diff options
| -rw-r--r-- | css/styles.css | 39 | ||||
| -rw-r--r-- | pages/menu.ecpp | 4 | ||||
| -rw-r--r-- | pages/schedule.ecpp | 20 | ||||
| -rw-r--r-- | pages/whats_on.ecpp | 29 |
4 files changed, 68 insertions, 24 deletions
diff --git a/css/styles.css b/css/styles.css index e32f95a..249711a 100644 --- a/css/styles.css +++ b/css/styles.css @@ -275,8 +275,8 @@ table.timers tr td.head { */ table.schedule { - margin-top: 10px; - border: 1px solid #6D96A9; + margin: 10px 0 0 0 ; + padding: 0; } table.schedule tr td.head { @@ -292,11 +292,46 @@ table.schedule tr td { padding: 3px 7px 3px 3px; } +table.schedule tr td.day { + vertical-align: top; + padding: 0; + margin: 0; + border:none; +} table.schedule tr.active { background: #DEE6EE; } +/* + ############################## + # Blue Baground Thingy + ############################## +*/ + +div.boxheader { + margin: 0; + padding: 0; + background: url(/bg_box_l.png) top left no-repeat; +} + +div.boxheader div { + background: url(/bg_box_r.png) top right no-repeat; +} + +div.boxheader div div { + background: url(/bg_box_h.png) repeat-x; + vertical-align: middle; + text-align: left; + margin-right: 3px; + margin-left: 3px; + padding-left: 5px; + padding-top: 2px; + color: white; + font-weight: bold; + height: 21px; +} + /* ############################## diff --git a/pages/menu.ecpp b/pages/menu.ecpp index a36a01a..2989e99 100644 --- a/pages/menu.ecpp +++ b/pages/menu.ecpp @@ -24,7 +24,5 @@ std::string set_active; <%args> current; </%args> -<{ if (current== set_active) { }> -class="active" -<{ } }> +<%cpp> if (current== set_active) { </%cpp>class="active"<%cpp> } </%cpp> </%def>
\ No newline at end of file diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp index 3bc50fd..019b3ad 100644 --- a/pages/schedule.ecpp +++ b/pages/schedule.ecpp @@ -73,19 +73,31 @@ using namespace vdrlive; tEventID event = Event->EventID(); if (current_day != day) { - current_day = day; + if (current_day != "") { }> <tr> - <td class="head" colspan="4"><$ current_day $></td> + <td colspan="4" style="border-top: 1px solid black"> </td></tr> </tr> +<{ + } +}> + <tr> + <td class="day" colspan="4"><div class="boxheader"><div><div><$ day $></div></div></div></td> + </tr> +% current_day = day; % } <tr class="<? active_line ? "active" ?>"> - <td><& pageelems.event_timer channelid=(channel_id) eventid=(event) &></td> + <td style="border-left: 1px solid black"><& pageelems.event_timer channelid=(channel_id) eventid=(event) &></td> <td><$ start $> - <$ end $></td> <td><strong><$ title $></strong><br /><$ short_description $><br /></td> - <td> </td> + <td style="border-right: 1px solid black"> </td> </tr> % } +% if (Schedule->Events()->Count() > 0) { + <tr> + <td colspan="4" style="border-top: 1px solid black"> </td></tr> + </tr> +% } </table> </div> </body> diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp index 3c06c91..5eb5edb 100644 --- a/pages/whats_on.ecpp +++ b/pages/whats_on.ecpp @@ -68,22 +68,22 @@ if (type == "now") { description += string(" ") + tr("more") + string(" ..."); } }> - <div class="event"> - <div class="station"> - <div><div><div><$ channel_name $></div></div></div> - </div> - <div class="tools"> - <& pageelems.event_timer channelid=(channel_id) eventid=(event) &> - </div> - <div class="content"> - <div class="info"><$ start $> - <$ end $></div> - <div class="title"><$ title $></div> - <div class="short"><$ short_description $></div> - <div class="description"> - <$ description $> - </div> + <div class="event"> + <div class="station"> + <div><div><div><$ channel_name $></div></div></div> + </div> + <div class="tools"> + <& pageelems.event_timer channelid=(channel_id) eventid=(event) &> + </div> + <div class="content"> + <div class="info"><$ start $> - <$ end $></div> + <div class="title"><$ title $></div> + <div class="short"><$ short_description $></div> + <div class="description"> + <$ description $> </div> </div> + </div> <{ @@ -93,7 +93,6 @@ if (type == "now") { } } }> - </div> </div> </body> </html> |