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

yWeb: integrate NI-yWeb into existing structure

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a037e906b
Author: vanhofen <vanhofen@gmx.de>
Date: 2022-09-06 (Tue, 06 Sep 2022)

Origin message was:
------------------
- yWeb: integrate NI-yWeb into existing structure

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2022-09-06 23:53:53 +02:00
parent 6bbed97fc4
commit 38584d90e4
25 changed files with 75 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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 \

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

@@ -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

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

@@ -169,6 +169,9 @@ function epg_plus_popup() {
<li>
<a target="work" href="Y_Timer_List.yhtm">{=L:live.timer=}</a>
</li>
<li>
<a target="work" href="Y_NI_PZapit-control.yhtm">{=L:ni.pzapit-control=}</a>
</li>
</ul>
</div>
</div>

5
data/y-web/Y_Info_Menue.yhtm
View File

@@ -17,7 +17,10 @@ function init(){
<div class="y_menu_sec">
<ul id="secmenu_info">
<li>
<a target="work" href="Y_About.yhtm">{=L:info.About=}</a>
<a target="work" href="Y_NI_About.yhtm">{=L:info.About=} NI-Image</a>
</li>
<li>
<a target="work" href="Y_About.yhtm">{=L:info.About=} yWeb</a>
</li>
<li>
<a target="work" href="Y_Info_Help.yhtm">{=L:info.help=}</a>

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

@@ -104,9 +104,6 @@ function vlc() {
-->
<li><a target="base" href="Y_Dyn_Pages.yhtm?page=frame_info"
title="{=L:main.info_desc=}">{=L:main.info=}</a></li>
<!-- //NI -->
<li><a target="base" href="Y_NI_Dyn_Pages.yhtm?page=frame_NI"
title="{=L:main.ni_desc=}">{=L:main.ni=}</a></li>
</ul>
</td>
<td>

11
data/y-web/Y_NI.css
View File

@@ -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;

7
data/y-web/Y_NI_About.yhtm
View File

@@ -41,19 +41,16 @@ jQuery(document).ready(function(){
<body>
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=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=}
</div></div>
<div class="work_box_body">
<table border="0" cellpadding="2" cellspacing="4" width="100%">
<tr>
<td valign="bottom" width="22%">
<td valign="bottom" colspan="4">
<a href="http://{=ini-get:/.version;homepage=}" target="_blank">
<img border="0" src="%(ICONSDIR)/hint_imagelogo.png" alt=""/>
</a>
</td>
<td valign="bottom" colspan="3">
<span class="ni_logo">NI-Imageinfo</span>
</td>
</tr>
<tr>
<td colspan="4">

12
data/y-web/Y_NI_Blocks.txt
View File

@@ -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
<div>{=var-get:menu=}</div>
end-block~NI_work_menu
# ------- Lay-NI-HEAD
start-block~head
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"

4
data/y-web/Y_NI_Camd-control.yhtm
View File

@@ -31,7 +31,7 @@ input[type="button"], .tools select {
{=var-set:wait_text={=L:ni.camd-control.title=}<br/>=}{=include-block:Y_Blocks.txt;snip_wait=}
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=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=}
</div></div>
<div class="work_box_body">
<form action="">
@@ -597,7 +597,7 @@ input[type="button"], .tools select {
</div>
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=var-set:menu={=L:answer=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=}</div></div>
{=var-set:menu={=L:answer=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
<div class="work_box_body">
<div id="out"></div>
</div>

1
data/y-web/Y_NI_Dyn_Pages.yhtm
View File

@@ -1 +0,0 @@
{=include-block:Y_NI_Blocks.txt;{=page=}=}

6
data/y-web/Y_NI_Infoicons-control.yhtm
View File

@@ -22,7 +22,7 @@ function do_submit()
{=var-set:wait_text={=L:ni.infoicons-control.title=}<br/>=}{=include-block:Y_Blocks.txt;snip_wait=}
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=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=}
</div></div>
<div class="work_box_body">
<table class="y_invisible_table" cellpadding="5" width="100%">
@@ -45,7 +45,7 @@ function do_submit()
</div>
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=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=}
</div></div>
<div class="work_box_body">
@@ -258,7 +258,7 @@ function do_submit()
</div>
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=var-set:menu={=L:answer=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=}</div></div>
{=var-set:menu={=L:answer=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
<div class="work_box_body">
<div id="out"></div>
</div>

38
data/y-web/Y_NI_Menue.yhtm
View File

@@ -1,38 +0,0 @@
{=include-block:Y_NI_Blocks.txt;head=}
<script type="text/javascript" src="/Y_yweb.js"></script>
</head>
<body>
<div class="y_menu_sec_box">
<div class="y_menu_sec_box_head"><h2>{=L:main.ni=}</h2></div>
<div class="y_menu_sec_box_body">
<div class="y_menu_sec_section">NI-{=L:bc.menue.control=}</div>
<div class="y_menu_sec">
<ul>
<li><a target="work" href="Y_NI_Infoicons-control.yhtm">{=L:ni.infoicons-control=}</a></li>
<li>{=L:ni.netfs-control=}</li>
<ul style="margin-left: 1em">
<li><a target="work" href="Y_NI_NetFS-init.yhtm?mount_type=0&mount_type_s=fstab">/var/etc/fstab</a></li>
<li><a target="work" href="Y_NI_NetFS-init.yhtm?mount_type=1&mount_type_s=automount">/var/etc/auto.net</a></li>
</ul>
<li><a target="work" href="Y_NI_Plugin-control.yhtm">{=L:ni.plugin-control=}</a></li>
<li><a target="work" href="Y_NI_Camd-control.yhtm">{=L:ni.camd-control=}</a></li>
<li><a target="work" href="Y_NI_m3uConvert.yhtm">m3uConvert</a></li>
</ul>
</div>
<div class="y_menu_sec_section">Box-{=L:bc.menue.control=}</div>
<div class="y_menu_sec">
<ul>
<li><a target="work" href="Y_NI_PZapit-control.yhtm">{=L:ni.pzapit-control=}</a></li>
</ul>
</div>
<div class="y_menu_sec_section">{=L:main.info=}</div>
<div class="y_menu_sec">
<ul>
<li><a target="work" href="Y_NI_About.yhtm">{=L:info.About=} NI-Image</a></li>
</ul>
</div>
</div>
</div>
</body>
</html>

4
data/y-web/Y_NI_NetFS-control.yhtm
View File

@@ -60,7 +60,7 @@ function do_submit()
{=var-set:wait_text={=L:ni.netfs-control.title=}<br/>=}{=include-block:Y_Blocks.txt;snip_wait=}
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=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=}
</div></div>
<div class="work_box_body">
<table class="y_invisible_table" cellpadding="5">
@@ -108,7 +108,7 @@ function do_submit()
</div>
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=var-set:menu={=L:answer=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=}</div></div>
{=var-set:menu={=L:answer=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
<div class="work_box_body">
<div id="out"></div>
</div>

2
data/y-web/Y_NI_NetFS-edit.yhtm
View File

@@ -26,7 +26,7 @@ function do_submit()
{=var-set:wait_text={=L:ni.netfs-control.title=}<br/>=}{=include-block:Y_Blocks.txt;snip_wait=}
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=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=}
</div></div>
<div class="work_box_body">
<form name="f" action="/y/cgi">

5
data/y-web/Y_NI_NetFS-init.yhtm
View File

@@ -10,10 +10,11 @@ jQuery(document).ready(function(){
<body>
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=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=}
</div></div>
<div class="work_box_body">
<img src="/images/wait.gif" class="status" title="wait"> Please wait ... {=func:netfs_read_config {=mount_type=}=}
<img src="/images/wait.gif" class="status" title="wait"> Please wait ...
{=func:netfs_read_config {=mount_type=}=}
</div>
</div>
</body>

4
data/y-web/Y_NI_PZapit-control.yhtm
View File

@@ -3,7 +3,7 @@
<body>
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=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=}
</div></div>
<div class="work_box_body">
<form action="">
@@ -40,7 +40,7 @@
</div>
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=var-set:menu={=L:answer=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=}</div></div>
{=var-set:menu={=L:answer=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
<div class="work_box_body">
<div id="out"></div>
</div>

4
data/y-web/Y_NI_Plugin-control.yhtm
View File

@@ -14,7 +14,7 @@
{=var-set:wait_text={=L:ni.plugin-control.title=}<br/>=}{=include-block:Y_Blocks.txt;snip_wait=}
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=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=}
</div></div>
<div class="work_box_body">
<form action="">
@@ -356,7 +356,7 @@
</div>
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=var-set:menu={=L:answer=}=}{=include-block:Y_NI_Blocks.txt;NI_work_menu=}</div></div>
{=var-set:menu={=L:answer=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
<div class="work_box_body">
<div id="out"></div>
</div>

2
data/y-web/Y_NI_blank.yhtm
View File

@@ -3,7 +3,7 @@
<body>
<div class="work_box">
<div class="work_box_head"><div class="work_box_head_h2">
{=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=}
</div></div>
<div class="work_box_body">
<img id="startjpg" src="%(ICONSDIR)/start.jpg" alt="" />

19
data/y-web/Y_Settings_Menue.yhtm
View File

@@ -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');
}
</script>
@@ -125,10 +126,28 @@ function init(){
-->
</ul>
</div>
<div class="y_menu_sec_section">NI-{=L:main.settings=}</div>
<div class="y_menu_sec">
<ul id="secmenu_settings">
<li>
{=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=}
</li>
<li>
{=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=}
</li>
</ul>
</div>
<div class="y_menu_sec_section">{=L:plugins=}</div>
<div class="y_menu_sec">
<ul id="secmenu_plugins">
<li>
{=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=}
</li>
</ul>
</div>

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

@@ -23,6 +23,7 @@ function init(){
<div class="y_menu_sec_section">{=L:main.tools=}</div>
<div class="y_menu_sec">
<ul id="secmenu_tools">
{=comment:NI - disable automounter~
<li>
{=if-empty:{=var-get:automount=}~
<a href="javascript:void(0)" class="disabled" title="{=L:tools.not_installed=}">{=L:tools.automount=}</a>
@@ -33,12 +34,28 @@ function init(){
{=include-block:Y_Blocks.txt;management_link=}
=}
</li>
=}
<li>
{=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=}
</li>
<li>{=L:ni.netfs-control=}</li>
<ul style="margin-left: 1em">
<li>
{=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=}
</li>
<li>
{=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=}
</li>
</ul>
<li>
{=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=}
=}
</li>
<li>
{=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=}
</li>
</ul>
</div>
<div class="y_menu_sec_section">{=L:tools.expert=}</div>
@@ -78,7 +101,7 @@ function init(){
<li>
<a target="work" href="Y_Tools_Check_Install.yhtm">{=L:tools.check_install=}</a>
</li>
{=comment:NI - disable yinstaller~
{=comment:NI - disable yInstaller~
<li>
{=var-set:m_link_href=Y_Tools_Installer.yhtm=}
{=var-set:m_link_desc==}

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

@@ -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

13
data/y-web/Y_blank.htm
View File

@@ -1,13 +0,0 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>yWeb</title>
<link rel="stylesheet" type="text/css" href="/Y_Main.css" />
<link rel="stylesheet" type="text/css" href="/Y_Dist.css" />
<link rel="stylesheet" type="text/css" href="/Y_User.css" />
</head>
<body>
</body>
</html>

3
data/y-web/languages/Deutsch
View File

@@ -423,7 +423,7 @@ live.timer-sync.status=Status
# ===== INFO
info.help=Hilfe
info.About=&uuml;ber
info.About=&Uuml;ber
info.check_for_updates=Auf Updates pr&uuml;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

1
data/y-web/languages/English
View File

@@ -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

3
data/y-web/styles/Y_Dist-NI_dark.css
View File

@@ -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;
}