From f98ae2c03cd2ab4a47e7335e1adb5a97e4a1ccea Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Sun, 7 Dec 2008 07:53:54 +0000
Subject: * RECORDS: New database 31 - support video directory per recorder
 (REQUEST #4306 ) (this directory should now defined with vdrlist/vdredit) *
 RECORDS: calc cut marks, display length of by cut recording * update-xxv: add
 file check, avoid missing upgrade-xxv-db.sql * update locale de

---
 html/rdisplay.tmpl | 11 +++++++----
 html/rlist.tmpl    |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'html')

diff --git a/html/rdisplay.tmpl b/html/rdisplay.tmpl
index 0b35460..122486e 100644
--- a/html/rdisplay.tmpl
+++ b/html/rdisplay.tmpl
@@ -62,7 +62,7 @@
     <?% Stunden = d div 3600 %?>
     <?% Minuten = d div 60 mod 60 %?>
     <?% Sekunden =  d mod 60 %?>
-    <?% gettext('Duration') %?> : <?% Stunden div 1 %?>:<?% Minuten div 1 | format('%02d') %?>:<?% Sekunden div 1 | format('%02d') %?>
+    <?% Stunden div 1 %?>:<?% Minuten div 1 | format('%02d') %?>:<?% Sekunden div 1 | format('%02d') %?>
 <?% END %?>
 <?% END %?>
 
@@ -137,7 +137,10 @@
             <td>&nbsp;</td>
             <td><?% date.format(data.StartTime,"%A, %x",locale) %?>&nbsp;
                 &nbsp;&nbsp;&nbsp;<?% date.format(data.StartTime,"%H:%M",locale) %?>&nbsp;-&nbsp;<?% date.format(data.StopTime,"%H:%M",locale) %?>&nbsp;
-                 (<?% PROCESS dur d=data.Duration IF data.Duration > (60*5)%?>)</td>
+                 (<?% gettext('Duration') %?> : <?% PROCESS dur d=data.Duration %?>
+                  <?% IF ( data.cutlength + 10 ) <  data.Duration %?>&nbsp;<?% gettext("By cut") %?> : <?% PROCESS dur d=data.cutlength %?><?% END %?>
+                 )
+            </td>
         </tr>
         <tr>
             <td>&nbsp;</td>
@@ -181,13 +184,13 @@
         <tr>
             <td>&nbsp;</td>
             <td>
-            <?% gettext('Lifetime') %?> : <?% data.Lifetime %?>
+            <?% gettext('Lifetime') %?> : <?% data.lifetime %?>
             </td>
         </tr>
         <tr>
             <td>&nbsp;</td>
             <td>
-            <?% gettext('Priority') %?> : <?% data.Prio %?>
+            <?% gettext('Priority') %?> : <?% data.priority %?>
             </td>
         </tr>
         </table>
diff --git a/html/rlist.tmpl b/html/rlist.tmpl
index aec2ecd..10614c9 100644
--- a/html/rlist.tmpl
+++ b/html/rlist.tmpl
@@ -112,7 +112,7 @@
 <?% END %?>
 <h1><?% gettext("Stored recordings") %?>
     <?% IF search.defined %?> : "<?% search %?>" <?% END %?>
-    &nbsp;<small>(<?% param.usage %?>)</small>
+    <br /><small>(<?% param.usage %?>)</small>
 </h1>
 <?% IF data.size %?>
 <?% fields = data.shift %?>
-- 
cgit v1.2.3