diff options
Diffstat (limited to 'template')
24 files changed, 247 insertions, 45 deletions
diff --git a/template/default/about.html b/template/default/about.html new file mode 100644 index 0000000..a649f29 --- /dev/null +++ b/template/default/about.html @@ -0,0 +1,101 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html> + +<head> + <meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>" /> + <title><%! About !%></title> + <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> + <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> +</head> + +<body id="rec_list" onload="window.focus()"> + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="heading"> + <td class="col_left"></td> + <td colspan="2"><h2><%! Authors !%></h2></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_even"> + <td class="col_left"></td> + <td class="col_label" width="100px"><h4><%! Current author (VDRAdmin-AM branch): !%></h4></td> + <td class="col_value"><a href="mailto:mail@andreas.vdr-developer.org">Andreas Mair</a> (<a href="http://andreas.vdr-developer.org">Homepage</a>)</td> + <td class="col_right"></td> + </tr> + <tr class="row_even"> + <td class="col_left"></td> + <td class="col_label"><h4><%! Original author (VDRAdmin): !%></h4></td> + <td class="col_value">Thomas Koch (<a href="http://www.linvdr.org">Homepage</a>)</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> + + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="heading"> + <td class="col_left"></td> + <td colspan="2"><h2><%! Translation Team !%></h2></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_even"> + <td class="col_left"></td> + <td class="col_label" width="100px"><h4><%! Dutch: !%></h4></td> + <td class="col_value">Roel Koelewijn</td> + <td class="col_right"></td> + </tr> + <tr class="row_even"> + <td class="col_left"></td> + <td class="col_label" width="100px"><h4><%! English: !%></h4></td> + <td class="col_value">Andreas Mair</td> + <td class="col_right"></td> + </tr> + <tr class="row_even"> + <td class="col_left"></td> + <td class="col_label" width="100px"><h4><%! Finnish: !%></h4></td> + <td class="col_value">Rolf Ahrenberg</td> + <td class="col_right"></td> + </tr> + <tr class="row_even"> + <td class="col_left"></td> + <td class="col_label" width="100px"><h4><%! French: !%></h4></td> + <td class="col_value"><%! At the moment unmaintained, former translations by: !%> Trois Six, map, lobotomise, bads</td> + <td class="col_right"></td> + </tr> + <tr class="row_even"> + <td class="col_left"></td> + <td class="col_label" width="100px"><h4><%! German: !%></h4></td> + <td class="col_value">Andreas Mair</td> + <td class="col_right"></td> + </tr> + <tr class="row_even"> + <td class="col_left"></td> + <td class="col_label" width="100px"><h4><%! Spanish: !%></h4></td> + <td class="col_value">Rüdiger Jung</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> + </table> +</body> + +</html> diff --git a/template/default/at_timer_list.html b/template/default/at_timer_list.html index 54f1637..a23325c 100644 --- a/template/default/at_timer_list.html +++ b/template/default/at_timer_list.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>"/> - <title>VDRAdmin - <%! AutoTimer !%></title> + <title>VDRAdmin-AM - <%! AutoTimer !%></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"/> diff --git a/template/default/at_timer_new.html b/template/default/at_timer_new.html index db2a7af..ee83c46 100644 --- a/template/default/at_timer_new.html +++ b/template/default/at_timer_new.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>"/> - <title>VDRAdmin - <tmpl_if newtimer><%! Add New AutoTimer !%><tmpl_else><%! Edit AutoTimer !%></tmpl_if></title> + <title>VDRAdmin-AM - <tmpl_if newtimer><%! Add New AutoTimer !%><tmpl_else><%! Edit AutoTimer !%></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"/> diff --git a/template/default/config.html b/template/default/config.html index 21c4b4b..60d6c02 100644 --- a/template/default/config.html +++ b/template/default/config.html @@ -2,7 +2,7 @@ <html> <head> <meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>" /> - <title>VDRAdmin - <%! Configuration !%></title> + <title>VDRAdmin-AM - <%! Configuration !%></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" /> @@ -466,6 +466,30 @@ <td class="col_value"><input type="text" name="ST_VIDEODIR" value="<tmpl_var ST_VIDEODIR>" size="20" maxlength="256" /></td> <td class="col_right"></td> </tr> + <tr class="row_odd"> + <td class="col_left"></td> + <td class="col_label"><h5><%! MIME type for live streaming: !%></h5></td> + <td class="col_value"><input type="text" name="TV_MIMETYPE" value="<tmpl_var TV_MIMETYPE>" size="20" maxlength="256" /></td> + <td class="col_right"></td> + </tr> + <tr class="row_even"> + <td class="col_left"></td> + <td class="col_label"><h5><%! Suffix for live streaming: !%></h5></td> + <td class="col_value"><input type="text" name="TV_EXT" value="<tmpl_var TV_EXT>" size="4" maxlength="256" /></td> + <td class="col_right"></td> + </tr> + <tr class="row_odd"> + <td class="col_left"></td> + <td class="col_label"><h5><%! MIME type for recordings streaming: !%></h5></td> + <td class="col_value"><input type="text" name="REC_MIMETYPE" value="<tmpl_var REC_MIMETYPE>" size="20" maxlength="256" /></td> + <td class="col_right"></td> + </tr> + <tr class="row_even"> + <td class="col_left"></td> + <td class="col_label"><h5><%! Suffix for recordings streaming: !%></h5></td> + <td class="col_value"><input type="text" name="REC_EXT" value="<tmpl_var REC_EXT>" size="4" maxlength="256" /></td> + <td class="col_right"></td> + </tr> <!-- not (yet?) supported <tr class="row_odd"> <td class="col_left"></td> diff --git a/template/default/copper/style.css b/template/default/copper/style.css index 6bbb183..2db059c 100644 --- a/template/default/copper/style.css +++ b/template/default/copper/style.css @@ -145,3 +145,4 @@ label + input { margin-left: 1em; } #navigation a { color: black; font-weight: bold; text-decoration: none; } #navigation a:hover { font-size: 13px; color: #ff0000 } #navigation input { width: 130px; } +#navigation .bottom { position:absolute; bottom: 5px; } diff --git a/template/default/default/style.css b/template/default/default/style.css index b7f6f14..55cde26 100644 --- a/template/default/default/style.css +++ b/template/default/default/style.css @@ -557,3 +557,9 @@ body.help .heading { #navigation input { width: 140px; } +#navigation .bottom { + position:absolute; + left: 0px; + right: 0px; + bottom: 5px; +} diff --git a/template/default/help.html b/template/default/help.html new file mode 100644 index 0000000..834235a --- /dev/null +++ b/template/default/help.html @@ -0,0 +1,44 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html> + +<head> + <meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>" /> + <title><%! Help !%></title> + <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> + <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> +</head> + +<body id="rec_list" class="help" onload="window.focus()"> + <table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group"> + <tr class="heading"> + <td class="col_left"></td> + <td><h2><%! Getting Help and Reporting Bugs !%></h2></td> + <td class="col_right"></td> + </tr> + <tr class="row_spacer"> + <td class="col_left"></td> + <td></td> + <td class="col_right"></td> + </tr> + <tr class="row_even"> + <td class="col_left"></td> + <td> + <ul> + <li><%! If you need help please first try to use the online help you'll find on some pages. You can access it by clicking <img src="bilder/help.gif"/>. !%></li> + <li><%! If this doesn't provide the information you need you can try to get help at <a href="http://www.vdrportal.de" target="_new">VDR-Portal</a> if you understand German language. Please use the announcement thread if possible, search for: !%> "[ANNOUNCE] <tmpl_var myversion>"</li> + <li><%! If you think you have found a bug please check that it's a new one and report it in the <a href="http://www.vdr-developer.org/mantisbt/main_page.php" target="_new">VDRAdmin-AM BugTracking system</a>. !%></li> + </td> + <td class="col_right"></td> + </tr> + <tr class="footer"> + <td class="col_left"></td> + <td></td> + <td class="col_right"></td> + </tr> + </table> +</body> + +</html> diff --git a/template/default/help_at_timer_list.html b/template/default/help_at_timer_list.html index 17ffa70..97af3ec 100644 --- a/template/default/help_at_timer_list.html +++ b/template/default/help_at_timer_list.html @@ -30,7 +30,7 @@ <tr class="row_even"> <td class="col_left"></td> <td> - <%! <p>Here you will find a listing of automatic timers (AutoTimer) known to VDRAdmin.</p> + <%! <p>Here you will find a listing of automatic timers (AutoTimer) known to VDRAdmin-AM.</p> <p>The list shows some information on AutoTimers. You can change the list's sorting by clicking the columns heading.</p> <p>For each AutoTimer you have the following options: <dl> @@ -49,7 +49,7 @@ <img src="bilder/poempl_grau.gif" alt="inactive" align="middle" /> AutoTimer is not active. </p> <p>In addition to these functions you can add a new AutoTimer by clicking <input type="submit" class="submit" value="New AutoTimer"/> at the top and you can delete a number of AutoTimers at once by checking the box in the last column of those timers and clicking <input type="submit" class="submit" value="Delete Selected AutoTimers"/>.</p> - <p>Click <input type="submit" class="submit" value="Force Update"/> to force VDRAdmin to reconnect to VDR, fetch the current EPG and check for matching AutoTimers.</p> !%> + <p>Click <input type="submit" class="submit" value="Force Update"/> to force VDRAdmin-AM to reconnect to VDR, fetch the current EPG and check for matching AutoTimers.</p> !%> </td> <td class="col_right"></td> </tr> diff --git a/template/default/help_at_timer_new.html b/template/default/help_at_timer_new.html index 288a01a..e848833 100644 --- a/template/default/help_at_timer_new.html +++ b/template/default/help_at_timer_new.html @@ -33,14 +33,14 @@ <td class="col_left"</td> <td> <%! <p>Here you can edit an automatic timer's (AutoTimer) settings.</p> - <p>AutoTimer is a key feature of VDRAdmin. An AutoTimer consists of one or more search terms and some other settings, that are looked for regularly in the Electronic Program Guide (EPG). On match AutoTimer adds a timer in VDR automatically for that broadcast. That's very comfortable for irregularly broadcasted series or movies you don't want to miss.</p> !%> + <p>AutoTimer is a key feature of VDRAdmin-AM. An AutoTimer consists of one or more search terms and some other settings, that are looked for regularly in the Electronic Program Guide (EPG). On match AutoTimer adds a timer in VDR automatically for that broadcast. That's very comfortable for irregularly broadcasted series or movies you don't want to miss.</p> !%> <dl> <dt><%! AutoTimer Active: !%></dt> <dd><%! Activate or deactivate this AutoTimer. Deactivated AutoTimers are still stored in the AutoTimer list so that they can be activated again, but they do not record anything meanwhile. Above that you can set this to "oneshot" so this AutoTimer only programs the (one!) next matching broadcast. !%></dd> <dt><%! Search Patterns: !%></dt> - <dd><%! Choosing the right search items decides whether only the wanted broadcasts or broadcasts having similar names or even nothing gets recorded.<br />Case doesn't matter, "X-Files" matches anything "x-files" will match. You can set multiple search items by separating them with spaces. Only broadcasts will match if they contain <strong>all</strong> items.<br />You'd better only use letters and numbers for search items, as the EPG often miss colons, brackets and other characters.<br />Experts can also use regular expressions, but you have to get needed information from the VDRAdmin sources (undocumented feature).<br /><br />You can exclude broadcasts so that they don't get recorded even if they would match an AutoTimer. Therefore you have to enter that titles into the file <i>vdradmind.bl</i>, one event a line. This file must be located in your VDRAdmin's configuration folder. If this string is found either in the EPG's <u>title</u> or in <u>title~subtitle</u>, this event will not be programmed by AutoTimer. So you can disable complete episodes (for example when using "Enterprise" as Blacklist-string) or only one episode (when using "Enterprise~Azati Prime" as Blacklist-string). !%></dd> + <dd><%! Choosing the right search items decides whether only the wanted broadcasts or broadcasts having similar names or even nothing gets recorded.<br />Case doesn't matter, "X-Files" matches anything "x-files" will match. You can set multiple search items by separating them with spaces. Only broadcasts will match if they contain <strong>all</strong> items.<br />You'd better only use letters and numbers for search items, as the EPG often miss colons, brackets and other characters.<br />Experts can also use regular expressions, but you have to get needed information from the VDRAdmin-AM sources (undocumented feature).<br /><br />You can exclude broadcasts so that they don't get recorded even if they would match an AutoTimer. Therefore you have to enter that titles into the file <i>vdradmind.bl</i>, one event a line. This file must be located in your VDRAdmin-AM's configuration folder. If this string is found either in the EPG's <u>title</u> or in <u>title~subtitle</u>, this event will not be programmed by AutoTimer. So you can disable complete episodes (for example when using "Enterprise" as Blacklist-string) or only one episode (when using "Enterprise~Azati Prime" as Blacklist-string). !%></dd> <dt><%! Search in: !%></dt> - <dd><%! Here you can define the EPG sections where VDRAdmin should look for the search pattern. !%></dd> + <dd><%! Here you can define the EPG sections where VDRAdmin-AM should look for the search pattern. !%></dd> <dt><%! Search only on these days: !%></dt> <dd><%! Use these checkboxes to limit searching for matching broadcasts to a set of weekdays. !%></dd> <dt><%! Channel: !%></dt> @@ -54,12 +54,12 @@ <dt><%! Lifetime: !%></dt> <dd><%! The <strong>guaranteed</strong> lifetime (in days) of a recording created by this timer. <strong>0</strong> means that this recording may be automatically deleted at any time by a new recording with higher priority. <strong>99</strong> means that this recording will never be automatically deleted. Any number in the range <strong>1...98</strong> means that this recording may not be automatically deleted in favour of a new recording, until the given number of days since the <strong>start</strong> time of the recording has passed by. !%></dd> <dt><%! Episode: !%></dt> - <dd><%! Check this box if you want VDRAdmin to append the broadcast's EPG subtitle to the recording's file name. !%></dd> + <dd><%! Check this box if you want VDRAdmin-AM to append the broadcast's EPG subtitle to the recording's file name. !%></dd> <dt><%! Remember programmed timers: !%></dt> - <dd><%! If you enable this VDRAdmin will track timers it has already programmed automatically. This is useful if want to deactivate or delete timers that have been programmed automatically in the timers listing. !%></dd> + <dd><%! If you enable this VDRAdmin-AM will track timers it has already programmed automatically. This is useful if want to deactivate or delete timers that have been programmed automatically in the timers listing. !%></dd> <dt><%! Directory: !%></dt> <dd> - <%! The directory this AutoTimer will place the recordings in. If the name shall contain subdirectories, these have to be delimited by '~' (since the '/' character may be part of a regular programme name).<br />VDRAdmin will append the matching broadcast's title and subtitle (if the "Episode" checkbox is marked) to the directory given here.<br /><br /> + <%! The directory this AutoTimer will place the recordings in. If the name shall contain subdirectories, these have to be delimited by '~' (since the '/' character may be part of a regular programme name).<br />VDRAdmin-AM will append the matching broadcast's title and subtitle (if the "Episode" checkbox is marked) to the directory given here.<br /><br /> You can also use the following keywords that are replaced in the final file name by the values supplied by for example <a href="http://tvmovie2vdr.vdr-developer.org">tvm2vdr</a>: <ul> <li>%Title% - will become the title of the event.</li> @@ -76,7 +76,7 @@ <li>%Rating% - will become the rating of the event from the EPG provider.</li> </ul> <h4>Note:</h4> - If you use the above keywords it's in your own responsibility to supply the <strong>complete file name</strong> for the recordings! VDRAdmin will not append anything to the resulting string. !%> + If you use the above keywords it's in your own responsibility to supply the <strong>complete file name</strong> for the recordings! VDRAdmin-AM will not append anything to the resulting string. !%> </dd> </dl> </td> diff --git a/template/default/help_config.html b/template/default/help_config.html index 323d498..98ffdc2 100644 --- a/template/default/help_config.html +++ b/template/default/help_config.html @@ -42,13 +42,13 @@ <dt><%! Skin: !%></dt> <dd><%! The skin you want to use. !%></dd> <dt><%! Login Page: !%></dt> - <dd><%! The page you want to see at first connect to VDRAdmin. !%></dd> + <dd><%! The page you want to see at first connect to VDRAdmin-AM. !%></dd> <dt><%! Number of channels to use: !%></dt> - <dd><%! VDRAdmin will load the given number of channels from VDR and present only those in any fields where channels can be selected. This also limits the EPG information VDRAdmin will read so that you can use this to reduce VDRAdmin's memory consumption and increase its performance. <strong>0</strong> turns this feature off and VDRAdmin will use all available channels. !%></dd> + <dd><%! VDRAdmin-AM will load the given number of channels from VDR and present only those in any fields where channels can be selected. This also limits the EPG information VDRAdmin-AM will read so that you can use this to reduce VDRAdmin-AM's memory consumption and increase its performance. <strong>0</strong> turns this feature off and VDRAdmin-AM will use all available channels. !%></dd> <dt><%! Local net (no login required): !%></dt> <dd><%! Here you can specify an IP address or range that can login without providing login information. For example: "192.168.0.0/24" will include any IP starting with "192.168.0", "192.168.0.123/32" will only match "192.168.0.123". !%></dd> <dt><%! Language: !%></dt> - <dd><%! Here you can set the localization VDRAdmin should use. !%></dd> + <dd><%! Here you can set the localization VDRAdmin-AM should use. !%></dd> </dl> <div class="top_link">[<a href="#top"><%! Top !%></a>]</div> </div> @@ -56,9 +56,9 @@ <div class="group"><a id="vdr" name="vdr"></a><h3><%! VDR !%></h3> <dl> <dt><%! Number of DVB cards: !%></dt> - <dd><%! The number of DVB cards VDR can access. Depending on this value VDRAdmin will calculate critical timers in the <span class="ref_menu">Timer</span> menu. !%></dd> + <dd><%! The number of DVB cards VDR can access. Depending on this value VDRAdmin-AM will calculate critical timers in the <span class="ref_menu">Timer</span> menu. !%></dd> <dt><%! Path to recordings: !%></dt> - <dd><%! The path to VDR's recordings. It's used so that VDRAdmin can locate the recordings when using <span class="ref_label">Recordings Streaming</span> and <span class="ref_file">reccmds.conf</span> in the <span class="ref_menu">Recordings</span> menu. !%></dd> + <dd><%! The path to VDR's recordings. It's used so that VDRAdmin-AM can locate the recordings when using <span class="ref_label">Recordings Streaming</span> and <span class="ref_file">reccmds.conf</span> in the <span class="ref_menu">Recordings</span> menu. !%></dd> <dt><%! Path to configuration files: !%></dt> <dd><%! The path where VDR's configuration files are located. If this directory contains the file <span class="ref_file">reccmds.conf</span> its content is shown in a selectbox in the <span class="ref_menu">Recordings</span> menu. !%></dd> <dt><%! Path to EPG images: !%></dt> @@ -106,7 +106,7 @@ <dt><%! Lifetime: !%></dt> <dd><%! The <strong>guaranteed</strong> lifetime (in days) of a recording created by this timer. <strong>0</strong> means that this recording may be automatically deleted at any time by a new recording with higher priority. <strong>99</strong> means that this recording will never be automatically deleted. Any number in the range <strong>1...98</strong> means that this recording may not be automatically deleted in favour of a new recording, until the given number of days since the <strong>start</strong> time of the recording has passed by. !%></dd> <dt><%! Send email after programming timer: !%></dt> - <dd><%! VDRAdmin will send an email whenever an event matches an AutoTimer and a timer has been programmed if you enable this feature. This requires that you have the sendEmail programm (which you will find <a target="_new" href="http://caspian.dotconf.net/menu/Software/SendEmail/">here</a>) located in PATH. !%></dd> + <dd><%! VDRAdmin-AM will send an email whenever an event matches an AutoTimer and a timer has been programmed if you enable this feature. !%></dd> <dt><%! Send email as: !%></dt> <dd><%! Here you set the sending domain of the generated email. !%></dd> <dt><%! Send email to: !%></dt> @@ -130,15 +130,15 @@ <dt><%! Lifetime: !%></dt> <dd><%! The <strong>guaranteed</strong> lifetime (in days) of a recording created by this timer. <strong>0</strong> means that this recording may be automatically deleted at any time by a new recording with higher priority. <strong>99</strong> means that this recording will never be automatically deleted. Any number in the range <strong>1...98</strong> means that this recording may not be automatically deleted in favour of a new recording, until the given number of days since the <strong>start</strong> time of the recording has passed by. !%></dd> <dt><%! Time Margin at Start: !%></dt> - <dd><%! The number of minutes VDRAdmin subtracts from the broadcasts start time found in the EPG. This value is used for timers programmed by AutoTimer and timers manually programmed when pressing "Record" in any EPG view. !%></dd> + <dd><%! The number of minutes VDRAdmin-AM subtracts from the broadcasts start time found in the EPG. This value is used for timers programmed by AutoTimer and timers manually programmed when pressing "Record" in any EPG view. !%></dd> <dt><%! Time Margin at Stop: !%></dt> - <dd><%! The number of minutes VDRAdmin adds to the broadcasts stop time found in the EPG. This value is used for timers programmed by AutoTimer and timers manually programmed when pressing "Record" in any EPG view. !%></dd> + <dd><%! The number of minutes VDRAdmin-AM adds to the broadcasts stop time found in the EPG. This value is used for timers programmed by AutoTimer and timers manually programmed when pressing "Record" in any EPG view. !%></dd> <dt><%! Tooltips in timeline: !%></dt> <dd><%! Here you can (de-)activate the tooltips in the timeline. !%></dd> <dt><%! Tooltips in list: !%></dt> <dd><%! Here you can (de-)activate the tooltips in the list. !%></dd> <dt><%! Add summary to new timers: !%></dt> - <dd><%! If you don't want VDRAdmin to add the summary taken from EPG to new timers you can switch it off here. !%></dd> + <dd><%! If you don't want VDRAdmin-AM to add the summary taken from EPG to new timers you can switch it off here. !%></dd> </dl> <div class="top_link">[<a href="#top"><%! Top !%></a>]</div> </div> @@ -150,9 +150,17 @@ <dt><%! HTTP Port of Streamdev (also possible 3000/ts): !%></dt> <dd><%! Here you have to set the port number your VDR's streamdev server listens for connections. Additionally you can also provide the stream type you like to use. !%></dd> <dt><%! Recordings Streaming: !%></dt> - <dd><%! Enable or disable streaming of recordings.<br />Well actually this is no real "streaming", but you have to setup your workstation so that it can access VDR's recordings. You can use for example Samba or NFS for this. VDRAdmin simply generates a playlist that contains all parts of the recording and sends this to your browser. If your browser and media player are configured correctly you will see the recording on your workstation's display. !%></dd> + <dd><%! Enable or disable streaming of recordings.<br />Well actually this is no real "streaming", but you have to setup your workstation so that it can access VDR's recordings. You can use for example Samba or NFS for this. VDRAdmin-AM simply generates a playlist that contains all parts of the recording and sends this to your browser. If your browser and media player are configured correctly you will see the recording on your workstation's display. !%></dd> <dt><%! Path to VDR Recordings on your workstation: !%></dt> <dd><%! This is the path where your workstation can access VDR's recordings. This depends on your VDR and workstation setup, for example "\\vdr\videos" or "V:\" (on Windows) or "/mnt/videos" (on Linux). !%></dd> + <dt><%! MIME type for live streaming: !%></dt> + <dd><%! The MIME type to send when using live streaming. Defaults to "video/x-mpegurl". !%></dd> + <dt><%! Suffix for live streaming: !%></dt> + <dd><%! The suffix to use for live streaming. Defaults to "m3u". !%></dd> + <dt><%! MIME type for recordings streaming: !%></dt> + <dd><%! The MIME type to send when using recordings streaming. Defaults to "video/x-mpegurl". !%></dd> + <dt><%! Suffix for recordings streaming: !%></dt> + <dd><%! The suffix to use for recordings streaming. Defaults to "m3u". !%></dd> </dl> <div class="top_link">[<a href="#top"><%! Top !%></a>]</div> </div> @@ -161,9 +169,9 @@ <%! <p>This section is for experts <strong>only</strong>, i.e. you know what you are doing!</p> !%> <dl> <dt><%! Read EPG directly using epg.data: !%></dt> - <dd><%! Accessing VDR's EPG through VDR's SVDRPort seems to block VDR for some time. If this option is activated VDRAdmin will read the <span class="ref_file">epg.data</span> file directly so that VDR doesn't get blocked. !%></dd> + <dd><%! 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><%! epg.data filename: !%></dt> - <dd><%! If you've enabled the option above you need to tell VDRAdmin where the <span class="ref_file">epg.data</span> file is located. !%></dd> + <dd><%! 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><%! VFAT: !%></dt> <dd><%! 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> @@ -171,7 +179,7 @@ </div> <div class="group"><a id="channels" name="channels"></a><h3><%! Channel Selections !%></h3> - <%! <p>If you want to limit the number of channels used in some parts of VDRAdmin, this is for you!</p> + <%! <p>If you want to limit the number of channels used in some parts of VDRAdmin-AM, this is for you!</p> <p>Use the radio buttons to activate or deactivate the wanted channels in the named menu.</p> <p>To add channels to the list of wanted channels you have to select them in the left side selectbox and click <input type="submit" class="submit" value=">>>>>"/>. If you want to remove channels from the list of wanted channels you have to select them in the right side selectbox and click <input type="submit" class="submit" value="<<<<<"/>.</p> !%> <div class="top_link">[<a href="#top"><%! Top !%></a>]</div> diff --git a/template/default/index.html b/template/default/index.html index fd7e5cb..a5e8dd7 100644 --- a/template/default/index.html +++ b/template/default/index.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>" /> - <title>VDRAdmin <tmpl_var version> (<tmpl_var host>)</title> + <title>VDRAdmin-AM <tmpl_var version> (<tmpl_var host>)</title> <link href="bilder/favicon.ico" rel="shortcut icon" /> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> <tmpl_if usercss> diff --git a/template/default/navigation.html b/template/default/navigation.html index 300af95..fd51a95 100644 --- a/template/default/navigation.html +++ b/template/default/navigation.html @@ -2,7 +2,7 @@ <html> <head> <meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>" /> - <title>VDRAdmin</title> + <title>VDRAdmin-AM</title> <link type="text/css" href="style.css" rel="stylesheet" media="screen" /> <tmpl_if usercss> <link type="text/css" href="user.css" rel="stylesheet" media="screen" /> @@ -71,5 +71,14 @@ <input type="hidden" name="aktion" value="prog_summary" /> </form> </div> + <div class="nav_bar bottom"> + <div class="navi"> + <a href="vdradmin.pl?aktion=help" target="main"><%! Help !%></a></a> + </div> + <div class="separator"></div> + <div class="navi"> + <a href="vdradmin.pl?aktion=about" target="main"><%! About !%></a> + </div> + </div> </body> </html> diff --git a/template/default/prog_detail.html b/template/default/prog_detail.html index 176cbf5..825ed43 100644 --- a/template/default/prog_detail.html +++ b/template/default/prog_detail.html @@ -43,7 +43,9 @@ <a href="javascript:window.close()">[<%! close !%>]</a> <tmpl_if date> <a href="javascript:callurl('<tmpl_var switchurl>')">[<%! view !%>]</a> - <a href="javascript:window.close();opener.location.href='<tmpl_var recurl>'">[<%! record !%>]</a> + <tmpl_if recurl> + <a href="javascript:window.close();opener.location.href='<tmpl_var recurl>'">[<%! record !%>]</a> + </tmpl_if> <a href="vdradmin.pl?search=<tmpl_var find_title>&aktion=prog_summary&submit=go11)" target="main">[<%! search !%>]</a> </tmpl_if> <tmpl_if imdburl> diff --git a/template/default/prog_list.html b/template/default/prog_list.html index 1b9b9a6..e6b42bd 100644 --- a/template/default/prog_list.html +++ b/template/default/prog_list.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>" /> - <title>VDRAdmin - <%! Channels !%></title> + <title>VDRAdmin-AM - <%! Channels !%></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" /> @@ -58,9 +58,9 @@ <tmpl_else> <tmpl_unless endd> <tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>"> - <td class="col_left"><a name="<tmpl_var anchor>"> </a></td> + <td class="col_left"></td> <td class="col_duration"> - <tmpl_var emit> - <tmpl_var duration> + <a name="<tmpl_var anchor>"><tmpl_var emit> - <tmpl_var duration></a> </td> <td class="col_title"> <h3> diff --git a/template/default/prog_list2.html b/template/default/prog_list2.html index 4e1e02a..75cb0e4 100644 --- a/template/default/prog_list2.html +++ b/template/default/prog_list2.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>" /> - <title>VDRAdmin - <%! Playing Today !%></title> + <title>VDRAdmin-AM - <%! Playing Today !%></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" /> @@ -66,9 +66,9 @@ <tmpl_else> <tmpl_unless endd> <tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>"> - <td class="col_left"><a id="<tmpl_var anchor>" name="<tmpl_var anchor>"> </a></td> + <td class="col_left"></td> <td class="col_duration"> - <tmpl_var emit> - <tmpl_var duration> + <a id="<tmpl_var anchor>" name="<tmpl_var anchor>"><tmpl_var emit> - <tmpl_var duration></a> </td> <td class="col_title"> <h3> diff --git a/template/default/prog_summary.html b/template/default/prog_summary.html index 1eb8542..3940872 100644 --- a/template/default/prog_summary.html +++ b/template/default/prog_summary.html @@ -4,7 +4,7 @@ <head> <meta http-equiv="refresh" content="600; URL=vdradmin.pl?aktion=prog_summary" /> <meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>" /> - <title>VDRAdmin - <%! What's On Now? !%></title> + <title>VDRAdmin-AM - <%! What's On Now? !%></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" /> diff --git a/template/default/prog_timeline.html b/template/default/prog_timeline.html index c5eafb2..9bc3ba9 100644 --- a/template/default/prog_timeline.html +++ b/template/default/prog_timeline.html @@ -4,7 +4,7 @@ <head> <meta http-equiv="refresh" content="600; URL=vdradmin.pl?aktion=prog_timeline" /> <meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>" /> - <title>VDRAdmin - <%! What's On Now? !%></title> + <title>VDRAdmin-AM - <%! What's On Now? !%></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" /> diff --git a/template/default/rc.html b/template/default/rc.html index e5f6fba..c477bd6 100644 --- a/template/default/rc.html +++ b/template/default/rc.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>" /> - <title>VDRAdmin - <%! Remote Control !%> (<tmpl_var host>)</title> + <title>VDRAdmin-AM - <%! Remote Control !%> (<tmpl_var host>)</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" /> diff --git a/template/default/rec_edit.html b/template/default/rec_edit.html index ae3b4f0..32af27f 100644 --- a/template/default/rec_edit.html +++ b/template/default/rec_edit.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>" /> - <title>VDRAdmin - <%! Rename Recording !%></title> + <title>VDRAdmin-AM - <%! Rename Recording !%></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" /> diff --git a/template/default/rec_list.html b/template/default/rec_list.html index ddc4793..0069aea 100644 --- a/template/default/rec_list.html +++ b/template/default/rec_list.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>" /> - <title>VDRAdmin - <%! Recordings !%></title> + <title>VDRAdmin-AM - <%! Recordings !%></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" /> diff --git a/template/default/style.css b/template/default/style.css index 3f6be1b..9c423f1 100644 --- a/template/default/style.css +++ b/template/default/style.css @@ -146,3 +146,4 @@ label + input { margin-left: 1em; } #navigation a { color: black; font-weight: bold; text-decoration: none; } #navigation a:hover { text-decoration: underline; } #navigation input { width: 130px; } +#navigation .bottom { position:absolute; bottom: 5px; } diff --git a/template/default/timer_list.html b/template/default/timer_list.html index 997590c..f5b128c 100644 --- a/template/default/timer_list.html +++ b/template/default/timer_list.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>" /> - <title>VDRAdmin - <%! Timer !%></title> + <title>VDRAdmin-AM - <%! Timer !%></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" /> diff --git a/template/default/timer_new.html b/template/default/timer_new.html index b6b1048..19751e1 100644 --- a/template/default/timer_new.html +++ b/template/default/timer_new.html @@ -3,7 +3,7 @@ <head> <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> + <title>VDRAdmin-AM - <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" /> @@ -141,23 +141,29 @@ </tr> <tr class="row_odd"> <td class="col_left"></td> + <td class="col_label"><h5><%! Use VPS: !%></h5></td> + <td class="col_value"><input type="checkbox" name="vps" value="1" <tmpl_if vps>checked</tmpl_if> /></td> + <td class="col_right"></td> + </tr> + <tr class="row_even"> + <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"> + <tr class="row_odd"> <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"> + <tr class="row_even"> <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"> + <tr class="row_odd"> <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> diff --git a/template/default/tv.html b/template/default/tv.html index d9ddbad..54c651e 100644 --- a/template/default/tv.html +++ b/template/default/tv.html @@ -2,7 +2,7 @@ <html> <head> - <title>VDRAdmin - <%! TV !%> (<tmpl_var host>)</title> + <title>VDRAdmin-AM - <%! TV !%> (<tmpl_var host>)</title> <meta http-equiv="Content-Type" content="text/html; <%! charset=ISO-8859-1 !%>" /> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> <tmpl_if usercss> |