diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am index 55e893db6..687018328 100644 --- a/data/y-web/Makefile.am +++ b/data/y-web/Makefile.am @@ -13,7 +13,6 @@ install_DATA = channels.js \ robots.txt \ Y_About.yhtm \ Y_Baselib.js \ - Y_blank.htm \ Y_Blocks.txt \ Y_Boxcontrol_Bouquet_Editor_Edit.yhtm \ Y_Boxcontrol_Bouquet_Editor_Main.yhtm \ @@ -91,11 +90,9 @@ install_DATA += Y_NIlib.js \ Y_NI_blank.yhtm \ Y_NI_Blocks.txt \ Y_NI_Camd-control.yhtm \ - Y_NI_Dyn_Pages.yhtm \ Y_NI_Infoicons-control.yhtm \ Y_NI_m3uConInfo.yhtm \ Y_NI_m3uConvert.yhtm \ - Y_NI_Menue.yhtm \ Y_NI_NetFS-control.yhtm \ Y_NI_NetFS-edit.yhtm \ Y_NI_NetFS-init.yhtm \ diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt index 3b7efceb5..b501af43e 100644 --- a/data/y-web/Y_Blocks.txt +++ b/data/y-web/Y_Blocks.txt @@ -427,28 +427,28 @@ end-block~frame_boxcontrol # ------- Lay-Frame Tools-Menu start-block~frame_tools {=var-set:sec_menu=Y_Tools_Menue.yhtm=} -{=var-set:work=Y_blank.htm=} +{=var-set:work=Y_NI_blank.yhtm=} {=include-block:Y_Blocks.txt;frame_secondary=} end-block~frame_tools # ------- Lay-Frame Settings-Menu start-block~frame_settings {=var-set:sec_menu=Y_Settings_Menue.yhtm=} -{=var-set:work=Y_blank.htm=} +{=var-set:work=Y_NI_blank.yhtm=} {=include-block:Y_Blocks.txt;frame_secondary=} end-block~frame_settings # ------- Lay-Frame Extentions-Menu start-block~frame_ext {=var-set:sec_menu=Y_Ext_Menue.yhtm=} -{=var-set:work=Y_blank.htm=} +{=var-set:work=Y_NI_blank.yhtm=} {=include-block:Y_Blocks.txt;frame_secondary=} end-block~frame_ext # ------- Lay-Frame Info-Menu start-block~frame_info {=var-set:sec_menu=Y_Info_Menue.yhtm=} -{=var-set:work=Y_About.yhtm=} +{=var-set:work=Y_NI_About.yhtm=} {=include-block:Y_Blocks.txt;frame_secondary=} end-block~frame_info diff --git a/data/y-web/Y_Boxcontrol_Menue.yhtm b/data/y-web/Y_Boxcontrol_Menue.yhtm index 925754192..41e12534c 100644 --- a/data/y-web/Y_Boxcontrol_Menue.yhtm +++ b/data/y-web/Y_Boxcontrol_Menue.yhtm @@ -169,6 +169,9 @@ function epg_plus_popup() {
  • {=L:live.timer=}
    • +
  • + {=L:ni.pzapit-control=} +
    • diff --git a/data/y-web/Y_Info_Menue.yhtm b/data/y-web/Y_Info_Menue.yhtm index 7a104ca8c..1c41fa4ab 100644 --- a/data/y-web/Y_Info_Menue.yhtm +++ b/data/y-web/Y_Info_Menue.yhtm @@ -17,7 +17,10 @@ function init(){
    diff --git a/data/y-web/Y_NI.css b/data/y-web/Y_NI.css index ac83a6e89..016990fe2 100644 --- a/data/y-web/Y_NI.css +++ b/data/y-web/Y_NI.css @@ -8,17 +8,6 @@ box-shadow: .5em .5em .5em rgba(0, 0, 0, 0.5); } -.ni_logo { - font-weight: bold; - font-size: 50px; - color: #FD6D13; - vertical-align: top; - text-shadow: 0 -1px #555555, 1px 0 #555555, 0 1px #555555, -1px 0 #555555, #000 4px 4px 3px; -} -.ni_logo img { - vertical-align: text-bottom; - margin-left: 5px; -} hr { border: 0 none; border-top: 1px solid #a0a0a0; diff --git a/data/y-web/Y_NI_About.yhtm b/data/y-web/Y_NI_About.yhtm index 580801710..972e209a0 100644 --- a/data/y-web/Y_NI_About.yhtm +++ b/data/y-web/Y_NI_About.yhtm @@ -41,19 +41,16 @@ jQuery(document).ready(function(){
    - {=var-set:menu={=L:info.About=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=} + {=var-set:menu={=L:info.About=} NI-Image=}{=include-block:Y_Blocks.txt;work_menu=}
    - -
    + - -
    diff --git a/data/y-web/Y_NI_Blocks.txt b/data/y-web/Y_NI_Blocks.txt index ff084a5e4..103115e4a 100644 --- a/data/y-web/Y_NI_Blocks.txt +++ b/data/y-web/Y_NI_Blocks.txt @@ -1,15 +1,3 @@ -# ------- Lay-Frame Extentions-Menu -start-block~frame_NI -{=var-set:sec_menu=Y_NI_Menue.yhtm=} -{=var-set:work=Y_NI_blank.yhtm=} -{=include-block:Y_Blocks.txt;frame_secondary=} -end-block~frame_NI - -# ------- NI work menu -start-block~NI_work_menu -
    {=var-get:menu=}
    -end-block~NI_work_menu - # ------- Lay-NI-HEAD start-block~head =}{=include-block:Y_Blocks.txt;snip_wait=}
    - {=var-set:menu={=L:ni.camd-control.title=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=} + {=var-set:menu={=L:ni.camd-control.title=}=}{=include-block:Y_Blocks.txt;work_menu=}
    @@ -597,7 +597,7 @@ input[type="button"], .tools select {
    - {=var-set:menu={=L:answer=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=}
    + {=var-set:menu={=L:answer=}=}{=include-block:Y_Blocks.txt;work_menu=}
    diff --git a/data/y-web/Y_NI_Dyn_Pages.yhtm b/data/y-web/Y_NI_Dyn_Pages.yhtm deleted file mode 100644 index ecc826b54..000000000 --- a/data/y-web/Y_NI_Dyn_Pages.yhtm +++ /dev/null @@ -1 +0,0 @@ -{=include-block:Y_NI_Blocks.txt;{=page=}=} diff --git a/data/y-web/Y_NI_Infoicons-control.yhtm b/data/y-web/Y_NI_Infoicons-control.yhtm index aa630135a..92d5c29c3 100644 --- a/data/y-web/Y_NI_Infoicons-control.yhtm +++ b/data/y-web/Y_NI_Infoicons-control.yhtm @@ -22,7 +22,7 @@ function do_submit() {=var-set:wait_text={=L:ni.infoicons-control.title=}
    =}{=include-block:Y_Blocks.txt;snip_wait=}
    - {=var-set:menu={=L:ni.infoicons-control.title=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=} + {=var-set:menu={=L:ni.infoicons-control.title=}=}{=include-block:Y_Blocks.txt;work_menu=}
    @@ -45,7 +45,7 @@ function do_submit()
    - {=var-set:menu={=L:ni.infoicons-control.flagfile-control=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=} + {=var-set:menu={=L:ni.infoicons-control.flagfile-control=}=}{=include-block:Y_Blocks.txt;work_menu=}
    @@ -258,7 +258,7 @@ function do_submit()
    - {=var-set:menu={=L:answer=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=}
    + {=var-set:menu={=L:answer=}=}{=include-block:Y_Blocks.txt;work_menu=}
    diff --git a/data/y-web/Y_NI_Menue.yhtm b/data/y-web/Y_NI_Menue.yhtm deleted file mode 100644 index 47ec5f57d..000000000 --- a/data/y-web/Y_NI_Menue.yhtm +++ /dev/null @@ -1,38 +0,0 @@ -{=include-block:Y_NI_Blocks.txt;head=} - - - -
    -

    {=L:main.ni=}

    -
    -
    NI-{=L:bc.menue.control=}
    -
    - -
    -
    Box-{=L:bc.menue.control=}
    -
    - -
    -
    {=L:main.info=}
    -
    - -
    -
    -
    - - - diff --git a/data/y-web/Y_NI_NetFS-control.yhtm b/data/y-web/Y_NI_NetFS-control.yhtm index 996807d97..6a0587167 100644 --- a/data/y-web/Y_NI_NetFS-control.yhtm +++ b/data/y-web/Y_NI_NetFS-control.yhtm @@ -60,7 +60,7 @@ function do_submit() {=var-set:wait_text={=L:ni.netfs-control.title=}
    =}{=include-block:Y_Blocks.txt;snip_wait=}
    - {=var-set:menu={=L:ni.netfs-control.title=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=} + {=var-set:menu={=L:ni.netfs-control.title=}=}{=include-block:Y_Blocks.txt;work_menu=}
    @@ -108,7 +108,7 @@ function do_submit()
    - {=var-set:menu={=L:answer=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=}
    + {=var-set:menu={=L:answer=}=}{=include-block:Y_Blocks.txt;work_menu=}
    diff --git a/data/y-web/Y_NI_NetFS-edit.yhtm b/data/y-web/Y_NI_NetFS-edit.yhtm index fb51228a7..a749143a8 100644 --- a/data/y-web/Y_NI_NetFS-edit.yhtm +++ b/data/y-web/Y_NI_NetFS-edit.yhtm @@ -26,7 +26,7 @@ function do_submit() {=var-set:wait_text={=L:ni.netfs-control.title=}
    =}{=include-block:Y_Blocks.txt;snip_wait=}
    - {=var-set:menu={=L:ni.netfs-control.title=} ({=L:ni.edit=}: {=L:ni.netfs-{=mount_type=}=} - {=nr=})=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=} + {=var-set:menu={=L:ni.netfs-control.title=} ({=L:ni.edit=}: {=L:ni.netfs-{=mount_type=}=} - {=nr=})=}{=include-block:Y_Blocks.txt;work_menu=}
    diff --git a/data/y-web/Y_NI_NetFS-init.yhtm b/data/y-web/Y_NI_NetFS-init.yhtm index e1f964203..7f115319f 100644 --- a/data/y-web/Y_NI_NetFS-init.yhtm +++ b/data/y-web/Y_NI_NetFS-init.yhtm @@ -10,10 +10,11 @@ jQuery(document).ready(function(){
    - {=var-set:menu=Initializing {=mount_type_s=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=} + {=var-set:menu=Initializing {=mount_type_s=}=}{=include-block:Y_Blocks.txt;work_menu=}
    - Please wait ... {=func:netfs_read_config {=mount_type=}=} + Please wait ... + {=func:netfs_read_config {=mount_type=}=}
    diff --git a/data/y-web/Y_NI_PZapit-control.yhtm b/data/y-web/Y_NI_PZapit-control.yhtm index d257a8ac0..aea0651c4 100644 --- a/data/y-web/Y_NI_PZapit-control.yhtm +++ b/data/y-web/Y_NI_PZapit-control.yhtm @@ -3,7 +3,7 @@
    - {=var-set:menu={=L:ni.pzapit-control.title=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=} + {=var-set:menu={=L:ni.pzapit-control.title=}=}{=include-block:Y_Blocks.txt;work_menu=}
    @@ -40,7 +40,7 @@
    - {=var-set:menu={=L:answer=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=}
    + {=var-set:menu={=L:answer=}=}{=include-block:Y_Blocks.txt;work_menu=}
    diff --git a/data/y-web/Y_NI_Plugin-control.yhtm b/data/y-web/Y_NI_Plugin-control.yhtm index 8f43317e0..dbe6a6eed 100644 --- a/data/y-web/Y_NI_Plugin-control.yhtm +++ b/data/y-web/Y_NI_Plugin-control.yhtm @@ -14,7 +14,7 @@ {=var-set:wait_text={=L:ni.plugin-control.title=}
    =}{=include-block:Y_Blocks.txt;snip_wait=}
    - {=var-set:menu={=L:ni.plugin-control.title=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=} + {=var-set:menu={=L:ni.plugin-control.title=}=}{=include-block:Y_Blocks.txt;work_menu=}
    @@ -356,7 +356,7 @@
    - {=var-set:menu={=L:answer=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=}
    + {=var-set:menu={=L:answer=}=}{=include-block:Y_Blocks.txt;work_menu=}
    diff --git a/data/y-web/Y_NI_blank.yhtm b/data/y-web/Y_NI_blank.yhtm index 719ddb2d3..34687eff0 100644 --- a/data/y-web/Y_NI_blank.yhtm +++ b/data/y-web/Y_NI_blank.yhtm @@ -3,7 +3,7 @@
    - {=var-set:menu={=L:main.ni_desc=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=} + {=var-set:menu={=L:main.ni=}=}{=include-block:Y_Blocks.txt;work_menu=}
    diff --git a/data/y-web/Y_Settings_Menue.yhtm b/data/y-web/Y_Settings_Menue.yhtm index f9e8a5a8b..323f8b0fd 100644 --- a/data/y-web/Y_Settings_Menue.yhtm +++ b/data/y-web/Y_Settings_Menue.yhtm @@ -7,6 +7,7 @@ function init(){ add_yExtensions('settings_general', 'secmenu_general'); add_yExtensions('settings_neutrino', 'secmenu_neutrino'); + add_yExtensions('settings_settings', 'secmenu_settings'); add_yExtensions('settings_plugins', 'secmenu_plugins'); } @@ -125,10 +126,28 @@ function init(){ -->
    +
    NI-{=L:main.settings=}
    +
    +
      +
    • + {=var-set:m_link_href=Y_NI_Infoicons-control.yhtm=} + {=var-set:m_link_text={=L:ni.infoicons-control=}=} + {=include-block:Y_Blocks.txt;management_link=} +
      • +
    • + {=var-set:m_link_href=Y_NI_Camd-control.yhtm=} + {=var-set:m_link_text={=L:ni.camd-control=}=} + {=include-block:Y_Blocks.txt;management_link=} +
      • +
    +
    {=L:plugins=}
    • + {=var-set:m_link_href=Y_NI_Plugin-control.yhtm=} + {=var-set:m_link_text={=L:ni.plugin-control=}=} + {=include-block:Y_Blocks.txt;management_link=}
    diff --git a/data/y-web/Y_Tools_Menue.yhtm b/data/y-web/Y_Tools_Menue.yhtm index 7c93460c6..03865d7f0 100644 --- a/data/y-web/Y_Tools_Menue.yhtm +++ b/data/y-web/Y_Tools_Menue.yhtm @@ -23,6 +23,7 @@ function init(){
    {=L:main.tools=}
      + {=comment:NI - disable automounter~
    • {=if-empty:{=var-get:automount=}~ {=L:tools.automount=} @@ -33,12 +34,28 @@ function init(){ {=include-block:Y_Blocks.txt;management_link=} =}
      • + =}
    • {=var-set:m_link_href=Y_Settings_mount_liste.yhtm=} {=var-set:m_link_desc={=L:tools.mounts_desc=}=} {=var-set:m_link_text={=L:tools.mounts=}=} {=include-block:Y_Blocks.txt;management_link=}
      • +
    • {=L:ni.netfs-control=}
      • +
        +
      • + {=var-set:m_link_href=Y_NI_NetFS-init.yhtm?mount_type=0&mount_type_s=fstab=} + {=var-set:m_link_desc=fstab-{=L:tools.mounts=}=} + {=var-set:m_link_text=/var/etc/fstab=} + {=include-block:Y_Blocks.txt;management_link=} +
        • +
      • + {=var-set:m_link_href=Y_NI_NetFS-init.yhtm?mount_type=1&mount_type_s=automount=} + {=var-set:m_link_desc={=L:tools.automount=}=} + {=var-set:m_link_text=/var/etc/auto.net=} + {=include-block:Y_Blocks.txt;management_link=} +
        • +
    • {=var-set:m_link_href=Y_Filemgr.yhtm=} {=var-set:m_link_desc={=L:tools.filemgr_desc=}=} @@ -55,6 +72,12 @@ function init(){ {=include-block:Y_Blocks.txt;management_link=} =}
      • +
    • + {=var-set:m_link_href=Y_NI_m3uConvert.yhtm=} + {=var-set:m_link_desc==} + {=var-set:m_link_text=m3uConvert=} + {=include-block:Y_Blocks.txt;management_link=} +
    {=L:tools.expert=}
    @@ -78,7 +101,7 @@ function init(){
  • {=L:tools.check_install=}
    • - {=comment:NI - disable yinstaller~ + {=comment:NI - disable yInstaller~
  • {=var-set:m_link_href=Y_Tools_Installer.yhtm=} {=var-set:m_link_desc==} diff --git a/data/y-web/Y_Version.txt b/data/y-web/Y_Version.txt index 36640271e..4e1802765 100644 --- a/data/y-web/Y_Version.txt +++ b/data/y-web/Y_Version.txt @@ -1,3 +1,3 @@ -version=2.9.0.60 -date=15.12.2021 +version=2.9.1.00 +date=06.09.2022 info=NI-Neutrino diff --git a/data/y-web/Y_blank.htm b/data/y-web/Y_blank.htm deleted file mode 100644 index 8eac065ed..000000000 --- a/data/y-web/Y_blank.htm +++ /dev/null @@ -1,13 +0,0 @@ - - - - -yWeb - - - - - - - diff --git a/data/y-web/languages/Deutsch b/data/y-web/languages/Deutsch index 43f994063..ef9fc7ac5 100644 --- a/data/y-web/languages/Deutsch +++ b/data/y-web/languages/Deutsch @@ -423,7 +423,7 @@ live.timer-sync.status=Status # ===== INFO info.help=Hilfe -info.About=über +info.About=Über info.check_for_updates=Auf Updates prüfen info.your_version=Deine Version info.actual_version=Aktuelle Version @@ -485,7 +485,6 @@ rc.key_recall=Recall # ===== NI main.ni=NI-yWeb -main.ni_desc=NI-yWeb Erweiterung ni.save=Speichern ni.cancel=Abbrechen diff --git a/data/y-web/languages/English b/data/y-web/languages/English index af50d5964..9e071fc30 100644 --- a/data/y-web/languages/English +++ b/data/y-web/languages/English @@ -485,7 +485,6 @@ rc.key_recall=Recall # ===== NI main.ni=NI-yWeb -main.ni_desc=NI-yWeb extension ni.save=Save ni.cancel=Cancel diff --git a/data/y-web/styles/Y_Dist-NI_dark.css b/data/y-web/styles/Y_Dist-NI_dark.css index 06aa042b4..60670296c 100644 --- a/data/y-web/styles/Y_Dist-NI_dark.css +++ b/data/y-web/styles/Y_Dist-NI_dark.css @@ -349,9 +349,6 @@ img#shot { border-color: #3b3b3b; } -.ni_logo { - text-shadow: 0 -1px #090909, 1px 0 #090909, 0 1px #090909, -1px 0 #090909, #000 4px 4px 3px; -} tr.list:hover td { background-color: #3b3b3b; }