mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 16:01:10 +02:00
Code Issues Packages Projects Releases Wiki Activity

yWeb: deNIfication done :)

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 333f5e8667
Author: vanhofen <vanhofen@gmx.de>
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
This commit is contained in:
vanhofen
2023-03-09 22:37:07 +01:00
parent d6f841c504
commit 27d1c21229
9 changed files with 111 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
data/y-web/Makefile.am
View File

@@ -1,91 +1,98 @@
SUBDIRS = images scripts languages styles prototype SUBDIRS = \
favicon \
# NI-yWeb images \
SUBDIRS += favicon info jquery lcd4linux info \
jquery \
languages \
lcd4linux \
prototype \
scripts \
styles
installdir = $(PRIVATE_HTTPDDIR) installdir = $(PRIVATE_HTTPDDIR)
install_DATA = extensions.txt \ install_DATA = \
favicon.ico \ extensions.txt \
index.html \ favicon.ico \
robots.txt \ index.html \
Y_About_Image.yhtm \ robots.txt \
Y_About_yWeb.yhtm \ Y_About_Image.yhtm \
Y_Baselib.js \ Y_About_yWeb.yhtm \
Y_Blank.yhtm \ Y_Baselib.js \
Y_Blocks.txt \ Y_Blank.yhtm \
Y_Blocks_Neutrino.txt \ Y_Blocks.txt \
Y_Boxcontrol_Bouquet_Editor_Edit.yhtm \ Y_Blocks_Neutrino.txt \
Y_Boxcontrol_Bouquet_Editor_Main.yhtm \ Y_Boxcontrol_Bouquet_Editor_Edit.yhtm \
Y_Boxcontrol_Bouquetlist.yhtm \ Y_Boxcontrol_Bouquet_Editor_Main.yhtm \
Y_Boxcontrol_Bouquets.yhtm \ Y_Boxcontrol_Bouquetlist.yhtm \
Y_Boxcontrol_Channellist.yhtm \ Y_Boxcontrol_Bouquets.yhtm \
Y_Boxcontrol_Menue.yhtm \ Y_Boxcontrol_Channellist.yhtm \
Y_Boxcontrol_Messages.yhtm \ Y_Boxcontrol_Menue.yhtm \
Y_Boxcontrol_PZapit.yhtm \ Y_Boxcontrol_Messages.yhtm \
Y_Dist.css \ Y_Boxcontrol_PZapit.yhtm \
Y_Dyn_Pages.yhtm \ Y_Dist.css \
Y_EPG.js \ Y_Dyn_Pages.yhtm \
Y_EPG_Plus.yhtm \ Y_EPG.js \
Y_Ext_Menue.yhtm \ Y_EPG_Plus.yhtm \
Y_Ext_Settings.yhtm \ Y_Ext_Menue.yhtm \
Y_Ext_Uninstall.yhtm \ Y_Ext_Settings.yhtm \
Y_Ext_Update.js \ Y_Ext_Uninstall.yhtm \
Y_Ext_Update.yhtm \ Y_Ext_Update.js \
Y_Ext_Update_refresh.yhtm \ Y_Ext_Update.yhtm \
Y_Filemgr.yhtm \ Y_Ext_Update_refresh.yhtm \
Y_Filemgr_Edit.yhtm \ Y_Filemgr.yhtm \
Y_Info_Help.yhtm \ Y_Filemgr_Edit.yhtm \
Y_Info_Menue.yhtm \ Y_Info_Help.yhtm \
Y_Live_EPG.yhtm \ Y_Info_Menue.yhtm \
Y_Live_EPG_Info.yhtm \ Y_Live_EPG.yhtm \
Y_Main.css \ Y_Live_EPG_Info.yhtm \
Y_Menue.yhtm \ Y_Main.css \
Y_Refresh.yhtm \ Y_Menue.yhtm \
Y_Settings_Backup.yhtm \ Y_Refresh.yhtm \
Y_Settings_Camds.yhtm \ Y_Settings_Backup.yhtm \
Y_Settings_Menue.yhtm \ Y_Settings_Camds.yhtm \
Y_Settings_automount.yhtm \ Y_Settings_Infoicons.yhtm \
Y_Settings_automount_list.yhtm \ Y_Settings_Menue.yhtm \
Y_Settings_buttons.yhtm \ Y_Settings_Plugins.yhtm \
Y_Settings_glcd.yhtm \ Y_Settings_Plugins_hide.yhtm \
Y_Settings_Infoicons.yhtm \ Y_Settings_automount.yhtm \
Y_Settings_lcd.yhtm \ Y_Settings_automount_list.yhtm \
Y_Settings_mount.yhtm \ Y_Settings_buttons.yhtm \
Y_Settings_mount_list.yhtm \ Y_Settings_glcd.yhtm \
Y_Settings_neutrino_forms.yhtm \ Y_Settings_lcd.yhtm \
Y_Settings_nhttpd.yhtm \ Y_Settings_mount.yhtm \
Y_Settings_personalize.yhtm \ Y_Settings_mount_list.yhtm \
Y_Settings_Plugins.yhtm \ Y_Settings_neutrino_forms.yhtm \
Y_Settings_Plugins_hide.yhtm \ Y_Settings_nhttpd.yhtm \
Y_Settings_umount_list.yhtm \ Y_Settings_personalize.yhtm \
Y_Settings_video_audio.yhtm \ Y_Settings_umount_list.yhtm \
Y_Settings_wol.yhtm \ Y_Settings_video_audio.yhtm \
Y_Settings_xmltv.yhtm \ Y_Settings_wol.yhtm \
Y_Settings_yWeb.yhtm \ Y_Settings_xmltv.yhtm \
Y_Settings_zapit.yhtm \ Y_Settings_yWeb.yhtm \
Y_StreamInfo.yhtm \ Y_Settings_zapit.yhtm \
Y_Timer_Edit.yhtm \ Y_StreamInfo.yhtm \
Y_Timer_List.yhtm \ Y_Timer_Edit.yhtm \
Y_Tools_Boxcontrol.yhtm \ Y_Timer_List.yhtm \
Y_Tools_Check_Install.yhtm \ Y_Tools_Boxcontrol.yhtm \
Y_Tools_Cmd.yhtm \ Y_Tools_Check_Install.yhtm \
Y_Tools_Info_Menue.yhtm \ Y_Tools_Cmd.yhtm \
Y_Tools_Installer.yhtm \ Y_Tools_Info_Menue.yhtm \
Y_Tools_Menue.yhtm \ Y_Tools_Installer.yhtm \
Y_Tools_m3uConvert.yhtm \ Y_Tools_Menue.yhtm \
Y_Tools_m3uConvert_help.yhtm \ Y_Tools_NetFS.yhtm \
Y_Tools_NetFS.yhtm \ Y_Tools_NetFS_edit.yhtm \
Y_Tools_NetFS_edit.yhtm \ Y_Tools_NetFS_init.yhtm \
Y_Tools_NetFS_init.yhtm \ Y_Tools_Rcsim.yhtm \
Y_Tools_Rcsim.yhtm \ Y_Tools_Screenshot.yhtm \
Y_Tools_Screenshot.yhtm \ Y_Tools_Screenshot_GraphLCD.yhtm \
Y_Tools_Screenshot_GraphLCD.yhtm \ Y_Tools_Screenshot_LCD4Linux.yhtm \
Y_Tools_Screenshot_LCD4Linux.yhtm \ Y_Tools_m3uConvert.yhtm \
Y_User.css \ Y_Tools_m3uConvert_help.yhtm \
Y_Version.txt \ Y_User.css \
Y_Wait.yhtm \ Y_Version.txt \
Y_yWeb.js Y_Wait.yhtm \
Y_yWeb.js
install-data-hook: install-data-hook:
@# Badass hack, I know. If anyone knows a better way -- please send patch! @# 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|%(HOSTED_HTTPDDIR)|$(HOSTED_HTTPDDIR)|g' \
-e 's|%(FLAGDIR)|$(FLAGDIR)|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 cp $(DESTDIR)$(PRIVATE_HTTPDDIR)/styles/Y_Dist-NI_dark.css $(DESTDIR)$(PRIVATE_HTTPDDIR)/Y_Dist.css

2
data/y-web/Y_Blocks.txt
View File

@@ -483,7 +483,7 @@ start-block~frame_live_epg
</html> </html>
end-block~frame_live_epg end-block~frame_live_epg
# ------- NI NetFS # ------- NetFS
start-block~netfs_local_dir 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=}=} {=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 end-block~netfs_local_dir

3
data/y-web/Y_Menue.yhtm
View File

@@ -96,7 +96,7 @@ function vlc() {
title="{=L:main.tools_desc=}">{=L:main.tools=}</a></li> title="{=L:main.tools_desc=}">{=L:main.tools=}</a></li>
<li><a target="base" href="Y_Dyn_Pages.yhtm?page=frame_settings" <li><a target="base" href="Y_Dyn_Pages.yhtm?page=frame_settings"
title="{=L:main.settings_desc=}">{=L:main.settings=}</a></li> title="{=L:main.settings_desc=}">{=L:main.settings=}</a></li>
<!-- unused <!--
<li><a target="base" href="Y_Dyn_Pages.yhtm?page=frame_ext" <li><a target="base" href="Y_Dyn_Pages.yhtm?page=frame_ext"
title="{=L:main.extensions_desc=}">{=L:main.extensions=}</a></li> title="{=L:main.extensions_desc=}">{=L:main.extensions=}</a></li>
--> -->
@@ -114,7 +114,6 @@ function vlc() {
<td align="right"> <td align="right">
<span id="state" style="color : red;font-family: Courier New, Courier, monospace;">&nbsp;</span> <span id="state" style="color : red;font-family: Courier New, Courier, monospace;">&nbsp;</span>
<span id="box_name" {=if-empty:{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_color=}~~style="color : #{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_color=};"=}> <span id="box_name" {=if-empty:{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_color=}~~style="color : #{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_color=};"=}>
<!-- //NI -->
{=if-equal:{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_name=}~${HOSTNAME}~{=script:Y_Tools get_hostname=}~{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_name=}=}</span> {=if-equal:{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_name=}~${HOSTNAME}~{=script:Y_Tools get_hostname=}~{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_name=}=}</span>
<span id="clock">00:00</span> <span id="clock">00:00</span>
</td> </td>

3
data/y-web/Y_Settings_yWeb.yhtm
View File

@@ -53,7 +53,6 @@ function do_init(){
} }
document.f.start_page.selectedIndex = sel; document.f.start_page.selectedIndex = sel;
style_old = "{=ini-get:%(CONFIGDIR)/yWeb.conf;style~cache=}"; style_old = "{=ini-get:%(CONFIGDIR)/yWeb.conf;style~cache=}";
//NI
if ("{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_name=}" == "${HOSTNAME}") { if ("{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_name=}" == "${HOSTNAME}") {
document.f.hostname.checked = true; document.f.hostname.checked = true;
document.f.yweb_box_name.value = "${HOSTNAME}"; document.f.yweb_box_name.value = "${HOSTNAME}";
@@ -61,7 +60,6 @@ function do_init(){
document.f.yweb_box_name.style.color='#aaaaaa' document.f.yweb_box_name.style.color='#aaaaaa'
} }
} }
//NI
function do_switch_hostname() function do_switch_hostname()
{ {
if(document.f.hostname.checked == true) if(document.f.hostname.checked == true)
@@ -127,7 +125,6 @@ select {
<td>{=L:set.yweb.box_tag=}</td> <td>{=L:set.yweb.box_tag=}</td>
<td colspan="3"><input type="text" name="yweb_box_name" size="17" value="{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_name=}" <td colspan="3"><input type="text" name="yweb_box_name" size="17" value="{=ini-get:%(CONFIGDIR)/yWeb.conf;yweb_box_name=}"
title="{=L:set.yweb.box_tag_desc=}"/> title="{=L:set.yweb.box_tag_desc=}"/>
<!-- //NI -->
<input type="checkbox" name="hostname" value="Hostname" onclick="do_switch_hostname()"/> Hostname <input type="checkbox" name="hostname" value="Hostname" onclick="do_switch_hostname()"/> Hostname
</td> </td>
</tr> </tr>

4
data/y-web/Y_Tools_Menue.yhtm
View File

@@ -23,7 +23,7 @@ function init(){
<div class="y_menu_sec_section">{=L:main.tools=}</div> <div class="y_menu_sec_section">{=L:main.tools=}</div>
<div class="y_menu_sec"> <div class="y_menu_sec">
<ul id="secmenu_tools_general"> <ul id="secmenu_tools_general">
{=comment:NI - disable automounter~ {=comment:disable automounter~
<li> <li>
{=if-empty:{=var-get:automount=}~ {=if-empty:{=var-get:automount=}~
<a href="javascript:void(0)" class="disabled" title="{=L:tools.not_installed=}">{=L:tools.automount=}</a> <a href="javascript:void(0)" class="disabled" title="{=L:tools.not_installed=}">{=L:tools.automount=}</a>
@@ -101,7 +101,7 @@ function init(){
<li> <li>
<a target="work" href="Y_Tools_Check_Install.yhtm">{=L:tools.check_install=}</a> <a target="work" href="Y_Tools_Check_Install.yhtm">{=L:tools.check_install=}</a>
</li> </li>
{=comment:NI - disable yInstaller~ {=comment:disable yInstaller~
<li> <li>
{=var-set:m_link_href=Y_Tools_Installer.yhtm=} {=var-set:m_link_href=Y_Tools_Installer.yhtm=}
{=var-set:m_link_desc==} {=var-set:m_link_desc==}

2
data/y-web/Y_Version.txt
View File

@@ -1,3 +1,3 @@
version=3.0.61 version=3.1.0
date=09.03.2023 date=09.03.2023
info=NI-Neutrino-Webinterface info=NI-Neutrino-Webinterface

16
data/y-web/images/Makefile.am
View File

@@ -8,7 +8,9 @@ images_DATA = \
arrowright.png \ arrowright.png \
arrowup.png \ arrowup.png \
blank.png \ blank.png \
cancel.png \
check_green.png \ check_green.png \
colored_bar.png \
comment.png \ comment.png \
cross.png \ cross.png \
elist.png \ elist.png \
@@ -32,6 +34,10 @@ images_DATA = \
rename.gif \ rename.gif \
save.png \ save.png \
saveall.png \ saveall.png \
server_add.png \
server_delete.png \
server_edit.png \
server_link.png \
snapshot.png \ snapshot.png \
stream.png \ stream.png \
streaminfo.png \ streaminfo.png \
@@ -87,15 +93,6 @@ images_DATA += \
ext_plugin.png \ ext_plugin.png \
ext_script.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 # remote controls
imagesrcdir = $(PRIVATE_HTTPDDIR)/images/rc imagesrcdir = $(PRIVATE_HTTPDDIR)/images/rc
@@ -122,4 +119,3 @@ imagesrc_DATA += \
rc/rc_wwio_bre2ze4k.png \ rc/rc_wwio_bre2ze4k.png \
rc/rc_zgemma_h7.png rc/rc_zgemma_h7.png
endif endif

4
data/y-web/languages/Makefile.am
View File

@@ -1,3 +1,5 @@
installdir = $(PRIVATE_HTTPDDIR)/languages installdir = $(PRIVATE_HTTPDDIR)/languages
install_DATA = Deutsch English install_DATA = \
Deutsch \
English

8
data/y-web/styles/Makefile.am
View File

@@ -1,6 +1,6 @@
installdir = $(PRIVATE_HTTPDDIR)/styles installdir = $(PRIVATE_HTTPDDIR)/styles
install_DATA = Y_Dist-Tuxbox.css Y_Dist-GreyBlue.css install_DATA = \
Y_Dist-GreyBlue.css \
# NI-yWeb Y_Dist-NI_dark.css \
install_DATA += Y_Dist-NI_dark.css Y_Dist-Tuxbox.css \