diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am index 4cc06751a..7f22a139e 100644 --- a/data/y-web/Makefile.am +++ b/data/y-web/Makefile.am @@ -55,6 +55,8 @@ install_DATA = extensions.txt \ Y_Settings_neutrino_forms.yhtm \ Y_Settings_nhttpd.yhtm \ Y_Settings_personalize.yhtm \ + Y_Settings_Plugin_hide.yhtm \ + Y_Settings_Plugincontrol.yhtm \ Y_Settings_umount_list.yhtm \ Y_Settings_video_audio.yhtm \ Y_Settings_wol.yhtm \ @@ -86,8 +88,7 @@ install_DATA += Y_NI_Camd-control.yhtm \ Y_NI_m3uConvert.yhtm \ Y_NI_NetFS-control.yhtm \ Y_NI_NetFS-edit.yhtm \ - Y_NI_NetFS-init.yhtm \ - Y_NI_Plugin-control.yhtm + Y_NI_NetFS-init.yhtm install-data-hook: @# Badass hack, I know. If anyone knows a better way -- please send patch! diff --git a/data/y-web/Y_Boxcontrol_PZapit.yhtm b/data/y-web/Y_Boxcontrol_PZapit.yhtm index ab22d2d0a..4f769cd2f 100644 --- a/data/y-web/Y_Boxcontrol_PZapit.yhtm +++ b/data/y-web/Y_Boxcontrol_PZapit.yhtm @@ -1,4 +1,4 @@ -{=include-block:Y_Blocks.txt;head_ni=} +{=include-block:Y_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head_close=} diff --git a/data/y-web/Y_Settings_Menue.yhtm b/data/y-web/Y_Settings_Menue.yhtm index e6b137133..4f4e91df0 100644 --- a/data/y-web/Y_Settings_Menue.yhtm +++ b/data/y-web/Y_Settings_Menue.yhtm @@ -145,8 +145,13 @@ function init(){
diff --git a/data/y-web/Y_NI_Plugin-control.yhtm b/data/y-web/Y_Settings_Plugincontrol.yhtm similarity index 81% rename from data/y-web/Y_NI_Plugin-control.yhtm rename to data/y-web/Y_Settings_Plugincontrol.yhtm index 554c27efe..8741b216e 100644 --- a/data/y-web/Y_NI_Plugin-control.yhtm +++ b/data/y-web/Y_Settings_Plugincontrol.yhtm @@ -1,27 +1,22 @@ -{=var-set:_p_list_so={=script:Y_NI_Tools p_list so=}=} -{=var-set:_p_list_sh={=script:Y_NI_Tools p_list sh=}=} -{=var-set:_p_list_lua={=script:Y_NI_Tools p_list lua=}=} - {=var-set:r_minidlnad={=script:Y_NI_Tools is_running minidlnad=}=} {=var-set:minidlnadport={=script:Y_NI_Tools get_minidlnad_webif_port=}=} {=var-set:r_xupnpd={=script:Y_NI_Tools is_running xupnpd=}=} {=var-set:xupnpdport={=script:Y_NI_Tools get_xupnpd_webif_port=}=} -{=include-block:Y_Blocks.txt;head_ni=} +{=include-block:Y_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head_close=} -{=var-set:wait_text={=L:ni.plugin-control.title=}
=}{=include-block:Y_Blocks.txt;snip_wait=} +{=var-set:wait_text={=L:set.plugincontrol.title=}
=}{=include-block:Y_Blocks.txt;snip_wait=}
- {=var-set:menu={=L:ni.plugin-control.title=}=}{=include-block:Y_Blocks.txt;work_menu=} + {=var-set:menu={=L:set.plugincontrol=}=}{=include-block:Y_Blocks.txt;work_menu=}
-
- + @@ -40,10 +35,10 @@ =} @@ -98,7 +93,7 @@ =} @@ -117,7 +112,7 @@ =} @@ -279,10 +274,10 @@   @@ -295,10 +290,10 @@   @@ -314,7 +309,7 @@   @@ -330,29 +325,10 @@  
{=L:ni.plugin-control.manage=}{=L:set.plugincontrol.title=}       - + - +
- + - + - + - +
- + - +
- +
- +
-
- - - - - - {=var-get:_p_list_so=} - - - - - {=var-get:_p_list_sh=} - - - - - {=var-get:_p_list_lua=} -
{=L:ni.plugin-control.blue=} 
-
diff --git a/data/y-web/Y_Settings_Plugins_hide.yhtm b/data/y-web/Y_Settings_Plugins_hide.yhtm new file mode 100644 index 000000000..6c9c7bbc9 --- /dev/null +++ b/data/y-web/Y_Settings_Plugins_hide.yhtm @@ -0,0 +1,42 @@ +{=var-set:_p_list_so={=script:Y_NI_Tools p_list so=}=} +{=var-set:_p_list_sh={=script:Y_NI_Tools p_list sh=}=} +{=var-set:_p_list_lua={=script:Y_NI_Tools p_list lua=}=} + +{=include-block:Y_Blocks.txt;head=} + +{=include-block:Y_Blocks.txt;head_close=} + +{=var-set:wait_text={=L:set.plugins_hide.title=}
=}{=include-block:Y_Blocks.txt;snip_wait=} +
+
+ {=var-set:menu={=L:set.plugins_hide=}=}{=include-block:Y_Blocks.txt;work_menu=} +
+
+ + + + + + {=var-get:_p_list_so=} + + + + + {=var-get:_p_list_sh=} + + + + + {=var-get:_p_list_lua=} +
{=L:set.plugins_hide.title=} 
+
+
+
+
+ {=var-set:menu={=L:answer=}=}{=include-block:Y_Blocks.txt;work_menu=}
+
+
+
+
+ + diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt index 0ab6ca2f1..71ab82039 100644 --- a/data/y-web/Y_Version.txt +++ b/data/y-web/Y_Version.txt @@ -1,3 +1,3 @@ -version=3.0.43 -date=23.02.2023 +version=3.0.44 +date=28.02.2023 info=NI-Neutrino-Webinterface diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch index 364835c59..661379208 100644 --- a/data/y-web/languages/Deutsch +++ b/data/y-web/languages/Deutsch @@ -340,6 +340,19 @@ set.settings.warning=Sichern & Wiederherstellen ist nur bei einem gleichen I # ===== Settings XMLTV set.xmltv.header=XMLTV Einstellungen +# ===== Settings Plugins +set.plugincontrol=Plugin-Steuerung +set.plugincontrol.title=Plugins und Services verwalten + +set.plugintools.fcm-addr=Telefonbuch bearbeiten +set.plugintools.pat-rules=Regeln bearbeiten +set.plugintools.epgscan-dat=Transponderliste bearbeiten +set.plugintools.rssreader-conf=RSS-Feeds bearbeiten +set.plugintools.2webtvxmlurls-conf=WebTV-URLs bearbeiten + +set.plugins_hide=Plugins verstecken +set.plugins_hide.title=Plugins anzeigen und verstecken + # ===== Tools Info tools.info.show_messages=Kernel Meldungen tools.info.processes=Prozesse @@ -530,17 +543,6 @@ ni.camd-tools.oscamversion=Allgemeine Informationen ni.camd-tools.ncamversion=Allgemeine Informationen ni.camd-tools.doscamversion=Allgemeine Informationen -ni.plugin-control=Plugins -ni.plugin-control.title=Plugin-Steuerung -ni.plugin-control.manage=Plugins und Services verwalten -ni.plugin-control.blue=Plugins auf blauer Taste verwalten - -ni.plugin-tools.fcm-addr=Telefonbuch bearbeiten -ni.plugin-tools.pat-rules=Regeln bearbeiten -ni.plugin-tools.epgscan-dat=Transponderliste bearbeiten -ni.plugin-tools.rssreader-conf=RSS-Feeds bearbeiten -ni.plugin-tools.2webtvxmlurls-conf=WebTV-URLs bearbeiten - ni.infoicons-control=Infoicons ni.infoicons-control.title=Infoicons-Steuerung ni.infoicons-control.flagfile-control=Benachrichtigungs-Einstellungen diff --git a/data/y-web/languages/English b/data/y-web/languages/English index ae9f2120e..ca7089e9a 100644 --- a/data/y-web/languages/English +++ b/data/y-web/languages/English @@ -340,6 +340,19 @@ set.settings.warning=Backup & Restore is only useful for the same image with the # ===== Settings XMLTV set.xmltv.header=XMLTV Settings +# ===== Settings Plugins +set.plugincontrol=Plugincontrol +set.plugincontrol.title=Manage plugins and services + +set.plugintools.fcm-addr=Edit Phonebook +set.plugintools.pat-rules=Edit Rules +set.plugintools.epgscan-dat=Edit Transponderlist +set.plugintools.rssreader-conf=Edit RSS-Feeds +set.plugintools.2webtvxmlurls-conf=Edit WebTV-URLs + +set.plugins_hide=Hide plugins +set.plugins_hide.title=Show and hide plugins + # ===== Tools Info tools.info.show_messages=Kernel Messages tools.info.processes=Processes @@ -530,17 +543,6 @@ ni.camd-tools.oscamversion=Common Informations ni.camd-tools.ncamversion=Common Informations ni.camd-tools.doscamversion=Common Informations -ni.plugin-control=Plugins -ni.plugin-control.title=Plugin-Control -ni.plugin-control.manage=Customize Plugins and Services -ni.plugin-control.blue=Customize Blue Button Plugins - -ni.plugin-tools.fcm-addr=Edit Phonebook -ni.plugin-tools.pat-rules=Edit Rules -ni.plugin-tools.epgscan-dat=Edit Transponderlist -ni.plugin-tools.rssreader-conf=Edit RSS-Feeds -ni.plugin-tools.2webtvxmlurls-conf=Edit WebTV-URLs - ni.infoicons-control=Infoicons ni.infoicons-control.title=Infoicons-Control ni.infoicons-control.flagfile-control=Flag-Control diff --git a/data/y-web/scripts/Makefile.am b/data/y-web/scripts/Makefile.am index e26060d32..1a9ac67a3 100644 --- a/data/y-web/scripts/Makefile.am +++ b/data/y-web/scripts/Makefile.am @@ -3,6 +3,7 @@ installdir = $(PRIVATE_HTTPDDIR)/scripts install_SCRIPTS = \ _Y_Globals.sh \ _Y_Library.sh \ + Y_Plugincontrol.sh \ Y_Tools.sh # file manager @@ -12,5 +13,4 @@ install_SCRIPTS += \ # NI-yWeb install_SCRIPTS += \ Y_NI_Camd-control.sh \ - Y_NI_Plugin-control.sh \ Y_NI_Tools.sh diff --git a/data/y-web/scripts/Y_NI_Tools.sh b/data/y-web/scripts/Y_NI_Tools.sh index 8d8d39537..2fad48851 100644 --- a/data/y-web/scripts/Y_NI_Tools.sh +++ b/data/y-web/scripts/Y_NI_Tools.sh @@ -485,30 +485,30 @@ case "$action" in printf "%s" "$S" ;; # plugin-control - p_fcm_start) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh fcm_start;; - p_fcm_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh fcm_stop;; - p_nfs_start) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh nfs_start;; - p_nfs_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh nfs_stop;; - p_samba_start) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh samba_start;; - p_samba_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh samba_stop;; - p_tuxcald_start) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh tuxcald_start;; - p_tuxcald_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh tuxcald_stop;; - p_tuxmaild_start) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh tuxmaild_start;; - p_tuxmaild_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh tuxmaild_stop;; - p_inadyn_start) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh inadyn_start;; - p_inadyn_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh inadyn_stop;; - p_dropbear_start) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh dropbear_start;; - p_dropbear_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh dropbear_stop;; - p_ushare_start) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh ushare_start;; - p_ushare_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh ushare_stop;; - p_djmount_start) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh djmount_start;; - p_djmount_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh djmount_stop;; - p_minidlna_start) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh minidlna_start;; - p_minidlna_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh minidlna_stop;; - p_xupnpd_start) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh xupnpd_start;; - p_xupnpd_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh xupnpd_stop;; - p_crond_start) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh crond_start;; - p_crond_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_NI_Plugin-control.sh crond_stop;; + p_fcm_start) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh fcm_start;; + p_fcm_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh fcm_stop;; + p_nfs_start) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh nfs_start;; + p_nfs_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh nfs_stop;; + p_samba_start) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh samba_start;; + p_samba_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh samba_stop;; + p_tuxcald_start) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh tuxcald_start;; + p_tuxcald_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh tuxcald_stop;; + p_tuxmaild_start) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh tuxmaild_start;; + p_tuxmaild_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh tuxmaild_stop;; + p_inadyn_start) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh inadyn_start;; + p_inadyn_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh inadyn_stop;; + p_dropbear_start) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh dropbear_start;; + p_dropbear_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh dropbear_stop;; + p_ushare_start) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh ushare_start;; + p_ushare_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh ushare_stop;; + p_djmount_start) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh djmount_start;; + p_djmount_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh djmount_stop;; + p_minidlna_start) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh minidlna_start;; + p_minidlna_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh minidlna_stop;; + p_xupnpd_start) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh xupnpd_start;; + p_xupnpd_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh xupnpd_stop;; + p_crond_start) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh crond_start;; + p_crond_stop) %(PRIVATE_HTTPDDIR)/scripts/Y_Plugincontrol.sh crond_stop;; # plugins on blue-button p_show) PLUGIN=$1 diff --git a/data/y-web/scripts/Y_NI_Plugin-control.sh b/data/y-web/scripts/Y_Plugincontrol.sh similarity index 100% rename from data/y-web/scripts/Y_NI_Plugin-control.sh rename to data/y-web/scripts/Y_Plugincontrol.sh