From e9d8133b5d78e4021acfb9b040cdc274e94b7fbc Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Sun, 13 Jan 2008 12:51:22 +0000
Subject: * Update translations * RECORDS: use File::stat * MOVETIMER: Add
 redirect if move timer updated * TIMER: tnew with fast=1 create timer from
 event, without prompt * Skins/search: program timer from selected events by
 joined list * Skins/redirect: close frame automated after 3 seconds * xstyle:
 Fix searchbox+cancel => call command <undef>

---
 skins/deltab/alist.tmpl             |  2 +-
 skins/deltab/clist.tmpl             |  6 +++---
 skins/deltab/display.tmpl           |  4 ++--
 skins/deltab/movetimerlist.tmpl     |  6 +++---
 skins/deltab/rdisplay.tmpl          |  4 ++--
 skins/deltab/rlist.tmpl             |  6 +++---
 skins/deltab/tlist.tmpl             |  6 +++---
 skins/deltab/tooltip.js             |  3 ++-
 skins/deltab/ulist.tmpl             |  2 +-
 skins/stone/alist.tmpl              |  2 +-
 skins/stone/clist.tmpl              |  6 +++---
 skins/stone/display.tmpl            |  2 +-
 skins/stone/global.js               |  1 +
 skins/stone/movetimerlist.tmpl      |  6 +++---
 skins/stone/quest.js                |  9 +++------
 skins/stone/rdisplay.tmpl           |  2 +-
 skins/stone/rlist.tmpl              | 14 +++++++-------
 skins/stone/search.tmpl             | 33 +++++++++++++++++++++++++++++++++
 skins/stone/tlist.tmpl              |  6 +++---
 skins/stone/tooltip.js              |  3 ++-
 skins/stone/ulist.tmpl              |  2 +-
 skins/stone/widgets/redirect.tmpl   |  7 ++++---
 skins/stone_flat/alist.tmpl         |  2 +-
 skins/stone_flat/clist.tmpl         |  6 +++---
 skins/stone_flat/display.tmpl       |  2 +-
 skins/stone_flat/movetimerlist.tmpl |  6 +++---
 skins/stone_flat/rdisplay.tmpl      |  2 +-
 skins/stone_flat/rlist.tmpl         | 10 +++++-----
 skins/stone_flat/search.tmpl        | 35 ++++++++++++++++++++++++++++++++++-
 skins/stone_flat/tlist.tmpl         |  8 ++++----
 skins/stone_flat/ulist.tmpl         |  2 +-
 skins/xstyle/alist.tmpl             |  2 +-
 skins/xstyle/clist.tmpl             |  2 +-
 skins/xstyle/help.tmpl              |  2 +-
 skins/xstyle/javascript/global.js   |  7 ++++---
 skins/xstyle/movetimerlist.tmpl     |  4 ++--
 skins/xstyle/rdisplay.tmpl          |  2 +-
 skins/xstyle/rlist.tmpl             |  2 +-
 skins/xstyle/tlist.tmpl             |  4 ++--
 skins/xstyle/ulist.tmpl             |  2 +-
 40 files changed, 150 insertions(+), 82 deletions(-)

diff --git a/skins/deltab/alist.tmpl b/skins/deltab/alist.tmpl
index ca27fc2..90d5ac1 100644
--- a/skins/deltab/alist.tmpl
+++ b/skins/deltab/alist.tmpl
@@ -30,7 +30,7 @@
                         </a>
 		    <?% END %?>
 		    <?% IF allow('adelete') %?>
-                        <a href="javascript:sureandreload('<?% gettext("You will delete this autotimer") %?> : \'<?% escape( title ) %?>\'','adelete','<?% id %?>')">
+                        <a href="javascript:sureandreload('<?% gettext("Would you like to delete this autotimer?") %?>\n\'<?% escape( title ) %?>\'','adelete','<?% id %?>')">
                             <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete autotimer") %?>" />
                         </a>
 		    <?% END %?>
diff --git a/skins/deltab/clist.tmpl b/skins/deltab/clist.tmpl
index e92d49e..0474d83 100644
--- a/skins/deltab/clist.tmpl
+++ b/skins/deltab/clist.tmpl
@@ -41,7 +41,7 @@
                         </a>
 <?% END %?>
 <?% IF allow('cdelete') %?>
-                        <a href="javascript:sure('<?% gettext("You will delete this channel") %?> : \'<?% escape( name ) %?>\' ?','?cmd=cdelete&amp;data=<?% POS %?>')">
+                        <a href="javascript:sure('<?% gettext("Would you like to delete this channel?") %?> : \'<?% escape( name ) %?>\' ?','?cmd=cdelete&amp;data=<?% POS %?>')">
                             <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete channel") %?>" />
                         </a>
 <?% END %?>
@@ -182,8 +182,8 @@
 
 <?% IF allow('cdelete') %?>
         <br /><br />
-        <a href="javascript:DeleteSelected('<?% gettext("You would delete follow channels?") %?>','<?% gettext("Nothing selected!") %?>','cdelete',document.clist)"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
-        <a href="javascript:DeleteSelected('<?% gettext("You would delete follow channels?") %?>','<?% gettext("Nothing selected!") %?>','cdelete',document.clist)"><?% gettext("Delete channels",20) %?></a><br />
+        <a href="javascript:DeleteSelected('<?% gettext("Would you like to delete these channels?") %?>','<?% gettext("Nothing selected!") %?>','cdelete',document.clist)"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:DeleteSelected('<?% gettext("Would you like to delete these channels?") %?>','<?% gettext("Nothing selected!") %?>','cdelete',document.clist)"><?% gettext("Delete channels",20) %?></a><br />
 <?% END %?>
     </p>
 <?% END %?>
diff --git a/skins/deltab/display.tmpl b/skins/deltab/display.tmpl
index e1ab887..16c5211 100644
--- a/skins/deltab/display.tmpl
+++ b/skins/deltab/display.tmpl
@@ -73,11 +73,11 @@ END %?>
       <br />
 
       <?% IF allow('switch') %?>
-      <a href="javascript:post('switch','<?% channel %?>')">
+      <a href="javascript:post('switch','<?% channelid %?>')">
           <img src="images/watch.<?% global.imagetyp %?>" alt="" title="<?% gettext("Switch") %?>" />
       </a>
       &nbsp;
-      <a href="javascript:post('switch','<?% channel %?>')">
+      <a href="javascript:post('switch','<?% channelid %?>')">
           <?% gettext("Switch") %?>
       </a>
       <br />
diff --git a/skins/deltab/movetimerlist.tmpl b/skins/deltab/movetimerlist.tmpl
index 5c8f18d..c181e94 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) %?> - <?% escape(destination) %?>','?cmd=movetimerdelete&amp;data=<?% id %?>')">
+                        <a href="javascript:sure('<?% gettext("Would you like to 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 %?>
@@ -96,8 +96,8 @@
         <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 />
+        <a href="javascript:DeleteSelected('<?% gettext("Would you like to delete these rules?") %?>','<?% gettext("Nothing selected!") %?>','movetimerdelete',document.movetimerlist,620,670)"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:DeleteSelected('<?% gettext("Would you like to delete these rules?") %?>','<?% gettext("Nothing selected!") %?>','movetimerdelete',document.movetimerlist,620,670)"><?% gettext("Delete rules to move timer",20) %?></a><br />
 <?% END %?>
     </p>
 <?% END %?>
diff --git a/skins/deltab/rdisplay.tmpl b/skins/deltab/rdisplay.tmpl
index 14c36bc..ff8c4ec 100644
--- a/skins/deltab/rdisplay.tmpl
+++ b/skins/deltab/rdisplay.tmpl
@@ -240,11 +240,11 @@
         <br />
 <?% END %?>
 <?% IF allow( 'rdelete' ) %?>
-        <a href="javascript:sure('<?% gettext("Do you really want to delete these recordings?") %?> : \'<?% escape( title ) %?>\' ?','?cmd=rdelete&amp;data=<?% id %?>')">
+        <a href="javascript:sure('<?% gettext("Would you like to delete this recording?") %?> : \'<?% escape( title ) %?>\' ?','?cmd=rdelete&amp;data=<?% id %?>')">
             <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete recording") %?>" />
         </a>
         &nbsp;
-        <a href="javascript:sure('<?% gettext("Do you really want to delete these recordings?") %?> : \'<?% escape( title ) %?>\' ?','?cmd=rdelete&amp;data=<?% id %?>')">
+        <a href="javascript:sure('<?% gettext("Would you like to delete this recording?") %?> : \'<?% escape( title ) %?>\' ?','?cmd=rdelete&amp;data=<?% id %?>')">
             <?% gettext("Delete recording",20) %?>
         </a>
         <br />
diff --git a/skins/deltab/rlist.tmpl b/skins/deltab/rlist.tmpl
index ad8ccf1..748bbed 100644
--- a/skins/deltab/rlist.tmpl
+++ b/skins/deltab/rlist.tmpl
@@ -103,7 +103,7 @@
             <img src="images/webcast.<?% global.imagetyp %?>" alt="" title="<?% gettext("Watch recording as web cast") %?>" /></a>
     <?% END %?>
     <?% IF allow('rdelete') %?>
-            <a href="javascript:sure('<?% gettext("Do you really want to delete these recordings?") %?> : \'<?% escape( title ) %?>\' ?','?cmd=rdelete&amp;data=<?% id %?>')">
+            <a href="javascript:sure('<?% gettext("Would you like to delete this recording?") %?> : \'<?% escape( title ) %?>\' ?','?cmd=rdelete&amp;data=<?% id %?>')">
                 <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete recording") %?>" />
             </a>
     <?% END %?>
@@ -289,8 +289,8 @@
       <a href="javascript:reverse(document.rlist)"><img src="images/invers.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
       <a href="javascript:reverse(document.rlist)"><?% gettext("Reverse select",20) %?></a><br />
 <?% IF allow('rdelete') %?>
-        <a href="javascript:DeleteSelected('<?% gettext("Do you want to delete the following recordings?") %?>','<?% gettext("Nothing selected!") %?>','rdelete',document.rlist)"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
-        <a href="javascript:DeleteSelected('<?% gettext("Do you want to delete the following recordings?") %?>','<?% gettext("Nothing selected!") %?>','rdelete',document.rlist)"><?% gettext("Delete recordings",20) %?></a><br />
+        <a href="javascript:DeleteSelected('<?% gettext("Would you like to delete these recordings?") %?>','<?% gettext("Nothing selected!") %?>','rdelete',document.rlist)"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:DeleteSelected('<?% gettext("Would you like to delete these recordings?") %?>','<?% gettext("Nothing selected!") %?>','rdelete',document.rlist)"><?% gettext("Delete recordings",20) %?></a><br />
 <?% END %?>
     </p>
 <?% END %?>
diff --git a/skins/deltab/tlist.tmpl b/skins/deltab/tlist.tmpl
index b4a905f..7f724f1 100644
--- a/skins/deltab/tlist.tmpl
+++ b/skins/deltab/tlist.tmpl
@@ -110,7 +110,7 @@
         </a>
     <?% END %?>
 	<?% IF allow('tdelete') %?>
-        <a href="javascript:sure('<?% gettext("Would You like to delete the following timer(s)?") %?>\n<?% escape( title.split('&#x7e;').first) %?>','?cmd=tdelete&amp;data=<?% id %?>')">
+        <a href="javascript:sure('<?% gettext("Would you like to delete this timer?") %?>\n<?% escape( title.split('&#x7e;').first) %?>','?cmd=tdelete&amp;data=<?% id %?>')">
             <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete timer") %?>" />
         </a>
     <?% END %?>
@@ -230,8 +230,8 @@
         <a href="javascript:ToggleTimer('<?% gettext("Nothing selected!") %?>',document.tlist)"><?% gettext("Toggle timer",20) %?></a><br />
 <?% END %?>
 <?% IF allow('tdelete') %?>
-        <a href="javascript:DeleteSelected('<?% gettext("Would You like to delete the following timer(s)?") %?>','<?% gettext("Nothing selected!") %?>','tdelete',document.tlist)"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
-        <a href="javascript:DeleteSelected('<?% gettext("Would You like to delete the following timer(s)?") %?>','<?% gettext("Nothing selected!") %?>','tdelete',document.tlist)"><?% gettext("Delete timer",20) %?></a><br />
+        <a href="javascript:DeleteSelected('<?% gettext("Would you like to delete these timers?") %?>','<?% gettext("Nothing selected!") %?>','tdelete',document.tlist)"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:DeleteSelected('<?% gettext("Would you like to delete these timers?") %?>','<?% gettext("Nothing selected!") %?>','tdelete',document.tlist)"><?% gettext("Delete timer",20) %?></a><br />
 <?% END %?>
     </p>
 <?% END %?>
diff --git a/skins/deltab/tooltip.js b/skins/deltab/tooltip.js
index 89cb309..7950b95 100644
--- a/skins/deltab/tooltip.js
+++ b/skins/deltab/tooltip.js
@@ -75,7 +75,8 @@ function ttp_update_pos(){
 }
 
 var ttp_ie = document.all?true:false;
-if (!ttp_ie) document.captureEvents(Event.MOUSEMOVE)
+//Netscape 4.0 only 
+//if (!ttp_ie) document.captureEvents(Event.MOUSEMOVE)
 document.onmousemove = ttp_onmousemove;
 
 function ttp_onmousemove(e) {
diff --git a/skins/deltab/ulist.tmpl b/skins/deltab/ulist.tmpl
index 7f60ceb..1f4e489 100644
--- a/skins/deltab/ulist.tmpl
+++ b/skins/deltab/ulist.tmpl
@@ -13,7 +13,7 @@
             <a href="?cmd=uedit&amp;data=<?% id %?>">
                 <img src="images/edit.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit account of user") %?>" />
             </a>
-            <a href="javascript:sureandreload('<?% gettext("Do you really want to delete this user account?") %?> : \'<?% escape( user ) %?>\'','udelete','<?% id %?>')">
+            <a href="javascript:sureandreload('<?% gettext("Would you like to delete this user account?") %?> : \'<?% escape( user ) %?>\'','udelete','<?% id %?>')">
                 <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete user account") %?>" />
             </a>
         </td>
diff --git a/skins/stone/alist.tmpl b/skins/stone/alist.tmpl
index 0d01822..3177c36 100644
--- a/skins/stone/alist.tmpl
+++ b/skins/stone/alist.tmpl
@@ -31,7 +31,7 @@
                 </a>
 		    <?% END %?>
 		    <?% IF allow('adelete') %?>
-                <a href="javascript:sureandreload('<?% gettext("You will delete this autotimer") %?>','<?% escape(title) %?>','adelete','<?% id %?>')">
+                <a href="javascript:sureandreload('<?% gettext("Would you like to delete this autotimer?") %?>','<?% escape(title) %?>','adelete','<?% id %?>')">
                     <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete autotimer") %?>" />
                 </a>
 		    <?% END %?>
diff --git a/skins/stone/clist.tmpl b/skins/stone/clist.tmpl
index 1cfc113..d194dda 100644
--- a/skins/stone/clist.tmpl
+++ b/skins/stone/clist.tmpl
@@ -23,7 +23,7 @@
                         </a>
 <?% END %?>
 <?% IF allow('cdelete') %?>
-                        <a href="javascript:surecmd('<?% gettext("You will delete this channel") %?>','<?% escape(name) %?>','cdelete','<?% POS %?>',620,670)">
+                        <a href="javascript:surecmd('<?% gettext("Would you like to delete this channel?") %?>','<?% escape(name) %?>','cdelete','<?% POS %?>',620,670)">
                             <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete channel") %?>" />
                         </a>
 <?% END %?>
@@ -230,8 +230,8 @@
     <tr>
     <td class="sidetext">
 <?% IF allow('cdelete') %?>
-        <a href="javascript:DeleteSelected('<?% gettext("You would delete follow channels?") %?>','<?% gettext("Nothing selected!") %?>','cdelete',document.clist,620,670)"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
-        <a href="javascript:DeleteSelected('<?% gettext("You would delete follow channels?") %?>','<?% gettext("Nothing selected!") %?>','cdelete',document.clist,620,670)"><?% gettext("Delete channels",20) %?></a><br />
+        <a href="javascript:DoitReally('<?% gettext("Would you like to delete these channels?") %?>','<?% gettext("Nothing selected!") %?>','cdelete',document.clist,620,670,'delete')"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:DoitReally('<?% gettext("Would you like to delete these channels?") %?>','<?% gettext("Nothing selected!") %?>','cdelete',document.clist,620,670,'delete')"><?% gettext("Delete channels",20) %?></a><br />
 <?% END %?>
     </td>
     </tr>
diff --git a/skins/stone/display.tmpl b/skins/stone/display.tmpl
index 3025c1b..6d334f6 100644
--- a/skins/stone/display.tmpl
+++ b/skins/stone/display.tmpl
@@ -87,7 +87,7 @@ END %?>
 			    <td>
              <div class="description" style="white-space: nowrap">    
                 <?% IF allow('switch') %?>
-                <a href="javascript:post('switch','<?% channel %?>')">
+                <a href="javascript:post('switch','<?% channelid %?>')">
                     <img src="images/watch.<?% global.imagetyp %?>" alt="" title="<?% gettext("Switch") %?>" /></a>&nbsp;
          	      <?% END %?>
                 <?% IF allow('livestream') %?>
diff --git a/skins/stone/global.js b/skins/stone/global.js
index 50e4aa6..d06dd58 100644
--- a/skins/stone/global.js
+++ b/skins/stone/global.js
@@ -42,6 +42,7 @@ var lastKeypress = null;
 function popupkeypress(e) {
   var KeyID = (window.event) ? event.keyCode : e.keyCode;
   if(KeyID == 27) { //ESC
+    parent.parent_url = null;
     closeit();
   } 
 }
diff --git a/skins/stone/movetimerlist.tmpl b/skins/stone/movetimerlist.tmpl
index 93b910f..5c1f169 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) %?> - <?% escape(destination) %?>','movetimerdelete','<?% id %?>',620,670)">
+                        <a href="javascript:surecmd('<?% gettext("Would you like to 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 %?>
@@ -121,8 +121,8 @@
     <tr>
     <td class="sidetext">
 <?% 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 />
+        <a href="javascript:DoitReally('<?% gettext("Would you like to delete these rules?") %?>','<?% gettext("Nothing selected!") %?>','movetimerdelete',document.movetimerlist,620,670,'delete')"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:DoitReally('<?% gettext("Would you like to delete these rules?") %?>','<?% gettext("Nothing selected!") %?>','movetimerdelete',document.movetimerlist,620,670,'delete')"><?% gettext("Delete rules to move timer",20) %?></a><br />
 <?% END %?>
     </td>
     </tr>
diff --git a/skins/stone/quest.js b/skins/stone/quest.js
index abf2939..6b2f769 100644
--- a/skins/stone/quest.js
+++ b/skins/stone/quest.js
@@ -44,9 +44,6 @@ function quest(title, text, center, image) {
   lastKeypress = document.onkeypress;
   document.onkeypress = questkeypress;
 
-  if(title.charAt(title.length-1) != '?') {
-    title += ' ?';
-  } 
   var Size = WindowSize();
   var x0;
   var y;
@@ -137,8 +134,8 @@ function surecmd(question,text,cmd,data,width,height) {
     quest(question,[text],0,'delete');
 }
 
-function DeleteSelected(question,warnmsg,cmd,form,width,height) {
-// test on checked Boxes
+function DoitReally(question,warnmsg,cmd,form,width,height,image) {
+// collect checked boxes
     ok = new Array;
     txt = new Array;
     x = 0;
@@ -165,7 +162,7 @@ function DeleteSelected(question,warnmsg,cmd,form,width,height) {
           }
         }
         questfn=new fn();
-        quest(question,txt,1,'delete');
+        quest(question,txt,1,image);
     } else {
         function none() { this.callback=function() { } }
         questfn=new none();
diff --git a/skins/stone/rdisplay.tmpl b/skins/stone/rdisplay.tmpl
index 014891e..cab7800 100644
--- a/skins/stone/rdisplay.tmpl
+++ b/skins/stone/rdisplay.tmpl
@@ -92,7 +92,7 @@
             </a>
     <?% END %?>
     <?% IF allow('rdelete') %?>
-            <a href="javascript:sure('<?% gettext("Do you want to delete the following recordings?") %?>','<?% escape(title) %?><?% IF subtitle.length > 0 %?>~<?% escape(subtitle) %?><?% END %?>','rdelete','<?% id %?>')">
+            <a href="javascript:sure('<?% gettext("Would you like to delete this recording?") %?>','<?% escape(title) %?><?% IF subtitle.length > 0 %?>~<?% escape(subtitle) %?><?% END %?>','rdelete','<?% id %?>')">
                 <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete recording") %?>" />
             </a>
     <?% END %?>
diff --git a/skins/stone/rlist.tmpl b/skins/stone/rlist.tmpl
index 2d7413a..98c6d72 100644
--- a/skins/stone/rlist.tmpl
+++ b/skins/stone/rlist.tmpl
@@ -94,7 +94,7 @@
             </a>
     <?% END %?>
     <?% IF allow('rdelete') %?>
-            <a href="javascript:surecmd('<?% gettext("Do you want to delete the following recordings?") %?>','<?% escape(fulltitle) %?>','rdelete','<?% id %?>',620,670)">
+            <a href="javascript:surecmd('<?% gettext("Would you like to delete this recording?") %?>','<?% escape(fulltitle) %?>','rdelete','<?% id %?>',620,670)">
                 <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete recording") %?>" />
             </a>
     <?% END %?>
@@ -106,7 +106,7 @@
           <tr>
             <td class="fieldhead">
               <div class="fieldhead">
-            <?% IF folder <= 1 %?>
+            <?% IF !folder || folder <= 1 %?>
             <a href="javascript:popup('rdisplay','<?% id %?>',620,670,0)" class="fieldinline">
             <?% IF new %?><img src="images/new.<?% global.imagetyp %?>" alt="" title="<?% gettext("New recording") %?>" /><?% END %?>
             <?% fta = fulltitle.split('&#x7e;'); 
@@ -131,7 +131,7 @@
               </div>
             </td>
           </tr>
-          <?% IF folder > 1 %?>
+          <?% IF folder && folder > 1 %?>
           <tr>
             <td class="fieldtext">
               <div class="fieldtext">
@@ -232,12 +232,12 @@
           foldertitle=fulltitle.split('&#x7e;').last;
           IF foldertitle == " ";  foldertitle=fulltitle.split('&#x7e;').last(2).join(" "); END;
     -%?>
-			<?% IF old.defined && old != ( folder > 1 ?  2 : 1 ) %?>
+			<?% IF old.defined && old != ( folder && folder > 1 ?  2 : 1 ) %?>
   <div class="areaclose"></div>
         <?% END %?>
         <?% PROCESS ItemAsArea %?>
     		<?% total = total + duration %?>
-        <?% old = ( folder > 1 ?  2 : 1 ) %?>
+        <?% old = ( folder && folder > 1 ?  2 : 1 ) %?>
     <?% END %?>
   <div class="areaclose"></div>
 <?% PROCESS printsumme %?>
@@ -338,8 +338,8 @@
     <tr>
     <td class="sidetext">
 <?% IF allow('rdelete') %?>
-        <a href="javascript:DeleteSelected('<?% gettext("Do you want to delete the following recordings?") %?>','<?% gettext("Nothing selected!") %?>','rdelete',document.rlist,620,670)"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
-        <a href="javascript:DeleteSelected('<?% gettext("Do you want to delete the following recordings?") %?>','<?% gettext("Nothing selected!") %?>','rdelete',document.rlist,620,670)"><?% gettext("Delete recordings",20) %?></a><br />
+        <a href="javascript:DoitReally('<?% gettext("Would you like to delete these recordings?") %?>','<?% gettext("Nothing selected!") %?>','rdelete',document.rlist,620,670,'delete')"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:DoitReally('<?% gettext("Would you like to delete these recordings?") %?>','<?% gettext("Nothing selected!") %?>','rdelete',document.rlist,620,670,'delete')"><?% gettext("Delete recordings",20) %?></a><br />
 <?% END %?>
     </td>
     </tr>
diff --git a/skins/stone/search.tmpl b/skins/stone/search.tmpl
index 698b061..899d3eb 100644
--- a/skins/stone/search.tmpl
+++ b/skins/stone/search.tmpl
@@ -2,6 +2,8 @@
 <?% USE date %?>
 <body class="frame">
 <div id="body">
+<?% enableform = ( allow('tnew') ) && data.size > 1 %?>
+<?% activeform = 0 %?>
 <?% ######################################################################## %?>
 <?% BLOCK RowButtons %?>
                         <a href="?cmd=search&amp;data=<?% url( title ) %?>">
@@ -63,6 +65,11 @@
             <td class="fieldtext">
               <table class="fieldinline" summary="">
                 <tr>
+                    <td valign="middle" align="left" style="white-space: nowrap">
+                        <?% IF enableform && !param.timers.exists(id); activeform = 1 %?>
+                  			<input class="push" type="checkbox" value="<?% id %?>" name="<?% title %?><?% IF subtitle != "";"~";subtitle;END %?>" />
+    	 		              <?% END %?>
+                    </td>
                     <td class="fieldinline" style="white-space: nowrap">
                        <font class="description<?% IF state != "";" ";state;END %?>">
                        <?% start %?>&nbsp;-&nbsp;<?% stop %?>
@@ -89,6 +96,7 @@
 <?% ELSE %?>
 <?% fields = data.shift %?>
 <h1><?% gettext("Search text") %?> : <?% cgi.param('data') %?> - <?% date.format(data.first.7, "%A, %x", locale) %?></h1>
+<form name="searchlist" action="">
     <?% FOREACH zeile = data %?>
         <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;start=zeile.5;stop=zeile.6;description=zeile.8;pdc=zeile.9 %?>
@@ -101,6 +109,7 @@
         <?% old = day %?>
     <?% END %?>
 <div class="areaclose"></div>
+</form>
 <?% END %?>
 </div>
 <!-- ###### Seite ###### -->
@@ -150,6 +159,30 @@
     <td class="sidebottom"></td>
     </tr>
   </table>
+<?% IF activeform %?>
+  <table summary="">
+    <tr><td class="sidehead"><?% gettext("To record") %?></td></tr>
+    <tr>
+    <td class="sidetext">
+        <a href="javascript:selAll(document.searchlist,1)"><img src="images/select.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:selAll(document.searchlist,1)"><?% gettext("Select all",20) %?></a><br />
+        <a href="javascript:selAll(document.searchlist,0)"><img src="images/deselect.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:selAll(document.searchlist,0)"><?% gettext("Unselect all",20) %?></a><br />
+        <a href="javascript:reverse(document.searchlist)"><img src="images/invers.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:reverse(document.searchlist)"><?% gettext("Reverse select",20) %?></a>
+    </td>
+    </tr>
+    <tr>
+    <td class="sidetext">
+        <a href="javascript:DoitReally('<?% gettext("Would you like to record these events?") %?>','<?% gettext("Nothing selected!") %?>','tnew&__fast=1',document.searchlist,620,670,'record')"><img src="images/record.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:DoitReally('<?% gettext("Would you like to record these events?") %?>','<?% gettext("Nothing selected!") %?>','tnew&__fast=1',document.searchlist,620,670,'record')"><?% gettext("Record selected events",20) %?></a><br />
+    </td>
+    </tr>
+    <tr>
+    <td class="sidebottom"></td>
+    </tr>
+  </table>
+<?% END %?>
   <p id="sidefooter">&nbsp;</p>
 </div>
 <?% INCLUDE header.inc %?>
diff --git a/skins/stone/tlist.tmpl b/skins/stone/tlist.tmpl
index 2208c4c..7d00c02 100644
--- a/skins/stone/tlist.tmpl
+++ b/skins/stone/tlist.tmpl
@@ -57,7 +57,7 @@
                         </a>
 			<?% END %?>
 			<?% IF allow('tdelete') %?>
-                        <a href="javascript:surecmd('<?% gettext("Would You like to delete the following timer(s)?") %?>','<?% escape(title) %?><?% IF subtitle != "";"~";escape(subtitle);END %?>','tdelete','<?% id %?>',620,670)">
+                        <a href="javascript:surecmd('<?% gettext("Would you like to delete this timer?") %?>','<?% escape(title) %?><?% IF subtitle != "";"~";escape(subtitle);END %?>','tdelete','<?% id %?>',620,670)">
                             <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete timer") %?>" />
                         </a>
 			<?% END %?>
@@ -243,8 +243,8 @@
         <a href="javascript:selToggle('<?% gettext("Nothing selected!") %?>',document.tlist)"><?% gettext("Toggle timer",20) %?></a><br />
 <?% END %?>
 <?% IF allow('tdelete') %?>
-        <a href="javascript:DeleteSelected('<?% gettext("Would You like to delete the following timer(s)?") %?>','<?% gettext("Nothing selected!") %?>','tdelete',document.tlist,620,670)"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
-        <a href="javascript:DeleteSelected('<?% gettext("Would You like to delete the following timer(s)?") %?>','<?% gettext("Nothing selected!") %?>','tdelete',document.tlist,620,670)"><?% gettext("Delete timer",20) %?></a><br />
+        <a href="javascript:DoitReally('<?% gettext("Would you like to delete these timers?") %?>','<?% gettext("Nothing selected!") %?>','tdelete',document.tlist,620,670,'delete')"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:DoitReally('<?% gettext("Would you like to delete these timers?") %?>','<?% gettext("Nothing selected!") %?>','tdelete',document.tlist,620,670,'delete')"><?% gettext("Delete timer",20) %?></a><br />
 <?% END %?>
     </td>
     </tr>
diff --git a/skins/stone/tooltip.js b/skins/stone/tooltip.js
index a940fd4..e8d7c97 100644
--- a/skins/stone/tooltip.js
+++ b/skins/stone/tooltip.js
@@ -75,7 +75,8 @@ function ttp_update_pos(){
 }
 
 var ttp_ie = document.all?true:false;
-if (!ttp_ie) document.captureEvents(Event.MOUSEMOVE)
+//Netscape 4.0 only 
+//if (!ttp_ie) document.captureEvents(Event.MOUSEMOVE)
 document.onmousemove = ttp_onmousemove;
 
 function ttp_onmousemove(e) {
diff --git a/skins/stone/ulist.tmpl b/skins/stone/ulist.tmpl
index 48a362a..55a6ab0 100644
--- a/skins/stone/ulist.tmpl
+++ b/skins/stone/ulist.tmpl
@@ -9,7 +9,7 @@
                         </a>
 <?% END %?>
 <?% IF allow('udelete') %?>
-                        <a href="javascript:sureandreload('<?% gettext("Do you really want to delete this user account?") %?>','<?% escape(user) %?>','udelete','<?% id %?>')">
+                        <a href="javascript:sureandreload('<?% gettext("Would you like to delete this user account?") %?>','<?% escape(user) %?>','udelete','<?% id %?>')">
                             <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete user account") %?>" />
                         </a>
 <?% END %?>
diff --git a/skins/stone/widgets/redirect.tmpl b/skins/stone/widgets/redirect.tmpl
index c586c8a..abaa8e7 100644
--- a/skins/stone/widgets/redirect.tmpl
+++ b/skins/stone/widgets/redirect.tmpl
@@ -1,6 +1,7 @@
 <!-- Redirect -->
-<!--
+<?% IF global.shutter.defined; %?>
 <script type="text/javascript">
-    redirect('<?% reentities(data.url) %?>', '<?% data.wait ? data.wait : 1 %?>');
+    setTimeout("closeit()", '<?% data.wait ? data.wait * 3000 : 3000 %?>' );
+    /* redirect('<?% reentities(data.url) %?>', '<?% data.wait ? data.wait : 1 %?>' ); */
 </script>
--->
+<?% END %?>
diff --git a/skins/stone_flat/alist.tmpl b/skins/stone_flat/alist.tmpl
index e6a509d..2a849a6 100644
--- a/skins/stone_flat/alist.tmpl
+++ b/skins/stone_flat/alist.tmpl
@@ -31,7 +31,7 @@
                 </a>
 		    <?% END %?>
 		    <?% IF allow('adelete') %?>
-                <a href="javascript:sureandreload('<?% gettext("You will delete this autotimer") %?>','<?% escape(title) %?>','adelete','<?% id %?>')">
+                <a href="javascript:sureandreload('<?% gettext("Would you like to delete this autotimer?") %?>','<?% escape(title) %?>','adelete','<?% id %?>')">
                     <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete autotimer") %?>" />
                 </a>
 		    <?% END %?>
diff --git a/skins/stone_flat/clist.tmpl b/skins/stone_flat/clist.tmpl
index 5d0dbee..d28b11f 100644
--- a/skins/stone_flat/clist.tmpl
+++ b/skins/stone_flat/clist.tmpl
@@ -23,7 +23,7 @@
                         </a>
 <?% END %?>
 <?% IF allow('cdelete') %?>
-                        <a href="javascript:surecmd('<?% gettext("You will delete this channel") %?>','<?% escape(name) %?>','cdelete','<?% POS %?>',620,670)">
+                        <a href="javascript:surecmd('<?% gettext("Would you like to delete this channel?") %?>','<?% escape(name) %?>','cdelete','<?% POS %?>',620,670)">
                             <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete channel") %?>" />
                         </a>
 <?% END %?>
@@ -230,8 +230,8 @@
     <tr>
     <td class="sidetext">
 <?% IF allow('cdelete') %?>
-        <a href="javascript:DeleteSelected('<?% gettext("You would delete follow channels?") %?>','<?% gettext("Nothing selected!") %?>','cdelete',document.clist,620,670)"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
-        <a href="javascript:DeleteSelected('<?% gettext("You would delete follow channels?") %?>','<?% gettext("Nothing selected!") %?>','cdelete',document.clist,620,670)"><?% gettext("Delete channels",20) %?></a><br />
+        <a href="javascript:DoitReally('<?% gettext("Would you like to delete these channels?") %?>','<?% gettext("Nothing selected!") %?>','cdelete',document.clist,620,670,'delete')"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:DoitReally('<?% gettext("Would you like to delete these channels?") %?>','<?% gettext("Nothing selected!") %?>','cdelete',document.clist,620,670,'delete')"><?% gettext("Delete channels",20) %?></a><br />
 <?% END %?>
     </td>
     </tr>
diff --git a/skins/stone_flat/display.tmpl b/skins/stone_flat/display.tmpl
index 14880f5..e4c804e 100644
--- a/skins/stone_flat/display.tmpl
+++ b/skins/stone_flat/display.tmpl
@@ -86,7 +86,7 @@ END %?>
 			    <td>
              <div class="description" style="white-space: nowrap">    
                 <?% IF allow('switch') %?>
-                <a href="javascript:post('switch','<?% channel %?>')">
+                <a href="javascript:post('switch','<?% channelid %?>')">
                     <img src="images/watch.<?% global.imagetyp %?>" alt="" title="<?% gettext("Switch") %?>" /></a>&nbsp;
          	      <?% END %?>
                 <?% IF allow('livestream') %?>
diff --git a/skins/stone_flat/movetimerlist.tmpl b/skins/stone_flat/movetimerlist.tmpl
index 703793a..7a988f3 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) %?> - <?% escape(destination) %?>','movetimerdelete','<?% id %?>',620,670)">
+                        <a href="javascript:surecmd('<?% gettext("Would you like to 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 %?>
@@ -121,8 +121,8 @@
     <tr>
     <td class="sidetext">
 <?% 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 />
+        <a href="javascript:DoitReally('<?% gettext("Would you like to delete these rules?") %?>','<?% gettext("Nothing selected!") %?>','movetimerdelete',document.movetimerlist,620,670,'delete')"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:DoitReally('<?% gettext("Would you like to delete these rules?") %?>','<?% gettext("Nothing selected!") %?>','movetimerdelete',document.movetimerlist,620,670,'delete')"><?% gettext("Delete rules to move timer",20) %?></a><br />
 <?% END %?>
     </td>
     </tr>
diff --git a/skins/stone_flat/rdisplay.tmpl b/skins/stone_flat/rdisplay.tmpl
index f99f439..7a2e323 100644
--- a/skins/stone_flat/rdisplay.tmpl
+++ b/skins/stone_flat/rdisplay.tmpl
@@ -92,7 +92,7 @@
             </a>
     <?% END %?>
     <?% IF allow('rdelete') %?>
-            <a href="javascript:sure('<?% gettext("Do you want to delete the following recordings?") %?>','<?% escape(title) %?><?% IF subtitle.length > 0 %?>~<?% escape(subtitle) %?><?% END %?>','rdelete','<?% id %?>')">
+            <a href="javascript:sure('<?% gettext("Would you like to delete this recording?") %?>','<?% escape(title) %?><?% IF subtitle.length > 0 %?>~<?% escape(subtitle) %?><?% END %?>','rdelete','<?% id %?>')">
                 <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete recording") %?>" />
             </a>
     <?% END %?>
diff --git a/skins/stone_flat/rlist.tmpl b/skins/stone_flat/rlist.tmpl
index 6004fc5..2d9922a 100644
--- a/skins/stone_flat/rlist.tmpl
+++ b/skins/stone_flat/rlist.tmpl
@@ -96,7 +96,7 @@
             </a>
     <?% END %?>
     <?% IF allow('rdelete') %?>
-            <a href="javascript:surecmd('<?% gettext("Do you want to delete the following recordings?") %?>','<?% escape(fulltitle) %?>','rdelete','<?% id %?>',620,670)">
+            <a href="javascript:surecmd('<?% gettext("Would you like to delete this recording?") %?>','<?% escape(fulltitle) %?>','rdelete','<?% id %?>',620,670)">
                 <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete recording") %?>" />
             </a>
     <?% END %?>
@@ -228,8 +228,8 @@
 <?% IF allow('rrecover') %?>
     <tr>
     <td class="sidetext">
-      <a title="<?% gettext("Recover deleted recordings") %?>" href="javascript:popup('rrecover',620,670,1)"><img src="images/recover.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
-      <a title="<?% gettext("Recover deleted recordings") %?>" href="javascript:popup('rrecover',620,670,1)"><?% gettext("Recover deleted recordings",20) %?></a>
+      <a title="<?% gettext("Recover deleted recordings") %?>" href="javascript:popupcmd('rrecover',620,670,1)"><img src="images/recover.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+      <a title="<?% gettext("Recover deleted recordings") %?>" href="javascript:popupcmd('rrecover',620,670,1)"><?% gettext("Recover deleted recordings",20) %?></a>
     </td>
     </tr>
 <?% END %?>
@@ -305,8 +305,8 @@
     <tr>
     <td class="sidetext">
 <?% IF allow('rdelete') %?>
-        <a href="javascript:DeleteSelected('<?% gettext("Do you want to delete the following recordings?") %?>','<?% gettext("Nothing selected!") %?>','rdelete',document.rlist,620,670)"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
-        <a href="javascript:DeleteSelected('<?% gettext("Do you want to delete the following recordings?") %?>','<?% gettext("Nothing selected!") %?>','rdelete',document.rlist,620,670)"><?% gettext("Delete recordings",20) %?></a><br />
+        <a href="javascript:DoitReally('<?% gettext("Would you like to delete these recordings?") %?>','<?% gettext("Nothing selected!") %?>','rdelete',document.rlist,620,670,'delete')"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:DoitReally('<?% gettext("Would you like to delete these recordings?") %?>','<?% gettext("Nothing selected!") %?>','rdelete',document.rlist,620,670,'delete')"><?% gettext("Delete recordings",20) %?></a><br />
 <?% END %?>
     </td>
     </tr>
diff --git a/skins/stone_flat/search.tmpl b/skins/stone_flat/search.tmpl
index 6d8685f..4757b9b 100644
--- a/skins/stone_flat/search.tmpl
+++ b/skins/stone_flat/search.tmpl
@@ -2,6 +2,8 @@
 <?% USE date %?>
 <body class="frame">
 <div id="body">
+<?% enableform = ( allow('tnew') ) && data.size > 1 %?>
+<?% activeform = 0 %?>
 <?% ######################################################################## %?>
 <?% BLOCK RowButtons %?>
                         <a href="?cmd=search&amp;data=<?% url( title ) %?>">
@@ -45,6 +47,11 @@
                   <?% IF subtitle.length > 0 %?><font class="subtitle<?% IF state != "";" ";state;END %?>">&nbsp;-&nbsp;<?% chop(subtitle,55) %?></font><?% END %?>
 				  </a>
             </td>
+            <td valign="middle" align="left" style="white-space: nowrap">
+                <?% IF enableform && !param.timers.exists(id); activeform = 1 %?>
+          			<input class="push" type="checkbox" value="<?% id %?>" name="<?% title %?><?% IF subtitle != "";"~";subtitle;END %?>" />
+	              <?% END %?>
+            </td>
             <td class="fieldinline<?% IF state != "";" ";state;END %?>" style="white-space: nowrap; text-align: right;">                        
             <?% IF pdc && pdc != start %?> (<?% gettext("PDC") %?>:<?% pdc %?>) <?% END %?>
             <?% start %?>&nbsp;-&nbsp;<?% stop %?>
@@ -57,7 +64,7 @@
         <?% IF global.hideDescription != 1  && description.length > 0 %?>
         <tr<?% ' class="two"' IF z mod 2 == 0 %?>>
             <td class="fieldinline" >&nbsp;</td>
-            <td class="fieldinline" colspan="4">
+            <td class="fieldinline" colspan="5">
                   <a href="javascript:popup('display','<?% id %?>',620,670,0)" class="fieldinline">
                   <font class="description<?% IF state != "";" ";state;END %?>"><?% chop(description,100,1) %?></font>
 				  </a>
@@ -69,6 +76,7 @@
 <h1><?% gettext("Search text") %?> : <?% cgi.param('data') %?></h1>
 <?% IF data.size > 1 %?>
 <?% fields = data.shift %?>
+<form name="searchlist" action="">
     <?% FOREACH zeile = data %?>
         <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
         <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;start=zeile.5;stop=zeile.6;description=zeile.8;pdc=zeile.9 %?>
@@ -98,6 +106,7 @@
         </tr>
     <tr><td class="largebottom"></td></tr>
 </table> 
+</form>
 <?% END %?>
 </div>
 <!-- ###### Seite ###### -->
@@ -147,6 +156,30 @@
     <td class="sidebottom"></td>
     </tr>
   </table>
+<?% IF activeform %?>
+  <table summary="">
+    <tr><td class="sidehead"><?% gettext("To record") %?></td></tr>
+    <tr>
+    <td class="sidetext">
+        <a href="javascript:selAll(document.searchlist,1)"><img src="images/select.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:selAll(document.searchlist,1)"><?% gettext("Select all",20) %?></a><br />
+        <a href="javascript:selAll(document.searchlist,0)"><img src="images/deselect.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:selAll(document.searchlist,0)"><?% gettext("Unselect all",20) %?></a><br />
+        <a href="javascript:reverse(document.searchlist)"><img src="images/invers.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:reverse(document.searchlist)"><?% gettext("Reverse select",20) %?></a>
+    </td>
+    </tr>
+    <tr>
+    <td class="sidetext">
+        <a href="javascript:DoitReally('<?% gettext("Would you like to record these events?") %?>','<?% gettext("Nothing selected!") %?>','tnew&__fast=1',document.searchlist,620,670,'record')"><img src="images/record.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:DoitReally('<?% gettext("Would you like to record these events?") %?>','<?% gettext("Nothing selected!") %?>','tnew&__fast=1',document.searchlist,620,670,'record')"><?% gettext("Record selected events",20) %?></a><br />
+    </td>
+    </tr>
+    <tr>
+    <td class="sidebottom"></td>
+    </tr>
+  </table>
+<?% END %?>
   <p id="sidefooter">&nbsp;</p>
 </div>
 <?% INCLUDE header.inc %?>
diff --git a/skins/stone_flat/tlist.tmpl b/skins/stone_flat/tlist.tmpl
index c034bad..4f591c5 100644
--- a/skins/stone_flat/tlist.tmpl
+++ b/skins/stone_flat/tlist.tmpl
@@ -21,7 +21,7 @@
     min  = total div 60 mod 60;
     hour = total div 3600;
 %?>
-<?% IF hour > 0 %?><?% hour FILTER format('%02d') %?>:<?% END %?><?% min FILTER format('%02d') %?>
+<?% hour FILTER format('%02d') %?>:<?% min FILTER format('%02d') %?>
 <?% END %?>
 </p>
 <?% END %?>
@@ -57,7 +57,7 @@
                         </a>
 			<?% END %?>
 			<?% IF allow('tdelete') %?>
-                        <a href="javascript:surecmd('<?% gettext("Would You like to delete the following timer(s)?") %?>','<?% escape(title) %?><?% IF subtitle != "";"~";escape(subtitle);END %?>','tdelete','<?% id %?>',620,670)">
+                        <a href="javascript:surecmd('<?% gettext("Would you like to delete this timer?") %?>','<?% escape(title) %?><?% IF subtitle != "";"~";escape(subtitle);END %?>','tdelete','<?% id %?>',620,670)">
                             <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete timer") %?>" />
                         </a>
 			<?% END %?>
@@ -242,8 +242,8 @@
         <a href="javascript:selToggle('<?% gettext("Nothing selected!") %?>',document.tlist)"><?% gettext("Toggle timer",20) %?></a><br />
 <?% END %?>
 <?% IF allow('tdelete') %?>
-        <a href="javascript:DeleteSelected('<?% gettext("Would You like to delete the following timer(s)?") %?>','<?% gettext("Nothing selected!") %?>','tdelete',document.tlist,620,670)"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
-        <a href="javascript:DeleteSelected('<?% gettext("Would You like to delete the following timer(s)?") %?>','<?% gettext("Nothing selected!") %?>','tdelete',document.tlist,620,670)"><?% gettext("Delete timer",20) %?></a><br />
+        <a href="javascript:DoitReally('<?% gettext("Would you like to delete these timers?") %?>','<?% gettext("Nothing selected!") %?>','tdelete',document.tlist,620,670,'delete')"><img src="images/delete.<?% global.imagetyp %?>" alt="" /></a>&nbsp;
+        <a href="javascript:DoitReally('<?% gettext("Would you like to delete these timers?") %?>','<?% gettext("Nothing selected!") %?>','tdelete',document.tlist,620,670,'delete')"><?% gettext("Delete timer",20) %?></a><br />
 <?% END %?>
     </td>
     </tr>
diff --git a/skins/stone_flat/ulist.tmpl b/skins/stone_flat/ulist.tmpl
index 21d2f96..4d82cc0 100644
--- a/skins/stone_flat/ulist.tmpl
+++ b/skins/stone_flat/ulist.tmpl
@@ -9,7 +9,7 @@
                         </a>
 <?% END %?>
 <?% IF allow('udelete') %?>
-                        <a href="javascript:sureandreload('<?% gettext("Do you really want to delete this user account?") %?>','<?% escape(user) %?>','udelete','<?% id %?>')">
+                        <a href="javascript:sureandreload('<?% gettext("Would you like to delete this account?") %?>','<?% escape(user) %?>','udelete','<?% id %?>')">
                             <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete user account") %?>" />
                         </a>
 <?% END %?>
diff --git a/skins/xstyle/alist.tmpl b/skins/xstyle/alist.tmpl
index a42a95f..616c48f 100644
--- a/skins/xstyle/alist.tmpl
+++ b/skins/xstyle/alist.tmpl
@@ -52,7 +52,7 @@
                     <?% END %?>
                     <?% IF allow('adelete') %?>
                     <a title="<?% gettext("Delete autotimer")  %?>"
-                       href="javascript:sure(document.Autotimer, '<?% gettext("You will delete this autotimer") %?> : <?% escape(zeile.2) %?>','?cmd=adelete&amp;data=<?% zeile.0 %?>')">
+                       href="javascript:sure(document.Autotimer, '<?% gettext("Would you like to delete this autotimer?") %?>\n<?% escape(zeile.2) %?>','?cmd=adelete&amp;data=<?% zeile.0 %?>')">
                     <img src="images/delete.png">
                     </a>
                     <?% END %?>
diff --git a/skins/xstyle/clist.tmpl b/skins/xstyle/clist.tmpl
index f00e575..cf6c5c2 100644
--- a/skins/xstyle/clist.tmpl
+++ b/skins/xstyle/clist.tmpl
@@ -37,7 +37,7 @@
 <a href="?cmd=cedit&amp;data=<?% id %?>" title="<?% gettext("Edit channel") %?>"><img src="images/edit.png"></a>
 <?%- END -%?>
 <?%- IF allow('cdelete') -%?>
-<a href="javascript:sure(document.KanalListe, '<?% gettext("You will delete this channel") %?> : \'<?% escape(name) %?>\' ?','?cmd=cdelete&amp;data=<?% POS %?>')"
+<a href="javascript:sure(document.KanalListe, '<?% gettext("Would you like to delete this channel?") %?>\n\'<?% escape(name) %?>\' ?','?cmd=cdelete&amp;data=<?% POS %?>')"
    title="<?% gettext("Delete channel") %?>" ><img src="images/delete.png"></a>
 </div>
 <?%- END -%?>
diff --git a/skins/xstyle/help.tmpl b/skins/xstyle/help.tmpl
index 64e662d..0a4cd35 100644
--- a/skins/xstyle/help.tmpl
+++ b/skins/xstyle/help.tmpl
@@ -90,7 +90,7 @@ var myBar = new WebFXMenuBar;
     <?% 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));
+    myBar.add(new WebFXMenuButton("<?% gettext("Media content") %?>",null,null,media));
 
 
     var tools = new WebFXMenu;
diff --git a/skins/xstyle/javascript/global.js b/skins/xstyle/javascript/global.js
index 9d69317..87f8741 100644
--- a/skins/xstyle/javascript/global.js
+++ b/skins/xstyle/javascript/global.js
@@ -172,11 +172,12 @@ function checkValue (valobj, msgname, cmd, wrongMsg, goodMsg) {
 
 function suche(question, urls, def, last) {
     var sstring = prompt(question, def);
+    if(!sstring || sstring.length <= 0 ) {
+      return
+    }
     if(! urls)
         urls    = "?cmd=search&data=";
-    if(sstring) {
-        var url =  urls + sstring;
-    }
+    var url =  urls + sstring;
     if(last) {
         url = url + last;
     }
diff --git a/skins/xstyle/movetimerlist.tmpl b/skins/xstyle/movetimerlist.tmpl
index acf2044..63f361f 100644
--- a/skins/xstyle/movetimerlist.tmpl
+++ b/skins/xstyle/movetimerlist.tmpl
@@ -9,7 +9,7 @@
                         </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") %?>">
+                        <a href="javascript:sure(document.movetimerlist, '<?% gettext("Would you like to 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 %?>
@@ -61,7 +61,7 @@
   <?% END %?>
   <?% IF allow('movetimerdelete') %?>
     <li><a title="<?% gettext("Delete rules to move timer") %?>"
-          href="#" onClick="Delete('<?% gettext("You would delete follow rules?") %?>','<?% gettext("Nothing selected!") %?>','movetimerdelete',document.movetimerlist)">
+          href="#" onClick="Delete('<?% gettext("Would you like to delete these rules?") %?>','<?% gettext("Nothing selected!") %?>','movetimerdelete',document.movetimerlist)">
         <?% gettext("Delete rules to move timer",25) %?></a>
      </li>
   <?% END %?>
diff --git a/skins/xstyle/rdisplay.tmpl b/skins/xstyle/rdisplay.tmpl
index f450217..e5223ca 100644
--- a/skins/xstyle/rdisplay.tmpl
+++ b/skins/xstyle/rdisplay.tmpl
@@ -70,7 +70,7 @@
 <ul id="navlist">
     <li><a href="?cmd=rlist"><?% gettext("Recording list") %?></a></li>
 <?% IF allow('rdelete') %?>
-    <li><a href="javascript:sure(document.RecordDisplay, '<?% gettext("Do you really want to delete these recordings?") %?>?','?cmd=rdelete&amp;data=<?% data.RecordId %?>')">
+    <li><a href="#" onclick="sure(document.RecordDisplay, '<?% gettext("Would you like to delete this recording?") %?>?','?cmd=rdelete&amp;data=<?% data.RecordId %?>')">
     <?% gettext("Delete recording") %?>
     </a></li>
 <?% END %?>
diff --git a/skins/xstyle/rlist.tmpl b/skins/xstyle/rlist.tmpl
index a889a12..90d6fec 100644
--- a/skins/xstyle/rlist.tmpl
+++ b/skins/xstyle/rlist.tmpl
@@ -126,7 +126,7 @@
 <ul id="navlist">
     <li><a href="?cmd=rupdate"><?% gettext("Update recordings") %?></a></li>
     <?% IF allow('rdelete') %?>
-    <li><a href="#" onClick="Delete('<?% gettext("Do you want to delete the following recordings?") %?>',
+    <li><a href="#" onClick="Delete('<?% gettext("Would you like to delete these recordings?") %?>',
     '<?% gettext("Nothing selected!") %?>','rdelete',document.rlist)">
     <?% gettext("Delete recordings") %?></a></li>
     <?% END %?>
diff --git a/skins/xstyle/tlist.tmpl b/skins/xstyle/tlist.tmpl
index c2e499b..e4865c6 100644
--- a/skins/xstyle/tlist.tmpl
+++ b/skins/xstyle/tlist.tmpl
@@ -22,7 +22,7 @@
     <li><a href="#" onClick="Toggle('<?% gettext("Nothing selected!") %?>',document.TimerList)"><?% gettext("Toggle timer") %?></a></li>
 <?% END %?>
 <?% IF allow('tdelete') %?>
-    <li><a href="#" onClick="Delete('<?% gettext("Would You like to delete the following timer(s)?") %?>','<?% gettext("Nothing selected!") %?>','tdelete',document.TimerList)"><?% gettext("Delete timer") %?></a></li>
+    <li><a href="#" onClick="Delete('<?% gettext("Would you like to delete these timers?") %?>','<?% gettext("Nothing selected!") %?>','tdelete',document.TimerList)"><?% gettext("Delete timer") %?></a></li>
 <?% END %?>
     <li><a href="#" onClick="suche('<?% gettext("Search text") %?>', '?cmd=tsearch&data=')"><?% gettext("Search for timers") %?></a></li>
 </ul>
@@ -74,7 +74,7 @@
 <!--
                         <a href="?cmd=search&amp;data=<?% url( zeile.7.split('~').last ) %?>" title="<?% gettext("Search for repeats") %?>"><img src="images/repeat.png"></a><br/>
     <?% IF allow('tdelete') %?>
-                        <a href="javascript:sure(document.TimerList, '<?% gettext("Would You like to delete the following timer(s)?") %?> : <?% escape(zeile.7.split('~').first)  %?>','?cmd=tdelete&amp;data=<?% zeile.0 %?>')" title="<?% gettext("Would You like to delete the following timer(s)?") %?>"><img src="images/delete.png"></a><br/>
+                        <a href="javascript:sure(document.TimerList, '<?% gettext("Would you like to delete this timer?") %?> : <?% escape(zeile.7.split('~').first)  %?>','?cmd=tdelete&amp;data=<?% zeile.0 %?>')" title="<?% gettext("Would you like to delete this timer?") %?>"><img src="images/delete.png"></a><br/>
     <?% END %?>
 -->
                         </div>
diff --git a/skins/xstyle/ulist.tmpl b/skins/xstyle/ulist.tmpl
index f5faf60..8f636f8 100644
--- a/skins/xstyle/ulist.tmpl
+++ b/skins/xstyle/ulist.tmpl
@@ -30,7 +30,7 @@
                     <a title="<?% gettext("Edit account of user") %?>" href="?cmd=uedit&amp;data=<?% zeile.0 %?>">
                         <img src='images/edit.png'></a>&nbsp;
                     <a title="<?% gettext("Delete user account") %?>"
-                       href="javascript:sure(document.UserList, '<?% gettext("Do you really want to delete this user account?") %?>: <?% escape(zeile.1) %?>','?cmd=udelete&amp;data=<?% zeile.0 %?>')">
+                       href="#" onclick="sure(document.UserList, '<?% gettext("Would you like to delete this user account?") %?>: <?% escape(zeile.1) %?>','?cmd=udelete&amp;data=<?% zeile.0 %?>')">
                     <img src='images/delete.png'>
                     </a>
                 </td>
-- 
cgit v1.2.3