2005-11-11: 0.97-am3.4.2rc4v0.97-am3.4.2rc4

- Updated Template-Toolkit to v2.13.
- Reworked sorting in rec_list/timer_list/at_timer_list.
- Activate/Inactivate selected timers in timers_list (Requested by Atti).
- Event's title in prog_summary/prog_list/prog_list2 links to prog_detail (Requested by Scorp).
- Added "Refresh" button in rec_list to refresh the cache of the list of recordings.
- Fixed popup if deleting timers/recordings/autotimers containing a "'" (Reported by Saxman2k).
- Remember sorting after deleteing or editing timer or autotimer (Reported by Atti).
- Improved re-connect to VDR if VDRAdmin crashes.

8 files changed, 622 insertions, 34 deletions

diff --git a/template/default/at_timer_list.html b/template/default/at_timer_list.html
index ba4b284..54f1637 100644
--- a/template/default/at_timer_list.html
+++ b/template/default/at_timer_list.html
@@ -163,7 +163,7 @@
 				</td>
 				<td class="col_delete">
 					<div>
-						<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>
+						<a href="javascript:del('<%! Delete timer? !%>\n\n&quot;<tmpl_var pattern_js>&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">
diff --git a/template/default/default/style.css b/template/default/default/style.css
index 71e9e81..4c0837d 100644
--- a/template/default/default/style.css
+++ b/template/default/default/style.css
@@ -145,11 +145,11 @@ body.help .heading {
 	height: 17px;
 }
 .heading td.selected {
-	background-color: #cdcdcd;
+	background-color: #94beee;
 	height: 17px;
 }
 .heading td {
-	background-color: #dedede;
+	background-color: #cdd5e5;
 	height: 17px;
 }
 .heading h2,
@@ -163,21 +163,21 @@ body.help .heading {
 	white-space: normal;
 }
 .heading a:hover {
-	color: white;
+	color: grey;
 	text-decoration: none;
 }
 
 .row_even td.selected {
-	background-color: #e6eef6;
+	background-color: #d5def6;
 }
 .row_even td {
-	background-color: #eef6ff;
+	background-color: #eeeeff;
 }
 .row_odd td.selected {
-	background-color: #f6f6f6;
+	background-color: #dee6f6;
 }
 .row_odd td {
-	background-color: #ffffff;
+	background-color: #f6faff;
 }
 
 .col_label,
@@ -342,7 +342,7 @@ body.help .heading {
 }
 #heading tr {
 	vertical-align: middle;
-	background-color: #d5dae6;
+	background-color: #dedeee;
 }
 #heading td {
 	vertical-align: middle;
diff --git a/template/default/default/style.css.bak b/template/default/default/style.css.bak
new file mode 100644
index 0000000..71e9e81
--- /dev/null
+++ b/template/default/default/style.css.bak
@@ -0,0 +1,559 @@
+* {
+	font-family: Verdana, Arial, Geneva, Helvetica, sans-serif;
+}
+
+#rc,
+#tv {
+	background-color: black;
+	margin: 0px;
+}
+
+body {
+	background-color: #c4cdd7;
+	margin: 3px;
+}
+
+form {
+	margin: 0px;
+}
+
+td,
+div {
+	color: black;
+	font-weight: normal;
+	font-size: 11px;
+}
+
+input {
+	color: black;
+	font-weight: normal;
+	font-size: 11px;
+}
+
+textarea {
+	color: black;
+	font-weight: normal;
+	font-size: 11px;
+}
+
+select {
+	color: black;
+	font-weight: normal;
+	font-size: 11px;
+}
+
+.submit {
+	height: 20px;
+}
+
+h1 {
+	margin-right: 12px;
+	margin-left: 12px;
+	font-size: 13px;
+	font-weight: bold;
+	color: black;
+	display: inline;
+}
+h2 {
+	margin: 0px;
+	font-size: 11px;
+	font-weight: bold;
+	color: black;
+	display: inline;
+}
+h3 {
+	margin: 0px;
+	font-size: 11px;
+	font-weight: bold;
+	color: black;
+}
+h4 {
+	margin: 0px;
+	font-size: 11px;
+	font-weight: normal;
+	font-style: italic;
+	color: black;
+}
+h5 {
+	margin: 1px 5px;
+	font-size: 11px;
+	font-weight: normal;
+	color: black;
+	text-align: right;
+}
+
+label {
+	cursor: default;
+}
+
+a,
+a:visited,
+a:active {
+	color: black;
+	text-decoration: none;
+}
+a:hover {
+	color: gray;
+	text-decoration: none;
+}
+
+label + input {
+	margin-left: 1em;
+}
+
+#tv input,
+#tv select,
+#tv h5 {
+	font-weight: normal;
+	font-size: 9px;
+	display: inline;
+}
+#rec_list .col_name {
+	font-weight: bold;
+}
+#prog_timeline a ,
+#prog_timeline a:visited,
+#prog_timeline a:active {
+	color: blue;
+}
+
+#error h2 {
+	font-size: 11px;
+	color: red;
+}
+
+.row_spacer,
+.row_spacer td,
+.row_spacer td.selected,
+.footer,
+.footer td,
+.footer td.selected,
+.col_left,
+.col_right,
+#timer_new .group .heading,
+#at_timer_new .group .heading,
+#rec_edit .group .heading {
+	display: none;
+}
+body.help .heading {
+	display: table-row;
+}
+
+.row_odd
+.row_even,
+.heading {
+	height: 17px;
+}
+.heading td.selected {
+	background-color: #cdcdcd;
+	height: 17px;
+}
+.heading td {
+	background-color: #dedede;
+	height: 17px;
+}
+.heading h2,
+.heading a {
+	padding-left: 3px;
+	padding-right: 3px;
+	font-weight: bold;
+	font-style: italic;
+	color: black;
+	margin-top: 0px;
+	white-space: normal;
+}
+.heading a:hover {
+	color: white;
+	text-decoration: none;
+}
+
+.row_even td.selected {
+	background-color: #e6eef6;
+}
+.row_even td {
+	background-color: #eef6ff;
+}
+.row_odd td.selected {
+	background-color: #f6f6f6;
+}
+.row_odd td {
+	background-color: #ffffff;
+}
+
+.col_label,
+.col_value,
+.col_active,
+.col_channel,
+.col_start,
+.col_stop,
+.col_date,
+.col_time {
+	padding-left: 3px;
+	padding-right: 3px;
+	white-space: nowrap;
+}
+
+.row_odd,
+.row_even {
+	height: 25px;
+}
+
+.col_channels {
+	text-align: right;
+	padding: 10px;
+	width: 40%;
+}
+
+.col_wanted_channels {
+	text-align: left;
+	padding: 10px;
+	width: 40%;
+}
+
+.col_navi {
+	text-align: right;
+	background-color: #f6faff;
+	white-space: nowrap;
+	height: 17px;
+}
+
+.list,
+.group {
+	margin-top: 0.6em;
+	border: 1px solid black;
+}
+.group td {
+	padding: 2px;
+}
+
+/* Summary */
+#prog_summary .group {
+	margin: 3px; float: left;
+}
+#prog_summary h2 {
+	padding: 0px;
+}
+#prog_summary .heading td.col_center {
+	height: 17px;
+	width: 246px;
+	white-space: nowrap;
+	overflow: hidden;
+}
+#prog_summary .row_odd td.col_center {
+	width: 246px;
+	height: 200px;
+	vertical-align: top;
+}
+#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: auto;
+	white-space: normal;
+}
+#prog_summary .heading a {
+	font-weight: bold;
+	font-style: italic;
+	color: black;
+	padding: 2px 2px;
+}
+#prog_summary .group {
+	margin: 3px;
+	display: inline;
+	float: left;
+}
+#prog_summary tr.footer {
+	display: table-row;
+	background-color: #f6faff;
+}
+#prog_summary .footer td.col_center {
+	display: table-cell;
+	height: 22px;
+	width: 246px;
+	border-top: 1px solid black;
+	vertical-align: middle;
+	white-space: nowrap;
+	text-align: center;
+}
+
+#content {
+	margin-top: 0.5em;
+}
+
+.col_duration {
+	padding-left: 3px;
+	padding-right: 3px;
+	width: 120px;
+	vertical-align: top;
+}
+.col_name,
+.col_title * {
+	padding-left: 3px;
+	padding-right: 3px;
+	min-width: 50px;
+	white-space: normal;
+}
+.col_info,
+.col_record {
+	width: 65px;
+	text-align: center;
+}
+.col_active {
+	width: 70px;
+}
+.col_channel {
+	width: 120px;
+}
+.col_start,
+.col_stop,
+.col_date,
+.col_time {
+	width: 76px;
+	text-align: right;
+}
+.col_edit,
+.col_delete,
+.col_stream,
+.col_checkbox {
+	text-align: center;
+	width: 30px;
+	max-width: 30px;
+}
+
+#heading {
+	height: 39px;
+	border: 1px dotted black;
+}
+#heading tr {
+	vertical-align: middle;
+	background-color: #d5dae6;
+}
+#heading td {
+	vertical-align: middle;
+	padding: 0px 10px;
+}
+#heading .col_other {
+	text-align: right;
+}
+#heading .col_other table {
+	display: inline;
+}
+#heading .col_help {
+	text-align: center;
+	width: 45px;
+}
+
+#prog_timeline #prgtable {
+	border-left-color: #c4cdd7;
+	border-bottom-color: #c4cdd7;
+}
+#prog_timeline #timertable {
+	background: red;
+	border-left-color: #ffcdd7;
+	border-bottom-color: #ffcdd7;
+}
+#prog_timeline #timeline {
+	background: red;
+}
+#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;
+}
+
+#timer_list .blackline {
+	background-color: black;
+}
+#timer_list .color_ok {
+	background-color: #00a317;
+}
+#timer_list .color_conflict {
+	background-color: #a11917;
+}
+#timer_list .color_collision {
+	background-color: #ffde62;
+}
+#timer_list .color_inactive {
+	background-color: #858585;
+}
+#timer_list #prgtable {
+	border-left-color: #000000;
+	border-right-color: #000000;
+}
+#prog_timeline .row_even table td.color1,
+#timer_list .row_even table td.color1 {
+	background-color: #e6eff9;
+}
+#prog_timeline .row_even table td.color2,
+#timer_list .row_even table td.color2 {
+	background-color: #d5dee8;
+}
+
+#prog_detail td {
+	white-space: normal;
+}
+#prog_detail .heading h2 {
+	white-space: normal;
+}
+
+#content {
+	margin-top: 1em;
+}
+.group {
+	margin-top: 0.5em;
+}
+#buttons {
+	border: 1px solid black;
+	padding: 3px;
+	margin-top: 1em;
+	margin-bottom: 1em;
+	background-color: #acb2ac;
+	text-align: right;
+}
+
+/* Tooltips */
+.tt_table {
+	width: 250px;
+	border: 2px solid #838183;
+	background-color: #acb2ac;
+}
+.tt_table th {
+	background-color: #838183;
+	font-weight: bold;
+	color: white;
+	padding-left: 2px;
+	padding-right: 2px;
+}
+.tt_table td {
+	color: black;
+	padding-left: 5px;
+	padding-right: 5px;
+}
+
+/* Help */
+#help dt {
+	margin-top: 0.6em;
+	font-weight: bold;
+	font-style: italic;
+}
+#help dd dl dt {
+	margin-top: 0.3em;
+	font-weight: normal;
+	font-style: italic;
+}
+#help dl {
+	padding: 5px;
+}
+#help h3 {
+	font-weight: bold;
+	font-style: italic;
+	letter-spacing: 0.5em;
+	background-color: gray;
+	color: white;
+	padding: 2px 5px;
+}
+#help h4 {
+	text-decoration: underline;
+	font-style: normal;
+}
+#help strong {
+	font-weight: bold;
+}
+#help .ref_menu {
+	font-style: italic;
+}
+#help .ref_file {
+	text-decoration: underline;
+}
+#help .ref_label {
+	font-style: italic;
+}
+#help .links {
+	padding: 5px;
+	background-color: silver;
+	text-align: justify;
+}
+#help .links a {
+	white-space: nowrap;
+}
+#help .group {
+	margin-top: 0.6em;
+	border: 1px solid black;
+	white-space: normal;
+}
+#help .group p {
+	padding: 5px;
+}
+#help .top_link {
+	text-align: right;
+	font-size: 0.8em;
+	background-color: silver;
+	padding: 1px 5px;
+	margin: 0px;
+}
+
+/* Navigation */
+#navigation {
+	margin: 0px;
+}
+#navigation .nav_bar {
+	border: 1px solid black;
+	padding: 1em 0px;
+}
+#navigation .logo {
+	padding-top: 2em;
+	padding-bottom: 3em;
+	width: 150px;
+}
+#navigation .navi {
+	font-size: 12px;
+	padding-top: 6px;
+	height: 25px;
+	text-align: center;
+}
+#navigation .navi:hover {
+	background-color: #dedede;
+}
+#navigation .search {
+	padding-top: 2em;
+	font-size: 12px;
+	text-align: center;
+}
+#navigation .separator {
+	display: none;
+}
+#navigation a,
+#navigation a:visited,
+#navigation a:active {
+	color: black;
+	font-weight: bold;
+	text-decoration: none;
+	border: 0px;
+}
+#navigation input {
+	width: 140px;
+}
diff --git a/template/default/prog_list.html b/template/default/prog_list.html
index c050e33..1b9b9a6 100644
--- a/template/default/prog_list.html
+++ b/template/default/prog_list.html
@@ -63,18 +63,20 @@
 					<tmpl_var emit> - <tmpl_var duration>
 				</td>
 				<td class="col_title">
-<!--					<tmpl_if infurl>
+					<h3>
+					<tmpl_if infurl>
 						<a href="javascript:popup('<tmpl_var infurl>');">
-					</tmpl_if>-->
-					<h3><tmpl_var title></h3>
+					</tmpl_if>
+					<tmpl_var title>
+					<tmpl_if infurl>
+						</a>
+					</tmpl_if>
+					</h3>
 					<tmpl_if subtitle>
 						<h4><tmpl_var subtitle></h4>
 					<tmpl_else>
 						<br />
 					</tmpl_if>
-<!--					<tmpl_if infurl>
-						</a>
-					</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 a570d0f..4e1e02a 100644
--- a/template/default/prog_list2.html
+++ b/template/default/prog_list2.html
@@ -71,18 +71,20 @@
 					<tmpl_var emit> - <tmpl_var duration>
 				</td>
 				<td class="col_title">
-<!--					<tmpl_if infurl>
-						<a href="javascript:popup('<tmpl_var infurl>');">
-					</tmpl_if>-->
-					<h3><tmpl_var title></h3>
+					<h3>
+						<tmpl_if infurl>
+							<a href="javascript:popup('<tmpl_var infurl>');">
+						</tmpl_if>
+						<tmpl_var title>
+						<tmpl_if infurl>
+							</a>
+						</tmpl_if>
+					</h3>
 					<tmpl_if subtitle>
 						<h4><tmpl_var subtitle></h4>
 					<tmpl_else>
 						<br />
 					</tmpl_if>
-<!--					<tmpl_if infurl>
-						</a>
-					</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 d7d10dd..1eb8542 100644
--- a/template/default/prog_summary.html
+++ b/template/default/prog_summary.html
@@ -53,7 +53,15 @@
 						<tmpl_if start><tmpl_var start>-<tmpl_var stop></tmpl_if>
 					</div>
 					<div class="title">
-						<h3><tmpl_var title></h3>
+						<h3>
+							<tmpl_if summary>
+								<a href="javascript:popup('<tmpl_var infurl>');">
+							</tmpl_if>
+							<tmpl_var title>
+							<tmpl_if summary>
+								</a>
+							</tmpl_if>
+						</h3>
 						<tmpl_if subtitle>
 							<h4><tmpl_var subtitle></h4>
 						<tmpl_else>
diff --git a/template/default/rec_list.html b/template/default/rec_list.html
index f37f93e..ddc4793 100644
--- a/template/default/rec_list.html
+++ b/template/default/rec_list.html
@@ -125,19 +125,19 @@
 				</td>
 				<td class="col_name <tmpl_if sortbyname>selected</tmpl_if>">
 					<tmpl_if isfolder>
-						<a href="<tmpl_var infurl>"><img align="middle" src="bilder/folder_video.gif" border="0" />&nbsp;<tmpl_var name></a>
+						<a href="<tmpl_var infurl><tmpl_var cur_sorting>"><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="middle" src="bilder/aktion.gif" border="0" />&nbsp;<tmpl_var name></a>
 					</tmpl_if>
 				</td>
 				<td class="col_edit">
 					<tmpl_unless isfolder>
-						<a href="<tmpl_var editurl>"><img src="bilder/edit.gif" alt="rename" title="<%! Rename !%>" height="17" width="17" border="0" /></a>
+						<a href="<tmpl_var editurl><tmpl_var cur_sorting>"><img src="bilder/edit.gif" alt="rename" title="<%! Rename !%>" height="17" width="17" border="0" /></a>
 					</tmpl_unless>
 				</td>
 				<td  class="col_delete">
 					<tmpl_unless isfolder>
-						<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>
+						<a href="javascript:del('<%! Delete recording? !%>\n\n&quot;<tmpl_var name_js>&quot;', '<tmpl_var delurl><tmpl_var cur_sorting>');"><img src="bilder/delete.gif" alt="delete" title="<%! Delete !%>" height="17" width="17" border="0" /></a>
 					</tmpl_unless>
 				</td>
 <tmpl_if stream_rec_on>
@@ -164,8 +164,13 @@
 			</tr>
 		</table>
 
-		<div id="buttons">
+		<table width="100%" border="0" cellspacing="0" cellpadding="0" id="buttons">
+			<tr>
+				<td align="left">
+					<input type="submit" class="submit" name="rec_update" value="<%! Refresh !%>" />
+				</td>
 <tmpl_if reccmds>
+				<td align="center">
 					<%! Commands: !%>
 					<select name="rec_cmd" class="submit">
 	<tmpl_loop reccmds>
@@ -173,9 +178,12 @@
 	</tmpl_loop>				
 					</select>
 					<input type="submit" class="submit" name="rec_runcmd" value="<%! Run !%>" onclick="return confirm('<%! Really run this command? !%>')" />
+				</td>
 </tmpl_if>
+				<td align="right">
 					<input type="submit" class="submit" name="rec_delete" value="<%! Delete Selected Recordings !%>" onclick="return mdel('<%! Delete all selected recordings? !%>');" />
-		</div>
+				</td>
+		</table>
 		<input type="hidden" name="aktion" value="rec_delete" />
 	</form>
 </body>
diff --git a/template/default/timer_list.html b/template/default/timer_list.html
index e2cea26..ee26c41 100644
--- a/template/default/timer_list.html
+++ b/template/default/timer_list.html
@@ -63,7 +63,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&amp;timer=' + this.options[this.selectedIndex].value,'main')">
+						<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>
@@ -352,7 +352,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? !%>\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>
+						<div><a href="javascript:del('<%! Delete timer? !%>\n\n&quot;<tmpl_var title_js>&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>
@@ -374,10 +374,19 @@
 				</tr>
 			</table>
 
-			<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" />
+			<table width="100%" border="0" cellspacing="0" cellpadding="0" id="buttons">
+				<tr>
+					<td align="left">
+						<input type="submit" class="submit" name="timer_active" value="<%! activate !%>" onclick="return confirm('<%! Edit timer status? !%>');" />
+						<input type="submit" class="submit" name="timer_inactive" value="<%! inactivate !%>" onclick="return confirm('<%! Edit timer status? !%>');" />
+						<%! selected timers !%>
+					</td>
+					<td align="right">
+						<input type="submit" class="submit" name="timer_delete" value="<%! Delete Selected Timers !%>" onclick="return mdel('<%! Delete all selected timers? !%>');" />
+					</td>
+				</tr>
+			</table>
+			<input type="hidden" name="aktion" value="timer_aktion" />
 		</form>
 	</div>
 </body>