- neutrinoyparser: smoother view in channellist; align icons right

src/nhttpd/tuxboxapi/neutrinoyparser.cpp

@@ -126,7 +126,6 @@ const CNeutrinoYParser::TyFuncCall CNeutrinoYParser::yFuncCallList[]=
 	{"set_timer_form",				&CNeutrinoYParser::func_set_timer_form},
 	{"bouquet_editor_main",			&CNeutrinoYParser::func_bouquet_editor_main},
 	{"set_bouquet_edit_form",		&CNeutrinoYParser::func_set_bouquet_edit_form},
-
 };
 //-------------------------------------------------------------------------
 // y-func : dispatching and executing
@@ -400,7 +399,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
 		if(event.eventID && 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"
+			yresult += string_printf("<td class=\"%c title_cell\"><table class=\"title_table\" border=\"0\" cellspacing=\"0\" cellpadding=\"3\"><tr><td class=\"cslider_cell\">\n"
 					"\t<table border=\"0\" rules=\"none\" class=\"cslider cslider_table\">"
 					"<tr>"
 					"<td class=\"cslider cslider_used\" width=\"%d\"></td>"
@@ -414,7 +413,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
 		}
 		else
 		{
-			yresult += string_printf("<td class=\"%c\"><table border=\"0\" cellspacing=\"0\" cellpadding=\"3\"><tr><td>\n"
+			yresult += string_printf("<td class=\"%c title_cell\"><table class=\"title_table\" border=\"0\" cellspacing=\"0\" cellpadding=\"3\"><tr><td class=\"cslider_cell\">\n"
 					"\t<table border=\"0\" rules=\"none\" class=\"cslider cslider_table\">"
 					"<tr>"
 					"<td class=\"cslider cslider_noepg\"></td>"
@@ -424,27 +423,44 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
 				);
 		}
 
-		/* channel name and buttons */
+		/* channel name */
-		yresult += string_printf("<td>\n%s<a class=\"clist\" href=\"javascript:do_zap('"
+		yresult += "<td>\n";
-				PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
-				"')\">&nbsp;%d. %s%s</a>&nbsp;<a href=\"javascript:do_epg('"
-				PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
-				"','"
-				PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
-				"')\">%s</a>\n",
-				((channel->getChannelID() == current_channel) ? "<a name=\"akt\"></a>" : " "),
-				channel->getChannelID(),
-				channel->number /* num + j */,
-				channel->getName().c_str(),
-				(channel->getServiceType() == ST_NVOD_REFERENCE_SERVICE) ? " (NVOD)" : "",
-				channel->getChannelID(),
-				channel->getChannelID() & 0xFFFFFFFFFFFFULL,
-				(event.eventID ? "<img src=\"/images/elist.png\" alt=\"Program preview\" style=\"border: 0px\" />" : ""));
 
 		if (channel->getChannelID() == current_channel)
-			yresult += string_printf("\n&nbsp;&nbsp;<a href=\"javascript:do_streaminfo()\"><img src=\"/images/streaminfo.png\" alt=\"Streaminfo\" style=\"border: 0px\" /></a>");
+			yresult += "<a name=\"akt\"></a>\n";
 
-		yresult += string_printf("</td></tr></table>\n</td>\n</tr>\n");
+		yresult += string_printf("<a class=\"clist\" href=\"javascript:do_zap('"PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS"')\">"
+				"%d. %s%s"
+				"</a>\n"
+				, channel->getChannelID()
+				, channel->number
+				, channel->getName().c_str()
+				, (channel->getServiceType() == ST_NVOD_REFERENCE_SERVICE) ? " (NVOD)" : ""
+			);
+
+		yresult += "</td>\n";
+
+		/* buttons */
+		yresult += "<td align=\"right\" >\n";
+
+		if (channel->getChannelID() == current_channel)
+		{
+			yresult += "<a href=\"javascript:do_streaminfo()\">";
+			yresult += "<img src=\"/images/streaminfo.png\" alt=\"Streaminfo\" title=\"Streaminfo\" />";
+			yresult += "</a>\n";
+		}
+
+		if (event.eventID)
+		{
+			yresult += string_printf("<a href=\"javascript:do_epg('"PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS"','"PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS"')\">"
+					"<img src=\"/images/elist.png\" alt=\"Program preview\" title=\"EPG\" />"
+					"</a>\n"
+					, channel->getChannelID()
+					, channel->getChannelID() & 0xFFFFFFFFFFFFULL
+				);
+		}
+
+		yresult += "</td></tr></table>\n</td>\n</tr>\n";
 
 		if (channel->getServiceType() == ST_NVOD_REFERENCE_SERVICE)
 		{

src/nhttpd/web/Y_Main.css

@@ -860,6 +860,10 @@ a:hover.clistsmall
 	font-size:10pt;
 	padding-left: 10px;
 }
+.cslider_cell
+{
+	width: 35px;
+}
 .cslider
 {
 	height: 10px;
@@ -884,6 +888,10 @@ a:hover.clistsmall
 {
 	background-color: #FAFAFF;
 }
+.title_table
+{
+	width: 100%;
+}
 /*EPG*/
 .epg
 {

src/nhttpd/web/Y_Version.txt

@@ -1,4 +1,4 @@
-version=2.9.0.33
+version=2.9.0.34
-date=03.03.2016
+date=14.03.2016
 type=Release
 info=Port CST