2006-11-02: 3.5.0rcv3.5.0rc

- Minor bugfixes.

6 files changed, 67 insertions, 54 deletions

diff --git a/template/default/at_timer_new.html b/template/default/at_timer_new.html
index 6a8dfb0..3d3eb77 100644
--- a/template/default/at_timer_new.html
+++ b/template/default/at_timer_new.html
@@ -28,7 +28,9 @@
 
 		<div id="content">
 			<table width="100%" border="0" cellspacing="0" cellpadding="0" class="group">
-				<tr class="row_even">
+				<?% tr_class = "row_odd" %?>
+				<tr class="<?% tr_class %?>">
+					<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 					<td class="col_label"><h5><?% gettext('AutoTimer Active:') %?></h5></td>
 					<td class="col_value">
 <?% IF active == 2 %?>
@@ -42,13 +44,15 @@
 <?% END %?>
 					</td>
 				</tr>
-				<tr class="row_odd">
+				<tr class="<?% tr_class %?>">
+					<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 					<td class="col_label"><h5><?% gettext('Search Patterns:') %?></h5></td>
 					<td class="col_value">
 						<input type="text" name="pattern" value="<?% pattern %?>" size="40" />
 					</td>
 				</tr>
-				<tr class="row_even">
+				<tr class="<?% tr_class %?>">
+					<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 					<td class="col_label"><h5><?% gettext('Search in:') %?></h5></td>
 					<td class="col_value">
 						<input type="checkbox" name="title" value="1" id="searchin_title" <?% IF title %?>checked="checked"<?% END %?> /><label for="searchin_title"><?% gettext('Title') %?></label>
@@ -56,7 +60,8 @@
 						<input type="checkbox" name="description" value="1" id="searchin_description" <?% IF description %?>checked="checked"<?% END %?> /><label for="searchin_description"><?% gettext('Description') %?></label>
  	       </td>
 				</tr>
-				<tr class="row_odd">
+				<tr class="<?% tr_class %?>">
+					<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 					<td class="col_label"><h5><?% gettext('Search only on these days:') %?></h5></td>
 					<td class="col_value">
 						<input type="checkbox" name="wday_mon" value="1" id="wday_mon" <?% IF wday_mon %?>checked="checked"<?% END %?> /><label for="wday_mon"><?% gettext('Monday') %?></label>
@@ -68,7 +73,8 @@
 						<input type="checkbox" name="wday_sun" value="1" id="wday_sun" <?% IF wday_sun %?>checked="checked"<?% END %?> /><label for="wday_sun"><?% gettext('Sunday') %?></label>
  	       </td>
 				</tr>
-				<tr class="row_even">
+				<tr class="<?% tr_class %?>">
+					<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 					<td class="col_label"><h5><?% gettext('Channel:') %?></h5></td>
 					<td class="col_value">
 						<select class="submit" name="channel">
@@ -79,7 +85,8 @@
 						</select>
 					</td>
 				</tr>
-				<tr class="row_odd">
+				<tr class="<?% tr_class %?>">
+					<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 					<td class="col_label"><h5><?% gettext('Starts After:') %?></h5></td>
 					<td class="col_value">
 						<input type="text" name="starth" value="<?% starth %?>" size="2" maxlength="2" />
@@ -88,7 +95,8 @@
 						&nbsp;<?% gettext('o\'clock') %?>
 					</td>
 				</tr>
-				<tr class="row_even">
+				<tr class="<?% tr_class %?>">
+					<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 					<td class="col_label"><h5><?% gettext('Ends Before:') %?></h5></td>
 					<td class="col_value">
 						<input type="text" name="stoph" value="<?% stoph %?>" size="2" maxlength="2" />
@@ -97,51 +105,59 @@
 						&nbsp;<?% gettext('o\'clock') %?>
 					</td>
 				</tr>
-				<tr class="row_odd">
+				<tr class="<?% tr_class %?>">
+					<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 					<td class="col_label"><h5><?% gettext('Override Start/Stop Margins:') %?></h5></td>
 					<td class="col_value">
 						<input type="radio" name="buffers" value="1" id="buffers_yes" <?% IF buffers %?>checked="checked"<?% END %?> /><label for="buffers_yes"><?% gettext('Yes') %?></label>
 						<input type="radio" name="buffers" value="0" id="buffers_no" <?% UNLESS buffers %?>checked="checked"<?% END %?> /><label for="buffers_no"><?% gettext('No') %?></label>
 					</td>
 				</tr>
-				<tr class="row_even">
+				<tr class="<?% tr_class %?>">
+					<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 					<td class="col_label"><h5><?% gettext('Time Margin at Start:') %?></h5></td>
 					<td class="col_value">
 						<input type="text" name="bstart" value="<?% bstart %?>" size="2" maxlength="2" /> <?% gettext('minutes') %?>
 					</td>
 				</tr>
-				<tr class="row_odd">
+				<tr class="<?% tr_class %?>">
+					<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 					<td class="col_label"><h5><?% gettext('Time Margin at Stop:') %?></h5></td>
 					<td class="col_value">
 						<input type="text" name="bstop" value="<?% bstop %?>" size="2" maxlength="2" /> <?% gettext('minutes') %?>
 					</td>
 				</tr>
-				<tr class="row_even">
+				<tr class="<?% tr_class %?>">
+					<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 					<td class="col_label"><h5><?% gettext('Priority:') %?></h5></td>
 					<td class="col_value">
 						<input type="text" name="prio" value="<?% prio %?>" size="2" maxlength="2" />
 					</td>
 				</tr>
-				<tr class="row_odd">
+				<tr class="<?% tr_class %?>">
+					<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 					<td class="col_label"><h5><?% gettext('Lifetime:') %?></h5></td>
 					<td class="col_value">
 						<input type="text" name="lft" value="<?% lft %?>" size="2" maxlength="2" />
 					</td>
 				</tr>
-				<tr class="row_even">
+				<tr class="<?% tr_class %?>">
+					<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 					<td class="col_label"><h5><label for="episode"><?% gettext('Episode:') %?></label></h5></td>
 					<td class="col_value">
 						<input type="checkbox" name="episode" value="1" id="episode" <?% IF episode %?>checked="checked"<?% END %?> />
 					</td>
 				</tr>
-				<tr class="row_odd">
+				<tr class="<?% tr_class %?>">
+					<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 					<td class="col_label"><h5><?% gettext('Remember programmed timers:') %?></h5></td>
 					<td class="col_value">
 						<input type="radio" name="done" value="1" id="rem_yes" <?% IF done %?>checked="checked"<?% END %?> /><label for="rem_yes"><?% gettext('Yes') %?></label>
 						<input type="radio" name="done" value="0" id="rem_no" <?% UNLESS done %?>checked="checked"<?% END %?> /><label for="rem_no"><?% gettext('No') %?></label>
 					</td>
 				</tr>
-				<tr class="row_even">
+				<tr class="<?% tr_class %?>">
+					<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 					<td class="col_label"><h5><?% gettext('Directory:') %?></h5></td>
 					<td class="col_value">
 						<input type="text" name="directory" value="<?% directory %?>" size="40" />
diff --git a/template/default/config.html b/template/default/config.html
index bb25def..728318d 100644
--- a/template/default/config.html
+++ b/template/default/config.html
@@ -8,20 +8,10 @@
 		<link href="user.css" rel="stylesheet" media="screen" type="text/css" />
 	<?% END %?>
 	<script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
-	<script type="text/javascript" language="JavaScript">
-		<!--
-		function new_tab(tab_nr)
-		{
-			document.FormName.new_tab.value = tab_nr;
-			document.FormName.apply.click();
-		}
-		//-->
-	</script>
 </head>
 
 <body id="config">
 	<form action="<?% url %?>" method="get" name="FormName">
-		<input type="hidden" name="new_tab" value="<?% active_tab %?>"/>
 		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
 			<tr>
 				<td class="col_title">
@@ -184,6 +174,7 @@
 			</tr>
 		</table>
 
+<?% IF features.AUTOTIMER %?>
 		<table border="0" cellspacing="0" cellpadding="0" class="group">
 			<tr class="heading">
 				<td colspan="2"><h2><?% gettext('AutoTimer') %?></h2></td>
@@ -252,6 +243,7 @@
 				</td>
 			</tr>
 		</table>
+<?% END %?>
 
 		<table border="0" cellspacing="0" cellpadding="0" class="group">
 			<tr class="heading">
diff --git a/template/default/epgsearch_list.html b/template/default/epgsearch_list.html
index 42a3ac7..71bdb1d 100644
--- a/template/default/epgsearch_list.html
+++ b/template/default/epgsearch_list.html
@@ -182,6 +182,7 @@
 			<tr>
 				<td align="left">
 					<input type="submit" class="submit" name="favorites" value="<?% gettext('Show Favorites') %?>" />
+					<input type="submit" class="submit" name="upds" value="<?% gettext('Force Update') %?>" />
 				</td>
 				<td align="right">
 					<input type="submit" class="submit" name="delete" value="<?% gettext('Delete Selected Searches') %?>" onclick="mdel(this, '<?% gettext('Delete all selected searches?') %?>');" />
diff --git a/template/default/style.css b/template/default/style.css
index 0bcc6ff..da942c5 100644
--- a/template/default/style.css
+++ b/template/default/style.css
@@ -4,7 +4,9 @@
 	overflow-y: scroll;
 }
 /* avoid too small inputs/selects */
-*+html #epgsearch_new #use_extepg_settings table,
+* + html #epgsearch_new #use_extepg_settings table {
+	width: 30%;
+}
 * html #epgsearch_new #use_extepg_settings table {
 	width: 30%;
 }
@@ -541,9 +543,8 @@ body.help .heading {
 #timer_list .list {
 	margin-top: 0.6em;
 }
-#timer_list .blackline {
-	height: 1px;
-	background-color: black;
+#timer_list .timers {
+	border-top: 1px solid black;
 }
 #timer_list .color_ok {
 	background-color: #00a317;
diff --git a/template/default/timer_list.html b/template/default/timer_list.html
index a5147a4..20b127a 100644
--- a/template/default/timer_list.html
+++ b/template/default/timer_list.html
@@ -99,13 +99,7 @@
 			IF timer.cdesc != sender && timer.starttime <= current && timer.stoptime >= current;
 				sender=timer.cdesc;
 	%?>
-						<table cellspacing="0" cellpadding="0" border="0">
-							<tr>
-								<td bgcolor="#000000" height="1" class="blackline"><img src="bilder/spacer.gif" width="<?% tablaenge + 100 %?>" height="1" border="0" alt="" /></td>
-							</tr>
-						</table>
-
-						<table cellspacing="0" cellpadding="0" border="0">
+						<table cellspacing="0" cellpadding="0" border="0" class="timers">
 							<tr>
 								<td class="<?% (programm % 2) == 0 ? 'color2' : 'color1' %?>" height="20" width="100"><img src="bilder/spacer.gif" width="100" height="1" border="0" alt="" /><br /><a href="<?% timer.proglink %?>"><b><?% sender | truncate(11) %?></b></a></td>
 
@@ -173,12 +167,6 @@
 			END;
 	  END;
 	%?>
-
-						<table cellspacing="0" cellpadding="0" border="0">
-							<tr>
-								<td bgcolor="#000000" height="1" class="blackline"><img src="bilder/spacer.gif" width="<?% tablaenge + 100 %?>" height="1" border="0" alt="" /></td>
-							</tr>
-						</table>
 					</td>
 				</tr>
 			</table>
diff --git a/template/default/timer_new.html b/template/default/timer_new.html
index 3d200aa..d311a43 100644
--- a/template/default/timer_new.html
+++ b/template/default/timer_new.html
@@ -56,14 +56,18 @@
 		</table>
 
 		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="group">
-			<tr class="row_odd">
+			<?% tr_class = "row_odd" %?>
+			<tr class="<?% tr_class %?>">
+				<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 				<td class="col_label"><h5><?% gettext('Timer Active:') %?></h5></td>
 				<td class="col_value">
 					<input type="radio" name="active" value="1" id="active_yes" <?% IF active %?>checked="checked"<?% END %?> /><label for="active_yes"><?% gettext('Yes') %?></label>
 					<input type="radio" name="active" value="0" id="active_no" <?% UNLESS active %?>checked="checked"<?% END %?> /><label for="active_no"><?% gettext('No') %?></label>
 				</td>
 			</tr>
-			<tr class="row_even">
+<?% IF features.AUTOTIMER %?>
+			<tr class="<?% tr_class %?>">
+				<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 				<td class="col_label"><h5><?% gettext('AutoTimer Checking:') %?></h5></td>
 				<td class="col_value">
 					<input type="hidden" name="event_id" value="<?% event_id %?>"/>
@@ -74,7 +78,9 @@
 					<input type="radio" name="autotimer" value="0" id="event_off" <?% IF autotimer == 0 %?>checked="checked"<?% END %?> /><label for="event_off"><?% gettext('off') %?></label>
 				</td>
 			</tr>
-			<tr class="row_odd">
+<?% END %?>
+			<tr class="<?% tr_class %?>">
+				<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 				<td class="col_label"><h5><?% gettext('Channel:') %?></h5></td>
 				<td class="col_value">
 					<select name="channel" class="submit">
@@ -84,7 +90,8 @@
 					</select>
 				</td>
 			</tr>
-			<tr class="row_even">
+			<tr class="<?% tr_class %?>">
+				<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 				<td valign="top" class="col_label"><h5><?% gettext('Day Of Recording:') %?></h5></td>
 				<td class="col_value">
 					<input type="text" name="dor" value="<?% dor %?>" size="20" />
@@ -98,7 +105,8 @@
 					<input onclick="cTimer(7)" type="checkbox" name="D6" value="1" id="wday_sun" /><label for="wday_sun"><?% gettext('Sunday') %?></label>
 				</td>
 			</tr>
-			<tr class="row_odd">
+			<tr class="<?% tr_class %?>">
+				<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 				<td class="col_label"><h5><?% gettext('Start Time:') %?></h5></td>
 				<td class="col_value">
 					<input type="text" name="starth" value="<?% starth %?>" size="2" maxlength="2" />
@@ -110,7 +118,8 @@
 					<?% END %?>
 				</td>
 			</tr>
-			<tr class="row_even">
+			<tr class="<?% tr_class %?>">
+				<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 				<td class="col_label"><h5><?% gettext('End Time:') %?></h5></td>
 				<td class="col_value">
 					<input type="text" name="stoph" value="<?% stoph %?>" size="2" maxlength="2" />
@@ -122,28 +131,34 @@
 					<?% END %?>
 				</td>
 			</tr>
-			<tr class="row_odd">
+			<tr class="<?% tr_class %?>">
+				<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 				<td class="col_label"><h5><?% gettext('Use VPS:') %?></h5></td>
 				<td class="col_value"><input type="checkbox" name="vps" value="1" <?% IF vps %?>checked="checked"<?% END %?> /></td>
 			</tr>
-			<tr class="row_even">
+			<tr class="<?% tr_class %?>">
+				<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 				<td class="col_label"><h5><?% gettext('Priority:') %?></h5></td>
 				<td class="col_value"><input type="text" name="prio" value="<?% prio %?>" size="2" maxlength="2" /></td>
 			</tr>
-			<tr class="row_odd">
+			<tr class="<?% tr_class %?>">
+				<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 				<td class="col_label"><h5><?% gettext('Lifetime:') %?></h5></td>
 				<td class="col_value"><input type="text" name="lft" value="<?% lft %?>" size="2" maxlength="2" /></td>
 			</tr>
-			<tr class="row_even">
+			<tr class="<?% tr_class %?>">
+				<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 				<td class="col_label"><h5><?% gettext('Title of Recording:') %?></h5></td>
 				<td class="col_value"><input type="text" name="title" value="<?% title %?>" size="80" /></td>
 			</tr>
-			<tr class="row_odd">
+			<tr class="<?% tr_class %?>">
+				<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 				<td class="col_label" valign="top"><h5><?% gettext('Summary:') %?></h5><h6>(<?% gettext('readonly') %?>)</h6></td>
 				<td class="col_value"><textarea name="summary" rows="6" cols="80" readonly="readonly"><?% summary %?></textarea></td>
 			</tr>
 <?% IF pattern %?>
-			<tr class="row_even">
+			<tr class="<?% tr_class %?>">
+				<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
 				<td class="col_label"><h5><?% gettext('Timer has been set by AutoTimer pattern:') %?></h5></td>
 				<td class="col_value"><?% pattern %?></td>
 			</tr>