From efc6c043a5fa0d557e82b562a8139e2a42541a89 Mon Sep 17 00:00:00 2001
From: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
Date: Tue, 25 Jan 2011 21:13:46 +0100
Subject: Applied patch (live-git-20110125-layout-fixes.patch.gz) supplied by
 Rolf Ahrenberg in vdr-portal.de. It fixes some layout and style issues of the
 multischedule extension of LIVE.

---
 pages/multischedule.ecpp | 6 +++---
 pages/setup.ecpp         | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'pages')

diff --git a/pages/multischedule.ecpp b/pages/multischedule.ecpp
index c160aad..39bf20a 100644
--- a/pages/multischedule.ecpp
+++ b/pages/multischedule.ecpp
@@ -51,7 +51,7 @@ bool logged_in(false);
 <%include>page_init.eh</%include>
 <%cpp>
 if (!logged_in && LiveSetup().UseAuth()) return reply.redirect("login.html");
-pageTitle = trVDR("Schedule");
+pageTitle = tr("MultiSchedule");
 
         ReadLock channelsLock( Channels );
 	if ( !channelsLock )
@@ -412,8 +412,8 @@ pageTitle = trVDR("Schedule");
                        row_class += odd ? " odd " : " even ";
 
 </%cpp>
-		       <tr class=" <$ row_class $>">
-		       <td class=" time leftcol ">
+		       <tr>
+		       <td class=" time leftcol rightcol <$ row_class $>">
 <%cpp>
 			if (  minutes < MINUTES_PER_ROW )
 			{
diff --git a/pages/setup.ecpp b/pages/setup.ecpp
index 7279ad0..b59d1bb 100644
--- a/pages/setup.ecpp
+++ b/pages/setup.ecpp
@@ -205,12 +205,12 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP))
 							</tr>
 							<tr>
 								<td class="label"><div class="withmargin"><$ tr("Streamdev stream type") $>:</div></td>
-								<td class="rightcol"><select name="streamdevtype" size="1" id="streamdevtype">
+								<td><select name="streamdevtype" size="1" id="streamdevtype">
 									<option value="TS" <%cpp> SELECTIF(streamdevtype == "TS") </%cpp>>TS</option>
 									<option value="PES" <%cpp> SELECTIF(streamdevtype == "PES") </%cpp>>PES</option>
 									<option value="PS" <%cpp> SELECTIF(streamdevtype == "PS") </%cpp>>PS</option>
 									<option value="ES" <%cpp> SELECTIF(streamdevtype == "ES") </%cpp>>ES</option>
-									<option value="EXT" <%cpp> SELECTIF(streamdevtype == "EXT") </%cpp>>Extern</option>
+									<option value="EXT" <%cpp> SELECTIF(streamdevtype == "EXT") </%cpp>>EXT</option>
 								</select></td>
 							</tr>
 							</table>
@@ -255,7 +255,7 @@ if (!cUser::CurrentUserHasRightTo(UR_EDITSETUP))
 							<option value="whatsonnow" <%cpp> SELECTIF(startscreen == "whatsonnow") </%cpp>><$ trVDR("What's on now?") $></option>
 							<option value="whatsonnext" <%cpp> SELECTIF(startscreen == "whatsonnext") </%cpp>><$ trVDR("What's on next?") $></option>
 							<option value="schedule" <%cpp> SELECTIF(startscreen == "schedule") </%cpp>><$ trVDR("Schedule") $></option>
-							<option value="multischedule" <%cpp> SELECTIF(startscreen == "multischedule") </%cpp>><$ trVDR("MultiSchedule") $></option>
+							<option value="multischedule" <%cpp> SELECTIF(startscreen == "multischedule") </%cpp>><$ tr("MultiSchedule") $></option>
 							<option value="recordings" <%cpp> SELECTIF(startscreen == "recordings") </%cpp>><$ trVDR("Recordings") $></option>
 							<option value="timers" <%cpp> SELECTIF(startscreen == "timers") </%cpp>><$ trVDR("Timers") $></option>
 						</select></td>
-- 
cgit v1.2.3