* TIMER/tlist: display used recorder

* TIMER/ttoggle: Fix javascript

6 files changed, 32 insertions, 11 deletions

diff --git a/skins/deltab/tlist.tmpl b/skins/deltab/tlist.tmpl
index a343151..677131c 100644
--- a/skins/deltab/tlist.tmpl
+++ b/skins/deltab/tlist.tmpl
@@ -79,7 +79,9 @@
     <?% END %?>
         <?% PROCESS StateImage %?>
         <?% "</a>" IF allow('ttoggle') %?>
-        <a class="fieldinline" href="?cmd=program&amp;data=<?% channel %?><?% IF eventid %?>#E<?% eventid %?><?% END %?>" title="<?% gettext("Jump to program:") %?><?% sender %?>" style="<?% IF state != "" %?><?% state %?><?% END %?>vertical-align:bottom;">
+    </td>
+    <td>
+        <a href="?cmd=program&amp;data=<?% channel %?><?% IF eventid %?>#E<?% eventid %?><?% END %?>" title="<?% gettext("Jump to program:") %?><?% sender %?>" style="vertical-align:bottom;">
             <font class="title<?% IF state != "";" ";state;END %?>"><?% sender %?></font>
         </a>
     </td>
@@ -113,16 +115,23 @@
         </a>
     <?% END %?>
     </td>
-<?% IF global.hideDescription != 1 && description.length > 0 %?>
+  <?% IF ( param.recorder > 1 ) || ( global.hideDescription != 1 && description.length > 0 ) %?>
   </tr>
   <tr<?% ' class="two"' IF loop.count mod 2 == 0 %?>>
     <td>&nbsp;</td>
+    <td>
+    <?% IF param.recorder > 1 %?>
+      <font class="description<?% IF state != "";" ";state;END %?>"><?% host %?></font>
+    <?% END %?>
+    </td>
     <td colspan="3">
+      <?% IF global.hideDescription != 1 && description.length > 0 %?>
       <a href="?cmd=display&amp;data=<?% eventid %?>">
         <font class="description<?% IF state != "";" ";state;END %?>"><?% chop(description,100,1) %?></font>
       </a>
+      <?% END %?>
     </td>
-<?% END %?>
+  <?% END %?>
 
 <?% END %?>
 
@@ -134,6 +143,7 @@
 <form name="tlist" action="">
 	<table summary=""  width="100%">
     <tr>
+        <th width="64" align="left"></th>
         <th></th>
         <th></th>
         <th></th>
@@ -156,6 +166,7 @@
           duration=zeile.12;
           description=zeile.13;
           running=zeile.14;
+          host=zeile.15;
           t = zeile.7.split('&#x7e;');IF t.size > 1;subtitle = t.pop;ELSE;subtitle="";END;title=t.join('&#x7e;');
           pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 ) %?>
 		<?% IF old.defined && day != old %?>
diff --git a/skins/stone/tlist.tmpl b/skins/stone/tlist.tmpl
index c9571b0..4681dcc 100644
--- a/skins/stone/tlist.tmpl
+++ b/skins/stone/tlist.tmpl
@@ -98,7 +98,7 @@
             <?% PROCESS StateImage %?>
             <?% '</a>' IF allow('ttoggle') %?>
             <?% IF allow('program') %?><a class="fieldinline" href="?cmd=program&amp;data=<?% channel %?><?% IF eventid %?>#E<?% eventid %?><?% END %?>" title="<?% gettext("Jump to program:") %?><?% sender %?><?% END %?>">
-              <font class="fieldinline<?% IF state != "";" ";state;END %?>"><?% chop(sender,20) %?></font>
+              <font class="fieldinline<?% IF state != "";" ";state;END %?>"><?% sender %?><?% IF param.recorder > 1;" (";host;")";END %?></font>
             <?% '</a>' IF allow('program') %?>
               </div>
             </td>
@@ -176,6 +176,7 @@
           duration=zeile.12;
           description=zeile.13;
           running=zeile.14;
+          host=zeile.15;
           t = zeile.7.split('&#x7e;');IF t.size > 1;subtitle = t.pop;ELSE;subtitle="";END;title=t.join('&#x7e;');
           pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 ) %?>
 			<?% IF old.defined && day != old %?>
diff --git a/skins/stone_flat/global.js b/skins/stone_flat/global.js
index 74706ca..92b5016 100644
--- a/skins/stone_flat/global.js
+++ b/skins/stone_flat/global.js
@@ -82,9 +82,9 @@ function toggle(cmd,data) {
             var x = values.data[i];
             if(x.length == 4 && x[0]) {
               var tid  = x[0];
-              var ton  = x[1];
-              var trun = x[2];
-              var tcon = x[3];
+              var ton  = x[1] * 1;
+              var trun = x[2] * 1;
+              var tcon = x[3] * 1;
 
               var img = document.getElementById('toggle' + tid);
               if(img) {
diff --git a/skins/stone_flat/tlist.tmpl b/skins/stone_flat/tlist.tmpl
index a589706..81b7e84 100644
--- a/skins/stone_flat/tlist.tmpl
+++ b/skins/stone_flat/tlist.tmpl
@@ -124,13 +124,16 @@
                 <?% PROCESS RowButtons %?>
             </td>
         </tr>
-        <?% IF global.hideDescription != 1 && description.length > 0 %?>
+        <?% IF ( param.recorder > 1 ) || ( global.hideDescription != 1 && description.length > 0 ) %?>
         <tr id="desc<?% id %?>"<?% ' class="two"' IF z mod 2 == 0 %?>>
-            <td class="fieldinline" colspan="2">&nbsp;</td>
+            <td class="fieldinline"></td>
+            <td class="fieldinline"><?% IF param.recorder > 1;host;END %?></td>
             <td class="fieldinline" colspan="3">
+                  <?% IF global.hideDescription != 1 && description.length > 0 %?>
                   <a href="javascript:popup('display','<?% eventid %?>',620,670,0)" class="fieldinline">
                   <font class="description<?% IF state != "";" ";state;END %?>"><?% chop(description,100,1) %?></font>
-				          </a>
+      	          </a>
+                  <?% END %?>
             </td>
         </tr>
         <?% END %?>
@@ -158,6 +161,7 @@
           duration=zeile.12;
           description=zeile.13;
           running=zeile.14;
+          host=zeile.15;
           t = zeile.7.split('&#x7e;');IF t.size > 1;subtitle = t.pop;ELSE;subtitle="";END;title=t.join('&#x7e;');
           pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 ) %?>
         <?% IF !old.defined || day != old %?>
diff --git a/skins/xstyle/mainmenu.inc b/skins/xstyle/mainmenu.inc
index f0e4fb1..2e17cf9 100644
--- a/skins/xstyle/mainmenu.inc
+++ b/skins/xstyle/mainmenu.inc
@@ -125,7 +125,6 @@ var myBar = new WebFXMenuBar;
     <?% ELSIF allow('uprefs') %?>admin.add(new WebFXMenuItem("<?% gettext("Personality",cuttext ) %?>","?cmd=uprefs"));<?% END %?>
     <?% IF allow('rel') %?>admin.add(new WebFXMenuItem("<?% gettext("Reload",cuttext ) %?>","?cmd=rel"));<?% END %?>
     <?% IF allow('logout') %?>admin.add(new WebFXMenuItem("<?% gettext("Logout",cuttext ) %?>","?cmd=logout"));<?% END %?>
-    <?% IF allow('restart') %?>admin.add(new WebFXMenuItem("<?% gettext("Restart",cuttext ) %?>","?cmd=restart"));<?% END %?>
 
     myBar.add(new WebFXMenuButton("<?% gettext("Administration") %?>",null,null,admin));
 
diff --git a/skins/xstyle/tlist.tmpl b/skins/xstyle/tlist.tmpl
index ae015ea..0a169eb 100644
--- a/skins/xstyle/tlist.tmpl
+++ b/skins/xstyle/tlist.tmpl
@@ -40,6 +40,9 @@
             <?% NEXT IF field.match('^__') or c == 4 %?>
             <th><?% field %?></th>
         <?% END %?>
+<?% IF param.recorder > 1 %?>
+            <th><?% gettext("Video disk recorder") %?></th>
+<?% END %?>
 <?% IF enableform %?>
             <th width="64"><?% gettext("Selection",7) %?></th>
 <?% END %?>
@@ -122,6 +125,9 @@
                     <td><div class="<?% myclass %?>"><?% field %?></div></td>
                     <?% END %?>
                 <?% END %?>
+<?% IF param.recorder > 1 %?>
+               <td><div class="<?% myclass %?>"><?% zeile.15 %?></div></td>
+<?% END %?>
     <?% IF enableform %?>
                     <td>
                         <input type="checkbox" value="<?% zeile.0 %?>" name="<?% zeile.7 | replace('~',' ') %?>" />