yWeb: rework for basic functionality

Based on the last changes by svenhoefer

configure.ac

@@ -452,7 +452,11 @@ data/weather/Makefile
 data/webradio/Makefile
 data/webtv/Makefile
 data/y-web/Makefile
+data/y-web/favicon/Makefile
 data/y-web/images/Makefile
+data/y-web/info/Makefile
+data/y-web/jquery/Makefile
+data/y-web/lcd4linux/Makefile
 data/y-web/languages/Makefile
 data/y-web/scripts/Makefile
 data/y-web/styles/Makefile

data/y-web/Makefile.am

@@ -1,18 +1,21 @@
 SUBDIRS = images scripts languages styles
 
+# yWeb
+SUBDIRS += favicon info jquery lcd4linux
+
 installdir = $(PRIVATE_HTTPDDIR)
 
 install_DATA =	channels.js \
-		extentions.txt \
+		extensions.txt \
 		favicon.ico \
 		index.html \
 		prototype.js \
 		robots.txt \
-		lcd4linux.html \
 		Y_About.yhtm \
 		Y_Baselib.js \
-		Y_blank.htm \
+		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 \
@@ -37,7 +40,6 @@ install_DATA =	channels.js \
 		Y_Live_EPG.yhtm \
 		Y_Main.css \
 		Y_Menue.yhtm \
-		Y_neutrino_Blocks.txt \
 		Y_Refresh.yhtm \
 		Y_Settings_automount_liste.yhtm \
 		Y_Settings_automount.yhtm \
@@ -63,13 +65,13 @@ install_DATA =	channels.js \
 		Y_Tools_Boxcontrol.yhtm \
 		Y_Tools_Check_Install.yhtm \
 		Y_Tools_Cmd.yhtm \
-		Y_Tools_Glcd_Screenshot.yhtm \
 		Y_Tools_Info_Menue.yhtm \
 		Y_Tools_Installer.yhtm \
 		Y_Tools_Menue.yhtm \
 		Y_Tools_Rcsim.yhtm \
 		Y_Tools_Screenshot.yhtm  \
-		Y_Tools_tvshot.yhtm \
+		Y_Tools_Screenshot_GraphLCD.yhtm \
+		Y_Tools_Screenshot_LCD4Linux.yhtm  \
 		Y_User.css \
 		Y_Version.txt \
 		Y_Wait.yhtm \
@@ -78,9 +80,23 @@ install_DATA =	channels.js \
 # file manager
 install_DATA +=	accordion.js \
 		effects.js \
+		Y_Blocks_Filemgr.txt \
 		Y_Filemgr.yhtm \
-		Y_Filemgr_Edit.yhtm \
+		Y_Filemgr_Edit.yhtm
-		Y_Filemgr_blocks.txt
+
+# v3-files
+install_DATA += Y_v3lib.js \
+		Y_v3.css 
+
+# tools		
+install_DATA += \
+		Y_m3uConInfo.yhtm \
+		Y_m3uConvert.yhtm \
+		Y_NetFS-control.yhtm \
+		Y_NetFS-edit.yhtm \
+		Y_NetFS-init.yhtm \
+		Y_Plugin-control.yhtm \
+		Y_PZapit-control.yhtm
 
 install-data-hook:
 	@# Badass hack, I know. If anyone knows a better way -- please send patch!
@@ -96,9 +112,12 @@ install-data-hook:
 			-e 's|%(FONTDIR_VAR)|$(FONTDIR_VAR)|g' \
 			-e 's|%(LIBDIR)|$(LIBDIR)|g' \
 			-e 's|%(GAMESDIR)|$(GAMESDIR)|g' \
+			-e 's|%(ICONSDIR)|$(ICONSDIR)|g' \
 			-e 's|%(ICONSDIR_VAR)|$(ICONSDIR_VAR)|g' \
 			-e 's|%(LOCALEDIR)|$(LOCALEDIR)|g' \
 			-e 's|%(LOCALEDIR_VAR)|$(LOCALEDIR_VAR)|g' \
+			-e 's|%(PLUGINDIR)|$(PLUGINDIR)|g' \
+			-e 's|%(PLUGINDIR_MNT)|$(PLUGINDIR_MNT)|g' \
 			-e 's|%(PLUGINDIR_VAR)|$(PLUGINDIR_VAR)|g' \
 			-e 's|%(LUAPLUGINDIR)|$(LUAPLUGINDIR)|g' \
 			-e 's|%(LUAPLUGINDIR_VAR)|$(LUAPLUGINDIR_VAR)|g' \
@@ -106,12 +125,14 @@ install-data-hook:
 			-e 's|%(THEMESDIR_VAR)|$(THEMESDIR_VAR)|g' \
 			-e 's|%(WEBRADIODIR)|$(WEBRADIODIR)|g' \
 			-e 's|%(WEBRADIODIR_VAR)|$(WEBRADIODIR_VAR)|g' \
+			-e 's|%(WEBTVDIR)|$(WEBTVDIR)|g' \
+			-e 's|%(WEBTVDIR_VAR)|$(WEBTVDIR_VAR)|g' \
 			-e 's|%(LOGODIR)|$(LOGODIR)|g' \
 			-e 's|%(LOGODIR_VAR)|$(LOGODIR_VAR)|g' \
-			-e 's|%(LCD4L_ICONSDIR)|$(LCD4L_ICONSDIR)|g' \
-			-e 's|%(LCD4L_ICONSDIR_VAR)|$(LCD4L_ICONSDIR_VAR)|g' \
 			-e 's|%(PRIVATE_HTTPDDIR)|$(PRIVATE_HTTPDDIR)|g' \
 			-e 's|%(PUBLIC_HTTPDDIR)|$(PUBLIC_HTTPDDIR)|g' \
 			-e 's|%(HOSTED_HTTPDDIR)|$(HOSTED_HTTPDDIR)|g' \
 			-e 's|%(FLAGDIR)|$(FLAGDIR)|g' \
 	;
+	@# yWeb
+# 	cp $(DESTDIR)$(PRIVATE_HTTPDDIR)/styles/Y_Dist-v3_dark.css $(DESTDIR)$(PRIVATE_HTTPDDIR)/Y_Dist.css

data/y-web/Y.css

@@ -0,0 +1,77 @@
+#startjpg {
+	display: block;
+	text-align: center;
+	width: 750px;
+	margin: 1.5em auto;
+	padding: .5em;
+	border: 1px solid #a0a0a0;
+	box-shadow: .5em .5em .5em rgba(0, 0, 0, 0.5);
+}
+
+hr {
+	border: 0 none;
+	border-top: 1px solid #a0a0a0;
+}
+span.upd_no,
+span.upd_yes {
+	display: none;
+}
+abbr.version {
+	cursor: help;
+}
+.exlink, .inlink, .comment {
+	text-decoration: none;
+}
+
+.status {
+	vertical-align: text-bottom;
+}
+.vinfo {
+	font-size: 75%;
+	color: #c0c0c0;
+}
+.tools select {
+	border: 1px solid #a0a0a0;
+	border-left: 3px solid #132cfd !important;
+}
+.tools option.e {
+	background: url(images/page_edit.png) no-repeat;
+	padding-left: 20px;
+}
+
+button,
+input[type="button"],
+input[type="submit"],
+._used_graph,
+._used_graph * {
+	border-radius: 5px;
+}
+button[ytype] {
+	background-position: 3px 1px;
+}
+button[ytype="accept_"],
+button[ytype="cancel_"] {
+	text-align: center;
+	width: 105px;
+}
+button[ytype="accept_"] { background-image:url(/images/accept.png); }
+button[ytype="cancel_"] { background-image:url(/images/cancel.png); }
+
+tr.list td {
+	padding-top: .25em;
+	padding-bottom: .25em;
+}
+tr.list:hover td {
+	background: #F0F0F0;
+}
+div._used_graph {
+	width: 150px;
+	height: 20px;
+	border: 1px solid #a0a0a0;
+}
+div._used_graph div._inner_graph {
+	width: 0;
+	height: 100%;
+	background: transparent url(images/colored_bar.png) no-repeat 0 0;
+	float: left;
+}

data/y-web/Y_About.yhtm

@@ -6,35 +6,36 @@
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Info-About=}{=var-set:menu={=L:info.About=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:info.about=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 		<table border="0" cellpadding="2" cellspacing="4">
 		<tr>
 			<td valign="bottom" width="144"></td>
 			<td valign="bottom"><img border="0" src="images/tux-yweb.png" alt="yWeb by yjogol"/></td>
-		</tr><tr>			
+		</tr>
+		<tr>
 			<td valign="top">&nbsp;</td>
 			<td valign="top">
-				v{=ini-get:{=var-get:vf=};version=} - {=ini-get:{=var-get:vf=};date=} - {=ini-get:{=var-get:vf=};type=} - {=ini-get:{=var-get:vf=};info=}
+				v{=ini-get:{=var-get:vf=};version=} - {=ini-get:{=var-get:vf=};date=} - {=ini-get:{=var-get:vf=};info=}
 				<br/><br/>
 			</td>
 		</tr>
 		<tr>
-		<td valign="top">COPYRIGHTS</td>
+			<td valign="top">COPYRIGHTS</td>
-		<td>
+			<td>
-			yWeb (this Web interface) is licensed under the terms of the Open Source GPL 2 license.<br/>
+				yWeb (this Web interface) is licensed under the terms of the Open Source GPL 2 license.<br/>
-			<a href="http://www.gnu.org/licenses/gpl.html" target="_new" class="exlink">http://www.gnu.org/licenses/old-licenses/gpl-2.0.html</a>
+				<a href="http://www.gnu.org/licenses/gpl.html" target="_new" class="exlink">http://www.gnu.org/licenses/old-licenses/gpl-2.0.html</a>
-			<br/><br/>
+				<br/><br/>
-			yWeb uses Icons from famfamfam (<a href="http://www.famfamfam.com" target="_new" class="exlink">http://www.famfamfam.com</a>) which are
+				yWeb uses Icons from famfamfam (<a href="http://www.famfamfam.com" target="_new" class="exlink">http://www.famfamfam.com</a>) which are
-			licensed under Creative Common Attribution License 2.5
+				licensed under Creative Common Attribution License 2.5
-		</td>
+			</td>
 		</tr>
 		<tr>
-		<td valign="top">IMPORTANT</td>
+			<td valign="top">IMPORTANT</td>
-		<td>
+			<td>
-			Do not make yWeb accessible to untrusted networks!<br/>
+				Do not make yWeb accessible to untrusted networks!<br/>
-			Otherwise someone else can access your Box.
+				Otherwise someone else can access your Box.
-		</td>
+			</td>
 		</tr>
 		</table>
 	</div>

data/y-web/Y_Blank.yhtm

@@ -0,0 +1,13 @@
+{=include-block:Y_Blocks.txt;head_v3=}
+</head>
+<body>
+<div class="work_box">
+<div class="work_box_head"><div class="work_box_head_h2">
+	{=var-set:menu={=L:main.v3=}=}{=include-block:Y_Blocks.txt;work_menu=}
+	</div></div>
+	<div class="work_box_body">
+		<img id="startjpg" src="%(ICONSDIR)/start.jpg" alt="" />
+	</div>
+</div>
+</body>
+</html>

data/y-web/Y_Blocks.txt

@@ -4,7 +4,7 @@ start-block~timer
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Neutrino:yWeb:Live_Timer#Timer=}{=var-set:menu=Timer=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu=Timer=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<iframe src="/fb/timer.stb" scrolling="auto" marginheight="1" marginwidth="1" frameborder="0" name="bouquets" style="height : 600px;width:90%;"></iframe>
 
@@ -146,7 +146,7 @@ end-block~personalize_save_settings
 
 # ------- Ext save Settings
 start-block~ext_save_settings
-{=file-action:%(CONFIGDIR)/extentions.txt;add;{=extentions=}=}
+{=file-action:%(CONFIGDIR)/extensions.txt;add;{=extensions=}=}
 end-block~ext_save_settings
 
 # ------- No Managemant Error
@@ -214,15 +214,9 @@ start-block~snip_show_wait
 </div>
 end-block~snip_show_wait
 
-# ------- Wiki Help display
-#<img src="/images/help.gif" align="bottom" />
-start-block~wiki_help
-<a href="https://wiki.tuxbox-neutrino.org/wiki/{=var-get:help_url=}" target="_blank" title="get help from https://wiki.tuxbox-neutrino.org">?</a>
-end-block~wiki_help
-
 # ------- work menu
 start-block~work_menu
-<div class="work_box_help">{=include-block:Y_Blocks.txt;wiki_help=}</div><div style="margin-right:4em;">{=var-get:menu=}</div>
+<div>{=var-get:menu=}</div>
 end-block~work_menu
 
 
@@ -293,6 +287,40 @@ start-block~frame_iso_head
 <title>yWeb</title>
 end-block~frame_iso_head
 
+# ------- Lay-HEAD v3
+start-block~head_v3
+<!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="Community Developers">
+<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</title>
+<link rel="stylesheet" type="text/css" href="/Y_Main.css" />
+<link rel="stylesheet" type="text/css" href="/Y_v3.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_v3lib.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();
+//]]>
+</script>
+end-block~head_v3
+
 # ------- nhttpd save Settings
 start-block~start_wizard_save_settings
 {=ini-set:%(CONFIGDIR)/Y-Web.conf;start_page;{=start_page=}~open=}
@@ -321,7 +349,7 @@ function do_submit()
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=NeutrinoHD:Inbetriebnahme#Inbetriebnahme=}{=var-set:menu={=L:start.head=}Start Wizard=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:start.head=}Start Wizard=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" class="y_form" action="/y/cgi">
 		<table border="0" width="100%">
@@ -415,7 +443,7 @@ start-block~frame_boxcontrol
 			~
 				{=if-equal:{=var-get:startpage=}~screenshot~Y_Tools_Screenshot.yhtm?osd=1
 				~
-					Y_blank.yhtm
+					Y_Blank.yhtm
 				=}
 			=}
 		=}
@@ -427,21 +455,21 @@ 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_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_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_Blank.yhtm=}
 {=include-block:Y_Blocks.txt;frame_secondary=}
 end-block~frame_ext
 
@@ -469,6 +497,43 @@ start-block~frame_live_epg
 </html>
 end-block~frame_live_epg
 
+# ------- 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_v3_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_NetFS-edit.yhtm?nr={=var-get:nr=}&mount_type={=mount_type=}&mount_type_s={=mount_type_s=}" title="{=L:v3.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_v3_Tools('do_mount {=var-get:local_dir_{=var-get:nr=}=}', 5000);" title="{=L:v3.netfs-control.mount=}">
+					<img src="/images/server_add.png">
+				</a>
+				<img src="/images/blank.png">
+				~
+				<img src="/images/blank.png">
+				<a href="javascript:Y_v3_Tools('do_umount {=var-get:local_dir_{=var-get:nr=}=}', 5000);" title="{=L:v3.netfs-control.umount=}">
+					<img src="/images/server_delete.png">
+				</a>
+				=}
+				~
+				=}
+			</td>
+		</tr>
+end-block~netfs_table_row
+
 # ------- Remote control variables
 start-block~rc_variables
 {=var-set:_fb_dbox_philips=2=}
@@ -577,7 +642,7 @@ end-block~remote
 
 # ------- Remote d-Box Philips/Sagem
 start-block~rc_dbox_philips
-<img src="images/rc_dbox_philips.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_dbox_philips.png" usemap="#rc" alt="remote" />
 <map name="rc" id="rc">
   <area shape="poly" href="javascript:rcsim('KEY_RIGHT')" coords="100,117,100,180,67,146,100,116" />
   <area shape="poly" href="javascript:rcsim('KEY_DOWN')" coords="36,181,101,180,66,146" />
@@ -610,7 +675,7 @@ end-block~rc_dbox_philips
 
 # ------- Remote d-Box Nokia old
 start-block~rc_dbox_nokia_old
-<img src="images/rc_dbox_nokia_old.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_dbox_nokia_old.png" usemap="#rc" alt="remote" />
 <map name="rc" id="rc">
   <area shape="rect" href="javascript:rcsim('KEY_SETUP')" coords="7,95,45,109" />
   <area shape="circle" href="javascript:rcsim('KEY_7')" coords="60,102,10" />
@@ -643,7 +708,7 @@ end-block~rc_dbox_nokia_old
 
 # ------ Remote CST V1 (HD1 / BSE)
 start-block~rc_cst_v1
-<img src="images/rc_cst_v1.jpg" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_cst_v1.jpg" usemap="#rc" alt="remote" />
 <map name="rc" id="rc">
   <area shape="rect" href="javascript:rcsim('KEY_POWER')" coords="134, 38, 159, 68" />
   <area shape="rect" href="javascript:rcsim('KEY_MUTE')" coords="29, 37, 56, 66" />
@@ -696,7 +761,7 @@ end-block~rc_cst_v1
 
 # ------- Remote CST V2 (NEO)
 start-block~rc_cst_v2
-<img src="images/rc_cst_v2.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_cst_v2.png" usemap="#rc" alt="remote" />
 <map name="rc" id="rc">
   <area shape="rect" href="javascript:rcsim('KEY_POWER')" coords="22, 28, 45, 50" />
   <area shape="rect" href="javascript:rcsim('KEY_MUTE')" coords="133, 29, 153, 50" />
@@ -751,14 +816,14 @@ end-block~rc_cst_v2
 # ------ Remote CST V3 (ZEE, NEO2)
 start-block~rc_cst_v3
 {=var-set:rcu=rc_cst_v3=}
-<img src="images/rc_cst_v3.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_cst_v3.png" usemap="#rc" alt="remote" />
 {=include-block:Y_Blocks.txt;map_rc_cst_v3_v4=}
 end-block~rc_cst_v3
 
 # ------ Remote CST V4 (NEO TWIN)
 start-block~rc_cst_v4
 {=var-set:rcu=rc_cst_v4=}
-<img src="images/rc_cst_v4.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_cst_v4.png" usemap="#rc" alt="remote" />
 {=include-block:Y_Blocks.txt;map_rc_cst_v3_v4=}
 end-block~rc_cst_v4
 
@@ -841,7 +906,7 @@ end-block~map_rc_cst_v3_v4
 
 # ------- Remote CST V5 (TANK)
 start-block~rc_cst_v5
-<img src="images/rc_cst_v5.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_cst_v5.png" usemap="#rc" alt="remote" />
 <map name="rc" id="rc">
   <area shape="circle" href="javascript:rcsim('KEY_POWER')" coords="50,42,14" alt="standby" title="{=L:rc.key_power=}" />
 
@@ -904,7 +969,7 @@ end-block~rc_cst_v5
 
 # ------- Remote CST V6 (TRINITY)
 start-block~rc_cst_v6
-<img src="images/rc_cst_v6.png" usemap="#rc" alt="remote" />
+<img src="images/rc/rc_cst_v6.png" usemap="#rc" alt="remote" />
 <map name="rc" id="rc">
   <area shape="circle" coords="94,50,16" alt="standby" href="javascript:rcsim('KEY_POWER')" title="{=L:rc.key_power=}" />
   <area shape="circle" coords="150,68,13" alt="mute" href="javascript:rcsim('KEY_MUTE')" title="{=L:rc.key_mute=}" />
@@ -970,7 +1035,7 @@ end-block~rc_cst_v6
 
 # ------ Remote AX HD51
 start-block~rc_ax_hd51
-<img src="images/rc_ax_hd51.png" usemap="#rc"/>
+<img src="images/rc/rc_ax_hd51.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <area shape="rect" coords="20,43,49,72" href="javascript:rcsim('KEY_POWER')" />
 <area shape="rect" coords="121,44,148,72" href="javascript:rcsim('KEY_MUTE')" />
@@ -1026,7 +1091,7 @@ end-block~rc_ax_hd51
 
 # ------ Remote Mutant HD51
 start-block~rc_mutant_hd51
-<img src="images/rc_mutant_hd51.png" usemap="#rc"/>
+<img src="images/rc/rc_mutant_hd51.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <area shape="rect" coords="18,24,53,48" href="javascript:rcsim('KEY_POWER')" />
 <area shape="rect" coords="121,21,148,47" href="javascript:rcsim('KEY_MUTE')" />
@@ -1082,7 +1147,7 @@ end-block~rc_mutant_hd51
 
 # ------ Remote WWIO BRE2ZE 4K
 start-block~rc_wwio_bre2ze4k
-<img src="images/rc_wwio_bre2ze4k.png" usemap="#rc"/>
+<img src="images/rc/rc_wwio_bre2ze4k.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <area shape="rect" coords="17,30,43,57" alt="KEY_POWER" href="javascript:rcsim('KEY_POWER')" />
 <area shape="rect" coords="90,36,113,57" alt="KEY_MODE" href="javascript:rcsim('KEY_MODE')" />
@@ -1144,7 +1209,7 @@ end-block~rc_wwio_bre2ze4k
 
 # ------ Remote VU+ Solo 4K, Duo 4K, Duo 4K SE, Ultimo 4K, Zero 4K, Uno 4K, Uno 4K SE
 start-block~rc_vuplus
-<img src="images/rc_vuplus.png" usemap="#rc"/>
+<img src="images/rc/rc_vuplus.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <!-- <area shape="circle" coords="33,28,10" id="113" alt="v1_mute" href="javascript:rcsim('KEY_POWER_TV')" /> -->
 <area shape="circle" coords="142,28,10" id ="116" alt="Power" href="javascript:rcsim('KEY_POWER')" />
@@ -1197,7 +1262,7 @@ end-block~rc_vuplus
 
 # ------ Remote Air Digital Zgemma H7
 start-block~rc_zgemma_h7
-<img src="images/rc_zgemma_h7.png" usemap="#rc"/>
+<img src="images/rc/rc_zgemma_h7.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <area shape="rect" coords="58,46,25,23" alt="KEY_POWER" href="javascript:rcsim('KEY_POWER')" />
 <area shape="rect" coords="134,22,171,46" alt="KEY_MUTE" href="javascript:rcsim('KEY_MUTE')" />
@@ -1254,7 +1319,7 @@ end-block~rc_zgemma_h7
 
 # ------ Remote Mutant HD60, Maxytec Multibox SE 4K
 start-block~rc_mutant_hd60
-<img src="images/rc_mutant_hd60.png" usemap="#rc"/>
+<img src="images/rc/rc_mutant_hd60.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <area shape="circle" coords="31,76,12" href="javascript:rcsim('KEY_POWER')" />
 <area shape="circle" coords="122,76,12" href="javascript:rcsim('KEY_MUTE')" />
@@ -1309,7 +1374,7 @@ end-block~rc_mutant_hd60
 
 # ------ Remote AX HD61
 start-block~rc_ax_hd61
-<img src="images/rc_ax_hd61.png" usemap="#rc"/>
+<img src="images/rc/rc_ax_hd61.png" usemap="#rc"/>
 <map name="rc" id="rc">
 <area shape="circle" coords="37,90,15" href="javascript:rcsim('KEY_POWER')" />
 <area shape="circle" coords="144,90,15" href="javascript:rcsim('KEY_MUTE')" />

data/y-web/Y_Blocks_Neutrino.txt

@@ -14,7 +14,7 @@ start-block~neutrino_form
 </head>
 <body>
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
-{=include-block:Y_neutrino_Blocks.txt;{=var-get:neutrino=}=}
+{=include-block:Y_Blocks_Neutrino.txt;{=var-get:neutrino=}=}
 </body>
 </html>
 {=include-block:Y_Blocks.txt;management_check_bottom=}
@@ -35,15 +35,13 @@ start-block~neutrino_form_submit
 	<button type="button" ytype="save" title="{=L:save_values_desc=}" onclick="do_submit()">{=L:save=}</button>
 	&nbsp;
 	<button type="button" ytype="refresh" title="{=L:apply_desc=}" onclick="reload_neutrino_conf()">{=L:apply=}</button>
-	&nbsp;
-	<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">{=L:help=}</a>
 end-block~neutrino_form_submit
 
 # ------- Neutrino form-data: record -------------------------------
 start-block~neutrino_form-data_record
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-Aufnahme=}{=var-set:menu={=L:set.menue.recording=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:set.menue.recording=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" class="y_form" action="/y/cgi">
 		<table cellspacing="0" border="0" cellpadding="2" width="100%">
@@ -146,9 +144,9 @@ start-block~neutrino_form-data_record
 		</table>
 		<br/>
 		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
-		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_record_save_settings;nix"/>
+		<input type="hidden" name="execute" value="include-block:Y_Blocks_Neutrino.txt;neutrino_record_save_settings;nix"/>
 		<input type="hidden" name="form" value="{=form=}"/>
-		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
+		{=include-block:Y_Blocks_Neutrino.txt;neutrino_form_submit;nothing=}
 	</form>
 	</div>
 </div>
@@ -218,7 +216,7 @@ end-block~neutrino_record_save_settings
 start-block~neutrino_form-data_movieplayer
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-Movieplayer=}{=var-set:menu={=L:set.menue.movieplayer=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:set.menue.movieplayer=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" class="y_form" action="/y/cgi">
 		<table cellspacing="0" border="0" cellpadding="2" width="100%">
@@ -230,9 +228,9 @@ start-block~neutrino_form-data_movieplayer
 		</table>
 		<br/>
 		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
-		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_movieplayer_save_settings;nix"/>
+		<input type="hidden" name="execute" value="include-block:Y_Blocks_Neutrino.txt;neutrino_movieplayer_save_settings;nix"/>
 		<input type="hidden" name="form" value="{=form=}"/>
-		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
+		{=include-block:Y_Blocks_Neutrino.txt;neutrino_form_submit;nothing=}
 	</form>
 	</div>
 </div>
@@ -264,7 +262,7 @@ end-block~neutrino_movieplayer_save_settings
 start-block~neutrino_form-data_parental
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-Jugendschutz=}{=var-set:menu={=L:set.menue.parental=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:set.menue.parental=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" action="/y/cgi">
 		<table cellspacing="0" border="0" cellpadding="2" width="100%">
@@ -295,9 +293,9 @@ start-block~neutrino_form-data_parental
 		</table>
 		<br/>
 		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
-		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_parental_save_settings;nix"/>
+		<input type="hidden" name="execute" value="include-block:Y_Blocks_Neutrino.txt;neutrino_parental_save_settings;nix"/>
 		<input type="hidden" name="form" value="{=form=}"/>
-		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
+		{=include-block:Y_Blocks_Neutrino.txt;neutrino_form_submit;nothing=}
 	</form>
 	</div>
 </div>
@@ -340,7 +338,7 @@ end-block~neutrino_parental_save_settings
 start-block~neutrino_form-data_epg
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-EPG=}{=var-set:menu={=L:set.menue.epg=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:set.menue.epg=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" action="/y/cgi" class="y_form">
 		<table cellspacing="0" border="0" cellpadding="2" width="100%">
@@ -425,9 +423,9 @@ start-block~neutrino_form-data_epg
 		</table>
 		<br/>
 		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
-		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_epg_save_settings;nix"/>
+		<input type="hidden" name="execute" value="include-block:Y_Blocks_Neutrino.txt;neutrino_epg_save_settings;nix"/>
 		<input type="hidden" name="form" value="{=form=}"/>
-		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
+		{=include-block:Y_Blocks_Neutrino.txt;neutrino_form_submit;nothing=}
 	</form>
 	</div>
 </div>
@@ -474,7 +472,7 @@ end-block~neutrino_epg_save_settings
 start-block~neutrino_form-data_diverse
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-Diverse=}{=var-set:menu=Diverse Einstellungen=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu=Diverse Einstellungen=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" action="/y/cgi" class="y_form">
 		<table cellspacing="0" border="0" cellpadding="2" width="100%">
@@ -698,9 +696,9 @@ start-block~neutrino_form-data_diverse
 		</table>
 		<br/>
 		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
-		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_diverse_save_settings;nix"/>
+		<input type="hidden" name="execute" value="include-block:Y_Blocks_Neutrino.txt;neutrino_diverse_save_settings;nix"/>
 		<input type="hidden" name="form" value="{=form=}"/>
-		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
+		{=include-block:Y_Blocks_Neutrino.txt;neutrino_form_submit;nothing=}
 	</form>
 	</div>
 </div>
@@ -794,7 +792,7 @@ end-block~neutrino_diverse_save_settings
 start-block~neutrino_form-data_pictureviewer
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-Bildbetrachter=}{=var-set:menu={=L:set.pv.pictureviewer=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:set.pv.pictureviewer=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" action="/y/cgi">
 		<table cellspacing="0" border="0" cellpadding="2" width="100%">
@@ -819,9 +817,9 @@ start-block~neutrino_form-data_pictureviewer
 		</table>
 		<br/>
 		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
-		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_pictureviewer_save_settings;nix"/>
+		<input type="hidden" name="execute" value="include-block:Y_Blocks_Neutrino.txt;neutrino_pictureviewer_save_settings;nix"/>
 		<input type="hidden" name="form" value="{=form=}"/>
-		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
+		{=include-block:Y_Blocks_Neutrino.txt;neutrino_form_submit;nothing=}
 	</form>
 	</div>
 </div>
@@ -856,7 +854,7 @@ end-block~neutrino_pictureviewer_save_settings
 start-block~neutrino_form-data_audioplayer
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-Audioplayer=}{=var-set:menu={=L:set.ap.audioplayer=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:set.ap.audioplayer=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" action="/y/cgi">
 		<table cellspacing="0" border="0" cellpadding="2" width="100%">
@@ -922,9 +920,9 @@ start-block~neutrino_form-data_audioplayer
 		</table>
 		<br/>
 		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
-		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_audioplayer_save_settings;nix"/>
+		<input type="hidden" name="execute" value="include-block:Y_Blocks_Neutrino.txt;neutrino_audioplayer_save_settings;nix"/>
 		<input type="hidden" name="form" value="{=form=}"/>
-		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
+		{=include-block:Y_Blocks_Neutrino.txt;neutrino_form_submit;nothing=}
 	</form>
 	</div>
 </div>
@@ -971,7 +969,7 @@ end-block~neutrino_audioplayer_save_settings
 start-block~neutrino_form-data_direct_recording
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-Direktaufnahme=}{=var-set:menu=Direktaufnahme=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu=Direktaufnahme=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" class="y_form" action="/y/cgi">
 		<table cellspacing="0" border="0" cellpadding="2" width="100%">
@@ -1091,9 +1089,9 @@ start-block~neutrino_form-data_direct_recording
 		</table>
 		<br/>
 		<input type="hidden" name="tmpl" value="Y_Settings_neutrino_forms.yhtm"/>
-		<input type="hidden" name="execute" value="include-block:Y_neutrino_Blocks.txt;neutrino_direct_recording_save_settings;nix"/>
+		<input type="hidden" name="execute" value="include-block:Y_Blocks_Neutrino.txt;neutrino_direct_recording_save_settings;nix"/>
 		<input type="hidden" name="form" value="{=form=}"/>
-		{=include-block:Y_neutrino_Blocks.txt;neutrino_form_submit;nothing=}
+		{=include-block:Y_Blocks_Neutrino.txt;neutrino_form_submit;nothing=}
 	</form>
 	</div>
 </div>

data/y-web/Y_Boxcontrol_Bouquet_Editor_Edit.yhtm

@@ -56,7 +56,7 @@ function poschannel(box, direction){
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-BoxControl-Bouquet-Editor=}{=var-set:menu={=L:bou.bouquet=} &quot;{=name=}&quot;=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:bou.bouquet=} &quot;{=name=}&quot;=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 		<form action="/control/changebouquet" method="post" id="channels" enctype="x-www-form-urlencoded">
 		<p><input type="hidden" name="selected" value="{=selected=}" /></p>

data/y-web/Y_Boxcontrol_Bouquet_Editor_Main.yhtm

@@ -106,7 +106,7 @@ function do_rename(){
 	position: absolute;
 	left: 100px;
 	top: 100px;
-	border: 1px solid #2188e0;
+	border: 1px solid #132cfd;
 	border-collapse: collapse;
 	background-color: white;
 	padding: 1em;
@@ -116,7 +116,7 @@ function do_rename(){
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-BoxControl-Bouquet-Editor=}{=var-set:menu={=L:set.menue.bouquet_editor=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:set.menue.bouquet_editor=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 		<div id="add" class="fly_form">
 			<form name="add" accept-charset="UTF-8" action="">

data/y-web/Y_Boxcontrol_Bouquets.yhtm

@@ -3,7 +3,7 @@
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-BoxControl-Bouquet=}{=var-set:menu=Bouquet=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu=Bouquet=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<iframe src="Y_Boxcontrol_Bouquetlist.yhtm?bouquet=#akt"
 		scrolling="auto" marginheight="1" marginwidth="1" frameborder="0" name="bouquets"

data/y-web/Y_Boxcontrol_Channellist.yhtm

@@ -1,5 +1,6 @@
 {=include-block:Y_Blocks.txt;head_no_charset=}
 <meta http-equiv="Content-Type" content="text/html; charset=windows-1252"/>
+<link rel="stylesheet" type="text/css" href="/Y_v3.css" />
 <script type="text/javascript" src="/Y_Baselib.js"></script>
 <script type="text/javascript">
 //<![CDATA[
@@ -20,7 +21,7 @@ function do_stream(channelid, channelname)
 	saveTextAsFile(plist, title, type);
 }
 function do_streaminfo() {
-	window.open("Y_StreamInfo.yhtm", "stream", "width=400");
+	window.open("Y_StreamInfo.yhtm", "stream", "width=520");
 }
 //]]>
 </script>
@@ -30,4 +31,4 @@ function do_streaminfo() {
 {=func:get_bouquets_with_epg {=bouquet=}=}
 </table>
 </body>
-</html>
+</html>

data/y-web/Y_Boxcontrol_Menue.yhtm

@@ -132,7 +132,6 @@ function epg_plus_popup() {
 //]]>
 </script>
 </head>
-{=var-set:lcshot={=find-exec:lcshot=}=}
 <body>
 <div class="y_menu_sec_box">
 	<div class="y_menu_sec_box_head"><h2>{=L:main.boxcontrol=}</h2></div>
@@ -144,7 +143,7 @@ function epg_plus_popup() {
 				</li>
 				<li>
 					<a target="work" href="Y_EPG_Plus.yhtm">{=L:live.epg_plus=}</a>
-					<a class="y_menu_popup_link" title="{=L:live.epg_plus_popup_desc=}" href="javascript:epg_plus_popup()"><img src="/images/popup.png"/></a>
+					<a title="{=L:live.epg_plus_popup_desc=}" href="javascript:epg_plus_popup()" class="y_menu_popup_link" ><img src="/images/popup.png"/></a>
 				</li>
 				<li>
 					<a target="work" title="{=L:bc.menue.control_desc=}" href="Y_Tools_Boxcontrol.yhtm">{=L:bc.menue.control=}</a>
@@ -155,20 +154,36 @@ function epg_plus_popup() {
 				<li>
 					<a target="work" title="{=L:bc.menue.remote_desc=}" href="Y_Tools_Rcsim.yhtm">{=L:bc.menue.remote=}</a>
 				</li>
-				{=if-equal:{=ini-get:%(CONFIGDIR)/neutrino.conf;glcd_enable;0=}~1~
 				<li>
-					<a target="work" title="{=L:bc.menue.glcd_screenshot_desc=}" href="Y_Tools_Glcd_Screenshot.yhtm">{=L:bc.menue.glcd_screenshot=}</a>
+					{=L:bc.menue.screenshot=}
-				</li>
-				~=}
-				<li>
-					<a target="work" title="OSD-{=L:bc.menue.screenshot=}" href="Y_Tools_Screenshot.yhtm?osd=1&rc={=ini-get:%(CONFIGDIR)/Y-Web.conf;screenshot_rc;false=}">OSD-{=L:bc.menue.screenshot=}</a>
-				</li>
-				<li>
-					<a target="work" title="TV-{=L:bc.menue.screenshot=}" href="Y_Tools_Screenshot.yhtm?video=1&rc={=ini-get:%(CONFIGDIR)/Y-Web.conf;screenshot_rc;false=}">TV-{=L:bc.menue.screenshot=}</a>
 				</li>
+				<ul style="margin-left: 1em">
+					<li>
+						<a target="work" title="OSD-{=L:bc.menue.screenshot=}" href="Y_Tools_Screenshot.yhtm?osd=1&rc={=ini-get:/var/tuxbox/config/Y-Web.conf;screenshot_rc;false=}">OSD</a>
+					</li>
+					<li>
+						<a target="work" title="TV-{=L:bc.menue.screenshot=}" href="Y_Tools_Screenshot.yhtm?video=1&rc={=ini-get:/var/tuxbox/config/Y-Web.conf;screenshot_rc;false=}">TV</a>
+					</li>
+					{=if-equal:{=ini-get:/var/tuxbox/config/neutrino.conf;lcd4l_support;0=}~1~
+					{=if-equal:{=ini-get:/var/tuxbox/config/neutrino.conf;lcd4l_screenshots;0=}~1~
+					<li>
+						<a target="work" title="LCD4Linux-{=L:bc.menue.screenshot=}" href="Y_Tools_Screenshot_LCD4Linux.yhtm">LCD4Linux</a>
+						<a target="blank" title="LCD4Linux-{=L:bc.menue.screenshot=} (Popup)" href="lcd4linux/ylcd4linux.yhtm" class="y_menu_popup_link" ><img src="/images/popup.png"/></a>
+					</li>
+					~=}
+					~=}
+					{=if-equal:{=ini-get:/var/tuxbox/config/neutrino.conf;glcd_enable;0=}~1~
+					<li>
+						<a target="work" title="GraphLCD-{=L:bc.menue.screenshot=}" href="Y_Tools_Screenshot_GraphLCD.yhtm">GraphLCD</a>
+					</li>
+					~=}
+				</ul>
 				<li>
 					<a target="work" href="Y_Timer_List.yhtm">{=L:live.timer=}</a>
 				</li>
+				<li>
+					<a target="work" href="Y_PZapit-control.yhtm">{=L:v3.pzapit-control=}</a>
+				</li>
 			</ul>
 		</div>
 	</div>
@@ -179,8 +194,8 @@ function epg_plus_popup() {
 		<center>
 			<table class="y_text_boxcontrol_table" cellspacing="0" cellpadding="0" title="{=L:bc.menue.volumen_display=}">
 			<tr>
-			<td id="audiobar_left" width="100%"><img src="/images/blank.gif" height="1" width="0" alt="."/></td>
+			<td id="audiobar_left" width="100%"><img src="/images/blank.png" height="1" width="0" alt="."/></td>
-			<td id="audiobar_right" width="0%"><img src="/images/blank.gif" height="1" width="0" alt="."/></td>
+			<td id="audiobar_right" width="0%"><img src="/images/blank.png" height="1" width="0" alt="."/></td>
 			</tr>
 			</table>
 			<br/>
@@ -219,8 +234,8 @@ function epg_plus_popup() {
 			<div class="y_text_boxcontrol_div_progress">SIG <span id="sig_value"></span>%</div>
 			<table class="y_text_boxcontrol_table_progress" cellspacing="0" cellpadding="0" title="{=L:bc.menue.sig_display=}">
 			<tr>
-			<td id="sigbar_left" width="100%"><img src="/images/blank.gif" height="1" width="0" alt="." /></td>
+			<td id="sigbar_left" width="100%"><img src="/images/blank.png" height="1" width="0" alt="." /></td>
-			<td id="sigbar_right" width="0%"><img src="/images/blank.gif" height="1" width="0" alt="." /></td>
+			<td id="sigbar_right" width="0%"><img src="/images/blank.png" height="1" width="0" alt="." /></td>
 			</tr>
 			</table>
 		</center>
@@ -228,8 +243,8 @@ function epg_plus_popup() {
 			<div class="y_text_boxcontrol_div_progress">SNR <span id="snr_value"></span>%</div>
 			<table class="y_text_boxcontrol_table_progress" cellspacing="0" cellpadding="0" title="{=L:bc.menue.snr_display=}">
 			<tr>
-			<td id="snrbar_left" width="100%"><img src="/images/blank.gif" height="1" width="0" alt="." /></td>
+			<td id="snrbar_left" width="100%"><img src="/images/blank.png" height="1" width="0" alt="." /></td>
-			<td id="snrbar_right" width="0%"><img src="/images/blank.gif" height="1" width="0" alt="." /></td>
+			<td id="snrbar_right" width="0%"><img src="/images/blank.png" height="1" width="0" alt="." /></td>
 			</tr>
 			</table>
 		</center>

data/y-web/Y_Boxcontrol_Messages.yhtm

@@ -19,7 +19,7 @@ function do_send(mode) {
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-BoxControl-Message=}{=var-set:menu={=L:bc.menue.messages=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:bc.menue.messages=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 		<table class="y_invisible_table" cellpadding="5" width="100%">
 		<tr><td class="y_form_header">{=L:bc.msg.message_to_screen=}</td></tr>
@@ -38,7 +38,7 @@ function do_send(mode) {
 </div>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-BoxControl-Message=}{=var-set:menu={=L:answer=}=}{=include-block:Y_Blocks.txt;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>

data/y-web/Y_EPG_Plus.yhtm

@@ -1,5 +1,6 @@
 {=include-block:Y_Blocks.txt;head_no_charset=}
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
+<link rel="stylesheet" type="text/css" href="/Y_v3.css" />
 <script type="text/javascript" src="/Y_Baselib.js"></script>
 <script type="text/javascript" src="/prototype.js"></script>
 <script type="text/javascript" src="/Y_EPG.js"></script>
@@ -11,7 +12,7 @@
 {=var-set:wait_text={=L:epg.get_epg=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Live_Timer-EPG_Plus=}{=var-set:menu={=L:epg.epg_plus=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:epg.epg_plus=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 		<form name="e">
 			<select size="1" class="y_live_bouquets" name="bouquets" title="{=L:epg.select_bouquet=}">

data/y-web/Y_Ext_Menue.yhtm

@@ -1,4 +1,4 @@
-{=var-set:extension={=if-file-exists:%(CONFIGDIR)/extentions.txt~%(CONFIGDIR)/extentions.txt~{=if-file-exists:%(PUBLIC_HTTPDDIR)/extentions.txt~%(PUBLIC_HTTPDDIR)/extentions.txt~%(PRIVATE_HTTPDDIR)/extentions.txt=}=}=}
+{=var-set:extension={=if-file-exists:%(CONFIGDIR)/extensions.txt~%(CONFIGDIR)/extensions.txt~{=if-file-exists:%(PUBLIC_HTTPDDIR)/extensions.txt~%(PUBLIC_HTTPDDIR)/extensions.txt~%(PRIVATE_HTTPDDIR)/extensions.txt=}=}=}
 {=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip2=}~1~=}=}
 {=include-block:Y_Blocks.txt;head=}
 <script type="text/javascript" src="/prototype.js"></script>

data/y-web/Y_Ext_Settings.yhtm

@@ -16,14 +16,17 @@ function do_submit(){
 <body>
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
-	<div class="work_box_head"><div class="work_box_head_h2">
+	<div class="work_box_head">
-	{=var-set:help_url=Help-Extensions-Settings=}{=var-set:menu={=L:main.settings=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+		<div class="work_box_head_h2">
+			{=var-set:menu={=L:main.settings=}=}{=include-block:Y_Blocks.txt;work_menu=}
+		</div>
+	</div>
 	<div class="work_box_body">
 	<form name="f" accept-charset="UTF-8" action="/y/cgi">
 		<table border="0" class="y_form_table" cellspacing="0" cellpadding="0">
 			<tr>
 				<td>&nbsp;</td>
-				<td><textarea name="extentions" id="ext" cols="90" rows="30" title="extention list">{=if-file-exists:%(CONFIGDIR)/extentions.txt~{=include:%(CONFIGDIR)/extentions.txt=}~{=if-file-exists:%(PUBLIC_HTTPDDIR)/extentions.txt~{=include:%(PUBLIC_HTTPDDIR)/extentions.txt=}~{=include:%(PRIVATE_HTTPDDIR)/extentions.txt=}=}=}</textarea></td>
+				<td><textarea name="extensions" id="ext" cols="90" rows="30" title="extension list">{=if-file-exists:%(CONFIGDIR)/extensions.txt~{=include:%(CONFIGDIR)/extensions.txt=}~{=if-file-exists:%(PUBLIC_HTTPDDIR)/extensions.txt~{=include:%(PUBLIC_HTTPDDIR)/extensions.txt=}~{=include:%(PRIVATE_HTTPDDIR)/extensions.txt=}=}=}</textarea></td>
 			</tr>
 		</table>
 		<br/>

data/y-web/Y_Ext_Uninstall.yhtm

@@ -13,18 +13,23 @@ function init(){
 </script>
 <style>
 .type, .uninstall{
-	text-align:center;;
+	text-align: center;
 }
 </style>
 </head>
 <body onload="init()">
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
-	<div class="work_box_head"><div class="work_box_head_h2">
+	<div class="work_box_head">
-	{=var-set:help_url=Help-Extensions-Uninstall=}{=var-set:menu={=L:ext.uninstaller=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+		<div class="work_box_head_h2">
+			{=var-set:menu={=L:ext.uninstaller=}=}{=include-block:Y_Blocks.txt;work_menu=}
+		</div>
+	</div>
 	<div class="work_box_body">
-		<div id="statusline"><img border="0" src="/images/wait.gif" width="20" height="20" alt="wait"/>
+		<div id="statusline">
-			<span id="status">{=L:ext.search_for_ext=}</span></div>
+			<img border="0" src="/images/wait.gif" width="20" height="20" alt="wait"/>
+			<span id="status">{=L:ext.search_for_ext=}</span>
+		</div>
 
 	<form method="post" name="update" action="">
 		<br/>
@@ -32,28 +37,40 @@ function init(){
 		<table class="lt_table" cellspacing="0" cellpadding="2">
 		<thead align="left">
 		<tr valign="bottom">
-			<th>{=L:ext.type=}</th><th>{=L:ext.extension=}</th>
+			<th>{=L:ext.type=}</th>
-			<th>{=L:ext.tag=}</th><th>{=L:ext.version=}</th><th>{=L:ext.size=}</th><th>{=L:ext.uninstall=}</th><th>{=L:ext.info=}</th>
+			<th>{=L:ext.extension=}</th>
+			<th>{=L:ext.tag=}</th>
+			<th>{=L:ext.version=}</th>
+			<th>{=L:ext.size=}</th>
+			<th>{=L:ext.uninstall=}</th>
+			<th>{=L:ext.info=}</th>
 		</tr>
 		</thead>
 		<tbody id="update_list">
-		<tr><td></td></tr>
+		<tr style="display: none">
+			<td></td>
+		</tr>
 		</tbody>
 		</table>
 	</form>
 	<br/>
 	<div id="free">?</div>
-	{=L:ext.free=}:&nbsp;<span id="avaiable">?</span>k
+	<div>{=L:ext.free=}: <span id="avaiable">?</span>k</div>
+	<br/>
 	<form method="post" name="log" action="">
-	<div class="y_form_header_oline">Log</div>
+		<div class="y_form_header_oline">Log</div>
 		<table class="lt_table" cellspacing="0" cellpadding="4">
 		<thead align="left">
 		<tr>
-			<th>&nbsp;</th><th>{=L:ext.action=}</th><th>{=L:ext.status=}</th>
+			<th>&nbsp;</th>
+			<th>{=L:ext.action=}</th>
+			<th>{=L:ext.status=}</th>
 		</tr>
 		</thead>
 		<tbody id="slog_list">
-		<tr><td></td></tr>
+		<tr style="display: none">
+			<td></td>
+		</tr>
 		</tbody>
 		</table>
 		<br/>
@@ -63,7 +80,7 @@ function init(){
 	<form name="f" accept-charset="UTF-8" action="/y/cgi">
 		<table border="0" class="y_form_table" cellspacing="0" cellpadding="0">
 			<tr>
-				<td><textarea name="extentions" cols="90" rows="5" title="extention list"></textarea></td>
+				<td><textarea name="extensions" cols="90" rows="5" title="extension list"></textarea></td>
 			</tr>
 		</table>
 		<br/>
@@ -75,4 +92,3 @@ function init(){
 </body>
 </html>
 {=include-block:Y_Blocks.txt;management_check_bottom=}
-

data/y-web/Y_Ext_Update.js

@@ -33,7 +33,7 @@ function sLog_addRow(_body, state, action_text, state_text){
 var update_body;
 /*<upd_site>,<type=n|m>,<link text>,<link helptext>,<url>,<unique tag>,<version>,<url of installer>*/
 /*<type=n|m>,<link text>,<link helptext>,<url>,<unique tag>,<version>*/
-/*<type=u>,<update site name>,<update site helptext>,<url of extention list>*/
+/*<type=u>,<update site name>,<update site helptext>,<url of extension list>*/
 function list_init(){
 	update_body=$("update_list");
 }
@@ -150,7 +150,7 @@ function do_set_updates2(){
 	}
 	sLog_addRow(sLog_body, "green", "updating local extension list. Starting ...", "ok");
 	var extfile=ext.build_extension_file();
-	document.f.extentions.value=extfile;
+	document.f.extensions.value=extfile;
 	show_waitbox(false);
 	alert("Update finished. Menue reload.");
 	do_submit();
@@ -217,7 +217,7 @@ function do_uninstall2(tag){
 		sLog_addRow(sLog_body, "green", "uninstalled: "+tag+"<br/>"+res, "ok");
 	sLog_addRow(sLog_body, "green", "updating local extension list. Starting ...", "ok");
 	var extfile=ext.build_extension_file();
-	document.f.extentions.value=extfile;
+	document.f.extensions.value=extfile;
 	show_waitbox(false);
 	alert("Update finished. Menue reload.");
 	do_submit();
@@ -236,7 +236,7 @@ function uninstall_build_list2(){
 	/*build_list*/
 	i=0;
 	ext.installed_extensions.sortBy(function(e){return e.get('tag');}).each(function(e){
-		res=loadSyncURL("/y/cgi?execute=if-file-exists:%(CONFIGDIR)/ext/"+e.get('tag')+"_uninstall.inc~1~0");
+		res=loadSyncURL("/y/cgi?execute=if-file-exists:%(CONFIGDIR)/y-ext/"+e.get('tag')+"_uninstall.inc~1~0");
 		uninstall_list_addRow(update_body,++i,e,res=="1");
 	});
 	$('statusline').hide();

data/y-web/Y_Ext_Update.yhtm

@@ -8,11 +8,16 @@
 <body>
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
-	<div class="work_box_head"><div class="work_box_head_h2">
+	<div class="work_box_head">
-	{=var-set:help_url=Help-Extensions-Update=}{=var-set:menu={=L:ext.installer_updater=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+		<div class="work_box_head_h2">
-	<div class="work_box_body" style="width:100%">
+			{=var-set:menu={=L:ext.installer_updater=}=}{=include-block:Y_Blocks.txt;work_menu=}
-		<div id="statusline"><img border="0" src="/images/wait.gif" width="20" height="20" alt="wait"/>
+		</div>
-			<span id="status">{=L:ext.search_for_ext=}</span></div>
+	</div>
+	<div class="work_box_body">
+		<div id="statusline">
+			<img border="0" src="/images/wait.gif" width="20" height="20" alt="wait"/>
+			<span id="status">{=L:ext.search_for_ext=}</span>
+		</div>
 
 	<form method="post" name="update" action="">
 		<br/>
@@ -21,30 +26,44 @@
 		<thead align="left">
 		<tr valign="bottom">
 			<th>&nbsp;</th>
-			<th>{=L:ext.site=}</th><th>{=L:ext.type=}</th><th>{=L:ext.extension=}</th>
+			<th>{=L:ext.site=}</th>
-			<th>{=L:ext.tag=}</th><th>{=L:ext.your=}<br/>{=L:ext.version=}</th><th>{=L:ext.update=}<br/>{=L:ext.version=}</th>
+			<th>{=L:ext.type=}</th>
-			<th title="minimal yWeb version">yWeb</th><th>{=L:ext.size=}</th><th>{=L:ext.info=}</th>
+			<th>{=L:ext.extension=}</th>
+			<th>{=L:ext.tag=}</th>
+			<th>{=L:ext.your=}<br/>{=L:ext.version=}</th>
+			<th>{=L:ext.update=}<br/>{=L:ext.version=}</th>
+			<th title="minimal yWeb version">yWeb</th>
+			<th>{=L:ext.size=}</th>
+			<th>{=L:ext.info=}</th>
 		</tr>
 		</thead>
 		<tbody id="update_list">
-		<tr><td></td></tr>
+		<tr style="display: none">
+			<td></td>
+		</tr>
 		</tbody>
 		</table>
+		<br/>
 		<button type="button" ytype="go" title="" name="set_updates" onclick="do_set_updates()">{=L:ext.update_install=}</button>&nbsp;
 	</form>
 	<br/>
 	<div id="free">?</div>
-	{=L:ext.free=}: <span id="avaiable">?</span>k
+	<div>{=L:ext.free=}: <span id="avaiable">?</span>k</div>
+	<br/>
 	<form method="post" name="log" action="">
-	<div class="y_form_header_oline">Log</div>
+		<div class="y_form_header_oline">Log</div>
 		<table class="lt_table" cellspacing="0" cellpadding="4">
 		<thead align="left">
 		<tr>
-			<th>&nbsp;</th><th>{=L:ext.action=}</th><th>{=L:ext.status=}</th>
+			<th>&nbsp;</th>
+			<th>{=L:ext.action=}</th>
+			<th>{=L:ext.status=}</th>
 		</tr>
 		</thead>
 		<tbody id="slog_list">
-		<tr><td></td></tr>
+		<tr style="display: none">
+			<td></td>
+		</tr>
 		</tbody>
 		</table>
 		<br/>
@@ -54,7 +73,7 @@
 	<form name="f" accept-charset="UTF-8" action="/y/cgi">
 		<table border="0" class="y_form_table" cellspacing="0" cellpadding="0">
 			<tr>
-				<td><textarea name="extentions" cols="90" rows="5" title="extention list"></textarea></td>
+				<td><textarea name="extensions" cols="90" rows="5" title="extension list"></textarea></td>
 			</tr>
 		</table>
 		<br/>
@@ -72,4 +91,3 @@
 </body>
 </html>
 {=include-block:Y_Blocks.txt;management_check_bottom=}
-

data/y-web/Y_Ext_Update_refresh.yhtm

@@ -15,12 +15,14 @@ function do_onload() {
 <body onload="do_onload()">
 {=var-set:wait_text={=L:refreshing=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
-	<div class="work_box_head"><div class="work_box_head_h2">
+	<div class="work_box_head">
-	{=var-set:help_url=Help-Extensions-Update=}{=var-set:menu={=L:ext.ext_saved=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+		<div class="work_box_head_h2">
+			{=var-set:menu={=L:ext.ext_saved=}=}{=include-block:Y_Blocks.txt;work_menu=}
+		</div>
+	</div>
 	<div class="work_box_body" width="100%s">
 		{=L:ext.refresh_now=}
 	</div>
 </div>
 </body>
 </html>
-

data/y-web/Y_Filemgr.yhtm

@@ -46,19 +46,40 @@ CyExplorer.prototype = {
 		var mycurrent_row = new Element( 'tr', {'class': ((this.line_number % 2) ==0)?"a":"b"} );
 		$(this.el).insert(mycurrent_row);
 		/* icon */
-		var __img ="/images/ftype_file.png";
+		var __img = "/images/ftype_file.png";
-		switch (fp.get('type')){
+		switch (fp.get('type')) {
-			case 	"folder":	__img = "/images/ftype_folder.png"; break;
+			case "folder":
-			case 	"link":	__img = "/images/ftype_link.png"; break;
+				__img = "/images/ftype_folder.png";
-			case 	"file":	__img = "/images/ftype_file.png"; 
+				break;
-				switch (fp.get('ext')){
+			case "link":
-					case 	"ts": case "ps": case "pes": case "avi":
+				__img = "/images/ftype_link.png";
-						__img = "/images/film.png"; break;
+				break;
-					case 	"jpg": case "jpeg": case "bmp": case "gif": case "ico": case "png":
+			case "file":
-						__img = "/images/picture.png"; break;
+				__img = "/images/ftype_file.png";
-					case 	"file": case "tar": case "zip": case "tar.gz":
+				switch (fp.get('ext')) {
+					case "ts":
+					case "ps":
+					case "pes":
+					case "avi":
+						__img = "/images/film.png";
+						break;
+					case "jpg":
+					case "jpeg":
+					case "bmp":
+					case "gif":
+					case "ico":
+					case "png":
+						__img = "/images/picture.png";
+						break;
+					case "tar":
+					case "tar.gz":
+					case "zip":
 						__img = "/images/package.png"; 
-					case 	"file": case "txt": case "ini": case "conf":
+						break;
+					case "file":
+					case "txt":
+					case "ini":
+					case "conf":
 						__img = "/images/text.png"; 
 						break;
 				}
@@ -416,7 +437,7 @@ function  do_prop(prop){
 	show_prop();
 
 	document.edit.fitem.value = explorer.ac_item;
-	// Fileextention handling
+	// Fileextension handling
 	var fullfname = explorer.build_fname();
 	switch(explorer.ac_prop.get('ext')){
 		case "xml":
@@ -426,10 +447,11 @@ function  do_prop(prop){
 			}
 			break;
 		case "jpg":
-		case "png":
+		case "jpeg":
 		case "bmp":
 		case "gif":
 		case "ico":
+		case "png":
 			prop_plugin_img(fullfname);
 			break;
 		case "ts":
@@ -565,7 +587,7 @@ function ni() {
 <body onload="init()">
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Extensions-filemgr=}{=var-set:menu=File Manager (1.0.0)=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu=File Manager (1.0.0)=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 		
 	<table class="mform" width="100%" border="0">

data/y-web/Y_Filemgr_Edit.yhtm

@@ -42,7 +42,7 @@ function ni(){
 {=var-set:wait_text=Speichern (Save).=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Extensions-filemgr=}{=var-set:menu=File Manager: Editor=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu=File Manager: Editor=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 			<table id="prop_toolbar" class="toolbar" cellspacing="1" cellpadding="1">
 			<tr>
@@ -55,7 +55,7 @@ function ni(){
 				<td title="close without save"><a href='javascript:window.close()'><img src="/images/cross.png"/></a></td>
 			</tr>
 			</table>
-	<form name="f" accept-charset="UTF-8" action="/y/cgi?execute=include-block:Y_Filemgr_blocks.txt;edit_save_settings;nix" method="POST">
+	<form name="f" accept-charset="UTF-8" action="/y/cgi?execute=include-block:Y_Blocks_Filemgr.txt;edit_save_settings;nix" method="POST">
 		<textarea id="txt" name="editfile" cols="100" rows="31"  wrap="off" title="Editor" style="width: 100%;">{=include:{=file=}=}</textarea>
 		<input type="hidden" name="tmpl" value="Y_Filemgr_Edit.yhtm"/>
 		<input type="hidden" name="file" value="{=file=}"/>

data/y-web/Y_Info_Help.yhtm

@@ -4,13 +4,13 @@
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Info-Hilfe=}{=var-set:menu={=L:info.help=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:info.help=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<ul>
-		<li><a href="https://wiki.tuxbox-neutrino.org/wiki/Tuxbox-Neutrino" class="exlink" title="User guide for Neutrino" target="_blank">Tuxbox-Wiki Neutrino Help</a></li>
+		<li><a href="https://wiki.tuxbox-neutrino.org/wiki/Tuxbox-Neutrino" class="exlink" title="User guide for Neutrino" target="_blank">Tuxbox-Wiki Neutrino</a></li>
-		<li><a href="https://wiki.tuxbox-neutrino.org/wiki/Neutrino:yWeb" class="exlink" title="yWeb Help from Tuxbox Wiki" target="_blank">Tuxbox-Wiki yWeb Help</a></li>
+		<li><a href="https://wiki.tuxbox-neutrino.org/wiki/Neutrino:yWeb" class="exlink" title="yWeb Help from Tuxbox Wiki" target="_blank">Tuxbox-Wiki yWeb</a></li>
-		<li><a href="https://forum.tuxbox-neutrino.org/forum/" class="exlink" title="Tuxbox Dicussion Forum" target="_blank">Tuxbox Forum</a></li>
+		<li><a href="https://www.tuxbox-neutrino.org/forum" class="exlink" title="Forum" target="_blank">Forum</a></li>
-		<li><a href="http://tuxbox-neutrino.org" class="exlink" title="Tuxbox-Neutrino developers" target="_blank">Sources</a></li>
+		<li><a href="https://github.com/tuxbox-neutrino" class="exlink" title="Sources" target="_blank">Sources</a></li>
 	</ul>
 	</div>
 </div>

data/y-web/Y_Info_Menue.yhtm

@@ -17,7 +17,7 @@ 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_About.yhtm">{=L:info.about=} yWeb</a>
 				</li>
 				<li>
 					<a target="work" href="Y_Info_Help.yhtm">{=L:info.help=}</a>

data/y-web/Y_Info_Updates.yhtm

@@ -13,7 +13,7 @@ function check_updates()
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Info-Auf_Updates_pruefen=}{=var-set:menu={=L:info.check_for_updates=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:info.check_for_updates=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 		<table border="0" cellpadding="2" cellspacing="4">
 		<tr>
@@ -22,7 +22,7 @@ function check_updates()
 				<p>
 				{=ini-get:Y_Version.txt;version=}<br/>
 				{=ini-get:Y_Version.txt;date=}<br/>
-				{=ini-get:Y_Version.txt;type=}<br/><br/>
+				</br>
 				{=ini-get:Y_Version.txt;info=}<br/>
 				</p>
 			</td>
@@ -31,7 +31,7 @@ function check_updates()
 				<p>
 				{=ini-get:/tmp/version.txt;version=}<br/>
 				{=ini-get:/tmp/version.txt;date=}<br/>
-				{=ini-get:/tmp/version.txt;type=}<br/><br/>
+				</br>
 				{=ini-get:/tmp/version.txt;info=}<br/>
 				{=if-empty:{=ini-get:/tmp/version.txt;url=}~~
 				<a href="{=ini-get:/tmp/version.txt;url=}" target="_blank">{=L:download=}</a><br/>

data/y-web/Y_Live_EPG.yhtm

@@ -1,4 +1,5 @@
-{=include-block:Y_Blocks.txt;head=}
+{=include-block:Y_Blocks.txt;head_v3=}
+<script type="text/javascript" src="/jquery/jquery.stickytableheaders.min.js"></script>
 <script type="text/javascript" src="/Y_Baselib.js"></script>
 <script type="text/javascript">
 //<![CDATA[
@@ -109,6 +110,7 @@ function _show_epg()
 		}
 	}
 	show_waitbox(false);
+	jQuery('table').stickyTableHeaders();
 }
 //]]>
 </script>
@@ -127,4 +129,4 @@ function _show_epg()
 	</table>
 	<br />
 </body>
-</html>
+</html>

data/y-web/Y_Main.css

@@ -194,7 +194,7 @@ tr {
 	color: #555555;
 }
 .y_menu_prim li a:hover {
-	color: #FF6600;
+	color: #132cfd;
 }
 /*extensions*/
 .y_menu_prim_ext {
@@ -218,7 +218,7 @@ tr {
 .y_menu_sec_box_head {
 	margin: 0;
 	padding: 0;
-	background: #ff6600;
+	background: #132cfd;
 	border-radius: 4px 4px 0 0;
 
 	-webkit-border-top-left-radius: 4px;
@@ -229,7 +229,7 @@ tr {
 .y_menu_sec_box_head h2 {
 	margin: 0;
 	padding: 5px 5px 5px 10px;
-	font-family: Arial, 'Lucida Grande',Tahoma, Verdana, Geneva, Helvetica, sans-serif;
+	/* font-family: Arial, 'Lucida Grande',Tahoma, Verdana, Geneva, Helvetica, sans-serif; */
 	color: white;
 	font-weight: bold;
 	font-size: 1.2em;
@@ -272,12 +272,12 @@ tr {
 	color: #555555
 }
 .y_menu_sec li a:hover {
-	color: #FF6600;
+	color: #132cfd;
 }
 .y_menu_sec_section {
 	margin: 10px 0px 0px 0px;
 	padding: 3px 2px 3px 10px;
-	background-color: #FFCC99;
+	background-color: #F7F7F7;
 	font-size: 10pt;
 	font-weight: bold;
 }
@@ -321,7 +321,7 @@ tr {
 	margin: 0;
 	padding: 0;
 	text-align: center;
-	background-color: #2188e0;
+	background-color: #132cfd;
 	border-radius: 4px 4px 0 0;
 
 	-webkit-border-top-left-radius: 4px;
@@ -332,7 +332,7 @@ tr {
 .work_box_head h2,.work_box_head_h2 {
 	margin: 0;
 	padding: 5px 20px;
-	font-family: Arial, 'Lucida Grande',Tahoma, Verdana, Geneva, Helvetica, sans-serif;
+	/* font-family: Arial, 'Lucida Grande',Tahoma, Verdana, Geneva, Helvetica, sans-serif; */
 	color: white;
 	font-weight: bold;
 	font-size: 1.2em;
@@ -365,7 +365,7 @@ tr {
 }
 /*raus
 .y_work_table {
-	border: 1px dashed #2188e0;
+	border: 1px dashed #132cfd;
 	border-collapse: collapse;
 	background: white;
 	color: #555555;
@@ -380,7 +380,7 @@ tr {
 	text-align: center;
 	border: 1px solid #6D96A9;
 	border-collapse: collapse;
-	background: #F0FAFF;
+	background: #F7F7F7;
 	border-spacing: 1px;
 	height: auto;
 }
@@ -429,7 +429,7 @@ tr {
 .y_wait_box_head {
 	margin: 0;
 	padding: 0;
-	background: #ff6600;
+	background: #132cfd;
 	border-radius: 4px 4px 0 0;
 
 	-webkit-border-top-left-radius: 4px;
@@ -511,7 +511,7 @@ tr {
 
 .y_topline
 {
-	border-top: 1px solid #2188e0;
+	border-top: 1px solid #132cfd;
 }
 .y_form {
 	margin:0;
@@ -554,11 +554,11 @@ tr {
 .y_text_boxcontrol_button
 {
 	padding : 1px;
-	border : #FF8e42 solid 1px;
+	border : #a0a0a0 solid 1px;
 }
 .y_text_boxcontrol_button a:hover
 {
-	background:#FF8e42;
+	background:#a0a0a0;
 }
 .y_text_boxcontrol_table {
 	width:114px;
@@ -566,14 +566,14 @@ tr {
 	background: url('/images/audiobar.png') no-repeat 1px 1px;
 	padding: 1px;
 	margin-top: 10px;
-	border: #FF8e42 solid 1px;
+	border: #132cfd solid 1px;
 }
 .y_text_boxcontrol_table_progress {
 	width: 114px;
 	height: 12px;
 	padding: 0;
 	margin-bottom: 5px;
-	border: #FF8e42 solid 1px;
+	border: #132cfd solid 1px;
 	border-top: 0 none;
 
 	background: #ffffff; /* Old browsers */
@@ -587,7 +587,7 @@ tr {
 }
 .y_text_boxcontrol_div_progress {
 	width: 112px;
-	border: #FF8e42 solid 1px;
+	border: #132cfd solid 1px;
 	font-size: 9px;
 	margin-top: 5px;
 	margin-bottom: -1px;
@@ -612,7 +612,7 @@ tr {
 	vertical-align: top;
 }
 .bouquetitemlist .logo_cell {
-	background: #A1CCF2;
+	background: #A7A7A7;
 	border-bottom: 1px solid white;
 	margin: 0;
 	padding: 0;
@@ -626,7 +626,7 @@ tr {
 	padding: 0 5px;
 }
 .channel_logo {
-	background: #A1CCF2;
+	background: #A7A7A7;
 	max-width: 175px;
 	max-height: 40px;
 }
@@ -635,7 +635,7 @@ tr {
 }
 .channel_logos
 {
-	background: #A1CCF2;
+	background: #A7A7A7;
 	vertical-align: middle;
 	max-width: 100px;
 	max-height: 40px;
@@ -661,7 +661,7 @@ tr {
 	min-height: 40px;
 }
 .ep_bouquet_name {
-	background: #A1CCF2;
+	background: #A7A7A7;
 	border-right : #BBBBBB solid 1px;
 	overflow:hidden;
 	padding-left: 1px;
@@ -686,7 +686,7 @@ tr {
 	font-size:8pt;
 }
 .ep_bouquet_item:hover {
-	background-color: #D3E7F8;
+	background-color: #D7D7D7;
 }
 .ep_bouquet_item span:hover {
 	cursor: pointer;
@@ -697,7 +697,7 @@ tr {
 /*	height: 1.3em;*/
 	padding-left: 1px;
 	padding-right: 1px;
-	background-color: #FF6600;
+	background-color: #132cfd;
 	height: 100%;
 	font-size:8pt;
 	z-index:10;
@@ -765,6 +765,10 @@ tr {
 	font-size: 8pt;
 	height: 20px;
 }
+/* stream info */
+td.set {
+	vertical-align: top;
+}
 /* bouquet*/
 .bouquetlist
 {
@@ -793,8 +797,8 @@ tr.bouquetlist
 }
 .a
 {
-	background-color: #F0FAFF;
+	background-color: #F7F7F7;
-	font-family:Arial,Sans-Serif;
+	/* font-family:Arial,Sans-Serif; */
 	font-size:11pt;
 	border-spacing: 0px;
 	padding: 0px;
@@ -802,6 +806,9 @@ tr.bouquetlist
 	padding-right: 20px;
 	margin:0px;
 }
+#epglist thead {
+	background-color: #fff;
+}
 #epglist th { 
 	font-weight:bold;
 	text-align: center;
@@ -812,7 +819,7 @@ tr.bouquetlist
 }
 .aepg
 {
-	background-color: #F0FAFF;
+	background-color: #F7F7F7;
 	font-weight:normal;
 	font-size:10pt;
 	padding-left: 10px;
@@ -846,7 +853,7 @@ a:hover.clistsmall
 }
 .c
 {
-	background-color:#D3E7F8;
+	background-color:#D7D7D7;
 	font-weight:bold;
 	font-size:11pt;
 	padding-left: 10px;
@@ -855,7 +862,7 @@ a:hover.clistsmall
 }
 .cepg
 {
-	background-color:#D3E7F8;
+	background-color:#D7D7D7;
 	font-weight:normal;
 	font-size:10pt;
 	padding-left: 10px;
@@ -870,7 +877,7 @@ a:hover.clistsmall
 }
 .cslider_table
 {
-	border: 1px solid #6cafea;
+	border: 1px solid #A0A0A0;
 	width: 30px;
 	border-spacing: 0px;
 	padding: 0px;
@@ -878,15 +885,15 @@ a:hover.clistsmall
 }
 .cslider_used
 {
-	background-color: #A1CCF2;
+	background-color: #A7A7A7;
 }
 .cslider_free
 {
-	background-color: #EAEBFF;
+	background-color: #EAEAEA;
 }
 .cslider_noepg
 {
-	background-color: #FAFAFF;
+	background-color: #FAFAFA;
 }
 .title_table
 {
@@ -926,7 +933,7 @@ a.timer {
 	text-decoration:underline;
 }
 .atimer {
-	background-color: #F0FAFF;
+	background-color: #F7F7F7;
 	text-align: center;
 }
 .btimer {

data/y-web/Y_Menue.yhtm

@@ -109,13 +109,15 @@ function vlc() {
 			<td>
 				<span class="control_icon">
 					<a target="base" href="Y_Tools_Screenshot.yhtm?osd=1" title="{=L:main.remote_full_desc=}"><img src="/images/fb.png"></a>
+<!--					<a target="blank" href="info/yinfo.yhtm" title="{=L:v3.infopage=}"><img src="/images/info.png"></a>-->
 					<a href="javascript:vlc()" title="{=L:main.stream_to_vlc_client_desc=}"><img src="/images/vlc.png"></a>
 				</span>
 			</td>
 			<td align="right">
 				<span id="state" style="color : red;font-family: Courier New, Courier, monospace;">&nbsp;</span>
 				<span id="box_name" {=if-empty:{=ini-get:%(CONFIGDIR)/Y-Web.conf;yweb_box_color=}~~style="color : #{=ini-get:%(CONFIGDIR)/Y-Web.conf;yweb_box_color=};"=}>
-					{=ini-get:%(CONFIGDIR)/Y-Web.conf;yweb_box_name=}</span>
+					<!-- hostname,-->
+					{=if-equal:{=ini-get:%(CONFIGDIR)/Y-Web.conf;yweb_box_name=}~${HOSTNAME}~{=script:Y_Tools get_hostname=}~{=ini-get:%(CONFIGDIR)/Y-Web.conf;yweb_box_name=}=}</span>
 				<span id="clock">00:00</span>
 			</td>
 		</tr>

data/y-web/Y_NetFS-control.yhtm

@@ -0,0 +1,117 @@
+{=var-set:nr=0=} {=include-block:Y_Blocks.txt;netfs_local_dir=}
+{=var-set:nr=1=} {=include-block:Y_Blocks.txt;netfs_local_dir=}
+{=var-set:nr=2=} {=include-block:Y_Blocks.txt;netfs_local_dir=}
+{=var-set:nr=3=} {=include-block:Y_Blocks.txt;netfs_local_dir=}
+{=var-set:nr=4=} {=include-block:Y_Blocks.txt;netfs_local_dir=}
+{=var-set:nr=5=} {=include-block:Y_Blocks.txt;netfs_local_dir=}
+{=var-set:nr=6=} {=include-block:Y_Blocks.txt;netfs_local_dir=}
+{=var-set:nr=7=} {=include-block:Y_Blocks.txt;netfs_local_dir=}
+
+{=var-set:nr=0=} {=include-block:Y_Blocks.txt;netfs_is_mount=}
+{=var-set:nr=1=} {=include-block:Y_Blocks.txt;netfs_is_mount=}
+{=var-set:nr=2=} {=include-block:Y_Blocks.txt;netfs_is_mount=}
+{=var-set:nr=3=} {=include-block:Y_Blocks.txt;netfs_is_mount=}
+{=var-set:nr=4=} {=include-block:Y_Blocks.txt;netfs_is_mount=}
+{=var-set:nr=5=} {=include-block:Y_Blocks.txt;netfs_is_mount=}
+{=var-set:nr=6=} {=include-block:Y_Blocks.txt;netfs_is_mount=}
+{=var-set:nr=7=} {=include-block:Y_Blocks.txt;netfs_is_mount=}
+
+{=include-block:Y_Blocks.txt;head_v3=}
+<script type="text/javascript">
+//<![CDATA[
+function edit_popup()
+{
+	popup = window.open('/Y_Filemgr_Edit.yhtm?file={=if-file-exists:/var/etc/{=L:v3.netfs-{=mount_type=}=}~/var/etc/{=L:v3.netfs-{=mount_type=}=}~/etc/{=L:v3.netfs-{=mount_type=}=}=}', 'edit', 'width=800,height=600,resizable=yes');
+	check_popup();
+}
+
+function check_popup()
+{
+	if(popup.closed == true)
+	{
+		restart_menu();
+	}
+	else
+	{
+		wait_for_popup();
+	}
+}
+
+function wait_for_popup()
+{
+	window.setTimeout("check_popup()", 10);
+}
+
+function restart_menu()
+{
+	alert('{=L:v3.netfs-control.restart_menu=}');
+	window.document.location.href='/Y_NetFS-init.yhtm?mount_type={=mount_type=}&mount_type_s={=mount_type_s=}';
+}
+
+function do_submit()
+{
+	show_waitbox(true);
+	document.f.submit();
+}
+//]]>
+</script>
+</head>
+<body>
+{=var-set:wait_text={=L:v3.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:v3.netfs-control.title=}=}{=include-block:Y_Blocks.txt;work_menu=}
+	</div></div>
+	<div class="work_box_body">
+	<table class="y_invisible_table" cellpadding="5">
+		<tr>
+			<td class="y_form_header" width="30%">
+				{=L:v3.netfs-control.entrys=} {=L:v3.netfs-{=mount_type=}=}
+			</td>
+			<td class="y_form_header">
+				<a href="javascript:edit_popup();" title="{=L:v3.edit=}: {=L:v3.netfs-{=mount_type=}=}">
+					<img src="/images/modify.png">
+				</a>
+				{=if-equal:{=mount_type=}~0~
+				<a href="javascript:Y_v3_Tools('do_mount_all', 5000);" title="{=L:v3.netfs-control.mount_all=}">
+					<img src="/images/server_add.png">
+				</a>
+				<a href="javascript:Y_v3_Tools('do_umount_all', 5000);" title="{=L:v3.netfs-control.umount_all=}">
+					<img src="/images/server_delete.png">
+				</a>
+				~
+				=}
+				{=if-equal:{=mount_type=}~1~
+				<a href="javascript:Y_v3_Tools('do_autofs restart', 5000);" title="{=L:v3.netfs-control.autofs_restart=}">
+					<img src="/images/server_link.png">
+				</a>
+				~
+				=}
+			</td>
+		</tr>
+		{=var-set:nr=0=} {=include-block:Y_Blocks.txt;netfs_table_row=}
+		{=var-set:nr=1=} {=include-block:Y_Blocks.txt;netfs_table_row=}
+		{=var-set:nr=2=} {=include-block:Y_Blocks.txt;netfs_table_row=}
+		{=var-set:nr=3=} {=include-block:Y_Blocks.txt;netfs_table_row=}
+		{=var-set:nr=4=} {=include-block:Y_Blocks.txt;netfs_table_row=}
+		{=var-set:nr=5=} {=include-block:Y_Blocks.txt;netfs_table_row=}
+		{=var-set:nr=6=} {=include-block:Y_Blocks.txt;netfs_table_row=}
+		{=var-set:nr=7=} {=include-block:Y_Blocks.txt;netfs_table_row=}
+	</table>
+	<br />
+	<button type="button" ytype="save" title="{=L:v3.save=}: {=L:v3.netfs-{=mount_type=}=}" onclick="$('out').update(''); goUrl('/y/cgi?execute=func:netfs_write_config {=mount_type=}')">{=L:v3.save=}</button>
+	{=if-equal:{=mount_type=}~1~
+	<button type="button" ytype="refresh" title="{=L:v3.netfs-control.autofs_restart=}" onclick="Y_v3_Tools('do_autofs restart', 5000)">{=L:v3.reload=}</button>
+	~
+	=}
+	</div>
+</div>
+<div class="work_box">
+	<div class="work_box_head"><div class="work_box_head_h2">
+	{=var-set:menu={=L:answer=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	<div class="work_box_body">
+		<div id="out"></div>
+	</div>
+</div>
+</body>
+</html>

data/y-web/Y_NetFS-edit.yhtm

@@ -0,0 +1,97 @@
+{=include-block:Y_Blocks.txt;head_v3=}
+<script type="text/javascript">
+//<![CDATA[
+function form_init()
+{
+	if (document.f.type[0].checked == 1)
+	{
+		document.f.username.disabled=true;
+		document.f.password.disabled=true;
+	}
+	else
+	{
+		document.f.username.disabled=false;
+		document.f.password.disabled=false;
+	}
+}
+function do_submit()
+{
+	show_waitbox(true);
+	document.f.submit();
+}
+//]]>
+</script>
+</head>
+<body onload="form_init()">
+{=var-set:wait_text={=L:v3.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:v3.netfs-control.title=} ({=L:v3.edit=}: {=L:v3.netfs-{=mount_type=}=} - {=nr=})=}{=include-block:Y_Blocks.txt;work_menu=}
+	</div></div>
+	<div class="work_box_body">
+	<form name="f" action="/y/cgi">
+		<input type="hidden" name="mount_type" value="{=mount_type=}"/>
+		<input type="hidden" name="mount_type_s" value="{=mount_type_s=}"/>
+		<input type="hidden" name="nr" value="{=nr=}"/>
+		<table border="0" class="y_form_table">
+			<tr>
+				<td>{=L:v3.netfs-control.type=}</td>
+				<td>
+					<input onclick="form_init();" type="radio" name="type" value="0" {=if-equal:{=ini-get:%(CONFIGDIR)/neutrino.conf;netfs_{=mount_type_s=}_type_{=nr=}~open=}~0~checked="checked"~=} />NFS
+					<input onclick="form_init();" type="radio" name="type" value="1" {=if-equal:{=ini-get:%(CONFIGDIR)/neutrino.conf;netfs_{=mount_type_s=}_type_{=nr=}~cache=}~1~checked="checked"~=} />CIFS
+				</td>
+			</tr>
+			<tr>
+				<td>{=L:v3.netfs-control.ip=}</td>
+				<td><input type="text" name="ip" size="15" maxlength="15" value="{=ini-get:%(CONFIGDIR)/neutrino.conf;netfs_{=mount_type_s=}_ip_{=nr=}~cache=}" /></td>
+			</tr>
+			<tr>
+				<td>{=L:v3.netfs-control.dir=}</td>
+				<td><input type="text" name="dir" size="30" value="{=ini-get:%(CONFIGDIR)/neutrino.conf;netfs_{=mount_type_s=}_dir_{=nr=}~cache=}" /></td>
+			</tr>
+			<tr>
+				<td>{=L:v3.netfs-control.local_dir=}</td>
+				<td><input type="text" name="localdir" size="30" value="{=ini-get:%(CONFIGDIR)/neutrino.conf;netfs_{=mount_type_s=}_local_dir_{=nr=}~cache=}" /></td>
+			</tr>
+			<tr>
+				<td>{=L:v3.netfs-control.options=} 1</td>
+				<td><input type="text" name="opt1" size="30" value="{=ini-get:%(CONFIGDIR)/neutrino.conf;netfs_{=mount_type_s=}_mount_options1_{=nr=}~cache=}" /></td>
+			</tr>
+			<tr>
+				<td>{=L:v3.netfs-control.options=} 2</td>
+				<td><input type="text" name="opt2" size="30" value="{=ini-get:%(CONFIGDIR)/neutrino.conf;netfs_{=mount_type_s=}_mount_options2_{=nr=}~cache=}" /></td>
+			</tr>
+			<tr>
+				<td>{=L:v3.netfs-control.user=}</td>
+				<td><input type="text" name="username" size="30" value="{=ini-get:%(CONFIGDIR)/neutrino.conf;netfs_{=mount_type_s=}_username_{=nr=}~cache=}" /></td>
+			</tr>
+			<tr>
+				<td>{=L:v3.netfs-control.password=}</td>
+				<td><input type="text" name="password" size="30" value="{=ini-get:%(CONFIGDIR)/neutrino.conf;netfs_{=mount_type_s=}_password_{=nr=}~cache=}" /></td>
+			</tr>
+			<tr>
+				<td>{=L:v3.netfs-control.dump=}</td>
+				<td><input type="text" name="dump" size="3" maxlength="3" value="{=ini-get:%(CONFIGDIR)/neutrino.conf;netfs_{=mount_type_s=}_dump_{=nr=}~cache=}" /></td>
+			</tr>
+			<tr>
+				<td>{=L:v3.netfs-control.pass=}</td>
+				<td><input type="text" name="pass" size="3" maxlength="3" value="{=ini-get:%(CONFIGDIR)/neutrino.conf;netfs_{=mount_type_s=}_pass_{=nr=}~cache=}" /></td>
+			</tr>
+			<tr>
+				<td>{=L:v3.netfs-control.active=}</td>
+				<td>
+					<input type="radio" name="active" value="1" {=if-equal:{=ini-get:%(CONFIGDIR)/neutrino.conf;netfs_{=mount_type_s=}_active_{=nr=}~cache=}~1~checked="checked"~=} />{=L:on=}
+					<input type="radio" name="active" value="0" {=if-equal:{=ini-get:%(CONFIGDIR)/neutrino.conf;netfs_{=mount_type_s=}_active_{=nr=}~cache=}~0~checked="checked"~=} />{=L:off=}
+				</td>
+			</tr>
+		</table>
+		<br/>
+		<input type="hidden" name="tmpl" value="Y_NetFS-control.yhtm"/>
+		<input type="hidden" name="execute" value="func:netfs_set_values"/>
+		<button type="button" ytype="accept_" title="ok" onClick="do_submit()">OK</button>
+		<button type="button" ytype="cancel_" title="{=L:cancel=}" name="abort" onClick='window.document.location.href="/Y_NetFS-control.yhtm?mount_type={=mount_type=}&mount_type_s={=mount_type_s=}"'>{=L:v3.cancel=}</button>
+	</form>
+	</div>
+</div>
+</body>
+</html>

data/y-web/Y_NetFS-init.yhtm

@@ -0,0 +1,21 @@
+{=include-block:Y_Blocks.txt;head_v3=}
+<script type="text/javascript">
+//<![CDATA[
+jQuery(document).ready(function(){
+        window.document.location.href='/Y_NetFS-control.yhtm?mount_type={=mount_type=}&mount_type_s={=mount_type_s=}';
+});
+//]]>
+</script>
+</head>
+<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_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=}=}
+	</div>
+</div>
+</body>
+</html>

data/y-web/Y_PZapit-control.yhtm

@@ -0,0 +1,49 @@
+{=include-block:Y_Blocks.txt;head_v3=}
+</head>
+<body>
+<div class="work_box">
+	<div class="work_box_head"><div class="work_box_head_h2">
+	{=var-set:menu={=L:v3.pzapit-control.title=}=}{=include-block:Y_Blocks.txt;work_menu=}
+	</div></div>
+	<div class="work_box_body">
+	<form action="">
+		<table class="y_invisible_table" cellpadding="5" width="100%">
+			<tr>
+				<td class="y_form_header" width="48%">{=L:v3.pzapit-control.resolution=}</td>
+				<td class="y_form_header" width="48%">{=L:v3.pzapit-control.43mode=}</td>
+			</tr>
+			<tr>
+				<td>
+					<input type="button" value="1080i" onclick='$("out").update(""); goUrl("/control/exec?Y_v3_Tools&amp;resolution&amp;1080");' />
+					<input type="button" value="720p"  onclick='$("out").update(""); goUrl("/control/exec?Y_v3_Tools&amp;resolution&amp;720");' />
+					<input type="button" value="Pal"   onclick='$("out").update(""); goUrl("/control/exec?Y_v3_Tools&amp;resolution&amp;pal");' />
+				</td>
+				<td>
+					<input type="button" value="Letterbox"           onclick='$("out").update(""); goUrl("/control/exec?Y_v3_Tools&amp;43mode&amp;1");' />
+					<input type="button" value="Pan &amp; Scan"      onclick='$("out").update(""); goUrl("/control/exec?Y_v3_Tools&amp;43mode&amp;2");' />
+					<input type="button" value="14:9 Pan &amp; Scan" onclick='$("out").update(""); goUrl("/control/exec?Y_v3_Tools&amp;43mode&amp;3");' />
+				</td>
+			</tr>
+			<tr>
+				<td class="y_form_header" width="48%">{=L:v3.pzapit-control.channellists=}</td>
+				<td class="y_form_header" width="48%">{=L:v3.pzapit-control.tuner=}</td>
+			</tr>
+				<td>
+					<input type="button" value="{=L:v3.reload=}" title="{=L:v3.dblclick=}" ondblclick='$("out").update(""); goUrl("/control/exec?Y_v3_Tools&amp;reload_channellists");' />
+				</td>
+				<td>
+					<input type="button" value="{=L:v3.reset=}"  title="{=L:v3.dblclick=}" ondblclick='$("out").update(""); goUrl("/control/exec?Y_v3_Tools&amp;reset_tuner");' />
+				</td>
+		</table>
+	</form>
+	</div>
+</div>
+<div class="work_box">
+	<div class="work_box_head"><div class="work_box_head_h2">
+	{=var-set:menu={=L:answer=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	<div class="work_box_body">
+		<div id="out"></div>
+	</div>
+</div>
+</body>
+</html>

data/y-web/Y_Plugin-control.yhtm

@@ -0,0 +1,365 @@
+{=var-set:_p_list_so={=script:Y_v3_Tools p_list so=}=}
+{=var-set:_p_list_sh={=script:Y_v3_Tools p_list sh=}=}
+{=var-set:_p_list_lua={=script:Y_v3_Tools p_list lua=}=}
+
+{=var-set:r_minidlnad={=script:Y_v3_Tools is_running minidlnad=}=}
+{=var-set:minidlnadport={=script:Y_v3_Tools get_minidlnad_webif_port=}=}
+
+{=var-set:r_xupnpd={=script:Y_v3_Tools is_running xupnpd=}=}
+{=var-set:xupnpdport={=script:Y_v3_Tools get_xupnpd_webif_port=}=}
+
+{=include-block:Y_Blocks.txt;head_v3=}
+</head>
+<body onload='goUrl("/control/reloadplugins");'>
+{=var-set:wait_text={=L:v3.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:v3.plugin-control.title=}=}{=include-block:Y_Blocks.txt;work_menu=}
+	</div></div>
+	<div class="work_box_body">
+	<form action="">
+		<table class="y_invisible_table" cellpadding="5" width="100%">
+			<tr>
+				<td class="y_form_header" width="35%">{=L:v3.plugin-control.manage=}</td>
+				<td class="y_form_header" width="5%">&nbsp;</td>
+				<td class="y_form_header">&nbsp;</td>
+				<td class="y_form_header">&nbsp;</td>
+			</tr>
+			<!-- fritzcallmonitor -->
+			<tr class="list">
+				<td>
+					<img src="images/{=if-file-exists:/var/etc/.fritzcallmonitor~check_green~x_red=}.png" class="status">
+					FritzCallMonitor
+				</td>
+				<td>
+					{=if-file-exists:/var/etc/.fritzcallmonitor~
+					<input type="button" value="{=L:v3.stop=}" onclick='Y_v3_Tools("p_fcm_stop", 5000);'/>
+					~
+					<input type="button" value="{=L:v3.start=}" onclick='Y_v3_Tools("p_fcm_start", 5000);'/>
+					=}
+				</td>
+				<td>
+					<input type="button" value="{=L:v3.configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/FritzCallMonitor.cfg","edit", "width=800,height=600,resizable=yes");' />
+				</td>
+				<td>
+					<input type="button" value="{=L:v3.plugin-tools.fcm-addr=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/FritzCallMonitor.addr","edit", "width=800,height=600,resizable=yes");' />
+				</td>
+			</tr>
+			<!-- nfs-server -->
+			<tr class="list">
+				<td>
+					<img src="images/{=if-file-exists:/var/etc/.nfsd~check_green~x_red=}.png" class="status">
+					NFS-Server
+				</td>
+				<td>
+					{=if-file-exists:/var/etc/.nfsd~
+					<input type="button" value="{=L:v3.stop=}" onclick='Y_v3_Tools("p_nfs_stop", 5000);'/>
+					~
+					<input type="button" value="{=L:v3.start=}" onclick='Y_v3_Tools("p_nfs_start", 5000);'/>
+					=}
+				</td>
+				<td>
+					<input type="button" value="{=L:v3.configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/etc/exports","edit", "width=800,height=600,resizable=yes");' />
+				</td>
+				<td>
+				</td>
+			</tr>
+			<!-- samba-server -->
+			<tr class="list">
+				<td>
+					<img src="images/{=if-file-exists:/var/etc/.samba~check_green~x_red=}.png" class="status">
+					Samba-Server
+				</td>
+				<td>
+					{=if-file-exists:/var/etc/.samba~
+					<input type="button" value="{=L:v3.stop=}" onclick='Y_v3_Tools("p_samba_stop", 5000);'/>
+					~
+					<input type="button" value="{=L:v3.start=}" onclick='Y_v3_Tools("p_samba_start", 5000);'/>
+					=}
+				</td>
+				<td>
+					<input type="button" value="{=L:v3.configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file={=if-file-exists:/etc/samba/smb.conf~/etc/samba/smb.conf~/etc/smb.conf=}","edit", "width=800,height=600,resizable=yes");' />
+				</td>
+				<td>
+				</td>
+			</tr>
+			<!-- tuxcal -->
+			<tr class="list">
+				<td>
+					<img src="images/{=if-file-exists:/var/etc/.tuxcald~check_green~x_red=}.png" class="status">
+					TuxCal
+				</td>
+				<td>
+					{=if-file-exists:/var/etc/.tuxcald~
+					<input type="button" value="{=L:v3.stop=}" onclick='Y_v3_Tools("p_tuxcald_stop", 5000);'/>
+					~
+					<input type="button" value="{=L:v3.start=}" onclick='Y_v3_Tools("p_tuxcald_start", 5000);'/>
+					=}
+				</td>
+				<td>
+					<input type="button" value="{=L:v3.configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/tuxcal/tuxcal.conf","edit", "width=800,height=600,resizable=yes");' />
+				</td>
+				<td>
+				</td>
+			</tr>
+			<!-- tuxmail -->
+			<tr class="list">
+				<td>
+					<img src="images/{=if-file-exists:/var/etc/.tuxmaild~check_green~x_red=}.png" class="status">
+					TuxMail
+				</td>
+				<td>
+					{=if-file-exists:/var/etc/.tuxmaild~
+					<input type="button" value="{=L:v3.stop=}" onclick='Y_v3_Tools("p_tuxmaild_stop", 5000);'/>
+					~
+					<input type="button" value="{=L:v3.start=}" onclick='Y_v3_Tools("p_tuxmaild_start", 5000);'/>
+					=}
+				</td>
+				<td>
+					<input type="button" value="{=L:v3.configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/tuxmail/tuxmail.conf","edit", "width=800,height=600,resizable=yes");' />
+				</td>
+				<td>
+				</td>
+			</tr>
+			<!-- inadyn -->
+			<tr class="list">
+				<td>
+					<img src="images/{=if-file-exists:/var/etc/.inadyn~check_green~x_red=}.png" class="status">
+					Inadyn
+				</td>
+				<td>
+					{=if-file-exists:/var/etc/.inadyn~
+					<input type="button" value="{=L:v3.stop=}" onclick='Y_v3_Tools("p_inadyn_stop", 5000);'/>
+					~
+					<input type="button" value="{=L:v3.start=}" onclick='Y_v3_Tools("p_inadyn_start", 5000);'/>
+					=}
+				</td>
+				<td>
+					<input type="button" value="{=L:v3.configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/etc/inadyn.conf","edit", "width=800,height=600,resizable=yes");' />
+				</td>
+				<td>
+				</td>
+			</tr>
+			<!-- dropbear -->
+			<tr class="list">
+				<td>
+					<img src="images/{=if-file-exists:/var/etc/.dropbear~check_green~x_red=}.png" class="status">
+					Dropbear
+				</td>
+				<td>
+					{=if-file-exists:/var/etc/.dropbear~
+					<input type="button" value="{=L:v3.stop=}" onclick='Y_v3_Tools("p_dropbear_stop", 5000);'/>
+					~
+					<input type="button" value="{=L:v3.start=}" onclick='Y_v3_Tools("p_dropbear_start", 5000);'/>
+					=}
+				</td>
+				<td>
+					&nbsp;
+				</td>
+				<td>
+				</td>
+			</tr>
+			<!-- ushare -->
+			<tr class="list">
+				<td>
+					<img src="images/{=if-file-exists:/var/etc/.ushare~check_green~x_red=}.png" class="status">
+					uShare
+				</td>
+				<td>
+					{=if-file-exists:/var/etc/.ushare~
+					<input type="button" value="{=L:v3.stop=}" onclick='Y_v3_Tools("p_ushare_stop", 5000);'/>
+					~
+					<input type="button" value="{=L:v3.start=}" onclick='Y_v3_Tools("p_ushare_start", 5000);'/>
+					=}
+				</td>
+				<td>
+					<input type="button" value="{=L:v3.configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/etc/ushare.conf","edit", "width=800,height=600,resizable=yes");' />
+				</td>
+				<td>
+				</td>
+			</tr>
+			<!-- minidlna -->
+			<tr class="list">
+				<td>
+					<img src="images/{=if-file-exists:/var/etc/.minidlnad~check_green~x_red=}.png" class="status">
+					MiniDLNA
+				</td>
+				<td>
+					{=if-file-exists:/var/etc/.minidlnad~
+					<input type="button" value="{=L:v3.stop=}" onclick='Y_v3_Tools("p_minidlna_stop", 5000);'/>
+					~
+					<input type="button" value="{=L:v3.start=}" onclick='Y_v3_Tools("p_minidlna_start", 5000);'/>
+					=}
+				</td>
+				<td>
+					&nbsp;
+				</td>
+				<td>
+					{=if-equal:{=var-get:r_minidlnad=}~true~
+					<input type="button" value="WebInterface" onclick='goPort("{=var-get:minidlnadport=}");' />
+					~
+					=}
+				</td>
+			</tr>
+			<!-- djmount -->
+			<tr class="list">
+				<td>
+					<img src="images/{=if-file-exists:/var/etc/.djmount~check_green~x_red=}.png" class="status">
+					djmount
+				</td>
+				<td>
+					{=if-file-exists:/var/etc/.djmount~
+					<input type="button" value="{=L:v3.stop=}" onclick='Y_v3_Tools("p_djmount_stop", 5000);'/>
+					~
+					<input type="button" value="{=L:v3.start=}" onclick='Y_v3_Tools("p_djmount_start", 5000);'/>
+					=}
+				</td>
+				<td>
+					&nbsp;
+				</td>
+				<td>
+				</td>
+			</tr>
+			<!-- xupnpd -->
+			<tr class="list">
+				<td>
+					<img src="images/{=if-file-exists:/var/etc/.xupnpd~check_green~x_red=}.png" class="status">
+					xupnpd
+				</td>
+				<td>
+					{=if-file-exists:/var/etc/.xupnpd~
+					<input type="button" value="{=L:v3.stop=}" onclick='Y_v3_Tools("p_xupnpd_stop", 5000);'/>
+					~
+					<input type="button" value="{=L:v3.start=}" onclick='Y_v3_Tools("p_xupnpd_start", 5000);'/>
+					=}
+				</td>
+				<td>
+					&nbsp;
+				</td>
+				<td>
+					{=if-equal:{=var-get:r_xupnpd=}~true~
+					<input type="button" value="WebInterface" onclick='goPort("{=var-get:xupnpdport=}");' />
+					~
+					=}
+				</td>
+			</tr>
+			<!-- crond -->
+			<tr class="list">
+				<td>
+					<img src="images/{=if-file-exists:/var/etc/.crond~check_green~x_red=}.png" class="status">
+					crond
+				</td>
+				<td>
+					{=if-file-exists:/var/etc/.crond~
+					<input type="button" value="{=L:v3.stop=}" onclick='Y_v3_Tools("p_crond_stop", 5000);'/>
+					~
+					<input type="button" value="{=L:v3.start=}" onclick='Y_v3_Tools("p_crond_start", 5000);'/>
+					=}
+				</td>
+				<td>
+					&nbsp;
+				</td>
+				<td>
+				</td>
+			</tr>
+			<tr>
+				<td><hr></td>
+				<td><hr></td>
+				<td><hr></td>
+				<td><hr></td>
+			</tr>
+			<!-- EPGscan -->
+			<tr class="list">
+				<td>
+					<img src="images/blank.png" class="status">
+					EPGscan
+				</td>
+				<td>
+					&nbsp;
+				</td>
+				<td>
+					<input type="button" value="{=L:v3.configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/EPGscan.conf","edit", "width=800,height=600,resizable=yes");' />
+				</td>
+				<td>
+					<input type="button" value="{=L:v3.plugin-tools.epgscan-dat=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/EPGscan.dat","edit", "width=800,height=600,resizable=yes");' />
+				</td>
+			</tr>
+			<!-- pr-auto-timer -->
+			<tr class="list">
+				<td>
+					<img src="images/blank.png" class="status">
+					Auto Timer
+				</td>
+				<td>
+					&nbsp;
+				</td>
+				<td>
+					<input type="button" value="{=L:v3.configure=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/pr-auto-timer.conf","edit", "width=800,height=600,resizable=yes");' />
+				</td>
+				<td>
+					<input type="button" value="{=L:v3.plugin-tools.pat-rules=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/pr-auto-timer.rules","edit", "width=800,height=600,resizable=yes");' />
+				</td>
+			</tr>
+			<!-- RSS-Reader -->
+			<tr class="list">
+				<td>
+					<img src="images/blank.png" class="status">
+					RSS-Reader
+				</td>
+				<td>
+					&nbsp;
+				</td>
+				<td>
+					&nbsp;
+				</td>
+				<td>
+					<input type="button" value="{=L:v3.plugin-tools.rssreader-conf=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/tuxbox/config/rssreader.conf","edit", "width=800,height=600,resizable=yes");' />
+				</td>
+			</tr>
+			<!-- 2webTVxml -->
+			<tr class="list">
+				<td>
+					<img src="images/blank.png" class="status">
+					2webTVxml
+				</td>
+				<td>
+					&nbsp;
+				</td>
+				<td>
+					&nbsp;
+				</td>
+				<td>
+					<input type="button" value="{=L:v3.plugin-tools.2webtvxmlurls-conf=}" onclick='window.open("/Y_Filemgr_Edit.yhtm?file=/var/tuxbox/config/2webTVxmlUrls.conf","edit", "width=800,height=600,resizable=yes");' />
+				</td>
+			</tr>
+		</table>
+		</br>
+		<table class="y_invisible_table" cellpadding="5" width="100%">
+			<tr>
+				<td class="y_form_header" width="35%">{=L:v3.plugin-control.blue=}</td>
+				<td class="y_form_header">&nbsp;</td>
+			</tr>
+			{=var-get:_p_list_so=}
+			<tr>
+				<td><hr></td>
+				<td><hr></td>
+			</tr>
+			{=var-get:_p_list_sh=}
+			<tr>
+				<td><hr></td>
+				<td><hr></td>
+			</tr>
+			{=var-get:_p_list_lua=}
+		</table>
+	</form>
+	</div>
+</div>
+<div class="work_box">
+	<div class="work_box_head"><div class="work_box_head_h2">
+	{=var-set:menu={=L:answer=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	<div class="work_box_body">
+		<div id="out"></div>
+	</div>
+</div>
+</body>
+</html>

data/y-web/Y_Settings_Backup.yhtm

@@ -36,7 +36,7 @@ function do_backup2()
 {=var-set:wait_text=Settings=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-		{=var-set:help_url=Help-Settings-Backup_Restore=}{=var-set:menu={=L:set.menue.backup_restore=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:set.menue.backup_restore=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 		<p><div style="border: 1px solid #cccccc; margin-top:20px; padding: 10px;">
 			<img src="/images/cross.png">
@@ -56,7 +56,7 @@ function do_backup2()
 		<tr>
 			<td>
 				<form name="f" method="post" enctype="multipart/form-data" action="/control/exec?Y_Tools&amp;settings_backup_restore&amp;restore">
-					tar-File:&nbsp;<input type="file" name="filename" size="70"/>&nbsp;<br/>
+					tar.gz-File:&nbsp;<input type="file" name="filename" size="70"/>&nbsp;<br/>
 					<input type="button" name="su" value="{=L:set.settings.restore=}" title="{=L:set.settings.restore_desc=}" onclick="do_submit()"/>
 					<br/><br/>
 				</form>

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_camds', 'secmenu_camds');
 	add_yExtensions('settings_plugins', 'secmenu_plugins');
 }
 </script>
@@ -79,6 +80,11 @@ function init(){
 					{=var-set:m_link_text={=L:set.menue.pictureviewer=}=}
 					{=include-block:Y_Blocks.txt;management_link=}
 				</li>
+				<li>
+					{=var-set:m_link_href=Y_Settings_xmltv.yhtm=}
+					{=var-set:m_link_text={=L:set.menue.xmltv=}=}
+					{=include-block:Y_Blocks.txt;management_link=}
+				</li>
 				{=if-equal:{=ini-get:%(CONFIGDIR)/neutrino.conf;glcd_enable;0=}~1~
 				<li>
 					{=var-set:m_link_href=Y_Settings_glcd.yhtm=}
@@ -102,11 +108,6 @@ function init(){
 					{=var-set:m_link_text={=L:set.menue.lcd_display=}=}
 					{=include-block:Y_Blocks.txt;management_link=}
 				</li>
-				<li>
-					{=var-set:m_link_href=Y_Settings_xmltv.yhtm=}
-					{=var-set:m_link_text={=L:set.menue.xmltv=}=}
-					{=include-block:Y_Blocks.txt;management_link=}
-				</li>
 				<li>
 					{=var-set:m_link_href=Y_Settings_buttons.yhtm=}
 					{=var-set:m_link_text={=L:set.menue.key_settings=}=}
@@ -125,10 +126,23 @@ function init(){
 				-->
 			</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_Plugin-control.yhtm=}
+					{=var-set:m_link_text={=L:v3.plugin-control=}=}
+					{=include-block:Y_Blocks.txt;management_link=}
 				</li>
 			</ul>
 		</div>

data/y-web/Y_Settings_automount.yhtm

@@ -4,7 +4,7 @@
 //<![CDATA[
 function automount_edit()
 {
-	var mstr = loadSyncURL("/control/exec?Y_Tools&automount_getline&{=if-file-exists:/var/etc/auto.net~/var/etc/auto.net~/etc/auto.net=}&{=R1=}");
+	var mstr = loadSyncURL("/control/exec?Y_Tools&automount_getline&/var/etc/auto.net&{=R1=}");
 	mstr = mstr.replace(/\t/gi," ");
 	mstr = mstr.replace(/[ ]+/gi," ");
 
@@ -133,7 +133,7 @@ function change_type()
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head">
-		<div class="work_box_head_h2">{=var-set:help_url=Help-Tools-AutoMount=}{=var-set:menu=AutoMount=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+		<div class="work_box_head_h2">{=var-set:menu=AutoMount=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" action="/y/cgi">
 		<input type="hidden" name="nr" value="{=R1=}"/>

data/y-web/Y_Settings_automount_liste.yhtm

@@ -36,7 +36,7 @@ function do_delete()
 {=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head">
-		<div class="work_box_head_h2">{=var-set:help_url=Help-Tools-AutoMount=}{=var-set:menu=AutoMount=}{=include-block:Y_Blocks.txt;work_menu=}</div>
+		<div class="work_box_head_h2">{=var-set:menu=AutoMount=}{=include-block:Y_Blocks.txt;work_menu=}</div>
 	</div>
 	<div class="work_box_body">
 	<form action="/y/cgi" name="f" id="f">
@@ -51,6 +51,6 @@ function do_delete()
 	</form>
 	</div>
 </div>
-{=include-block:Y_neutrino_Blocks.txt;neutrino_form_helpbox=}
+{=include-block:Y_Blocks_Neutrino.txt;neutrino_form_helpbox=}
 </body>
 </html>

data/y-web/Y_Settings_buttons.yhtm

@@ -211,7 +211,7 @@ function do_submit()
 {=var-set:wait_text=Werte werden übernommen (Save).=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-Buttons=}{=var-set:menu=Tastenbelegung=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu=Tastenbelegung=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 		<form name="f" class="y_form" action="">
 			<table cellspacing="0" border="0" cellpadding="2" width="100%">
@@ -330,8 +330,8 @@ function do_submit()
 			<br />
 			<input type="hidden" name="execute" value="include-block:Y_Blocks.txt;buttons_save_settings;nix" />
 			<button type="button" ytype="save" title="submit and save values" onclick="do_submit()">Speichern</button>
-			&nbsp;<button type="button" ytype="refresh" onclick="stb_reload_neutrino()">reload Neutrino</button>
+			&nbsp;
-			&nbsp;<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">Hilfe</a>
+			<button type="button" ytype="refresh" onclick="stb_reload_neutrino()">reload Neutrino</button>
 		</form>
 	</div>
 </div>

data/y-web/Y_Settings_glcd.yhtm

@@ -62,7 +62,7 @@ function do_submit()
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-LCD=}{=var-set:menu=GLCD Einstellungen=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu=GLCD Einstellungen=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" class="y_form" action="">
 		<table cellspacing="0" border="0" cellpadding="2" width="100%">
@@ -117,9 +117,9 @@ function do_submit()
 		</table>
 		<br />
 		<input type="hidden" name="execute" value="include-block:Y_Blocks.txt;glcd_save_settings;nix" />
-		<button type="button" ytype="save" title="submit and save values" onclick="do_submit()">Speichern</button>&nbsp;
+		<button type="button" ytype="save" title="submit and save values" onclick="do_submit()">Speichern</button>
-		<button type="button" ytype="refresh" onclick="stb_reload_neutrino()">reload Neutrino</button>&nbsp;
+		&nbsp;
-		<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">Hilfe</a>
+		<button type="button" ytype="refresh" onclick="stb_reload_neutrino()">reload Neutrino</button>
 	</form>
 	</div>
 </div>

data/y-web/Y_Settings_lcd.yhtm

@@ -71,7 +71,7 @@ function do_submit()
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-LCD=}{=var-set:menu=LCD Einstellungen=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu=LCD Einstellungen=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" class="y_form" action="">
 		<table cellspacing="0" border="0" cellpadding="2" width="100%">
@@ -157,9 +157,9 @@ function do_submit()
 		</table>
 		<br />
 		<input type="hidden" name="execute" value="include-block:Y_Blocks.txt;lcd_save_settings;nix" />
-		<button type="button" ytype="save" title="submit and save values" onclick="do_submit()">Speichern</button>&nbsp;
+		<button type="button" ytype="save" title="submit and save values" onclick="do_submit()">Speichern</button>
-		<button type="button" ytype="refresh" onclick="stb_reload_neutrino()">reload Neutrino</button>&nbsp;
+		&nbsp;
-		<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">Hilfe</a>
+		<button type="button" ytype="refresh" onclick="stb_reload_neutrino()">reload Neutrino</button>
 	</form>
 	</div>
 </div>

data/y-web/Y_Settings_mount.yhtm

@@ -22,7 +22,7 @@ function do_submit()
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head">
-		<div class="work_box_head_h2">{=var-set:help_url=Help-Tools-Mounts=}{=var-set:menu=Mount {=R1=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+		<div class="work_box_head_h2">{=var-set:menu=Mount {=R1=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" action="/y/cgi">
 		<input type="hidden" name="nr" value="{=R1=}"/>
@@ -83,4 +83,4 @@ function do_submit()
 	</div>
 </div>
 </body>
-</html>
+</html>

data/y-web/Y_Settings_mount_liste.yhtm

@@ -27,7 +27,7 @@ function do_edit()
 {=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head">
-		<div class="work_box_head_h2">{=var-set:help_url=Help-Tools-Mounts=}{=var-set:menu=Mount=}{=include-block:Y_Blocks.txt;work_menu=}</div>
+		<div class="work_box_head_h2">{=var-set:menu=Mount=}{=include-block:Y_Blocks.txt;work_menu=}</div>
 	</div>
 	<div class="work_box_body">
 	<form action="/y/cgi" name="f" id="f">
@@ -40,6 +40,6 @@ function do_edit()
 	</form>
 	</div>
 </div>
-{=include-block:Y_neutrino_Blocks.txt;neutrino_form_helpbox=}
+{=include-block:Y_Blocks_Neutrino.txt;neutrino_form_helpbox=}
 </body>
 </html>

data/y-web/Y_Settings_neutrino_forms.yhtm

@@ -1,2 +1,2 @@
 {=var-set:neutrino={=form=}=}
-{=include-block:Y_neutrino_Blocks.txt;neutrino_form=}
+{=include-block:Y_Blocks_Neutrino.txt;neutrino_form=}

data/y-web/Y_Settings_nhttpd.yhtm

@@ -16,7 +16,7 @@ function form_init()
 }
 function do_submit()
 {
-	if(document.f.authpassword.value.length < 5)
+	if(document.f.authpassword.value.length < 2)
 		alert("{=L:set.nhttpd.check_password=}");
 	else
 	if(document.f.port.value == "")
@@ -41,7 +41,7 @@ function do_check_input_LogosURL()
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-WebServer=}{=var-set:menu={=L:set.nhttpd.webserver=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:set.nhttpd.webserver=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" class="y_form" action="/y/cgi">
 		<table border="0" width="100%">

data/y-web/Y_Settings_personalize.yhtm

@@ -62,7 +62,7 @@ function do_init()
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-Personalize=}{=var-set:menu=Personalisierung=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu=Personalisierung=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" class="y_form" action="">
 		<table cellspacing="0" border="0" cellpadding="2" width="100%">
@@ -340,8 +340,8 @@ function do_init()
 		<br />
 		<input type="hidden" name="execute" value="include-block:Y_Blocks.txt;personalize_save_settings;nix"/>
 		<button type="button" ytype="save" title="submit and save values" onclick="do_submit()">Speichern</button>
-		&nbsp;<button type="button" ytype="refresh" onclick="stb_reload_neutrino()">reload Neutrino</button>
+		&nbsp;
-		&nbsp;<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">Hilfe</a>
+		<button type="button" ytype="refresh" onclick="stb_reload_neutrino()">reload Neutrino</button>
 	</form>
 	</div>
 </div>

data/y-web/Y_Settings_umount_liste.yhtm

@@ -23,7 +23,7 @@ function do_unmount()
 {=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head">
-	<div class="work_box_head_h2">{=var-set:help_url=Help-Tools-Mounts=}{=var-set:menu=UnMount=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	<div class="work_box_head_h2">{=var-set:menu=UnMount=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form action="/y/cgi" name="f" id="f">
 		{=func:umount_get_list=}

data/y-web/Y_Settings_video_audio.yhtm

@@ -60,7 +60,7 @@ function do_submit()
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-Video-Audio=}{=var-set:menu=Video und Audio Einstellungen=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu=Video und Audio Einstellungen=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" class="y_form" action="">
 		<table cellspacing="0" border="0" cellpadding="2" width="100%">
@@ -171,9 +171,9 @@ function do_submit()
 		</table>
 		<br/>
 		<input type="hidden" name="execute" value="include-block:Y_Blocks.txt;video_audio_save_settings;nix"/>
-		<button type="button" ytype="save" title="submit and save values" onclick="do_submit()">Speichern</button>&nbsp;
+		<button type="button" ytype="save" title="submit and save values" onclick="do_submit()">Speichern</button>
-		<button type="button" ytype="refresh" onclick="stb_reload_neutrino()">reload Neutrino</button>&nbsp;
+		&nbsp;
-		<a href="javascript:top.top_main.prim_menu.nav('info', 'Y_Info_Help.yhtm');" class="inlink">Hilfe</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;(* diese Einstellungen sind nur lesbar)
+		<button type="button" ytype="refresh" onclick="stb_reload_neutrino()">reload Neutrino</button>
 	</form>
 	</div>
 </div>

data/y-web/Y_Settings_wol.yhtm

@@ -25,7 +25,7 @@ function goto_settings(){
 <body>
 <div class="work_box">
 	<div class="work_box_head">
-	<div class="work_box_head_h2">{=var-set:help_url=Help-Tools-Wake_on_LAN=}{=var-set:menu=Wake on LAN=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	<div class="work_box_head_h2">{=var-set:menu=Wake on LAN=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" action="/y/cgi">
 		<table border="0" class="y_form_table">

data/y-web/Y_Settings_xmltv.yhtm

@@ -14,7 +14,7 @@ function do_submit() {
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-XMLTV_Settings=}{=var-set:menu={=L:set.xmltv.header=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:set.xmltv.header=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" class="y_form" accept-charset="UTF-8" action="/control/xmltvlist" method="POST" enctype="x-www-form-urlencoded">
 		<table border="0" width="100%">
@@ -49,4 +49,3 @@ function do_submit() {
 </body>
 </html>
 {=include-block:Y_Blocks.txt;management_check_bottom=}
-

data/y-web/Y_Settings_yWeb.yhtm

@@ -54,7 +54,7 @@ function do_init(){
 	}
 	document.f.start_page.selectedIndex = sel;
 	style_old = "{=ini-get:%(CONFIGDIR)/Y-Web.conf;style~cache=}";
-
+	//hostname
 	if ("{=ini-get:%(CONFIGDIR)/Y-Web.conf;yweb_box_name=}" == "${HOSTNAME}") {
 		document.f.hostname.checked = true;
 		document.f.yweb_box_name.value = "${HOSTNAME}";
@@ -62,7 +62,7 @@ function do_init(){
 		document.f.yweb_box_name.style.color='#aaaaaa'
 	}
 }
-//NI
+
 function do_switch_hostname()
 {
 	if(document.f.hostname.checked == true)
@@ -92,7 +92,7 @@ select {
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-yWeb=}{=var-set:menu=yWeb=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu=yWeb=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="f" class="y_form" action="/y/cgi">
 		<table border="0" class="y_form_table">
@@ -129,7 +129,7 @@ select {
 				<td>{=L:set.yweb.box_tag=}</td>
 				<td colspan="3"><input type="text" name="yweb_box_name" size="17" value="{=ini-get:%(CONFIGDIR)/Y-Web.conf;yweb_box_name=}"
 					title="{=L:set.yweb.box_tag_desc=}"/>
-					<!-- //NI -->
+					<!-- //hostname -->
 					<input type="checkbox" name="hostname" value="Hostname" onclick="do_switch_hostname()"/> Hostname
 				</td>
 			</tr>

data/y-web/Y_Settings_zapit.yhtm

@@ -23,7 +23,7 @@ function do_submit()
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Settings-zapit=}{=var-set:menu=zapit=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu=zapit=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<table border="0" cellpadding="5" width="100%">
 		<tr><td width="50%" class="y_form_header">Upload</td><td class="y_form_header">Download</td></tr>

data/y-web/Y_StreamInfo.yhtm

@@ -24,93 +24,75 @@
 {=func:get_current_stream_info=}
 <div class="y_head">{=L:epg.si.streaminfo=} ({=ServiceName=})</div>
 <div class="y_work_box">
-	<table cellspacing="2" cellpadding="3" class="tableborder" width="300px">
+	<table class="tableborder" width="480px">
 		<tr>
 			<td class="set"><b>{=L:epg.si.url=}:</b></td>
-			<td>&nbsp;</td>
+			<td class="set"><div align="left">{=Url=}</div></td>
-			<td class="set"> <div align="left">{=Url=}</div></td>
-		</tr>
-		<tr> 
-			<td class="set"><b>{=L:epg.si.resolution=}:</b></td>
-			<td width="30">&nbsp;</td>
-		<td class="set">{=VideoFormat=}</td>
-		</tr>
-		<tr> 
-			<td class="set"><b>{=L:epg.si.ratio=}:</b></td>
-			<td>&nbsp;</td>
-			<td class="set"> <div align="left">{=AspectRatio=}</div></td>
-		</tr>
-<!-- 	<tr> 
-		<td class="set"><b>Bitrate:</b></td>
-		<td>&nbsp;</td>
-		<td class="set"> <div align="left">{=BitRate=} bit/sec</div></td>
-		</tr>
--->
-		<tr> 
-			<td class="set"><b>{=L:epg.si.fps=}:</b></td>
-			<td>&nbsp;</td>
-			<td class="set"> <div align="left">{=FPS=}</div></td>
-		</tr>
-		<tr> 
-			<td class="set"><b>{=L:epg.si.audiotype=}:</b></td>
-			<td>&nbsp;</td>
-			<td class="set"> <div align="left">{=AudioType=}</div></td>
-		</tr>
-		<tr> 
-			<td class="set"><b>{=L:epg.si.frequence=}:</b></td>
-			<td>&nbsp;</td>
-			<td class="set"> <div align="left">{=tsfrequency=} ({=polarisation=})</div></td>
 		</tr>
 		<tr>
-			<td class="set" colspan="3">&nbsp;</td>
+			<td class="set" colspan="2">&nbsp;</td>
 		</tr>
-		<tr> 
+		<tr>
+			<td class="set"><b>{=L:epg.si.resolution=}:</b></td>
+			<td class="set">{=VideoFormat=}</td>
+		</tr>
+		<tr>
+			<td class="set"><b>{=L:epg.si.ratio=}:</b></td>
+			<td class="set"><div align="left">{=AspectRatio=}</div></td>
+		</tr>
+		<tr>
+			<td class="set"><b>{=L:epg.si.fps=}:</b></td>
+			<td class="set"><div align="left">{=FPS=}</div></td>
+		</tr>
+		<tr>
+			<td class="set"><b>{=L:epg.si.audiotype=}:</b></td>
+			<td class="set"><div align="left">{=AudioType=}</div></td>
+		</tr>
+		<tr>
+			<td class="set"><b>{=L:epg.si.frequence=}:</b></td>
+			<td class="set"><div align="left">{=tsfrequency=} ({=polarisation=})</div></td>
+		</tr>
+		<tr>
+			<td class="set" colspan="2">&nbsp;</td>
+		</tr>
+		<tr>
 			<td class="set"><b>{=L:epg.si.onid=}:</b></td>
-			<td>&nbsp;</td>
+			<td class="set"><div align="left">{=onid=}</div></td>
-			<td class="set"> <div align="left">{=onid=}</div></td>
 		</tr>
-		<tr> 
+		<tr>
 			<td class="set"><b>{=L:epg.si.sid=}:</b></td>
-			<td>&nbsp;</td>
+			<td class="set"><div align="left">{=sid=}</div></td>
-			<td class="set"> <div align="left">{=sid=}</div></td>
 		</tr>
-		<tr> 
+		<tr>
 			<td class="set"><b>{=L:epg.si.tsid=}:</b></td>
-			<td>&nbsp;</td>
+			<td class="set"><div align="left">{=tsid=}</div></td>
-			<td class="set"> <div align="left">{=tsid=}</div></td>
 		</tr>
-		<tr> 
+		<tr>
 			<td class="set"><b>{=L:epg.si.vpid=}:</b></td>
-			<td>&nbsp;</td>
+			<td class="set"><div align="left">{=vpid=}</div></td>
-			<td class="set"> <div align="left">{=vpid=}</div></td>
 		</tr>
 		<tr>
 			<td class="set"><b>{=L:epg.si.pcrpid=}:</b></td>
-			<td>&nbsp;</td>
+			<td class="set"><div align="left">{=pcrpid=}</div></td>
-			<td class="set"> <div align="left">{=pcrpid=}</div></td>
 		</tr>
 		<tr>
 			<td class="set"><b>{=L:epg.si.pmtpid=}:</b></td>
-			<td>&nbsp;</td>
+			<td class="set"><div align="left">{=pmtpid=}</div></td>
-			<td class="set"> <div align="left">{=pmtpid=}</div></td>
-		</tr>
-		<tr> 
-			<td class="set"><b>{=L:epg.si.apid=}:</b></td>
-			<td>&nbsp;</td>
-			<td class="set"> <div align="left">{=apid=}</div></td>
-		</tr>
-		<tr> 
-			<td class="set"><b>{=L:epg.si.vtxtpid=}:</b></td>
-			<td>&nbsp;</td>
-			<td class="set"> <div align="left">{=vtxtpid=}</div></td>
 		</tr>
 		<tr>
-			<td class="set" colspan="3">&nbsp;</td>
+			<td class="set"><b>{=L:epg.si.apid=}:</b></td>
+			<td class="set"><div align="left">{=apid=}</div></td>
 		</tr>
-		<tr> 
+		<tr>
+			<td class="set"><b>{=L:epg.si.vtxtpid=}:</b></td>
+			<td class="set"><div align="left">{=vtxtpid=}</div></td>
+		</tr>
+		<tr>
+			<td class="set" colspan="2">&nbsp;</td>
+		</tr>
+		<tr>
 			<td class="set"><b>{=L:epg.si.crypt=}:</b></td>
-			<td>&nbsp;</td>
+			<td class="set"><div align="left">{=Crypt=}</div></td>
-			<td class="set"> <div align="left">{=Crypt=}</div></td>
 		</tr>
 	</table>
 </div>

data/y-web/Y_Timer_Edit.yhtm

@@ -76,7 +76,7 @@ function init()
 {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Live_Timer-Timer=}{=var-set:menu={=L:live.timer_edit.timer=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:live.timer_edit.timer=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 
 	<form method="get" class="y_form" name="f" action="/fb/timer.stb">
@@ -164,7 +164,7 @@ function init()
 			<tr id="RecDirRow" style="display:none">
 				<td>{=L:live.timer_edit.rec_dir=}:</td>
 				<td>
-				{=include-block:Y_neutrino_Blocks.txt;neutrino_list_record_dirs=}
+				{=include-block:Y_Blocks_Neutrino.txt;neutrino_list_record_dirs=}
 				</td>
 			</tr>
 		</table>

data/y-web/Y_Timer_List.yhtm

@@ -6,7 +6,7 @@
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-Live_Timer-Timer=}{=var-set:menu={=L:live.timer_edit.timer=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:live.timer_edit.timer=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 <table class="timer">
 <tr class="timer_header">
@@ -40,7 +40,7 @@
 {=func:get_timer_list {=var-get:row=}=}
 
 <tr class="timer_footer">
-	<td colspan="6"><img src="/images/blank.gif" width="1" height="1"/></td>
+	<td colspan="6"><img src="/images/blank.png" width="1" height="1"/></td>
 	<td>
 		<a href="/Y_Timer_Edit.yhtm?typ=new">
 		<img src="/images/new.png" alt="neuer Timer"/></a>

data/y-web/Y_Tools_Boxcontrol.yhtm

@@ -17,11 +17,12 @@ function goUrl(_url){
 }
 function set_btn_standby(){
 	var res = trim(loadSyncURL("/control/standby"));
-	var color = "red";
+	var color = "gray";
 	switch(res){
 		case "off": color = "green"; break;
+		case "on":  color = "red";   break;
 	}
-	$("btn_standby").setStyle({borderColor: color});
+	document.getElementById('btn_standby').style.borderColor = color;
 }
 function standby(_standby){
 	var _cec = (document.getElementById('checkCEC').checked == true) ? "on" : "off";
@@ -29,17 +30,15 @@ function standby(_standby){
 }
 function init() {
 	set_btn_standby();
-}
+	window.setInterval("set_btn_standby();", 5000);
-function get_data() {
-	set_btn_standby();
 }
 //]]>
 </script>
 </head>
-<body>
+<body onload="init()">
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-BoxControl-Control=}{=var-set:menu={=L:bc.menue.control=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:bc.menue.control=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form action="">
 		<table class="y_invisible_table" cellpadding="5" width="100%">
@@ -108,7 +107,7 @@ function get_data() {
 </div>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url=Help-BoxControl-Control=}{=var-set:menu={=L:answer=}=}{=include-block:Y_Blocks.txt;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>

data/y-web/Y_Tools_Check_Install.yhtm

@@ -39,9 +39,6 @@ function sLog_addRow(_body, state, action_text, state_text){
 	y_add_text_cell_to_row(mycurrent_row, "state_text", state_text);
 }
 /*check*/
-function wiki_url(_page){
-	return "<a href=\"https://wiki.tuxbox-neutrino.org/wiki/"+_page+"\" target='_blank'><b>[Help]<\/b><\/a>"
-}
 function do_check(){
 	sLog_init();
 	sLog_clear();
@@ -62,18 +59,16 @@ function do_check(){
 	=}
 	{=if-equal:{=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.port;80=}~80~~
 		sLog_addRow(sLog_body, "yellow",
-		"WebServer: not set to Standard-Port. Actual: {=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.port;80=} "+wiki_url("Neutrino:yWeb:Settings#WebServer"), "notice");
+		"WebServer: not set to Standard-Port. Actual: {=ini-get:%(CONFIGDIR)/nhttpd.conf;WebsiteMain.port;80=}", "notice");
 	=}
 	/*settings*/
 	{=if-empty:{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip=}~~
 		sLog_addRow(sLog_body, "yellow",
-		"Settings: Management IP(1) is set to {=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip=} ! Your IP is {=func:get_request_data client_addr=}. "
+		"Settings: Management IP(1) is set to {=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip=} ! Your IP is {=func:get_request_data client_addr=}.", "notice");
-		+wiki_url("Neutrino:yWeb:Settings#yWeb"), "notice");
 	=}
 	{=if-empty:{=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip2=}~~
 		sLog_addRow(sLog_body, "yellow",
-		"Settings: Management IP(2) is set to {=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip2=} ! Your IP is {=func:get_request_data client_addr=}. "
+		"Settings: Management IP(2) is set to {=ini-get:%(CONFIGDIR)/Y-Web.conf;management_ip2=} ! Your IP is {=func:get_request_data client_addr=}.", "notice");
-		+wiki_url("Neutrino:yWeb:Settings#yWeb"), "notice");
 	=}
 
 	/*programs*/
@@ -110,9 +105,8 @@ function do_check(){
 </head>
 <body>
 <div class="work_box">
-	<div class="work_box_head">
+	<div class="work_box_head"><div class="work_box_head_h2">
-		<div class="work_box_head_h2">
+	{=var-set:menu={=L:tools.check_install=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
-		{=var-set:help_url=Help-Tools-Check_Install=}{=var-set:menu={=L:tools.check_install=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 		<br />
 		<div id="statusline"><img border="0" src="/images/wait.gif" width="20" height="20" alt="wait"/>

data/y-web/Y_Tools_Cmd.yhtm

@@ -38,17 +38,13 @@ function setCaretToEnd(control)
 		control.setSelectionRange(l, l);
 	}
 }
-function doUpload()
-{
-	upload = window.open('Y_Tools_Cmd_Upload.yhtm?path='+document.f.pwd.value,'upload',"width=500,height=400,scrollbars=yes");
-}
 //]]>
 </script>
 </head>
 <body>
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-		{=var-set:help_url=Help-Tools-Command_Shell=}{=var-set:menu={=L:tools.command_shell=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:tools.command_shell=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form name="co" action="">
 		<textarea name="cmds" cols="80" rows="18" title="shell output window"></textarea>
@@ -59,7 +55,6 @@ function doUpload()
 		<tr>
 			<td><input type="button" name="clear" value="{=L:clear=}" onclick="do_clear()"/></td>
 			<td><input type="checkbox" name="appendx" value="1" title="append output (only IE)"/>&nbsp;{=L:tools.cmd_shell.output_desc=}
-			<!--<input type="button" value="Upload" title="upload a file to current directory" onClick="doUpload()">-->
 			</td>
 		</tr><tr>
 			<td>{=L:tools.path=}:&nbsp;</td>

data/y-web/Y_Tools_Info_Menue.yhtm

@@ -12,7 +12,7 @@ function goUrl(_url){
 <body>
 <div class="work_box">
 	<div class="work_box_head">
-		<div class="work_box_head_h2">{=var-set:help_url=Help-Tools-Info=}{=var-set:menu=Info=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+		<div class="work_box_head_h2">{=var-set:menu=Info=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form action="">
 		<table  class="y_invisible_table" cellpadding="5" width="100%">

data/y-web/Y_Tools_Installer.yhtm

@@ -38,7 +38,7 @@ function init(){
 <body onload="init()">
 <div class="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-		{=var-set:help_url=Help-Tools-yInstaller=}{=var-set:menu={=L:tools.yinstaller.head=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:tools.yinstaller.head=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 		<form name="f" method="post" enctype="multipart/form-data" action="/control/exec?Y_Tools&amp;installer" target="out">
 			{=L:tools.yinstaller.tar_file=}:&nbsp;<input type="file" name="filename" size="70"/>&nbsp;<br/>

data/y-web/Y_Tools_Menue.yhtm

@@ -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,30 @@ 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:v3.netfs-control=}</li>
+				<ul style="margin-left: 1em">
+					<li>
+						{=var-set:m_link_href=Y_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_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 +74,12 @@ function init(){
 					{=include-block:Y_Blocks.txt;management_link=}
 					=}
 				</li>
+				<li>
+					{=var-set:m_link_href=Y_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>
@@ -68,7 +93,7 @@ function init(){
 					{=var-set:m_link_desc==}
 					{=var-set:m_link_text={=L:tools.command_shell=}=}
 					{=include-block:Y_Blocks.txt;management_link=}
-					<a class="y_menu_popup_link" title="{=L:tools.command_shell=} (popup)" href="javascript:cmd_popup()"><img src="/images/popup.png"/></a>
+					<a title="{=L:tools.command_shell=} (popup)" href="javascript:cmd_popup()" class="y_menu_popup_link" ><img src="/images/popup.png"/></a>
 				</li>
 			</ul>
 		</div>
@@ -78,12 +103,14 @@ function init(){
 				<li>
 					<a target="work" href="Y_Tools_Check_Install.yhtm">{=L:tools.check_install=}</a>
 				</li>
+				{=comment:NI - disable yInstaller~
 				<li>
 					{=var-set:m_link_href=Y_Tools_Installer.yhtm=}
 					{=var-set:m_link_desc==}
 					{=var-set:m_link_text=yInstaller=}
 					{=include-block:Y_Blocks.txt;management_link=}
 				</li>
+				=}
 			</ul>
 		</div>
 	</div>

data/y-web/Y_Tools_Rcsim.yhtm

@@ -20,7 +20,7 @@ function rcsim(_key)
 <body>
 <div class="work_box" id="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url==}{=var-set:menu={=L:bc.menue.remote=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:bc.menue.remote=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 		{=include-block:Y_Blocks.txt;remote=}
 	</div>

data/y-web/Y_Tools_Screenshot.yhtm

@@ -1,7 +1,7 @@
 {=var-set:grab={=find-exec:grab=}=}
 {=var-set:fbshot={=find-exec:fbshot=}=}
 
-{=include-block:Y_Blocks.txt;head=}
+{=include-block:Y_Blocks.txt;head_v3=}
 <script type="text/javascript" src="/Y_Baselib.js"></script>
 <script type="text/javascript" src="/prototype.js"></script>
 <script type="text/javascript">
@@ -78,12 +78,18 @@ function do_clearshot(){
 	loadSyncURL("/control/exec?Y_Tools&screenshot_clear");
 }
 function do_switchrc(){
+	    
+	/*
 	if (id('remote').style.display == 'none')
 		$('remote').show();
 	else
 		$('remote').hide();
 
 	do_switchrc_txt();
+	*/
+	jQuery('#remote').toggle('slide', {direction: 'left'}, 'slow', function() {
+		do_switchrc_txt();
+	});
 }
 
 function do_switchrc_txt(){
@@ -105,7 +111,7 @@ function do_reload(){
 <body onload="do_switchrc_txt(); do_snapshot();">
 <div class="work_box" id="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url==}{=var-set:menu={=L:bc.menue.screenshot=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:bc.menue.screenshot=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 		<div id="screenshot_header">
 		<div id="buttons" style="display: block">

data/y-web/Y_Tools_Screenshot_GraphLCD.yhtm

@@ -50,7 +50,7 @@ function do_reload(){
 <body onload="do_snapshot();">
 <div class="work_box" id="work_box">
 	<div class="work_box_head"><div class="work_box_head_h2">
-	{=var-set:help_url==}{=var-set:menu={=L:bc.menue.screenshot=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:menu={=L:bc.menue.screenshot=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 		<div id="screenshot_header">
 		<div id="buttons" style="display: block">

data/y-web/Y_Tools_Screenshot_LCD4Linux.yhtm

@@ -0,0 +1,54 @@
+{=include-block:Y_Blocks.txt;head_v3=}
+<script type="text/javascript">
+//<![CDATA[
+var interval;
+
+function do_showshot() {
+	$('shot').src = "/tmp/lcd4linux.png?"+Math.random();
+	$('shot').show();
+}
+
+function do_reload(){
+	if (document.getElementById("checkReload").checked)
+		interval = setInterval(do_showshot, document.getElementById("inputReload").value + "000");
+	else
+		clearInterval(interval);
+}
+//]]>
+</script>
+</head>
+<body onload="do_showshot();">
+<div class="work_box" id="work_box">
+	<div class="work_box_head"><div class="work_box_head_h2">
+	{=var-set:menu=LCD4Linux-{=L:bc.menue.screenshot=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	<div class="work_box_body">
+		<div id="screenshot_header">
+		<div id="buttons" style="display: block">
+			<div class="right">
+				Reload: <input type="number" value="15" id="inputReload" min="1" max="180" title="{=L:bc.screenshot.reload_desc=}" disabled /> <input id="checkReload" name="checkReload" type="checkbox" />
+			</div>
+			<div class="clear"></div>
+		</div>
+		</div>
+		<table cellpadding="0" class="screenshot">
+		<tr>
+			<td class="shot">
+				<img id="shot" src="" style="display: none" />
+			</td>
+		</tr>
+		</table>
+	</div>
+</div>
+<script>
+document.getElementById('checkReload').onclick = function() {
+	if (this.checked ) {
+		interval = setInterval(do_showshot, document.getElementById("inputReload").value + "000");
+		document.getElementById("inputReload").disabled = false;
+	} else {
+		clearInterval(interval);
+		document.getElementById("inputReload").disabled = true;
+	}
+};
+</script>
+</body>
+</html>

data/y-web/Y_Tools_tvshot.yhtm

@@ -1,51 +0,0 @@
-{=include-block:Y_Blocks.txt;head=}
-<script type="text/javascript" src="/Y_Baselib.js"></script>
-<script type="text/javascript" src="/prototype.js"></script>
-<script type="text/javascript">
-//<![CDATA[
-function do_snapshot(){
-	loadSyncURL("/control/screenshot");
-	window.setTimeout("do_showshot();", 3500);
-}
-function do_showshot(){
-	$('statusline').hide();
-	$('buttons').show();
-	$('shot').src = "/tmp/screenshot.png?"+Math.random();
-	$('shot').show();
-}
-function do_snapshot_again(){
-	$('buttons').hide();
-	$('statusline').show();
-	window.setTimeout('do_snapshot()', 100);
-}
-function do_clearshot(){
-	$('shot').hide();
-	loadSyncURL("/control/exec?Y_Tools&tvshot_clear");
-}
-//]]>
-</script>
-</head>
-<body onload="do_snapshot();">
-<div class="work_box">
-	<div class="work_box_head">
-		<div class="work_box_head_h2">
-			{=var-set:menu={=L:bc.menue.tv_screenshot=}=}
-			{=include-block:Y_Blocks.txt;work_menu=}
-		</div>
-	</div>
-	<div class="work_box_body">
-		<div style="height:30px;">
-		<span id="buttons" style="display: none;">
-			<button name="snapshot" ytype="shot" onclick="do_snapshot_again();">{=L:bc.tv.shot=}</button>
-			<button name="clearshot" ytype="clearshot" onclick="do_clearshot();">{=L:bc.tv.delete_shot=}</button>
-		</span>
-		<span id="statusline">
-			<img border="0" src="/images/wait.gif" width="20" height="20" alt="wait"/>
-			{=L:bc.tv.shap_wait_text=}
-		</span>
-		</div>
-		<img id="shot" src="" style="display: none; width: 100%; margin: 1em 0"/>
-	</div>
-</div>
-</body>
-</html>

data/y-web/Y_Version.txt

@@ -1,3 +1,3 @@
-version=2.9.0.60
+version=3.0.0
-date=15.12.2021
+date=02.11.2022
-info=Tuxbox-Neutrino
+info=Neutrino-Webinterface

data/y-web/Y_blank.htm

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

data/y-web/Y_m3uConInfo.yhtm

@@ -0,0 +1,78 @@
+{=include-block:Y_Blocks.txt;head_v3=}
+	<style type="text/css">
+		#InputOutputField
+		{
+			display: none;
+			font-weight: bold;
+			text-align: left;
+			padding: 1em 0;
+			margin: 1em 0;
+			color: #a0a0a0;
+			border: 1px dashed #555;
+			border-radius: 5px;
+			cursor: default;
+			min-width: 50%;
+			max-width: 100%;
+		}
+
+		#InputOutputField.hover
+		{
+			color: #132cfd;
+			border-color: #132cfd;
+			border-style: solid;
+			box-shadow: inset 0 3px 4px #888;
+		}
+
+		#messages
+		{
+			padding: 0 10px;
+			margin: 1em 0;
+			border: 1px solid #a0a0a0;
+		}
+	</style>
+
+</head>
+<body>
+<div class="work_box">
+	<div class="work_box_head"><div class="work_box_head_h2">
+	m3uConvert
+	</div></div>
+	<div class="work_box_body">
+		<table class="y_invisible_table" cellpadding="5" width="100%">
+			<tr><td class="y_form_header" colspan="2">Anleitung zu <b>m3uConvert</b></td></tr>
+			<tr>
+				<td>
+      <p>Mit m3uConvert ist es möglich, m3u-Playlisten in das webtv_usr.xml Format von Neutrino HD zu konvertieren.</p>
+     	 </td>
+			</tr>   
+			<tr><td class="y_form_header" colspan="2">Info zur Verarbeitung</td></tr>
+				<td>
+				<p>Die Verarbeitung der vorhandenen m3u Playlists (Dateien oder Links) kann auf 3 Arten erfolgen:</p>
+         <p><LI>die Links direkt per <b><u>Copy & Paste</u></b> in die Inputbox einfügen</LI>
+            <LI>eine/mehrere Datei/en per <b><u>Drag & Drop</u></b> auf die Inputbox ziehen/loslassen</LI>
+			      <LI>die m3U Dateien direkt über den Button <b><u>importieren</u></b></LI></p>
+			  <p>Bei Darstellungsproblemen von Umlauten, wähle die	korrekte Kodierung dieser Datei. Ziel ist es, dass die Umlaute in der Inputbox korrekt dargestellt werden.</p>
+				<p>Danach kann noch unter Punkt 2 der webtv-Titel und das Genre (beides wird in der Bouquet-Liste angezeigt) und eine Stream-Beschreibung, die dann bei den einzelnen Links gesetzt wird, eingetragen werden. 
+				Diese Information wird dann an der Box entsprechend angezeigt.</p>
+				<p>Mit Punkt 3 wird der Inhalt der Inputbox in das webtv Format für NeutrinoHD konvertiert.</p>
+		
+				</td> 
+			</tr>   
+			<tr><td class="y_form_header" colspan="2">Info zum Export, Speichern oder zur Box übertragen</td></tr>
+				<td>
+				<p>Das Ergebnis der Konvertierung, also die fertigen Einträge können auf zwei Arten exportiert bzw. weiterverarbeitet werden.</p>
+				<p>Dazu muss zuerst unter Punkt 4 der Dateiname angeben werden (default: webtv_usr.xml). Dieser Name wird für die drei Möglichkeiten entsprechend genutzt.</p>
+				<p><LI><p><b><u>Datei online bearbeiten/erstellen</u></b>: Existiert auf der Box bereits eine Datei mit diesem Namen, wird diese im separaten Editor Fenster geöffndet. Hier hat man nun die Möglichkeit neue Links aus der Inputbox direkt per Copy/Paste einzufügen, Sortierung zu ändern etc. In dem Editorfenster, kann man mit dem Speichern Button die Datei wieder zurück auf die Box schreiben.</p>
+				       <p>Wenn es auf der Box KEINE Datei mit diesem Namen gibt, wird über diesen Weg eine neue leere Datei auf der Box angelegt!</p>
+				       <p>Man kann den Ort der Datei wählen: %(WEBTVDIR_VAR)/ = hier wird die Datei automatisch nach Boxstart geladen  ODER %(CONFIGDIR)/ = hier muss die Datei manuell im Menü angemeldet werden (siehe unten)!</p></LI>
+			     <LI><b><u>Download auf PC</u></b>: Der komplette Inhalt der Inputbox wird über die Download-Funktion vom Internetbrowser auf dem PC gespeichert. </LI>
+			  </p>
+			  <p>Wenn egal über welchen Weg, neue webtv-Dateien auf die Box übertragen werden, muss im Menü der Box unter -Einstellungen - Multimedia - WebTV- die neue Datei hinzugefügt werden.<br>
+			  Bei einem Update einer vorhandenen Datei genügt unter Services ein Kanallisten neu laden.</p>
+			  <p>fertig.</p>
+				</td>
+			</tr>   
+
+</body>
+</html>
+

data/y-web/Y_m3uConvert.yhtm

@@ -0,0 +1,279 @@
+{=include-block:Y_Blocks.txt;head_v3=}
+	<style type="text/css">
+		#InputOutputField
+		{
+			display: none;
+			font-weight: bold;
+			text-align: left;
+			padding: 1em 0;
+			margin: 1em 0;
+			color: #a0a0a0;
+			border: 1px dashed #555;
+			border-radius: 5px;
+			cursor: default;
+			min-width: 50%;
+			max-width: 100%;
+		}
+
+		#InputOutputField.hover
+		{
+			color: #132cfd;
+			border-color: #132cfd;
+			border-style: solid;
+			box-shadow: inset 0 3px 4px #888;
+		}
+
+		#messages
+		{
+			padding: 0 10px;
+			margin: 1em 0;
+			border: 1px solid #a0a0a0;
+		}
+	</style>
+
+</head>
+<body>
+<div class="work_box">
+	<div class="work_box_head"><div class="work_box_head_h2">
+	m3uConvert
+	</div></div>
+	<div class="work_box_body">
+		<br/>
+		<table class="y_invisible_table" cellpadding="5" width="85%">
+		  <tr>
+		    <td>Mit <b>m3uConvert</b> ist es möglich, m3u-Playlisten in das webtv_usr.xml Format zu konvertieren.</td>
+		    <td>Zum ersten Mal hier?<br>
+		    <button onClick="window.open('/Y_m3uConInfo.yhtm', '', 'status=0,title=0,height=0,width=1000,scrollbars=1');" title="Info und Anleitung zu m3uConvert">Info und Anleitung</button></td>
+		  </tr>
+			<tr><td class="y_form_header" colspan="2">1. Streams einfügen:</td></tr>
+			<tr>
+				<td colspan="2">
+					<form>
+						<textarea id="InputOutputField" style="width:95%" rows="10" title="Beispiel: 
+#EXTM3U
+#EXTINF:0,DE:RTL
+http://www.xyz.com:8000/live/test/test/377.ts
+#EXTINF:0,DE:ZDF
+http://www.xyz.com:8000/live/test/test/372.ts
+#EXTINF:0,DE:TNT_SERIE
+http://www.xyz.com:8000/live/test/test/376.ts">
+						</textarea>
+					</form>
+				</td>
+			</tr>
+			<tr>
+				<td>
+					<label for="fileselect">Datei(en) auswählen:</label>
+					<input type="file" id="fileselect" name="fileselect[]" multiple="multiple" />
+				</td>
+				<td>
+					m3u-Quelldatei Kodierung:
+					<div><input type="radio" id="ansi" name="SourceEncoding" value="ANSI" checked="checked"><label for="ansi">  ANSI</label></div>
+					<div><input type="radio" id="utf8" name="SourceEncoding" value="UTF-8"><label for="utf8"> UTF-8</label></div>
+				</td>
+			</tr>   
+			<tr><td class="y_form_header" colspan="2">2. Stream-Infos und Beschreibung angeben:</td></tr>
+				<td>
+					Titel: <input id="inputTitel" title="Variablenwert Titel der webtv-Datei ... webtv [xyz]" value="eigene Streams"></input>  Beschreibung: <input id="inputDescription" title="Variablenwert Description in der Datei ... description='Stream'..." value="webtv"></input>  Genre: <input id="inputGenre" title="Variablenwert Genre in der Datei ... genre='Movie'..." value="Movie"></input>
+				</td>
+			</tr>   
+			<tr><td class="y_form_header" colspan="2">3. Inputbox umwandeln in xml-Format:</td></tr>
+				<td>
+					<button onclick="WriteForm();" title="obige m3u in webtv_usr umwandeln">Umwandeln</button>
+				</td>
+			</tr>   
+			<tr><td class="y_form_header" colspan="2">4. Dateiname zum Speichern und Download:</td></tr>
+				<td>
+					<input id="inputFileNameToSaveAs" value="webtv_usr.xml" title="Dateiname zum lokal speichern oder auf der Box aufrufen/erstellen"></input>
+				</td>
+			</tr>
+			<tr><td class="y_form_header" colspan="2">5. Export mit obigem Dateinamen:</td></tr>
+				<td>
+					<div>Datei online bearbeiten/erstellen: <button onclick="oeffnenXML2();" title="Datei mit obigem Namen auf der Box &ouml;ffnen oder erstellen">unter %(WEBTVDIR_VAR)/ (autoload)</button> . <button onclick="oeffnenXML();" title="Datei mit obigem Namen auf der Box &ouml;ffnen oder erstellen">unter %(CONFIGDIR)/ (manuell)</button>
+						Download: <button onclick="saveXML()" title="Download">Download auf PC</button>
+					</div></td>
+			</tr>
+		</table>   
+	</div>
+
+<script language="javascript" type="text/javascript">
+	var textAreas = document.getElementsByTagName('textarea');
+	Array.prototype.forEach.call(textAreas, function(elem)
+	{
+		elem.placeholder = elem.placeholder.replace(/\\n/g, '\n');
+	});
+	String.prototype.trim = function()
+	{
+		return this.replace(/^\s+|\s+$/g, '');
+	};
+
+	function WriteForm(e)
+	{
+		try
+		{
+			e = document.getElementById("InputOutputField");
+			descri = document.getElementById("inputDescription").value;
+			genre = document.getElementById("inputGenre").value;
+			titel = document.getElementById("inputTitel").value;
+			l = e.value.split("\n");
+			s = '<?xml version="1.0"?>\n<webtvs name="[';
+			s += titel;
+			s += '] ">\n';
+			name = '';
+			if (l.length > 1)
+			{
+				for (var i = 0; i < l.length; i++)
+				{
+					v = l[i].trim();
+					if (v == '') continue;
+					if (v.indexOf("#") !== -1)
+					{
+						if (v.toUpperCase().indexOf("#EXTINF") != -1)
+						{
+							ci = v.indexOf(',');
+							if (ci !== -1) name = v.substr(ci + 1);
+						}
+					}
+					else
+					{
+						if (v.trim().toUpperCase().indexOf('UDP:') != -1)
+						{
+							url = v.replace('udp://@', "udp/", "i");
+						}
+						else url = v;
+						// url=url.replace(/:/g,'%3a');
+						name = name.replace(/#EXTINF:|[0-9],|-[1-9],|,/g, '');
+						name = name.replace(/^\s+/g, '');
+						if (name == '') name = 'Kanal ' + i;
+						s += '    <webtv title="';
+						s += name + '" url="';
+						s += url;
+						s += '" epgid="" genre="';
+						s += genre;
+						s += '" description="';
+						s += descri;
+						s += '" />\n';
+						name = '';
+					}
+				}
+				s = s.split('&').join('&amp;');
+				s += '</webtvs>';
+				e.value = s;
+			}
+		}
+		catch (Err)
+		{
+			alert("Error: " + Err.description);
+		}
+		return false;
+	}
+
+	function oeffnenXML()
+	{
+		var fileNameToSaveAs = document.getElementById("inputFileNameToSaveAs").value;
+		var form = document.createElement('form');
+		form.setAttribute('method', 'post');
+		form.target = 'Map';
+		form.setAttribute('action', '/Y_Filemgr_Edit.yhtm?file=%(CONFIGDIR)/' +
+			fileNameToSaveAs);
+		document.body.appendChild(form);
+		window.open('', 'Map', 'status=0,title=0,height=0,width=1000,scrollbars=0');
+		form.submit();
+	}
+
+	function oeffnenXML2()
+	{
+		var fileNameToSaveAs = document.getElementById("inputFileNameToSaveAs").value;
+		var form = document.createElement('form');
+		form.setAttribute('method', 'post');
+		form.target = 'Map';
+		form.setAttribute('action', '/Y_Filemgr_Edit.yhtm?file=%(WEBTVDIR_VAR)/' +
+			fileNameToSaveAs);
+		document.body.appendChild(form);
+		window.open('', 'Map', 'status=0,title=0,height=0,width=1000,scrollbars=0');
+		form.submit();
+	}
+
+	function saveXML()
+	{
+		var textToWrite = document.getElementById("InputOutputField").value;
+		var fileNameToSaveAs = document.getElementById("inputFileNameToSaveAs").value;
+		var type = 'text/plain';
+		saveTextAsFile(textToWrite, fileNameToSaveAs, type);
+	}
+	// getElementById
+	function $id(id)
+	{
+		return document.getElementById(id);
+	}
+	// output information
+	function Output(msg)
+	{
+		var m = $id("InputOutputField");
+		m.value = m.value + msg;
+	}
+	// file drag hover
+	function FileDragHover(e)
+	{
+		e.stopPropagation();
+		e.preventDefault();
+		e.target.className = (e.type == "dragover" ? "hover" : "");
+	}
+	// file selection
+	function FileSelectHandler(e)
+	{
+		// cancel event and hover styling
+		FileDragHover(e);
+		// fetch FileList object
+		var files = e.target.files || e.dataTransfer.files;
+		// process all File objects
+		for (var i = 0, f; f = files[i]; i++)
+		{
+			ParseFile(f);
+		}
+	}
+	// output file information
+	function ParseFile(file)
+	{
+		var reader = new FileReader();
+		reader.onload = function(e)
+		{
+			Output(e.target.result.replace(/</g, "&lt;").replace(/>/g, "&gt;") + "\n");
+		}
+		if (document.getElementById('ansi').checked)
+		{
+			reader.readAsText(file, 'windows-1252');
+		}
+		else
+		{
+			reader.readAsText(file);
+		}
+	}
+	// initialize
+	function Init()
+	{
+		var fileselect = $id("fileselect"),
+			filedrag = $id("InputOutputField");
+		// file select
+		fileselect.addEventListener("change", FileSelectHandler, false);
+		// is XHR2 available?
+		var xhr = new XMLHttpRequest();
+		if (xhr.upload)
+		{
+			// file drop
+			filedrag.addEventListener("dragover", FileDragHover, false);
+			filedrag.addEventListener("dragleave", FileDragHover, false);
+			filedrag.addEventListener("drop", FileSelectHandler, false);
+			filedrag.style.display = "block";
+		}
+	}
+	// call initialization file
+	if (window.File && window.FileList && window.FileReader)
+	{
+		Init();
+	}
+</script>
+
+</body>
+</html>
+

data/y-web/Y_v3.css

@@ -0,0 +1,77 @@
+#startjpg {
+	display: block;
+	text-align: center;
+	width: 750px;
+	margin: 1.5em auto;
+	padding: .5em;
+	border: 1px solid #a0a0a0;
+	box-shadow: .5em .5em .5em rgba(0, 0, 0, 0.5);
+}
+
+hr {
+	border: 0 none;
+	border-top: 1px solid #a0a0a0;
+}
+span.upd_no,
+span.upd_yes {
+	display: none;
+}
+abbr.version {
+	cursor: help;
+}
+.exlink, .inlink, .comment {
+	text-decoration: none;
+}
+
+.status {
+	vertical-align: text-bottom;
+}
+.vinfo {
+	font-size: 75%;
+	color: #c0c0c0;
+}
+.tools select {
+	border: 1px solid #a0a0a0;
+	border-left: 3px solid #132cfd !important;
+}
+.tools option.e {
+	background: url(images/page_edit.png) no-repeat;
+	padding-left: 20px;
+}
+
+button,
+input[type="button"],
+input[type="submit"],
+._used_graph,
+._used_graph * {
+	border-radius: 5px;
+}
+button[ytype] {
+	background-position: 3px 1px;
+}
+button[ytype="accept_"],
+button[ytype="cancel_"] {
+	text-align: center;
+	width: 105px;
+}
+button[ytype="accept_"] { background-image:url(/images/accept.png); }
+button[ytype="cancel_"] { background-image:url(/images/cancel.png); }
+
+tr.list td {
+	padding-top: .25em;
+	padding-bottom: .25em;
+}
+tr.list:hover td {
+	background: #F0F0F0;
+}
+div._used_graph {
+	width: 150px;
+	height: 20px;
+	border: 1px solid #a0a0a0;
+}
+div._used_graph div._inner_graph {
+	width: 0;
+	height: 100%;
+	background: transparent url(images/colored_bar.png) no-repeat 0 0;
+	float: left;
+}

data/y-web/Y_v3lib.js

@@ -0,0 +1,113 @@
+/*	yWeb v3lib
+*/
+
+//	next booth functions are taken from the original yweb
+//	to make them available in all of our pages
+function goConfirmUrl(_meld, _url){
+	if (confirm(_meld)==true) goUrl(_url);
+}
+
+function goUrl(_url){
+	var res = trim(loadSyncURL(_url));
+	switch(res){
+		case "1": res="on"; break;
+		case "0": res="off"; break;
+	}
+	$("out").update(res);
+}
+
+function goPort(_port) {
+	if (_port == "") return;
+	var host = self.location.href;
+	var pos1 = host.indexOf('//');
+	var temp = host.substring(pos1+2,host.length);
+	var pos2 = temp.indexOf('/');
+	var host = host.substring(0,pos1+2+pos2);
+	window.open(host + ":" + _port,"_blank");
+}
+
+function Y_v3_Tools(_cmd, _tout){
+	$("out").update("");
+	show_waitbox(true);
+	goUrl("/control/exec?Y_v3_Tools&" + _cmd);
+	if (typeof(_tout) == "undefined")
+		{
+		show_waitbox(false);
+		}
+	else
+		{
+		window.setTimeout("document.location.reload()", _tout);
+		}
+}
+
+// taken from http://www.jjam.de/JavaScript/Datum_Uhrzeit/Wochentag.html
+function getWeekDay(dd,mm,yyyy) {
+	var month = "312831303130313130313031";
+	var days = (yyyy-1)*365 + (dd-1);
+	for(var i=0;i<mm-1;i++) days += month.substr(i*2,2)*1;
+	if(yyyy>1582 || yyyy==1582 && (mm>10 || mm==10 && dd >4)) days -= 10;
+	var leapyears = Math.floor(yyyy / 4);
+	if(yyyy%4==0 && mm<3) leapyears--;
+	if(yyyy>=1600) {
+		leapyears -= Math.floor((yyyy-1600) / 100);
+		leapyears += Math.floor((yyyy-1600) / 400);
+		if(yyyy%100==0 && mm<3) {
+			leapyears++;
+			if(yyyy%400==0) leapyears--;
+		}
+	}
+	days += leapyears;
+	return "SatSonMonThuWedThuFri".substr(days%7*3,3);
+}
+
+function compareVersion(_vi, _vo)
+{
+	if (_vi == "" || _vo == "") return;
+
+	if (_vi >= _vo)	jQuery(document).ready(function(){jQuery('.upd_no').show().css('color', '#c0c0c0')});
+        else		jQuery(document).ready(function(){jQuery('.upd_yes').show().css('color', '#008000')});
+}
+
+function getVersion(_version)
+{
+	if (_version == "") return;
+	var Vmajor = _version.substr(1, 1);
+	var Vminor = _version.substr(2, 2);
+
+	document.write(Vmajor + "." + Vminor);
+}
+
+function getBuild(_version)
+{
+	if (_version == "") return;
+
+	var month=new Array(13);
+		month[0]="";
+		month[1]="Jan";
+		month[2]="Feb";
+		month[3]="Mar";
+		month[4]="Apr";
+		month[5]="May";
+		month[6]="Jun";
+		month[7]="Jul";
+		month[8]="Aug";
+		month[9]="Sep";
+		month[10]="Oct";
+		month[11]="Nov";
+		month[12]="Dec";
+
+	var Byear = _version.substr(4, 4);
+	var Bmonth = _version.substr(8, 2).replace( /^(0+)/g, '' );
+	var Bday = _version.substr(10, 2);
+	var Bhour = _version.substr(12, 2);
+	var Bmin = _version.substr(14, 2);
+
+	document.write(getWeekDay(Bday,Bmonth,Byear) + " " + month[Bmonth] + " " + Bday + " " + Bhour + ":" + Bmin + " CEST " + Byear);
+}
+
+function get_update_txt()
+{
+        //show_waitbox(true);
+	loadSyncURL("/control/exec?Y_v3_Tools&get_update_txt");
+	window.document.location.href="/Y_About.yhtm?ani=false";
+}

data/y-web/Y_yweb.js

@@ -76,7 +76,7 @@ else
 /* Class Y.extension */
 Y.extension = new Class.create();
 Object.extend(Y.extension.prototype, {
-	ext_version: 1, /* ver of Y.extention*/
+	ext_version: 1, /* ver of Y.extension*/
 	conf_version: 2,/* ver of local conf file */
 	upd_version: 2, /* ver of upd file */
 	file: "",

data/y-web/extensions.txt

@@ -0,0 +1 @@
+type:u,site:Image,desc:yWeb Neutrino Webinterface Extensions,url:https://raw.githubusercontent.com/tuxbox-neutrino/plugin-webif-extensions/master/yWeb-Extensions/Y_Extensions.txt

data/y-web/extentions.txt

@@ -1 +0,0 @@
-type:u,site:Tuxbox-Neutrino,desc:yWeb extentions,url:https://raw.githubusercontent.com/tuxbox-neutrino/gui-yweb/master/Y_Extentions.txt

data/y-web/favicon/Makefile.am

@@ -0,0 +1,12 @@
+installdir = $(PRIVATE_HTTPDDIR)/favicon
+
+install_DATA =	\
+	android-chrome-192x192.png \
+	android-chrome-512x512.png \
+	apple-touch-icon.png \
+	browserconfig.xml \
+	favicon-16x16.png \
+	favicon-32x32.png \
+	favicon.ico \
+	mstile-150x150.png \
+	safari-pinned-tab.svg

data/y-web/favicon/browserconfig.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/favicon/mstile-150x150.png"/>
+            <TileColor>#212121</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>

data/y-web/images/Makefile.am

@@ -1,95 +1,123 @@
-installdir = $(PRIVATE_HTTPDDIR)/images
+imagesdir = $(PRIVATE_HTTPDDIR)/images
 
-install_DATA =	accept.png \
+images_DATA = \
-		alert.gif \
+	accept.png \
-		arrowdown.png \
+	alert.gif \
-		arrowleft.png \
+	arrowdown.png \
-		arrowright.png \
+	arrowleft.png \
-		arrowup.png \
+	arrowright.png \
-		audiobar.png \
+	arrowup.png \
-		blank.gif \
+	audiobar.png \
-		check_green.png \
+	blank.png \
-		comment.png \
+	check_green.png \
-		cross.png \
+	comment.png \
-		elist.png \
+	cross.png \
-		exlink.gif \
+	elist.png \
-		fb.png \
+	exlink.gif \
-		help.gif \
+	fb.png \
-		hidden.png \
+	hidden.png \
-		info.png \
+	info.png \
-		inlink.gif \
+	inlink.gif \
-		key.png \
+	key.png \
-		live.png \
+	live.png \
-		lock.png \
+	lock.png \
-		modify.png \
+	modify.png \
-		new.png \
+	new.png \
-		ok.gif \
+	ok.gif \
-		popup.png \
+	popup.png \
-		properties.png \
+	properties.png \
-		radio.png \
+	radio.png \
-		record.png \
+	record.png \
-		reload.png \
+	reload.png \
-		remove.png \
+	remove.png \
-		rename.gif \
+	rename.gif \
-		save.png \
+	save.png \
-		saveall.png \
+	saveall.png \
-		snapshot.png \
+	snapshot.png \
-		stream.png \
+	stream.png \
-		streaminfo.png \
+	streaminfo.png \
-		time_add.png \
+	time_add.png \
-		time_down.png \
+	time_down.png \
-		time_up.png \
+	time_up.png \
-		tux-yweb.png \
+	tux-yweb.png \
-		unlock.png \
+	unlock.png \
-		visible.png \
+	visible.png \
-		vlc.png \
+	vlc.png \
-		volumedown.png \
+	volumedown.png \
-		volumemute.png \
+	volumemute.png \
-		volumeunmute.png \
+	volumeunmute.png \
-		volumeup.png \
+	volumeup.png \
-		wait.gif \
+	wait.gif \
-		webtv.png \
+	webtv.png \
-		wget.png \
+	wget.png \
-		x_red.png \
+	x_red.png \
-		zap.png
+	zap.png
-
-# remote controls
-install_DATA += rc_cst_v1.jpg \
-		rc_cst_v2.png \
-		rc_cst_v3.png \
-		rc_cst_v4.png \
-		rc_cst_v5.png \
-		rc_cst_v6.png \
-		rc_dbox_nokia_old.png \
-		rc_dbox_philips.png
-
-if ! BOXTYPE_CST
-install_DATA += rc_ax_hd51.png \
-		rc_ax_hd61.png \
-		rc_mutant_hd51.png \
-		rc_wwio_bre2ze4k.png \
-		rc_zgemma_h7.png \
-		rc_osmio4k.png \
-		rc_vuplus.png \
-		rc_mutant_hd60.png
-endif
 
 # file manager
-install_DATA +=	chmod.png \
+images_DATA += \
-		copy.gif \
+	chmod.png \
-		cut.png \
+	copy.gif \
-		dir_up.png \
+	cut.png \
-		download.png \
+	dir_up.png \
-		film.png \
+	download.png \
-		folder_add.png \
+	film.png \
-		ftype_file.png \
+	folder_add.png \
-		ftype_folder.png \
+	ftype_file.png \
-		ftype_link.png \
+	ftype_folder.png \
-		home.png \
+	ftype_link.png \
-		package.png \
+	home.png \
-		page_edit.png \
+	package.png \
-		paste.gif \
+	page_edit.png \
-		picture.png \
+	paste.gif \
-		text.png \
+	picture.png \
-		upload.png \
+	text.png \
-		work.gif
+	upload.png \
+	work.gif
+
+# extensions
+images_DATA += \
+	ext_add.png \
+	ext_delete.png \
+	ext_edit.png \
+	ext_error.png \
+	ext_ex.png \
+	ext_menu.png \
+	ext_mgr.png \
+	ext_normal.png \
+	ext_plugin.png \
+	ext_script.png
+
+# 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
+
+imagesrc_DATA = \
+	rc/rc_cst_v1.jpg \
+	rc/rc_cst_v2.png \
+	rc/rc_cst_v3.png \
+	rc/rc_cst_v4.png \
+	rc/rc_cst_v5.png \
+	rc/rc_cst_v6.png \
+	rc/rc_dbox_nokia_old.png \
+	rc/rc_dbox_philips.png
+
+if ! BOXTYPE_CST
+imagesrc_DATA += \
+	rc/rc_ax_hd51.png \
+	rc/rc_ax_hd61.png \
+	rc/rc_mutant_hd51.png \
+	rc/rc_wwio_bre2ze4k.png \
+	rc/rc_zgemma_h7.png \
+	rc/rc_osmio4k.png \
+	rc/rc_vuplus.png \
+	rc/rc_mutant_hd60.png
+endif
+