From 12afd457f85ae4c80446787ec2a37f5a0c30e3fb Mon Sep 17 00:00:00 2001
From: Andreas Mair <amair.sob@googlemail.com>
Date: Thu, 25 Jan 2007 16:01:07 +0100
Subject: 2007-01-25: 3.5.3 - Fixed: epgsearch's LSTT/DEFT commands need at
 least epgsearch v0.9.20. - Added: Klaus Schmidinger's "lste" speedup patch. -
 Changed: Do not send every HTTP header line in its own TCP packet (Speedup!).
 - Changed: Display error message if VDRAdmin-AM can't connect to VDR if
 index.html is requested. - Changed: Added warning in epgsearch edit if
 neither "title", "subtitle" nor "description" is checked. - Changed: Don't
 show recording commands drop-down if there are no reccmds. - Fixed: When
 sorting recordings by name, sort folders by name too.

---
 template/default/config.html        |  2 ++
 template/default/epgsearch_new.html | 20 +++++++++++---------
 template/default/help_config.html   |  2 ++
 template/default/rec_list.html      |  2 +-
 template/default/timer_new.html     |  2 +-
 5 files changed, 17 insertions(+), 11 deletions(-)

(limited to 'template')

diff --git a/template/default/config.html b/template/default/config.html
index 728318d..54c3ea8 100644
--- a/template/default/config.html
+++ b/template/default/config.html
@@ -350,6 +350,7 @@
 			<tr class="heading">
 				<td colspan="2"><h2><?% gettext('Expert') %?></h2></td>
 			</tr>
+<!-- no longer supported
 			<tr class="row_odd">
 				<td class="col_label"><h5><?% gettext('Read EPG directly using epg.data:') %?></h5></td>
 				<td class="col_value">
@@ -361,6 +362,7 @@
 				<td class="col_label"><h5><?% gettext('epg.data filename:') %?></h5></td>
 				<td class="col_value"><input type="text" name="EPG_FILENAME" value="<?% config.EPG_FILENAME %?>" size="20" maxlength="256" /></td>
 			</tr>
+-->
 			<tr class="row_odd">
 				<td class="col_label"><h5><?% gettext('VFAT:') %?></h5></td>
 				<td class="col_value">
diff --git a/template/default/epgsearch_new.html b/template/default/epgsearch_new.html
index cfc917b..2c5deae 100644
--- a/template/default/epgsearch_new.html
+++ b/template/default/epgsearch_new.html
@@ -124,15 +124,17 @@
 
 		function checkSearchPattern()
 		{
-			if (document.getElementById("pattern").value.length > 3)
-				return true;
-
-			if (   !document.getElementById("use_title").checked
-			    && !document.getElementById("use_subtitle").checked
-					&& !document.getElementById("use_descr").checked)
-				return true;
-
-			return confirm('<?% gettext('Small search pattern.\nDo you really want to use it?') %?>');
+			if (document.getElementById("pattern").value.length <= 3)
+			{
+					return confirm('<?% gettext('Small search pattern.\nDo you really want to use it?') %?>');
+			}
+			else
+			{
+				if (   !document.getElementById("use_title").checked
+			      && !document.getElementById("use_subtitle").checked
+					  && !document.getElementById("use_descr").checked)
+					return confirm("<?% gettext('You didn\'t select at least one of\ntitle, subtitle or description.\nDo you really want to use this search?') %?>");
+			}
 		}
 
 		function hideResults()
diff --git a/template/default/help_config.html b/template/default/help_config.html
index 5bc6163..16f6fb0 100644
--- a/template/default/help_config.html
+++ b/template/default/help_config.html
@@ -162,10 +162,12 @@
 				<div class="group"><a id="expert" name="expert"></a><h3><?% gettext('Expert') %?></h3>
 					<?% gettext('<p>This section is for experts <strong>only</strong>, i.e. you know what you are doing!</p>') %?>
 					<dl>
+<!--
 						<dt><?% gettext('Read EPG directly using epg.data:') %?></dt>
 						<dd><?% gettext('Accessing VDR\'s EPG through VDR\'s SVDRPort seems to block VDR for some time. If this option is activated VDRAdmin-AM will read the <span class="ref_file">epg.data</span> file directly so that VDR doesn\'t get blocked.') %?></dd>
 						<dt><?% gettext('epg.data filename:') %?></dt>
 						<dd><?% gettext('If you\'ve enabled the option above you need to tell VDRAdmin-AM where the <span class="ref_file">epg.data</span> file is located.') %?></dd>
+-->
 						<dt><?% gettext('VFAT:') %?></dt>
 						<dd><?% gettext('If you have compiled VDR with the VFAT define you have to enable this option. If this option is set to the wrong value, you may have problems with certain recordings if you want to stream them or run reccmds on them.') %?></dd>
 					</dl>
diff --git a/template/default/rec_list.html b/template/default/rec_list.html
index ab4905c..d1b9a85 100644
--- a/template/default/rec_list.html
+++ b/template/default/rec_list.html
@@ -133,7 +133,7 @@
 					<td align="left">
 						<input type="submit" class="submit" name="rec_update" value="<?% gettext('Refresh') %?>" />
 					</td>
-	<?% IF reccmds %?>
+	<?% IF reccmds.size > 0 %?>
 					<td align="center">
 						<?% gettext('Commands:') %?>
 						<select name="rec_cmd" class="submit">
diff --git a/template/default/timer_new.html b/template/default/timer_new.html
index d311a43..a32635c 100644
--- a/template/default/timer_new.html
+++ b/template/default/timer_new.html
@@ -149,7 +149,7 @@
 			<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>
+				<td class="col_value"><input type="text" name="title" value="<?% title | html %?>" size="80" /></td>
 			</tr>
 			<tr class="<?% tr_class %?>">
 				<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
-- 
cgit v1.2.3