From 65af1eeb18e3653d2ba9b50de6a17eb35eb1a44e Mon Sep 17 00:00:00 2001
From: yjogol <yjogol@e54a6e83-5905-42d5-8d5c-058d10e6a962>
Date: Thu, 18 Mar 2010 18:33:30 +0000
Subject: [PATCH] yweb: update EPG Plus: Show logos, show recording and zap
 timers

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@507 e54a6e83-5905-42d5-8d5c-058d10e6a962
---
 src/nhttpd/web/Y_EPG.js        | 7 ++++++-
 src/nhttpd/web/Y_EPG_Plus.yhtm | 2 +-
 src/nhttpd/web/Y_Main.css      | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/nhttpd/web/Y_EPG.js b/src/nhttpd/web/Y_EPG.js
index 4cd4a3042..29705fbec 100644
--- a/src/nhttpd/web/Y_EPG.js
+++ b/src/nhttpd/web/Y_EPG.js
@@ -33,6 +33,10 @@ function epg_zapto(){
 function epg_set_timer(){
 	dbox_set_timer($("d_channel_id").innerHTML, $("d_start").innerHTML, $("d_stop").innerHTML);
 }
+function set_zapit(){
+	var rec = "/control/timer?action=new&type=3&alarm="+$("d_start").innerHTML+"&channel_id="+$("d_channel_id").innerHTML;
+	var res = loadSyncURL(rec);
+}
 function build_epg_clear(){
 	var ep = $("epg_plus");
 	obj_clear_all_childs(ep);
@@ -186,10 +190,11 @@ function build_epg_plus_loop(_starttime, _stoptime)
 		var _bouquet = g_bouquet_list[g_i];
 		var __channel_name = getXMLNodeItemValue(_bouquet, "name");
 		var __channel_id = getXMLNodeItemValue(_bouquet, "id");
+		var __short_channel_id = getXMLNodeItemValue(_bouquet, "short_id");
 		var ep = $("epg_plus");
 		var __bdiv = obj_createAt(ep, "div", "ep_bouquet");
 		var __bname_div = obj_createAt(__bdiv, "div", "ep_bouquet_name");
-		var ch_name_with_logo= (g_logosURL!="")?"<img class=\"channel_logos\" src=\""+g_logosURL+"/"+__channel_id+".gif\" alt=\""+__channel_name+"\" >":__channel_name;
+		var ch_name_with_logo= (g_logosURL!="")?"<img class=\"channel_logos\" src=\""+g_logosURL+"/"+__short_channel_id+".jpg\" title=\""+__channel_name+"\" alt=\""+__channel_name+"\" >":__channel_name;
 		$(__bname_div).update("<a href=\"javascript:do_zap('"+__channel_id+"');\">"+ch_name_with_logo+"</a>");
 		build_epg_bouquet(__bdiv, __channel_id, _starttime, _stoptime);
 		window.setTimeout("build_epg_plus_loop("+_starttime+","+_stoptime+")",100);
diff --git a/src/nhttpd/web/Y_EPG_Plus.yhtm b/src/nhttpd/web/Y_EPG_Plus.yhtm
index 046ba9378..e075e7cd9 100644
--- a/src/nhttpd/web/Y_EPG_Plus.yhtm
+++ b/src/nhttpd/web/Y_EPG_Plus.yhtm
@@ -53,7 +53,7 @@ function epg_imdb(){
 		<tr>
 			<td colspan="3">
 				<button ytype="record" title="{=L:epg.set_timer=}" onclick="epg_set_timer();show_obj('epg_info',false);">{=L:record=}</button>
-				<button ytype="zap" title="{=L:epg.zap_to=}" onclick="epg_zapto();show_obj('epg_info',false);">{=L:zap=}</button>
+				<button ytype="zap" title="{=L:epg.zap_to=}" onclick="set_zapit();show_obj('epg_info',false);">{=L:zap=}</button>
 				{=L:lookup=}:
 				<span id="d_lookup"></span>
 			</td>
diff --git a/src/nhttpd/web/Y_Main.css b/src/nhttpd/web/Y_Main.css
index 38c38b6e2..f44a57edd 100644
--- a/src/nhttpd/web/Y_Main.css
+++ b/src/nhttpd/web/Y_Main.css
@@ -545,7 +545,7 @@ tr {
 	background-color: #FF6600;
 	height: 100%;
 	font-size:8pt;
-	z-index:-10;
+	z-index:10;
 	-moz-opacity: 0.2;
 	opacity:.20;
 	filter: alpha(opacity=20);