Various stuff, I'm in a hurry

8 files changed, 502 insertions, 400 deletions

diff --git a/README b/README
index bfccfc0..6a8a9f3 100644
--- a/README
+++ b/README
@@ -3,6 +3,7 @@ This is a "plugin" for the Video Disk Recorder (VDR).
 Written by:                  Thomas Keil <tkeil@datacrystal.de>
                              Sascha Volkenandt <sascha@akv-soft.de>
 			     Dieter Hametner <dh+vdr@gekrumbel.de>
+			     Christian Wieninger <cwieniger@gmx.de>
 
 Project's homepage:          URL
 
diff --git a/css/styles.css b/css/styles.css
index 82919b5..c6630f0 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -261,6 +261,37 @@ button.smallbutton {
 	cursor: pointer;
 }
 
+button.green {
+	width: 100px;
+	height: 20px;
+	background-color: inherit;
+	background-image: url(button_green.png);
+	background-repeat: no-repeat;
+	color: #FFFFFF;
+	font-size: 12px;
+	border: 0px;
+	vertical-align: middle;
+	text-align: center;
+	cursor: pointer;
+	padding-bottom: 3px;
+}
+
+button.red {
+	width: 100px;
+	height: 20px;
+	background-color: inherit;
+	background-image: url(button_red.png);
+	background-repeat: no-repeat;
+	color: #FFFFFF;
+	font-size: 11px;
+	border: 0px;
+	vertical-align: middle;
+	text-align: center;
+	cursor: pointer;
+	padding-bottom: 3px;
+}
+
+
 table td.buttonpanel {
 	text-align: right;
 }
@@ -626,12 +657,18 @@ table.edit tr td {
 
 table.edit tr td.label {
 	font-weight: bold;
+	vertical-align: top;
 }
 
 table.edit tr.active {
 	background: #DEE6EE;
 }
 
+table.edit td.blank {
+	background: none;
+	border: none;
+}
+
 
 /*
   ##############################
diff --git a/images/Makefile b/images/Makefile
index 05f3f7d..fb0f8f7 100644
--- a/images/Makefile
+++ b/images/Makefile
@@ -21,7 +21,8 @@ OBJS	= logo.o record.o active.o inactive.o button_blue.o	\
 	  bg_box_l.o bg_box_r.o movie.o menu_line_bg.o		\
 	  bg_line.o bg_tools.o zap.o favicon.o bg_line_top.o	\
 	  reload.o stop.o one_uparrow.o one_downarrow.o tv.o	\
-	  remotecontrol.o search.o record_timer.o
+	  remotecontrol.o search.o record_timer.o button_red.o \
+	  button_green.o
 
 ### Default rules:
 
diff --git a/images/button_green.png b/images/button_green.png
index fe5be5d..45074cf 100644
--- a/images/button_green.png
+++ b/images/button_green.png
diff --git a/images/button_red.png b/images/button_red.png
index a73adc3..cfe76b3 100644
--- a/images/button_red.png
+++ b/images/button_red.png
diff --git a/pages/edit_searchtimer.ecpp b/pages/edit_searchtimer.ecpp
index d4c3dd4..6476ee1 100644
--- a/pages/edit_searchtimer.ecpp
+++ b/pages/edit_searchtimer.ecpp
@@ -312,92 +312,104 @@ Blacklists blacklists;
 
 		function initform()
 		{
-            changedsearchmode(document.getElementById("search_mode"));
-            changedchannelmode(document.getElementById("channel_mode"));
-            changedusetime(document.getElementById("usetime"));
-            changeduseduration(document.getElementById("useduration"));
-            changeduseweekday(document.getElementById("useweekday"));
-            changeduseassearchtimer(document.getElementById("useassearchtimer"));
-            changeduseextepginfo(document.getElementById("useextepginfo"));
-            changedavoidrepeats(document.getElementById("avoidrepeats"));
-            changedblacklistmode(document.getElementById("blacklistmode"));
+			changedsearchmode(document.getElementById("search_mode"));
+			changedchannelmode(document.getElementById("channel_mode"));
+			changedusetime(document.getElementById("usetime"));
+			changeduseduration(document.getElementById("useduration"));
+			changeduseweekday(document.getElementById("useweekday"));
+			changeduseassearchtimer(document.getElementById("useassearchtimer"));
+			changeduseextepginfo(document.getElementById("useextepginfo"));
+			changedavoidrepeats(document.getElementById("avoidrepeats"));
+			changedblacklistmode(document.getElementById("blacklistmode"));
+		}
+
+		function changedsearchmode(selection)
+		{
+			document.getElementById("tolerance").style.display = (selection.options[selection.selectedIndex].value == 5 ? "block" : "none");
+		}
+
+		function changedchannelmode(selection)
+		{
+			document.getElementById("channelinterval").style.display = (selection.options[selection.selectedIndex].value == 1 ? "block" : "none");
+			document.getElementById("channelgroup").style.display = (selection.options[selection.selectedIndex].value == 2 ? "block" : "none");
+		}
+
+		function changedusetime(selection)
+		{
+			document.getElementById("timesettings").style.display = (selection.checked ? "block" : "none");
+		}
+
+		function changeduseduration(selection)
+		{
+			document.getElementById("durationsettings").style.display = (selection.checked ? "block" : "none");
+		}
+
+		function changeduseweekday(selection)
+		{
+			document.getElementById("weekdaysettings").style.display = (selection.checked ? "block" : "none");
+		}
+
+		function changeduseassearchtimer(selection)
+		{
+			document.getElementById("searchtimermodesettings").style.display = (selection.checked ? "block" : "none");
+			changedsearchtimermode(document.getElementById("searchtimer_mode"));
+		}
+
+		function changedsearchtimermode(selection)
+		{
+		document.getElementById("searchtimermode1settings").style.display = 
+			(selection.options[selection.selectedIndex].value == 0 &
+			document.getElementById("useassearchtimer").checked ? "block" : "none");
+		document.getElementById("searchtimermode3settings").style.display = 
+			(selection.options[selection.selectedIndex].value == 2 &
+			document.getElementById("useassearchtimer").checked ? "block" : "none");
+		}
+
+		function changeduseextepginfo(selection)
+		{
+			document.getElementById("use_extepg_settings").style.display = (selection.checked ? "block" : "none");
+		}
+
+		function changedextepginfo(selection)
+		{
+			var i; 
+			document.getElementById(selection.name + "_value").value = "";
+			for(i=0;i<selection.length;i++) 
+			{ 
+				if (selection.options[i].selected)
+				{
+				if (document.getElementById(selection.name + "_value").value != "")
+					document.getElementById(selection.name + "_value").value += ",";
+				document.getElementById(selection.name + "_value").value += selection.options[i].value; 
+				}
+			}
+		}
+
+		function changedavoidrepeats(selection)
+		{
+			document.getElementById("avoidrepeatssettings").style.display = (selection.checked ? "block" : "none");
+		}
+
+		function changedblacklistmode(selection)
+		{
+			document.getElementById("blacklistmodesettings").style.display = 
+				(selection.options[selection.selectedIndex].value == 1 ? "block" : "none");
+		}
+
+		function changedblacklistsel(selection)
+		{
+			var i; 
+			document.getElementById("blacklistids_internal").value = "";
+			for(i=0;i<selection.length;i++) 
+			{ 
+				if (selection.options[i].selected)
+				{
+				if (document.getElementById("blacklistids_internal").value != "")
+					document.getElementById("blacklistids_internal").value += "|";
+				document.getElementById("blacklistids_internal").value += selection.options[i].value; 
+				}
+			}
 		}
-        function changedsearchmode(selection)
-        {
-            document.getElementById("tolerance").style.display = (selection.options[selection.selectedIndex].value == 5 ? "block" : "none");
-        }
-        function changedchannelmode(selection)
-        {
-            document.getElementById("channelinterval").style.display = (selection.options[selection.selectedIndex].value == 1 ? "block" : "none");
-            document.getElementById("channelgroup").style.display = (selection.options[selection.selectedIndex].value == 2 ? "block" : "none");
-        }
-        function changedusetime(selection)
-        {
-            document.getElementById("timesettings").style.display = (selection.checked ? "block" : "none");
-        }
-        function changeduseduration(selection)
-        {
-            document.getElementById("durationsettings").style.display = (selection.checked ? "block" : "none");
-        }
-        function changeduseweekday(selection)
-        {
-            document.getElementById("weekdaysettings").style.display = (selection.checked ? "block" : "none");
-        }
-        function changeduseassearchtimer(selection)
-        {
-            document.getElementById("searchtimermodesettings").style.display = (selection.checked ? "block" : "none");
-            changedsearchtimermode(document.getElementById("searchtimer_mode"));
-        }
-        function changedsearchtimermode(selection)
-        {
-            document.getElementById("searchtimermode1settings").style.display = 
-                (selection.options[selection.selectedIndex].value == 0 &
-                 document.getElementById("useassearchtimer").checked ? "block" : "none");
-            document.getElementById("searchtimermode3settings").style.display = 
-                (selection.options[selection.selectedIndex].value == 2 &
-                 document.getElementById("useassearchtimer").checked ? "block" : "none");
-        }
-        function changeduseextepginfo(selection)
-        {
-            document.getElementById("use_extepg_settings").style.display = (selection.checked ? "block" : "none");
-        }
-        function changedextepginfo(selection)
-        {
-            var i; 
-            document.getElementById(selection.name + "_value").value = "";
-            for(i=0;i<selection.length;i++) 
-            { 
-                if (selection.options[i].selected)
-                {
-                    if (document.getElementById(selection.name + "_value").value != "")
-                        document.getElementById(selection.name + "_value").value += ",";
-                    document.getElementById(selection.name + "_value").value += selection.options[i].value; 
-                }
-            }
-        }
-        function changedavoidrepeats(selection)
-        {
-            document.getElementById("avoidrepeatssettings").style.display = (selection.checked ? "block" : "none");
-        }
-        function changedblacklistmode(selection)
-        {
-            document.getElementById("blacklistmodesettings").style.display = 
-                (selection.options[selection.selectedIndex].value == 1 ? "block" : "none");
-        }
-        function changedblacklistsel(selection)
-        {
-            var i; 
-            document.getElementById("blacklistids_internal").value = "";
-            for(i=0;i<selection.length;i++) 
-            { 
-                if (selection.options[i].selected)
-                {
-                    if (document.getElementById("blacklistids_internal").value != "")
-                        document.getElementById("blacklistids_internal").value += "|";
-                    document.getElementById("blacklistids_internal").value += selection.options[i].value; 
-                }
-            }
-        }      
 		//--></script>
 
 		<title>VDR Live - <$ searchtimer ? tr("Edit search timer") : tr("New search timer") $></title>
@@ -408,321 +420,369 @@ Blacklists blacklists;
 			<& pageelems.logo &>
 			<& menu active=("searchtimers") component=("edit_searchtimer.header") &>
 		</div>
-	<div class="right_area">
-		<div class="inhalt">
-			<form method="POST" name="edit_searchtimer" action="edit_searchtimer.ecpp">
-				<input type="hidden" name="searchtimerid" value="<$ searchtimerid $>"/>
-				<input type="hidden" name="blacklistids_internal" value="<$ blacklistids_internal $>" id="blacklistids_internal"/>
-				<table class="edit" cellpadding="0" cellspacing="0">
-
-                    <!-- Search term -->
-					<tr class="active">
-						<td class="label"><$ tr("Search term") $>:</td>
-						<td><input type="text" name="search" value="<$ search $>" size="90" /></td>
-					</tr>
-
-                    <!-- Search mode -->
- 					<tr>
-                        <td class="label"><$ tr("Search mode" ) $>:</td>   
-                        <td><div style="float:left; max-width:50%; margin-right:20px">
-                            <select onchange="changedsearchmode(this)" name="mode" size="1" id="search_mode">
-                              <option value="0" <{ SELECTIF(mode == 0) }> ><$ tr("phrase") $></option>
-                              <option value="1" <{ SELECTIF(mode == 1) }> ><$ tr("all words") $></option>
-                              <option value="2" <{ SELECTIF(mode == 2) }> ><$ tr("at least one word") $></option>
-                              <option value="3" <{ SELECTIF(mode == 3) }> ><$ tr("match exactly") $></option>
-                              <option value="4" <{ SELECTIF(mode == 4) }> ><$ tr("regular expression") $></option>
-                              <option value="5" <{ SELECTIF(mode == 5) }> ><$ tr("fuzzy") $></option>                            
-                            </select></div>
-                            <div id="tolerance" style="display: none">
-                                <$ tr("Tolerance" ) $>:
-                                <input type="text" name="tolerance" size="2" value="<$ tolerance $>" />
-                            </div>
-                        </td>
-                    </tr>                    
-
-                    <!-- Match case -->
-	                <tr class="active">
-						<td class="label"><$ tr("Match case") $>:</td>
-	    				<td><input type="checkbox" name="matchcase" value="1" <{ CHECKIF(matchcase) }> id="matchcase"/></td>
-                    </tr>   
-
-                    <!-- Search in -->                 
-					<tr>
-                        <td class="label"><$ tr("Search in") $>:</td>
-                        <td>
-                            <input type="checkbox" name="usetitle" value="1" <{ CHECKIF(usetitle) }> />
-                                <label for="usetitle"><$ tr("Title") $> </label>
-                            <input type="checkbox" name="usesubtitle" value="1" <{ CHECKIF(usesubtitle) }> />
-                                <label for="usesubtitle"><$ tr("Episode") $> </label>
-                            <input type="checkbox" name="usedescr" value="1" <{ CHECKIF(usedescr) }> />
-                                <label for="usedescr"><$ tr("Description") $> </label>
-                        </td>
-					</tr>
-
-%                   if (extEPGInfos.size() > 0) {
-                    <!-- Use ext. EPG categories -->
- 					<tr class="active">
-                        <td class="label"><$ tr("Use extended EPG info" ) $>:</td>   
-                        <td><input type="checkbox" name="useextepginfo" value="1" <{ CHECKIF(useextepginfo) }> 
-                                onclick="changeduseextepginfo(this)" id="useextepginfo"/>
-                            <div id="use_extepg_settings" style="display: none">
-                                <table border="0" cellspacing="0" cellpadding="0">
-%                               int i=0; for (ExtEPGInfos::iterator extinfo = extEPGInfos.begin(); extinfo != extEPGInfos.end(); ++extinfo, i++) {                                     
-                                        <tr valign="top">
-                                            <td align="left" valign="top"><$ extinfo->Name() $></td>
-                                            <td align="left" valign="top"><input type="text" name="extepgvalues" value="<$extepgvalues[i]$>" size="10" id="extepg_<{ reply.out() << extinfo->Id(); }>_value"/></td>
-%                                       if (extinfo->Values().size() > 0) {  
-                                            <td><select size="3" multiple="multiple" align="left" valign="top" name="extepg_<{ reply.out() << extinfo->Id(); }>" onchange="changedextepginfo(this)">
-%                                               for (unsigned int j=0; j<extinfo->Values().size(); j++) {
-                                                <option value="<{ reply.out() << extinfo->Values()[j];}>" 
-%                                               if (extinfo->Selected(j, extepgvalues[i])) {
-                                                    selected="selected"
+		<div class="right_area">
+			<div class="inhalt">
+				<form method="POST" name="edit_searchtimer" action="edit_searchtimer.ecpp">
+					<input type="hidden" name="searchtimerid" value="<$ searchtimerid $>"/>
+					<input type="hidden" name="blacklistids_internal" value="<$ blacklistids_internal $>" id="blacklistids_internal"/>
+					<table class="edit" cellpadding="0" cellspacing="0">
+						<tr>
+							<td  class="head" colspan="4"><div class="boxheader"><div><div><$ searchtimer ? tr("Edit search timer") : tr("New search timer") $></div></div></div></td>
+						</tr>
+						
+						<!-- Search term -->
+						<tr>
+							<td class="border" style="border-left: 1px solid black"></td>
+							<td class="label"><$ tr("Search term") $>:</td>
+							<td><input type="text" name="search" value="<$ search $>" size="90" /></td>
+							<td class="border" style="border-right: 1px solid black"></td>
+						</tr>
+	
+						<!-- Search mode -->
+						<tr>
+							<td class="border" style="border-left: 1px solid black"></td>
+							<td class="label"><$ tr("Search mode" ) $>:</td>
+							<td>
+								<div style="float:left; max-width:50%; margin-right:20px">
+									<select onchange="changedsearchmode(this)" name="mode" size="1" id="search_mode">
+										<option value="0" <{ SELECTIF(mode == 0) }> ><$ tr("phrase") $></option>
+										<option value="1" <{ SELECTIF(mode == 1) }> ><$ tr("all words") $></option>
+										<option value="2" <{ SELECTIF(mode == 2) }> ><$ tr("at least one word") $></option>
+										<option value="3" <{ SELECTIF(mode == 3) }> ><$ tr("match exactly") $></option>
+										<option value="4" <{ SELECTIF(mode == 4) }> ><$ tr("regular expression") $></option>
+										<option value="5" <{ SELECTIF(mode == 5) }> ><$ tr("fuzzy") $></option>
+									</select>
+								</div>
+								<div id="tolerance" style="display: none">
+										<$ tr("Tolerance" ) $>:
+										<input type="text" name="tolerance" size="2" value="<$ tolerance $>" />
+								</div>
+							</td>
+							<td class="border" style="border-right: 1px solid black"></td>
+						</tr>
+
+						<!-- Match case -->
+						<tr>
+							<td class="border" style="border-left: 1px solid black"></td>
+							<td class="label"><$ tr("Match case") $>:</td>
+							<td><input type="checkbox" name="matchcase" value="1" <{ CHECKIF(matchcase) }> id="matchcase"/></td>
+							<td class="border" style="border-right: 1px solid black"></td>
+						</tr>
+	
+						<!-- Search in -->
+						<tr>
+							<td class="border" style="border-left: 1px solid black"></td>
+							<td class="label"><$ tr("Search in") $>:</td>
+							<td>
+								<input type="checkbox" name="usetitle" value="1" <{ CHECKIF(usetitle) }> />
+								<label for="usetitle"><$ tr("Title") $> </label>
+								
+								<input type="checkbox" name="usesubtitle" value="1" <{ CHECKIF(usesubtitle) }> />
+								<label for="usesubtitle"><$ tr("Episode") $> </label>
+								
+								<input type="checkbox" name="usedescr" value="1" <{ CHECKIF(usedescr) }> />
+								<label for="usedescr"><$ tr("Description") $> </label>
+							</td>
+							<td class="border" style="border-right: 1px solid black"></td>
+						</tr>
+
+%						if (extEPGInfos.size() > 0) {
+						<!-- Use ext. EPG categories -->
+						<tr>
+							<td class="border" style="border-left: 1px solid black"></td>
+							<td class="label"><$ tr("Use extended EPG info" ) $>:</td>
+							<td>
+								<input type="checkbox" name="useextepginfo" value="1" <{ CHECKIF(useextepginfo) }> onclick="changeduseextepginfo(this)" id="useextepginfo"/>
+								<div id="use_extepg_settings" style="display: none">
+									<table border="0" cellspacing="0" cellpadding="0">
+%										int i=0; for (ExtEPGInfos::iterator extinfo = extEPGInfos.begin(); extinfo != extEPGInfos.end(); ++extinfo, i++) {                                     
+										<tr valign="top">
+											<td align="left" valign="top"><$ extinfo->Name() $></td>
+											<td align="left" valign="top">
+												<input type="text" name="extepgvalues" value="<$extepgvalues[i]$>" size="10" id="extepg_<{ reply.out() << extinfo->Id(); }>_value"/>
+											</td>
+%											if (extinfo->Values().size() > 0) {
+											<td>
+												<select size="3" multiple="multiple" align="left" valign="top" name="extepg_<{ reply.out() << extinfo->Id(); }>" onchange="changedextepginfo(this)">
+%											for (unsigned int j=0; j<extinfo->Values().size(); j++) {
+													<option value="<{ reply.out() << extinfo->Values()[j];}>"
+%													if (extinfo->Selected(j, extepgvalues[i])) {
+																											selected="selected"
 %                                               }
-                                                > <{ reply.out() << extinfo->Values()[j]; }> </option>
+																									> <{ reply.out() << extinfo->Values()[j]; }> </option>
 %                                               }
-                                                </select>
-                                            </td>
-                                        </tr>
+												</select>
+											</td>
+										</tr>
 %                                       }
 %                                   }
-                                </table>
-                            </div>
-                        </td>   
-                    </tr>   
-%                   }
-
-
-                    <!-- Use channel -->
- 					<tr>
-                        <td class="label"><$ tr("Use channel" ) $>:</td>   
-                        <td><select onchange="changedchannelmode(this)" name="usechannel" size="1" id="channel_mode">
-                              <option value="0" <{ SELECTIF(usechannel == 0) }> ><$ tr("no") $></option>
-                              <option value="1" <{ SELECTIF(usechannel == 1) }> ><$ tr("interval") $></option>
-                              <option value="2" <{ SELECTIF(usechannel == 2) }> ><$ tr("channel group") $></option>
-                              <option value="3" <{ SELECTIF(usechannel == 3) }> ><$ tr("only FTA") $></option>
-                            </select>
-                            <div id="channelinterval" style="display: none">
-                                <$ tr("from channel" ) $>:
-                                <& channels_widget name=("channelfrom") channelid=(true) selected=(channelfrom) &>
-                                <$ tr("to channel" ) $>:
-                                <& channels_widget name=("channelto") channelid=(true) selected=(channelto) &>
-                            </div>
-                            <div id="channelgroup" style="display: none">                                        
-%                           if (channelGroups.size() > 0) {
-                                <select name="changrpsel" size="1" id="changrpsel">
-%                                   int i=0; for (ChannelGroups::iterator changrp = channelGroups.begin(); changrp != channelGroups.end(); ++changrp, i++) {                                     
-
-                                    <option value="<$ changrp->Name() $>" <{ SELECTIF(changrpsel == changrp->Name()) }> ><$ changrp->Name() $></option>
-%                                   }
-                                </select>
-%                           }
-                            </div>
-                        </td>
-                    </tr>               
-
-                    <!-- Use time -->     
-                    <tr class="active">
-                        <div style="float:left max-width:10%; margin-right:20px">
-                            <td class="label"><$ tr("Use time") $>:</td>  
-                            <td><input type="checkbox" name="usetime" value="1" <{ CHECKIF(usetime) }> 
-                                    onclick="changedusetime(this)" id="usetime" />
-                        </div>
-                        <div id="timesettings" style="display: none">
-                            <table border="0" cellpadding="0" cellspacing="0">
-								<tr>
-									<td><$ tr("Start after") $>:</td>
-									<td><input type="text" size="2" maxlength="2" name="start_h" value="<$ start_h $>" /> : <input type="text" size="2" maxlength="2" name="start_m" value="<$ start_m $>" /></td>
-								</tr>
-								<tr>
-									<td><$ tr("Start before") $>:</td>
-									<td><input type="text" size="2" maxlength="2" name="stop_h" value="<$ stop_h $>" /> : <input type="text" size="2" maxlength="2" name="stop_m" value="<$ stop_m $>" /></td>
-								</tr>
-							</table>
-                        </div>
-                    </tr>
-
-                    <!-- Use duration -->     
-                    <tr>
-                        <div style="float:left max-width:10%; margin-right:20px">
-                            <td class="label"><$ tr("Use duration") $>:</td>  
-                            <td><input type="checkbox" name="useduration" value="1" <{ CHECKIF(useduration) }>
-                                    onclick="changeduseduration(this)" id="useduration" />
-                        </div>
-                        <div id="durationsettings" style="display: none">
-                            <table border="0" cellpadding="0" cellspacing="0">
-								<tr>
-									<td><$ tr("Min. duration") $>:</td>
-									<td><input type="text" size="3" maxlength="3" name="durationmin" value="<$ durationmin $>" /> min</td>
-								</tr>
-								<tr>
-									<td><$ tr("Max. duration") $>:</td>
-									<td><input type="text" size="3" maxlength="3" name="durationmax" value="<$ durationmax $>" /> min</td>
-								</tr>
-							</table>
-                        </div>
-                    </tr>
-
-                    <!-- Use weekday -->     
-                    <tr class="active">
-                        <div style="float:left max-width:10%; margin-right:20px">
-                            <td class="label"><$ tr("Use day of week") $>:</td>  
-                            <td><input type="checkbox" name="useweekday" value="1" <{ CHECKIF(useweekday) }> 
-                                    onclick="changeduseweekday(this)" id="useweekday" />
-                        </div>
-                        <div id="weekdaysettings" style="display: none">
-							<input type="checkbox" name="wday_mon" value="1" <{ CHECKIF(wday_mon) }> /> <$ tr("Monday") $>
-							<input type="checkbox" name="wday_tue" value="1" <{ CHECKIF(wday_tue) }> /> <$ tr("Tuesday") $>
-							<input type="checkbox" name="wday_wed" value="1" <{ CHECKIF(wday_wed) }> /> <$ tr("Wednesday") $>
-							<input type="checkbox" name="wday_thu" value="1" <{ CHECKIF(wday_thu) }> /> <$ tr("Thursday") $>
-							<input type="checkbox" name="wday_fri" value="1" <{ CHECKIF(wday_fri) }> /> <$ tr("Friday") $>
-							<input type="checkbox" name="wday_sat" value="1" <{ CHECKIF(wday_sat) }> /> <$ tr("Saturday") $>
-							<input type="checkbox" name="wday_sun" value="1" <{ CHECKIF(wday_sun) }> /> <$ tr("Sunday") $>
-						</td>
-                        </div>
-                    </tr>
-
-                    <!-- Use blacklists -->
- 					<tr>
-                        <td class="label"><$ tr("Use blacklists" ) $>:</td>   
-                        <td><select onchange="changedblacklistmode(this)" name="blacklistmode" 
-                                    size="1" id="blacklistmode">
-                              <option value="0" <{ SELECTIF(blacklistmode == 0) }> ><$ tr("no") $></option>
-                              <option value="1" <{ SELECTIF(blacklistmode == 1) }> ><$ tr("Selection") $></option>
-                              <option value="2" <{ SELECTIF(blacklistmode == 2) }> ><$ tr("all") $></option>
-                            </select>
-                            <div id="blacklistmodesettings" style="display: none">
-%                           if (blacklists.size() > 0) {
-                                <select name="blacklists" multiple="multiple" size="5" onchange="changedblacklistsel(this)">
-%                                   int i=0; for (Blacklists::iterator blacklist = blacklists.begin(); blacklist != blacklists.end(); ++blacklist, i++) {                                     
-
-                                    <option value="<$ blacklist->Id() $>" <{ SELECTIF(searchtimer && searchtimer->BlacklistSelected(blacklist->Id())) }>><$ blacklist->Search() $></option>
-%                                   }
-                                </select>
-%                           }
-                            </div>
-                        </td>   
-                    </tr>               
-
-                    <!-- Use in favorites menu -->
-	                <tr class="active">
-						<td class="label"><$ tr("Use in favorites menu") $>:</td>
-	    				<td><input type="checkbox" name="useinfavorites" 
-                                   value="1" <{ CHECKIF(useinfavorites) }>/></td>
-                    </tr>   
-
-                    <!-- Use as search timer -->
- 					<tr>
-                        <td class="label"><$ tr("Use as search timer" ) $>:</td>   
-                        <td><div style="float:left; max-width:50%; margin-right:20px">
-	    				    <input type="checkbox" name="useassearchtimer" 
-                                    value="1" <{ CHECKIF(useassearchtimer) }> onclick="changeduseassearchtimer(this)" 
-                                    id="useassearchtimer"/>
-                            </div>
-                            <div id="searchtimermodesettings" style="display: none">
-                            <select onchange="changedsearchtimermode(this)" name="searchtimeraction" 
-                                    size="1" id="searchtimer_mode">
-                              <option value="0" <{ SELECTIF(searchtimeraction == 0) }> ><$ tr("Record") $></option>
-                              <option value="1" <{ SELECTIF(searchtimeraction == 1) }> ><$ tr("Announce only") $></option>
-                              <option value="2" <{ SELECTIF(searchtimeraction == 2) }> ><$ tr("Switch only") $></option>
-                            </select>
-                            </div>
-                            <div id="searchtimermode1settings" style="display: none">
-                                <table border="0" cellpadding="0" cellspacing="0">
-	    							<tr class="active">
-                                        <td><$ tr("Series recording") $>:</td>
-                	    				<td><input type="checkbox" name="seriesrecording" 
-                                             value="1" <{ CHECKIF(seriesrecording) }>/></td>
-				    				</tr>
-	    							<tr>
-                                        <td><$ tr("Directory") $>:</td>
-                	    				<td><input type="text" name="directory" value="<$ directory $>" size="70" /></td>
-				    				</tr>
-	    							<tr class="active">
-                                        <td><$ tr("Delete recordings after ... days") $>:</td>
-                	    				<td><input type="text" name="delrecafterdays" id="delrecafterdays" size="2" 
-                                                value="<$ delrecafterdays $>"/>&nbsp;&nbsp;
-                                        <$ tr("Keep ... recordings") $>:
-                	    				<input type="text" name="keeprecs" size="2" value="<$ keeprecs $>"/></td>
-				    				</tr>
-	    							<tr>
-                                        <td><$ tr("Pause when ... recordings exist") $>:</td>
-                	    				<td><input type="text" name="pauseonrecs" id="pauseonrecs" size="2" value="<$ pauseonrecs $>"/></td>
-                                    </tr>
-                 					<tr class="active">
-                                        <td><$ tr("Avoid repeats" ) $>:</td>   
-                                        <td><input type="checkbox" name="avoidrepeats" value="1" <{ CHECKIF(avoidrepeats) }> 
-                                                onclick="changedavoidrepeats(this)" id="avoidrepeats"/>
-                                    <div id="avoidrepeatssettings" style="display: none">
-                                    <table border="0" cellpadding="0" cellspacing="0">
-                                        <tr>
-        									<td><$ tr("Allowed repeats") $>:</td>
-		        							<td>
-                                            <input type="text" size="3" maxlength="3" name="allowedrepeats" value="<$ allowedrepeats $>" /> <$ tr("Only repeats within ... days") $>:<input type="text" size="3" maxlength="3" name="repeatswithindays" value="<$ repeatswithindays $>" />
-                                            </td>
-                                        </tr>
-                     					<tr>
-                                            <td><$ tr("Compare title" ) $>:</td>   
-                                            <td><input type="checkbox" name="comparetitle" value="1" <{ CHECKIF(comparetitle) }>/>
-                                        </tr>
-                     					<tr class= "active">
-                                            <td><$ tr("Compare subtitle" ) $>:</td>   
-                                            <td><input type="checkbox" name="comparesubtitle" value="1" <{ CHECKIF(comparesubtitle) }>/>
-                                        </tr>
-                 				    	<tr>
-                                            <td><$ tr("Compare summary" ) $>:</td>   
-                                            <td><input type="checkbox" name="comparesummary" value="1" <{ CHECKIF(comparesummary) }>/>
-                                        </tr>
-%                                       if (extEPGInfos.size() > 0) {
-%                                           int i=0; for (ExtEPGInfos::iterator extinfo = extEPGInfos.begin(); extinfo != extEPGInfos.end(); ++extinfo, i++) {                                     
-                                            <tr valign="top">
-                                                <td align="left" valign="top"><$ tr("Compare" ) $> <$ extinfo->Name() $>:</td>
-                                                <td><input type="checkbox" name="avoidrepeatscatselected" value="<$ i+1 $>" 
-                                                        <{ CHECKIF(avoidrepeatscatselected[i]) }>/></td>
-                                            </tr>
-%                                           }
-%                                       }
-                                    </table>
-                                    </div>
-                                    </tr>
-                                    <tr>
-                                        <td><$ tr("Priority") $>:</td>
-                	    				<td><input type="text" name="priority" size="2" value="<$ priority $>"/></td>
-                                    </tr>
-                                    <tr class="active">
-                                        <td><$ tr("Priority") $>:</td>
-                	    				<td><input type="text" name="lifetime" size="2" value="<$ lifetime $>"/></td>
-                                    </tr>
-                                    <tr>
-                                        <td><$ tr("Setup.Recording$Margin at start (min)") $>:</td>
-                	    				<td><input type="text" name="marginstart" size="2" value="<$ marginstart $>"/></td>
-                                    </tr>
-                                    <tr class="active">
-                                        <td><$ tr("Setup.Recording$Margin at stop (min)") $>:</td>
-                	    				<td><input type="text" name="marginstop" size="2" value="<$ marginstop $>"/></td>
-                                    </tr>
-                	                <tr>
-                						<td><$ tr("Use VPS") $>:</td>
-	    		                		<td><input type="checkbox" name="usevps" value="1" <{ CHECKIF(usevps) }>/></td>
-                                    </tr>   
-							    </table>
-                            </div>
-                            <div id="searchtimermode3settings" style="display: none">
-                                <table border="0" cellpadding="0" cellspacing="0">
-	    							<tr class="active">
-                                        <td><$ tr("Switch ... minutes before start") $>:</td>
-                	    				<td><input type="text" name="switchminbefore" id="switchminbefore" size="2" value="<$ switchminbefore $>"/></td>				    				</tr>
-							    </table>
-                            </div>
-                        </td>
-                    </tr>                    
-
-					<tr class="active">
-						<td class="buttonpanel" colspan="2"><button name="submit" type="submit"><$ tr("Save") $></button></td>
-					</tr>
-				</table>
-			</form>
+									</table>
+								</div>
+							</td>
+							<td class="border" style="border-right: 1px solid black"></td>
+						</tr>
+%						}
+
+
+						<!-- Use channel -->
+						<tr>
+							<td class="border" style="border-left: 1px solid black"></td>
+							<td class="label"><$ tr("Use channel" ) $>:</td>
+							<td>
+								
+								<select onchange="changedchannelmode(this)" name="usechannel" size="1" id="channel_mode">
+									<option value="0" <{ SELECTIF(usechannel == 0) }> ><$ tr("no") $></option>
+									<option value="1" <{ SELECTIF(usechannel == 1) }> ><$ tr("interval") $></option>
+									<option value="2" <{ SELECTIF(usechannel == 2) }> ><$ tr("channel group") $></option>
+									<option value="3" <{ SELECTIF(usechannel == 3) }> ><$ tr("only FTA") $></option>
+								</select>
+								
+								<div id="channelinterval" style="display: none">
+									<$ tr("from channel" ) $>:
+									<& channels_widget name=("channelfrom") channelid=(true) selected=(channelfrom) &>
+									<$ tr("to channel" ) $>:
+									<& channels_widget name=("channelto") channelid=(true) selected=(channelto) &>
+								</div>
+								
+								<div id="channelgroup" style="display: none">
+%									if (channelGroups.size() > 0) {
+									<select name="changrpsel" size="1" id="changrpsel">
+%										int i=0; for (ChannelGroups::iterator changrp = channelGroups.begin(); changrp != channelGroups.end(); ++changrp, i++) {
+										<option value="<$ changrp->Name() $>" <{ SELECTIF(changrpsel == changrp->Name()) }> ><$ changrp->Name() $></option>
+%										         }
+									</select>
+%									}
+								</div>
+							</td>
+							<td class="border" style="border-right: 1px solid black"></td>
+						</tr>
+
+						<!-- Use time -->
+						<tr>
+							<td class="border" style="border-left: 1px solid black"></td>
+							<td class="label"><$ tr("Use time") $>:</td>  
+							<td>
+								<input type="checkbox" name="usetime" value="1" <{ CHECKIF(usetime) }> onclick="changedusetime(this)" id="usetime" />
+								<div id="timesettings" style="display: none">
+									<table border="0" cellpadding="0" cellspacing="0">
+										<tr>
+											<td><$ tr("Start after") $>:</td>
+											<td><input type="text" size="2" maxlength="2" name="start_h" value="<$ start_h $>" /> : <input type="text" size="2" maxlength="2" name="start_m" value="<$ start_m $>" /></td>
+										</tr>
+										<tr>
+											<td><$ tr("Start before") $>:</td>
+											<td><input type="text" size="2" maxlength="2" name="stop_h" value="<$ stop_h $>" /> : <input type="text" size="2" maxlength="2" name="stop_m" value="<$ stop_m $>" /></td>
+										</tr>
+									</table>
+								</div>
+							</td>
+							<td class="border" style="border-right: 1px solid black"></td>
+						</tr>
+
+						<!-- Use duration -->
+						<tr>
+							<td class="border" style="border-left: 1px solid black"></td>
+							<td class="label"><$ tr("Use duration") $>:</td>  
+							<td>
+								<input type="checkbox" name="useduration" value="1" <{ CHECKIF(useduration) }> onclick="changeduseduration(this)" id="useduration" />
+								<div id="durationsettings" style="display: none">
+									<table border="0" cellpadding="0" cellspacing="0">
+										<tr>
+											<td><$ tr("Min. duration") $>:</td>
+											<td><input type="text" size="3" maxlength="3" name="durationmin" value="<$ durationmin $>" /> min</td>
+										</tr>
+										<tr>
+											<td><$ tr("Max. duration") $>:</td>
+											<td><input type="text" size="3" maxlength="3" name="durationmax" value="<$ durationmax $>" /> min</td>
+										</tr>
+									</table>
+								</div>
+							</td>
+							<td class="border" style="border-right: 1px solid black"></td>
+						</tr>
+		
+						<!-- Use weekday -->
+						<tr>
+							<td class="border" style="border-left: 1px solid black"></td>
+							<td class="label"><$ tr("Use day of week") $>:</td>  
+							<td>
+								<input type="checkbox" name="useweekday" value="1" <{ CHECKIF(useweekday) }> onclick="changeduseweekday(this)" id="useweekday" />
+								<div id="weekdaysettings" style="display: none">
+									<input type="checkbox" name="wday_mon" value="1" <{ CHECKIF(wday_mon) }> /> <$ tr("Monday") $>
+									<input type="checkbox" name="wday_tue" value="1" <{ CHECKIF(wday_tue) }> /> <$ tr("Tuesday") $>
+									<input type="checkbox" name="wday_wed" value="1" <{ CHECKIF(wday_wed) }> /> <$ tr("Wednesday") $>
+									<input type="checkbox" name="wday_thu" value="1" <{ CHECKIF(wday_thu) }> /> <$ tr("Thursday") $>
+									<input type="checkbox" name="wday_fri" value="1" <{ CHECKIF(wday_fri) }> /> <$ tr("Friday") $>
+									<input type="checkbox" name="wday_sat" value="1" <{ CHECKIF(wday_sat) }> /> <$ tr("Saturday") $>
+									<input type="checkbox" name="wday_sun" value="1" <{ CHECKIF(wday_sun) }> /> <$ tr("Sunday") $>
+								</div>
+							</td>
+							<td class="border" style="border-right: 1px solid black"></td>
+						</tr>
+
+						<!-- Use blacklists -->
+						<tr>
+							<td class="border" style="border-left: 1px solid black"></td>
+							<td class="label"><$ tr("Use blacklists" ) $>:</td>   
+							<td>
+								<select onchange="changedblacklistmode(this)" name="blacklistmode" size="1" id="blacklistmode">
+									<option value="0" <{ SELECTIF(blacklistmode == 0) }> ><$ tr("no") $></option>
+									<option value="1" <{ SELECTIF(blacklistmode == 1) }> ><$ tr("Selection") $></option>
+									<option value="2" <{ SELECTIF(blacklistmode == 2) }> ><$ tr("all") $></option>
+								</select>
+								<div id="blacklistmodesettings" style="display: none">
+%								if (blacklists.size() > 0) {
+									<select name="blacklists" multiple="multiple" size="5" onchange="changedblacklistsel(this)">
+%									int i=0; for (Blacklists::iterator blacklist = blacklists.begin(); blacklist != blacklists.end(); ++blacklist, i++) {
+										<option value="<$ blacklist->Id() $>" <{ SELECTIF(searchtimer && searchtimer->BlacklistSelected(blacklist->Id())) }>><$ blacklist->Search() $></option>
+%									         }
+									</select>
+%								}
+								</div>
+							</td>
+							<td class="border" style="border-right: 1px solid black"></td>
+						</tr>
+
+						<!-- Use in favorites menu -->
+						<tr>
+							<td class="border" style="border-left: 1px solid black"></td>
+							<td class="label"><$ tr("Use in favorites menu") $>:</td>
+							<td><input type="checkbox" name="useinfavorites" value="1" <{ CHECKIF(useinfavorites) }>/></td>
+							<td class="border" style="border-right: 1px solid black"></td>
+						</tr>
+
+						<!-- Use as search timer -->
+						<tr>
+							<td class="border" style="border-left: 1px solid black"></td>
+							<td class="label"><$ tr("Use as search timer" ) $>:</td>   
+							<td>
+								<div style="float:left; max-width:50%; margin-right:20px">
+									<input type="checkbox" name="useassearchtimer" value="1" <{ CHECKIF(useassearchtimer) }> onclick="changeduseassearchtimer(this)" id="useassearchtimer"/>
+								</div>
+								<div id="searchtimermodesettings" style="display: none">
+									<select onchange="changedsearchtimermode(this)" name="searchtimeraction" size="1" id="searchtimer_mode">
+										<option value="0" <{ SELECTIF(searchtimeraction == 0) }> ><$ tr("Record") $></option>
+										<option value="1" <{ SELECTIF(searchtimeraction == 1) }> ><$ tr("Announce only") $></option>
+										<option value="2" <{ SELECTIF(searchtimeraction == 2) }> ><$ tr("Switch only") $></option>
+									</select>
+								</div>
+								<div id="searchtimermode1settings" style="display: none">
+									<table border="0" cellpadding="0" cellspacing="0">
+										<tr>
+											<td><$ tr("Series recording") $>:</td>
+											<td><input type="checkbox" name="seriesrecording" value="1" <{ CHECKIF(seriesrecording) }>/></td>
+										</tr>
+										
+										<tr>
+											<td><$ tr("Directory") $>:</td>
+											<td><input type="text" name="directory" value="<$ directory $>" size="70" /></td>
+										</tr>
+										
+										<tr>
+											<td><$ tr("Delete recordings after ... days") $>:</td>
+											<td>
+												<input type="text" name="delrecafterdays" id="delrecafterdays" size="2" value="<$ delrecafterdays $>"/>&nbsp;&nbsp;
+												<$ tr("Keep ... recordings") $>:
+												<input type="text" name="keeprecs" size="2" value="<$ keeprecs $>"/>
+											</td>
+										</tr>
+										
+										<tr>
+											<td><$ tr("Pause when ... recordings exist") $>:</td>
+											<td><input type="text" name="pauseonrecs" id="pauseonrecs" size="2" value="<$ pauseonrecs $>"/></td>
+										</tr>
+	
+										<tr>
+											<td><$ tr("Avoid repeats" ) $>:</td>   
+											<td><input type="checkbox" name="avoidrepeats" value="1" <{ CHECKIF(avoidrepeats) }> onclick="changedavoidrepeats(this)" id="avoidrepeats"/>
+												<div id="avoidrepeatssettings" style="display: none">
+													<table border="0" cellpadding="0" cellspacing="0">
+														<tr>
+															<td><$ tr("Allowed repeats") $>:</td>
+															<td>
+																<input type="text" size="3" maxlength="3" name="allowedrepeats" value="<$ allowedrepeats $>" /> <$ tr("Only repeats within ... days") $>:<input type="text" size="3" maxlength="3" name="repeatswithindays" value="<$ repeatswithindays $>" />
+															</td>
+														</tr>
+	
+														<tr>
+															<td><$ tr("Compare title" ) $>:</td>   
+															<td><input type="checkbox" name="comparetitle" value="1" <{ CHECKIF(comparetitle) }>/>
+														</tr>
+
+														<tr class= "active">
+															<td><$ tr("Compare subtitle" ) $>:</td>
+															<td><input type="checkbox" name="comparesubtitle" value="1" <{ CHECKIF(comparesubtitle) }>/>
+														</tr>
+														
+														<tr>
+															<td><$ tr("Compare summary" ) $>:</td>   
+															<td><input type="checkbox" name="comparesummary" value="1" <{ CHECKIF(comparesummary) }>/>
+														</tr>
+
+%														if (extEPGInfos.size() > 0) {
+%															int i=0; for (ExtEPGInfos::iterator extinfo = extEPGInfos.begin(); extinfo != extEPGInfos.end(); ++extinfo, i++) {
+														<tr valign="top">
+															<td align="left" valign="top"><$ tr("Compare" ) $> <$ extinfo->Name() $>:</td>
+															<td><input type="checkbox" name="avoidrepeatscatselected" value="<$ i+1 $>" <{ CHECKIF(avoidrepeatscatselected[i]) }>/></td>
+														</tr>
+%															}
+%														}
+													</table>
+												</div>
+											</td>
+										</tr>
+
+										<tr>
+											<td><$ tr("Priority") $>:</td>
+											<td><input type="text" name="priority" size="2" value="<$ priority $>"/></td>
+										</tr>
+	
+										<tr>
+											<td><$ tr("Priority") $>:</td>
+											<td><input type="text" name="lifetime" size="2" value="<$ lifetime $>"/></td>
+										</tr>
+	
+										<tr>
+											<td><$ tr("Setup.Recording$Margin at start (min)") $>:</td>
+											<td><input type="text" name="marginstart" size="2" value="<$ marginstart $>"/></td>
+										</tr>
+	
+										<tr>
+											<td><$ tr("Setup.Recording$Margin at stop (min)") $>:</td>
+											<td><input type="text" name="marginstop" size="2" value="<$ marginstop $>"/></td>
+										</tr>
+	
+										<tr>
+											<td><$ tr("Use VPS") $>:</td>
+											<td><input type="checkbox" name="usevps" value="1" <{ CHECKIF(usevps) }>/></td>
+										</tr>
+									</table>
+								</div>
+
+								<div id="searchtimermode3settings" style="display: none">
+									<table border="0" cellpadding="0" cellspacing="0">
+										<tr>
+											<td><$ tr("Switch ... minutes before start") $>:</td>
+											<td><input type="text" name="switchminbefore" id="switchminbefore" size="2" value="<$ switchminbefore $>"/></td>
+										</tr>
+									</table>
+								</div>
+							</td>
+							<td class="border" style="border-right: 1px solid black"></td>
+						</tr>
+
+						<tr>
+							<td class="border" style="border-left: 1px solid black"></td>
+							<td class="buttonpanel" colspan="2">
+								<button class="green" type="submit"><$ tr("Save") $></button>
+								<button type="button" class="red" onclick="location.href='searchtimers.html';"><$ tr("Cancel") $></button>
+							</td>
+							<td class="border" style="border-right: 1px solid black"></td>
+						</tr>
+					</table>
+				</form>
+			</div>
 		</div>
-	</div>
 	</body>
 </html>
 <%include>page_exit.eh</%include>
diff --git a/pages/edit_timer.ecpp b/pages/edit_timer.ecpp
index f5e132f..d094d21 100644
--- a/pages/edit_timer.ecpp
+++ b/pages/edit_timer.ecpp
@@ -208,7 +208,10 @@ cTimer* timer;
 
 					<tr>
 						<td class="border" style="border-left: 1px solid black; border-bottom: 1px solid black"></td>
-						<td class="buttonpanel" colspan="2" style="border-bottom: 1px solid black"><button name="submit" type="submit"><$ tr("Save") $></button></td>
+						<td class="buttonpanel" colspan="2" style="border-bottom: 1px solid black">
+							<button class="green" type="submit"><$ tr("Save") $></button>
+							<button type="button" class="red" onclick="location.href='timers.html';"><$ tr("Cancel") $></button>
+						</td>
 						<td class="border" style="border-right: 1px solid black; border-bottom: 1px solid black"></td>
 					</tr>
 				</table>
diff --git a/pages/searchtimers.ecpp b/pages/searchtimers.ecpp
index 499f908..eab65ce 100644
--- a/pages/searchtimers.ecpp
+++ b/pages/searchtimers.ecpp
@@ -51,9 +51,9 @@ using namespace vdrlive;
 					<td><? timer->UseTime() ? timer->StartTimeFormatted() ?></td>
 					<td><? timer->UseTime() ? timer->StopTimeFormatted() ?></td>
 					<td>&nbsp;</td>
-					<td><img src="/<$ timer->UseAsSearchTimer() ? "active" : "inactive" $>.png" alt="" <& tooltip.hint text=(tr("Toggle searchtimer actions (in)active")) &>/></td>
-					<td><a href="searchresults.html?searchtimerid=<$ timer->Id() $>"><img src="/search.png" border="0" alt="" <& tooltip.hint text=(tr("Browse searchtimer results")) &>></a></td>
-					<td><a href="edit_searchtimer.html?searchtimerid=<$ timer->Id() $>"><img src="/edit.png" alt=""  <& tooltip.hint text=(tr("Edit searchtimer")) &>></a></td>
+					<td><img src="/<$ timer->UseAsSearchTimer() ? "active" : "inactive" $>.png" alt="" <& tooltip.hint text=(tr("Toggle searchtimer actions (in)active")) &>"/></td>
+					<td><a href="searchresults.html?searchtimerid=<$ timer->Id() $>"><img src="/search.png" border="0" alt="" <& tooltip.hint text=(tr("Browse searchtimer results")) &> ></a></td>
+					<td><a href="edit_searchtimer.html?searchtimerid=<$ timer->Id() $>"><img src="/edit.png" alt=""  <& tooltip.hint text=(tr("Edit searchtimer")) &> ></a></td>
 					<td class="border" style="border-right: 1px solid black"></td>
 				</tr>
 <{