mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 17:31:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

- yweb: rework classifying slidertable in channellist for a smoother view

Browse Source
This commit is contained in:
svenhoefer
2013-06-28 00:52:59 +02:00
parent b1f2f4dc98
commit 63173fd5e2
3 changed files with 34 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp
View File

@@ -345,7 +345,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
int i = 1; int i = 1;
char classname; char classname;
t_channel_id current_channel = CZapit::getInstance()->GetCurrentChannelID(); t_channel_id current_channel = CZapit::getInstance()->GetCurrentChannelID();
int prozent; int prozent = 100;
CSectionsdClient::responseGetCurrentNextInfoChannelID currentNextInfo; CSectionsdClient::responseGetCurrentNextInfoChannelID currentNextInfo;
std::string timestr; std::string timestr;
bool have_logos = false; bool have_logos = false;
@@ -373,20 +373,31 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
/* timer slider */ /* timer slider */
if(event && event->duration > 0) if(event && event->duration > 0)
{
prozent = 100 * (time(NULL) - event->startTime) / event->duration; 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 else
prozent = 100; {
yresult += string_printf("<td class=\"%c\"><table border=\"0\" cellspacing=\"0\" cellpadding=\"3\"><tr><td>\n" 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\">" "\t<table border=\"0\" rules=\"none\" class=\"cslider cslider_table\">"
"<tr>" "<tr>"
"<td class=\"cslider_used\" width=\"%d\"></td>" "<td class=\"cslider cslider_noepg\"></td>"
"<td class=\"cslider_free\" width=\"%d\"></td>" "</tr>"
"</tr>" "</table>\n</td>\n"
"</table>\n</td>\n" , classname
, classname );
, (prozent / 10) * 3 }
, (10 - (prozent / 10))*3
);
/* channel name and buttons */ /* channel name and buttons */
yresult += string_printf("<td>\n%s<a class=\"clist\" href=\"javascript:do_zap('" yresult += string_printf("<td>\n%s<a class=\"clist\" href=\"javascript:do_zap('"

11
src/nhttpd/web/Y_Main.css
View File

@@ -771,9 +771,12 @@ a:hover.clistsmall
font-size:10pt; font-size:10pt;
padding-left: 10px; padding-left: 10px;
} }
.cslider_table .cslider
{ {
height: 10px; height: 10px;
}
.cslider_table
{
border: 1px solid #6cafea; border: 1px solid #6cafea;
width: 30px; width: 30px;
border-spacing: 0px; border-spacing: 0px;
@@ -783,12 +786,14 @@ a:hover.clistsmall
.cslider_used .cslider_used
{ {
background-color: #A1CCF2; background-color: #A1CCF2;
height: 10px;
} }
.cslider_free .cslider_free
{ {
background-color: #EAEBFF; background-color: #EAEBFF;
height: 10px; }
.cslider_noepg
{
background-color: #FAFAFF;
} }
/*EPG*/ /*EPG*/
.epg .epg

4
src/nhttpd/web/Y_Version.txt
View File

@@ -1,4 +1,4 @@
version=2.8.0.34 version=2.8.0.36
date=24.06.2013 date=28.06.2013
type=Release type=Release
info=Port CST info=Port CST