diff --git a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp index 2ce55b2ad..fa86cc967 100644 --- a/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp +++ b/src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp @@ -367,7 +367,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std: yresult += ""; if(have_logos) - yresult += string_printf("", classname, channel->channel_id, (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("\n"); } else - yresult += string_printf("\n"); + yresult += string_printf(" 
 \n",classname); } return yresult; } diff --git a/src/nhttpd/web/Y_Main.css b/src/nhttpd/web/Y_Main.css index b9f71adfe..f6e44e168 100644 --- a/src/nhttpd/web/Y_Main.css +++ b/src/nhttpd/web/Y_Main.css @@ -591,16 +591,42 @@ tr { .y_epg_info #info2 { 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 { - max-width: 44px; + background: #A1CCF2; + vertical-align: middle; + max-width: 100px; max-height: 40px; } #epg_plus { border-top : #BBBBBB solid 1px; border-left : #BBBBBB solid 1px; border-right : #BBBBBB solid 1px; - margin: 0px; + margin: 1em 0; /* width:auto;*/ overflow:auto; } @@ -612,6 +638,7 @@ tr { min-height: 40px; } .ep_bouquet_name { + background: #A1CCF2; border-right : #BBBBBB solid 1px; width : 100px; /* height: 1.3em;*/ @@ -622,6 +649,12 @@ tr { text-align: center; min-height: 40px; } +.ep_bouquet_name a { + display: table-cell; + vertical-align: middle; + min-width: 100px; + height: 40px; +} .ep_bouquet_item { border-right : #BBBBBB solid 1px; overflow:hidden; @@ -631,6 +664,12 @@ tr { height: 100%; font-size:8pt; } +.ep_bouquet_item:hover { + background-color: #D3E7F8; +} +.ep_bouquet_item span:hover { + cursor: pointer; +} .ep_bouquet_rec { border-right : #BBBBBB solid 1px; overflow:hidden; diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt index 56230142c..8c0df9096 100644 --- a/src/nhttpd/web/Y_Version.txt +++ b/src/nhttpd/web/Y_Version.txt @@ -1,4 +1,4 @@ -version=2.8.0.59 -date=12.02.2014 +version=2.8.0.60 +date=01.04.2014 type=Release info=Port CST