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

yWeb: integrate content of Y_NI_Blocks.txt into Y_Blocks.txt

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

Origin message was:
------------------
- yWeb: integrate content of Y_NI_Blocks.txt into Y_Blocks.txt

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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2022-09-09 22:43:15 +02:00
parent b6422d069d
commit 600943b3f9
20 changed files with 111 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,6 @@ install_DATA += Y_NIlib.js \
Y_NI.css \ Y_NI.css \
Y_NI_About.yhtm \ Y_NI_About.yhtm \
Y_NI_blank.yhtm \ Y_NI_blank.yhtm \
Y_NI_Blocks.txt \
Y_NI_Camd-control.yhtm \ Y_NI_Camd-control.yhtm \
Y_NI_Infoicons-control.yhtm \ Y_NI_Infoicons-control.yhtm \
Y_NI_m3uConInfo.yhtm \ Y_NI_m3uConInfo.yhtm \

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

@@ -287,6 +287,39 @@ start-block~frame_iso_head
<title>yWeb</title> <title>yWeb</title>
end-block~frame_iso_head end-block~frame_iso_head
# ------- Lay-HEAD NI
start-block~head_ni
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta name="author" content="NI-Team">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta http-equiv="cache-control" content="no-cache" />
<meta http-equiv="expires" content="Thu, 01 Jan 1970 00:00:00 GMT" />
<title>yWeb - NI</title>
<link rel="stylesheet" type="text/css" href="/Y_Main.css" />
<link rel="stylesheet" type="text/css" href="/Y_NI.css" />
<link rel="stylesheet" type="text/css" href="/Y_Dist.css" />
<link rel="stylesheet" type="text/css" href="/Y_User.css" />
<script type="text/javascript" src="/Y_Baselib.js"></script>
<script type="text/javascript" src="/prototype.js"></script>
<script type="text/javascript" src="/Y_NIlib.js"></script>
<script type="text/javascript">
//<![CDATA[
// Clear y-Cache in our pages
yhttpd_cache_clear('');
//]]>
</script>
<script type="text/javascript" src="/jquery/jquery.min.js"></script>
<script type="text/javascript" src="/jquery/jquery-ui.min.js"></script>
<script type="text/javascript">
//<![CDATA[
// Use jQuery via jQuery(...)
jQuery.noConflict();
//]]>
end-block~head_ni
# ------- nhttpd save Settings # ------- nhttpd save Settings
start-block~start_wizard_save_settings start-block~start_wizard_save_settings
{=ini-set:%(CONFIGDIR)/Y-Web.conf;start_page;{=start_page=}~open=} {=ini-set:%(CONFIGDIR)/Y-Web.conf;start_page;{=start_page=}~open=}
@@ -463,6 +496,43 @@ start-block~frame_live_epg
</html> </html>
end-block~frame_live_epg end-block~frame_live_epg
# ------- NI 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
start-block~netfs_is_mount
{=var-set:is_mount_{=var-get:nr=}={=script:Y_NI_Tools is_mount {=if-equal:{=mount_type=}~1~/mnt/autofs/~=}{=var-get:local_dir_{=var-get:nr=}=}=}=}
end-block~netfs_is_mount
start-block~netfs_table_row
<tr class="list">
<td>
<img src="/images/{=if-equal:{=var-get:is_mount_{=var-get:nr=}=}~true~check_green~x_red=}.png" class="status">
{=var-get:local_dir_{=var-get:nr=}=}
</td>
<td>
<a href="/Y_NI_NetFS-edit.yhtm?nr={=var-get:nr=}&mount_type={=mount_type=}&mount_type_s={=mount_type_s=}" title="{=L:ni.edit=}">
<img src="/images/modify.png">
</a>
{=if-equal:{=mount_type=}~0~
{=if-equal:{=var-get:is_mount_{=var-get:nr=}=}~false~
<a href="javascript:Y_NI_Tools('do_mount {=var-get:local_dir_{=var-get:nr=}=}', 5000);" title="{=L:ni.netfs-control.mount=}">
<img src="/images/server_add.png">
</a>
<img src="/images/blank.png">
~
<img src="/images/blank.png">
<a href="javascript:Y_NI_Tools('do_umount {=var-get:local_dir_{=var-get:nr=}=}', 5000);" title="{=L:ni.netfs-control.umount=}">
<img src="/images/server_delete.png">
</a>
=}
~
=}
</td>
</tr>
end-block~netfs_table_row
# ------- Remote control variables # ------- Remote control variables
start-block~rc_variables start-block~rc_variables
{=var-set:_fb_dbox_philips=2=} {=var-set:_fb_dbox_philips=2=}

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

@@ -1,4 +1,4 @@
{=include-block:Y_NI_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head_ni=}
<script type="text/javascript" src="/jquery/jquery.stickytableheaders.min.js"></script> <script type="text/javascript" src="/jquery/jquery.stickytableheaders.min.js"></script>
<script type="text/javascript" src="/Y_Baselib.js"></script> <script type="text/javascript" src="/Y_Baselib.js"></script>
<script type="text/javascript"> <script type="text/javascript">

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

@@ -1,4 +1,4 @@
{=include-block:Y_NI_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head_ni=}
{=var-set:_mtd_info_dev={=script:Y_NI_Tools get_mtd_info dev=}=} {=var-set:_mtd_info_dev={=script:Y_NI_Tools get_mtd_info dev=}=}
{=var-set:_mtd_info_name={=script:Y_NI_Tools get_mtd_info name=}=} {=var-set:_mtd_info_name={=script:Y_NI_Tools get_mtd_info name=}=}

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

@@ -1,75 +0,0 @@
# ------- Lay-NI-HEAD
start-block~head
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html>
<head>
<meta name="author" content="NI-Team">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<meta http-equiv="cache-control" content="no-cache" />
<meta http-equiv="expires" content="Thu, 01 Jan 1970 00:00:00 GMT" />
<title>yWeb - NI</title>
<link rel="stylesheet" type="text/css" href="/Y_Main.css" />
<link rel="stylesheet" type="text/css" href="/Y_NI.css" />
<link rel="stylesheet" type="text/css" href="/Y_Dist.css" />
<link rel="stylesheet" type="text/css" href="/Y_User.css" />
<script type="text/javascript" src="/Y_Baselib.js"></script>
<script type="text/javascript" src="/prototype.js"></script>
<script type="text/javascript" src="/Y_NIlib.js"></script>
<script type="text/javascript">
//<![CDATA[
// Clear y-Cache in our pages
yhttpd_cache_clear('');
//]]>
</script>
{=include-block:Y_NI_Blocks.txt;include_jquery=}
end-block~head
# ------- Lay-NI-HEAD
start-block~include_jquery
<script type="text/javascript" src="/jquery/jquery.min.js"></script>
<script type="text/javascript" src="/jquery/jquery-ui.min.js"></script>
<script type="text/javascript">
//<![CDATA[
// Use jQuery via jQuery(...)
jQuery.noConflict();
//]]>
</script>
end-block~include_jquery
# ------- NI 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
start-block~netfs_is_mount
{=var-set:is_mount_{=var-get:nr=}={=script:Y_NI_Tools is_mount {=if-equal:{=mount_type=}~1~/mnt/autofs/~=}{=var-get:local_dir_{=var-get:nr=}=}=}=}
end-block~netfs_is_mount
start-block~netfs_table_row
<tr class="list">
<td>
<img src="/images/{=if-equal:{=var-get:is_mount_{=var-get:nr=}=}~true~check_green~x_red=}.png" class="status">
{=var-get:local_dir_{=var-get:nr=}=}
</td>
<td>
<a href="/Y_NI_NetFS-edit.yhtm?nr={=var-get:nr=}&mount_type={=mount_type=}&mount_type_s={=mount_type_s=}" title="{=L:ni.edit=}">
<img src="/images/modify.png">
</a>
{=if-equal:{=mount_type=}~0~
{=if-equal:{=var-get:is_mount_{=var-get:nr=}=}~false~
<a href="javascript:Y_NI_Tools('do_mount {=var-get:local_dir_{=var-get:nr=}=}', 5000);" title="{=L:ni.netfs-control.mount=}">
<img src="/images/server_add.png">
</a>
<img src="/images/blank.png">
~
<img src="/images/blank.png">
<a href="javascript:Y_NI_Tools('do_umount {=var-get:local_dir_{=var-get:nr=}=}', 5000);" title="{=L:ni.netfs-control.umount=}">
<img src="/images/server_delete.png">
</a>
=}
~
=}
</td>
</tr>
end-block~netfs_table_row

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

@@ -20,7 +20,7 @@
{=var-set:cccamport={=script:Y_NI_Tools get_cccam_webif_port=}=} {=var-set:cccamport={=script:Y_NI_Tools get_cccam_webif_port=}=}
{=var-set:doscamport={=script:Y_NI_Tools get_doscam_webif_port=}=} {=var-set:doscamport={=script:Y_NI_Tools get_doscam_webif_port=}=}
{=include-block:Y_NI_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head_ni=}
<style type="text/css"> <style type="text/css">
input[type="button"], .tools select { input[type="button"], .tools select {
width: 100%; width: 100%;

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

@@ -7,7 +7,7 @@
{=var-set:icons_flag6={=ini-get:%(CONFIGDIR)/neutrino.conf;mode_icons_flag6~cache=}=} {=var-set:icons_flag6={=ini-get:%(CONFIGDIR)/neutrino.conf;mode_icons_flag6~cache=}=}
{=var-set:icons_flag7={=ini-get:%(CONFIGDIR)/neutrino.conf;mode_icons_flag7~cache=}=} {=var-set:icons_flag7={=ini-get:%(CONFIGDIR)/neutrino.conf;mode_icons_flag7~cache=}=}
{=var-set:icons_dir=%(ICONSDIR)=} {=var-set:icons_dir=%(ICONSDIR)=}
{=include-block:Y_NI_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head_ni=}
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
function do_submit() function do_submit()

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

@@ -1,22 +1,22 @@
{=var-set:nr=0=} {=include-block:Y_NI_Blocks.txt;netfs_local_dir=} {=var-set:nr=0=} {=include-block:Y_Blocks.txt;netfs_local_dir=}
{=var-set:nr=1=} {=include-block:Y_NI_Blocks.txt;netfs_local_dir=} {=var-set:nr=1=} {=include-block:Y_Blocks.txt;netfs_local_dir=}
{=var-set:nr=2=} {=include-block:Y_NI_Blocks.txt;netfs_local_dir=} {=var-set:nr=2=} {=include-block:Y_Blocks.txt;netfs_local_dir=}
{=var-set:nr=3=} {=include-block:Y_NI_Blocks.txt;netfs_local_dir=} {=var-set:nr=3=} {=include-block:Y_Blocks.txt;netfs_local_dir=}
{=var-set:nr=4=} {=include-block:Y_NI_Blocks.txt;netfs_local_dir=} {=var-set:nr=4=} {=include-block:Y_Blocks.txt;netfs_local_dir=}
{=var-set:nr=5=} {=include-block:Y_NI_Blocks.txt;netfs_local_dir=} {=var-set:nr=5=} {=include-block:Y_Blocks.txt;netfs_local_dir=}
{=var-set:nr=6=} {=include-block:Y_NI_Blocks.txt;netfs_local_dir=} {=var-set:nr=6=} {=include-block:Y_Blocks.txt;netfs_local_dir=}
{=var-set:nr=7=} {=include-block:Y_NI_Blocks.txt;netfs_local_dir=} {=var-set:nr=7=} {=include-block:Y_Blocks.txt;netfs_local_dir=}
{=var-set:nr=0=} {=include-block:Y_NI_Blocks.txt;netfs_is_mount=} {=var-set:nr=0=} {=include-block:Y_Blocks.txt;netfs_is_mount=}
{=var-set:nr=1=} {=include-block:Y_NI_Blocks.txt;netfs_is_mount=} {=var-set:nr=1=} {=include-block:Y_Blocks.txt;netfs_is_mount=}
{=var-set:nr=2=} {=include-block:Y_NI_Blocks.txt;netfs_is_mount=} {=var-set:nr=2=} {=include-block:Y_Blocks.txt;netfs_is_mount=}
{=var-set:nr=3=} {=include-block:Y_NI_Blocks.txt;netfs_is_mount=} {=var-set:nr=3=} {=include-block:Y_Blocks.txt;netfs_is_mount=}
{=var-set:nr=4=} {=include-block:Y_NI_Blocks.txt;netfs_is_mount=} {=var-set:nr=4=} {=include-block:Y_Blocks.txt;netfs_is_mount=}
{=var-set:nr=5=} {=include-block:Y_NI_Blocks.txt;netfs_is_mount=} {=var-set:nr=5=} {=include-block:Y_Blocks.txt;netfs_is_mount=}
{=var-set:nr=6=} {=include-block:Y_NI_Blocks.txt;netfs_is_mount=} {=var-set:nr=6=} {=include-block:Y_Blocks.txt;netfs_is_mount=}
{=var-set:nr=7=} {=include-block:Y_NI_Blocks.txt;netfs_is_mount=} {=var-set:nr=7=} {=include-block:Y_Blocks.txt;netfs_is_mount=}
{=include-block:Y_NI_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head_ni=}
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
function edit_popup() function edit_popup()
@@ -89,14 +89,14 @@ function do_submit()
=} =}
</td> </td>
</tr> </tr>
{=var-set:nr=0=} {=include-block:Y_NI_Blocks.txt;netfs_table_row=} {=var-set:nr=0=} {=include-block:Y_Blocks.txt;netfs_table_row=}
{=var-set:nr=1=} {=include-block:Y_NI_Blocks.txt;netfs_table_row=} {=var-set:nr=1=} {=include-block:Y_Blocks.txt;netfs_table_row=}
{=var-set:nr=2=} {=include-block:Y_NI_Blocks.txt;netfs_table_row=} {=var-set:nr=2=} {=include-block:Y_Blocks.txt;netfs_table_row=}
{=var-set:nr=3=} {=include-block:Y_NI_Blocks.txt;netfs_table_row=} {=var-set:nr=3=} {=include-block:Y_Blocks.txt;netfs_table_row=}
{=var-set:nr=4=} {=include-block:Y_NI_Blocks.txt;netfs_table_row=} {=var-set:nr=4=} {=include-block:Y_Blocks.txt;netfs_table_row=}
{=var-set:nr=5=} {=include-block:Y_NI_Blocks.txt;netfs_table_row=} {=var-set:nr=5=} {=include-block:Y_Blocks.txt;netfs_table_row=}
{=var-set:nr=6=} {=include-block:Y_NI_Blocks.txt;netfs_table_row=} {=var-set:nr=6=} {=include-block:Y_Blocks.txt;netfs_table_row=}
{=var-set:nr=7=} {=include-block:Y_NI_Blocks.txt;netfs_table_row=} {=var-set:nr=7=} {=include-block:Y_Blocks.txt;netfs_table_row=}
</table> </table>
<br /> <br />
<button type="button" ytype="save" title="{=L:ni.save=}: {=L:ni.netfs-{=mount_type=}=}" onclick="$('out').update(''); goUrl('/y/cgi?execute=func:netfs_write_config {=mount_type=}')">{=L:ni.save=}</button> <button type="button" ytype="save" title="{=L:ni.save=}: {=L:ni.netfs-{=mount_type=}=}" onclick="$('out').update(''); goUrl('/y/cgi?execute=func:netfs_write_config {=mount_type=}')">{=L:ni.save=}</button>

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

@@ -1,4 +1,4 @@
{=include-block:Y_NI_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head_ni=}
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
function form_init() function form_init()

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

@@ -1,4 +1,4 @@
{=include-block:Y_NI_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head_ni=}
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
jQuery(document).ready(function(){ jQuery(document).ready(function(){

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

@@ -1,4 +1,4 @@
{=include-block:Y_NI_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head_ni=}
</head> </head>
<body> <body>
<div class="work_box"> <div class="work_box">

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

@@ -8,7 +8,7 @@
{=var-set:r_xupnpd={=script:Y_NI_Tools is_running xupnpd=}=} {=var-set:r_xupnpd={=script:Y_NI_Tools is_running xupnpd=}=}
{=var-set:xupnpdport={=script:Y_NI_Tools get_xupnpd_webif_port=}=} {=var-set:xupnpdport={=script:Y_NI_Tools get_xupnpd_webif_port=}=}
{=include-block:Y_NI_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head_ni=}
</head> </head>
<body onload='goUrl("/control/reloadplugins");'> <body onload='goUrl("/control/reloadplugins");'>
{=var-set:wait_text={=L:ni.plugin-control.title=}<br/>=}{=include-block:Y_Blocks.txt;snip_wait=} {=var-set:wait_text={=L:ni.plugin-control.title=}<br/>=}{=include-block:Y_Blocks.txt;snip_wait=}

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

@@ -1,4 +1,4 @@
{=include-block:Y_NI_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head_ni=}
</head> </head>
<body> <body>
<div class="work_box"> <div class="work_box">

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

@@ -1,4 +1,4 @@
{=include-block:Y_NI_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head_ni=}
<style type="text/css"> <style type="text/css">
#InputOutputField #InputOutputField
{ {

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

@@ -1,4 +1,4 @@
{=include-block:Y_NI_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head_ni=}
<style type="text/css"> <style type="text/css">
#InputOutputField #InputOutputField
{ {

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

@@ -1,7 +1,7 @@
{=var-set:grab={=find-exec:grab=}=} {=var-set:grab={=find-exec:grab=}=}
{=var-set:fbshot={=find-exec:fbshot=}=} {=var-set:fbshot={=find-exec:fbshot=}=}
{=include-block:Y_NI_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head_ni=}
<script type="text/javascript" src="/Y_Baselib.js"></script> <script type="text/javascript" src="/Y_Baselib.js"></script>
<script type="text/javascript" src="/prototype.js"></script> <script type="text/javascript" src="/prototype.js"></script>
<script type="text/javascript"> <script type="text/javascript">

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

@@ -1,5 +1,5 @@
{=include-block:Y_NI_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head_ni=}
<script type="text/javascript" src="/Y_Baselib.js"></script> <script type="text/javascript" src="/Y_Baselib.js"></script>
<script type="text/javascript" src="/prototype.js"></script> <script type="text/javascript" src="/prototype.js"></script>
<script type="text/javascript"> <script type="text/javascript">

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

@@ -1,3 +1,3 @@
version=2.9.1.04 version=2.9.1.05
date=06.09.2022 date=06.09.2022
info=NI-Neutrino info=NI-Neutrino

2
data/y-web/info/yinfo.yhtm
View File

@@ -16,7 +16,7 @@
{=var-set:tuner={=script:Y_NI_Tools getline /tmp/lcd/tuner=}=} {=var-set:tuner={=script:Y_NI_Tools getline /tmp/lcd/tuner=}=}
{=var-set:volume={=script:Y_NI_Tools getline /tmp/lcd/volume=}=} {=var-set:volume={=script:Y_NI_Tools getline /tmp/lcd/volume=}=}
{=include-block:Y_NI_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head_ni=}
<meta http-equiv="refresh" content="15; URL=yinfo.yhtm"> <meta http-equiv="refresh" content="15; URL=yinfo.yhtm">
<link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png"> <link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png">

2
data/y-web/lcd4linux/ylcd4linux.yhtm
View File

@@ -1,6 +1,6 @@
{=var-set:lcd4linux_png=/tmp/lcd4linux.png=} {=var-set:lcd4linux_png=/tmp/lcd4linux.png=}
{=include-block:Y_NI_Blocks.txt;head=} {=include-block:Y_Blocks.txt;head_ni=}
<meta http-equiv="refresh" content="15; URL=ylcd4linux.yhtm"> <meta http-equiv="refresh" content="15; URL=ylcd4linux.yhtm">
<link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png"> <link rel="apple-touch-icon" sizes="180x180" href="/favicon/apple-touch-icon.png">