2005-09-23: 0.97-am3.4v0.97-am3.4

- Send valid "Expires" header (Submitted by Ville Skyttä). - Open failure of vdradmind.done reported wrong filename (Submitted by Ville Skyttä). - Deliver validated HTML (Reported by Ville Skyttä). - Display name of recordings/timers... that will be deleted (Requested by Richard Lithvall). - Channels list in AutoTimer only shows selected channels if selective channels are active for AT. - Added "chmod" for grabbed images of TV so that everyone can read/write the file (Submitted by Udo Richter). - Added "-d" argument to set the configuration folder (Submitted by Rene Bredlau). - Fixed handling for recording on February, 29th for VDR >=1.3.26 (Submitted by Rene Bredlau). - Alternativly use Locale::Messages if Locale::gettext not found (Submitted by Ville Skyttä). - Fixed "send command" error message (Submitted by Ville Skyttä). - Display free disk size as float instead of integer (Submitted by Hardy Flor). - Step forward/backward a day in "Playing today" (Requested by Tüddelkopp) - Enable/disable selective channels in "Playing today" (Requested by Reiner Buehl) - Added images in prog_detail; needs external tool that provides these images; must be configured first! (Requested by several people) - Fixed display of login page (Reported by DrSat)
author: Andreas Mair <amair.sob@googlemail.com> 2005-09-23 10:26:48 +0200
committer: Andreas Mair <amair.sob@googlemail.com> 2005-09-23 10:26:48 +0200
commit: 32e84da8cc92fc7c69e6ecbf6d937145018f96f2 (patch)
tree: 4917147a96998fb2bbc0cb8903ee2311b8b39a41 /template/default
parent: 8c5b06e471f1254d2e750dfba3154461eb3030bc (diff)
download: vdradmin-am-0.97-am3.4.tar.gz
vdradmin-am-0.97-am3.4.tar.bz2
22 files changed, 299 insertions, 283 deletions
diff --git a/template/default/at_timer_list.html b/template/default/at_timer_list.html
index d24d8b1..6064c8b 100644
--- a/template/default/at_timer_list.html
+++ b/template/default/at_timer_list.html
@@ -23,39 +23,32 @@
 	END
 %?>
 </script>
-	<table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
-		<tr>
-			<td class="col_left">
-			<td class="col_title">
-				<h1><%! AutoTimer !%></h1>
-			</td>
-			<td class="col_other">
-				<span>
-					<table border="0" cellspacing="0" cellpadding="0">
-						<tr height="20">
-							<td width="12" height="20" background="bilder/gbutton_left.gif"></td>
-							<td align="center" height="20" background="bilder/gbutton_middle.gif">
-								<a href="<tmpl_var naturl>"><div class="gbutton"><%! New AutoTimer !%></div></a>
-							</td>
-							<td width="12" height="20" background="bilder/gbutton_right.gif"></td>
-						</tr>
-					</table>
-				</span>
-			</td>
+	<form action="<tmpl_var url>" method="get" name="FormName0">
+		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
+			<tr>
+				<td class="col_left">
+				<td class="col_title">
+					<h1><%! AutoTimer !%></h1>
+				</td>
+				<td class="col_other">
+					<input type="submit" class="submit" name="new_at" value="<%! New AutoTimer !%>" />
+					<input type="hidden" name="aktion" value="at_timer_new" />
+				</td>
 <tmpl_if name="help_url">
-			<td class="col_help">
-				<a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.gif" border="0" alt="help" title="<%! Help !%>"/></a>
-			</td>
+				<td class="col_help">
+					<a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.gif" border="0" alt="help" title="<%! Help !%>"/></a>
+				</td>
 </tmpl_if>
-			<td class="col_right"></td>
-		</tr>
-	</table>
+				<td class="col_right"></td>
+			</tr>
+		</table>
+	</form>
 
 	<form action="<tmpl_var url>" method="get" name="FormName">
 		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="list">
 			<tr class="heading">
 				<td class="col_left"></td>
-				<td class="col_active" <tmpl_if sortbyactive>selected="yes"</tmpl_if>>
+				<td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>">
 					<h2>
 						<a href="<tmpl_var sortbyactiveurl>"><%! Active !%>
 							<tmpl_if sortbyactive>
@@ -66,7 +59,7 @@
 						</a>
 					</h2>
 				</td>
-				<td class="col_channel" <tmpl_if sortbychannel>selected="yes"</tmpl_if>>
+				<td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>">
 					<h2>
 						<a href="<tmpl_var sortbychannelurl>"><%! Channel !%>
 							<tmpl_if sortbychannel>
@@ -77,7 +70,7 @@
 						</a>
 					</h2>
 				</td>
-				<td class="col_start" <tmpl_if sortbystart>selected="yes"</tmpl_if>>
+				<td class="col_start <tmpl_if sortbystart>selected</tmpl_if>">
 					<h2>
 						<a href="<tmpl_var sortbystarturl>"><%! Start !%>
 							<tmpl_if sortbystart>
@@ -88,7 +81,7 @@
 						</a>
 					</h2>
 				</td>
-				<td class="col_stop" <tmpl_if sortbystop>selected="yes"</tmpl_if>>
+				<td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>">
 					<h2>
 						<a href="<tmpl_var sortbystopurl>"><%! Stop !%>
 							<tmpl_if sortbystop>
@@ -99,7 +92,7 @@
 						</a>
 					</h2>
 				</td>
-				<td class="col_name" <tmpl_if sortbypattern>selected="yes"</tmpl_if>>
+				<td class="col_name <tmpl_if sortbypattern>selected</tmpl_if>">
 					<h2>
 						<a href="<tmpl_var sortbypatternurl>"><%! Name !%>
 							<tmpl_if sortbypattern>
@@ -117,11 +110,11 @@
 			</tr>
 			<tr class="row_spacer">
 				<td class="col_left"></td>
-				<td class="col_active" <tmpl_if sortbyactive>selected="yes"</tmpl_if>></td>
-				<td class="col_channel" <tmpl_if sortbychannel>selected="yes"</tmpl_if>></td>
-				<td class="col_start" <tmpl_if sortbystart>selected="yes"</tmpl_if>></td>
-				<td class="col_stop" <tmpl_if sortbystop>selected="yes"</tmpl_if>></td>
-				<td class="col_name" <tmpl_if sortbypattern>selected="yes"</tmpl_if>></td>
+				<td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>"></td>
+				<td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>"></td>
+				<td class="col_start <tmpl_if sortbystart>selected</tmpl_if>"></td>
+				<td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>"></td>
+				<td class="col_name <tmpl_if sortbypattern>selected</tmpl_if>"></td>
 				<td colspan="3"></td>
 				<td class="col_right"></td>
 			</tr>
@@ -129,31 +122,31 @@
 <tmpl_loop at_timer_loop>
 			<tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>">
 				<td class="col_left"></td>
-				<td class="col_active" <tmpl_if sortbyactive>selected="yes"</tmpl_if>>
+				<td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>">
 					<div>
 						<tmpl_if active>
-							<a href="<tmpl_var toggleurl>"><img src="bilder/poempl_gruen.gif" alt="" width="19" height="19" align="absmiddle" border="0"/> <%! Yes !%></a>
+							<a href="<tmpl_var toggleurl>"><img src="bilder/poempl_gruen.gif" alt="" width="19" height="19" align="middle" border="0"/> <%! Yes !%></a>
 						<tmpl_else>
-							<a href="<tmpl_var toggleurl>"><img src="bilder/poempl_grau.gif" alt="" width="19" height="19" align="absmiddle" border="0"/> <%! No !%></a>
+							<a href="<tmpl_var toggleurl>"><img src="bilder/poempl_grau.gif" alt="" width="19" height="19" align="middle" border="0"/> <%! No !%></a>
 						</tmpl_if>
 					</div>
 				</td>
-				<td class="col_channel" <tmpl_if sortbychannel>selected="yes"</tmpl_if>>
+				<td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>">
 					<div>
 						<tmpl_if channel><a href="<tmpl_var proglink>"><tmpl_var channel></a><tmpl_else>-</tmpl_if>
 					</div>
 				</td>
-				<td class="col_start" <tmpl_if sortbystart>selected="yes"</tmpl_if>>
+				<td class="col_start <tmpl_if sortbystart>selected</tmpl_if>">
 					<div>
 						<tmpl_if start><tmpl_var start><tmpl_else>-</tmpl_if>
 					</div>
 				</td>
-				<td class="col_stop" <tmpl_if sortbystop>selected="yes"</tmpl_if>>
+				<td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>">
 					<div>
 						<tmpl_if stop><tmpl_var stop><tmpl_else>-</tmpl_if>
 					</div>
 				</td>
-				<td class="col_name" onMouseOver="tip('VDR-<tmpl_var id>'); return true;" onMouseOut="untip(); return true;" <tmpl_if sortbypattern>selected="yes"</tmpl_if>>
+				<td class="col_name <tmpl_if sortbypattern>selected</tmpl_if>" onMouseOver="tip('VDR-<tmpl_var id>'); return true;" onMouseOut="untip(); return true;">
 					<div>
 						<tmpl_var pattern>
 					</div>
@@ -165,7 +158,7 @@
 				</td>
 				<td class="col_delete">
 					<div>
-						<a href="javascript:del('<%! Delete timer? !%>', '<tmpl_var delurl>');"><img src="bilder/delete.gif" alt="delete" height="17" width="17" border="0" title="<%! Delete !%>"/></a>
+						<a href="javascript:del('<%! Delete timer? !%>\n\n&quot;<tmpl_var pattern>&quot;', '<tmpl_var delurl>');"><img src="bilder/delete.gif" alt="delete" height="17" width="17" border="0" title="<%! Delete !%>"/></a>
 					</div>
 				</td>
 				<td class="col_checkbox">
@@ -179,11 +172,11 @@
 
 			<tr class="footer">
 				<td class="col_left"></td>
-				<td class="col_active" <tmpl_if sortbyactive>selected="yes"</tmpl_if>></td>
-				<td class="col_channel" <tmpl_if sortbychannel>selected="yes"</tmpl_if>></td>
-				<td class="col_start" <tmpl_if sortbystart>selected="yes"</tmpl_if>></td>
-				<td class="col_stop" <tmpl_if sortbystop>selected="yes"</tmpl_if>></td>
-				<td class="col_name" <tmpl_if sortbypattern>selected="yes"</tmpl_if>></td>
+				<td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>"></td>
+				<td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>"></td>
+				<td class="col_start <tmpl_if sortbystart>selected</tmpl_if>"></td>
+				<td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>"></td>
+				<td class="col_name <tmpl_if sortbypattern>selected</tmpl_if>"></td>
 				<td colspan="3"></td>
 				<td class="col_right"></td>
 			</tr>
@@ -192,30 +185,14 @@
 		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="buttons">
 			<tr>
 				<td align="left">
-					<table border="0" cellspacing="0" cellpadding="0">
-						<tr height="20">
-							<td width="12" height="20" background="bilder/gbutton_left.gif"></td>
-							<td align="center" height="20" background="bilder/gbutton_middle.gif">
-								<a href="<tmpl_var force_update_url>"><div class="gbutton"><%! Force Update !%></div></a>
-							</td>
-							<td width="12" height="20" background="bilder/gbutton_right.gif"></td>
-						</tr>
-					</table>
+					<input type="submit" class="submit" name="at_force" value="<%! Force Update !%>" />
 				</td>
 				<td align="right">
-					<table border="0" cellspacing="0" cellpadding="0">
-						<tr height="20">
-							<td width="12" height="20" background="bilder/gbutton_left.gif"></td>
-							<td align="center" height="20" background="bilder/gbutton_middle.gif">
-								<a href="javascript:mdel_old('<%! Delete all selected timers? !%>');"><div class="gbutton"><%! Delete Selected AutoTimers !%></div></a>
-							</td>
-							<td width="12" height="20" background="bilder/gbutton_right.gif"></td>
-						</tr>
-					</table>
+					<input type="submit" class="submit" name="at_delete" value="<%! Delete Selected AutoTimers !%>" onclick="return mdel_old('<%! Delete all selected timers? !%>');" />
 				</td>
 			</tr>
 		</table>
-		<input type="hidden" name="aktion" value="at_timer_delete"/>
+		<input type="hidden" name="aktion" value="at_timer_aktion"/>
 	</form>
 </body>
 
diff --git a/template/default/at_timer_new.html b/template/default/at_timer_new.html
index afafbb2..d1e14ce 100644
--- a/template/default/at_timer_new.html
+++ b/template/default/at_timer_new.html
@@ -29,7 +29,7 @@
 		</table>
 
 		<div id="content">
-			<table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="group">
+			<table width="100%" border="0" cellspacing="0" cellpadding="0" class="group">
 				<tr class="heading">
 					<td class="col_left"></td>
 					<td colspan="2"></td>
diff --git a/template/default/config.html b/template/default/config.html
index 2f6e104..1e240af 100644
--- a/template/default/config.html
+++ b/template/default/config.html
@@ -127,6 +127,12 @@
 							<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>
 						<tr class="footer">
 							<td class="col_left"></td>
 							<td colspan="2"></td>
@@ -450,7 +456,7 @@
 						</tr>
 						<tr class="row_even">
 							<td class="col_left"></td>
-							<td class="col_label"><h5><%! In "Channels" / "Playing Today"? !%></h5></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>
@@ -459,6 +465,15 @@
 						</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>
@@ -466,16 +481,16 @@
 							</td>
 							<td class="col_right"></td>
 						</tr>
-						<tr class="row_even">
+						<tr class="row_odd">
 							<td class="col_left"></td>
-							<td class="col_label"><h5><%! In "AutoTimer"? !%><h5></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_odd">
+						<tr class="row_even">
 							<td class="col_left"></td>
 							<td class="col_channels">
 								<select name="all_channels" size="8" multiple>
diff --git a/template/default/help_at_timer_list.html b/template/default/help_at_timer_list.html
index 9f2c473..c837536 100644
--- a/template/default/help_at_timer_list.html
+++ b/template/default/help_at_timer_list.html
@@ -12,6 +12,10 @@
 </head>
 
 <body id="at_timer_list">
+<form onsubmit="return false;">
+	<input type="hidden" name="aktion" value="show_help"/>
+	<input type="hidden" name="area" value="<tmpl_var area>"/>
+
 	<table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group">
 		<tr class="heading">
 			<td class="col_left"></td>
@@ -44,8 +48,8 @@
 					<img src="bilder/poempl_gruen.gif" alt="on" align="absmiddle" /> AutoTimer is OK and will automatically program matching broadcasts.<br />
 					<img src="bilder/poempl_grau.gif" alt="inactive" align="absmiddle" /> AutoTimer is not active.
 				</p>
-				<p>In addition to these functions you can add a new AutoTimer by clicking <span class="submit">New AutoTimer</span> at the top and you can delete a number of AutoTimers at once by checking the box in the last column of those timers and clicking <span class="submit">Delete Selected AutoTimers</span>.</p>
-				<p>Click <span class="submit">Force Update</span> to force VDRAdmin to reconnect to VDR, fetch the current EPG and check for matching AutoTimers.</p> !%>
+				<p>In addition to these functions you can add a new AutoTimer by clicking <input type="submit" class="submit" value="New AutoTimer"/> at the top and you can delete a number of AutoTimers at once by checking the box in the last column of those timers and clicking <input type="submit" class="submit" value="Delete Selected AutoTimers"/>.</p>
+				<p>Click <input type="submit" class="submit" value="Force Update"/> to force VDRAdmin to reconnect to VDR, fetch the current EPG and check for matching AutoTimers.</p> !%>
 			</td>
 			<td class="col_right"></td>
 		</tr>
@@ -55,6 +59,7 @@
 			<td class="col_right"></td>
 		</tr>
 	</table>
+</form>
 </body>
 
 </html>
diff --git a/template/default/help_config.html b/template/default/help_config.html
index acc7d59..705412b 100644
--- a/template/default/help_config.html
+++ b/template/default/help_config.html
@@ -15,10 +15,14 @@
 </head>
 
 <body id="config">
+<form onsubmit="return false;">
+	<input type="hidden" name="aktion" value="show_help"/>
+	<input type="hidden" name="area" value="<tmpl_var area>"/>
+
 	<table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group">
 		<tr class="heading">
 			<td class="col_left"></td>
-			<td><h2><a name="top"></a><%! Configuration !%></h2></td>
+			<td><h2><a id="top" name="top"></a><%! Configuration !%></h2></td>
 			<td class="col_right"></td>
 		</tr>
 		<tr class="row_spacer">
@@ -33,7 +37,7 @@
 				<div class="links">
 					[<a href="#general"><%! General Settings !%></a>] [<a href="#vdr"><%! VDR !%></a>] [<a href="#identification"><%! Identification !%></a>] [<a href="#timeline"><%! Timeline !%></a>] [<a href="#autotimer"><%! AutoTimer !%></a>] [<a href="#timer"><%! Timer !%></a>] [<a href="#streaming"><%! Streaming !%></a>] [<a href="#expert"><%! Expert !%></a>] [<a href="#channels"><%! Channel Selections !%></a>]
 				</div>
-				<div class="group"><a name="general"></a><h3><%! General Settings !%></h3>
+				<div class="group"><a id="general" name="general"></a><h3><%! General Settings !%></h3>
 					<dl>
 						<dt><%! Skin: !%></dt>
 						<dd><%! The skin you want to use. !%></dd>
@@ -47,7 +51,7 @@
 					<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
 				</div>
 
-				<div class="group"><a name="vdr"></a><h3><%! VDR !%></h3>
+				<div class="group"><a id="vdr" name="vdr"></a><h3><%! VDR !%></h3>
 					<dl>
 						<dt><%! Number of DVB cards: !%></dt>
 						<dd><%! The number of DVB cards VDR can access. Depending on this value VDRAdmin will calculate critical timers in the <span class="ref_menu">Timer</span> menu. !%></dd>
@@ -55,11 +59,13 @@
 						<dd><%! The path to VDR's recordings. It's used so that VDRAdmin can locate the recordings when using <span class="ref_label">Recordings Streaming</span> and <span class="ref_file">reccmds.conf</span> in the <span class="ref_menu">Recordings</span> menu. !%></dd>
 						<dt><%! Path to configuration files: !%></dt>
 						<dd><%! The path where VDR's configuration files are located. If this directory contains the file <span class="ref_file">reccmds.conf</span> its content is shown in a selectbox in the <span class="ref_menu">Recordings</span> menu. !%></dd>
+						<dt><%! Path to EPG images: !%></dt>
+						<dd><%! The path where the EPG images are stored. !%></dd>
 					</dl>
 					<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
 				</div>
 
-				<div class="group"><a name="identification"></a><h3><%! Identification !%></h3>
+				<div class="group"><a id="identification" name="identification"></a><h3><%! Identification !%></h3>
 					<dl>
 						<dt><%! Username: !%></dt>
 						<dd><%! The username for the main user, i.e. the user having the most privileges. !%></dd>
@@ -75,7 +81,7 @@
 					<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
 				</div>
 
-				<div class="group"><a name="timeline"></a><h3><%! Timeline !%></h3>
+				<div class="group"><a id="timeline" name="timeline"></a><h3><%! Timeline !%></h3>
 					<dl>
 						<dt><%! Hours: !%></dt>
 						<dd><%! The number of hours to show in the timeline. !%></dd>
@@ -85,7 +91,7 @@
 					<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
 				</div>
 
-				<div class="group"><a name="autotimer"></a><h3><%! AutoTimer !%></h3>
+				<div class="group"><a id="autotimer" name="autotimer"></a><h3><%! AutoTimer !%></h3>
 					<dl>
 						<dt><%! Active: !%></dt>
 						<dd><%! Activate or deactivate the AutoTimer function. !%></dd>
@@ -99,7 +105,7 @@
 					<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
 				</div>
 
-				<div class="group"><a name="timer"></a><h3><%! Timer !%></h3>
+				<div class="group"><a id="timer" name="timer"></a><h3><%! Timer !%></h3>
 					<dl>
 						<dt><%! Priority: !%></dt>
 						<dd><%! An integer in the range <strong>0...99</strong>, defining the <strong>priority</strong> of this timer and of recordings created by this timer. <strong>0</strong> represents the lowest value, <strong>99</strong> the highest. The priority is used to decide which timer shall be started in case there are two or more timers with the exact same <strong>start</strong> time. The first timer in the list with the highest priority will be used.<br /><br />This value is also stored with the recording and is later used to decide which recording to remove from disk in order to free space for a new recording. If the disk runs full and a new recording needs more space, an existing recording with the lowest priority (and which has exceeded its guaranteed <strong>lifetime</strong>) will be removed.<br /><br />If all available DVB cards are currently occupied, a timer with a higher priority will interrupt the timer with the lowest priority in order to start recording. !%></dd>
@@ -113,7 +119,7 @@
 					<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
 				</div>
 
-				<div class="group"><a name="streaming"></a><h3><%! Streaming !%></h3>
+				<div class="group"><a id="streaming" name="streaming"></a><h3><%! Streaming !%></h3>
 					<dl>
 						<dt><%! Live Streaming: !%></dt>
 						<dd><%! Enable or disable live streaming using the <a href="http://www.magoa.net/linux/">streamdev plugin</a>. You also have to set the correct <span class="ref_label">HTTP Port for Streamdev</span> below. !%></dd>
@@ -127,7 +133,7 @@
 					<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
 				</div>
 
-				<div class="group"><a name="expert"></a><h3><%! Expert !%></h3>
+				<div class="group"><a id="expert" name="expert"></a><h3><%! Expert !%></h3>
 					<%! <p>This section is for experts <strong>only</strong>, i.e. you know what you are doing!</p> !%>
 					<dl>
 						<dt><%! Read EPG directly using epg.data: !%></dt>
@@ -140,10 +146,10 @@
 					<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
 				</div>
 
-				<div class="group"><a name="channels"></a><h3><%! Channel Selections !%></h3>
+				<div class="group"><a id="channels" name="channels"></a><h3><%! Channel Selections !%></h3>
 					<%! <p>If you want to limit the number of channels used in some parts of VDRAdmin, this is for you!</p>
 					<p>Use the radio buttons to activate or deactivate the wanted channels in the named menu.</p>
-					<p>To add channels to the list of wanted channels you have to select them in the left side selectbox and click <span class="submit">&gt;&gt;&gt;&gt;&gt;</span>. If you want to remove channels from the list of wanted channels you have to select them in the right side selectbox and click <span class="submit">&lt;&lt;&lt;&lt;&lt;</span>.</p> !%>
+					<p>To add channels to the list of wanted channels you have to select them in the left side selectbox and click <input type="submit" class="submit" value="&gt;&gt;&gt;&gt;&gt;"/>. If you want to remove channels from the list of wanted channels you have to select them in the right side selectbox and click <input type="submit" class="submit" value="&lt;&lt;&lt;&lt;&lt;"/>.</p> !%>
 					<div class="top_link">[<a href="#top"><%! Top !%></a>]</div>
 				</div>
 			</td>
@@ -155,6 +161,7 @@
 			<td class="col_right"></td>
 		</tr>
 	</table>
+</form>
 </body>
 
 </html>
diff --git a/template/default/help_no.html b/template/default/help_no.html
index ce4d70a..2dcf4a5 100644
--- a/template/default/help_no.html
+++ b/template/default/help_no.html
@@ -11,7 +11,7 @@
 	</tmpl_if>
 </head>
 
-<body id="timer_list">
+<body id="no">
 	<table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group">
 		<tr class="heading">
 			<td class="col_left"></td>
diff --git a/template/default/help_rec_list.html b/template/default/help_rec_list.html
index da6ff33..4835ca3 100644
--- a/template/default/help_rec_list.html
+++ b/template/default/help_rec_list.html
@@ -11,7 +11,7 @@
 	</tmpl_if>
 </head>
 
-<body id="timer_list">
+<body id="rec_list">
 	<table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group">
 		<tr class="heading">
 			<td class="col_left"></td>
@@ -44,8 +44,8 @@
 						<dd>This column is only shown if you activated and configured <span class="ref_label">Recordings Streaming</span> in the <span class="ref_menu">Configuration</span> menu. You can watch the recording at your workstation.</dd>
 					</dl>
 				</p>
-				<p>In addition to these functions you can delete a number of recordings at once by checking the box in the last but one column of those recordings and clicking <span class="submit">Delete Selected Recordings</span>.</p>
-				<p>If you've set the path the VDR's configuration files and have entries in VDR's <span class="ref_file">reccmds.conf</span> you can run those commands for the selected recording by selecting the wanted command in the select box locate next to <span class="ref_label">Commands:</span> and pressing the <span class="submit">Run</span> button.</p> !%>
+				<p>In addition to these functions you can delete a number of recordings at once by checking the box in the last but one column of those recordings and clicking <input type="submit" class="submit" value="Delete Selected Recordings"/>.</p>
+				<p>If you've set the path the VDR's configuration files and have entries in VDR's <span class="ref_file">reccmds.conf</span> you can run those commands for the selected recording by selecting the wanted command in the select box locate next to <span class="ref_label">Commands:</span> and pressing the <input type="submit" class="submit" value="Run"/> button.</p> !%>
 			</td>
 			<td class="col_right"></td>
 		</tr>
diff --git a/template/default/help_timer_list.html b/template/default/help_timer_list.html
index 3e6503a..b2a4479 100644
--- a/template/default/help_timer_list.html
+++ b/template/default/help_timer_list.html
@@ -12,6 +12,10 @@
 </head>
 
 <body id="timer_list">
+<form onsubmit="return false;">
+	<input type="hidden" name="aktion" value="show_help"/>
+	<input type="hidden" name="area" value="<tmpl_var area>"/>
+
 	<table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group">
 		<tr class="heading">
 			<td class="col_left"></td>
@@ -49,7 +53,7 @@
 					<span class="color_conflict">&nbsp;&nbsp;&nbsp;</span> / <img src="bilder/poempl_rot.gif" alt="impossible" align="absmiddle" /> Timer is critical and will most likely <strong>not</strong> record.<br />
 					<span class="color_inactive">&nbsp;&nbsp;&nbsp;</span> / <img src="bilder/poempl_grau.gif" alt="inactive" align="absmiddle" /> Timer is not active.
 				</p>
-				<p>In addition to these functions you can add a new timer by clicking <span class="submit">New Timer</span> at the top and you can delete a number of timers at once by checking the box in the last column of those timers and clicking <span class="submit">Delete Selected Timers</span>.</p> !%>
+				<p>In addition to these functions you can add a new timer by clicking <input type="submit" class="submit" value="New Timer"/> at the top and you can delete a number of timers at once by checking the box in the last column of those timers and clicking <input type="submit"  class="submit" value="Delete Selected Timers"/>.</p> !%>
 			</td>
 			<td class="col_right"></td>
 		</tr>
@@ -59,6 +63,7 @@
 			<td class="col_right"></td>
 		</tr>
 	</table>
+</form>
 </body>
 
 </html>
diff --git a/template/default/infobox.js b/template/default/infobox.js
index 5b81179..a4f8781 100644
--- a/template/default/infobox.js
+++ b/template/default/infobox.js
@@ -60,6 +60,8 @@ function tip(name){
 }
 
 function showtip(){
+  if (isNaN(x))	return;
+
   idiv.left=(((x+260)<winW)?x+12:x-255)+px; idiv.top=(((y+90)<winH)?y+12:y-90)+px;
   idiv.visibility=ns4?"show":"visible";
 //  window.status="idiv="+idiv+"X:"+(idiv.left?idiv.left:"NAN")+", Y:"+(idiv.top?idiv.top:"NAN")+", x:"+x+", y:"+y;
diff --git a/template/default/navigation.html b/template/default/navigation.html
index 24adc50..041cf5e 100644
--- a/template/default/navigation.html
+++ b/template/default/navigation.html
@@ -22,7 +22,7 @@
 
 <body id="navigation">
 	<div class="logo">
-		<a href="./" target="_top"><tmpl_if linvdr><img src="bilder/logo_linvdr.gif" alt="" height="50px" width="150px" border="0" /><tmpl_else><img src="bilder/logo_other.gif" alt="" height="50px" width="150px" border="0" /></tmpl_if></a>
+		<a href="./" target="_top"><tmpl_if linvdr><img src="bilder/logo_linvdr.gif" alt="" height="50px" width="150px" border="0" /><tmpl_else><img src="bilder/logo_other.gif" alt="" height="50" width="150" border="0" /></tmpl_if></a>
 	</div>
 	<div class="separator"></div>
 	<div class="navi">
@@ -38,7 +38,7 @@
 	</div>
 	<div class="separator"></div>
 	<div class="navi">
-		<a href="vdradmin.pl?aktion=prog_list" target="main"><%! Channels !%>
+		<a href="vdradmin.pl?aktion=prog_list" target="main"><%! Channels !%></a>
 	</div>
 	<div class="separator"></div>
 	<div class="navi">
diff --git a/template/default/prog_detail.html b/template/default/prog_detail.html
index d62f677..34821d6 100644
--- a/template/default/prog_detail.html
+++ b/template/default/prog_detail.html
@@ -34,14 +34,20 @@
 				</tmpl_if>
 				<br />
 				<tmpl_var text><br /><br />
+				<tmpl_if epgimages>
+					<tmpl_loop epgimages>
+						<img src="<tmpl_var image>"/>
+					</tmpl_loop>
+					<br /><br />
+				</tmpl_if>
 				&nbsp;<a href="javascript:window.close()">[<%! close !%>]</a>
 				<tmpl_if date>
 					&nbsp;<a href="javascript:callurl('<tmpl_var switchurl>')">[<%! view !%>]</a>
 					&nbsp;<a href="javascript:window.close();opener.location.href='<tmpl_var recurl>'">[<%! record !%>]</a>
-					&nbsp;<a href="vdradmin.pl?search=<tmpl_var title>&aktion=prog_summary&submit=go11)"  target="main">[<%! search !%>]</a>
+					&nbsp;<a href="vdradmin.pl?search=<tmpl_var find_title>&amp;aktion=prog_summary&amp;submit=go11)"  target="main">[<%! search !%>]</a>
 				</tmpl_if>
-				<tmpl_if title>
-					&nbsp;<a href="http://akas.imdb.com/Tsearch?title=<tmpl_var	title>" target="_blank" title="<%! Lookup movie in the Internet-Movie-Database (IMDb) !%>">[IMDb]</a>
+				<tmpl_if imdburl>
+					&nbsp;<a href="http://akas.imdb.com/Tsearch?title=<tmpl_var find_title>" target="_blank" title="<%! Lookup movie in the Internet-Movie-Database (IMDb) !%>">[IMDb]</a>
 				</tmpl_if>
 			</td>
 			<td class="col_right"></td>
diff --git a/template/default/prog_list.html b/template/default/prog_list.html
index f4fc6c7..032cc58 100644
--- a/template/default/prog_list.html
+++ b/template/default/prog_list.html
@@ -8,7 +8,7 @@
 	<tmpl_if usercss>
 		<link href="user.css" rel="stylesheet" media="screen" type="text/css" />
 	</tmpl_if>
-	<script language="JavaScript" src="library.js"></script>
+	<script type="text/javascript" language="JavaScript" src="library.js"></script>
 </head>
 
 <body id="prog_list">
@@ -20,12 +20,12 @@
 					<h1>
 						<a href="javascript:callurl('<tmpl_var switchurl>');"><tmpl_var progname></a>&nbsp;&nbsp;
 <tmpl_if stream_live_on>
-						<a href="<tmpl_var streamurl>"><img src="bilder/stream.jpg" alt="stream" title="<%! Stream !%>" height="17" align="center" border="0" /></a>
+						<a href="<tmpl_var streamurl>"><img src="bilder/stream.jpg" alt="stream" title="<%! Stream !%>" height="17" align="middle" border="0" /></a>
 </tmpl_if>
 					</h1>
 				</td>
 				<td class="col_other"><%! Channel: !%>&nbsp; 
-					<select name="vdr_id" class="submit" onchange="window.open('<tmpl_var url>?aktion=prog_list&vdr_id=' + this.options[this.selectedIndex].value,'main')">
+					<select name="vdr_id" class="submit" onchange="window.open('<tmpl_var url>?aktion=prog_list&amp;vdr_id=' + this.options[this.selectedIndex].value,'main')">
 <tmpl_loop chanloop>
 						<option value="<tmpl_var vdr_id>" <tmpl_if current>selected</tmpl_if>><tmpl_var name></option>
 </tmpl_loop>
@@ -58,14 +58,17 @@
 	<tmpl_else>
 		<tmpl_unless endd>
 			<tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>">
-				<td class="col_left"><a name="<tmpl_var anchor>">&nbsp;</a></td>
+				<td class="col_left"><a id="<tmpl_var anchor>" name="<tmpl_var anchor>">&nbsp;</a></td>
 				<td class="col_duration">
 					<tmpl_var emit> - <tmpl_var duration>
 				</td>
 				<td class="col_title">
 					<h3><tmpl_var title></h3>
-					<tmpl_unless subtitle><br /></tmpl_unless>
-					<h4><tmpl_var subtitle></h4>
+					<tmpl_if subtitle>
+						<h4><tmpl_var subtitle></h4>
+					<tmpl_else>
+						<br />
+					</tmpl_if>
 				</td>
 				<td class="col_info">
 					<tmpl_if infurl>
diff --git a/template/default/prog_list2.html b/template/default/prog_list2.html
index bbe7768..081bbe2 100644
--- a/template/default/prog_list2.html
+++ b/template/default/prog_list2.html
@@ -25,17 +25,19 @@
 		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
 			<tr>
 				<td class="col_left"></td>
-				<td class="col_title"><h1><%! Playing Today !%></h1></td>
-<!-- TODO: really need this?
-				<td class="col_other"><%! Channel: !%>&nbsp;
-					<select name="vdr_id" class="submit" onchange="window.open('<tmpl_var url>?aktion=prog_list&vdr_id=' + this.options[this.selectedIndex].value,'main')">
-<tmpl_loop chanloop>
-						<option value="<tmpl_var vdr_id>" <tmpl_if current>selected</tmpl_if>><tmpl_var name></option>
-</tmpl_loop>
-					</select>&nbsp;<input type="submit" name="submit" value="<%! Go! !%>" />
-					<a href="javascript:toolbar('<tmpl_var toolbarurl>');" target="toolbar"><img src="bilder/spacer.gif" border="0" /></a>
+				<td class="col_title"><h1><tmpl_var title></h1></td>
+				<td class="col_other">
+					<tmpl_if prevdayurl>
+						<a href="<tmpl_var prevdayurl>"><img src="bilder/pfeile_nachlinks.gif" border="0" width="28" height="17" /></a>
+					<tmpl_else>
+						<img src="bilder/pfeile_nachlinks_soft.gif" border="0" width="28" height="17" />
+					</tmpl_if>
+					<tmpl_if nextdayurl>
+						<a href="<tmpl_var nextdayurl>"><img src="bilder/pfeile_nachrechts.gif" border="0" width="29" height="17" /></a>
+					<tmpl_else>
+						<img src="bilder/pfeile_nachrechts_soft.gif" border="0" width="29" height="17" />
+					</tmpl_if>
 				</td>
--->
 				<td class="col_right"></td>
 			</tr>
 		</table>
@@ -64,12 +66,17 @@
 	<tmpl_else>
 		<tmpl_unless endd>
 			<tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>">
-				<td class="col_left"><a name="<tmpl_var anchor>">&nbsp;</a></td>
+				<td class="col_left"><a id="<tmpl_var anchor>" name="<tmpl_var anchor>">&nbsp;</a></td>
 				<td class="col_duration">
 					<tmpl_var emit> - <tmpl_var duration>
 				</td>
 				<td class="col_title">
-					<h3><tmpl_var title></h3><tmpl_unless subtitle><br /></tmpl_unless><h4><tmpl_var subtitle></h4>
+					<h3><tmpl_var title></h3>
+					<tmpl_if subtitle>
+						<h4><tmpl_var subtitle></h4>
+					<tmpl_else>
+						<br />
+					</tmpl_if>
 				</td>
 				<td class="col_info">
 					<tmpl_if infurl><a href="javascript:popup('<tmpl_var infurl>');"><img src="bilder/info_button.gif" border="0" /></a><tmpl_else><img src="bilder/info_button_disabled.gif" border="0" /></tmpl_if>
diff --git a/template/default/prog_summary.html b/template/default/prog_summary.html
index 606b76d..0d3b9ac 100644
--- a/template/default/prog_summary.html
+++ b/template/default/prog_summary.html
@@ -9,7 +9,7 @@
 	<tmpl_if usercss>
 		<link href="user.css" rel="stylesheet" media="screen" type="text/css" />
 	</tmpl_if>
-	<script language="JavaScript" src="library.js"></script>
+	<script type="text/javascript" language="JavaScript" src="library.js"></script>
 </head>
 
 <body id="prog_summary">
@@ -37,7 +37,7 @@
 			<tr class="heading">
 				<td class="col_left"></td>
 				<td>
-					<a name="<tmpl_var anchor>"></a>
+					<a id="<tmpl_var anchor>" name="<tmpl_var anchor>"></a>
 					<h2><a href="<tmpl_var proglink>"><tmpl_var progname></a></h2>
 					<tmpl_if stream_live_on>
 						&nbsp;<a href="<tmpl_var streamurl>" title="<%! Stream !%>">[S]</a>
@@ -71,7 +71,7 @@
 				<td>
 					<tmpl_if recurl>
 						<a href="javascript:callurl('<tmpl_var switchurl>');"><img src="bilder/sum_view.gif" width="58" height="22" border="0" alt="<%! TV select !%>" onmouseover="window.status='<%! TV select !%>';return true" title="<%! TV select !%>" /></a>
-						<a href="vdradmin.pl?search=<tmpl_var title>&aktion=prog_summary&submit=go11)"><img src="bilder/sum_find.gif" width="58" height="22" border="0" alt="<%! Search for other show times !%>" onmouseover="window.status='<%! Search for other show times !%>';return true" title="<%! Search for other show times !%>" /></a>
+						<a href="vdradmin.pl?search=<tmpl_var find_title>&amp;aktion=prog_summary&amp;submit=go11)"><img src="bilder/sum_find.gif" width="58" height="22" border="0" alt="<%! Search for other show times !%>" onmouseover="window.status='<%! Search for other show times !%>';return true" title="<%! Search for other show times !%>" /></a>
 						<tmpl_if summary>
 							<a href="javascript:popup('<tmpl_var infurl>');"><img src="bilder/sum_info.gif" width="58" height="22" border="0" alt="<%! More Information !%>" onmouseover="window.status='<%! More Information !%>';return true" title="<%! More Information !%>" /></a>
 						<tmpl_else>
diff --git a/template/default/prog_timeline.html b/template/default/prog_timeline.html
index 046b368..bad19e7 100644
--- a/template/default/prog_timeline.html
+++ b/template/default/prog_timeline.html
@@ -52,7 +52,7 @@
 		#bigtable { position:absolute; top:100px; left: <?% left %?>px; z-index: 1; }
 	</style>
 
-	<script language="JavaScript">
+	<script type="text/javascript" language="JavaScript">
 		function Go(x) {
 			if(x =="nothing") {
 				document.forms[0].reset();
@@ -96,7 +96,7 @@
 						<option value="<?% nowurl %?>"><%! now !%></option>
 <?% FOREACH timer = times %?>
 	<?% timer_o_dopp = timer | replace('\:', '') %?>
-						<option value="<?% nowurl %?>&time=<?% timer_o_dopp %?>" <?% "selected" IF now == timer %?>><?% timer %?></option>
+						<option value="<?% nowurl %?>&amp;time=<?% timer_o_dopp %?>" <?% "selected" IF now == timer %?>><?% timer %?></option>
 <?% END %?>
 					</select>
 					&nbsp;|&nbsp;<%! at: !%>&nbsp;
@@ -117,7 +117,7 @@
 				<tr class="heading">
 					<td class="col_left"></td>
 					<td colspan="3" width='<?% breite + seite %?>'><h2><%! Timeline: !%>&nbsp;<?% date.format(akt_sekunde, '%H:%M') %?>&nbsp;<%! o'clock !%>&nbsp;<%! to !%>&nbsp;<?% date.format(bis_sec, '%H:%M') %?>&nbsp;<%! o'clock !%></h2></td>
-					<td class="col_navi"><?% IF akt_stunde <= jetzt_stunde %?><img src="bilder/pfeile_nachlinks_soft.gif" border="0" width="28" height="17" /><?% ELSE %?><a href="<?% nowurl %?>&time=<?% akt_stunde - zeitrahmen | format('%02d') %?><?% akt_minute | format('%02d') %?>"><img src="bilder/pfeile_nachlinks.gif" border="0" width="28" height="17" /></a><?% END %?><a href="<?% nowurl %?>&time=<?% bis_stunde | format('%02d') %?><?% akt_minute | format('%02d') %?>"><img src="bilder/pfeile_nachrechts.gif" border="0" width="29" height="17" /></a></td>
+					<td class="col_navi"><?% IF akt_stunde <= jetzt_stunde %?><img src="bilder/pfeile_nachlinks_soft.gif" border="0" width="28" height="17" /><?% ELSE %?><a href="<?% nowurl %?>&amp;time=<?% akt_stunde - zeitrahmen | format('%02d') %?><?% akt_minute | format('%02d') %?>"><img src="bilder/pfeile_nachlinks.gif" border="0" width="28" height="17" /></a><?% END %?><a href="<?% nowurl %?>&amp;time=<?% bis_stunde | format('%02d') %?><?% akt_minute | format('%02d') %?>"><img src="bilder/pfeile_nachrechts.gif" border="0" width="29" height="17" /></a></td>
 					<td class="col_right"></td>
 				</tr>
 				<tr class="row_spacer">
@@ -219,7 +219,7 @@
 											<td width="1" class="<?% td_class %?>" onMouseOver="tip('VDR-<?% show.vdr_id %?>-<?% counter %?>'); return true;" onMouseOut="untip(); return true;">
 												<img src="bilder/spacer.gif" width="<?% laenge_pix %?>" height="1" border="0" hspace="0" /><br />
 												<nobr>
-													<?% IF show.summary %?><a href="javascript:popup('./vdradmin.pl?aktion=prog_detail&epg_id=<?% show.anchor %?>&vdr_id=<?% show.vdr_id %?>');"><?% END %?>
+													<?% IF show.summary %?><a href="javascript:popup('./vdradmin.pl?aktion=prog_detail&amp;epg_id=<?% show.anchor %?>&amp;vdr_id=<?% show.vdr_id %?>');"><?% END %?>
 													<?% IF laenge_chars > 2 %?>
 														<?% show.title | truncate( laenge_chars ) %?>
 													<?% ELSE %?>
diff --git a/template/default/rc.html b/template/default/rc.html
index b7b788e..1c18c65 100644
--- a/template/default/rc.html
+++ b/template/default/rc.html
@@ -8,18 +8,18 @@
 	<tmpl_if usercss>
 		<link href="user.css" rel="stylesheet" media="screen" type="text/css" />
 	</tmpl_if>
-	<script language="JavaScript">
+	<script type="text/javascript" language="JavaScript">
 		<!--
     	function switch_channel(url) {
       	Now = new Date();
-      	document.switchimage.src = url + "&" + Now.getTime();
+      	document.switchimage.src = url + "&amp;" + Now.getTime();
     	}
     //-->
 	</script>
 </head>
 
 <body id="rc">
-	<table width="200" border="0" cellspacing="0" cellpadding="0" background="bilder/fern_back.jpg">
+	<table width="200" border="0" cellspacing="0" cellpadding="0" style="background-image: url(bilder/fern_back.jpg);">
 		<tr>
 			<td></td>
 			<td><img src="bilder/spacer.gif" alt="" height="20" width="50" border="0" /></td>
@@ -28,7 +28,7 @@
 		<tr>
 			<td></td>
 			<td></td>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=power');"><img src="bilder/fern_03.jpg" alt="" height="27" width="68" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=power');"><img src="bilder/fern_03.jpg" alt="" height="27" width="68" border="0" /></a></td>
 		</tr>
 		<tr>
 			<td></td>
@@ -36,23 +36,23 @@
 			<td></td>
 		</tr>
 		<tr>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=1');"><img src="bilder/fern_05.jpg" alt="" height="28" width="67" border="0" /></a></td>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=2');"><img src="bilder/fern_06.jpg" alt="" height="28" width="66" border="0" /></a></td>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=3');"><img src="bilder/fern_07.jpg" alt="" height="28" width="67" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=1');"><img src="bilder/fern_05.jpg" alt="" height="28" width="67" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=2');"><img src="bilder/fern_06.jpg" alt="" height="28" width="66" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=3');"><img src="bilder/fern_07.jpg" alt="" height="28" width="67" border="0" /></a></td>
 		</tr>
 		<tr>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=4');"><img src="bilder/fern_08.jpg" alt="" height="28" width="67" border="0" /></a></td>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=5');"><img src="bilder/fern_09.jpg" alt="" height="28" width="66" border="0" /></a></td>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=6');"><img src="bilder/fern_10.jpg" alt="" height="28" width="67" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=4');"><img src="bilder/fern_08.jpg" alt="" height="28" width="67" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=5');"><img src="bilder/fern_09.jpg" alt="" height="28" width="66" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=6');"><img src="bilder/fern_10.jpg" alt="" height="28" width="67" border="0" /></a></td>
 		</tr>
 		<tr>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=7');"><img src="bilder/fern_11.jpg" alt="" height="28" width="67" border="0" /></a></td>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=8');"><img src="bilder/fern_12.jpg" alt="" height="28" width="66" border="0" /></a></td>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=9');"><img src="bilder/fern_13.jpg" alt="" height="28" width="67" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=7');"><img src="bilder/fern_11.jpg" alt="" height="28" width="67" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=8');"><img src="bilder/fern_12.jpg" alt="" height="28" width="66" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=9');"><img src="bilder/fern_13.jpg" alt="" height="28" width="67" border="0" /></a></td>
 		</tr>
 		<tr>
 			<td></td>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=0');"><img src="bilder/fern_15.jpg" alt="" height="28" width="66" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=0');"><img src="bilder/fern_15.jpg" alt="" height="28" width="66" border="0" /></a></td>
 			<td></td>
 		</tr>
 		<tr>
@@ -61,12 +61,12 @@
 			<td></td>
 		</tr>
 		<tr>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=menu');"><img src="bilder/fern_18.jpg" alt="" height="27" width="67" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=menu');"><img src="bilder/fern_18.jpg" alt="" height="27" width="67" border="0" /></a></td>
 			<td></td>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=back');"><img src="bilder/fern_19.jpg" alt="" height="27" width="67" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=back');"><img src="bilder/fern_19.jpg" alt="" height="27" width="67" border="0" /></a></td>
 		</tr>
 		<tr>
-			<td colspan="3"><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=red');"><img src="bilder/fern_22.jpg" alt="" height="28" width="50" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=green');"><img src="bilder/fern_23.jpg" alt="" height="28" width="49" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=yellow');"><img src="bilder/fern_24.jpg" alt="" height="28" width="51" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=blue');"><img src="bilder/fern_25.jpg" alt="" height="28" width="50" border="0" /></a></td>
+			<td colspan="3"><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=red');"><img src="bilder/fern_22.jpg" alt="" height="28" width="50" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=green');"><img src="bilder/fern_23.jpg" alt="" height="28" width="49" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=yellow');"><img src="bilder/fern_24.jpg" alt="" height="28" width="51" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=blue');"><img src="bilder/fern_25.jpg" alt="" height="28" width="50" border="0" /></a></td>
 		</tr>
 		<tr>
 			<td></td>
@@ -75,7 +75,7 @@
 		</tr>
 		<tr>
 			<td></td>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=up');"><img src="bilder/fern_28.jpg" alt="" height="27" width="66" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=up');"><img src="bilder/fern_28.jpg" alt="" height="27" width="66" border="0" /></a></td>
 			<td></td>
 		</tr>
 		<tr>
@@ -84,9 +84,9 @@
 			<td></td>
 		</tr>
 		<tr>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=left');"><img src="bilder/fern_31.jpg" alt="" height="27" width="67" border="0" /></a></td>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=ok');"><img src="bilder/fern_32.jpg" alt="" height="27" width="66" border="0" /></a></td>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=right');"><img src="bilder/fern_33.jpg" alt="" height="27" width="67" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=left');"><img src="bilder/fern_31.jpg" alt="" height="27" width="67" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=ok');"><img src="bilder/fern_32.jpg" alt="" height="27" width="66" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=right');"><img src="bilder/fern_33.jpg" alt="" height="27" width="67" border="0" /></a></td>
 		</tr>
 		<tr>
 			<td></td>
@@ -95,7 +95,7 @@
 		</tr>
 		<tr>
 			<td></td>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=down');"><img src="bilder/fern_36.jpg" alt="" height="27" width="66" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=down');"><img src="bilder/fern_36.jpg" alt="" height="27" width="66" border="0" /></a></td>
 			<td></td>
 		</tr>
 		<tr>
@@ -104,9 +104,9 @@
 			<td><img src="bilder/spacer.gif" name="switchimage" width="1" height="1" /> </td>
 		</tr>
 		<tr>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=VolumeMinus');"><img src="bilder/fern_39.jpg" alt="" height="27" width="67" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=VolumeMinus');"><img src="bilder/fern_39.jpg" alt="" height="27" width="67" border="0" /></a></td>
 			<td></td>
-			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=VolumePlus');"><img src="bilder/fern_40.jpg" alt="" height="27" width="67" border="0" /></a></td>
+			<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=VolumePlus');"><img src="bilder/fern_40.jpg" alt="" height="27" width="67" border="0" /></a></td>
 		</tr>
 		<tr>
 			<td></td>
diff --git a/template/default/rec_edit.html b/template/default/rec_edit.html
index 2b12a7d..c77c255 100644
--- a/template/default/rec_edit.html
+++ b/template/default/rec_edit.html
@@ -25,7 +25,7 @@
 
 		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="group">
 			<tr class="heading">
-				<td class="col_left"/td>
+				<td class="col_left"</td>
 				<td colspan="2"></td>
 				<td class="col_right"></td>
 			</tr>
@@ -37,13 +37,13 @@
 			<tr class="row_odd">
 				<td class="col_left"></td>
 				<td class="col_label"><h5><%! Original Name of Recording: !%></h5></td>
-				<td class="col_value"><input type="text" name="title" value="<tmpl_var title>" size="55" readonly /></td>
+				<td class="col_value"><input type="text" name="title" value="<tmpl_var title escape="HTML">" size="55" readonly /></td>
 				<td class="col_right"></td>
 			</tr>
 			<tr class="row_even">
 				<td class="col_left"></td>
 				<td class="col_label"><h5><%! New Name of Recording: !%></h5></td>
-				<td class="col_value"><input type="text" name="nn" value="<tmpl_var title>" size="55" /></td>
+				<td class="col_value"><input type="text" name="nn" value="<tmpl_var title escape="HTML">" size="55" /></td>
 				<td class="col_right"></td>
 			</tr>
 			<tr class="footer">
diff --git a/template/default/rec_list.html b/template/default/rec_list.html
index 7694224..28aa4a4 100644
--- a/template/default/rec_list.html
+++ b/template/default/rec_list.html
@@ -54,7 +54,7 @@
 			</colgroup>
 			<tr class="heading">
 				<td class="col_left"></td>
-				<td class="col_date" <tmpl_if sortbydate>selected="yes"</tmpl_if>>
+				<td class="col_date <tmpl_if sortbydate>selected</tmpl_if>">
 					<h2>
 						<a href="<tmpl_var sortbydateurl>"><%! Date !%>
 							<tmpl_if sortbydate>
@@ -65,7 +65,7 @@
 						</a>
 					</h2>
 				</td>
-				<td class="col_time" <tmpl_if sortbytime>selected="yes"</tmpl_if>>
+				<td class="col_time <tmpl_if sortbytime>selected</tmpl_if>">
 					<h2>
 						<a href="<tmpl_var sortbytimeurl>"><%! Time !%>
 							<tmpl_if sortbytime>
@@ -76,7 +76,7 @@
 						</a>
 					</h2>
 				</td>
-				<td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>>
+				<td class="col_name <tmpl_if sortbyname>selected</tmpl_if>">
 					<h2>
 						<a href="<tmpl_var sortbynameurl>"><%! Name !%>
 							<tmpl_if sortbyname>
@@ -97,9 +97,9 @@
 			</tr>
 			<tr class="row_spacer">
 				<td class="col_left"></td>
-				<td class="col_date" <tmpl_if sortbydate>selected="yes"</tmpl_if>></td>
-				<td class="col_time" <tmpl_if sortbytime>selected="yes"</tmpl_if>></td>
-				<td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>></td>
+				<td class="col_date <tmpl_if sortbydate>selected</tmpl_if>"></td>
+				<td class="col_time <tmpl_if sortbytime>selected</tmpl_if>"></td>
+				<td class="col_name <tmpl_if sortbyname>selected</tmpl_if>"></td>
 				<td colspan="<tmpl_if stream_rec_on>4<tmpl_else>3</tmpl_if>"></td>
 				<td class="col_right"></td>
 			</tr>
@@ -107,11 +107,11 @@
 <tmpl_loop recloop>
 			<tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>">
 				<td class="col_left"></td>
-				<td class="col_date" <tmpl_if sortbydate>selected="yes"</tmpl_if>>
+				<td class="col_date <tmpl_if sortbydate>selected</tmpl_if>">
 					<span class="date"><tmpl_var date></span>
 					<tmpl_if isfolder><span class="total"><%! Total !%></span></tmpl_if>
 				</td>
-				<td class="col_time" <tmpl_if sortbytime>selected="yes"</tmpl_if>>
+				<td class="col_time <tmpl_if sortbytime>selected</tmpl_if>">
 					<span class="time"><tmpl_var time></span>
 					<span class="new">
 						<tmpl_if isfolder>
@@ -123,11 +123,11 @@
 						</tmpl_if>
 					</span>
 				</td>
-				<td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>>
+				<td class="col_name <tmpl_if sortbyname>selected</tmpl_if>">
 					<tmpl_if isfolder>
-						<a href="<tmpl_var infurl>"><img align="absmiddle" src="bilder/folder_video.gif" border="0" />&nbsp;<tmpl_var name></a>
+						<a href="<tmpl_var infurl>"><img align="middle" src="bilder/folder_video.gif" border="0" />&nbsp;<tmpl_var name></a>
 					<tmpl_else>
-						<a href="javascript:popup('<tmpl_var infurl>');"><img align="absmiddle" src="bilder/aktion.gif" border="0" />&nbsp;<tmpl_var name></a>
+						<a href="javascript:popup('<tmpl_var infurl>');"><img align="middle" src="bilder/aktion.gif" border="0" />&nbsp;<tmpl_var name></a>
 					</tmpl_if>
 				</td>
 				<td class="col_edit">
@@ -137,7 +137,7 @@
 				</td>
 				<td  class="col_delete">
 					<tmpl_unless isfolder>
-						<a href="javascript:del('<%! Delete recording? !%>', '<tmpl_var delurl>');"><img src="bilder/delete.gif" alt="delete" title="<%! Delete !%>" height="17" width="17" border="0" /></a>
+						<a href="javascript:del('<%! Delete recording? !%>\n\n&quot;<tmpl_var name>&quot;', '<tmpl_var delurl>');"><img src="bilder/delete.gif" alt="delete" title="<%! Delete !%>" height="17" width="17" border="0" /></a>
 					</tmpl_unless>
 				</td>
 				<td class="col_checkbox">
@@ -156,9 +156,9 @@
 
 			<tr class="footer">
 				<td class="col_left"></td>
-				<td class="col_date" <tmpl_if sortbydate>selected="yes"</tmpl_if>></td>
-				<td class="col_time" <tmpl_if sortbytime>selected="yes"</tmpl_if>></td>
-				<td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>></td>
+				<td class="col_date <tmpl_if sortbydate>selected</tmpl_if>"></td>
+				<td class="col_time <tmpl_if sortbytime>selected</tmpl_if>"></td>
+				<td class="col_name <tmpl_if sortbyname>selected</tmpl_if>"></td>
 				<td colspan="<tmpl_if stream_rec_on>4<tmpl_else>3</tmpl_if>"></td>
 				<td class="col_right"></td>
 			</tr>
diff --git a/template/default/style.css b/template/default/style.css
index 3f57d09..e24ed8a 100644
--- a/template/default/style.css
+++ b/template/default/style.css
@@ -8,7 +8,6 @@ textarea { color: black; font-weight: normal; font-size: 11px; }
 select { color: black; font-weight: normal; font-size: 11px; }
 b { font-weight: bold }
 i { font-style: italic }
-.gbutton { color: black; font-weight: bold; }
 .submit { height: 20px; }
 
 h1 { margin-right: 12px; margin-left: 12px; font-size: 13px; font-weight: bold; color: black; display: inline; }
@@ -39,19 +38,19 @@ label + input { margin-left: 1em; }
 .col_wanted_channels { text-align: left; padding: 10px; width: 40%; }
 .col_navi { text-align: right; white-space: nowrap; }
 
-.heading td[selected] { background-image: url("bilder/uebersicht_oben_selected.gif"); }
+.heading td.selected { background-image: url("bilder/uebersicht_oben_selected.gif"); }
 .heading td { background-image: url("bilder/uebersicht_oben.gif"); }
 .heading .col_left { background-image: url("bilder/uebersicht_oben_links.gif"); }
 .heading .col_right { background-image: url("bilder/uebersicht_oben_rechts.gif"); }
-.row_odd td[selected] { background-image: url("bilder/uebersicht_mitte_dark_selected.gif"); }
+.row_odd td.selected { background-image: url("bilder/uebersicht_mitte_dark_selected.gif"); }
 .row_odd td { background-image: url("bilder/uebersicht_mitte_dark.gif"); }
 .row_odd .col_left { background-image: url("bilder/uebersicht_links_dark.gif"); }
 .row_odd .col_right { background-image: url("bilder/uebersicht_rechts_dark.gif"); }
-.row_even td[selected], .row_spacer td[selected] { background-image: url("bilder/uebersicht_mitte_selected.gif"); }
+.row_even td.selected, .row_spacer td.selected { background-image: url("bilder/uebersicht_mitte_selected.gif"); }
 .row_even td, .row_spacer td { background-image: url("bilder/uebersicht_mitte.gif"); }
 .row_even .col_left, .row_spacer .col_left { background-image: url("bilder/uebersicht_links.gif"); }
 .row_even .col_right, .row_spacer .col_right { background-image: url("bilder/uebersicht_rechts.gif"); }
-.footer td[selected] { height: 30px; background-image: url("bilder/uebersicht_unten_selected.gif"); }
+.footer td.selected { height: 30px; background-image: url("bilder/uebersicht_unten_selected.gif"); }
 .footer td { height: 30px; background-image: url("bilder/uebersicht_unten.gif"); }
 .footer .col_left { background-image: url("bilder/uebersicht_unten_links.gif"); }
 .footer .col_right { background-image: url("bilder/uebersicht_unten_rechts.gif"); }
@@ -70,7 +69,7 @@ label + input { margin-left: 1em; }
 #heading .col_left { min-width: 15px; width: 15px; background-image: url("bilder/nav_button_back_start.gif"); }
 #heading .col_title { background-image: url("bilder/nav_button_back_mitte.gif"); }
 #heading .col_other { text-align: right; background-image: url("bilder/nav_button_back_mitte.gif"); }
-#heading .col_other span { float: right; }
+#heading .col_other table { display: inline; }
 #heading .col_help { text-align: center; width: 45px; background-image: url("bilder/nav_button_back_mitte.gif"); }
 #heading .col_right { min-width: 15px; width: 15px; background-image: url("bilder/nav_button_back_end.gif"); }
 
@@ -110,10 +109,10 @@ label + input { margin-left: 1em; }
 #prog_summary .footer td { height: 38px; width: 246px; background-image: url("bilder/sum_bottom_mid.gif"); text-align: center; vertical-align: middle; }
 #prog_summary .footer .col_left { min-width: 12px; width: 12px; height: 38px; background-image: url("bilder/sum_bottom_left.gif"); }
 #prog_summary .footer .col_right { min-width: 12px; width: 12px; height: 38px; background-image: url("bilder/sum_bottom_right.gif"); }
-#prog_summary .date { text-align: right; margin-top: 1em; float: left; }
-#prog_summary .duration { text-align: right; margin-top: 1em; }
+#prog_summary .date { text-align: right; margin-top: 3px; float: left; }
+#prog_summary .duration { text-align: right; margin-top: 3px; }
 #prog_summary .title { margin-top: 1em; width: 246px; overflow: hidden; white-space: nowrap; }
-#prog_summary .summary { margin-top: 1em; margin-bottom: 1em; width: 240px; height: 100px; overflow: hidden; white-space: normal; }
+#prog_summary .summary { margin-top: 1em; margin-bottom: 3px; width: 240px; height: 124px; overflow: hidden; white-space: normal; }
 
 /* Tooltips */
 .tt_table { width: 250px; border: 2px solid #333399; background-color: #ccccff; }
diff --git a/template/default/timer_list.html b/template/default/timer_list.html
index afc95a1..66dc2e9 100644
--- a/template/default/timer_list.html
+++ b/template/default/timer_list.html
@@ -33,31 +33,24 @@
 	faktor=2.2;
 %?>
 
-	<table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
-		<tr>
-			<td class="col_left"></td>
-			<td class="col_title"><h1><%! Timer !%></h1></td>
-			<td class="col_other">
-				<span>
-					<table border="0" cellspacing="0" cellpadding="0">
-						<tr height="20">
-							<td width="12" height="20" background="bilder/gbutton_left.gif"></td>
-							<td align="center" height="20" background="bilder/gbutton_middle.gif">
-								<a href="<tmpl_var nturl>"><div class="gbutton"><%! New Timer !%></div></a>
-							</td>
-							<td width="12" height="20" background="bilder/gbutton_right.gif"></td>
-						</tr>
-					</table>
-				</span>
-			</td>
+	<form action="<tmpl_var url>" method="get" name="FormName0">
+		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
+			<tr>
+				<td class="col_left"></td>
+				<td class="col_title"><h1><%! Timer !%></h1></td>
+				<td class="col_other">
+					<input type="submit" class="submit" value="<%! New Timer !%>" name="new_timer"/>
+					<input type="hidden" name="aktion" value="timer_new_form"/>
+				</td>
 <tmpl_if help_url> 
-			<td class="col_help">
-				<a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.gif" border="0" alt="help" title="<%! Help !%>" /></a>
-			</td>
+				<td class="col_help">
+					<a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.gif" border="0" alt="help" title="<%! Help !%>" /></a>
+				</td>
 </tmpl_if>
-			<td class="col_right"></td>
-		</tr>
-	</table>
+				<td class="col_right"></td>
+			</tr>
+		</table>
+	</form>
 
 	<div id="content">
 		<form action="<tmpl_var url>" method="get" name="FormName1">
@@ -66,7 +59,7 @@
 					<td class="col_left"></td>
 					<td><h2><tmpl_var title></h2></td>
 					<td align="right">
-						<select name="vdr_id" class="submit" onchange="window.open('<tmpl_var url>?aktion=timer_list&timer=' + this.options[this.selectedIndex].value,'main')">
+						<select name="vdr_id" class="submit" onchange="window.open('<tmpl_var url>?aktion=timer_list&amp;timer=' + this.options[this.selectedIndex].value,'main')">
 <tmpl_loop day_loop>
 							<option value="<tmpl_var sortfield>" <tmpl_if current>selected</tmpl_if>><tmpl_var day></option>
 </tmpl_loop>
@@ -211,14 +204,14 @@
 					<col class="col_start"/>
 					<col class="col_stop"/>
 					<col class="col_name"/>
-					<col class0"col_edit"/>
+					<col class="col_edit"/>
 					<col class="col_delete"/>
 					<col class="col_checkbox"/>
 					<col class="col_right"/>
 				</colgroup>
 				<tr class="heading">
 					<td class="col_left"></td>
-					<td class="col_active" <tmpl_if sortbyactive>selected="yes"</tmpl_if>>
+					<td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>">
 						<h2>
 							<a href="<tmpl_var sortbyactiveurl>"><%! Active !%>
 								<tmpl_if sortbyactive>
@@ -229,7 +222,7 @@
 							</a>
 						</h2>
 					</td>
-					<td class="col_channel" <tmpl_if sortbychannel>selected="yes"</tmpl_if>>
+					<td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>">
 						<h2>
 							<a href="<tmpl_var sortbychannelurl>"><%! Channel !%>
 								<tmpl_if sortbychannel>
@@ -240,7 +233,7 @@
 							</a>
 						</h2>
 					</td>
-					<td class="col_date" <tmpl_if sortbyday>selected="yes"</tmpl_if>>
+					<td class="col_date <tmpl_if sortbyday>selected</tmpl_if>">
 						<h2>
 							<a href="<tmpl_var sortbydayurl>"><%! Date !%>
 								<tmpl_if sortbyday>
@@ -251,7 +244,7 @@
 							</a>
 						</h2>
 					</td>
-					<td class="col_start" <tmpl_if sortbystart>selected="yes"</tmpl_if>>
+					<td class="col_start <tmpl_if sortbystart>selected</tmpl_if>">
 						<h2>
 							<a href="<tmpl_var sortbystarturl>"><%! Start !%>
 								<tmpl_if sortbystart>
@@ -262,7 +255,7 @@
 							</a>
 						</h2>
 					</td>
-					<td class="col_stop" <tmpl_if sortbystop>selected="yes"</tmpl_if>>
+					<td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>">
 						<h2>
 							<a href="<tmpl_var sortbystopurl>"><%! Stop !%>
 								<tmpl_if sortbystop>
@@ -273,7 +266,7 @@
 							</a>
 						</h2>
 					</td>
-					<td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>>
+					<td class="col_name <tmpl_if sortbyname>selected</tmpl_if>">
 						<h2>
 							<a href="<tmpl_var sortbynameurl>"><%! Name !%>
 								<tmpl_if sortbyname>
@@ -291,12 +284,12 @@
 				</tr>
 				<tr class="row_spacer">
 					<td class="col_left"></td>
-					<td class="col_active" <tmpl_if sortbyactive>selected="yes"</tmpl_if>></td>
-					<td class="col_channel" <tmpl_if sortbychannel>selected="yes"</tmpl_if>></td>
-					<td class="col_date" <tmpl_if sortbyday>selected="yes"</tmpl_if>></td>
-					<td class="col_start" <tmpl_if sortbystart>selected="yes"</tmpl_if>></td>
-					<td class="col_stop" <tmpl_if sortbystop>selected="yes"</tmpl_if>></td>
-					<td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>></td>
+					<td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>"></td>
+					<td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>"></td>
+					<td class="col_date <tmpl_if sortbyday>selected</tmpl_if>"></td>
+					<td class="col_start <tmpl_if sortbystart>selected</tmpl_if>"></td>
+					<td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>"></td>
+					<td class="col_name <tmpl_if sortbyname>selected</tmpl_if>"></td>
 					<td colspan="3"></td>
 					<td class="col_right"></td>
 				</tr>
@@ -304,24 +297,24 @@
 <tmpl_loop timer_loop>
 				<tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>">
 					<td class="col_left"></td>
-					<td class="col_active" <tmpl_if sortbyactive>selected="yes"</tmpl_if>>
+					<td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>">
 						<div>
 							<tmpl_if expr="(active%32768) == 0">
-								<img src="bilder/poempl_grau.gif" alt="inactive" title="<%! This timer is inactive! !%>" width="19" height="19" align="absmiddle" border="0" />
+								<img src="bilder/poempl_grau.gif" alt="inactive" title="<%! This timer is inactive! !%>" width="19" height="19" align="middle" border="0" />
 							<tmpl_else>
 								<tmpl_if critical>
-									<img src="bilder/poempl_rot.gif" alt="impossible" title="<%! This timer is impossible! !%>" width="19" height="19" align="absmiddle" border="0" />
+									<img src="bilder/poempl_rot.gif" alt="impossible" title="<%! This timer is impossible! !%>" width="19" height="19" align="middle" border="0" />
 								<tmpl_else>
 									<tmpl_if collision>
-										<img src="bilder/poempl_gelb.gif" alt="nomore" title="<%! No more timers on other transponders possible! !%>" width="19" height="19" align="absmiddle" border="0" />
+										<img src="bilder/poempl_gelb.gif" alt="nomore" title="<%! No more timers on other transponders possible! !%>" width="19" height="19" align="middle" border="0" />
 									<tmpl_else>
 										<tmpl_if active>
-											<img src="bilder/poempl_gruen.gif" alt="possible" title="<%! Timer OK. !%>" width="19" height="19" align="absmiddle" border="0" />
+											<img src="bilder/poempl_gruen.gif" alt="possible" title="<%! Timer OK. !%>" width="19" height="19" align="middle" border="0" />
 										</tmpl_if>
 									</tmpl_if>
 								</tmpl_if>
 							</tmpl_if>
-							<a href="javascript:change('<%! Edit timer status? !%>','<tmpl_var toggleurl>&timer=<?% current %?>');">
+							<a href="javascript:change('<%! Edit timer status? !%>','<tmpl_var toggleurl>&amp;timer=<?% current %?>');">
 								<tmpl_if expr="active == 1"><%! Yes !%></tmpl_if>
 								<tmpl_if expr="(active%32768) == 0"><%! No !%></tmpl_if>
 								<tmpl_if expr="active == 5"><%! VPS !%></tmpl_if>
@@ -329,21 +322,21 @@
 							</a>
 						</div>
 					</td>
-					<td class="col_channel" <tmpl_if sortbychannel>selected="yes"</tmpl_if>>
+					<td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>">
 						<div><a href="<tmpl_var proglink>"><tmpl_var cdesc></a></div>
 					</td>
-					<td class="col_date" <tmpl_if sortbyday>selected="yes"</tmpl_if>>
+					<td class="col_date <tmpl_if sortbyday>selected</tmpl_if>">
 						<div><tmpl_var dor></div>
 					</td>
-					<td class="col_start" <tmpl_if sortbystart>selected="yes"</tmpl_if>>
+					<td class="col_start <tmpl_if sortbystart>selected</tmpl_if>">
 						<div><tmpl_var start></div>
 					</td>
-					<td class="col_stop" <tmpl_if sortbystop>selected="yes"</tmpl_if>>
+					<td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>">
 						<div><tmpl_var stop></div>
 					</td>
-					<td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>>
+					<td class="col_name <tmpl_if sortbyname>selected</tmpl_if>">
 						<div onMouseOver="tip('VDR-<tmpl_var id>'); return true;" onMouseOut="untip(); return true;">
-							<tmpl_if recording><img align="absmiddle" src="bilder/rec.gif" border="0" />&nbsp;</tmpl_if>
+							<tmpl_if recording><img align="middle" src="bilder/rec.gif" border="0" />&nbsp;</tmpl_if>
 							<tmpl_if infurl>
 								<a href="javascript:popup('<tmpl_var infurl>');"><tmpl_var title></a>
 							<tmpl_else>
@@ -355,7 +348,7 @@
 						<div><a href="<tmpl_var modurl>"><img src="bilder/edit.gif" alt="edit" title="<%! Edit !%>" height="17" width="17" border="0" /></a></div>
 					</td>
 					<td class="col_delete">
-						<div><a href="javascript:del('<%! Delete timer? !%>','<tmpl_var delurl>');"><img src="bilder/delete.gif" alt="delete" title="<%! Delete !%>" height="17" width="17" border="0" /></a></div>
+						<div><a href="javascript:del('<%! Delete timer? !%>\n\n&quot;<tmpl_var title>&quot;','<tmpl_var delurl>');"><img src="bilder/delete.gif" alt="delete" title="<%! Delete !%>" height="17" width="17" border="0" /></a></div>
 					</td>
 					<td class="col_checkbox">
 						<div><input type="checkbox" name="xxxx_<tmpl_var id>" /></div>
@@ -366,23 +359,22 @@
 
 				<tr class="footer">
 					<td class="col_left"></td>
-					<td class="col_active" <tmpl_if sortbyactive>selected="yes"</tmpl_if>></td>
-					<td class="col_channel" <tmpl_if sortbychannel>selected="yes"</tmpl_if>></td>
-					<td class="col_date" <tmpl_if sortbyday>selected="yes"</tmpl_if>></td>
-					<td class="col_start" <tmpl_if sortbystart>selected="yes"</tmpl_if>></td>
-					<td class="col_stop" <tmpl_if sortbystop>selected="yes"</tmpl_if>></td>
-					<td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>></td>
+					<td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>"></td>
+					<td class="col_channel <tmpl_if sortbychannel>selected</tmpl_if>"></td>
+					<td class="col_date <tmpl_if sortbyday>selected</tmpl_if>"></td>
+					<td class="col_start <tmpl_if sortbystart>selected</tmpl_if>"></td>
+					<td class="col_stop <tmpl_if sortbystop>selected</tmpl_if>"></td>
+					<td class="col_name <tmpl_if sortbyname>selected</tmpl_if>"></td>
 					<td colspan="3"></td>
 					<td class="col_right"></td>
 				</tr>
 			</table>
-		</div>
 
-		<div id="buttons">
-			<input type="submit" class="submit" name="timer_delete" value="<%! Delete Selected Timers !%>" onclick="return mdel('<%! Delete all selected timers? !%>');" />
-		</div>
-		<input type="hidden" name="aktion" value="timer_delete" />
-	</form>
+			<div id="buttons">
+				<input type="submit" class="submit" name="timer_delete" value="<%! Delete Selected Timers !%>" onclick="return mdel('<%! Delete all selected timers? !%>');" />
+			</div>
+			<input type="hidden" name="aktion" value="timer_delete" />
+		</form>
 	</div>
 </body>
 </html>
diff --git a/template/default/timer_new.html b/template/default/timer_new.html
index 75f8224..d900f73 100644
--- a/template/default/timer_new.html
+++ b/template/default/timer_new.html
@@ -119,7 +119,7 @@
 			</tr>
 			<tr class="row_odd">
 				<td class="col_left"></td>
-				<td class="col_label"><h5><%! Start Time: !%><h5></td>
+				<td class="col_label"><h5><%! Start Time: !%></h5></td>
 				<td class="col_value">
 					<input type="text" name="starth" value="<tmpl_var starth>" size="2" maxlength="2" />
 					<b>&nbsp;:&nbsp;</b>
diff --git a/template/default/tv.html b/template/default/tv.html
index fc606e0..0be28bc 100644
--- a/template/default/tv.html
+++ b/template/default/tv.html
@@ -9,7 +9,7 @@
 		<link href="user.css" rel="stylesheet" media="screen" type="text/css" />
 	</tmpl_if>
 	<script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
-	<script language="JavaScript">
+	<script type="text/javascript" language="JavaScript">
 		<!--
 		var aktiv;
 		var interval = 5;
@@ -17,13 +17,13 @@
 
 		function switch_channel(url) {
 			Now = new Date();
-			document.switchimage.src = url + "&" + Now.getTime();
+			document.switchimage.src = url + "&amp;" + Now.getTime();
       window.setTimeout("WebcamUpdate()", 500);
 		}
 
 		function WebcamUpdate() {
 			Now = new Date();
-			NewPicUrl = "<tmpl_var url>&size=" + size + "&" + Now.getTime();
+			NewPicUrl = "<tmpl_var url>&amp;size=" + size + "&amp;" + Now.getTime();
 			document.Bild.src = NewPicUrl;
 		}
 
@@ -60,15 +60,15 @@
 		}
 
 		function tv_open() {
-	 		window.open("./vdradmin.pl?aktion=tv_show&new_win=1", "_blank", "width=615, height=548, resizable=yes, scrollbars=no, status=no, toolbar=no");
+	 		window.open("./vdradmin.pl?aktion=tv_show&amp;new_win=1", "_blank", "width=615, height=548, resizable=yes, scrollbars=no, status=no, toolbar=no");
 		}
 		//-->
 	</script>
 </head>
 
 <body onLoad="go()" id="tv"> 
-	<form name="liveform">
-		<table width="200" border="0" cellspacing="0" cellpadding="0" background="bilder/tv_bottom.gif">
+	<form action="<tmpl_var url>" method="get" name="liveform">
+		<table width="200" border="0" cellspacing="0" cellpadding="0" style="background-image: url(bilder/tv_bottom.gif);">
 			<tr>
 				<td align="center" valign="middle"><img name="Bild" src="<tmpl_var url>" border="1" hspace="2" vspace="2" /></td>
 				<td><img src="bilder/spacer.gif" name="switchimage" width="2" height="1" /></td>
@@ -82,7 +82,7 @@
 						<tr>
 							<td></td>
 							<td></td>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=power');"><img src="bilder/fern_03.jpg" alt="" height="27" width="68" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=power');"><img src="bilder/fern_03.jpg" alt="" height="27" width="68" border="0" /></a></td>
 						</tr>
 						<tr>
 							<td></td>
@@ -90,23 +90,23 @@
 							<td></td>
 						</tr>
 						<tr>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=1');"><img src="bilder/fern_05.jpg" alt="" height="28" width="67" border="0" /></a></td>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=2');"><img src="bilder/fern_06.jpg" alt="" height="28" width="66" border="0" /></a></td>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=3');"><img src="bilder/fern_07.jpg" alt="" height="28" width="67" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=1');"><img src="bilder/fern_05.jpg" alt="" height="28" width="67" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=2');"><img src="bilder/fern_06.jpg" alt="" height="28" width="66" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=3');"><img src="bilder/fern_07.jpg" alt="" height="28" width="67" border="0" /></a></td>
 						</tr>
 						<tr>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=4');"><img src="bilder/fern_08.jpg" alt="" height="28" width="67" border="0" /></a></td>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=5');"><img src="bilder/fern_09.jpg" alt="" height="28" width="66" border="0" /></a></td>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=6');"><img src="bilder/fern_10.jpg" alt="" height="28" width="67" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=4');"><img src="bilder/fern_08.jpg" alt="" height="28" width="67" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=5');"><img src="bilder/fern_09.jpg" alt="" height="28" width="66" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=6');"><img src="bilder/fern_10.jpg" alt="" height="28" width="67" border="0" /></a></td>
 						</tr>
 						<tr>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=7');"><img src="bilder/fern_11.jpg" alt="" height="28" width="67" border="0" /></a></td>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=8');"><img src="bilder/fern_12.jpg" alt="" height="28" width="66" border="0" /></a></td>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=9');"><img src="bilder/fern_13.jpg" alt="" height="28" width="67" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=7');"><img src="bilder/fern_11.jpg" alt="" height="28" width="67" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=8');"><img src="bilder/fern_12.jpg" alt="" height="28" width="66" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=9');"><img src="bilder/fern_13.jpg" alt="" height="28" width="67" border="0" /></a></td>
 						</tr>
 						<tr>
 							<td></td>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=0');"><img src="bilder/fern_15.jpg" alt="" height="28" width="66" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=0');"><img src="bilder/fern_15.jpg" alt="" height="28" width="66" border="0" /></a></td>
 							<td></td>
 						</tr>
 						<tr>
@@ -115,12 +115,12 @@
 							<td></td>
 						</tr>
 						<tr>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=menu');"><img src="bilder/fern_18.jpg" alt="" height="27" width="67" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=menu');"><img src="bilder/fern_18.jpg" alt="" height="27" width="67" border="0" /></a></td>
 							<td></td>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=back');"><img src="bilder/fern_19.jpg" alt="" height="27" width="67" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=back');"><img src="bilder/fern_19.jpg" alt="" height="27" width="67" border="0" /></a></td>
 						</tr>
 						<tr>
-							<td colspan="3"><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=red');"><img src="bilder/fern_22.jpg" alt="" height="28" width="50" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=green');"><img src="bilder/fern_23.jpg" alt="" height="28" width="49" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=yellow');"><img src="bilder/fern_24.jpg" alt="" height="28" width="51" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=blue');"><img src="bilder/fern_25.jpg" alt="" height="28" width="50" border="0" /></a></td>
+							<td colspan="3"><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=red');"><img src="bilder/fern_22.jpg" alt="" height="28" width="50" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=green');"><img src="bilder/fern_23.jpg" alt="" height="28" width="49" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=yellow');"><img src="bilder/fern_24.jpg" alt="" height="28" width="51" border="0" /></a><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=blue');"><img src="bilder/fern_25.jpg" alt="" height="28" width="50" border="0" /></a></td>
 						</tr>
 						<tr>
 							<td></td>
@@ -129,7 +129,7 @@
 						</tr>
 						<tr>
 							<td></td>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=up');"><img src="bilder/fern_28.jpg" alt="" height="27" width="66" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=up');"><img src="bilder/fern_28.jpg" alt="" height="27" width="66" border="0" /></a></td>
 							<td></td>
 						</tr>
 						<tr>
@@ -138,9 +138,9 @@
 							<td></td>
 						</tr>
 						<tr>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=left');"><img src="bilder/fern_31.jpg" alt="" height="27" width="67" border="0" /></a></td>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=ok');"><img src="bilder/fern_32.jpg" alt="" height="27" width="66" border="0" /></a></td>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=right');"><img src="bilder/fern_33.jpg" alt="" height="27" width="67" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=left');"><img src="bilder/fern_31.jpg" alt="" height="27" width="67" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=ok');"><img src="bilder/fern_32.jpg" alt="" height="27" width="66" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=right');"><img src="bilder/fern_33.jpg" alt="" height="27" width="67" border="0" /></a></td>
 						</tr>
 						<tr>
 							<td></td>
@@ -149,7 +149,7 @@
 						</tr>
 						<tr>
 							<td></td>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=down');"><img src="bilder/fern_36.jpg" alt="" height="27" width="66" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=down');"><img src="bilder/fern_36.jpg" alt="" height="27" width="66" border="0" /></a></td>
 							<td></td>
 						</tr>
 						<tr>
@@ -158,9 +158,9 @@
 							<td></td>
 						</tr>
 						<tr>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=VolumeMinus');"><img src="bilder/fern_39.jpg" alt="" height="27" width="67" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=VolumeMinus');"><img src="bilder/fern_39.jpg" alt="" height="27" width="67" border="0" /></a></td>
 							<td></td>
-							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&key=VolumePlus');"><img src="bilder/fern_40.jpg" alt="" height="27" width="67" border="0" /></a></td>
+							<td><a href="javascript:switch_channel('./vdradmin.pl?aktion=rc_hitk&amp;key=VolumePlus');"><img src="bilder/fern_40.jpg" alt="" height="27" width="67" border="0" /></a></td>
 						</tr>
 						<tr>
 							<td></td>
@@ -174,28 +174,26 @@
 				<td colspan="3"></td>
 			</tr>
 			<tr valign="middle">
-				<td valign="middle">
-					<nobr>
-						<h5><%! Interval: !%></h5>
-						<select name="Seconds" class="submit" onChange="v_changeInterval(this.options[this.selectedIndex].value)">
-							<option value="0"><%! off !%></option>
-							<option value="1"> 1 <%! sec. !%></option>
-							<option value="2"> 2 <%! sec. !%></option>
-							<option value="3"> 3 <%! sec. !%></option>
-							<option value="5" selected> 5 <%! sec. !%></option>
-							<option value="10">10 <%! sec. !%></option>
-							<option value="30">30 <%! sec. !%></option>
-							<option value="60">60 <%! sec. !%></option>
-						</select>
-						<input type="button" class="submit" name="livebild" value='<%! G !%>' title="<%! Grab the picture! !%>" onClick="WebcamUpdate()" />
-						&nbsp;&nbsp;<h5><%! Size: !%></h5>
-						<select name="Size" class="submit" onChange="v_changeSize(this.options[this.selectedIndex].value)">
-							<option value="full">1:1</option>
-							<option value="half" selected>1:2</option>
-							<option value="quarter">1:4</option>
-						</select>
-						<input type="button" class="submit" name="livebild" value='<%! G !%>' title="<%! Grab the picture! !%>" onClick="WebcamUpdate()" />
-					</nobr>
+				<td valign="middle" style="white-space: nowrap;">
+					<h5><%! Interval: !%></h5>
+					<select name="Seconds" class="submit" onChange="v_changeInterval(this.options[this.selectedIndex].value)">
+						<option value="0"><%! off !%></option>
+						<option value="1"> 1 <%! sec. !%></option>
+						<option value="2"> 2 <%! sec. !%></option>
+						<option value="3"> 3 <%! sec. !%></option>
+						<option value="5" selected> 5 <%! sec. !%></option>
+						<option value="10">10 <%! sec. !%></option>
+						<option value="30">30 <%! sec. !%></option>
+						<option value="60">60 <%! sec. !%></option>
+					</select>
+					<input type="button" class="submit" name="livebild" value='<%! G !%>' title="<%! Grab the picture! !%>" onClick="WebcamUpdate()" />
+					&nbsp;&nbsp;<h5><%! Size: !%></h5>
+					<select name="Size" class="submit" onChange="v_changeSize(this.options[this.selectedIndex].value)">
+						<option value="full">1:1</option>
+						<option value="half" selected>1:2</option>
+						<option value="quarter">1:4</option>
+					</select>
+					<input type="button" class="submit" name="livebild" value='<%! G !%>' title="<%! Grab the picture! !%>" onClick="WebcamUpdate()" />
 				</td>
 				<td colspan="2" align="right"><tmpl_unless new_win><a href="javascript:tv_open();"><%! Open in separate window !%></a>&nbsp;&nbsp;</tmpl_unless></td>
 			</tr>
author	Andreas Mair <amair.sob@googlemail.com>	2005-09-23 10:26:48 +0200
committer	Andreas Mair <amair.sob@googlemail.com>	2005-09-23 10:26:48 +0200
commit	32e84da8cc92fc7c69e6ecbf6d937145018f96f2 (patch)
tree	4917147a96998fb2bbc0cb8903ee2311b8b39a41 /template/default
parent	8c5b06e471f1254d2e750dfba3154461eb3030bc (diff)
download	vdradmin-am-0.97-am3.4.tar.gz vdradmin-am-0.97-am3.4.tar.bz2