From 7e1edd7310c35548846e444cf1b81fcfd1ee2d8c Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Fri, 18 Jan 2008 16:48:25 +0000
Subject: * TIMERS: Use MD5Sum to reference timer * AUTOTIMER: Fix double
 create timer if starttime less then 60 seconds changed * AUTOTIMER: Hide 'use
 pdc' if TIMER::use pdc disabled * AUTOTIMER: Bug #12960 dont create timer
 with pdc, if TIMER::use pdc disabled

---
 html/bloecke/event_links.tmpl |  4 ++--
 html/display.tmpl             |  2 +-
 html/now.tmpl                 | 16 ++++++++--------
 html/program.tmpl             |  6 +++---
 html/schema.tmpl              |  4 ++--
 html/search.tmpl              |  2 +-
 html/topten.tmpl              |  4 ++--
 7 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'html')

diff --git a/html/bloecke/event_links.tmpl b/html/bloecke/event_links.tmpl
index b618f6b..ce37939 100644
--- a/html/bloecke/event_links.tmpl
+++ b/html/bloecke/event_links.tmpl
@@ -3,8 +3,8 @@
 <a href="?cmd=display&data=<?% epgId %?>" title='<?% gettext("Detailed program information") %?>'><img src="images/view_event.png" /></a><?% umbruch %?>
     <?% END %?>
 <a href="?cmd=search&amp;data=<?% url( data.1 ) %?>"><img src="images/repeat.png" title="[<?% gettext("Rep") %?>]" /></a><?% umbruch %?>
-    <?% IF param.timers.${data.0}.Id && allow('tedit') %?>
-<a href="?cmd=tedit&amp;data=<?% param.timers.${data.0}.Id %?>"><img src="images/record_blue.png" title="[<?% gettext("Edit this timer") %?>]" /></a><?% umbruch %?>
+    <?% IF param.timers.${data.0}.id && allow('tedit') %?>
+<a href="?cmd=tedit&amp;data=<?% param.timers.${data.0}.id %?>"><img src="images/record_blue.png" title="[<?% gettext("Edit this timer") %?>]" /></a><?% umbruch %?>
     <?% ELSIF allow('tnew') %?>
 <a href="?cmd=tnew&amp;data=<?% data.0 %?>"><img src="images/record.png" title="[<?% gettext("To record") %?>]" name='recordlink' id='<?% data.0 %?>' /></a><?% umbruch %?>
     <?% END %?>
diff --git a/html/display.tmpl b/html/display.tmpl
index fb04878..4933ccd 100644
--- a/html/display.tmpl
+++ b/html/display.tmpl
@@ -28,7 +28,7 @@
             <td>
             <a href="?cmd=search&amp;data=<?% url( data.first.1 ) %?>">[<?% gettext("Search for repeats") %?>]</a>
             <?% IF param.timers.${data.first.$c} && allow('tedit') %?>
-                <a href="?cmd=tedit&amp;data=<?% param.timers.${data.first.$c}.Id %?>"><span name='recordlink' class='normal'><b>[<?% gettext("Edit this timer") %?>]</b></span></a>
+                <a href="?cmd=tedit&amp;data=<?% param.timers.${data.first.$c}.id %?>"><span name='recordlink' class='normal'><b>[<?% gettext("Edit this timer") %?>]</b></span></a>
             <?% ELSIF allow('tnew')%?>
                 <a href="?cmd=tnew&amp;data=<?% data.first.$c %?>"><span name='recordlink' id='<?% data.first.$c %?>' class='normal'>[<?% gettext("To record") %?>]</span></a>
             <?% END %?>
diff --git a/html/now.tmpl b/html/now.tmpl
index e124a67..81b8db1 100644
--- a/html/now.tmpl
+++ b/html/now.tmpl
@@ -60,10 +60,10 @@
             <?% END %?>
         <tr class="<?% myclass %?>" <?% IF (loop.count mod 2) == 0 %?>bgcolor='#F5F5F5'<?% END %?>>
                 <td><nobr>
-                <?% IF param.timers.${id} && param.timers.${id}.Status  %?><b><?% END %?>
+                <?% IF param.timers.${id} && param.timers.${id}.activ  %?><b><?% END %?>
                     <a href="?cmd=search&amp;data=<?% url( title ) %?>">[<?% gettext("Rep") %?>]</a>
                 <?% IF param.timers.${id} && allow('tedit') %?>
-                    <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.Id %?>">[<?% gettext("Edit") %?>]</a><br>
+                    <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">[<?% gettext("Edit") %?>]</a><br>
                 <?% ELSIF allow('tnew') %?>
                     <a href="?cmd=tnew&amp;data=<?% id %?>"><span name='recordlink' id='<?% id %?>' class='normal'>[<?% gettext("Rec") %?>]</span></a><br>
                 <?% END %?>
@@ -72,18 +72,18 @@
                 <?% END %?>
                 </td>
                 <td>
-                    <?% IF param.timers.${id} && param.timers.${id}.Status %?><b><?% END %?>
+                    <?% IF param.timers.${id} && param.timers.${id}.activ %?><b><?% END %?>
                     <?% INCLUDE bloecke/tooltip.tmpl cmd="display" eventid=id linkid=id ttp_offset=0 %?><?% title %?></a>
                     <?% IF subtitle != "" %?>
                     <br><small><?% subtitle %?></small>
                     <?% END %?>
                 </td>
                 <td>
-                    <?% IF param.timers.${id} && param.timers.${id}.Status  %?><b><?% END %?>
+                    <?% IF param.timers.${id} && param.timers.${id}.activ  %?><b><?% END %?>
                     <a href="?cmd=program&amp;data=<?% channel %?>"><?% sender %?></a>
                 </td>
-                <td><?% IF param.timers.${id} && param.timers.${id}.Status %?><b><?% END %?><?% start %?><?% IF param.timers.${id} && param.timers.${id}.Status %?></b><?% END %?></td>
-                <td><?% IF param.timers.${id} && param.timers.${id}.Status %?><b><?% END %?><?% stop %?><?% IF param.timers.${id} && param.timers.${id}.Status %?></b><?% END %?></td>
+                <td><?% IF param.timers.${id} && param.timers.${id}.activ %?><b><?% END %?><?% start %?><?% IF param.timers.${id} && param.timers.${id}.activ %?></b><?% END %?></td>
+                <td><?% IF param.timers.${id} && param.timers.${id}.activ %?><b><?% END %?><?% stop %?><?% IF param.timers.${id} && param.timers.${id}.activ %?></b><?% END %?></td>
                 <?% UNLESS duration > 100 OR duration <= 0 %?>
                 <td width="100" valign='bottom'><nobr>
                     <?% per = ( (100 - duration) + 0.999 ) div 1 ; per = (per > 100 ? 100 : per)  %?>
@@ -91,8 +91,8 @@
                     <?% text = per div 1 | format("<br><font size='1'>${per}%%</font>") %?>
                     <table width="100%" cellspacing='0' cellpadding='0'>
                         <tr>
-                        <td bgcolor="#dedede"><img src='images/blank.png' width="<?% per %?>" height='1' hspace=0 vspace=0><?% IF param.timers.${id} && param.timers.${id}.Status %?><b><?% END %?><?% (per > 19 ? text : "&nbsp;") %?></td>
-                        <td bgcolor="#ffffff"><img src='images/blank.png' width="<?% per2 %?>" height='1' hspace=0 vspace=0><?% IF param.timers.${id} && param.timers.${id}.Status %?><b><?% END %?><?% (per < 20 ? text : "") %?></td>
+                        <td bgcolor="#dedede"><img src='images/blank.png' width="<?% per %?>" height='1' hspace=0 vspace=0><?% IF param.timers.${id} && param.timers.${id}.activ %?><b><?% END %?><?% (per > 19 ? text : "&nbsp;") %?></td>
+                        <td bgcolor="#ffffff"><img src='images/blank.png' width="<?% per2 %?>" height='1' hspace=0 vspace=0><?% IF param.timers.${id} && param.timers.${id}.activ %?><b><?% END %?><?% (per < 20 ? text : "") %?></td>
                         <tr>
                     </table>
                 </td>
diff --git a/html/program.tmpl b/html/program.tmpl
index 8fe07b1..781f275 100644
--- a/html/program.tmpl
+++ b/html/program.tmpl
@@ -65,7 +65,7 @@
                 <td>
                     <a href="?cmd=search&amp;data=<?% url( zeile.1 ) %?>">[<?% gettext("Rep") %?>]</a>
     <?% IF param.timers.${zeile.0} && allow('tedit') %?>
-                    <a href="?cmd=tedit&amp;data=<?% param.timers.${zeile.0}.Id %?>"><b><span name='recordlink' id='<?% zeile.0 %?>' class='normal'>[<?% gettext("Edit this timer") %?>]</span></b></a>
+                    <a href="?cmd=tedit&amp;data=<?% param.timers.${zeile.0}.id %?>"><b><span name='recordlink' id='<?% zeile.0 %?>' class='normal'>[<?% gettext("Edit this timer") %?>]</span></b></a>
     <?% ELSIF allow('tnew') %?>
                     <a href="?cmd=tnew&amp;data=<?% zeile.0 %?>"><span name='recordlink' id='<?% zeile.0 %?>' class='normal'>[<?% gettext("To record") %?>]</span></a>
     <?% END %?>
@@ -75,7 +75,7 @@
                 <?% ELSIF c == 2; # Text Field %?>
                 <td>
                     <?% INCLUDE bloecke/tooltip.tmpl cmd="display" title=field subtitle=zeile.2 desc=zeile.6 eventid=zeile.0 linkid=zeile.0 ttp_offset=0 %?>
-                    <?% IF param.timers.${zeile.0} && param.timers.${zeile.0}.Status %?>
+                    <?% IF param.timers.${zeile.0} && param.timers.${zeile.0}.activ %?>
                     <b><?% field %?></b>
                     <?% ELSE %?>
                     <?% field %?>
@@ -92,7 +92,7 @@
                 <?% ELSIF c == 6; # Day Field %?>
                 <?% ELSIF c >= 7; # Desc Field %?>
                 <?% ELSE %?>
-                    <?% IF param.timers.${zeile.0} && param.timers.${zeile.0}.Status %?>
+                    <?% IF param.timers.${zeile.0} && param.timers.${zeile.0}.activ %?>
                             <td><b><?% field %?></b></td>
                     <?% ELSE %?>
                             <td><?% field %?></td>
diff --git a/html/schema.tmpl b/html/schema.tmpl
index 5869c4e..b933184 100644
--- a/html/schema.tmpl
+++ b/html/schema.tmpl
@@ -166,10 +166,10 @@ Duration = param.zeitbis - param.zeitvon;
 <?%- BLOCK getStatus -%?>
 <?%-
     class = 'schema_normal';
-    IF t.exists(e.0) && t.${e.0}.Status;
+    IF t.exists(e.0) && t.${e.0}.activ;
         class = 'schema_record_plan';
     END;
-    IF t.exists(e.0) && r.exists(t.${e.0}.Id);
+    IF t.exists(e.0) && r.exists(t.${e.0}.id);
         class = 'schema_record_now';
     END;
 class;
diff --git a/html/search.tmpl b/html/search.tmpl
index 5cb0235..48c9312 100644
--- a/html/search.tmpl
+++ b/html/search.tmpl
@@ -100,7 +100,7 @@
                 <?% ELSIF c == 1; # Text Field %?>
                 <td>
                     <?% INCLUDE bloecke/tooltip.tmpl cmd="display" title=field subtitle=zeile.2 desc=zeile.8 eventid=zeile.0 linkid=zeile.0 ttp_offset=0 %?>
-                    <?% IF param.timers.${zeile.0} && param.timers.${zeile.0}.Status %?>
+                    <?% IF param.timers.${zeile.0} && param.timers.${zeile.0}.activ %?>
                     <b><?% field %?></b>
                     <?% ELSE %?>
                     <?% field %?>
diff --git a/html/topten.tmpl b/html/topten.tmpl
index 8ebe7f5..2458da2 100644
--- a/html/topten.tmpl
+++ b/html/topten.tmpl
@@ -34,7 +34,7 @@
                 <?% ELSIF c == 2; # Text Field %?>
                 <td>
                     <?% INCLUDE bloecke/tooltip.tmpl cmd="display" title=field subtitle=zeile.2 desc=zeile.3 eventid=zeile.0 linkid=zeile.0 ttp_offset=0 %?>
-                    <?% IF param.timers.${zeile.0} && param.timers.${zeile.0}.Status %?>
+                    <?% IF param.timers.${zeile.0} && param.timers.${zeile.0}.activ %?>
                     <b><?% field %?></b>
                     <?% ELSE %?>
                     <?% field %?>
@@ -61,7 +61,7 @@
                 <?% field | format('%d') %?>
                 </td>
                 <?% ELSE %?>
-                    <?% IF param.timers.${zeile.0} && param.timers.${zeile.0}.Status %?>
+                    <?% IF param.timers.${zeile.0} && param.timers.${zeile.0}.activ %?>
                             <td><b><?% field %?></b></td>
                     <?% ELSE %?>
                             <td><?% field %?></td>
-- 
cgit v1.2.3