* WML: Backport changes from module HTTPD

6 files changed, 22 insertions, 15 deletions

diff --git a/wml/now.tmpl b/wml/now.tmpl
index 9aa2caa..6ef28a0 100644
--- a/wml/now.tmpl
+++ b/wml/now.tmpl
@@ -2,7 +2,7 @@
     <?% "<i>" IF param.timers.${id} %?>
     <?% IF global.ShowCardTitle %?>
     <a href="?cmd=p&amp;data=<?% channel %?>">
-        <?% channel %?>. <?% sender | truncate(20) | html %?>
+        <?% sender | truncate(20) | html %?>
     </a><br />
     <?% END %?>
     <?% start %?> - <?% stop %?><br />
@@ -26,14 +26,18 @@
 <?% fields = data.shift %?>
    	<?% FOREACH zeile = data %?>
         <?% IF loop.count < skip;NEXT;END %?>
-		<?% title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;start=zeile.5;stop=zeile.6;duration=zeile.7;desc=zeile.8 %?>
+        <?% title=zeile.1;subtitle=zeile.2;sender=zeile.3;
+            channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;
+            desc=zeile.8;duration=zeile.9;
+            timerid=zeile.10;recording=zeile.11;running=zeile.12;
+            pdc=zeile.13; %?>
     	<?% IF id.defined %?>
         <a href="#n<?% loop.count %?>"><img src="images/forward.wbm" alt="<?% gettext("Forward") %?>" /></a>
         <a href="#index"><img src="images/home.wbm" alt="<?% gettext("Menu") %?>" /></a>
     </p>
 </card>
         <?% END %?>
-<card id="<?% IF loop.count > 1 %?>n<?% loop.count;ELSE %?>first<?% END %?>" title="<?% channel %?>.<?% sender | truncate(10)| html %?>">
+<card id="<?% IF loop.count > 1 %?>n<?% loop.count;ELSE %?>first<?% END %?>" title="<?% sender | truncate(10)| html %?>">
         <?% id=zeile.0 %?>
     <p>
 		<?% PROCESS item %?>
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 %?>
diff --git a/wml/search.tmpl b/wml/search.tmpl
index e1dd782..7885fdd 100644
--- a/wml/search.tmpl
+++ b/wml/search.tmpl
@@ -3,7 +3,7 @@
     <?% "<i>" IF param.timers.${id} %?>
     <?% IF global.ShowCardTitle %?>
     <a href="?cmd=p&amp;data=<?% channel %?>">
-        <?% channel %?>. <?% sender | truncate(20) | html %?>
+        <?% sender | truncate(20) | html %?>
     </a><br />
     <?% END %?>
     <?% date.format(datum, "%a, %x") | html %?><br />
@@ -36,7 +36,7 @@
 </card>
         <?% END %?>
         <?% id=zeile.0 %?>
-<card id="<?% IF loop.count > 1 %?>s<?% loop.count;ELSE %?>first<?% END %?>" title="<?% channel %?>.<?% sender | truncate(10)| html %?>">
+<card id="<?% IF loop.count > 1 %?>s<?% loop.count;ELSE %?>first<?% END %?>" title="<?% sender | truncate(10)| html %?>">
     <p>
 		<?% PROCESS item %?>
         <?% count =  loop.count + 1 %?>
diff --git a/wml/skin.cfg b/wml/skin.cfg
index bc2b5e7..85cef40 100644
--- a/wml/skin.cfg
+++ b/wml/skin.cfg
@@ -12,4 +12,4 @@
 <?% SET global.ShowCardTitle = 0 %?>
 <?% ######################################################################## %?>
 <?% # Include EPG description inside card %?>
-<?% SET global.ShowDescription = 0 %?>
+<?% SET global.ShowDescription = 1 %?>
diff --git a/wml/tlist.tmpl b/wml/tlist.tmpl
index a3289c1..63cf300 100644
--- a/wml/tlist.tmpl
+++ b/wml/tlist.tmpl
@@ -23,7 +23,7 @@
     <?% IF allow('tedit') %?>
     <a href="?cmd=te&amp;data=<?% id %?>">
     <?% END %?>
-        <?% gettext("Timer") %?> <?% id %?>
+        <?% gettext("Timer") %?> <?% ' ';loop.count %?>
     <?% "</a>" IF allow('tedit') %?>
     <br />
     <?% END %?>
@@ -64,7 +64,7 @@
 </card>
         <?% END %?>
         <?% id=zeile.0 %?>
-<card id="t<?% loop.count %?>" title="<?% gettext("Timer") %?> <?% id %?>">
+<card id="t<?% loop.count %?>" title="<?% gettext("Timer") %?> <?% ' ';loop.count %?>">
      <p>
 		<?% PROCESS item %?>
         <?% count =  loop.count + 1 %?>
diff --git a/wml/widgets/textfield.tmpl b/wml/widgets/textfield.tmpl
new file mode 120000
index 0000000..8ea271d
--- /dev/null
+++ b/wml/widgets/textfield.tmpl
@@ -0,0 +1 @@
+string.tmpl
\ No newline at end of file