* deltab: add movetimerlist

* stone/stone_flat: add links to movetimerlist
* stone/stone_flat: fix display.tmpl

7 files changed, 133 insertions, 18 deletions

diff --git a/skins/deltab/movetimerlist.tmpl b/skins/deltab/movetimerlist.tmpl
new file mode 100644
index 0000000..d5e41f7
--- /dev/null
+++ b/skins/deltab/movetimerlist.tmpl
@@ -0,0 +1,104 @@
+<!-- movetimerlist -->
+<div id="body">
+<?% ######################################################################## %?>
+<?% enableform = allow('movetimerdelete') && data.size > 1  %?>
+<?% ######################################################################## %?>
+<?% BLOCK RowButtons %?>
+<?% IF allow('movetimeredit') %?>
+                        <a name="<?% id %?>" href="?cmd=movetimeredit&amp;data=<?% id %?>">
+                            <img src="images/edit.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit rule to move timer") %?>" />
+                        </a>
+<?% END %?>
+<?% IF allow('movetimerdelete') %?>
+                        <a href="javascript:sure('<?% gettext("You will delete this rule") %?>\n<?% escape(source) %?>','?cmd=movetimerdelete&amp;data=<?% id %?>')">
+                            <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete rule to move timer") %?>" />
+                        </a>
+<?% END %?>
+<?% END %?>
+<?% ######################################################################## %?>
+<?% BLOCK Item %?>
+        <tr<?% ' class="two"' IF loop.count mod 2 == 0 %?>>
+          <td>
+            <?% IF enableform %?>
+        			<input type="checkbox" value="<?% id %?>" name="<?% source %?> - <?% destination %?>" />
+             <?% END %?>
+          </td>
+          <td>
+<?% IF allow('movetimeredit') %?>
+            <a name="<?% id %?>" href="?cmd=movetimeredit&amp;data=<?% id %?>">
+<?% END %?>
+            <?% source %?>
+<?% IF allow('movetimeredit') %?>
+            </a>
+<?% END %?>
+          </td>
+          <td>
+            <?% destination %?>
+          </td>
+          <td>
+            <?% when %?>
+          </td>
+          <td>
+            <?% action %?>
+          </td>
+          <td>
+            <?% PROCESS RowButtons %?>
+          </td>
+        </tr>
+<?% END %?>
+<?% ######################################################################## %?>
+<h1>
+    <?% gettext("Rules to move timer between channels") %?>
+</h1>
+<?% IF data.size > 1 %?>
+<?% fields = data.shift %?>
+<form name="movetimerlist" action="">
+      <table summary="" width="100%">
+            <tr><th width="20"></th>
+                <th width="120"><?% gettext('Source') %?></th>
+                <th><?% gettext('Destination')%?></th>
+                <th><?% gettext('Move timer') %?></th>
+                <th><?% gettext('Change original timer') %?></th>
+                <th width="64" align="right"></th>
+            </tr>
+    <?% FOREACH zeile = data %?>
+        <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+        <?%- id=zeile.0;source=zeile.1;destination=zeile.2;when=zeile.3;action=zeile.4 -%?>
+        <?% PROCESS Item %?>
+     <?% END %?>
+      </table>
+<?% END %?>
+</div>
+<!-- ###### Seite ###### -->
+<div id="sidebar">
+<?% IF allow('movetimercreate') %?>
+    <p class="section"><?% gettext("Move timer",20) %?></p>
+    <p>
+<?% IF allow('movetimercreate') %?>
+      <a title="<?% gettext("Create a new rule to move timer") %?>" href="?cmd=movetimercreate"><img src="images/new.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+      <a title="<?% gettext("Create a new rule to move timer") %?>" href="?cmd=movetimercreate"><?% gettext("Create a new rule to move timer",20) %?></a><br />
+<?% END %?>
+<?% IF allow('movetimer') %?>
+      <a title="<?% gettext("Manual move timer between channels") %?>" href="?cmd=movetimer"><img src="images/refresh.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+      <a title="<?% gettext("Manual move timer between channels") %?>" href="?cmd=movetimer"><?% gettext("Manual move timer between channels",20) %?></a>
+<?% END %?>
+    </p>
+<?% END %?>
+<?% IF enableform %?>
+    <p class="section"><?% gettext("Selection") %?></p>
+    <p>
+        <a href="javascript:selAll(document.movetimerlist,1)"><img src="images/select.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:selAll(document.movetimerlist,1)"><?% gettext("Select all",20) %?></a><br />
+        <a href="javascript:selAll(document.movetimerlist,0)"><img src="images/deselect.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:selAll(document.movetimerlist,0)"><?% gettext("Unselect all",20) %?></a><br />
+        <a href="javascript:reverse(document.movetimerlist)"><img src="images/invers.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:reverse(document.movetimerlist)"><?% gettext("Reverse select",20) %?></a><br />
+
+<?% IF allow('movetimerdelete') %?>
+        <a href="javascript:DeleteSelected('<?% gettext("You would delete follow rules?") %?>','<?% gettext("Nothing selected!") %?>','movetimerdelete',document.movetimerlist,620,670)"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:DeleteSelected('<?% gettext("You would delete follow rules?") %?>','<?% gettext("Nothing selected!") %?>','movetimerdelete',document.movetimerlist,620,670)"><?% gettext("Delete rules to move timer",20) %?></a><br />
+<?% END %?>
+    </p>
+<?% END %?>
+</div>
+<?% global.sidebar = 1 %?>
diff --git a/skins/deltab/tlist.tmpl b/skins/deltab/tlist.tmpl
index 22443b0..1201e0e 100644
--- a/skins/deltab/tlist.tmpl
+++ b/skins/deltab/tlist.tmpl
@@ -208,7 +208,11 @@
 <?% END %?>
 <?% IF allow('tupdate') %?>
       <a href="javascript:fire('tupdate','0')"><img src="images/refresh.<?% global.imagetyp %?>" alt="" title="<?% gettext("Update timers") %?>" /></a>&nbsp;
-      <a href="javascript:fire('tupdate','0')"><?% gettext("Update timers",20) %?></a>
+      <a href="javascript:fire('tupdate','0')"><?% gettext("Update timers",20) %?></a><br />
+<?% END %?>
+<?% IF allow('movetimerlist') %?>
+      <a href="?cmd=movetimerlist"><img src="images/onoff.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+      <a href="?cmd=movetimerlist"><?% gettext("Move timer",20) %?></a><br />
 <?% END %?>
     </p>
 <?% END %?>
diff --git a/skins/stone/display.tmpl b/skins/stone/display.tmpl
index aaaf70f..3025c1b 100644
--- a/skins/stone/display.tmpl
+++ b/skins/stone/display.tmpl
@@ -88,13 +88,11 @@ END %?>
              <div class="description" style="white-space: nowrap">    
                 <?% IF allow('switch') %?>
                 <a href="javascript:post('switch','<?% channel %?>')">
-                    <img src="images/watch.<?% global.imagetyp %?>" alt="" title="<?% gettext("Switch") %?>" />&nbsp;
-                </a>
+                    <img src="images/watch.<?% global.imagetyp %?>" alt="" title="<?% gettext("Switch") %?>" /></a>&nbsp;
          	      <?% END %?>
                 <?% IF allow('livestream') %?>
                 <a href="?cmd=livestream&amp;data=<?% channelid %?>">
                   <img src="images/webcast.<?% global.imagetyp %?>" alt="" title="<?% gettext("Live TV web cast") %?>" /></a>&nbsp;
-                </a>
         	      <?% END %?>
    			        <?% channel %?>
             </div>
diff --git a/skins/stone/quest.js b/skins/stone/quest.js
index 62e2c53..abf2939 100644
--- a/skins/stone/quest.js
+++ b/skins/stone/quest.js
@@ -1,6 +1,6 @@
 
 var questfn = null;
-function questcontent(title, text){
+function questcontent(title, text, image){
   var utitle = unescape(title);
   var content =  '<table class="areatable" summary=""><tr><td class="areahead"><div class="editorhead">';
   content += utitle.substr(0,50);
@@ -21,7 +21,7 @@ function questcontent(title, text){
   content += '</ul></font>';
   content += '<font class="title" style="float:right;padding-right:2em;">';
   content += '<a href="javascript:questclose(1)">';
-  content += '<img src="images/delete.'+ imageExt +'" alt="'+ title +'" />';
+  content += '<img src="images/'+ image +'.'+ imageExt +'" alt="'+ title +'" />';
   content += '</a></font></td></tr>';
   content += '<tr><td class="areabottom"></td></tr></table>';
   return content;
@@ -39,7 +39,7 @@ function questkeypress(e) {
 }
 
 var lastKeypress = null;
-function quest(title, text, center) {
+function quest(title, text, center, image) {
   ttp_enable(0);
   lastKeypress = document.onkeypress;
   document.onkeypress = questkeypress;
@@ -80,7 +80,7 @@ function quest(title, text, center) {
   }
 	ele.style.left = x + "px";
 
-	ele.innerHTML = questcontent(title, text);
+	ele.innerHTML = questcontent(title, text, image);
   ele.style.visibility = "visible";
 }
 
@@ -108,7 +108,7 @@ function sure(question, text, cmd, data) {
       }
     }
     questfn=new fn();
-    quest(question,[text],0);
+    quest(question,[text],0,'delete');
 }
 
 function di(url, wert) {
@@ -123,7 +123,7 @@ function sureandreload(question, text, cmd, data) {
       }
     }
     questfn=new fn();
-    quest(question,[text],0);
+    quest(question,[text],0,'delete');
 }
 
 // Question bevor delete
@@ -134,7 +134,7 @@ function surecmd(question,text,cmd,data,width,height) {
       }
     }
     questfn=new fn();
-    quest(question,[text],0);
+    quest(question,[text],0,'delete');
 }
 
 function DeleteSelected(question,warnmsg,cmd,form,width,height) {
@@ -165,8 +165,11 @@ function DeleteSelected(question,warnmsg,cmd,form,width,height) {
           }
         }
         questfn=new fn();
-        quest(question,txt,1);
+        quest(question,txt,1,'delete');
     } else {
-        alert(warnmsg);
+        function none() { this.callback=function() { } }
+        questfn=new none();
+        txt.push(warnmsg);
+        quest(question,txt,1,'off');
     }
 }
diff --git a/skins/stone/tlist.tmpl b/skins/stone/tlist.tmpl
index da220a7..af49046 100644
--- a/skins/stone/tlist.tmpl
+++ b/skins/stone/tlist.tmpl
@@ -210,7 +210,11 @@
 <?% END %?>
 <?% IF allow('tupdate') %?>
       <a href="javascript:fire('tupdate','0')"><img src="images/refresh.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
-      <a href="javascript:fire('tupdate','0')"><?% gettext("Update timers",20) %?></a>
+      <a href="javascript:fire('tupdate','0')"><?% gettext("Update timers",20) %?></a><br />
+<?% END %?>
+<?% IF allow('movetimerlist') %?>
+      <a href="?cmd=movetimerlist"><img src="images/onoff.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+      <a href="?cmd=movetimerlist"><?% gettext("Move timer",20) %?></a><br />
 <?% END %?>
     </td>
     </tr>
diff --git a/skins/stone_flat/display.tmpl b/skins/stone_flat/display.tmpl
index 8c90ced..14880f5 100644
--- a/skins/stone_flat/display.tmpl
+++ b/skins/stone_flat/display.tmpl
@@ -87,13 +87,11 @@ END %?>
              <div class="description" style="white-space: nowrap">    
                 <?% IF allow('switch') %?>
                 <a href="javascript:post('switch','<?% channel %?>')">
-                    <img src="images/watch.<?% global.imagetyp %?>" alt="" title="<?% gettext("Switch") %?>" />&nbsp;
-                </a>
+                    <img src="images/watch.<?% global.imagetyp %?>" alt="" title="<?% gettext("Switch") %?>" /></a>&nbsp;
          	      <?% END %?>
                 <?% IF allow('livestream') %?>
                 <a href="?cmd=livestream&amp;data=<?% channelid %?>">
                   <img src="images/webcast.<?% global.imagetyp %?>" alt="" title="<?% gettext("Live TV web cast") %?>" /></a>&nbsp;
-                </a>
         	      <?% END %?>
    			        <?% channel %?>
             </div>
diff --git a/skins/stone_flat/tlist.tmpl b/skins/stone_flat/tlist.tmpl
index 5201246..7934706 100644
--- a/skins/stone_flat/tlist.tmpl
+++ b/skins/stone_flat/tlist.tmpl
@@ -209,7 +209,11 @@
 <?% END %?>
 <?% IF allow('tupdate') %?>
       <a href="javascript:fire('tupdate','0')"><img src="images/refresh.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
-      <a href="javascript:fire('tupdate','0')"><?% gettext("Update timers",20) %?></a>
+      <a href="javascript:fire('tupdate','0')"><?% gettext("Update timers",20) %?></a><br />
+<?% END %?>
+<?% IF allow('movetimerlist') %?>
+      <a href="?cmd=movetimerlist"><img src="images/onoff.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+      <a href="?cmd=movetimerlist"><?% gettext("Move timer",20) %?></a><br />
 <?% END %?>
     </td>
     </tr>