From b54b6c95d599b4e0febff69ba47ed7ac9ca7e639 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Mon, 4 May 2009 18:30:04 +0000
Subject: * WML: Backport changes from module HTTPD

---
 wml/program.tmpl | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'wml/program.tmpl')

diff --git a/wml/program.tmpl b/wml/program.tmpl
index d3dcd37..5dae34d 100644
--- a/wml/program.tmpl
+++ b/wml/program.tmpl
@@ -1,10 +1,12 @@
 <?% USE date %?>
-<?% ######################################################################################
-    channelpos=0;;
+<?% channel1st = param.channels.0;
+    channel = channel1st.0;
+    channelhash = channel1st.1;
+    channelitem = 1;
     FOREACH ch = param.channels;
         IF cgi.param('data') == ch.1 || cgi.param('data') == ch.0 || param.current == ch.1;
             channel = ch.0;
-            channelpos = ch.1;
+            channelhash = ch.1;
             channelitem = loop.count;
             LAST;
         END;
@@ -14,7 +16,7 @@
     <p>
     <select name="channel" ivalue="<?% channelitem %?>" >
     <?% FOREACH ch = param.channels %?>
-        <option value="<?% ch.1 %?>"><?% ch.0 | html %?></option>
+        <option value="<?% loop.count %?>"><?% ch.0 | html %?></option>
         <?% IF loop.count >= global.MaxChannelsProgram;LAST;END %?>
     <?% END %?>
     </select><br />
@@ -29,10 +31,10 @@
 <?% BLOCK item %?>
     <?% "<i>" IF param.timers.${id} %?>
     <?% IF global.ShowCardTitle %?>
-        <?% channelpos %?>.<?% channel | truncate(15)| html %?>
+        <?% channel | truncate(15)| html %?>
     <br />
     <?% END %?>
-    <?% date.format(datum, "%a, %x") | html %?><br />
+    <?% datum | html %?><br />
     <?% start %?> - <?% stop %?><br />
     <b><?% title | truncate(20) | html %?></b><?% IF subtitle %?><br /><?% subtitle | truncate(20) | html%?><?% END %?>
     <br />
@@ -64,7 +66,7 @@
     </p>
 </card>
         <?% END %?>
-<card id="p<?% loop.count %?>" title="<?% channelpos %?>.<?% channel | truncate(15)| html %?>">
+<card id="p<?% loop.count %?>" title="<?% channel | truncate(15)| html %?>">
         <?% id=zeile.0 %?>
     <p>
 		<?% PROCESS item %?>
-- 
cgit v1.2.3