- Added pagemenu infrastructure. Use this to create below the main menu

  a page specific optional additional menu. Just add a component to
  the main menu. A working sample can be found in 'schedule.ecpp'
- Added extra with at the top of the recordings line.
- Adapted styles.css for both changes.

3 files changed, 32 insertions, 13 deletions

diff --git a/pages/menu.ecpp b/pages/menu.ecpp
index d1e02d6..3841b85 100644
--- a/pages/menu.ecpp
+++ b/pages/menu.ecpp
@@ -16,14 +16,29 @@ std::string set_component;
 		set_component = component;
 }>
 <div class="menu">
-	<a href="whats_on.html?type=now" <& menu.setactive current=("now") &>><$ tr("What's on now?") $></a> <& menu.component current=("now") &> |
-	<a href="whats_on.html?type=next" <& menu.setactive current=("next") &>><$ tr("What's on next?") $></a> <& menu.component current=("next") &> |
-	<a href="schedule.html" <& menu.setactive current=("schedule") &>><$ tr("Schedule") $></a> <& menu.component current=("schedule") &> |
-	<a href="timers.html" <& menu.setactive current=("timers") &>><$ tr("Timers") $></a> <& menu.component current=("timers") &> |
-	<a href="searchtimers.html" <& menu.setactive current=("searchtimers") &>><$ tr("Searchtimers") $></a> <& menu.component current=("searchtimers") &> |
-	<a href="recordings.html" <& menu.setactive current=("recordings") &>><$ tr("Recordings") $></a> <& menu.component current=("recordings") &> |
-	<a href="remote.html" <& menu.setactive current=("remote") &>><$ tr("Remote Control") $></a> <& menu.component current=("remote") &>
+	<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="schedule.html" <& menu.setactive current=("schedule") &>><$ tr("Schedule") $></a> |
+	<a href="timers.html" <& menu.setactive current=("timers") &>><$ tr("Timers") $></a> |
+	<a href="searchtimers.html" <& menu.setactive current=("searchtimers") &>><$ tr("Searchtimers") $></a> |
+	<a href="recordings.html" <& menu.setactive current=("recordings") &>><$ tr("Recordings") $></a> |
+	<a href="remote.html" <& menu.setactive current=("remote") &>><$ tr("Remote Control") $></a>
 </div>
+% if (!component.empty()) {
+<div class="pagemenu">
+ <div> <!-- outer -->
+  <div> <!-- inner -->
+	<& menu.component current=("now") &>
+	<& menu.component current=("next") &>
+	<& menu.component current=("schedule") &>
+	<& menu.component current=("timers") &>
+	<& menu.component current=("searchtimers") &>
+	<& menu.component current=("recordings") &>
+	<& menu.component current=("remote") &>
+  </div>
+ </div>
+</div>
+% }
 
 <%def setactive>
 <%args>
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index 755a3bc..96562f7 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -84,7 +84,9 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) {
 			+ string("<img class=\"recording_folder\" src=\"") + folderimg + string("\" alt=\"\" />")
 			+ string("</div>");
 }>
-			<div class="recording_name"><$ recItem->Name() $></div>
+			<div class="recording_spec">
+			  <div class="recording_name"><$ recItem->Name() $></div>
+            </div>
 			<div class="recording_actions">&nbsp;</div>
 			</div>
 <{
@@ -125,10 +127,12 @@ for (iter = recordingsTree.begin(path); iter != end; ++iter) {
 
 		string shortDescr(tr("Click to view details.")); if (info && info->ShortText()) shortDescr = (string("") +  info->ShortText() + string("<br />") + shortDescr);
 }>
-			<div class="recording_day" style="width: <$ dayLen $>"><$ day $></div>
-			<div class="recording_date"><$ FormatDateTime(tr("%b %d %y"), recItem->StartTime()) $></div>
-			<div class="recording_time"><$ FormatDateTime(tr("%I:%M %p"), recItem->StartTime()) $></div>
-			<div class="recording_name" <& tooltip.hint text=(shortDescr) &><& tooltip.display domId=(recItem->Id()) &>><$ recItem->Name() $></div>
+			<div class="recording_spec">
+			  <div class="recording_day" style="width: <$ dayLen $>"><$ day $></div>
+			  <div class="recording_date"><$ FormatDateTime(tr("%b %d %y"), recItem->StartTime()) $></div>
+			  <div class="recording_time"><$ FormatDateTime(tr("%I:%M %p"), recItem->StartTime()) $></div>
+			  <div class="recording_name" <& tooltip.hint text=(shortDescr) &><& tooltip.display domId=(recItem->Id()) &>><$ recItem->Name() $></div>
+			</div>
 			<div class="recording_actions">
 				 <& pageelems.ajax_action_href action="play_recording" param=(recItem->Id()) tip=(tr("play this recording.")) image="play.png" alt="" &>
 				 <img src="edit.png" alt="" />
diff --git a/pages/schedule.ecpp b/pages/schedule.ecpp
index df358ec..2ee7ed0 100644
--- a/pages/schedule.ecpp
+++ b/pages/schedule.ecpp
@@ -106,5 +106,5 @@ using namespace vdrlive;
 <%include>page_exit.eh</%include>
 
 <%def channel_selection>
-<form name="channels" id="channels"><& channels_widget name=("channel") selected=(Channel ? *Channel->GetChannelID().ToString() : "") onchange=("document.forms.channels.submit()") &></form>
+<form name="channels" id="channels"><span><$ tr("Show schedule of channel") $>: </span><& channels_widget name=("channel") selected=(Channel ? *Channel->GetChannelID().ToString() : "") onchange=("document.forms.channels.submit()") &></form>
 </%def>