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

- yWeb: scale channellogos in channellist and epg plus

Browse Source
This commit is contained in:
svenhoefer
2014-04-01 17:59:04 +02:00
parent 7d4747b5be
commit 1e2290a758
3 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -367,7 +367,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
yresult += "<tr>"; yresult += "<tr>";
if(have_logos) if(have_logos)
yresult += string_printf("<td class=\"%c\" width=\"44\" rowspan=\"2\"><a href=\"javascript:do_zap('" yresult += string_printf("<td class=\"%c logo_cell\" width=\"44\" rowspan=\"2\"><a href=\"javascript:do_zap('"
PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS PRINTF_CHANNEL_ID_TYPE_NO_LEADING_ZEROS
"')\"><img class=\"channel_logo\" src=\"%s\"/></a></td>", classname, channel->channel_id, "')\"><img class=\"channel_logo\" src=\"%s\"/></a></td>", classname, channel->channel_id,
(NeutrinoAPI->getLogoFile(hh->WebserverConfigList["Tuxbox.LogosURL"], channel->channel_id)).c_str()); (NeutrinoAPI->getLogoFile(hh->WebserverConfigList["Tuxbox.LogosURL"], channel->channel_id)).c_str());
@@ -487,7 +487,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
yresult += string_printf("</td></tr>\n"); yresult += string_printf("</td></tr>\n");
} }
else else
yresult += string_printf("<tr style=\"height: 2px\"><td></td></tr>\n"); yresult += string_printf("<tr><td class=\"%cepg\">&nbsp;<br />&nbsp;</td></tr>\n",classname);
} }
return yresult; return yresult;
} }

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

@@ -591,16 +591,42 @@ tr {
.y_epg_info #info2 { .y_epg_info #info2 {
font-size:8pt; font-size:8pt;
} }
.a, .b, .c {
vertical-align: top;
}
.bouquetitemlist .logo_cell {
background: #A1CCF2;
border-bottom: 1px solid white;
margin: 0;
padding: 0;
}
.bouquetitemlist .logo_cell a {
display: table-cell;
text-align: center;
vertical-align: middle;
min-width: 185px;
height: 60px;
padding: 0 5px;
}
.channel_logo {
background: #A1CCF2;
max-width: 175px;
}
.aepg, .bepg, .cepg {
white-space: nowrap;
}
.channel_logos .channel_logos
{ {
max-width: 44px; background: #A1CCF2;
vertical-align: middle;
max-width: 100px;
max-height: 40px; max-height: 40px;
} }
#epg_plus { #epg_plus {
border-top : #BBBBBB solid 1px; border-top : #BBBBBB solid 1px;
border-left : #BBBBBB solid 1px; border-left : #BBBBBB solid 1px;
border-right : #BBBBBB solid 1px; border-right : #BBBBBB solid 1px;
margin: 0px; margin: 1em 0;
/* width:auto;*/ /* width:auto;*/
overflow:auto; overflow:auto;
} }
@@ -612,6 +638,7 @@ tr {
min-height: 40px; min-height: 40px;
} }
.ep_bouquet_name { .ep_bouquet_name {
background: #A1CCF2;
border-right : #BBBBBB solid 1px; border-right : #BBBBBB solid 1px;
width : 100px; width : 100px;
/* height: 1.3em;*/ /* height: 1.3em;*/
@@ -622,6 +649,12 @@ tr {
text-align: center; text-align: center;
min-height: 40px; min-height: 40px;
} }
.ep_bouquet_name a {
display: table-cell;
vertical-align: middle;
min-width: 100px;
height: 40px;
}
.ep_bouquet_item { .ep_bouquet_item {
border-right : #BBBBBB solid 1px; border-right : #BBBBBB solid 1px;
overflow:hidden; overflow:hidden;
@@ -631,6 +664,12 @@ tr {
height: 100%; height: 100%;
font-size:8pt; font-size:8pt;
} }
.ep_bouquet_item:hover {
background-color: #D3E7F8;
}
.ep_bouquet_item span:hover {
cursor: pointer;
}
.ep_bouquet_rec { .ep_bouquet_rec {
border-right : #BBBBBB solid 1px; border-right : #BBBBBB solid 1px;
overflow:hidden; overflow:hidden;

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

@@ -1,4 +1,4 @@
version=2.8.0.59 version=2.8.0.60
date=12.02.2014 date=01.04.2014
type=Release type=Release
info=Port CST info=Port CST