* xstyle add movetimerlist

5 files changed, 133 insertions, 20 deletions

diff --git a/skins/deltab/movetimerlist.tmpl b/skins/deltab/movetimerlist.tmpl
index fdd4f98..5c8f18d 100644
--- a/skins/deltab/movetimerlist.tmpl
+++ b/skins/deltab/movetimerlist.tmpl
@@ -10,7 +10,7 @@
                         </a>
 <?% END %?>
 <?% IF allow('movetimerdelete') %?>
-                        <a href="javascript:sure('<?% gettext("You will delete this rule") %?>\n<?% escape(source) %?>','?cmd=movetimerdelete&amp;data=<?% id %?>')">
+                        <a href="javascript:sure('<?% gettext("You will delete this rule") %?>\n<?% escape(source) %?> - <?% escape(destination) %?>','?cmd=movetimerdelete&amp;data=<?% id %?>')">
                             <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete rule to move timer") %?>" />
                         </a>
 <?% END %?>
@@ -67,6 +67,7 @@
         <?% PROCESS Item %?>
      <?% END %?>
       </table>
+</form>
 <?% END %?>
 </div>
 <!-- ###### Seite ###### -->
diff --git a/skins/stone/movetimerlist.tmpl b/skins/stone/movetimerlist.tmpl
index e3975a3..93b910f 100644
--- a/skins/stone/movetimerlist.tmpl
+++ b/skins/stone/movetimerlist.tmpl
@@ -11,7 +11,7 @@
                         </a>
 <?% END %?>
 <?% IF allow('movetimerdelete') %?>
-                        <a href="javascript:surecmd('<?% gettext("You will delete this rule") %?>','<?% escape(source) %?>','movetimerdelete','<?% id %?>',620,670)">
+                        <a href="javascript:surecmd('<?% gettext("You will delete this rule") %?>','<?% escape(source) %?> - <?% escape(destination) %?>','movetimerdelete','<?% id %?>',620,670)">
                             <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete rule to move timer") %?>" />
                         </a>
 <?% END %?>
diff --git a/skins/stone_flat/movetimerlist.tmpl b/skins/stone_flat/movetimerlist.tmpl
index dbfc1be..703793a 100644
--- a/skins/stone_flat/movetimerlist.tmpl
+++ b/skins/stone_flat/movetimerlist.tmpl
@@ -11,7 +11,7 @@
                         </a>
 <?% END %?>
 <?% IF allow('movetimerdelete') %?>
-                        <a href="javascript:surecmd('<?% gettext("You will delete this rule") %?>','<?% escape(source) %?>','movetimerdelete','<?% id %?>',620,670)">
+                        <a href="javascript:surecmd('<?% gettext("You will delete this rule") %?>','<?% escape(source) %?> - <?% escape(destination) %?>','movetimerdelete','<?% id %?>',620,670)">
                             <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete rule to move timer") %?>" />
                         </a>
 <?% END %?>
diff --git a/skins/xstyle/help.tmpl b/skins/xstyle/help.tmpl
index d325e9d..baf7fab 100644
--- a/skins/xstyle/help.tmpl
+++ b/skins/xstyle/help.tmpl
@@ -70,34 +70,46 @@ var myBar = new WebFXMenuBar;
         <?% END %?>
             program.add(new WebFXMenuItem('<?% group.first %?>',null,null,programGrp<?% group.last %?>));
     <?% END %?>
+
+    <?% IF allow('erestart') %?>
+      program.add(new WebFXMenuSeparator());
+      program.add(new WebFXMenuItem("<?% gettext("Update EPG data",12) %?>","?cmd=erestart"));
+    <?% END %?>
+
     myBar.add(new WebFXMenuButton("<?% gettext("Program guide") %?>",null,null,program));
 <?% END %?>
 
 // -----
+    var control = new WebFXMenu;
+    <?% IF allow('alist') %?>control.add(new WebFXMenuItem("<?% gettext("Autotimer",12) %?>",     "?cmd=alist"));<?% END %?>
+    <?% IF allow('tlist') %?>control.add(new WebFXMenuItem("<?% gettext("Timers",12) %?>",        "?cmd=tlist"));<?% END %?>
+    <?% IF allow('movetimerlist') %?>control.add(new WebFXMenuItem("<?% gettext("Rules to move timer",12) %?>","?cmd=movetimerlist"));<?% END %?>
+    myBar.add(new WebFXMenuButton("<?% gettext("Programming") %?>",null,null,control));
+
+    var media = new WebFXMenu;
+    <?% IF allow('rlist') %?>media.add(new WebFXMenuItem("<?% gettext("Recordings",12) %?>",    "?cmd=rlist"));<?% END %?>
+    <?% IF allow('mlist') %?>media.add(new WebFXMenuItem("<?% gettext("Music",12) %?>",         "?cmd=mlist"));<?% END %?>
+    <?% IF allow('mllist') %?>media.add(new WebFXMenuItem("<?% gettext("Media library",12) %?>","?cmd=mllist"));<?% END %?>
+    myBar.add(new WebFXMenuButton("<?% gettext("Media") %?>",null,null,media));
+
 
     var tools = new WebFXMenu;
-    <?% IF allow('cmdlist') %?>tools.add(new WebFXMenuItem("<?% gettext("Commands") %?>",    "?cmd=cmdlist"));<?% END %?>
-    <?% IF allow('alist') %?>tools.add(new WebFXMenuItem("<?% gettext("Autotimer") %?>",     "?cmd=alist"));<?% END %?>
-    <?% IF allow('tlist') %?>tools.add(new WebFXMenuItem("<?% gettext("Timers") %?>",        "?cmd=tlist"));<?% END %?>
-    <?% IF allow('rlist') %?>tools.add(new WebFXMenuItem("<?% gettext("Recordings") %?>",    "?cmd=rlist"));<?% END %?>
-    <?% IF allow('mlist') %?>tools.add(new WebFXMenuItem("<?% gettext("Music") %?>",         "?cmd=mlist"));<?% END %?>
-    <?% IF allow('remote') %?>tools.add(new WebFXMenuItem("<?% gettext("Remote") %?>",        "?cmd=remote"));<?% END %?>
-    <?% IF allow('vtxpage') %?>tools.add(new WebFXMenuItem("<?% gettext("Teletext") %?>",      "?cmd=vtxpage"));<?% END %?>
-    <?% IF allow('report') %?>tools.add(new WebFXMenuItem("<?% gettext("Report") %?>","?cmd=report"));<?% END %?>
-    <?% IF allow('mllist') %?>tools.add(new WebFXMenuItem("<?% gettext("Media library") %?>","?cmd=mllist"));<?% END %?>
-    tools.add(new WebFXMenuItem("<?% gettext("Channels") %?>",  "?cmd=cl"));
+    <?% IF allow('remote') %?>tools.add(new WebFXMenuItem("<?% gettext("Remote",12) %?>",        "?cmd=remote"));<?% END %?>
+    <?% IF allow('vtxpage') %?>tools.add(new WebFXMenuItem("<?% gettext("Teletext",12) %?>",     "?cmd=vtxpage"));<?% END %?>
+    <?% IF allow('cmdlist') %?>tools.add(new WebFXMenuItem("<?% gettext("Commands",12) %?>",     "?cmd=cmdlist"));<?% END %?>
+    <?% IF allow('report') %?>tools.add(new WebFXMenuItem("<?% gettext("Report",12) %?>","?cmd=report"));<?% END %?>
 
     myBar.add(new WebFXMenuButton("<?% gettext("Tools") %?>",null,null,tools));
 
 // -----
 
     var admin = new WebFXMenu;
-    <?% IF allow('ul') %?>admin.add(new WebFXMenuItem("<?% gettext("User") %?>","?cmd=ul"));
-    <?% ELSIF allow('uprefs') %?>admin.add(new WebFXMenuItem("<?% gettext("Personality") %?>","?cmd=uprefs"));<?% END %?>
-    <?% IF allow('erestart') %?>admin.add(new WebFXMenuItem("<?% gettext("Update EPG data") %?>","?cmd=erestart"));<?% END %?>
-    <?% IF allow('rel') %?>admin.add(new WebFXMenuItem("<?% gettext("Reload") %?>","?cmd=rel"));<?% END %?>
-    <?% IF allow('logout') %?>admin.add(new WebFXMenuItem("<?% gettext("Logout") %?>","?cmd=logout"));<?% END %?>
-    <?% IF allow('restart') %?>admin.add(new WebFXMenuItem("<?% gettext("Restart") %?>","?cmd=restart"));<?% END %?>
+    <?% IF allow('cl') %?>admin.add(new WebFXMenuItem("<?% gettext("Channels",12) %?>",  "?cmd=cl"));<?% END %?>
+    <?% IF allow('ul') %?>admin.add(new WebFXMenuItem("<?% gettext("User",12) %?>","?cmd=ul"));
+    <?% ELSIF allow('uprefs') %?>admin.add(new WebFXMenuItem("<?% gettext("Personality",12) %?>","?cmd=uprefs"));<?% END %?>
+    <?% IF allow('rel') %?>admin.add(new WebFXMenuItem("<?% gettext("Reload",12) %?>","?cmd=rel"));<?% END %?>
+    <?% IF allow('logout') %?>admin.add(new WebFXMenuItem("<?% gettext("Logout",12) %?>","?cmd=logout"));<?% END %?>
+    <?% IF allow('restart') %?>admin.add(new WebFXMenuItem("<?% gettext("Restart",12) %?>","?cmd=restart"));<?% END %?>
 
     myBar.add(new WebFXMenuButton("<?% gettext("Administration") %?>",null,null,admin));
 
@@ -107,7 +119,7 @@ var myBar = new WebFXMenuBar;
     var prefs = new WebFXMenu;
     <?% FOREACH co = getModule('CONFIG').realModNames %?>
       <?% IF co != "CONFIG" %?>
-        prefs.add(new WebFXMenuItem("<?% chop(co,10) %?>",  "?cmd=configedit&amp;data=<?% co %?>"));
+        prefs.add(new WebFXMenuItem("<?% chop(co,12) %?>",  "?cmd=configedit&amp;data=<?% co %?>"));
       <?% END %?>
     <?% END %?>
     myBar.add(new WebFXMenuButton("<?% gettext("Preferences") %?>",null,null,prefs));
diff --git a/skins/xstyle/movetimerlist.tmpl b/skins/xstyle/movetimerlist.tmpl
new file mode 100644
index 0000000..f3f7ced
--- /dev/null
+++ b/skins/xstyle/movetimerlist.tmpl
@@ -0,0 +1,100 @@
+<!-- movetimerlist -->
+<?% ######################################################################## %?>
+<?% enableform = allow('movetimerdelete') && data.size > 1  %?>
+<?% ######################################################################## %?>
+<?% BLOCK RowButtons %?>
+<?% IF allow('movetimeredit') %?>
+                        <a name="<?% id %?>" href="?cmd=movetimeredit&amp;data=<?% id %?>">
+                            <img src="images/edit.png" alt="" title="<?% gettext("Edit rule to move timer") %?>" />
+                        </a>
+<?% END %?>
+<?% IF allow('movetimerdelete') %?>
+                        <a href="javascript:sure(document.movetimerlist, '<?% gettext("You will delete this rule") %?>\n<?% escape(source) %?> - <?% escape(destination) %?>','?cmd=movetimerdelete&amp;data=',<?% id %?>)" title="<?% gettext("Delete rule to move timer") %?>">
+                            <img src="images/delete.png" alt="" title="<?% gettext("Delete rule to move timer") %?>" />
+                        </a>
+<?% END %?>
+<?% END %?>
+<?% ######################################################################## %?>
+<?% BLOCK Item %?>
+        <tr<?% ' bgcolor="#F5F5F5"' 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>
+
+<div id="navcontainer">
+<ul id="navlist">
+<?% IF allow('movetimercreate') %?>
+    <li><a href="?cmd=movetimercreate"><?% gettext("Create a new rule to move timer") %?></a></li>
+<?% END %?>
+<?% IF data.size > 1 %?>
+  <?% IF allow('movetimer') %?>
+    <li><a href="?cmd=movetimer"><?% gettext("Manual move timer between channels",20) %?></a></li>
+  <?% END %?>
+  <?% IF allow('movetimerdelete') %?>
+    <li><a href="#" onClick="Delete('<?% gettext("You would delete follow rules?") %?>','<?% gettext("Nothing selected!") %?>','movetimerdelete',document.movetimerlist)">
+        <?% gettext("Delete rules to move timer") %?></a>
+     </li>
+  <?% END %?>
+<?% END %?>
+</ul>
+</div>
+
+<?% IF data.size > 1 %?>
+<?% fields = data.shift %?>
+<?% IF enableform %?>
+<a href="#" onClick="selAll(document.movetimerlist, 1)">[<?% gettext("Select all") %?>]</a>
+<a href="#" onClick="selAll(document.movetimerlist, 0)">[<?% gettext("Unselect all") %?>]</a>
+<a href="#" onClick="reverse(document.movetimerlist)">[<?% gettext("Reverse select") %?>]</a>
+<form name="movetimerlist" action="">
+  <?% INCLUDE 'widgets/referer.tmpl' %?>
+<?% END %?>
+
+      <table summary="" width="95%">
+            <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>
+<?% IF enableform %?>
+</form>
+<?% END %?>
+
+<?% END %?>
+