2005-11-xx: 0.97-am3.4.2v0.97-am3.4.2rc5

- Fixed: Programming a timer using InternetExplorer didn't return to the previous page but gave an error (Reported by several people).
- Remember sorting after (in)activating selected timers (Reported by Atti).

8 files changed, 31 insertions, 11 deletions

diff --git a/template/default/config.html b/template/default/config.html
index f6d88b4..21c4b4b 100644
--- a/template/default/config.html
+++ b/template/default/config.html
@@ -300,7 +300,7 @@
 							<td class="col_right"></td>
 						</tr>
 -->
-						<tr class="row_even">
+						<tr class="row_odd">
 							<td class="col_left"></td>
 							<td class="col_label"><h5><%! Send email after programming timer: !%></h5></td>
 							<td class="col_value">
@@ -309,26 +309,38 @@
 							</td>
 							<td class="col_right"></td>
 						</tr>
-						<tr class="row_odd">
+						<tr class="row_even">
 							<td class="col_left"></td>
 							<td class="col_label"><h5><%! Send email as: !%></h5></td>
 							<td class="col_value">autotimer@<input type="text" name="MAIL_FROMDOMAIN" value="<tmpl_var MAIL_FROMDOMAIN>" size="20" maxlength="100" /></td>
 							<td class="col_right"></td>
 						</tr>
-						<tr class="row_even">
+						<tr class="row_odd">
 							<td class="col_left"></td>
 							<td class="col_label"><h5><%! Send email to: !%></h5></td>
 							<td class="col_value"><input type="text" name="MAIL_TO" value="<tmpl_var MAIL_TO>" size="20" maxlength="100" /></td>
 							<td class="col_right"></td>
 						</tr>
-						<tr class="row_odd">
+						<tr class="row_even">
 							<td class="col_left"></td>
 							<td class="col_label"><h5><%! Mail server: !%></h5></td>
 							<td class="col_value"><input type="text" name="MAIL_SERVER" value="<tmpl_var MAIL_SERVER>" size="20" maxlength="100" /></td>
 							<td class="col_right"></td>
 						</tr>
+						<tr class="row_odd">
+							<td class="col_left"></td>
+							<td class="col_label"><h5><%! SMTPAuth user: !%></h5></td>
+							<td class="col_value"><input type="text" name="MAIL_AUTH_USER" value="<tmpl_var MAIL_AUTH_USER>" size="20" maxlength="100" /></td>
+							<td class="col_right"></td>
+						</tr>
 						<tr class="row_even">
 							<td class="col_left"></td>
+							<td class="col_label"><h5><%! SMTPAuth password: !%></h5></td>
+							<td class="col_value"><input type="text" name="MAIL_AUTH_PASS" value="<tmpl_var MAIL_AUTH_PASS>" size="20" maxlength="100" /></td>
+							<td class="col_right"></td>
+						</tr>
+						<tr class="row_odd">
+							<td class="col_left"></td>
 							<td class="col_label"><h5><%! Tooltips: !%></h5></td>
 							<td class="col_value">
 								<input type="radio" name="AT_TOOLTIP" value="1" id="at_tooltip_yes" <tmpl_if at_tooltip>checked</tmpl_if> /><label for="at_tooltip_yes"><%! Yes !%></label>
@@ -578,7 +590,7 @@
 							</td>
 							<td class="col_right"></td>
 						</tr>
-						<tr class="row_odd">
+						<tr class="row_even">
 							<td class="col_left"></td>
 							<td class="col_label"><h5><%! In "Watch TV"? !%></h5></td>
 							<td class="col_value" colspan="2">
@@ -587,7 +599,7 @@
 							</td>
 							<td class="col_right"></td>
 						</tr>
-						<tr class="row_even">
+						<tr class="row_odd">
 							<td class="col_left"></td>
 							<td class="col_channels">
 								<select name="all_channels" size="8" multiple>
diff --git a/template/default/default/style.css b/template/default/default/style.css
index 4c0837d..b7f6f14 100644
--- a/template/default/default/style.css
+++ b/template/default/default/style.css
@@ -315,7 +315,7 @@ body.help .heading {
 	text-align: center;
 }
 .col_active {
-	width: 70px;
+	width: 90px;
 }
 .col_channel {
 	width: 120px;
diff --git a/template/default/default/style.css.bak b/template/default/default/style.css.bak
index 71e9e81..d435861 100644
--- a/template/default/default/style.css.bak
+++ b/template/default/default/style.css.bak
@@ -315,7 +315,7 @@ body.help .heading {
 	text-align: center;
 }
 .col_active {
-	width: 70px;
+	width: 90px;
 }
 .col_channel {
 	width: 120px;
diff --git a/template/default/help_config.html b/template/default/help_config.html
index 2768d6c..323d498 100644
--- a/template/default/help_config.html
+++ b/template/default/help_config.html
@@ -113,6 +113,10 @@
 						<dd><%! The email address the email is sent to. !%></dd>
 						<dt><%! Mail server: !%></dt>
 						<dd><%! The outgoing mail server. !%></dd>
+						<dt><%! SMTPAuth user: !%></dt>
+						<dd><%! If you need to authenticate yourself at the outgoing mail server, you have to supply the username and the password below. Leaving this field empty will disable SMTPAuth. !%>
+						<dt><%! SMTPAuth password: !%></dt>
+						<dd><%! The password for the SMTPAuth user. !%></dd>
 						<dt><%! Tooltips: !%></dt>
 						<dd><%! Here you can (de-)activate the tooltips. !%></dd>
 					</dl>
diff --git a/template/default/help_rec_list.html b/template/default/help_rec_list.html
index 0e9bd00..e7543b7 100644
--- a/template/default/help_rec_list.html
+++ b/template/default/help_rec_list.html
@@ -45,7 +45,8 @@
 					</dl>
 				</p>
 				<p>In addition to these functions you can delete a number of recordings at once by checking the box in the last but one column of those recordings and clicking <input type="submit" class="submit" value="Delete Selected Recordings"/>.</p>
-				<p>If you've set the path the VDR's configuration files and have entries in VDR's <span class="ref_file">reccmds.conf</span> you can run those commands for the selected recording by selecting the wanted command in the select box locate next to <span class="ref_label">Commands:</span> and pressing the <input type="submit" class="submit" value="Run"/> button.</p> !%>
+				<p>If you've set the path the VDR's configuration files and have entries in VDR's <span class="ref_file">reccmds.conf</span> you can run those commands for the selected recording by selecting the wanted command in the select box locate next to <span class="ref_label">Commands:</span> and pressing the <input type="submit" class="submit" value="Run"/> button.</p>
+				<p>Use <input type="submit" class="submit" value="Refresh"/> to force reloading of VDR's recordings listing.</p> !%>
 			</td>
 			<td class="col_right"></td>
 		</tr>
diff --git a/template/default/help_timer_list.html b/template/default/help_timer_list.html
index 96b6198..9b8559f 100644
--- a/template/default/help_timer_list.html
+++ b/template/default/help_timer_list.html
@@ -53,7 +53,8 @@
 					<span class="color_conflict">&nbsp;&nbsp;&nbsp;</span> / <img src="bilder/poempl_rot.gif" alt="impossible" align="middle" /> Timer is critical and will most likely <strong>not</strong> record.<br />
 					<span class="color_inactive">&nbsp;&nbsp;&nbsp;</span> / <img src="bilder/poempl_grau.gif" alt="inactive" align="middle" /> Timer is not active.
 				</p>
-				<p>In addition to these functions you can add a new timer by clicking <input type="submit" class="submit" value="New Timer"/> at the top and you can delete a number of timers at once by checking the box in the last column of those timers and clicking <input type="submit"  class="submit" value="Delete Selected Timers"/>.</p> !%>
+				<p>In addition to these functions you can add a new timer by clicking <input type="submit" class="submit" value="New Timer"/> at the top and you can delete a number of timers at once by checking the box in the last column of those timers and clicking <input type="submit"  class="submit" value="Delete Selected Timers"/>.</p>
+				<p>You can <input type="submit" class="submit" value="activate"/> and <input type="submit" class="submit" value="inactivate"/> selected timers.</p> !%>
 			</td>
 			<td class="col_right"></td>
 		</tr>
diff --git a/template/default/prog_detail.html b/template/default/prog_detail.html
index 7d83d8b..176cbf5 100644
--- a/template/default/prog_detail.html
+++ b/template/default/prog_detail.html
@@ -47,7 +47,7 @@
 					&nbsp;<a href="vdradmin.pl?search=<tmpl_var find_title>&amp;aktion=prog_summary&amp;submit=go11)"  target="main">[<%! search !%>]</a>
 				</tmpl_if>
 				<tmpl_if imdburl>
-					&nbsp;<a href="http://akas.imdb.com/Tsearch?title=<tmpl_var find_title>" target="_blank" title="<%! Lookup movie in the Internet-Movie-Database (IMDb) !%>">[IMDb]</a>
+					&nbsp;<a href="<tmpl_var imdburl>" target="_blank" title="<%! Lookup movie in the Internet-Movie-Database (IMDb) !%>">[IMDb]</a>
 				</tmpl_if>
 			</td>
 			<td class="col_right"></td>
diff --git a/template/default/timer_list.html b/template/default/timer_list.html
index ee26c41..997590c 100644
--- a/template/default/timer_list.html
+++ b/template/default/timer_list.html
@@ -387,6 +387,8 @@
 				</tr>
 			</table>
 			<input type="hidden" name="aktion" value="timer_aktion" />
+			<input type="hidden" name="desc" value="<tmpl_var cur_desc>" />
+			<input type="hidden" name="sortby" value="<tmpl_var sortby>" />
 		</form>
 	</div>
 </body>