From 6f75effc6bab838512c2f88a5871aca315c02f77 Mon Sep 17 00:00:00 2001
From: yjogol <yjogol@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: Thu, 18 Mar 2010 18:34:01 +0000
Subject: [PATCH] yweb: add timer sync for tvinfo and klack

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@508 e54a6e83-5905-42d5-8d5c-058d10e6a962
---
 src/nhttpd/web/Y_Live_Menue.yhtm       |  6 +-----
 src/nhttpd/web/Y_Settings_Menue.yhtm   |  4 ++--
 src/nhttpd/web/Y_Settings_Timer.yhtm   | 29 +++++++++++++-------------
 src/nhttpd/web/Y_Tools_Timer_Sync.yhtm | 28 ++++++++++++-------------
 4 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/src/nhttpd/web/Y_Live_Menue.yhtm b/src/nhttpd/web/Y_Live_Menue.yhtm
index f1cfe0831..5efd33a80 100644
--- a/src/nhttpd/web/Y_Live_Menue.yhtm
+++ b/src/nhttpd/web/Y_Live_Menue.yhtm
@@ -66,9 +66,7 @@ function init(){
 						<td align="right"><a title="{=L:live.radio_popup_desc=}" href="javascript:go_live_popup_radio()"><img src="/images/popup.png"/></a></td>
 					</tr></table>
 				</li>
-			{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
-				<li><a target="work" title="use LiveView with 2 boxes" href="Y_Live_DoubleView.yhtm">{=L:live.double_view=}</a></li>
-			=}
+				<!-- <li><a target="work" title="use LiveView with 2 boxes" href="Y_Live_DoubleView.yhtm">{=L:live.double_view=}</a></li> -->
 			</ul>
 		</div>
 		<div class="y_menu_sec_section">{=L:live.timer=}</div>
@@ -82,9 +80,7 @@ function init(){
 						<td align="right"><a title="{=L:live.epg_plus_popup_desc=}" href="javascript:epg_plus_popup()"><img src="/images/popup.png"/></a></td>
 					</tr></table>
 				</li>
-			{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
 				<li><a target="work" href="Y_Tools_Timer_Sync.yhtm">{=L:live.timer_sync=}</a></li>
-			~=}
 				<!--<li><a target="work" title="recorder" href="Y_Blank.yhtm">Recorder</a></li>-->
 			</ul>
 		</div>
diff --git a/src/nhttpd/web/Y_Settings_Menue.yhtm b/src/nhttpd/web/Y_Settings_Menue.yhtm
index cddfedce6..c72f8bd94 100644
--- a/src/nhttpd/web/Y_Settings_Menue.yhtm
+++ b/src/nhttpd/web/Y_Settings_Menue.yhtm
@@ -53,8 +53,8 @@ function init(){
 			{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
 				<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.ucodes=}</li>
 				<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.boot_logo=}</li>
-				<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.timer_settings=}</a></li>
 			~=}
+				<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.timer_settings=}</a></li>
 			~
 				<li><a target="work" href="Y_Settings_yWeb.yhtm">yWeb</a></li>
 				<li><a target="work" href="Y_Settings_nhttpd.yhtm">{=L:set.menue.webserver=}</a></li>
@@ -65,8 +65,8 @@ function init(){
 			~=}
 			{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
 				<li><a target="work" href="Y_Settings_Backup.yhtm">{=L:set.menue.backup_restore=}</a></li>
-				<li><a target="work" href="Y_Settings_Timer.yhtm">{=L:set.menue.timer_settings=}</a></li>
 			~=}
+				<li><a target="work" href="Y_Settings_Timer.yhtm">{=L:set.menue.timer_settings=}</a></li>
 			=}	
 				<!--<li><a title="change layout skin" target="work" href="Y_Settings_Skin.yhtm">Skins</a></li>-->
 			</ul>
diff --git a/src/nhttpd/web/Y_Settings_Timer.yhtm b/src/nhttpd/web/Y_Settings_Timer.yhtm
index 52b04b8c9..1c82b4a9f 100644
--- a/src/nhttpd/web/Y_Settings_Timer.yhtm
+++ b/src/nhttpd/web/Y_Settings_Timer.yhtm
@@ -3,8 +3,7 @@
 <script type="text/javascript" src="/Y_Baselib.js"></script>
 <script type="text/javascript">
 //<![CDATA[
-function do_submit()
-{
+function do_submit() {
 	show_waitbox(true);
 	var t = document.f.klack_url.value.replace(/&/gi,";");
 	document.f.klack_url.value = t;
@@ -17,7 +16,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-Timer_Settings=}{=var-set:menu=Timer Settings=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:help_url=Help-Settings-Timer_Settings=}{=var-set:menu={=L:set.timer.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="/y/cgi?execute=include-block:Y_Blocks.txt;timer_save_settings;nix" method="POST">
 		<table border="0" width="100%">
@@ -25,36 +24,36 @@ function do_submit()
 				<td colspan="2" class="y_form_header">tvinfo.de</td>
 			</tr>
 			<tr>
-				<td>Benutzername</td>
-				<td><input type="text" name="tvinfo_username" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;tvinfo_username=}" title="username"/></td>
+				<td>{=L:set.timer.username=}</td>
+				<td><input type="text" name="tvinfo_username" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;tvinfo_username=}"/></td>
 			</tr>
 			<tr>
-				<td>Passwort</td>
-				<td><input type="password" name="tvinfo_password" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;tvinfo_password=}" title="password"/><br/><br/></td>
+				<td>{=L:set.timer.password=}</td>
+				<td><input type="password" name="tvinfo_password" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;tvinfo_password=}"/><br/><br/></td>
 			</tr>
 			<tr>
 				<td colspan="2" class="y_form_header">klack.de (V2)</td>
 			</tr>
 			<tr>
-				<td>personal RSS TV-Planer URL</td>
-				<td><input type="text" name="klack_url" size="60" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;klack_url=}" title="Klack.de RSS TV-Planer URL"/><br/>
-				(&#038; will be converted to &quot;;&quot; on save)</br></td>
+				<td>{=L:set.timer.klack.url=}</td>
+				<td><input type="text" name="klack_url" size="60" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;klack_url=}"/><br/>
+				{=L:set.timer.klack.url_desc=}</br></td>
 			</tr>
 			<tr>
-				<td>Security Code</td>
-				<td><input type="password" name="klack_securitycode" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;klack_securitycode=}" title="your klack security code to get your data without login"/><br/><br/></td>
+				<td>{=L:set.timer.klack.security_code=}</td>
+				<td><input type="password" name="klack_securitycode" size="15" value="{=ini-get:/var/tuxbox/config/Y-Web.conf;klack_securitycode=}" title="{=L:set.timer.klack.security_code_desc=}"/><br/><br/></td>
 			</tr>
 			<tr>
-				<td colspan="2" class="y_form_header">Sendernamen</td>
+				<td colspan="2" class="y_form_header">{=L:set.timer.channel_name_replacelist=}</td>
 			</tr>
 			<tr>
 				<td>&nbsp;</td>
-				<td><textarea name="channels" cols="60" rows="10"  title="channel name replacement" style="background : white; font : 'Courier New',medium  monospace; color : #436976;">{=if-file-exists:/var/tuxbox/config/channels.txt~{=include:/var/tuxbox/config/channels.txt=}~{=if-file-exists:/var/httpd/channels.txt~{=include:/var/httpd/channels.txt=}~{=include:/share/tuxbox/neutrino/httpd-y/channels.txt=}=}=}</textarea></td>
+				<td><textarea name="channels" cols="60" rows="10" style="background : white; font : 'Courier New',medium  monospace; color : #436976;">{=if-file-exists:/var/tuxbox/config/channels.txt~{=include:/var/tuxbox/config/channels.txt=}~{=if-file-exists:/var/httpd/channels.txt~{=include:/var/httpd/channels.txt=}~{=include:/share/tuxbox/neutrino/httpd/channels.txt=}=}=}</textarea></td>
 			</tr>
 		</table>
 		<br/>
 		<input type="hidden" name="tmpl" value="Y_Settings_Timer.yhtm"/>
-		<button type="button" ytype="save" title="submit and save values" onclick="do_submit()">Speichern</button>
+		<button type="button" ytype="save" title="submit and save values" onclick="do_submit()">{=L:save=}</button>
 	</form>
 	</div>
 </div>
diff --git a/src/nhttpd/web/Y_Tools_Timer_Sync.yhtm b/src/nhttpd/web/Y_Tools_Timer_Sync.yhtm
index 30788e1d9..0ec1d2fb4 100644
--- a/src/nhttpd/web/Y_Tools_Timer_Sync.yhtm
+++ b/src/nhttpd/web/Y_Tools_Timer_Sync.yhtm
@@ -4,13 +4,13 @@
 <script type="text/javascript" src="/Y_Tools_Timer_Sync.js"></script>
 </head>
 <body>
-{=var-set:wait_text=Timer holen (get timer).=}{=include-block:Y_Blocks.txt;snip_wait=}
+{=var-set:wait_text={=L:live.timer-sync.get_timer=}=}{=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_Sync=}{=var-set:menu=Timer Sync=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
+	{=var-set:help_url=Help-Live_Timer-Timer_Sync=}{=var-set:menu={=L:live.timer-sync.header=}=}{=include-block:Y_Blocks.txt;work_menu=}</div></div>
 	<div class="work_box_body">
 	<form method="post" name="f" action="">
-		<div  class="y_form_header">Timer Source</div>
+		<div  class="y_form_header">{=L:live.timer-sync.timer_source=}</div>
 		<table border="0" cellspacing="0" cellpadding="4" width="100%">
 		<tr>
 		<td>
@@ -22,7 +22,7 @@
 		<!--
 			<input type="radio" name="planer" value="slave" disabled="disabled"/>Slave box<br/>
 			<input type="radio" name="planer" value="slave" disabled="disabled"/>Test<br/> -->
-			Aufnahmeverzeichnis:
+			{=L:live.timer-sync.rec_dir=}:
 				<select name="rec_dir" class="y_live_button">
 				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_0;/mnt/filme~open=}" selected="selected">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_0;/mnt/filme~cache=}</option>
 				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_1;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_1;/mnt/filme~cache=}</option>
@@ -36,22 +36,22 @@
 				<option value="{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_9;/mnt/filme~cache=}">{=ini-get:/var/tuxbox/config/neutrino.conf;recording_dir_9;/mnt/filme~cache=}</option>
 				</select>
 
-			<br/><a href="javascript:top.top_main.prim_menu.nav('settings', 'Y_Settings_Timer.yhtm');" class="inlink">Einstellungen</a>&nbsp;<input type="checkbox" name="debug" value="1"/>Debugging</td>
+			<br/><a href="javascript:top.top_main.prim_menu.nav('settings', 'Y_Settings_Timer.yhtm');" class="inlink">{=L:live.timer-sync.settings=}</a>&nbsp;<input type="checkbox" name="debug" value="1"/>{=L:live.timer-sync.debugging=}</td>
 		</tr>
 		</table>
-		<button type="button" ytype="download" itle="get selected" name="get_selected" onclick="do_get_selected()">get selected</button>
+		<button type="button" ytype="download" name="get_selected" onclick="do_get_selected()">{=L:live.timer-sync.get_selected=}</button>
 		&nbsp;
-		<button type="button" ytype="clear" title="clear all" name="clear_all" onclick="do_clear_all()">clear all</button>
+		<button type="button" ytype="clear" name="clear_all" onclick="do_clear_all()">{=L:live.timer-sync.clear_all=}</button>
 	</form>
 	<br/>
 	<form method="post" name="timer" action="">
-		<div class="y_form_header_oline">Timer Preview List</div>
+		<div class="y_form_header_oline">{=L:live.timer-sync.timer_preview=}</div>
 		<table class="lt_table" border="0" cellspacing="0" cellpadding="4">
 		<thead align="left">
 		<tr>
 			<th><input type="checkbox" checked="checked" name="checkall" onclick="doToogleCheckboxes();" id="checkall"/></th>
-			<th colspan="2">Startzeit</th><th colspan="2">Endezeit</th>
-			<th>Sender</th><th>Sendung</th><th>Quelle</th>
+			<th colspan="2">{=L:live.timer-sync.start_time=}</th><th colspan="2">{=L:live.timer-sync.end_time=}</th>
+			<th>{=L:live.timer-sync.channel=}</th><th>{=L:live.timer-sync.programm=}</th><th>{=L:live.timer-sync.source=}</th>
 		</tr>
 		</thead>
 		<tbody id="timer_list">
@@ -59,17 +59,17 @@
 		</tbody>
 		</table>
 		<div style="padding-top:2px">
-		<button type="button" ytype="timeadd" title="" name="set_timers" onclick="do_set_timer()">set timer</button>&nbsp;
-		<button type="button" ytype="clear" title="" name="clear_log" onclick="sLog_clear()">clear log</button>
+		<button type="button" ytype="timeadd" onclick="do_set_timer()">{=L:live.timer-sync.set_timer=}</button>&nbsp;
+		<button type="button" ytype="clear" name="clear_log" onclick="sLog_clear()">{=L:live.timer-sync.clear_log=}</button>
 		</div>
 	</form>
 	<br/>
 	<form method="post" name="log" action="">
-		<div class="y_form_header_oline">Log</div>
+		<div class="y_form_header_oline">{=L:live.timer-sync.log=}</div>
 		<table class="lt_table" border="0" cellspacing="0" cellpadding="4">
 		<thead align="left">
 		<tr>
-			<th>&nbsp;</th><th>Aktion</th><th>Status</th>
+			<th>&nbsp;</th><th>{=L:live.timer-sync.action=}</th><th>{=L:live.timer-sync.status=}</th>
 		</tr>
 		</thead>
 		<tbody id="slog_list">