2006-03-14: 3.4.4beta2v3.4.4beta2

- Reworked TV grabbing.
- Added optional parameters for TV for use with external tools: http://vdradmin-am.ip?aktion=tv_show&size=[full|half|quarter]&interval=[0|1|2|3|5|10|30|60]&tv_only=bla
- Fixed program switching in prog_summary, prog_list and prog_detail (Based on suggestions by kayser).
- New: buttons to move to previous/next day in timers_list (Requested by BigDiSt).
- Moved "help" menu into "about" menu.
- Added VDR's "commands.conf" conntent to select box in navigation menu.
- Changed defaults for "autotimer checking" in timers as they had been in v3.4.3.
- New button on remote controls: Mute (Requested by Rüdiger Jung and Hardy Flor).
- Timeline in timer_list will show timers of current day even if a timer starts the day before (Reported by Hardy Flor).

14 files changed, 243 insertions, 86 deletions

diff --git a/template/default/about.html b/template/default/about.html
index 1f3da4b..37254e8 100644
--- a/template/default/about.html
+++ b/template/default/about.html
@@ -95,6 +95,63 @@
 			<td class="col_right"></td>
 		</tr>
 	</table>
+
+	<table width="100%" border="0" cellspacing="0" cellpadding="0" class="group">
+		<tr class="heading">
+			<td class="col_left"></td>
+			<td colspan="2"><h2><%! Informations !%></h2></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>
+		<tr class="row_even">
+			<td class="col_left"></td>
+			<td class="col_label" width="100px"><h4><%! VDRAdmin-AM version: !%></h4></td>
+			<td class="col_value"><tmpl_var myversion></td>
+			<td class="col_right"></td>
+		</tr>
+		<tr class="row_odd">
+			<td class="col_left"></td>
+			<td class="col_label" width="100px"><h4><%! VDR version: !%></h4></td>
+			<td class="col_value"><tmpl_var vdrversion></td>
+			<td class="col_right"></td>
+		</tr>
+		<tr class="footer">
+			<td class="col_left"></td>
+			<td colspan="2"></td>
+			<td class="col_right"></td>
+		</tr>
+	</table>
+
+	<table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group">
+		<tr class="heading">
+			<td class="col_left"></td>
+			<td><h2><%! Getting Help and Reporting Bugs !%></h2></td>
+			<td class="col_right"></td>
+		</tr>
+		<tr class="row_spacer">
+			<td class="col_left"></td>
+			<td></td>
+			<td class="col_right"></td>
+		</tr>
+		<tr class="row_even">
+			<td class="col_left"></td>
+			<td>
+				<ul>
+					<li><%! If you need help please first try to use the online help you'll find on some pages. You can access it by clicking <img src="bilder/help.gif"/>. !%></li>
+					<li><%! If this doesn't provide the information you need you can try to get help at <a href="http://www.vdrportal.de" target="_blank">VDR-Portal</a> if you understand German language. Please use the announcement thread if possible, search for: !%> &quot;[ANNOUNCE] VDRAdmin-AM-<tmpl_var myversion>&quot;</li>
+					<li><%! If you think you have found a bug please check that it's a new one and report it in the <a href="http://www.vdr-developer.org/mantisbt/main_page.php" target="_blank">VDRAdmin-AM BugTracking system</a>. !%></li>
+			</td>
+			<td class="col_right"></td>
+		</tr>
+		<tr class="footer">
+			<td class="col_left"></td>
+			<td></td>
+			<td class="col_right"></td>
+		</tr>
 	</table>
 </body>
 
diff --git a/template/default/bilder/fern_mute.jpg b/template/default/bilder/fern_mute.jpg
new file mode 100644
index 0000000..5e880e1
--- /dev/null
+++ b/template/default/bilder/fern_mute.jpg
diff --git a/template/default/copper/fern_mute.jpg b/template/default/copper/fern_mute.jpg
new file mode 100644
index 0000000..3f77156
--- /dev/null
+++ b/template/default/copper/fern_mute.jpg
diff --git a/template/default/copper/style.css b/template/default/copper/style.css
index 20e5210..270426d 100644
--- a/template/default/copper/style.css
+++ b/template/default/copper/style.css
@@ -38,6 +38,7 @@ label + input { margin-left: 1em; }
 .col_channels { text-align: right; padding: 10px; width: 40%; }
 .col_wanted_channels { text-align: left; padding: 10px; width: 40%; }
 .col_navi { text-align: right; white-space: nowrap; }
+.col_navi img { position: relative; top: 2px; }
 
 .heading td.selected { background-image: url("bilder/uebersicht_oben_selected.gif"); }
 .heading td { background-image: url("bilder/uebersicht_oben.gif"); }
@@ -94,6 +95,8 @@ label + input { margin-left: 1em; }
 #prog_detail td { white-space: normal; }
 #prog_detail .heading h2 { white-space: normal; }
 
+#vdr_cmds pre { margin: 0px; padding: 0px; }
+
 #content { margin-top: 1em; }
 .group { margin-top: 0.5em; }
 #buttons { margin-top: 0.5em; text-align: right; }
@@ -114,7 +117,7 @@ label + input { margin-left: 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: 3px; width: 240px; height: 124px; overflow: hidden; white-space: normal; }
+#prog_summary .summary { margin-top: 1em; margin-bottom: 3px; width: 240px; height: 124px; overflow: auto; white-space: normal; }
 
 /* Tooltips */
 .tt_table { width: 250px; border: 2px solid #333399; background-color: #ccccff; }
@@ -139,10 +142,10 @@ label + input { margin-left: 1em; }
 
 /* Navigation */
 #navigation { margin: 0px; background-image: url("bilder/back.gif"); }
-#navigation .logo { padding-top: 2em; padding-bottom: 3em; width: 150px; }
-#navigation .navi { font-size: 12px; padding-top: 6px; height: 25px; text-align: center; width: 148px; }
-#navigation .search { padding-top: 2em; font-size: 12px; width: 148px; text-align: center; }
-#navigation .separator { height: 2px; background-image: url("bilder/separator.png"); width: 148px; }
+#navigation .logo { padding-top: 1em; padding-bottom: 2em; width: 150px; }
+#navigation .navi { font-size: 12px; padding-top: 6px; padding-bottom: 6px; text-align: center; width: 148px; }
+#navigation .search { padding-top: 6px; font-size: 12px; width: 148px; text-align: center; }
+#navigation .separator { height: 2px; background-image: url("bilder/separator.png"); width: 148px; background-repeat: repeat-x; }
 #navigation a { color: black; font-weight: bold; text-decoration: none; }
 #navigation a:hover { font-size: 13px; color: #ff0000 }
 #navigation input { width: 130px; }
diff --git a/template/default/default/fern_mute.jpg b/template/default/default/fern_mute.jpg
new file mode 120000
index 0000000..d7d4f46
--- /dev/null
+++ b/template/default/default/fern_mute.jpg
@@ -0,0 +1 @@
+../bilder/fern_mute.jpg
\ No newline at end of file
diff --git a/template/default/default/style.css b/template/default/default/style.css
index f15d39a..7409d26 100644
--- a/template/default/default/style.css
+++ b/template/default/default/style.css
@@ -223,6 +223,10 @@ body.help .heading {
 	white-space: nowrap;
 	height: 17px;
 }
+.col_navi img {
+	position: relative;
+	top: 2px;
+}
 
 .list,
 .group {
@@ -427,6 +431,11 @@ body.help .heading {
 	white-space: normal;
 }
 
+#vdr_cmds pre {
+	margin: 0px;
+	padding: 0px;
+}
+
 #content {
 	margin-top: 1em;
 }
@@ -537,21 +546,21 @@ body.help .heading {
 	padding: 1em 0px;
 }
 #navigation .logo {
-	padding-top: 2em;
-	padding-bottom: 3em;
+	padding-top: 1em;
+	padding-bottom: 2em;
 	width: 150px;
 }
 #navigation .navi {
 	font-size: 12px;
 	padding-top: 6px;
-	height: 25px;
+	padding-bottom: 6px;
 	text-align: center;
 }
 #navigation .navi:hover {
 	background-color: #dedede;
 }
 #navigation .search {
-	padding-top: 2em;
+	padding-top: 6px;
 	font-size: 12px;
 	text-align: center;
 }
diff --git a/template/default/help.html b/template/default/help.html
deleted file mode 100644
index 6ccc542..0000000
--- a/template/default/help.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-
-<head>
-	<meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>" />
-	<title><%! Help !%></title>
-	<script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
-	<link href="style.css" rel="stylesheet" media="screen" type="text/css" />
-	<tmpl_if usercss>
-		<link href="user.css" rel="stylesheet" media="screen" type="text/css" />
-	</tmpl_if>
-</head>
-
-<body id="rec_list" class="help" onload="window.focus()">
-	<table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group">
-		<tr class="heading">
-			<td class="col_left"></td>
-			<td><h2><%! Getting Help and Reporting Bugs !%></h2></td>
-			<td class="col_right"></td>
-		</tr>
-		<tr class="row_spacer">
-			<td class="col_left"></td>
-			<td></td>
-			<td class="col_right"></td>
-		</tr>
-		<tr class="row_even">
-			<td class="col_left"></td>
-			<td>
-				<ul>
-					<li><%! If you need help please first try to use the online help you'll find on some pages. You can access it by clicking <img src="bilder/help.gif"/>. !%></li>
-					<li><%! If this doesn't provide the information you need you can try to get help at <a href="http://www.vdrportal.de" target="_blank">VDR-Portal</a> if you understand German language. Please use the announcement thread if possible, search for: !%> &quot;[ANNOUNCE] <tmpl_var myversion>&quot;</li>
-					<li><%! If you think you have found a bug please check that it's a new one and report it in the <a href="http://www.vdr-developer.org/mantisbt/main_page.php" target="_blank">VDRAdmin-AM BugTracking system</a>. !%></li>
-			</td>
-			<td class="col_right"></td>
-		</tr>
-		<tr class="footer">
-			<td class="col_left"></td>
-			<td></td>
-			<td class="col_right"></td>
-		</tr>
-	</table>
-</body>
-
-</html>
diff --git a/template/default/library.js b/template/default/library.js
index e8275b5..67b36fb 100644
--- a/template/default/library.js
+++ b/template/default/library.js
@@ -28,7 +28,8 @@ function mdel(message) {
 
 function callurl( url ) {
 	image = new Image();
-	image.src = url;
+	Now = new Date();
+	image.src = url + "&rand=" + Now.getTime();
 }
 
 function popup(URL) {
diff --git a/template/default/navigation.html b/template/default/navigation.html
index 9a5881a..98bae56 100644
--- a/template/default/navigation.html
+++ b/template/default/navigation.html
@@ -55,24 +55,26 @@
 		</div>
 		<div class="separator"></div>
 		<div class="navi">
-			<a href="vdradmin.pl?aktion=config" target="main"><%! Configuration !%></a>
+			<a href="javascript:rc_open();"><%! Remote Control !%></a>
 		</div>
 		<div class="separator"></div>
 		<div class="navi">
-			<a href="javascript:rc_open();"><%! Remote Control !%></a>
+			<a href="vdradmin.pl?aktion=tv_show" target="main"><%! Watch TV !%></a>
 		</div>
 		<div class="separator"></div>
 		<div class="navi">
-			<a href="vdradmin.pl?aktion=tv_show" target="main"><%! Watch TV !%></a>
+			<a href="vdradmin.pl?aktion=vdr_cmds" target="main"><%! VDR Commands !%></a>
 		</div>
 		<div class="separator"></div>
 		<div class="navi">
-			<a href="vdradmin.pl?aktion=help" target="main"><%! Help !%></a></a>
+			<a href="vdradmin.pl?aktion=config" target="main"><%! Configuration !%></a>
 		</div>
 		<div class="separator"></div>
 		<div class="navi">
-			<a href="vdradmin.pl?aktion=about" target="main"><%! About !%></a>
+			<a href="vdradmin.pl?aktion=about" target="main"><%! About !%> / <%! Help !%></a>
 		</div>
+
+		<div class="separator"></div>
 		<form action="vdradmin.pl" method="get" name="FormName" target="main" class="search">
 			<input type="text" name="search" /><br />
 			<input type="submit" name="submit" value="<%! Search !%>" />
diff --git a/template/default/rc.html b/template/default/rc.html
index c477bd6..82396d2 100644
--- a/template/default/rc.html
+++ b/template/default/rc.html
@@ -105,7 +105,7 @@
 		</tr>
 		<tr>
 			<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&amp;key=mute');"><img src="bilder/fern_mute.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>
diff --git a/template/default/style.css b/template/default/style.css
index 5fa78df..9e68416 100644
--- a/template/default/style.css
+++ b/template/default/style.css
@@ -39,6 +39,7 @@ label + input { margin-left: 1em; }
 .col_channels { text-align: right; padding: 10px; width: 40%; }
 .col_wanted_channels { text-align: left; padding: 10px; width: 40%; }
 .col_navi { text-align: right; white-space: nowrap; }
+.col_navi img { position: relative; top: 2px; }
 
 .heading td.selected { background-image: url("bilder/uebersicht_oben_selected.gif"); }
 .heading td { background-image: url("bilder/uebersicht_oben.gif"); }
@@ -83,7 +84,7 @@ label + input { margin-left: 1em; }
 #prog_timeline .color_current { background-color: #f7fffa; }
 #prog_timeline .color_broadcast { background-color: #e6eee9; }
 #prog_timeline .color_timer { background-color: #ffeee9; }
-#rec_list #path { margin: 1em 10px 0px 10px; }
+#rec_list #path { margin: 1em 10px 0px 10px; border-top: 1px solid black; border-bottom: 1px solid black; padding: 3px 0px; }
 #timer_list .color_ok { background-color: #00a317; }
 #timer_list .color_conflict { background-color: #a11917; }
 #timer_list .color_collision { background-color: #ffde62; }
@@ -95,6 +96,7 @@ label + input { margin-left: 1em; }
 #prog_detail td { white-space: normal; }
 #prog_detail .heading h2 { white-space: normal; }
 
+#vdr_cmds pre { margin: 0px; padding: 0px; }
 #content { margin-top: 1em; }
 .group { margin-top: 0.5em; }
 #buttons { margin-top: 0.5em; text-align: right; }
@@ -141,10 +143,10 @@ label + input { margin-left: 1em; }
 
 /* Navigation */
 #navigation { margin: 0px; background-image: url("bilder/back.gif"); }
-#navigation .logo { padding-top: 2em; padding-bottom: 3em; width: 150px; }
-#navigation .navi { font-size: 12px; padding-top: 6px; height: 25px; text-align: center; width: 148px; }
-#navigation .search { padding-top: 2em; font-size: 12px; width: 148px; text-align: center; }
-#navigation .separator { height: 2px; background-image: url("bilder/separator.png"); width: 148px; }
+#navigation .logo { padding-top: 1em; padding-bottom: 2em; width: 150px; }
+#navigation .navi { font-size: 12px; padding-top: 6px; padding-bottom: 6px; text-align: center; width: 148px; }
+#navigation .search { padding-top: 6px; font-size: 12px; width: 148px; text-align: center; }
+#navigation .separator { height: 2px; background-image: url("bilder/separator.png"); width: 148px; background-repeat: repeat-x; }
 #navigation a { color: black; font-weight: bold; text-decoration: none; }
 #navigation a:hover { text-decoration: underline; }
 #navigation input { width: 130px; }
diff --git a/template/default/timer_list.html b/template/default/timer_list.html
index 68bb232..dc1fc46 100644
--- a/template/default/timer_list.html
+++ b/template/default/timer_list.html
@@ -62,12 +62,14 @@
 				<tr class="heading">
 					<td class="col_left"></td>
 					<td><h2><tmpl_var title></h2></td>
-					<td align="right">
+					<td class="col_navi">
+						<tmpl_if prevdayurl><a href="<tmpl_var prevdayurl>"><img src="bilder/pfeile_nachlinks.gif" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachlinks_soft.gif" border="0" /></tmpl_if>
 						<select name="vdr_id" class="submit" onchange="window.open('<tmpl_var url>?aktion=timer_list&amp;sortby=<tmpl_var sortby>&amp;desc=<tmpl_var cur_desc>&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>
 						</select>
+						<tmpl_if nextdayurl><a href="<tmpl_var nextdayurl>"><img src="bilder/pfeile_nachrechts.gif" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachrechts_soft.gif" border="0" /></tmpl_if>
 					</td>
 					<td class="col_right"></td>
 				</tr>
@@ -320,7 +322,7 @@
 								</tmpl_if>
 							</tmpl_if>
 								<tmpl_if expr="active == 1"><%! Yes !%></tmpl_if>
-								<tmpl_if expr="(active%32768) == 0"><%! No !%></tmpl_if>
+								<tmpl_if expr="active == 0"><%! No !%></tmpl_if>
 								<tmpl_if expr="active == 5"><%! VPS !%></tmpl_if>
 								<tmpl_if expr="autotimer">(<%! Auto !%>)</tmpl_if>
 							</a>
diff --git a/template/default/tv.html b/template/default/tv.html
index 54c651e..24ad372 100644
--- a/template/default/tv.html
+++ b/template/default/tv.html
@@ -12,8 +12,9 @@
 	<script type="text/javascript" language="JavaScript">
 		<!--
 		var aktiv;
-		var interval = 5;
-		var size = "half";
+		var timeout;
+		var interval = <tmpl_var interval>;
+		var size = "<tmpl_var size>";
 
 		function switch_by_select() {
 			for (i = 0; i < document.forms[0].channel.length; ++i)
@@ -26,19 +27,21 @@
 
 		function switch_channel(url) {
 			Now = new Date();
-			document.switchimage.src = url + "&" + Now.getTime();
-      window.setTimeout("WebcamUpdate()", 500);
+			document.switchimage.src = url + "&rand=" + Now.getTime();
+      timeout = window.setTimeout("WebcamUpdate()", 500);
 		}
 
 		function WebcamUpdate() {
-			Now = new Date();
-			NewPicUrl = "<tmpl_var url>&size=" + size + "&" + Now.getTime();
+			Before = new Date();
+			NewPicUrl = "<tmpl_var url>&size=" + size + "&rand=" + Before.getTime();
 			document.Bild.src = NewPicUrl;
+			After = new Date();
+			timeout = window.setTimeout("WebcamUpdate()", (interval * 1000) - (After - Before));
 		}
 
 		function go() {
 			WebcamUpdate();
-      v_Start();
+//      v_Start();
 		}
 
 		function v_Start() {
@@ -46,7 +49,8 @@
 		}
 
 		function v_Stop() {
-			window.clearInterval(aktiv);
+//			window.clearInterval(aktiv);
+			cleanTimeout(timeout);
 		}
 
 		function v_changeInterval(val) {
@@ -81,6 +85,7 @@
 			<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>
+<tmpl_unless tv_only>
 				<td valign="top">
 					<table width="200" border="0" cellspacing="0" cellpadding="0">
 						<tr>
@@ -168,7 +173,7 @@
 						</tr>
 						<tr>
 							<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&amp;key=mute');"><img src="bilder/fern_mute.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>
@@ -186,7 +191,9 @@
 					</select>
 <!--					<a class="submit" href="javascript:switch_by_select();">Switch</a>-->
 				</td>
+</tmpl_unless>
 			</tr>
+<tmpl_unless tv_only>
 			<tr>
 				<td colspan="4"></td>
 			</tr>
@@ -195,20 +202,20 @@
 					<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>
+						<option value="1" <tmpl_if expr="interval == 1">selected="selected"</tmpl_if>> 1 <%! sec. !%></option>
+						<option value="2" <tmpl_if expr="interval == 2">selected="selected"</tmpl_if>> 2 <%! sec. !%></option>
+						<option value="3" <tmpl_if expr="interval == 3">selected="selected"</tmpl_if>> 3 <%! sec. !%></option>
+						<option value="5" <tmpl_if expr="interval == 5">selected="selected"</tmpl_if>> 5 <%! sec. !%></option>
+						<option value="10" <tmpl_if expr="interval == 10">selected="selected"</tmpl_if>>10 <%! sec. !%></option>
+						<option value="30" <tmpl_if expr="interval == 30">selected="selected"</tmpl_if>>30 <%! sec. !%></option>
+						<option value="60" <tmpl_if expr="interval == 60">selected="selected"</tmpl_if>>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>
+						<option value="full" <tmpl_if expr="size eq 'full'">selected="selected"</tmpl_if>>1:1</option>
+						<option value="half" <tmpl_if expr="size eq 'half'">selected="selected"</tmpl_if>>1:2</option>
+						<option value="quarter" <tmpl_if expr="size eq 'quarter'">selected="selected"</tmpl_if>>1:4</option>
 					</select>
 					<input type="button" class="submit" name="livebild" value='<%! G !%>' title="<%! Grab the picture! !%>" onClick="WebcamUpdate()" />
 				</td>
@@ -217,6 +224,7 @@
 			<tr>
 				<td colspan="4"></td>
 			</tr>
+</tmpl_unless>
 		</table>
 	</form>
 </body>
diff --git a/template/default/vdr_cmds.html b/template/default/vdr_cmds.html
new file mode 100644
index 0000000..d71781c
--- /dev/null
+++ b/template/default/vdr_cmds.html
@@ -0,0 +1,116 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html>
+
+<head>
+	<meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>" />
+	<title>VDRAdmin-AM - <%! VDR Commands !%></title>
+	<link href="style.css" rel="stylesheet" media="screen" type="text/css" />
+	<tmpl_if usercss>
+		<link href="user.css" rel="stylesheet" media="screen" type="text/css" />
+	</tmpl_if>
+	<script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
+</head>
+
+<body id="vdr_cmds">
+	<table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
+		<tr>
+			<td class="col_left"></td>
+			<td class="col_title"><h1><%! VDR Commands !%></h1></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>
+</tmpl_if>
+			<td class="col_right"></td>
+		</tr>
+	</table>
+
+	<form action="<tmpl_var url>" method="get" name="FormName">
+		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="group">
+			<tr class="heading">
+				<td class="col_left"></td>
+				<td colspan="2"></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>
+
+			<tr class="row_odd">
+				<td class="col_left"></td>
+				<td class="col_label"><%! Number of lines to show: !%></td>
+				<td class="col_value">
+					<select name="max_lines">
+						<option value="20" <tmpl_if expr="max_lines == 20">selected="selected"</tmpl_if>>20</option>
+						<option value="50" <tmpl_if expr="max_lines == 50">selected="selected"</tmpl_if>>50</option>
+						<option value="100" <tmpl_if expr="max_lines == 100">selected="selected"</tmpl_if>>100</option>
+						<option value="0"><%! unlimited !%></option>
+					</select>
+				</td>
+				<td class="col_right"></td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_left"></td>
+				<td class="col_label"><%! SVDRP commands: !%></td>
+				<td class="col_value">
+					<input type="text" name="svdrp_cmd" value="<tmpl_var svdrp_cmd>"/>
+					<input type="submit" class="submit" name="run_svdrpcmd" value="<%! Run !%>" onclick="return confirm('<%! Really run this command? !%>')" />
+				</td>
+				<td class="col_right"></td>
+			</tr>
+<tmpl_if commands>
+			<tr class="row_odd">
+				<td class="col_left"></td>
+				<td class="col_label"><%! Commands defined in commands.conf: !%></td>
+				<td class="col_value">
+					<select name="vdr_cmd" class="submit">
+						<tmpl_loop commands>
+							<option value="<tmpl_var id>" <tmpl_if expr="vdr_cmd == id">selected="selected"</tmpl_if>><tmpl_var title></option>
+						</tmpl_loop>
+					</select>
+					<input type="submit" class="submit" name="run_vdrcmd" value="<%! Run !%>" onclick="return confirm('<%! Really run this command? !%>')" />
+				</td>
+				<td class="col_right"></td>
+			</tr>
+</tmpl_if>
+
+			<tr class="footer">
+				<td class="col_left"></td>
+				<td colspan="2"></td>
+				<td class="col_right"></td>
+			</tr>
+		</table>
+		<input type="hidden" name="aktion" value="vdr_cmds"/>
+	</form>
+
+<tmpl_if show_output>
+	<table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="group">
+		<tr class="heading">
+			<td class="col_left"></td>
+			<td><h2><%! Output !%></h2></td>
+			<td class="col_right"></td>
+		</tr>
+		<tr class="row_spacer">
+			<td class="col_left"></td>
+			<td></td>
+			<td class="col_right"></td>
+		</tr>
+
+<tmpl_loop show_output>
+		<tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>">
+			<td class="col_left"></td>
+			<td><pre><tmpl_var line escape="html"></pre></td>
+			<td class="col_right"></td>
+		</tr>
+</tmpl_loop>
+		<tr class="footer">
+			<td class="col_left"></td>
+			<td></td>
+			<td class="col_right"></td>
+		</tr>
+	</table>
+</tmpl_if>
+</body>
+</html>