2005-06-22: 0.97-am3.3rcv0.97-am3.3rc

- Updated all help messages. - Added beautified tooltips in timer_list. PLEASE COMMENT!!! - Changed saving of AutoTimer patterns: ":" -> "|" and "|" -> "\|". - Added support for user.css for overwriting style.css (Must be located in /etc/vdradmin/). See user.css.example. PLEASE COMMENT ON THIS!!! - Removed obsolete files (e.g. images). - Merged style.css and navi.css. - Reworked templates so that they use a lot of CSS (Tested using Konqueror 3.3.2 and Firefox 1.0.4). - Fixed programming timers with special summary when using EPG_DIRECT (timer didn't get programmed) (Thanks to HolgerAusB for giving vital hints). - Allow browsers to cache all files VDRAdmin sends, except "text/html". This should speed up VDRAdmin but changing the skin or css needs a "shift reload". - Added support for VDR v1.3.25's info.vdr (Submitted by vejoun). - Use localized date formates. - Now using "video/x-mpegurl" MIME type instead of "audio/x-mpegurl" for streaming (Suggested by stefan.h). - Added patches supplied by stefan.h: -> using EPG's subtitle when found for AutoTimer else " " (that's the VDR way). -> New config option VDRVFAT to find recordings if VDR has been compiled with or without VFAT define. - Fixed calling reccmds on recordings in subdirs, manual recordings (@rectitle) and repeating timer's recordings without episode title. - Fixed streaming of manual recordings (@rectitle) and repeating timer's recordings without episode title. - VDRAdmin-AM now uses the required charsets setting in templates, so no need to write "&xyz;" things in .po files. - Reworked templates to make better use of CSS (for example: timeline colours can be set by style.css). - EPG_PRUNE now is the number of channels to fetch from VDR (had been one too less before). - Added "install.sh" and "uninstall.sh" ("./install.sh -h" for help) (Requested by several people). - Made "name" columns in lists wrapping again (Reported by vejoun). - Deleting a single recording works again (Reported by vejoun). - Fixed streaming of recordings in subdirs (Reported by vejoun). - Added missing gray sign on deactivated AutoTimers (Reported by vejoun).
author: Andreas Mair <amair.sob@googlemail.com> 2005-06-22 14:42:18 +0200
committer: Andreas Mair <amair.sob@googlemail.com> 2005-06-22 14:42:18 +0200
commit: 1f33deeae237bdcc4281de03d268528d4a09edd3 (patch)
tree: ba27f73a162201dc1f33a83cdb77ca724ab22fa8 /template/default/timer_new.html
parent: d6922e850779c4ff9d8bcbcef9842cf333eb8638 (diff)
download: vdradmin-am-1f33deeae237bdcc4281de03d268528d4a09edd3.tar.gz
vdradmin-am-1f33deeae237bdcc4281de03d268528d4a09edd3.tar.bz2
1 files changed, 138 insertions, 131 deletions
diff --git a/template/default/timer_new.html b/template/default/timer_new.html
index f335cb6..75f8224 100644
--- a/template/default/timer_new.html
+++ b/template/default/timer_new.html
@@ -5,6 +5,9 @@
 	<meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>" />
 	<title>VDRAdmin - <tmpl_if newtimer><%! Create New Timer !%><tmpl_else><%! Edit Timer !%></tmpl_if></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>
 	<script type="text/javascript" language="JavaScript1.2">
 	<!--
@@ -39,141 +42,145 @@
 
 <body onload='eCheckbox("<tmpl_var dor>")' id="timer_new">
 	<form action="<tmpl_var url>" method="get" name="form">
-	<table width="100%" border="0" cellspacing="0" cellpadding="0" height="39" id="heading">
-		<tr>
-			<td valign="middle" width="500" background="bilder/nav_button_back.gif">
-				<h1><tmpl_if newtimer><%! Create New Timer !%><tmpl_else><%! Edit Timer !%></tmpl_if></h1>
-			</td>
-			<td background="bilder/nav_button_back_mitte.gif"></td>
-			<td width="35" background="bilder/nav_button_back_mitte.gif">
-				<tmpl_if name="help_url"><a href="javascript:open_help('<tmpl_var help_url>');">
-					<img src="bilder/help.gif" border="0" align="right" valign="top" alt="help" title="<%! Help !%>" /></a>
-				</tmpl_if>
-			</td>
-			<td width="15" background="bilder/nav_button_back_end.gif"></td>
-		</tr>
-	</table>
+		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
+			<tr>
+				<td class="col_left"></td>
+				<td class="col_title">
+					<h1><tmpl_if newtimer><%! Create New Timer !%><tmpl_else><%! Edit Timer !%></tmpl_if></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>
 
-	<table width="100%" border="0" cellspacing="0" cellpadding="0" id="content">
-		<tr height="30">
-			<td width="30" height="30"><img src="bilder/uebersicht_oben_links.gif" alt="" width="30" height="30" border="0" /></td>
-			<td height="30" background="bilder/uebersicht_oben.gif"></td>
-			<td height="30" background="bilder/uebersicht_oben.gif"></td>
-			<td width="30" height="30"><img src="bilder/uebersicht_oben_rechts.gif" alt="" width="30" height="30" border="0" /></td>
-		</tr>
-		<tr height="25">
-			<td width="30" height="25" background="bilder/uebersicht_links.gif"></td>
-			<td width="20%" height="25" background="bilder/uebersicht_mitte.gif"><h5><%! Timer Active: !%></h5></td>
-			<td height="25" background="bilder/uebersicht_mitte.gif">
-				<input type="radio" name="active" value="1" <tmpl_if active>checked</tmpl_if> /> <%! Yes !%>
-				<input type="radio" name="active" value="0" <tmpl_unless active>checked</tmpl_unless> /> <%! No !%>
-			</td>
-			<td width="30" height="25" background="bilder/uebersicht_rechts.gif"></td>
-		</tr>
-		<tr height="25">
-			<td width="30" height="25" background="bilder/uebersicht_links_dark.gif"></td>
-			<td width="20%" height="25" background="bilder/uebersicht_mitte_dark.gif"><h5><%! AutoTimer Checking: !%></h5></td>
-			<td height="25" background="bilder/uebersicht_mitte_dark.gif">
-				<tmpl_if expr="event_id > 1">
-					<input type="radio" name="event_id" value="<tmpl_var event_id>" checked /> <%! Transmission Identification !%>
-				</tmpl_if>
-				<input type="radio" name="event_id" value="1" <tmpl_if expr="event_id == 1">checked</tmpl_if> /> <%! Time !%>
-				<input type="radio" name="event_id" value="0" <tmpl_if expr="event_id == 0">checked</tmpl_if> /> <%! off !%>
-			</td>
-			<td width="30" height="25" background="bilder/uebersicht_rechts_dark.gif"></td>
-		</tr>
-		<tr height="25">
-			<td width="30" height="25" background="bilder/uebersicht_links.gif"></td>
-			<td width="20%" height="25" background="bilder/uebersicht_mitte.gif"><h5><%! Channel: !%></h5></td>
-			<td height="25" background="bilder/uebersicht_mitte.gif">
-				<select name="channel" size="1">
+		<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"><h5><%! Timer Active: !%></h5></td>
+				<td class="col_value">
+					<input type="radio" name="active" value="1" id="active_yes" <tmpl_if active>checked</tmpl_if> /><label for="active_yes"><%! Yes !%></label>
+					<input type="radio" name="active" value="0" id="active_no" <tmpl_unless active>checked</tmpl_unless> /><label for="active_no"><%! No !%></label>
+				</td>
+				<td class="col_right"></td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_left"></td>
+				<td class="col_label"><h5><%! AutoTimer Checking: !%></h5></td>
+				<td class="col_value">
+					<tmpl_if expr="event_id > 1">
+						<input type="radio" name="event_id" value="<tmpl_var event_id>" id="event_id" checked /><label for="event_id"><%! Transmission Identification !%></label>
+					</tmpl_if>
+					<input type="radio" name="event_id" value="1" id="event_time" <tmpl_if expr="event_id == 1">checked</tmpl_if> /><label for="event_time"><%! Time !%></label>
+					<input type="radio" name="event_id" value="0" id="event_off" <tmpl_if expr="event_id == 0">checked</tmpl_if> /><label for="event_off"><%! off !%></label>
+				</td>
+				<td class="col_right"></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_left"></td>
+				<td class="col_label"><h5><%! Channel: !%></h5></td>
+				<td class="col_value">
+					<select name="channel" class="submit">
 <tmpl_loop name="channels">
-					<option value="<tmpl_var vdr_id>" <tmpl_if current>selected</tmpl_if>><tmpl_var name="name"></option>
+						<option value="<tmpl_var vdr_id>" <tmpl_if current>selected</tmpl_if>><tmpl_var name="name"></option>
 </tmpl_loop>
-				</select>
-			</td>
-			<td width="30" height="25" background="bilder/uebersicht_rechts.gif"></td>
-		</tr>
-		<tr height="25">
-			<td valign="top" width="30" height="25" background="bilder/uebersicht_links_dark.gif"></td>
-			<td valign="top" width="20%" height="25" background="bilder/uebersicht_mitte_dark.gif"><h5><%! Day Of Recording: !%></h5></td>
-			<td height="25" background="bilder/uebersicht_mitte_dark.gif">
-				<input type="text" name="dor" value="<tmpl_var dor>" size="20" />
-				<br />
-				<input onclick="cTimer(1)" type="checkbox" name="D0" value="1" /> <%! Monday !%>
-				<input onclick="cTimer(2)" type="checkbox" name="D1" value="1" /> <%! Tuesday !%>
-				<input onclick="cTimer(3)" type="checkbox" name="D2" value="radioValue" /> <%! Wednesday !%>
-				<input onclick="cTimer(4)" type="checkbox" name="D3" value="radioValue" /> <%! Thursday !%>
-				<input onclick="cTimer(5)" type="checkbox" name="D4" value="radioValue" /> <%! Friday !%>
-				<input onclick="cTimer(6)" type="checkbox" name="D5" value="radioValue" /> <%! Saturday !%>
-				<input onclick="cTimer(7)" type="checkbox" name="D6" value="radioValue" /> <%! Sunday !%>
-			</td>
-			<td width="30" height="25" background="bilder/uebersicht_rechts_dark.gif"></td>
-		</tr>
-		<tr height="25">
-			<td width="30" height="25" background="bilder/uebersicht_links.gif"></td>
-			<td width="20%" height="25" background="bilder/uebersicht_mitte.gif"><h5><%! Start Time: !%><h5></td>
-			<td height="25" background="bilder/uebersicht_mitte.gif">
-				<input type="text" name="starth" value="<tmpl_var starth>" size="2" maxlength="2" />
-				<b>&nbsp;:&nbsp;</b>
-				<input type="text" name="startm" value="<tmpl_var startm>" size="2" maxlength="2" />
-				&nbsp;<%! o'clock !%>
-			</td>
-			<td width="30" height="25" background="bilder/uebersicht_rechts.gif"></td>
-		</tr>
-		<tr height="25">
-			<td width="30" height="25" background="bilder/uebersicht_links_dark.gif"></td>
-			<td width="20%" height="25" background="bilder/uebersicht_mitte_dark.gif"><h5><%! End Time: !%></h5></td>
-			<td height="25" background="bilder/uebersicht_mitte_dark.gif">
-				<input type="text" name="stoph" value="<tmpl_var stoph>" size="2" maxlength="2" />
-				<b>&nbsp;:&nbsp;</b>
-				<input type="text" name="stopm" value="<tmpl_var stopm>" size="2" maxlength="2" />
-				&nbsp;<%! o'clock !%>
-			</td>
-			<td width="30" height="25" background="bilder/uebersicht_rechts_dark.gif"></td>
-		</tr>
-		<tr height="25">
-			<td width="30" height="25" background="bilder/uebersicht_links.gif"></td>
-			<td width="20%" height="25" background="bilder/uebersicht_mitte.gif"><h5><%! Priority: !%></h5></td>
-			<td height="25" background="bilder/uebersicht_mitte.gif"><input type="text" name="prio" value="<tmpl_var prio>" size="2" maxlength="2" /></td>
-			<td width="30" height="25" background="bilder/uebersicht_rechts.gif"></td>
-		</tr>
-		<tr height="25">
-			<td width="30" height="25" background="bilder/uebersicht_links_dark.gif"></td>
-			<td width="20%" height="25" background="bilder/uebersicht_mitte_dark.gif"><h5><%! Lifetime: !%></h5></td>
-			<td height="25" background="bilder/uebersicht_mitte_dark.gif"><input type="text" name="lft" value="<tmpl_var lft>" size="2" maxlength="2" /></td>
-			<td width="30" height="25" background="bilder/uebersicht_rechts_dark.gif"></td>
-		</tr>
-		<tr height="25">
-			<td width="30" height="25" background="bilder/uebersicht_links.gif"></td>
-			<td width="20%" height="25" background="bilder/uebersicht_mitte.gif"><h5><%! Title of Recording: !%></h5></td>
-			<td height="25" background="bilder/uebersicht_mitte.gif"><input type="text" name="title" value="<tmpl_var title>" size="80" /></td>
-			<td width="30" height="25" background="bilder/uebersicht_rechts.gif"></td>
-		</tr>
-		<tr>
-			<td valign="top" width="30" background="bilder/uebersicht_links_dark.gif"></td>
-			<td valign="top" width="20%" background="bilder/uebersicht_mitte_dark.gif"><h5><%! Summary: !%></h5></td>
-			<td background="bilder/uebersicht_mitte_dark.gif"><textarea name="summary" rows="6" cols="80"><tmpl_var summary></textarea></td>
-			<td width="30" background="bilder/uebersicht_rechts_dark.gif"></td>
-		</tr>
-		<tr height="30">
-			<td width="30" height="30"><img src="bilder/uebersicht_unten_links.gif" alt="" width="30" height="30" border="0" /></td>
-			<td colspan="2" height="30" background="bilder/uebersicht_unten.gif"></td>
-			<td width="30" height="30"><img src="bilder/uebersicht_unten_rechts.gif" alt="" width="30" height="30" border="0" /></td>
-		</tr>
-	</table>
+					</select>
+				</td>
+				<td class="col_right"></td>
+			</tr>
+			<tr class="row_even">
+				<td valign="top"  class="col_left"></td>
+				<td valign="top"  class="col_label"><h5><%! Day Of Recording: !%></h5></td>
+				<td class="col_value">
+					<input type="text" name="dor" value="<tmpl_var dor>" size="20" />
+					<br />
+					<input onclick="cTimer(1)" type="checkbox" name="D0" value="1" id="wday_mon" /><label for="wday_mon"><%! Monday !%></label>
+					<input onclick="cTimer(2)" type="checkbox" name="D1" value="1" id="wday_tue" /><label for="wday_tue"><%! Tuesday !%></label>
+					<input onclick="cTimer(3)" type="checkbox" name="D2" value="1" id="wday_wed" /><label for="wday_wed"><%! Wednesday !%></label>
+					<input onclick="cTimer(4)" type="checkbox" name="D3" value="1" id="wday_thu" /><label for="wday_thu"><%! Thursday !%></label>
+					<input onclick="cTimer(5)" type="checkbox" name="D4" value="1" id="wday_fri" /><label for="wday_fri"><%! Friday !%></label>
+					<input onclick="cTimer(6)" type="checkbox" name="D5" value="1" id="wday_sat" /><label for="wday_sat"><%! Saturday !%></label>
+					<input onclick="cTimer(7)" type="checkbox" name="D6" value="1" id="wday_sun" /><label for="wday_sun"><%! Sunday !%></label>
+				</td>
+				<td class="col_right"></td>
+			</tr>
+			<tr class="row_odd">
+				<td class="col_left"></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>
+					<input type="text" name="startm" value="<tmpl_var startm>" size="2" maxlength="2" />
+					&nbsp;<%! o'clock !%>
+				</td>
+				<td  class="col_right"></td>
+			</tr>
+			<tr class="row_even">
+				<td  class="col_left"></td>
+				<td  class="col_label"><h5><%! End Time: !%></h5></td>
+				<td  class="col_value">
+					<input type="text" name="stoph" value="<tmpl_var stoph>" size="2" maxlength="2" />
+					<b>&nbsp;:&nbsp;</b>
+					<input type="text" name="stopm" value="<tmpl_var stopm>" size="2" maxlength="2" />
+					&nbsp;<%! o'clock !%>
+				</td>
+				<td  class="col_right"></td>
+			</tr>
+			<tr class="row_odd">
+				<td  class="col_left"></td>
+				<td  class="col_label"><h5><%! Priority: !%></h5></td>
+				<td  class="col_value"><input type="text" name="prio" value="<tmpl_var prio>" size="2" maxlength="2" /></td>
+				<td  class="col_right"></td>
+			</tr>
+			<tr class="row_even">
+				<td  class="col_left"></td>
+				<td  class="col_label"><h5><%! Lifetime: !%></h5></td>
+				<td  class="col_value"><input type="text" name="lft" value="<tmpl_var lft>" size="2" maxlength="2" /></td>
+				<td  class="col_right"></td>
+			</tr>
+			<tr class="row_odd">
+				<td  class="col_left"></td>
+				<td  class="col_label"><h5><%! Title of Recording: !%></h5></td>
+				<td  class="col_value"><input type="text" name="title" value="<tmpl_var title>" size="80" /></td>
+				<td  class="col_right"></td>
+			</tr>
+			<tr class="row_even">
+				<td class="col_left"></td>
+				<td class="col_label" valign="top"><h5><%! Summary: !%></h5></td>
+				<td class="col_value"><textarea name="summary" rows="6" cols="80"><tmpl_var summary></textarea></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>
 
-	<div id="buttons">
-		<input type="submit" class="submit" name="save" value="<%! Save !%>" />
-		<input type="submit" class="submit" name="exit" value="<%! Cancel !%>" />
-	</div>
-	<input type="hidden" name="aktion" value="timer_add" /> 
-	<tmpl_if referer>
-		<input type="hidden" name="referer" value="<tmpl_var referer>" />
-	</tmpl_if>
-	<tmpl_if timer_id>
-		<input type="hidden" name="timer_id" value="<tmpl_var timer_id>" /> 
-	</tmpl_if>
+		<div id="buttons">
+			<input type="submit" class="submit" name="save" value="<%! Save !%>" />
+			<input type="submit" class="submit" name="exit" value="<%! Cancel !%>" />
+		</div>
+		<input type="hidden" name="aktion" value="timer_add" /> 
+		<tmpl_if referer>
+			<input type="hidden" name="referer" value="<tmpl_var referer>" />
+		</tmpl_if>
+		<tmpl_if timer_id>
+			<input type="hidden" name="timer_id" value="<tmpl_var timer_id>" /> 
+		</tmpl_if>
 	</form>
 </body>
author	Andreas Mair <amair.sob@googlemail.com>	2005-06-22 14:42:18 +0200
committer	Andreas Mair <amair.sob@googlemail.com>	2005-06-22 14:42:18 +0200
commit	1f33deeae237bdcc4281de03d268528d4a09edd3 (patch)
tree	ba27f73a162201dc1f33a83cdb77ca724ab22fa8 /template/default/timer_new.html
parent	d6922e850779c4ff9d8bcbcef9842cf333eb8638 (diff)
download	vdradmin-am-1f33deeae237bdcc4281de03d268528d4a09edd3.tar.gz vdradmin-am-1f33deeae237bdcc4281de03d268528d4a09edd3.tar.bz2