diff options
| author | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2007-05-25 13:51:30 +0000 |
|---|---|---|
| committer | Christian Wieninger <cwieninger (at) gmx (dot) de> | 2007-05-25 13:51:30 +0000 |
| commit | d43534acfc3e0e094671485b9ddffec77d1ef6ec (patch) | |
| tree | f9f5545aae209e0caa8bf50c41376749d9c26e2f /pages | |
| parent | 763b59bfa1c47ee7436d079eda8eb70a896f16a8 (diff) | |
| download | vdr-plugin-live-d43534acfc3e0e094671485b9ddffec77d1ef6ec.tar.gz vdr-plugin-live-d43534acfc3e0e094671485b9ddffec77d1ef6ec.tar.bz2 | |
- merged 'What's on now' and 'What's on next'
Diffstat (limited to 'pages')
| -rw-r--r-- | pages/menu.ecpp | 6 | ||||
| -rw-r--r-- | pages/whats_on.ecpp | 7 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pages/menu.ecpp b/pages/menu.ecpp index acae70c..4a034a1 100644 --- a/pages/menu.ecpp +++ b/pages/menu.ecpp @@ -29,8 +29,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); set_component = component; }> <div class="menu"> - <a href="whats_on.html?type=now" <& menu.setactive current=("now") &>><$ tr("What's on now?") $></a> | - <a href="whats_on.html?type=next" <& menu.setactive current=("next") &>><$ tr("What's on next?") $></a> | + <a href="whats_on.html?type=now" <& menu.setactive current=("whats_on") &>><$ tr("What's on?") $></a> | <a href="schedule.html" <& menu.setactive current=("schedule") &>><$ tr("Schedule") $></a> | <a href="timers.html" <& menu.setactive current=("timers") &>><$ tr("Timers") $></a> | % if (LiveSetup().HaveEPGSearch()) { @@ -51,8 +50,7 @@ if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html"); <div class="pagemenu"> <div> <!-- outer --> <div> <!-- inner --> - <& menu.component current=("now") &> - <& menu.component current=("next") &> + <& menu.component current=("whats_on") &> <& menu.component current=("schedule") &> <& menu.component current=("timers") &> % if (LiveSetup().HaveEPGSearch()) { diff --git a/pages/whats_on.ecpp b/pages/whats_on.ecpp index 7c91393..bab6a57 100644 --- a/pages/whats_on.ecpp +++ b/pages/whats_on.ecpp @@ -45,7 +45,7 @@ if (type == "now") { </head> <body onload="<& pageelems.infobox_start_update &>"> <& pageelems.logo &> - <& menu active=(type) &> + <& menu active=("whats_on") component=("whats_on.whats_on_actions")> <div class="inhalt"> <{ EpgEvents epgEvents; @@ -118,3 +118,8 @@ if (type == "now") { </body> </html> <%include>page_exit.eh</%include> + +<%def whats_on_actions> +<a href="whats_on.html?type=now"><$ tr("Now") $></a> +<a href="whats_on.html?type=next"><$ tr("Next") $></a> +</%def> |