2006-06-23: 3.4.6beta3v3.4.6beta3

- Fixed: Crash in prog_detail if invalid EPG-ID (Bug #0000077, Reported by Reiner Buehl).
- Fixed: Bug #0000034 (Reported by The Unknown).
- Added: error page on internal vdradmind.pl errors.
- Changed: access_log.
- Removed: unused stuff in templates.
- Fixed: quote special characters in "find repeatings" URL (Reported by Hans-Joachim Gurt).
- Reworked: prog_timeline again (Fixes Bug #0000009, Reported by Georgius, Patch submitted by Torsten Herz).
- Fixed: correct sorting in prog_list2 selectbox at the end of a month (Reported by sirtobi).
- Changed: dates in prog_list2 selectbox now shows day and month (Requested by sirtobi).
- Changed: Removed tabs in configuration menu.
- Fixed: "Divide by 0" bug in prog_summary list view (Bug #0000072,  Reported by djdagobert).
- Changed: Place folders in rec_list at the top (Patch submitted by Frank Jepsen).
- Fixed: Remember sorting after returning fom rec_rename (Bug #0000037, Reported by martind).
- Fixed: Canceling rec_rename does no longer rename the recording (Bug #0000036, Reported by martind).
- Fixed: VDRAdmin-AM didn't start if PID file was empty (Reported and fixed by Hirmke Michael).
- Fixed: In prog_list2 starting time also works for other days.
- Added: Icons to find repeatings and IMDb lookup in prog_list and prog_list2.
- Added: Each AutoTimer can have its own start/stop margins (Requested by many people at vdrportal.de). NOTE: vdradmind.at format changed!

1 files changed, 302 insertions, 402 deletions

diff --git a/template/default/config.html b/template/default/config.html
index 1256609..d097577 100644
--- a/template/default/config.html
+++ b/template/default/config.html
@@ -24,7 +24,6 @@
 		<input type="hidden" name="new_tab" value="<?% active_tab %?>"/>
 		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
 			<tr>
-				<td class="col_left"></td>
 				<td class="col_title">
 					<h1><%! Configuration !%></h1>
 				</td>
@@ -33,478 +32,384 @@
 					<a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.png" border="0" alt="help" title="<%! Help !%>" /></a>
 				</td>
 </tmpl_if>
-				<td class="col_right"></td>
 			</tr>
 		</table>
 
-		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="group">
-			<tr class="tabs">
-				<td class="col_left"></td>
-				<td colspan="2"><span class=<?% IF active_tab == 0 %?>"tab_selected"<?% ELSE %?>"tab_unselected"<?% END %?>><a href="javascript:new_tab('0')"><%! General Settings !%></a></span><span class=<?% IF active_tab == 1 %?>"tab_selected"<?% ELSE %?>"tab_unselected"<?% END %?>><a href="javascript:new_tab('1')"><%! VDR !%></a></span><span class=<?% IF active_tab == 2 %?>"tab_selected"<?% ELSE %?>"tab_unselected"<?% END %?>><a href="javascript:new_tab('2')"><%! Identification !%></a></span><span class=<?% IF active_tab == 3 %?>"tab_selected"<?% ELSE %?>"tab_unselected"<?% END %?>><a href="javascript:new_tab('3')"><%! Timeline !%></a></span><span class=<?% IF active_tab == 4 %?>"tab_selected"<?% ELSE %?>"tab_unselected"<?% END %?>><a href="javascript:new_tab('4')"><%! AutoTimer !%></a></span><span class=<?% IF active_tab == 5 %?>"tab_selected"<?% ELSE %?>"tab_unselected"<?% END %?>><a href="javascript:new_tab('5')"><%! Timer !%></a></span><span class=<?% IF active_tab == 6 %?>"tab_selected"<?% ELSE %?>"tab_unselected"<?% END %?>><a href="javascript:new_tab('6')"><%! Streaming !%></a></span><span class=<?% IF active_tab == 7 %?>"tab_selected"<?% ELSE %?>"tab_unselected"<?% END %?>><a href="javascript:new_tab('7')"><%! Expert !%></a></span><span class=<?% IF active_tab == 8 %?>"tab_selected"<?% ELSE %?>"tab_unselected"<?% END %?>><a href="javascript:new_tab('8')"><%! Channel Selections !%></a></span></td>
-				<td class="col_right"></td>
-			</tr>
-			<tr class="row_spacer">
-				<td class="col_left"></td>
-				<td colspan="2"></td>
-				<td class="col_right"></td>
-			</tr>
-<?% SWITCH active_tab %?>
-<?% CASE 0 %?> <!-- General Settings -->
+		<table border="0" cellspacing="0" cellpadding="0" class="group">
+			<tr class="heading">
+				<td colspan="2"><h2><%! General Settings !%></h2></td>
+			</tr>
 <!-- Only one template, so no need to chose
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Template: !%></h5></td>
-							<td class="col_value">
-								<select class="submit" name="TEMPLATE">
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Template: !%></h5></td>
+				<td class="col_value">
+					<select class="submit" name="TEMPLATE">
 <tmpl_loop name="TEMPLATELIST">
-									<option value="<tmpl_var name>" <tmpl_if aktemplate> selected</tmpl_if>><tmpl_var name></option>
+						<option value="<tmpl_var name>" <tmpl_if aktemplate> selected</tmpl_if>><tmpl_var name></option>
 </tmpl_loop>
-								</select>
-							</td>
-							<td class="col_right"></td>
-						</tr>
+					</select>
+				</td>
+			</tr>
 -->
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Skin: !%></h5></td>
-							<td class="col_value">
-								<select class="submit" name="SKIN">
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Skin: !%></h5></td>
+				<td class="col_value">
+					<select class="submit" name="SKIN">
 <tmpl_loop name="SKINLIST">
-									<option value="<tmpl_var name>" <tmpl_if sel> selected</tmpl_if>><tmpl_var name></option>
+						<option value="<tmpl_var name>" <tmpl_if sel> selected</tmpl_if>><tmpl_var name></option>
 </tmpl_loop>
-								</select>
-							</td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Login Page: !%></h5></td>
-							<td class="col_value">
-								<select class="submit" name="LOGINPAGE">
+					</select>
+				</td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! Login Page: !%></h5></td>
+				<td class="col_value">
+					<select class="submit" name="LOGINPAGE">
 <tmpl_loop name="LOGINPAGES">
-									<option value="<tmpl_var id>" <tmpl_if current> selected</tmpl_if>><tmpl_var name></option>
+						<option value="<tmpl_var id>" <tmpl_if current> selected</tmpl_if>><tmpl_var name></option>
 </tmpl_loop>
-								</select>
-							</td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Number of channels to use: !%></h5></td>
-							<td class="col_value"><input type="text" name="EPG_PRUNE" value="<tmpl_var EPG_PRUNE>" size="5" maxlength="25" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Local net (no login required): !%></h5></td>
-							<td class="col_value"><input type="text" name="LOCAL_NET" value="<tmpl_var LOCAL_NET>" size="20" maxlength="50" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Language: !%></h5></td>
-							<td class="col_value">
+					</select>
+				</td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Number of channels to use: !%></h5></td>
+				<td class="col_value"><input type="text" name="EPG_PRUNE" value="<tmpl_var EPG_PRUNE>" size="5" maxlength="25" /></td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! Local net (no login required): !%></h5></td>
+				<td class="col_value"><input type="text" name="LOCAL_NET" value="<tmpl_var LOCAL_NET>" size="20" maxlength="50" /></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Language: !%></h5></td>
+				<td class="col_value">
 <tmpl_if name="MY_LOCALES">
-								<select class="submit" name="LANG">
+					<select class="submit" name="LANG">
 	<tmpl_loop name="MY_LOCALES">
-									<option value="<tmpl_var id>" <tmpl_if cur>selected</tmpl_if>><tmpl_var name></option>
+						<option value="<tmpl_var id>" <tmpl_if cur>selected</tmpl_if>><tmpl_var name></option>
 	</tmpl_loop>
-								</select>
+					</select>
 <tmpl_else>
-								<input type="text" name="LANG" value="<tmpl_var LANG>" size="20" maxlength="50" />
+					<input type="text" name="LANG" value="<tmpl_var LANG>" size="20" maxlength="50" />
 </tmpl_if>
-							</td>
-							<td class="col_right"></td>
-						</tr>
+				</td>
+			</tr>
+		</table>
 
-<?% CASE 1 %?> <!-- VDR -->
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Number of DVB cards: !%></h5></td>
-							<td class="col_value"><input type="text" name="RECORDINGS" value="<tmpl_var RECORDINGS>" size="2" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Path to recordings: !%></h5></td>
-							<td class="col_value"><input type="text" name="VIDEODIR" value="<tmpl_var VIDEODIR>" size="20" maxlength="256" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Path to configuration files: !%></h5></td>
-							<td class="col_value"><input type="text" name="VDRCONFDIR" value="<tmpl_var VDRCONFDIR>" size="20" maxlength="256" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Path to EPG images: !%></h5></td>
-							<td class="col_value"><input type="text" name="EPGIMAGES" value="<tmpl_var EPGIMAGES>" size="20" maxlength="256" /></td>
-							<td class="col_right"></td>
-						</tr>
+		<table border="0" cellspacing="0" cellpadding="0" class="group">
+			<tr class="heading">
+				<td colspan="2"><h2><%! VDR !%></h2></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Number of DVB cards: !%></h5></td>
+				<td class="col_value"><input type="text" name="RECORDINGS" value="<tmpl_var RECORDINGS>" size="2" /></td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! Path to recordings: !%></h5></td>
+				<td class="col_value"><input type="text" name="VIDEODIR" value="<tmpl_var VIDEODIR>" size="20" maxlength="256" /></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Path to configuration files: !%></h5></td>
+				<td class="col_value"><input type="text" name="VDRCONFDIR" value="<tmpl_var VDRCONFDIR>" size="20" maxlength="256" /></td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! Path to EPG images: !%></h5></td>
+				<td class="col_value"><input type="text" name="EPGIMAGES" value="<tmpl_var EPGIMAGES>" size="20" maxlength="256" /></td>
+			</tr>
+		</table>
 
-<?% CASE 2 %?> <!-- Identification -->
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Username: !%></h5></td>
-							<td class="col_value"><input type="text" name="USERNAME" value="<tmpl_var USERNAME>" size="12" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Password: !%></h5></td>
-							<td class="col_value"><input type="password" name="PASSWORD" value="<tmpl_var PASSWORD>" size="12" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Guest Account: !%></h5></td>
-							<td class="col_value">
-								<input type="radio" name="GUEST_ACCOUNT" value="1" id="guest_yes" <tmpl_if guest_account>checked</tmpl_if> /><label for="guest_yes"><%! Yes !%></label>
-								<input type="radio" name="GUEST_ACCOUNT" value="0" id="guest_no" <tmpl_unless guest_account>checked</tmpl_unless> /><label for="guest_no"><%! No !%></label>
-							</td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Guest Username: !%></h5></td>
-							<td class="col_value"><input type="text" name="USERNAME_GUEST" value="<tmpl_var USERNAME_GUEST>" size="12" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Guest Password: !%></h5></td>
-							<td class="col_value"><input type="password" name="PASSWORD_GUEST" value="<tmpl_var PASSWORD_GUEST>" size="12" /></td>
-							<td class="col_right"></td>
-						</tr>
+		<table border="0" cellspacing="0" cellpadding="0" class="group">
+			<tr class="heading">
+				<td colspan="2"><h2><%! Identification !%></h2></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Username: !%></h5></td>
+				<td class="col_value"><input type="text" name="USERNAME" value="<tmpl_var USERNAME>" size="12" /></td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! Password: !%></h5></td>
+				<td class="col_value"><input type="password" name="PASSWORD" value="<tmpl_var PASSWORD>" size="12" /></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Guest Account: !%></h5></td>
+				<td class="col_value">
+					<input type="radio" name="GUEST_ACCOUNT" value="1" id="guest_yes" <tmpl_if guest_account>checked</tmpl_if> /><label for="guest_yes"><%! Yes !%></label>
+					<input type="radio" name="GUEST_ACCOUNT" value="0" id="guest_no" <tmpl_unless guest_account>checked</tmpl_unless> /><label for="guest_no"><%! No !%></label>
+				</td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! Guest Username: !%></h5></td>
+				<td class="col_value"><input type="text" name="USERNAME_GUEST" value="<tmpl_var USERNAME_GUEST>" size="12" /></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Guest Password: !%></h5></td>
+				<td class="col_value"><input type="password" name="PASSWORD_GUEST" value="<tmpl_var PASSWORD_GUEST>" size="12" /></td>
+			</tr>
+		</table>
 
-<?% CASE 3 %?> <!-- Timeline -->
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Hours: !%></h5></td>
-							<td class="col_value"><input type="text" name="ZEITRAHMEN" value="<tmpl_var ZEITRAHMEN>" size="2" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Times: !%></h5></td>
-							<td class="col_value"><input type="text" name="TIMES" value="<tmpl_var TIMES>" size="20" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Tooltips: !%></h5></td>
-							<td class="col_value">
-								<input type="radio" name="TL_TOOLTIP" value="1" id="tl_tooltip_yes" <tmpl_if tl_tooltip>checked</tmpl_if> /><label for="tl_tooltip_yes"><%! Yes !%></label>
-								<input type="radio" name="TL_TOOLTIP" value="0" id="tl_tooltip_no" <tmpl_unless tl_tooltip>checked</tmpl_unless> /><label for="tl_tooltip_no"><%! No !%></label>
-							</td>
-							<td class="col_right"></td>
-						</tr>
+		<table border="0" cellspacing="0" cellpadding="0" class="group">
+			<tr class="heading">
+				<td colspan="2"><h2><%! Timeline !%></h2></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Hours: !%></h5></td>
+				<td class="col_value"><input type="text" name="ZEITRAHMEN" value="<tmpl_var ZEITRAHMEN>" size="2" /></td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! Times: !%></h5></td>
+				<td class="col_value"><input type="text" name="TIMES" value="<tmpl_var TIMES>" size="20" />&nbsp;&nbsp;&nbsp;<%! Also used for other EPG views! !%></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Tooltips: !%></h5></td>
+				<td class="col_value">
+					<input type="radio" name="TL_TOOLTIP" value="1" id="tl_tooltip_yes" <tmpl_if tl_tooltip>checked</tmpl_if> /><label for="tl_tooltip_yes"><%! Yes !%></label>
+					<input type="radio" name="TL_TOOLTIP" value="0" id="tl_tooltip_no" <tmpl_unless tl_tooltip>checked</tmpl_unless> /><label for="tl_tooltip_no"><%! No !%></label>
+				</td>
+			</tr>
+		</table>
 
-<?% CASE 4 %?> <!-- AutoTimer -->
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Active: !%></h5></td>
-							<td class="col_value">
-								<input type="radio" name="AT_FUNC" value="1" id="at_yes" <tmpl_if at_func>checked</tmpl_if> /><label for="at_yes"><%! Yes !%></label>
-								<input type="radio" name="AT_FUNC" value="0" id="at_no" <tmpl_unless at_func>checked</tmpl_unless> /><label for="at_no"><%! No !%></label>
-							</td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Timeout: !%></h5></td>
-							<td class="col_value"><input type="text" name="AT_TIMEOUT" value="<tmpl_var AT_TIMEOUT>" size="4" /> <%! minutes !%></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Priority: !%></h5></td>
-							<td class="col_value"><input type="text" name="AT_PRIORITY" value="<tmpl_var AT_PRIORITY>" size="2" maxlength="2" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Lifetime: !%></h5></td>
-							<td class="col_value"><input type="text" name="AT_LIFETIME" value="<tmpl_var AT_LIFETIME>" size="2" maxlength="2" /></td>
-							<td class="col_right"></td>
-						</tr>
+		<table border="0" cellspacing="0" cellpadding="0" class="group">
+			<tr class="heading">
+				<td colspan="2"><h2><%! AutoTimer !%></h2></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Active: !%></h5></td>
+				<td class="col_value">
+					<input type="radio" name="AT_FUNC" value="1" id="at_yes" <tmpl_if at_func>checked</tmpl_if> /><label for="at_yes"><%! Yes !%></label>
+					<input type="radio" name="AT_FUNC" value="0" id="at_no" <tmpl_unless at_func>checked</tmpl_unless> /><label for="at_no"><%! No !%></label>
+				</td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! Timeout: !%></h5></td>
+				<td class="col_value"><input type="text" name="AT_TIMEOUT" value="<tmpl_var AT_TIMEOUT>" size="4" /> <%! minutes !%></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Priority: !%></h5></td>
+				<td class="col_value"><input type="text" name="AT_PRIORITY" value="<tmpl_var AT_PRIORITY>" size="2" maxlength="2" /></td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! Lifetime: !%></h5></td>
+				<td class="col_value"><input type="text" name="AT_LIFETIME" value="<tmpl_var AT_LIFETIME>" size="2" maxlength="2" /></td>
+			</tr>
 <!--
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Time Margin at Start: !%></h5></td>
-							<td class="col_value"><input type="text" name="AT_MARGIN_BEGIN" value="<tmpl_var AT_MARGIN_BEGIN>" size="2" maxlength="2" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Time Margin at Stop: !%></h5></td>
-							<td class="col_value"><input type="text" name="AT_MARGIN_END" value="<tmpl_var AT_MARGIN_END>" size="2" maxlength="2" /></td>
-							<td class="col_right"></td>
-						</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Time Margin at Start: !%></h5></td>
+				<td class="col_value"><input type="text" name="AT_MARGIN_BEGIN" value="<tmpl_var AT_MARGIN_BEGIN>" size="2" maxlength="2" /></td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! Time Margin at Stop: !%></h5></td>
+				<td class="col_value"><input type="text" name="AT_MARGIN_END" value="<tmpl_var AT_MARGIN_END>" size="2" maxlength="2" /></td>
+			</tr>
 -->
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Send email after programming timer: !%></h5></td>
-							<td class="col_value">
-								<input type="radio" name="AT_SENDMAIL" value="1" id="at_sendmail_yes" <tmpl_if at_sendmail>checked</tmpl_if> /><label for="at_sendmail_yes"><%! Yes !%></label>
-								<input type="radio" name="AT_SENDMAIL" value="0" id="at_sendmail_no" <tmpl_unless at_sendmail>checked</tmpl_unless> /><label for="at_sendmail_no"><%! No !%></label>
-							</td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Send email as: !%></h5></td>
-							<td class="col_value"><input type="text" name="MAIL_FROM" value="<tmpl_var MAIL_FROM>" size="20" maxlength="100" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Send email to: !%></h5></td>
-							<td class="col_value"><input type="text" name="MAIL_TO" value="<tmpl_var MAIL_TO>" size="20" maxlength="100" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Mail server: !%></h5></td>
-							<td class="col_value"><input type="text" name="MAIL_SERVER" value="<tmpl_var MAIL_SERVER>" size="20" maxlength="100" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! SMTPAuth user: !%></h5></td>
-							<td class="col_value"><input type="text" name="MAIL_AUTH_USER" value="<tmpl_var MAIL_AUTH_USER>" size="20" maxlength="100" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! SMTPAuth password: !%></h5></td>
-							<td class="col_value"><input type="password" name="MAIL_AUTH_PASS" value="<tmpl_var MAIL_AUTH_PASS>" size="20" maxlength="100" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Tooltips: !%></h5></td>
-							<td class="col_value">
-								<input type="radio" name="AT_TOOLTIP" value="1" id="at_tooltip_yes" <tmpl_if at_tooltip>checked</tmpl_if> /><label for="at_tooltip_yes"><%! Yes !%></label>
-								<input type="radio" name="AT_TOOLTIP" value="0" id="at_tooltip_no" <tmpl_unless at_tooltip>checked</tmpl_unless> /><label for="at_tooltip_no"><%! No !%></label>
-							</td>
-							<td class="col_right"></td>
-						</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Send email after programming timer: !%></h5></td>
+				<td class="col_value">
+					<input type="radio" name="AT_SENDMAIL" value="1" id="at_sendmail_yes" <tmpl_if at_sendmail>checked</tmpl_if> /><label for="at_sendmail_yes"><%! Yes !%></label>
+					<input type="radio" name="AT_SENDMAIL" value="0" id="at_sendmail_no" <tmpl_unless at_sendmail>checked</tmpl_unless> /><label for="at_sendmail_no"><%! No !%></label>
+				</td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! Send email as: !%></h5></td>
+				<td class="col_value"><input type="text" name="MAIL_FROM" value="<tmpl_var MAIL_FROM>" size="20" maxlength="100" /></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Send email to: !%></h5></td>
+				<td class="col_value"><input type="text" name="MAIL_TO" value="<tmpl_var MAIL_TO>" size="20" maxlength="100" /></td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! Mail server: !%></h5></td>
+				<td class="col_value"><input type="text" name="MAIL_SERVER" value="<tmpl_var MAIL_SERVER>" size="20" maxlength="100" /></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! SMTPAuth user: !%></h5></td>
+				<td class="col_value"><input type="text" name="MAIL_AUTH_USER" value="<tmpl_var MAIL_AUTH_USER>" size="20" maxlength="100" /></td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! SMTPAuth password: !%></h5></td>
+				<td class="col_value"><input type="password" name="MAIL_AUTH_PASS" value="<tmpl_var MAIL_AUTH_PASS>" size="20" maxlength="100" /></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Tooltips: !%></h5></td>
+				<td class="col_value">
+					<input type="radio" name="AT_TOOLTIP" value="1" id="at_tooltip_yes" <tmpl_if at_tooltip>checked</tmpl_if> /><label for="at_tooltip_yes"><%! Yes !%></label>
+					<input type="radio" name="AT_TOOLTIP" value="0" id="at_tooltip_no" <tmpl_unless at_tooltip>checked</tmpl_unless> /><label for="at_tooltip_no"><%! No !%></label>
+				</td>
+			</tr>
+		</table>
 
-<?% CASE 5 %?> <!-- Timer -->
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Priority: !%></h5></td>
-							<td class="col_value"><input type="text" name="TM_PRIORITY" value="<tmpl_var TM_PRIORITY>" size="2" maxlength="2" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Lifetime: !%></h5></td>
-							<td class="col_value"><input type="text" name="TM_LIFETIME" value="<tmpl_var TM_LIFETIME>" size="2" maxlength="2" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Time Margin at Start: !%></h5></td>
-							<td class="col_value"><input type="text" name="TM_MARGIN_BEGIN" value="<tmpl_var TM_MARGIN_BEGIN>" size="3" /> <%! minutes !%></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Time Margin at Stop: !%></h5></td>
-							<td class="col_value"><input type="text" name="TM_MARGIN_END" value="<tmpl_var TM_MARGIN_END>" size="3" /> <%! minutes !%></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Tooltips in timeline: !%></h5></td>
-							<td class="col_value">
-								<input type="radio" name="TM_TT_TIMELINE" value="1" id="tm_tl_timeline_yes" <tmpl_if tm_tt_timeline>checked</tmpl_if> /><label for="tm_tl_timeline_yes"><%! Yes !%></label>
-								<input type="radio" name="TM_TT_TIMELINE" value="0" id="tm_tl_timeline_no" <tmpl_unless tm_tt_timeline>checked</tmpl_unless> /><label for="tm_tl_timeline_no"><%! No !%></label>
-							</td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Tooltips in list: !%></h5></td>
-							<td class="col_value">
-								<input type="radio" name="TM_TT_LIST" value="1" id="tm_tl_list_yes" <tmpl_if tm_tt_list>checked</tmpl_if> /><label for="tm_tl_list_yes"><%! Yes !%></label>
-								<input type="radio" name="TM_TT_LIST" value="0" id="tm_tl_list_no" <tmpl_unless tm_tt_list>checked</tmpl_unless> /><label for="tm_tl_list_no"><%! No !%></label>
-							</td>
-							<td class="col_right"></td>
-						</tr>
+		<table border="0" cellspacing="0" cellpadding="0" class="group">
+			<tr class="heading">
+				<td colspan="2"><h2><%! Timer !%></h2></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Priority: !%></h5></td>
+				<td class="col_value"><input type="text" name="TM_PRIORITY" value="<tmpl_var TM_PRIORITY>" size="2" maxlength="2" /></td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! Lifetime: !%></h5></td>
+				<td class="col_value"><input type="text" name="TM_LIFETIME" value="<tmpl_var TM_LIFETIME>" size="2" maxlength="2" /></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Time Margin at Start: !%></h5></td>
+				<td class="col_value"><input type="text" name="TM_MARGIN_BEGIN" value="<tmpl_var TM_MARGIN_BEGIN>" size="3" /> <%! minutes !%></td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! Time Margin at Stop: !%></h5></td>
+				<td class="col_value"><input type="text" name="TM_MARGIN_END" value="<tmpl_var TM_MARGIN_END>" size="3" /> <%! minutes !%></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Tooltips in timeline: !%></h5></td>
+				<td class="col_value">
+					<input type="radio" name="TM_TT_TIMELINE" value="1" id="tm_tl_timeline_yes" <tmpl_if tm_tt_timeline>checked</tmpl_if> /><label for="tm_tl_timeline_yes"><%! Yes !%></label>
+					<input type="radio" name="TM_TT_TIMELINE" value="0" id="tm_tl_timeline_no" <tmpl_unless tm_tt_timeline>checked</tmpl_unless> /><label for="tm_tl_timeline_no"><%! No !%></label>
+				</td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! Tooltips in list: !%></h5></td>
+				<td class="col_value">
+					<input type="radio" name="TM_TT_LIST" value="1" id="tm_tl_list_yes" <tmpl_if tm_tt_list>checked</tmpl_if> /><label for="tm_tl_list_yes"><%! Yes !%></label>
+					<input type="radio" name="TM_TT_LIST" value="0" id="tm_tl_list_no" <tmpl_unless tm_tt_list>checked</tmpl_unless> /><label for="tm_tl_list_no"><%! No !%></label>
+				</td>
+			</tr>
 <!--						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Add summary to new timers: !%></h5></td>
-							<td class="col_value">
-								<input type="radio" name="TM_ADD_SUMMARY" value="1" id="tm_add_summary_yes" <tmpl_if tm_add_summary>checked</tmpl_if> /><label for="tm_add_summary_yes"><%! Yes !%></label>
-								<input type="radio" name="TM_ADD_SUMMARY" value="0" id="tm_add_summary_no" <tmpl_unless tm_add_summary>checked</tmpl_unless> /><label for="tm_add_summary_no"><%! No !%></label>
-							</td>
-							<td class="col_right"></td>
-						</tr>-->
+				<td class="col_label"><h5><%! Add summary to new timers: !%></h5></td>
+				<td class="col_value">
+					<input type="radio" name="TM_ADD_SUMMARY" value="1" id="tm_add_summary_yes" <tmpl_if tm_add_summary>checked</tmpl_if> /><label for="tm_add_summary_yes"><%! Yes !%></label>
+					<input type="radio" name="TM_ADD_SUMMARY" value="0" id="tm_add_summary_no" <tmpl_unless tm_add_summary>checked</tmpl_unless> /><label for="tm_add_summary_no"><%! No !%></label>
+				</td>
+			</tr>-->
+		</table>
 
 <tmpl_if ST_FUNC>
-<?% CASE 6 %?> <!-- Streaming -->
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Live Streaming: !%></h5></td>
-							<td class="col_value">
-								<input type="radio" name="ST_LIVE_ON" value="1" id="live_yes" <tmpl_if ST_LIVE_ON>checked</tmpl_if> /><label for="live_yes"><%! Yes !%></label>
-								<input type="radio" name="ST_LIVE_ON" value="0" id="live_no" <tmpl_unless ST_LIVE_ON>checked</tmpl_unless> /><label for="live_no"><%! No !%></label>
-							</td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! HTTP Port of Streamdev (also possible 3000/ts): !%></h5></td>
-							<td class="col_value"><input type="text" name="ST_STREAMDEV_PORT" value="<tmpl_var ST_STREAMDEV_PORT>" size="10" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Recordings Streaming: !%></h5></td>
-							<td class="col_value">
-								<input type="radio" name="ST_REC_ON" value="1" id="rec_yes" <tmpl_if ST_REC_ON>checked</tmpl_if> /><label for="rec_yes"><%! Yes !%></label>
-								<input type="radio" name="ST_REC_ON" value="0" id="rec_no" <tmpl_unless ST_REC_ON>checked</tmpl_unless> /><label for="rec_no"><%! No !%></label>
-							</td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Path to VDR Recordings on your workstation: !%></h5></td>
-							<td class="col_value"><input type="text" name="ST_VIDEODIR" value="<tmpl_var ST_VIDEODIR>" size="20" maxlength="256" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! MIME type for live streaming: !%></h5></td>
-							<td class="col_value"><input type="text" name="TV_MIMETYPE" value="<tmpl_var TV_MIMETYPE>" size="20" maxlength="256" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Suffix for live streaming: !%></h5></td>
-							<td class="col_value"><input type="text" name="TV_EXT" value="<tmpl_var TV_EXT>" size="4" maxlength="256" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! MIME type for recordings streaming: !%></h5></td>
-							<td class="col_value"><input type="text" name="REC_MIMETYPE" value="<tmpl_var REC_MIMETYPE>" size="20" maxlength="256" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Suffix for recordings streaming: !%></h5></td>
-							<td class="col_value"><input type="text" name="REC_EXT" value="<tmpl_var REC_EXT>" size="4" maxlength="256" /></td>
-							<td class="col_right"></td>
-						</tr>
+		<table border="0" cellspacing="0" cellpadding="0" class="group">
+			<tr class="heading">
+				<td colspan="2"><h2><%! Streaming !%></h2></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Live Streaming: !%></h5></td>
+				<td class="col_value">
+					<input type="radio" name="ST_LIVE_ON" value="1" id="live_yes" <tmpl_if ST_LIVE_ON>checked</tmpl_if> /><label for="live_yes"><%! Yes !%></label>
+					<input type="radio" name="ST_LIVE_ON" value="0" id="live_no" <tmpl_unless ST_LIVE_ON>checked</tmpl_unless> /><label for="live_no"><%! No !%></label>
+				</td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! HTTP Port of Streamdev (also possible 3000/ts): !%></h5></td>
+				<td class="col_value"><input type="text" name="ST_STREAMDEV_PORT" value="<tmpl_var ST_STREAMDEV_PORT>" size="10" /></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Recordings Streaming: !%></h5></td>
+				<td class="col_value">
+					<input type="radio" name="ST_REC_ON" value="1" id="rec_yes" <tmpl_if ST_REC_ON>checked</tmpl_if> /><label for="rec_yes"><%! Yes !%></label>
+					<input type="radio" name="ST_REC_ON" value="0" id="rec_no" <tmpl_unless ST_REC_ON>checked</tmpl_unless> /><label for="rec_no"><%! No !%></label>
+				</td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! Path to VDR Recordings on your workstation: !%></h5></td>
+				<td class="col_value"><input type="text" name="ST_VIDEODIR" value="<tmpl_var ST_VIDEODIR>" size="20" maxlength="256" /></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! MIME type for live streaming: !%></h5></td>
+				<td class="col_value"><input type="text" name="TV_MIMETYPE" value="<tmpl_var TV_MIMETYPE>" size="20" maxlength="256" /></td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! Suffix for live streaming: !%></h5></td>
+				<td class="col_value"><input type="text" name="TV_EXT" value="<tmpl_var TV_EXT>" size="4" maxlength="256" /></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! MIME type for recordings streaming: !%></h5></td>
+				<td class="col_value"><input type="text" name="REC_MIMETYPE" value="<tmpl_var REC_MIMETYPE>" size="20" maxlength="256" /></td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! Suffix for recordings streaming: !%></h5></td>
+				<td class="col_value"><input type="text" name="REC_EXT" value="<tmpl_var REC_EXT>" size="4" maxlength="256" /></td>
+			</tr>
 <!-- not (yet?) supported 
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Bandwidth of Streams: !%></h5></td>
-							<td class="col_value">
-								<select class="submit" name="STREAMTYPE">
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Bandwidth of Streams: !%></h5></td>
+				<td class="col_value">
+					<select class="submit" name="STREAMTYPE">
 <tmpl_loop name="STREAMTYPELIST">
-									<option value="<tmpl_var name>" <tmpl_if sel> selected</tmpl_if>><tmpl_var name></option>
+						<option value="<tmpl_var name>" <tmpl_if sel> selected</tmpl_if>><tmpl_var name></option>
 </tmpl_loop>
-								</select>
-							</td>
-							<td class="col_right"></td>
-						</tr>
+					</select>
+				</td>
+			</tr>
 -->
+		</table>
 </tmpl_if>
 
-<?% CASE 7 %?> <!-- Expert -->
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! Read EPG directly using epg.data: !%></h5></td>
-							<td class="col_value">
-								<input type="radio" name="EPG_DIRECT" value="1" id="epg_yes" <tmpl_if EPG_DIRECT>checked</tmpl_if> /><label for="epg_yes"><%! Yes !%></label>
-								<input type="radio" name="EPG_DIRECT" value="0" id="epg_no" <tmpl_unless EPG_DIRECT>checked</tmpl_unless> /><label for="epg_no"><%! No !%></label>
-							</td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_even">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! epg.data filename: !%></h5></td>
-							<td class="col_value"><input type="text" name="EPG_FILENAME" value="<tmpl_var EPG_FILENAME>" size="20" maxlength="256" /></td>
-							<td class="col_right"></td>
-						</tr>
-						<tr class="row_odd">
-							<td class="col_left"></td>
-							<td class="col_label"><h5><%! VFAT: !%></h5></td>
-							<td class="col_value">
-								<input type="radio" name="VDRVFAT" value="1" id="vfat_yes" <tmpl_if VDRVFAT>checked</tmpl_if> /><label for="vfat_yes"><%! Yes !%></label>
-								<input type="radio" name="VDRVFAT" value="0" id="vfat_no" <tmpl_unless VDRVFAT>checked</tmpl_unless> /><label for="vfat_no"><%! No !%></label>
-							</td>
-							<td class="col_right"></td>
-						</tr>
+		<table border="0" cellspacing="0" cellpadding="0" class="group">
+			<tr class="heading">
+				<td colspan="2"><h2><%! Expert !%></h2></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! Read EPG directly using epg.data: !%></h5></td>
+				<td class="col_value">
+					<input type="radio" name="EPG_DIRECT" value="1" id="epg_yes" <tmpl_if EPG_DIRECT>checked</tmpl_if> /><label for="epg_yes"><%! Yes !%></label>
+					<input type="radio" name="EPG_DIRECT" value="0" id="epg_no" <tmpl_unless EPG_DIRECT>checked</tmpl_unless> /><label for="epg_no"><%! No !%></label>
+				</td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_label"><h5><%! epg.data filename: !%></h5></td>
+				<td class="col_value"><input type="text" name="EPG_FILENAME" value="<tmpl_var EPG_FILENAME>" size="20" maxlength="256" /></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_label"><h5><%! VFAT: !%></h5></td>
+				<td class="col_value">
+					<input type="radio" name="VDRVFAT" value="1" id="vfat_yes" <tmpl_if VDRVFAT>checked</tmpl_if> /><label for="vfat_yes"><%! Yes !%></label>
+					<input type="radio" name="VDRVFAT" value="0" id="vfat_no" <tmpl_unless VDRVFAT>checked</tmpl_unless> /><label for="vfat_no"><%! No !%></label>
+				</td>
+			</tr>
+		</table>
 
-<?% CASE 8 %?> <!-- Channel Selections -->
-			<tr>
-				<td colspan="2">                  
-					<table width="100%" border="0" cellspacing="0" cellpadding="0">
+		<table border="0" cellspacing="0" cellpadding="0" class="group">
+			<tr class="heading">
+				<td colspan="3"><h2><%! Channel Selections !%></h2></td>
+			</tr>
 						<tr class="row_odd">
-							<td class="col_left"></td>
 							<td class="col_label"><h5><%! In "Timeline"? !%></h5></td>
 							<td class="col_value" colspan="2">
 								<input type="radio" name="CHANNELS_WANTED_TIMELINE" value="1" id="tl_yes" <tmpl_if CHANNELS_WANTED_TIMELINE>checked</tmpl_if> /><label for="tl_yes"><%! Yes !%></label>
 								<input type="radio" name="CHANNELS_WANTED_TIMELINE" value="0" id="tl_no" <tmpl_unless CHANNELS_WANTED_TIMELINE>checked</tmpl_unless> /><label for="tl_no"><%! No !%></label>
 							</td>
-							<td class="col_right"></td>
 						</tr>
 						<tr class="row_even">
-							<td class="col_left"></td>
 							<td class="col_label"><h5><%! In "Channels"? !%></h5></td>
 							<td class="col_value" colspan="2">
 								<input type="radio" name="CHANNELS_WANTED_PRG" value="1" id="prg_yes" <tmpl_if CHANNELS_WANTED_PRG>checked</tmpl_if> /><label for="prg_yes"><%! Yes !%></label>
 								<input type="radio" name="CHANNELS_WANTED_PRG" value="0" id="prg_no"<tmpl_unless CHANNELS_WANTED_PRG>checked</tmpl_unless> /><label for="prg_no"><%! No !%> </label>
 							</td>
-							<td class="col_right"></td>
 						</tr>
 						<tr class="row_odd">
-							<td class="col_left"></td>
 							<td class="col_label"><h5><%! In "Playing Today"? !%></h5></td>
 							<td class="col_value" colspan="2">
 								<input type="radio" name="CHANNELS_WANTED_PRG2" value="1" id="prg2_yes" <tmpl_if CHANNELS_WANTED_PRG2>checked</tmpl_if> /><label for="prg2_yes"><%! Yes !%></label>
 								<input type="radio" name="CHANNELS_WANTED_PRG2" value="0" id="prg2_no"<tmpl_unless CHANNELS_WANTED_PRG2>checked</tmpl_unless> /><label for="prg2_no"><%! No !%> </label>
 							</td>
-							<td class="col_right"></td>
 						</tr>
 						<tr class="row_even">
-							<td class="col_left"></td>
 							<td class="col_label"><h5><%! In "What's On Now"? !%></h5></td>
 							<td class="col_value" colspan="2">
 								<input type="radio" name="CHANNELS_WANTED_SUMMARY" value="1" id="sum_yes" <tmpl_if CHANNELS_WANTED_SUMMARY>checked</tmpl_if> /><label for="sum_yes"><%! Yes !%></label>
 								<input type="radio" name="CHANNELS_WANTED_SUMMARY" value="0" id="sum_no" <tmpl_unless CHANNELS_WANTED_SUMMARY>checked</tmpl_unless> /><label for="sum_no"><%! No !%></label>
 							</td>
-							<td class="col_right"></td>
 						</tr>
 						<tr class="row_odd">
-							<td class="col_left"></td>
 							<td class="col_label"><h5><%! In "AutoTimer"? !%></h5></td>
 							<td class="col_value" colspan="2">
 								<input type="radio" name="CHANNELS_WANTED_AUTOTIMER" value="1" id="wat_yes" <tmpl_if CHANNELS_WANTED_AUTOTIMER>checked</tmpl_if> /><label for="wat_yes"><%! Yes !%></label>
 								<input type="radio" name="CHANNELS_WANTED_AUTOTIMER" value="0" id="wat_no" <tmpl_unless CHANNELS_WANTED_AUTOTIMER>checked</tmpl_unless> /><label for="wat_no"><%! No !%></label>
 							</td>
-							<td class="col_right"></td>
 						</tr>
 						<tr class="row_even">
-							<td class="col_left"></td>
 							<td class="col_label"><h5><%! In "Watch TV"? !%></h5></td>
 							<td class="col_value" colspan="2">
 								<input type="radio" name="CHANNELS_WANTED_WATCHTV" value="1" id="wtv_yes" <tmpl_if CHANNELS_WANTED_WATCHTV>checked</tmpl_if> /><label for="wtv_yes"><%! Yes !%></label>
 								<input type="radio" name="CHANNELS_WANTED_WATCHTV" value="0" id="wtv_no" <tmpl_unless CHANNELS_WANTED_WATCHTV>checked</tmpl_unless> /><label for="wtv_no"><%! No !%></label>
 							</td>
-							<td class="col_right"></td>
 						</tr>
 						<tr class="row_odd">
-							<td class="col_left"></td>
 							<td class="col_channels">
-								<select name="all_channels" size="8" multiple>
+								<select name="all_channels" size="8" multiple class="channels">
 <tmpl_loop name="ALL_CHANNELS">
 									<option value="<tmpl_var vdr_id>"><tmpl_var name escape="html"></option>
 </tmpl_loop>
@@ -515,18 +420,13 @@
 								<input type="submit" class="submit" name="submit" value="&lt;&lt;&lt;&lt;&lt;" />
 							</td>
 							<td class="col_wanted_channels">
-								<select name="selected_channels" size="8" multiple>
+								<select name="selected_channels" size="8" multiple class="channels">
 <tmpl_loop name="SELECTED_CHANNELS">
 									<option value="<tmpl_var vdr_id>"><tmpl_var name escape="html"></option>
 </tmpl_loop>
 								</select>
 							</td>
-							<td class="col_right"></td>
 						</tr>
-					</table>
-<?% END %?>
-				</td>
-			</tr>
 		</table>
 
 		<div id="buttons">