From ff7ab63bd94d01b1372a39d0e39b05143ba09158 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 28 Feb 2023 20:57:45 +0100 Subject: [PATCH] yWeb: rename Y_NI_Infoicons-control.yhtm => Y_Settings_Infoicons.yhtm Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/5ce5197d09cf80d403140d8a6d60db01fe6835a7 Author: vanhofen Date: 2023-02-28 (Tue, 28 Feb 2023) Origin message was: ------------------ - yWeb: rename Y_NI_Infoicons-control.yhtm => Y_Settings_Infoicons.yhtm ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/y-web/Makefile.am | 4 ++-- ...control.yhtm => Y_Settings_Infoicons.yhtm} | 22 +++++++++---------- data/y-web/Y_Settings_Menue.yhtm | 4 ++-- data/y-web/Y_Version.txt | 2 +- data/y-web/languages/Deutsch | 17 +++++++------- data/y-web/languages/English | 17 +++++++------- 6 files changed, 34 insertions(+), 32 deletions(-) rename data/y-web/{Y_NI_Infoicons-control.yhtm => Y_Settings_Infoicons.yhtm} (91%) diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am index 7f22a139e..8eaff8f2f 100644 --- a/data/y-web/Makefile.am +++ b/data/y-web/Makefile.am @@ -49,14 +49,15 @@ install_DATA = extensions.txt \ Y_Settings_automount_list.yhtm \ Y_Settings_buttons.yhtm \ Y_Settings_glcd.yhtm \ + Y_Settings_Infoicons.yhtm \ Y_Settings_lcd.yhtm \ Y_Settings_mount.yhtm \ Y_Settings_mount_list.yhtm \ Y_Settings_neutrino_forms.yhtm \ Y_Settings_nhttpd.yhtm \ Y_Settings_personalize.yhtm \ - Y_Settings_Plugin_hide.yhtm \ Y_Settings_Plugincontrol.yhtm \ + Y_Settings_Plugins_hide.yhtm \ Y_Settings_umount_list.yhtm \ Y_Settings_video_audio.yhtm \ Y_Settings_wol.yhtm \ @@ -83,7 +84,6 @@ install_DATA = extensions.txt \ # NI-yWeb install_DATA += Y_NI_Camd-control.yhtm \ - Y_NI_Infoicons-control.yhtm \ Y_NI_m3uConInfo.yhtm \ Y_NI_m3uConvert.yhtm \ Y_NI_NetFS-control.yhtm \ diff --git a/data/y-web/Y_NI_Infoicons-control.yhtm b/data/y-web/Y_Settings_Infoicons.yhtm similarity index 91% rename from data/y-web/Y_NI_Infoicons-control.yhtm rename to data/y-web/Y_Settings_Infoicons.yhtm index ce0ac8feb..e0069ad3e 100644 --- a/data/y-web/Y_NI_Infoicons-control.yhtm +++ b/data/y-web/Y_Settings_Infoicons.yhtm @@ -8,7 +8,7 @@ {=var-set:icons_flag7={=ini-get:%(CONFIGDIR)/neutrino.conf;mode_icons_flag7~cache=}=} {=var-set:icons_dir=%(ICONSDIR)=} -{=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.infoicons-control.title=}
=}{=include-block:Y_Blocks.txt;snip_wait=} +{=var-set:wait_text={=L:set.infoicons.title=}
=}{=include-block:Y_Blocks.txt;snip_wait=}
- {=var-set:menu={=L:ni.infoicons-control.title=}=}{=include-block:Y_Blocks.txt;work_menu=} + {=var-set:menu={=L:set.infoicons=}=}{=include-block:Y_Blocks.txt;work_menu=}
- {=L:ni.infoicons-control=} + {=L:set.infoicons.title=}
- - - - - + + + + +
@@ -45,7 +45,7 @@ function do_submit()
- {=var-set:menu={=L:ni.infoicons-control.flagfile-control=}=}{=include-block:Y_Blocks.txt;work_menu=} + {=var-set:menu={=L:set.infoicons.flagfile-control=}=}{=include-block:Y_Blocks.txt;work_menu=}
@@ -56,7 +56,7 @@ function do_submit()   - {=L:ni.infoicons-control.flagfiles=} + {=L:set.infoicons.flagfiles=} diff --git a/data/y-web/Y_Settings_Menue.yhtm b/data/y-web/Y_Settings_Menue.yhtm index 4f4e91df0..2440f0b15 100644 --- a/data/y-web/Y_Settings_Menue.yhtm +++ b/data/y-web/Y_Settings_Menue.yhtm @@ -86,8 +86,8 @@ function init(){ {=include-block:Y_Blocks.txt;management_link=}
  • - {=var-set:m_link_href=Y_NI_Infoicons-control.yhtm=} - {=var-set:m_link_text={=L:ni.infoicons-control=}=} + {=var-set:m_link_href=Y_Settings_Infoicons.yhtm=} + {=var-set:m_link_text={=L:set.infoicons=}=} {=include-block:Y_Blocks.txt;management_link=}
    • {=if-equal:{=ini-get:%(CONFIGDIR)/neutrino.conf;glcd_enable;0=}~1~ diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt index 71ab82039..a852a4e3a 100644 --- a/data/y-web/Y_Version.txt +++ b/data/y-web/Y_Version.txt @@ -1,3 +1,3 @@ -version=3.0.44 +version=3.0.45 date=28.02.2023 info=NI-Neutrino-Webinterface diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch index 661379208..d46e797b1 100644 --- a/data/y-web/languages/Deutsch +++ b/data/y-web/languages/Deutsch @@ -353,6 +353,15 @@ set.plugintools.2webtvxmlurls-conf=WebTV-URLs bearbeiten set.plugins_hide=Plugins verstecken set.plugins_hide.title=Plugins anzeigen und verstecken +# ===== Settings Infoicons +set.infoicons=Infoicons +set.infoicons.title=Infoicons-Steuerung +set.infoicons.flagfile-control=Benachrichtigungs-Einstellungen +set.infoicons.flagfiles=Benachrichtigungs-Dateien +set.infoicons.static=Statisch +set.infoicons.popup=Als Popup +set.infoicons.infoviewer=Mit Infoviewer + # ===== Tools Info tools.info.show_messages=Kernel Meldungen tools.info.processes=Prozesse @@ -543,14 +552,6 @@ ni.camd-tools.oscamversion=Allgemeine Informationen ni.camd-tools.ncamversion=Allgemeine Informationen ni.camd-tools.doscamversion=Allgemeine Informationen -ni.infoicons-control=Infoicons -ni.infoicons-control.title=Infoicons-Steuerung -ni.infoicons-control.flagfile-control=Benachrichtigungs-Einstellungen -ni.infoicons-control.flagfiles=Benachrichtigungs-Dateien -ni.infoicons-control.static=Statisch -ni.infoicons-control.popup=Als Popup -ni.infoicons-control.infoviewer=Mit Infoviewer - ni.netfs-control=NetFS ni.netfs-0=fstab ni.netfs-1=auto.net diff --git a/data/y-web/languages/English b/data/y-web/languages/English index ca7089e9a..9b5d83f5d 100644 --- a/data/y-web/languages/English +++ b/data/y-web/languages/English @@ -353,6 +353,15 @@ set.plugintools.2webtvxmlurls-conf=Edit WebTV-URLs set.plugins_hide=Hide plugins set.plugins_hide.title=Show and hide plugins +# ===== Settings Infoicons +set.infoicons=Infoicons +set.infoicons.title=Infoicons-Control +set.infoicons.flagfile-control=Flag-Control +set.infoicons.flagfiles=Flag-Files +set.infoicons.static=Static +set.infoicons.popup=As a popup +set.infoicons.infoviewer=With Infoviewer + # ===== Tools Info tools.info.show_messages=Kernel Messages tools.info.processes=Processes @@ -543,14 +552,6 @@ ni.camd-tools.oscamversion=Common Informations ni.camd-tools.ncamversion=Common Informations ni.camd-tools.doscamversion=Common Informations -ni.infoicons-control=Infoicons -ni.infoicons-control.title=Infoicons-Control -ni.infoicons-control.flagfile-control=Flag-Control -ni.infoicons-control.flagfiles=Flag-Files -ni.infoicons-control.static=Static -ni.infoicons-control.popup=As a popup -ni.infoicons-control.infoviewer=With Infoviewer - ni.netfs-control=NetFS ni.netfs-0=fstab ni.netfs-1=auto.net