From 27d1c212290753ddea601738544515b3933d5005 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Thu, 9 Mar 2023 22:37:07 +0100 Subject: [PATCH] yWeb: deNIfication done :) Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/333f5e8667fec10f08a00ed6fd6e5c57d448d967 Author: vanhofen Date: 2023-03-09 (Thu, 09 Mar 2023) Origin message was: ------------------ - yWeb: deNIfication done :) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- data/y-web/Makefile.am | 179 ++++++++++++++++--------------- data/y-web/Y_Blocks.txt | 2 +- data/y-web/Y_Menue.yhtm | 3 +- data/y-web/Y_Settings_yWeb.yhtm | 3 - data/y-web/Y_Tools_Menue.yhtm | 4 +- data/y-web/Y_Version.txt | 2 +- data/y-web/images/Makefile.am | 16 ++- data/y-web/languages/Makefile.am | 4 +- data/y-web/styles/Makefile.am | 8 +- 9 files changed, 111 insertions(+), 110 deletions(-) diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am index d6e3e1c7e..20b519e82 100644 --- a/data/y-web/Makefile.am +++ b/data/y-web/Makefile.am @@ -1,91 +1,98 @@ -SUBDIRS = images scripts languages styles prototype - -# NI-yWeb -SUBDIRS += favicon info jquery lcd4linux +SUBDIRS = \ + favicon \ + images \ + info \ + jquery \ + languages \ + lcd4linux \ + prototype \ + scripts \ + styles installdir = $(PRIVATE_HTTPDDIR) -install_DATA = extensions.txt \ - favicon.ico \ - index.html \ - robots.txt \ - Y_About_Image.yhtm \ - Y_About_yWeb.yhtm \ - Y_Baselib.js \ - Y_Blank.yhtm \ - Y_Blocks.txt \ - Y_Blocks_Neutrino.txt \ - Y_Boxcontrol_Bouquet_Editor_Edit.yhtm \ - Y_Boxcontrol_Bouquet_Editor_Main.yhtm \ - Y_Boxcontrol_Bouquetlist.yhtm \ - Y_Boxcontrol_Bouquets.yhtm \ - Y_Boxcontrol_Channellist.yhtm \ - Y_Boxcontrol_Menue.yhtm \ - Y_Boxcontrol_Messages.yhtm \ - Y_Boxcontrol_PZapit.yhtm \ - Y_Dist.css \ - Y_Dyn_Pages.yhtm \ - Y_EPG.js \ - Y_EPG_Plus.yhtm \ - Y_Ext_Menue.yhtm \ - Y_Ext_Settings.yhtm \ - Y_Ext_Uninstall.yhtm \ - Y_Ext_Update.js \ - Y_Ext_Update.yhtm \ - Y_Ext_Update_refresh.yhtm \ - Y_Filemgr.yhtm \ - Y_Filemgr_Edit.yhtm \ - Y_Info_Help.yhtm \ - Y_Info_Menue.yhtm \ - Y_Live_EPG.yhtm \ - Y_Live_EPG_Info.yhtm \ - Y_Main.css \ - Y_Menue.yhtm \ - Y_Refresh.yhtm \ - Y_Settings_Backup.yhtm \ - Y_Settings_Camds.yhtm \ - Y_Settings_Menue.yhtm \ - Y_Settings_automount.yhtm \ - 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_Plugins.yhtm \ - Y_Settings_Plugins_hide.yhtm \ - Y_Settings_umount_list.yhtm \ - Y_Settings_video_audio.yhtm \ - Y_Settings_wol.yhtm \ - Y_Settings_xmltv.yhtm \ - Y_Settings_yWeb.yhtm \ - Y_Settings_zapit.yhtm \ - Y_StreamInfo.yhtm \ - Y_Timer_Edit.yhtm \ - Y_Timer_List.yhtm \ - Y_Tools_Boxcontrol.yhtm \ - Y_Tools_Check_Install.yhtm \ - Y_Tools_Cmd.yhtm \ - Y_Tools_Info_Menue.yhtm \ - Y_Tools_Installer.yhtm \ - Y_Tools_Menue.yhtm \ - Y_Tools_m3uConvert.yhtm \ - Y_Tools_m3uConvert_help.yhtm \ - Y_Tools_NetFS.yhtm \ - Y_Tools_NetFS_edit.yhtm \ - Y_Tools_NetFS_init.yhtm \ - Y_Tools_Rcsim.yhtm \ - Y_Tools_Screenshot.yhtm \ - Y_Tools_Screenshot_GraphLCD.yhtm \ - Y_Tools_Screenshot_LCD4Linux.yhtm \ - Y_User.css \ - Y_Version.txt \ - Y_Wait.yhtm \ - Y_yWeb.js +install_DATA = \ + extensions.txt \ + favicon.ico \ + index.html \ + robots.txt \ + Y_About_Image.yhtm \ + Y_About_yWeb.yhtm \ + Y_Baselib.js \ + Y_Blank.yhtm \ + Y_Blocks.txt \ + Y_Blocks_Neutrino.txt \ + Y_Boxcontrol_Bouquet_Editor_Edit.yhtm \ + Y_Boxcontrol_Bouquet_Editor_Main.yhtm \ + Y_Boxcontrol_Bouquetlist.yhtm \ + Y_Boxcontrol_Bouquets.yhtm \ + Y_Boxcontrol_Channellist.yhtm \ + Y_Boxcontrol_Menue.yhtm \ + Y_Boxcontrol_Messages.yhtm \ + Y_Boxcontrol_PZapit.yhtm \ + Y_Dist.css \ + Y_Dyn_Pages.yhtm \ + Y_EPG.js \ + Y_EPG_Plus.yhtm \ + Y_Ext_Menue.yhtm \ + Y_Ext_Settings.yhtm \ + Y_Ext_Uninstall.yhtm \ + Y_Ext_Update.js \ + Y_Ext_Update.yhtm \ + Y_Ext_Update_refresh.yhtm \ + Y_Filemgr.yhtm \ + Y_Filemgr_Edit.yhtm \ + Y_Info_Help.yhtm \ + Y_Info_Menue.yhtm \ + Y_Live_EPG.yhtm \ + Y_Live_EPG_Info.yhtm \ + Y_Main.css \ + Y_Menue.yhtm \ + Y_Refresh.yhtm \ + Y_Settings_Backup.yhtm \ + Y_Settings_Camds.yhtm \ + Y_Settings_Infoicons.yhtm \ + Y_Settings_Menue.yhtm \ + Y_Settings_Plugins.yhtm \ + Y_Settings_Plugins_hide.yhtm \ + Y_Settings_automount.yhtm \ + Y_Settings_automount_list.yhtm \ + Y_Settings_buttons.yhtm \ + Y_Settings_glcd.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_umount_list.yhtm \ + Y_Settings_video_audio.yhtm \ + Y_Settings_wol.yhtm \ + Y_Settings_xmltv.yhtm \ + Y_Settings_yWeb.yhtm \ + Y_Settings_zapit.yhtm \ + Y_StreamInfo.yhtm \ + Y_Timer_Edit.yhtm \ + Y_Timer_List.yhtm \ + Y_Tools_Boxcontrol.yhtm \ + Y_Tools_Check_Install.yhtm \ + Y_Tools_Cmd.yhtm \ + Y_Tools_Info_Menue.yhtm \ + Y_Tools_Installer.yhtm \ + Y_Tools_Menue.yhtm \ + Y_Tools_NetFS.yhtm \ + Y_Tools_NetFS_edit.yhtm \ + Y_Tools_NetFS_init.yhtm \ + Y_Tools_Rcsim.yhtm \ + Y_Tools_Screenshot.yhtm \ + Y_Tools_Screenshot_GraphLCD.yhtm \ + Y_Tools_Screenshot_LCD4Linux.yhtm \ + Y_Tools_m3uConvert.yhtm \ + Y_Tools_m3uConvert_help.yhtm \ + Y_User.css \ + Y_Version.txt \ + Y_Wait.yhtm \ + Y_yWeb.js install-data-hook: @# Badass hack, I know. If anyone knows a better way -- please send patch! @@ -123,5 +130,5 @@ install-data-hook: -e 's|%(HOSTED_HTTPDDIR)|$(HOSTED_HTTPDDIR)|g' \ -e 's|%(FLAGDIR)|$(FLAGDIR)|g' \ ; - @# NI-yWeb + @# install NI dark style cp $(DESTDIR)$(PRIVATE_HTTPDDIR)/styles/Y_Dist-NI_dark.css $(DESTDIR)$(PRIVATE_HTTPDDIR)/Y_Dist.css diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt index 75e11c06d..34a75e34e 100644 --- a/data/y-web/Y_Blocks.txt +++ b/data/y-web/Y_Blocks.txt @@ -483,7 +483,7 @@ start-block~frame_live_epg end-block~frame_live_epg -# ------- NI NetFS +# ------- NetFS start-block~netfs_local_dir {=var-set:local_dir_{=var-get:nr=}={=ini-get:%(CONFIGDIR)/neutrino.conf;netfs_{=mount_type_s=}_local_dir_{=var-get:nr=}~open=}=} end-block~netfs_local_dir diff --git a/data/y-web/Y_Menue.yhtm b/data/y-web/Y_Menue.yhtm index 2639b6a43..15159f7b4 100644 --- a/data/y-web/Y_Menue.yhtm +++ b/data/y-web/Y_Menue.yhtm @@ -96,7 +96,7 @@ function vlc() { title="{=L:main.tools_desc=}">{=L:main.tools=}
  • {=L:main.settings=}
    • - @@ -114,7 +114,6 @@ function vlc() {   - {=if-equal:{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_name=}~${HOSTNAME}~{=script:Y_Tools get_hostname=}~{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_name=}=} 00:00 diff --git a/data/y-web/Y_Settings_yWeb.yhtm b/data/y-web/Y_Settings_yWeb.yhtm index 4232d8841..9dd9b8286 100644 --- a/data/y-web/Y_Settings_yWeb.yhtm +++ b/data/y-web/Y_Settings_yWeb.yhtm @@ -53,7 +53,6 @@ function do_init(){ } document.f.start_page.selectedIndex = sel; style_old = "{=ini-get:%(CONFIGDIR)/yWeb.conf;style~cache=}"; - //NI if ("{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_name=}" == "${HOSTNAME}") { document.f.hostname.checked = true; document.f.yweb_box_name.value = "${HOSTNAME}"; @@ -61,7 +60,6 @@ function do_init(){ document.f.yweb_box_name.style.color='#aaaaaa' } } -//NI function do_switch_hostname() { if(document.f.hostname.checked == true) @@ -127,7 +125,6 @@ select { {=L:set.yweb.box_tag=} - Hostname diff --git a/data/y-web/Y_Tools_Menue.yhtm b/data/y-web/Y_Tools_Menue.yhtm index 70dc8a057..a0ac0836d 100644 --- a/data/y-web/Y_Tools_Menue.yhtm +++ b/data/y-web/Y_Tools_Menue.yhtm @@ -23,7 +23,7 @@ function init(){
    {=L:main.tools=}
      - {=comment:NI - disable automounter~ + {=comment:disable automounter~
    • {=if-empty:{=var-get:automount=}~ {=L:tools.automount=} @@ -101,7 +101,7 @@ function init(){
    • {=L:tools.check_install=}
      • - {=comment:NI - disable yInstaller~ + {=comment: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 a5e22aa50..150026b28 100644 --- a/data/y-web/Y_Version.txt +++ b/data/y-web/Y_Version.txt @@ -1,3 +1,3 @@ -version=3.0.61 +version=3.1.0 date=09.03.2023 info=NI-Neutrino-Webinterface diff --git a/data/y-web/images/Makefile.am b/data/y-web/images/Makefile.am index 4f353a604..db3d9c23b 100644 --- a/data/y-web/images/Makefile.am +++ b/data/y-web/images/Makefile.am @@ -8,7 +8,9 @@ images_DATA = \ arrowright.png \ arrowup.png \ blank.png \ + cancel.png \ check_green.png \ + colored_bar.png \ comment.png \ cross.png \ elist.png \ @@ -32,6 +34,10 @@ images_DATA = \ rename.gif \ save.png \ saveall.png \ + server_add.png \ + server_delete.png \ + server_edit.png \ + server_link.png \ snapshot.png \ stream.png \ streaminfo.png \ @@ -87,15 +93,6 @@ images_DATA += \ ext_plugin.png \ ext_script.png -# NI-yWeb -images_DATA += \ - cancel.png \ - colored_bar.png \ - server_add.png \ - server_delete.png \ - server_edit.png \ - server_link.png - # remote controls imagesrcdir = $(PRIVATE_HTTPDDIR)/images/rc @@ -122,4 +119,3 @@ imagesrc_DATA += \ rc/rc_wwio_bre2ze4k.png \ rc/rc_zgemma_h7.png endif - diff --git a/data/y-web/languages/Makefile.am b/data/y-web/languages/Makefile.am index 24ba51d21..1184925ad 100644 --- a/data/y-web/languages/Makefile.am +++ b/data/y-web/languages/Makefile.am @@ -1,3 +1,5 @@ installdir = $(PRIVATE_HTTPDDIR)/languages -install_DATA = Deutsch English +install_DATA = \ + Deutsch \ + English diff --git a/data/y-web/styles/Makefile.am b/data/y-web/styles/Makefile.am index 0fe200552..b0ac3866d 100644 --- a/data/y-web/styles/Makefile.am +++ b/data/y-web/styles/Makefile.am @@ -1,6 +1,6 @@ installdir = $(PRIVATE_HTTPDDIR)/styles -install_DATA = Y_Dist-Tuxbox.css Y_Dist-GreyBlue.css - -# NI-yWeb -install_DATA += Y_Dist-NI_dark.css +install_DATA = \ + Y_Dist-GreyBlue.css \ + Y_Dist-NI_dark.css \ + Y_Dist-Tuxbox.css \