summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Brachold <vdr07@deltab.de>2008-01-18 16:48:25 +0000
committerAndreas Brachold <vdr07@deltab.de>2008-01-18 16:48:25 +0000
commitbaeb3e7be84b6d07390518abc257b1725ad112d7 (patch)
treed1f8657d98928c535f12b1c3c64444d0deae4971
parente9d8133b5d78e4021acfb9b040cdc274e94b7fbc (diff)
downloadxxv-baeb3e7be84b6d07390518abc257b1725ad112d7.tar.gz
xxv-baeb3e7be84b6d07390518abc257b1725ad112d7.tar.bz2
* 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
-rw-r--r--skins/deltab/display.tmpl4
-rw-r--r--skins/deltab/now.tmpl4
-rw-r--r--skins/deltab/program.tmpl4
-rw-r--r--skins/deltab/schema.tmpl2
-rw-r--r--skins/deltab/search.tmpl4
-rw-r--r--skins/deltab/topten.tmpl4
-rw-r--r--skins/stone/display.tmpl2
-rw-r--r--skins/stone/now.tmpl4
-rw-r--r--skins/stone/program.tmpl4
-rw-r--r--skins/stone/rdisplay.tmpl4
-rw-r--r--skins/stone/schema.tmpl2
-rw-r--r--skins/stone/search.tmpl4
-rw-r--r--skins/stone/topten.tmpl4
-rw-r--r--skins/stone_flat/display.tmpl2
-rw-r--r--skins/stone_flat/now.tmpl4
-rw-r--r--skins/stone_flat/program.tmpl4
-rw-r--r--skins/stone_flat/schema.tmpl2
-rw-r--r--skins/stone_flat/search.tmpl4
-rw-r--r--skins/stone_flat/topten.tmpl4
-rw-r--r--skins/xstyle/bloecke/event_links.tmpl4
-rwxr-xr-xskins/xstyle/bloecke/event_row.tmpl2
-rw-r--r--skins/xstyle/now.tmpl8
-rw-r--r--skins/xstyle/program.tmpl4
-rw-r--r--skins/xstyle/schema.tmpl2
-rw-r--r--skins/xstyle/search.tmpl2
25 files changed, 45 insertions, 43 deletions
diff --git a/skins/deltab/display.tmpl b/skins/deltab/display.tmpl
index 16c5211..de3addb 100644
--- a/skins/deltab/display.tmpl
+++ b/skins/deltab/display.tmpl
@@ -97,11 +97,11 @@ END %?>
<br />
<?% IF param.timers.${id} && allow('tedit') %?>
- <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.Id %?>">
+ <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
<img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
</a>
&nbsp;
- <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.Id %?>">
+ <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
<?% gettext("Edit this timer",20) %?>
</a>
<br />
diff --git a/skins/deltab/now.tmpl b/skins/deltab/now.tmpl
index f3991dd..d67afc7 100644
--- a/skins/deltab/now.tmpl
+++ b/skins/deltab/now.tmpl
@@ -18,7 +18,7 @@
<?% IF param.runningTimer.exists(id) %?>
<?% state = "running" %?>
<?% ELSIF param.timers.exists(id) %?>
- <?% UNLESS param.timers.${id}.Status %?>
+ <?% UNLESS param.timers.${id}.activ %?>
<?% state = "deactive" %?>
<?% ELSE %?>
<?% state = "active" %?>
@@ -63,7 +63,7 @@
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
</a>
<?% IF param.timers.${id} && allow('tedit') %?>
- <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.Id %?>">
+ <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
<img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
</a>
<?% ELSIF allow('tnew') %?>
diff --git a/skins/deltab/program.tmpl b/skins/deltab/program.tmpl
index 80a1773..1978892 100644
--- a/skins/deltab/program.tmpl
+++ b/skins/deltab/program.tmpl
@@ -17,7 +17,7 @@
<?% IF param.runningTimer.exists(id) %?>
<?% state = "running" %?>
<?% ELSIF param.timers.exists(id) %?>
- <?% UNLESS param.timers.${id}.Status %?>
+ <?% UNLESS param.timers.${id}.activ %?>
<?% state = "deactive" %?>
<?% ELSE %?>
<?% state = "active" %?>
@@ -46,7 +46,7 @@
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
</a>
<?% IF param.timers.${id} && allow('tedit') %?>
- <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.Id %?>">
+ <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
<img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
</a>
<?% ELSIF allow('tnew') %?>
diff --git a/skins/deltab/schema.tmpl b/skins/deltab/schema.tmpl
index 5ca7922..2d80abf 100644
--- a/skins/deltab/schema.tmpl
+++ b/skins/deltab/schema.tmpl
@@ -166,7 +166,7 @@
<?% IF param.runningTimer.exists(id) %?>
<?% state = "running" %?>
<?% ELSIF param.timers.exists(id) %?>
- <?% UNLESS param.timers.${id}.Status %?>
+ <?% UNLESS param.timers.${id}.activ %?>
<?% state = "deactive" %?>
<?% ELSE %?>
<?% state = "active" %?>
diff --git a/skins/deltab/search.tmpl b/skins/deltab/search.tmpl
index 78e5761..4ca1814 100644
--- a/skins/deltab/search.tmpl
+++ b/skins/deltab/search.tmpl
@@ -17,7 +17,7 @@
<?% IF param.runningTimer.exists(id) %?>
<?% state = "running" %?>
<?% ELSIF param.timers.exists(id) %?>
- <?% UNLESS param.timers.${id}.Status %?>
+ <?% UNLESS param.timers.${id}.activ %?>
<?% state = "deactive" %?>
<?% ELSE %?>
<?% state = "active" %?>
@@ -51,7 +51,7 @@
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
</a>
<?% IF param.timers.${id} && allow('tedit') %?>
- <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.Id %?>">
+ <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
<img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
</a>
<?% ELSIF allow('tnew') %?>
diff --git a/skins/deltab/topten.tmpl b/skins/deltab/topten.tmpl
index a7f44c5..517e315 100644
--- a/skins/deltab/topten.tmpl
+++ b/skins/deltab/topten.tmpl
@@ -7,7 +7,7 @@
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
</a>
<?% IF param.timers.${id} && allow('tedit') %?>
- <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.Id %?>">
+ <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
<img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
</a>
<?% ELSIF allow('tnew') %?>
@@ -22,7 +22,7 @@
<?% IF param.runningTimer.exists(id) %?>
<?% state = "running" %?>
<?% ELSIF param.timers.exists(id) %?>
- <?% UNLESS param.timers.${id}.Status %?>
+ <?% UNLESS param.timers.${id}.activ %?>
<?% state = "deactive" %?>
<?% ELSE %?>
<?% state = "active" %?>
diff --git a/skins/stone/display.tmpl b/skins/stone/display.tmpl
index 6d334f6..d101948 100644
--- a/skins/stone/display.tmpl
+++ b/skins/stone/display.tmpl
@@ -59,7 +59,7 @@ END %?>
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
</a>
<?% IF param.timers.${id} && allow('tedit') %?>
- <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.Id %?>">
+ <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
<img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
</a>
<?% ELSIF allow('tnew') %?>
diff --git a/skins/stone/now.tmpl b/skins/stone/now.tmpl
index 306ff94..3456bcc 100644
--- a/skins/stone/now.tmpl
+++ b/skins/stone/now.tmpl
@@ -20,7 +20,7 @@
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
</a>
<?% IF param.timers.${id} && allow('tedit') %?>
- <a href="javascript:popup('tedit','<?% param.timers.${id}.Id %?>',620,670,1)">
+ <a href="javascript:popup('tedit','<?% param.timers.${id}.id %?>',620,670,1)">
<img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
</a>
<?% ELSIF allow('tnew') %?>
@@ -35,7 +35,7 @@
<?% IF param.runningTimer.exists(id) %?>
<?% state = "running" %?>
<?% ELSIF param.timers.exists(id) %?>
- <?% UNLESS param.timers.${id}.Status %?>
+ <?% UNLESS param.timers.${id}.activ %?>
<?% state = "deactive" %?>
<?% ELSE %?>
<?% state = "active" %?>
diff --git a/skins/stone/program.tmpl b/skins/stone/program.tmpl
index a1bba44..8d88ff3 100644
--- a/skins/stone/program.tmpl
+++ b/skins/stone/program.tmpl
@@ -18,7 +18,7 @@
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
</a>
<?% IF param.timers.${id} && allow('tedit') %?>
- <a href="javascript:popup('tedit','<?% param.timers.${id}.Id %?>',620,670,1)">
+ <a href="javascript:popup('tedit','<?% param.timers.${id}.id %?>',620,670,1)">
<img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
</a>
<?% ELSIF allow('tnew') %?>
@@ -33,7 +33,7 @@
<?% IF param.runningTimer.exists(id) %?>
<?% state = "running" %?>
<?% ELSIF param.timers.exists(id) %?>
- <?% UNLESS param.timers.${id}.Status %?>
+ <?% UNLESS param.timers.${id}.activ %?>
<?% state = "deactive" %?>
<?% ELSE %?>
<?% state = "active" %?>
diff --git a/skins/stone/rdisplay.tmpl b/skins/stone/rdisplay.tmpl
index cab7800..d2a19b7 100644
--- a/skins/stone/rdisplay.tmpl
+++ b/skins/stone/rdisplay.tmpl
@@ -162,7 +162,9 @@
cols = cols + 1;
seconds = window * cols; -%?>
<td style="width:<?% (width / (ticks * 3)) div 1 %?>px; white-space: nowrap; text-align:right">
- <img style="background:<?% cols % 3 ? "gray" : "black" %?>" src="images/blank.gif" width="<?% cols % 12 ? "1" : "2" %?>" height='<?% (cols % 3 ? "5" : "10") %?>' />
+<?% IF allowplay && seconds < data.Duration %?><a href="javascript:setstart('<?% PROCESS hfs d=seconds %?>')" ><?% END %?>
+<img title="<?% PROCESS hfs d=seconds %?>" style="background:<?% cols % 3 ? "gray" : "black" %?>" src="images/blank.gif" width="<?% cols % 12 ? "1" : "2" %?>" height='<?% (cols % 3 ? "5" : "10") %?>' />
+<?% IF allowplay && seconds < data.Duration %?></a><?% END %?>
</td>
<?% END %?>
</tr>
diff --git a/skins/stone/schema.tmpl b/skins/stone/schema.tmpl
index 34fcbf9..76ab1af 100644
--- a/skins/stone/schema.tmpl
+++ b/skins/stone/schema.tmpl
@@ -187,7 +187,7 @@
<?% IF param.runningTimer.exists(id) %?>
<?% state = "running" %?>
<?% ELSIF param.timers.exists(id) %?>
- <?% UNLESS param.timers.${id}.Status %?>
+ <?% UNLESS param.timers.${id}.activ %?>
<?% state = "deactive" %?>
<?% ELSE %?>
<?% state = "active" %?>
diff --git a/skins/stone/search.tmpl b/skins/stone/search.tmpl
index 899d3eb..1519367 100644
--- a/skins/stone/search.tmpl
+++ b/skins/stone/search.tmpl
@@ -10,7 +10,7 @@
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
</a>
<?% IF param.timers.${id} && allow('tedit') %?>
- <a href="javascript:popup('tedit','<?% param.timers.${id}.Id %?>',620,670,1)">
+ <a href="javascript:popup('tedit','<?% param.timers.${id}.id %?>',620,670,1)">
<img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
</a>
<?% ELSIF allow('tnew') %?>
@@ -25,7 +25,7 @@
<?% IF param.runningTimer.exists(id) %?>
<?% state = "running" %?>
<?% ELSIF param.timers.exists(id) %?>
- <?% UNLESS param.timers.${id}.Status %?>
+ <?% UNLESS param.timers.${id}.activ %?>
<?% state = "deactive" %?>
<?% ELSE %?>
<?% state = "active" %?>
diff --git a/skins/stone/topten.tmpl b/skins/stone/topten.tmpl
index 4119ee3..ffbfdc3 100644
--- a/skins/stone/topten.tmpl
+++ b/skins/stone/topten.tmpl
@@ -8,7 +8,7 @@
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
</a>
<?% IF param.timers.${id} && allow('tedit') %?>
- <a href="javascript:popup('tedit','<?% param.timers.${id}.Id %?>',620,670,1)">
+ <a href="javascript:popup('tedit','<?% param.timers.${id}.id %?>',620,670,1)">
<img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
</a>
<?% ELSIF allow('tnew') %?>
@@ -23,7 +23,7 @@
<?% IF param.runningTimer.exists(id) %?>
<?% state = "running" %?>
<?% ELSIF param.timers.exists(id) %?>
- <?% UNLESS param.timers.${id}.Status %?>
+ <?% UNLESS param.timers.${id}.activ %?>
<?% state = "deactive" %?>
<?% ELSE %?>
<?% state = "active" %?>
diff --git a/skins/stone_flat/display.tmpl b/skins/stone_flat/display.tmpl
index e4c804e..deb3a61 100644
--- a/skins/stone_flat/display.tmpl
+++ b/skins/stone_flat/display.tmpl
@@ -59,7 +59,7 @@ END %?>
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
</a>
<?% IF param.timers.${id} && allow('tedit') %?>
- <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.Id %?>">
+ <a href="?cmd=tedit&amp;data=<?% param.timers.${id}.id %?>">
<img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
</a>
<?% ELSIF allow('tnew') %?>
diff --git a/skins/stone_flat/now.tmpl b/skins/stone_flat/now.tmpl
index 5b1300a..ec75e8c 100644
--- a/skins/stone_flat/now.tmpl
+++ b/skins/stone_flat/now.tmpl
@@ -18,7 +18,7 @@
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
</a>
<?% IF param.timers.${id} && allow('tedit') %?>
- <a href="javascript:popup('tedit','<?% param.timers.${id}.Id %?>',620,670,1)">
+ <a href="javascript:popup('tedit','<?% param.timers.${id}.id %?>',620,670,1)">
<img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
</a>
<?% ELSIF allow('tnew') %?>
@@ -33,7 +33,7 @@
<?% IF param.runningTimer.exists(id) %?>
<?% state = "running" %?>
<?% ELSIF param.timers.exists(id) %?>
- <?% UNLESS param.timers.${id}.Status %?>
+ <?% UNLESS param.timers.${id}.activ %?>
<?% state = "deactive" %?>
<?% ELSE %?>
<?% state = "active" %?>
diff --git a/skins/stone_flat/program.tmpl b/skins/stone_flat/program.tmpl
index c9d0a04..f712998 100644
--- a/skins/stone_flat/program.tmpl
+++ b/skins/stone_flat/program.tmpl
@@ -18,7 +18,7 @@
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
</a>
<?% IF param.timers.${id} && allow('tedit') %?>
- <a href="javascript:popup('tedit','<?% param.timers.${id}.Id %?>',620,670,1)">
+ <a href="javascript:popup('tedit','<?% param.timers.${id}.id %?>',620,670,1)">
<img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
</a>
<?% ELSIF allow('tnew') %?>
@@ -33,7 +33,7 @@
<?% IF param.runningTimer.exists(id) %?>
<?% state = "running" %?>
<?% ELSIF param.timers.exists(id) %?>
- <?% UNLESS param.timers.${id}.Status %?>
+ <?% UNLESS param.timers.${id}.activ %?>
<?% state = "deactive" %?>
<?% ELSE %?>
<?% state = "active" %?>
diff --git a/skins/stone_flat/schema.tmpl b/skins/stone_flat/schema.tmpl
index 38fbc1b..73714e6 100644
--- a/skins/stone_flat/schema.tmpl
+++ b/skins/stone_flat/schema.tmpl
@@ -187,7 +187,7 @@
<?% IF param.runningTimer.exists(id) %?>
<?% state = "running" %?>
<?% ELSIF param.timers.exists(id) %?>
- <?% UNLESS param.timers.${id}.Status %?>
+ <?% UNLESS param.timers.${id}.activ %?>
<?% state = "deactive" %?>
<?% ELSE %?>
<?% state = "active" %?>
diff --git a/skins/stone_flat/search.tmpl b/skins/stone_flat/search.tmpl
index 4757b9b..53adfeb 100644
--- a/skins/stone_flat/search.tmpl
+++ b/skins/stone_flat/search.tmpl
@@ -10,7 +10,7 @@
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
</a>
<?% IF param.timers.${id} && allow('tedit') %?>
- <a href="javascript:popup('tedit','<?% param.timers.${id}.Id %?>',620,670,1)">
+ <a href="javascript:popup('tedit','<?% param.timers.${id}.id %?>',620,670,1)">
<img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
</a>
<?% ELSIF allow('tnew') %?>
@@ -25,7 +25,7 @@
<?% IF param.runningTimer.exists(id) %?>
<?% state = "running" %?>
<?% ELSIF param.timers.exists(id) %?>
- <?% UNLESS param.timers.${id}.Status %?>
+ <?% UNLESS param.timers.${id}.activ %?>
<?% state = "deactive" %?>
<?% ELSE %?>
<?% state = "active" %?>
diff --git a/skins/stone_flat/topten.tmpl b/skins/stone_flat/topten.tmpl
index fc8133e..e09408c 100644
--- a/skins/stone_flat/topten.tmpl
+++ b/skins/stone_flat/topten.tmpl
@@ -8,7 +8,7 @@
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
</a>
<?% IF param.timers.${id} && allow('tedit') %?>
- <a href="javascript:popup('tedit','<?% param.timers.${id}.Id %?>',620,670,1)">
+ <a href="javascript:popup('tedit','<?% param.timers.${id}.id %?>',620,670,1)">
<img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this timer") %?>" />
</a>
<?% ELSIF allow('tnew') %?>
@@ -23,7 +23,7 @@
<?% IF param.runningTimer.exists(id) %?>
<?% state = "running" %?>
<?% ELSIF param.timers.exists(id) %?>
- <?% UNLESS param.timers.${id}.Status %?>
+ <?% UNLESS param.timers.${id}.activ %?>
<?% state = "deactive" %?>
<?% ELSE %?>
<?% state = "active" %?>
diff --git a/skins/xstyle/bloecke/event_links.tmpl b/skins/xstyle/bloecke/event_links.tmpl
index eff0a3d..26fe5a4 100644
--- a/skins/xstyle/bloecke/event_links.tmpl
+++ b/skins/xstyle/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/skins/xstyle/bloecke/event_row.tmpl b/skins/xstyle/bloecke/event_row.tmpl
index 803c3da..96edd9e 100755
--- a/skins/xstyle/bloecke/event_row.tmpl
+++ b/skins/xstyle/bloecke/event_row.tmpl
@@ -36,7 +36,7 @@
<?% field | format('%d') %?>
</td>
<?% ELSE %?>
- <?% IF param.timers.${fielddata.11} && param.timers.${fielddata.11}.Status %?>
+ <?% IF param.timers.${fielddata.11} && param.timers.${fielddata.11}.activ %?>
<td><b><?% field %?></b></td>
<?% ELSE %?>
<td><?% field %?></td>
diff --git a/skins/xstyle/now.tmpl b/skins/xstyle/now.tmpl
index f50b047..2d0530b 100644
--- a/skins/xstyle/now.tmpl
+++ b/skins/xstyle/now.tmpl
@@ -64,18 +64,18 @@
<?% INCLUDE 'bloecke/event_links.tmpl' data=zeile switch=1 %?>
</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) %?>
diff --git a/skins/xstyle/program.tmpl b/skins/xstyle/program.tmpl
index d889a2b..048d252 100644
--- a/skins/xstyle/program.tmpl
+++ b/skins/xstyle/program.tmpl
@@ -56,7 +56,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 %?>
@@ -73,7 +73,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/skins/xstyle/schema.tmpl b/skins/xstyle/schema.tmpl
index e351465..04a5bbe 100644
--- a/skins/xstyle/schema.tmpl
+++ b/skins/xstyle/schema.tmpl
@@ -209,7 +209,7 @@ sec_height = 0.1;
END;
%?>
-<div id='eventbox' style="<?% IF param.timers.$epgId.Id && param.timers.$epgId.Status %?>border-color:#F00;<?% END %?><?% IF param.runningTimer.$epgId.Id %?>border-color:#0F0;<?% END %?>height: <?% (durat * sec_height) | format('%d') %?>px;<?%- IF date.now < second_start || date.now > second_stop -%?>color : #777;<?%- END -%?>
+<div id='eventbox' style="<?% IF param.timers.$epgId.id && param.timers.$epgId.activ %?>border-color:#F00;<?% END %?><?% IF param.runningTimer.$epgId.Id %?>border-color:#0F0;<?% END %?>height: <?% (durat * sec_height) | format('%d') %?>px;<?%- IF date.now < second_start || date.now > second_stop -%?>color : #777;<?%- END -%?>
<?%- IF second_start == param.zeitvon -%?>
top: 0px;border-top-style:dashed;border-top-color:green;border-top-width:2px;
<?%- ELSE -%?>
diff --git a/skins/xstyle/search.tmpl b/skins/xstyle/search.tmpl
index 8b7d65e..2c02a7c 100644
--- a/skins/xstyle/search.tmpl
+++ b/skins/xstyle/search.tmpl
@@ -99,7 +99,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 %?>