From cd2959a44a006e9e2d814995c6b7aff7e6229a0b Mon Sep 17 00:00:00 2001
From: Dominic Evans <oldmanuk@gmail.com>
Date: Tue, 8 Jun 2010 21:51:39 +0100
Subject: Improve/fix locale date/time formatting.

---
 css/styles.css        | 3 ++-
 pages/recordings.ecpp | 6 ++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/css/styles.css b/css/styles.css
index 33822fc..4fd23b1 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -933,6 +933,7 @@ div.recording_item {
 }
 
 .recording_item div.recording_day {
+	width: 13em;
 }
 
 .recording_item div.recording_date {
@@ -944,7 +945,7 @@ div.recording_item {
 }
 
 .recording_item div.recording_duration {
-	width: 2.5em;
+	width: 4em;
 }
 
 .recording_item div.recording_name {
diff --git a/pages/recordings.ecpp b/pages/recordings.ecpp
index 5789304..060c847 100644
--- a/pages/recordings.ecpp
+++ b/pages/recordings.ecpp
@@ -223,10 +223,8 @@ for (iter = recordingsTree->begin(path); iter != end; ++iter) {
 	<div class="recording_item">
 	<div class="recording_imgs"><%cpp> reply.out() << StringRepeat(level + 1, "<img src=\"img/transparent.png\" alt=\"\" width=\"16px\" height=\"16px\" />"); </%cpp><%cpp> if (!archived.empty()) { </%cpp><img src="<$ LiveSetup().GetThemedLink("img", "on_dvd.png") $>" alt="on_dvd" <& tooltip.hint text=(archived) &> /><%cpp> } else { </%cpp><img src="<$ LiveSetup().GetThemedLink("img", "movie.png") $>" alt="movie" /><%cpp> } </%cpp></div>
 	<div class="recording_spec">
-		<div class="recording_day" style="width: <$ dayLen $>"><$ day $></div>
-		<div class="recording_date nowrap"><$ FormatDateTime(tr("%b %d %y"), startTime) $></div>
-		<div class="recording_time nowrap"><$ FormatDateTime(tr("%I:%M %p"), startTime) $></div>
-		<div class="recording_duration"><$ duration $></div>
+		<div class="recording_day"><$ FormatDateTime(tr("%a %x %X"), startTime) $></div>
+		<div class="recording_duration">(<$ duration $>)</div>
 		<div class="recording_name"><a <& tooltip.hint text=(hint) &><& tooltip.display domId=(id) &>><$ name $><br /><%cpp>if ((name != shortDescr) && (!shortDescr.empty())) {</%cpp><span><$ shortDescr $></span><%cpp> } else { </%cpp><span>&nbsp;</span><%cpp> } </%cpp></a></div>
 	</div>
 	<div class="recording_actions">
-- 
cgit v1.2.3