From 6de6fcef79405d76e9519f5a8939972ef9b0d244 Mon Sep 17 00:00:00 2001
From: vanhofen <vanhofen@gmx.de>
Date: Fri, 28 Jun 2013 00:52:59 +0200
Subject: [PATCH] yweb: rework classifying slidertable in channellist for a
 smoother view

Origin commit data
------------------
Commit: https://github.com/neutrino-images/ni-neutrino/commit/63173fd5e28a066d716a157382f5a8ac2d48297e
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-06-28 (Fri, 28 Jun 2013)

Origin message was:
------------------
- yweb: rework classifying slidertable in channellist for a smoother view
---
 .../tuxboxapi/coolstream/neutrinoyparser.cpp  | 37 ++++++++++++-------
 src/nhttpd/web/Y_Main.css                     | 11 ++++--
 src/nhttpd/web/Y_Version.txt                  |  4 +-
 3 files changed, 34 insertions(+), 18 deletions(-)

diff --git a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
index 9ea0ebaaf..a3489f34a 100644
--- a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
+++ b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
@@ -345,7 +345,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
 	int i = 1;
 	char classname;
 	t_channel_id current_channel = CZapit::getInstance()->GetCurrentChannelID();
-	int prozent;
+	int prozent = 100;
 	CSectionsdClient::responseGetCurrentNextInfoChannelID currentNextInfo;
 	std::string timestr;
 	bool have_logos = false;
@@ -373,20 +373,31 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
 
 		/* timer slider */
 		if(event && event->duration > 0)
+		{
 			prozent = 100 * (time(NULL) - event->startTime) / event->duration;
+			yresult += string_printf("<td class=\"%c\"><table border=\"0\" cellspacing=\"0\" cellpadding=\"3\"><tr><td>\n"
+					"\t<table border=\"0\" rules=\"none\" class=\"cslider cslider_table\">"
+					"<tr>"
+					"<td class=\"cslider cslider_used\" width=\"%d\"></td>"
+					"<td class=\"cslider cslider_free\" width=\"%d\"></td>"
+					"</tr>"
+					"</table>\n</td>\n"
+					, classname
+					, (prozent / 10) * 3
+					, (10 - (prozent / 10))*3
+				);
+		}
 		else
-			prozent = 100;
-		yresult += string_printf("<td class=\"%c\"><table border=\"0\" cellspacing=\"0\" cellpadding=\"3\"><tr><td>\n"
-				"\t<table border=\"0\" rules=\"none\" class=\"cslider_table\" width=\"32\">"
-				"<tr>"
-				"<td class=\"cslider_used\" width=\"%d\"></td>"
-				"<td class=\"cslider_free\" width=\"%d\"></td>"
-				"</tr>"
-				"</table>\n</td>\n"
-				, classname
-				, (prozent / 10) * 3
-				, (10 - (prozent / 10))*3
-			);
+		{
+			yresult += string_printf("<td class=\"%c\"><table border=\"0\" cellspacing=\"0\" cellpadding=\"3\"><tr><td>\n"
+					"\t<table border=\"0\" rules=\"none\" class=\"cslider cslider_table\">"
+					"<tr>"
+					"<td class=\"cslider cslider_noepg\"></td>"
+					"</tr>"
+					"</table>\n</td>\n"
+					, classname
+				);
+		}
 
 		/* channel name and buttons */
 		yresult += string_printf("<td>\n%s<a class=\"clist\" href=\"javascript:do_zap('"
diff --git a/src/nhttpd/web/Y_Main.css b/src/nhttpd/web/Y_Main.css
index ea0f859d3..6a062e5e0 100644
--- a/src/nhttpd/web/Y_Main.css
+++ b/src/nhttpd/web/Y_Main.css
@@ -771,9 +771,12 @@ a:hover.clistsmall
 	font-size:10pt;
 	padding-left: 10px;
 }
-.cslider_table
+.cslider
 {
 	height: 10px;
+}
+.cslider_table
+{
 	border: 1px solid #6cafea;
 	width: 30px;
 	border-spacing: 0px;
@@ -783,12 +786,14 @@ a:hover.clistsmall
 .cslider_used
 {
 	background-color: #A1CCF2;
-	height: 10px;
 }
 .cslider_free
 {
 	background-color: #EAEBFF;
-	height: 10px;
+}
+.cslider_noepg
+{
+	background-color: #FAFAFF;
 }
 /*EPG*/
 .epg
diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt
index fd3d4cd20..754e880b9 100644
--- a/src/nhttpd/web/Y_Version.txt
+++ b/src/nhttpd/web/Y_Version.txt
@@ -1,4 +1,4 @@
-version=2.8.0.34
-date=24.06.2013
+version=2.8.0.36
+date=28.06.2013
 type=Release
 info=Port CST