From fa0c9473db7ff372d4654f3a00dd039222c45189 Mon Sep 17 00:00:00 2001 From: Thomas Keil Date: Sat, 13 Jan 2007 19:54:00 +0000 Subject: Changed overall menue structure --- css/styles.css | 47 ++++++++++++++++++++++------------------------- images/Makefile | 2 +- pages/menu.ecpp | 32 +++++++++++++++++++++++++------- pages/recordings.ecpp | 14 +++++--------- pages/remote.ecpp | 2 +- pages/schedule.ecpp | 8 ++------ pages/timers.ecpp | 8 ++------ pages/whats_on.ecpp | 11 ++++------- 8 files changed, 62 insertions(+), 62 deletions(-) diff --git a/css/styles.css b/css/styles.css index 6afebb0..e32f95a 100644 --- a/css/styles.css +++ b/css/styles.css @@ -55,26 +55,6 @@ div.domTTOverlib .contents { background-color: #F1F1FF; } -/* ####################### - # Areas - ####################### -*/ -div.left_area { - width: 150px; - float: left; -} - -div.left_area img.logo { - margin: 5px; -} - -div.right_area { - float: left; -} - -div.inhalt { - margin: 5px; -} /* ####################### # Menue @@ -82,19 +62,36 @@ div.inhalt { */ div.menu { - border: 1px solid #6D96A9; + background: #000057 url(menu_line_bg.png) repeat-x; + min-height: 30px; + margin: 0; + padding: 0 0 0 10px; + line-height: 20px; + vertical-align: middle; + border-top: 1px solid black; + border-bottom: 1px solid black; color: #6D96A9; - padding: 5px; - margin: 5px; } div.menu a { text-decoration: none; + color: white; + font-weight: bold; } -div.menu a:hover { +div.menu a.active { text-decoration: none; - background: #DEE6EE; + color: #6D96A9; + font-weight: bold; +} + + +div.menu a:hover { + text-decoration: underline; +} + +div.inhalt { + padding: 10px; } /* ####################### diff --git a/images/Makefile b/images/Makefile index a8ef343..450cb35 100644 --- a/images/Makefile +++ b/images/Makefile @@ -19,7 +19,7 @@ OBJS = logo.o record.o active.o inactive.o button_blue.o \ transparent.o edit.o del.o play.o \ bg_header_h.o bg_header_l.o bg_header_r.o \ bg_box_h.o bg_box_l.o bg_box_r.o \ - movie.o + movie.o menu_line_bg.o ### Default rules: diff --git a/pages/menu.ecpp b/pages/menu.ecpp index 3d46df4..a36a01a 100644 --- a/pages/menu.ecpp +++ b/pages/menu.ecpp @@ -2,11 +2,29 @@ #include #include +<%args> +active; + +<%request scope="page"> +std::string set_active; + +<{ + set_active = active; +}> + ><$ tr("What's on now?") $> | + ><$ tr("What's on next?") $> | + ><$ tr("Schedule") $> | + ><$ tr("Timers") $> | + ><$ tr("Recordings") $> | + ><$ tr("Remote Control") $> + + +<%def setactive> +<%args> +current; + +<{ if (current== set_active) { }> +class="active" +<{ } }> + \ No newline at end of file diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp index b93e16e..a8aa15d 100644 --- a/pages/recordings.ecpp +++ b/pages/recordings.ecpp @@ -26,22 +26,18 @@ RecordingsTree recordingsTree; <& pageelems.tooltip_js &> -

- <& pageelems.logo &> - <& menu &> -

-

-

+ <& pageelems.logo &> + <& menu active=("recordings") &> +

<& pageelems.header_box content=(tr("Recordings")) &> % if (Recordings.Count() == 0) { Keine Aufnahmen vorhanden % } else { -

+

<& recordings.recordings_item &> -

+

% }

-

<%include>page_exit.eh diff --git a/pages/remote.ecpp b/pages/remote.ecpp index 0926052..dabad65 100644 --- a/pages/remote.ecpp +++ b/pages/remote.ecpp @@ -107,7 +107,7 @@ using namespace vdrlive;

<& pageelems.logo &> - <& menu > + <& menu active="remote" &>

diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp index 4ff06ad..3bc50fd 100644 --- a/pages/schedule.ecpp +++ b/pages/schedule.ecpp @@ -48,11 +48,8 @@ using namespace vdrlive; -

- <& pageelems.logo &> - <& menu > -

-

+ <& pageelems.logo &> + <& menu active=("schedule")>

<&pageelems.header_box component=("schedule.channel_selection") &> @@ -91,7 +88,6 @@ using namespace vdrlive; % }

-

<%include>page_exit.eh diff --git a/pages/timers.ecpp b/pages/timers.ecpp index 97adafa..422b2ea 100644 --- a/pages/timers.ecpp +++ b/pages/timers.ecpp @@ -20,11 +20,8 @@ using namespace vdrlive; -

- <& pageelems.logo &> - <& menu > -

-

+ <& pageelems.logo &> + <& menu active=("timers") &>

<& pageelems.header_box content=(pageTitle) &> % if (timers.size() == 0) { @@ -62,7 +59,6 @@ using namespace vdrlive; }>

-

<%include>page_exit.eh diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp index 9bb3171..3c06c91 100644 --- a/pages/whats_on.ecpp +++ b/pages/whats_on.ecpp @@ -24,6 +24,7 @@ string head; if (type == "now") { head = tr("What's running at")+string(" ")+FormatDateTime(tr("%I:%M %p"), time(0)); } else { + type="next"; head = tr("What's on next?"); } @@ -40,13 +41,9 @@ if (type == "now") { -

- <& pageelems.logo &> - <& menu > -

-

-

- <& pageelems.header_box content=(head) &> + <& pageelems.logo &> + <& menu active=(type) &> +

<{ ReadLock channelsLock( Channels ); if (channelsLock) { -- cgit v1.2.3