diff options
| author | Andreas Mair <amair.sob@googlemail.com> | 2010-03-13 14:39:33 +0100 |
|---|---|---|
| committer | Andreas Mair <amair.sob@googlemail.com> | 2010-03-13 14:39:33 +0100 |
| commit | 0d228055e708d997a0be7ea0a5b602cc2611ab41 (patch) | |
| tree | d7856ea72290d07d31e5ea727ccfdb42a1ca350a /template | |
| parent | 958739d6b84d31402b01ec1b7048cd5ccb59f5e4 (diff) | |
| download | vdradmin-am-3.6.6.tar.gz vdradmin-am-3.6.6.tar.bz2 | |
2010-03-13: 3.6.6v3.6.6
- Added: Support new epgsearch v0.9.25-git settings "unmute" and "min. description match".
- Changed: Log to syslog by default (if logging is enabled) (Ville Skyttä).
- Changed: Fall back to stderr if setting up syslog fails (Ville Skyttä).
- Changed: Get character encoding from configured locale or environment variables (Submitted by Tobias Grimm).
- Fixed: Encode SVDRP commands sent to VDR if needed (Submitted by Tobias Grimm).
- Updated: Italian translation (Submitted by Diego Pierotto).
- Updated: Dutch translation (Submitted by Roel Koelewijn).
- Updated: Spanish translation (Submitted by Manuel Gomez).
- Improved: Default mail settings (Ville Skyttä).
- Fixed: Check if "GUI_POPUP_WIDTH" and "GUI_POPUP_HEIGHT" are numeric and set them to the defaults if they are not (Reported by Jan).
- Added: Support VDR 1.7.12+ commands.conf and reccmds.conf (means: skip lines ending in "{" and lines with only "}" in them).
- Added: check file and directory permissions on startup abort on error.
- Changed: Default directory for PID file to /var/run/vdradmin.
- Changed: Default directory for log file to /var/log/vdradmin.
- Changed: Use "cache" directory in the current directory if $SEARCH_FILES_IN_SYSTEM is not set.
- Changed: Hide "record" button in EPG lists there's already a timer for that broadcast (Based on patch by Dave Pickles).
- Added: New options to show or hide a broadcast's subtitle and/or summary in EPG lists (Based on patch by Dave Pickles).
- Added: New option to set a day's "start time" in "Playing today?" (Based on patch by Dave Pickles).
- Changed: Minimum required epgsearch version now is 0.9.24.
- Added: Support for new epgsearch search timer actions (Bug #557).
- Changed: "--ipv6" only enables IPv6 for connections to VDRAdmin-AM, to also use IPv6 for SVDRP connection one can use "--ipv6-all" (if he really knows what he's doing!).
- Fixed: Check encoding for every SVDRP connection (Submitted by Tobias Grimm).
- Changed: Warn about missing key or certificate if --ssl is used.
- Changed: Certificates for --ssl option must be located in $ETCDIR/certs.
- Fixed: Resizing browser window in "Timeline" showed "file not found" (Reported by tag @vdr-portal.de).
- Updated: Links to EPGSearch and Streamdev home pages (Ville Skyttä).
- Updated: Finnish translation (Ville Skyttä).
Diffstat (limited to 'template')
34 files changed, 184 insertions, 61 deletions
diff --git a/template/default/about.html b/template/default/about.html index 1406bfe..b7fa180 100644 --- a/template/default/about.html +++ b/template/default/about.html @@ -2,7 +2,7 @@ <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title><?% gettext('About') %?></title> <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> @@ -108,11 +108,11 @@ </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('VDRAdmin-AM version:') %?></h5></td> - <td class="col_value"><?% myversion %?></td> + <td class="col_value"><?% features.MYVERSION_HR %?></td> </tr> <tr class="row_even"> <td class="col_label"><h5><?% gettext('VDR version:') %?></h5></td> - <td class="col_value"><?% vdrversion %?></td> + <td class="col_value"><?% features.VDRVERSION_HR %?></td> </tr> <tr class="row_even"> <td class="col_label" valign="top"><h5><?% gettext('Supported features in VDR:') %?></h5></td> @@ -122,13 +122,17 @@ <?% ELSE %?> <img src="bilder/poempl_rot.png" alt="" align="middle" border="0"/> <?% END %?> - <?% gettext('EPGSearch (<a href="http://people.freenet.de/cwieninger/html/vdr-epg-search.html" target="_blank">EPGSearch Plugin</a>)') %?><br /> + <?% gettext('EPGSearch (<a href="http://winni.vdr-developer.org/epgsearch/index_eng.html" target="_blank">EPGSearch Plugin</a>)') %?> + <?% IF features.EPGSEARCH %?> + v<?% features.EPGSEARCH_VERSION_HR %?> + <?% END %?> + <br /> <?% IF features.STREAMDEV %?> <img src="bilder/poempl_gruen.png" alt="" align="middle" border="0"/> <?% ELSE %?> <img src="bilder/poempl_rot.png" alt="" align="middle" border="0"/> <?% END %?> - <?% gettext('LiveTV Streaming (<a href="http://www.vdr-wiki.de/wiki/index.php/Streamdev-plugin" target="_blank">Streamdev Plugin</a>)') %?><br /> + <?% gettext('LiveTV Streaming (<a href="http://streamdev.vdr-developer.org/" target="_blank">Streamdev Plugin</a>)') %?><br /> <?% IF features.REC_RENAME %?> <img src="bilder/poempl_gruen.png" alt="" align="middle" border="0"/> <?% ELSE %?> @@ -147,7 +151,7 @@ <td> <ul> <li><?% gettext('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.png" alt="" />.') %?></li> - <li><?% gettext('If this doesn\'t provide the information you need you can try to get help at <a href="http://www.vdrportal.de" target="_blank">VDR-Portal</a> if you understand German language. Please use the announcement thread if possible, search for:') %?> "[ANNOUNCE] VDRAdmin-AM-<?% myversion %?>"</li> + <li><?% gettext('If this doesn\'t provide the information you need you can try to get help at <a href="http://www.vdrportal.de" target="_blank">VDR-Portal</a> if you understand German language. Please use the announcement thread if possible, search for:') %?> "[ANNOUNCE] VDRAdmin-AM-<?% features.MYVERSION_HR %?>"</li> <li><?% gettext('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="_blank">VDRAdmin-AM BugTracking system</a>.') %?></li> </ul> </td> diff --git a/template/default/at_timer_list.html b/template/default/at_timer_list.html index b078fe6..1f93ccd 100644 --- a/template/default/at_timer_list.html +++ b/template/default/at_timer_list.html @@ -2,7 +2,7 @@ <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>"/> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>"/> <title>VDRAdmin-AM - <?% gettext('AutoTimer') %?></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css"/> <?% IF usercss %?> diff --git a/template/default/at_timer_new.html b/template/default/at_timer_new.html index 6cddd68..5a4a662 100644 --- a/template/default/at_timer_new.html +++ b/template/default/at_timer_new.html @@ -2,7 +2,7 @@ <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>"/> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>"/> <title>VDRAdmin-AM - <?% IF newtimer %?><?% gettext('Add New AutoTimer') %?><?% ELSE %?><?% gettext('Edit AutoTimer') %?><?% END %?></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css"/> <?% IF usercss %?> diff --git a/template/default/config.html b/template/default/config.html index ee1bbce..feacf9b 100644 --- a/template/default/config.html +++ b/template/default/config.html @@ -1,7 +1,7 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title>VDRAdmin-AM - <?% gettext('Configuration') %?></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> <?% IF usercss %?> @@ -178,6 +178,30 @@ </tr> </table> + <table border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="heading"> + <td colspan="2"><h2><?% gettext('Electronic Program Guide (EPG)') %?></h2></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><?% gettext('Day begins at:') %?></h5></td> + <td class="col_value"><input type="text" name="EPG_START_TIME" value="<?% config.EPG_START_TIME | html %?>" size="8" /></td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('Show Subtitle:') %?></h5></td> + <td class="col_value"> + <input type="radio" name="EPG_SUBTITLE" value="1" id="epg_subtitle_yes" <?% IF config.EPG_SUBTITLE %?>checked="checked"<?% END %?> /><label for="epg_subtitle_yes"><?% gettext('Yes') %?></label> + <input type="radio" name="EPG_SUBTITLE" value="0" id="epg_subtitle_no" <?% UNLESS config.EPG_SUBTITLE %?>checked="checked"<?% END %?> /><label for="epg_subtitle_no"><?% gettext('No') %?></label> + </td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><?% gettext('Show Summary:') %?></h5></td> + <td class="col_value"> + <input type="radio" name="EPG_SUMMARY" value="1" id="epg_summary_yes" <?% IF config.EPG_SUMMARY %?>checked="checked"<?% END %?> /><label for="epg_summary_yes"><?% gettext('Yes') %?></label> + <input type="radio" name="EPG_SUMMARY" value="0" id="epg_summary_no" <?% UNLESS config.EPG_SUMMARY %?>checked="checked"<?% END %?> /><label for="epg_summary_no"><?% gettext('No') %?></label> + </td> + </tr> + </table> + <?% IF features.AUTOTIMER %?> <table border="0" cellspacing="0" cellpadding="0" class="group"> <tr class="heading"> diff --git a/template/default/epgsearch_config.html b/template/default/epgsearch_config.html index 9f85c65..0620adb 100644 --- a/template/default/epgsearch_config.html +++ b/template/default/epgsearch_config.html @@ -2,7 +2,7 @@ <html id="scroller"> <?% USE JavaScript, HTML %?> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>"/> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>"/> <title>VDRAdmin-AM - <?% gettext('EPG Search Blacklists') %?></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css"/> <?% IF usercss %?> diff --git a/template/default/epgsearch_list.html b/template/default/epgsearch_list.html index 687fb1a..b93cd57 100644 --- a/template/default/epgsearch_list.html +++ b/template/default/epgsearch_list.html @@ -2,7 +2,7 @@ <html id="scroller"> <?% USE JavaScript, HTML %?> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>"/> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>"/> <title>VDRAdmin-AM - <?% gettext('EPG search') %?></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css"/> <?% IF usercss %?> diff --git a/template/default/epgsearch_new.html b/template/default/epgsearch_new.html index e8d55f3..b83a378 100644 --- a/template/default/epgsearch_new.html +++ b/template/default/epgsearch_new.html @@ -2,7 +2,7 @@ <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>"/> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>"/> <?% IF mode_blacklist %?> <title>VDRAdmin-AM - <?% IF newtimer %?><?% gettext('Add New Blacklist') %?><?% ELSE %?><?% gettext('Edit Blacklist') %?><?% END %?></title> <?% ELSE %?> @@ -37,6 +37,9 @@ changedHasAction(document.getElementById("has_action")); changedAvoidRepeats(document.getElementById("avoid_repeats")); changedAutoDelete(document.getElementById("select_autodelete")); + <?% IF features.EPGSEARCH_VERSION >= 925 %?> + changedCompDescr(document.getElementById("comp_descr")); + <?% END %?> <?% END %?> document.getElementById("content").style.display = "block"; } @@ -104,6 +107,7 @@ document.getElementById("set_action_timeframe").style.display = "none"; document.getElementById("action_record_settings").style.display = "none"; document.getElementById("action_switch_settings").style.display = "none"; + document.getElementById("action_announce_switch_settings").style.display = "none"; } else { @@ -126,19 +130,29 @@ { switch (mySelect.options[mySelect.selectedIndex].value) { - case "0": + case "0": // Record document.getElementById("action_record_settings").style.display = "block"; document.getElementById("action_switch_settings").style.display = "none"; + document.getElementById("action_announce_switch_settings").style.display = "none"; break; - case "1": + case "1": // Announce by OSD + case "4": // Announce by mail document.getElementById("action_record_settings").style.display = "none"; document.getElementById("action_switch_settings").style.display = "none"; + document.getElementById("action_announce_switch_settings").style.display = "none"; break; - case "2": + case "2": // Switch only document.getElementById("action_record_settings").style.display = "none"; document.getElementById("action_switch_settings").style.display = "block"; + document.getElementById("action_announce_switch_settings").style.display = "none"; + break; + + case "3": // Announce and switch + document.getElementById("action_record_settings").style.display = "none"; + document.getElementById("action_switch_settings").style.display = "none"; + document.getElementById("action_announce_switch_settings").style.display = "block"; break; } } @@ -154,6 +168,13 @@ document.getElementById("avoid_repeats_settings").style.display = (myCheckbox.checked ? "block" : "none"); } + function changedCompDescr(myCheckbox) + { +<?% IF features.EPGSEARCH_VERSION >= 925 %?> + document.getElementById("comp_descr_settings").style.display = (myCheckbox.checked ? "block" : "none"); +<?% END %?> + } + function checkSearchPattern() { if (document.getElementById("pattern").value.length <= 3) @@ -492,8 +513,12 @@ <span id="set_action"> <select onchange="javascript:changedAction(this)" id="select_action" name="action"> <option value="0" <?% IF epgsearch.action == 0 %?>selected="selected"<?% END %?>><?% gettext('record') %?></option> - <option value="1" <?% IF epgsearch.action == 1 %?>selected="selected"<?% END %?>><?% gettext('announce only') %?></option> + <option value="1" <?% IF epgsearch.action == 1 %?>selected="selected"<?% END %?>><?% gettext('announce by OSD') %?></option> <option value="2" <?% IF epgsearch.action == 2 %?>selected="selected"<?% END %?>><?% gettext('switch only') %?></option> +<?% IF features.EPGSEARCH_VERSION >= 925 %?> + <option value="3" <?% IF epgsearch.action == 3 %?>selected="selected"<?% END %?>><?% gettext('announce and switch') %?></option> + <option value="4" <?% IF epgsearch.action == 4 %?>selected="selected"<?% END %?>><?% gettext('announce by mail') %?></option> + <?% END %?> </select> </span> <div id="set_action_timeframe"> @@ -572,7 +597,12 @@ <div> <input type="checkbox" name="comp_title" value="1" id="comp_title" <?% IF epgsearch.comp_title %?>checked="checked"<?% END %?> /><label for="comp_title"><?% gettext('Title') %?></label> <input type="checkbox" name="comp_subtitle" value="1" id="comp_subtitle" <?% IF epgsearch.comp_subtitle %?>checked="checked"<?% END %?> /><label for="comp_subtitle"><?% gettext('Subtitle') %?></label> - <input type="checkbox" name="comp_descr" value="1" id="comp_descr" <?% IF epgsearch.comp_descr %?>checked="checked"<?% END %?> /><label for="comp_descr"><?% gettext('Description') %?></label> + <input type="checkbox" name="comp_descr" value="1" id="comp_descr" <?% IF epgsearch.comp_descr %?>checked="checked"<?% END %?> onclick="javascript:changedCompDescr(this)" /><label for="comp_descr"><?% gettext('Description') %?></label> +<?% IF features.EPGSEARCH_VERSION >= 925 %?> + <div id="comp_descr_settings"> + <label for="min_match"><?% gettext('Minimal match of description in %:') %?></label><input type="text" name="min_match" value="<?% epgsearch.min_match | html%?>" size="5" maxlength="3" id="min_match"/> + </div> +<?% END %?> </div> <div> <?% FOREACH ext = extepg %?> @@ -632,8 +662,38 @@ <input type="text" name="switch_before" value="<?% epgsearch.switch_before | html %?>" size="2" maxlength="2" /> <?% gettext('minutes') %?> </td> </tr> +<?% IF features.EPGSEARCH_VERSION >= 925 %?> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('Unmute sound:') %?></h5></td> + <td class="col_value"> + <input type="checkbox" name="unmute" value="1" id="unmute" <?% IF epgsearch.unmute %?>checked="checked"<?% END %?> /> + </td> + </tr> +<?% END %?> + </table> + </div> + +<?% IF features.EPGSEARCH_VERSION >= 925 %?> + <div id="action_announce_switch_settings"> + <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> + <tr class="heading"> + <td colspan="2"><h2><?% gettext('Settings for action "announce and switch"') %?></h2></td> + </tr> + <tr class="row_odd"> + <td class="col_label"><h5><?% gettext('Ask ... Minutes Before Start:') %?></h5></td> + <td class="col_value"> + <input type="text" name="switch_before" value="<?% epgsearch.switch_before | html %?>" size="2" maxlength="2" /> <?% gettext('minutes') %?> + </td> + </tr> + <tr class="row_even"> + <td class="col_label"><h5><?% gettext('Unmute sound:') %?></h5></td> + <td class="col_value"> + <input type="checkbox" name="unmute" value="1" id="unmute" <?% IF epgsearch.unmute %?>checked="checked"<?% END %?> /> + </td> + </tr> </table> </div> +<?% END %?> </div> <?% END %?> diff --git a/template/default/error.html b/template/default/error.html index f704759..6478ca9 100644 --- a/template/default/error.html +++ b/template/default/error.html @@ -2,7 +2,7 @@ <html> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>"/> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>"/> <title><?% gettext('Error!') %?></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css"/> <?% IF usercss %?> diff --git a/template/default/help_at_timer_list.html b/template/default/help_at_timer_list.html index ebbd880..f1c556b 100644 --- a/template/default/help_at_timer_list.html +++ b/template/default/help_at_timer_list.html @@ -2,7 +2,7 @@ <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title><?% gettext('AutoTimer') %?></title> <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> diff --git a/template/default/help_at_timer_new.html b/template/default/help_at_timer_new.html index c4b48d9..a935e07 100644 --- a/template/default/help_at_timer_new.html +++ b/template/default/help_at_timer_new.html @@ -8,7 +8,7 @@ <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title><?% gettext('Edit AutoTimer') %?></title> <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> diff --git a/template/default/help_config.html b/template/default/help_config.html index 3b54b25..67c195a 100644 --- a/template/default/help_config.html +++ b/template/default/help_config.html @@ -5,7 +5,7 @@ <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title><?% gettext('Configuration') %?></title> <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> @@ -27,7 +27,7 @@ <td> <?% gettext('<p>Here you can change general settings and base settings for timers, AutoTimers, channel selection and streaming parameters.</p>') %?> <div class="links"> - [<a href="#general"><?% gettext('General Settings') %?></a>] [<a href="#vdr"><?% gettext('VDR') %?></a>] [<a href="#identification"><?% gettext('Identification') %?></a>] [<a href="#timeline"><?% gettext('Timeline') %?></a>] [<a href="#autotimer"><?% gettext('AutoTimer') %?></a>] [<a href="#timer"><?% gettext('Timer') %?></a>] [<a href="#streaming"><?% gettext('Streaming') %?></a>] [<a href="#expert"><?% gettext('Expert') %?></a>] [<a href="#ext_search"><?% gettext('External Search') %?></a>] [<a href="#channels"><?% gettext('Channel Selections') %?></a>] + [<a href="#general"><?% gettext('General Settings') %?></a>] [<a href="#vdr"><?% gettext('VDR') %?></a>] [<a href="#identification"><?% gettext('Identification') %?></a>] [<a href="#timeline"><?% gettext('Timeline') %?></a>] [<a href="#epg"><?% gettext('Electronic Program Guide (EPG)') %?></a>] [<a href="#autotimer"><?% gettext('AutoTimer') %?></a>] [<a href="#timer"><?% gettext('Timer') %?></a>] [<a href="#streaming"><?% gettext('Streaming') %?></a>] [<a href="#expert"><?% gettext('Expert') %?></a>] [<a href="#ext_search"><?% gettext('External Search') %?></a>] [<a href="#channels"><?% gettext('Channel Selections') %?></a>] </div> <div class="group"><a id="general" name="general"></a><h3><?% gettext('General Settings') %?></h3> <dl> @@ -89,6 +89,18 @@ <div class="top_link">[<a href="#top"><?% gettext('Top') %?></a>]</div> </div> + <div class="group"><a id="epg" name="epg"></a><h3><?% gettext('Electronic Program Guide (EPG)') %?></h3> + <dl> + <dt><?% gettext('Day begins at:') %?></dt> + <dd><?% gettext('The time after which events are shown on a new day. For example setting 03:00 means that today\'s schedule will include any event starting before 03:00 tomorrow. Applies only to the \'Playing Today?\' list.') %?></dd> + <dt><?% gettext('Show Subtitle:') %?></dt> + <dd><?% gettext('Show the \'Subtitle\' text for each event. Not all broadcasters use this field.') %?></dd> + <dt><?% gettext('Show Summary:') %?></dt> + <dd><?% gettext('Show the \'Summary\' text for each event.') %?></dd> + </dl> + <div class="top_link">[<a href="#top"><?% gettext('Top') %?></a>]</div> + </div> + <div class="group"><a id="autotimer" name="autotimer"></a><h3><?% gettext('AutoTimer') %?></h3> <dl> <dt><?% gettext('Active:') %?></dt> @@ -142,7 +154,7 @@ <div class="group"><a id="streaming" name="streaming"></a><h3><?% gettext('Streaming') %?></h3> <dl> <dt><?% gettext('Live Streaming:') %?></dt> - <dd><?% gettext('Enable or disable live streaming using the <a href="http://www.magoa.net/linux/">streamdev plugin</a>. You also have to set the correct <span class="ref_label">HTTP Port for Streamdev</span> below.') %?></dd> + <dd><?% gettext('Enable or disable live streaming using the <a href="http://streamdev.vdr-developer.org/">streamdev plugin</a>. You also have to set the correct <span class="ref_label">HTTP Port for Streamdev</span> below.') %?></dd> <dt><?% gettext('HTTP Port of Streamdev (also possible 3000/ts):') %?></dt> <dd><?% gettext('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><?% gettext('Recordings Streaming:') %?></dt> diff --git a/template/default/help_edit_epg.html b/template/default/help_edit_epg.html index 3ca1e49..6d77bbe 100644 --- a/template/default/help_edit_epg.html +++ b/template/default/help_edit_epg.html @@ -5,7 +5,7 @@ <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title><?% gettext('Edit Timer') %?></title> <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> diff --git a/template/default/help_no.html b/template/default/help_no.html index c98f917..82f8408 100644 --- a/template/default/help_no.html +++ b/template/default/help_no.html @@ -2,7 +2,7 @@ <html> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title><?% gettext('No Help Available') %?></title> <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> diff --git a/template/default/help_rec_list.html b/template/default/help_rec_list.html index b5fb008..7293744 100644 --- a/template/default/help_rec_list.html +++ b/template/default/help_rec_list.html @@ -2,7 +2,7 @@ <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title><?% gettext('Recordings') %?></title> <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> diff --git a/template/default/help_timer_list.html b/template/default/help_timer_list.html index 08762da..cb1dc43 100644 --- a/template/default/help_timer_list.html +++ b/template/default/help_timer_list.html @@ -2,7 +2,7 @@ <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title><?% gettext('Timer') %?></title> <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> diff --git a/template/default/help_timer_new.html b/template/default/help_timer_new.html index 046eba9..7fed82d 100644 --- a/template/default/help_timer_new.html +++ b/template/default/help_timer_new.html @@ -5,7 +5,7 @@ <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title><?% gettext('Edit Timer') %?></title> <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> diff --git a/template/default/index.html b/template/default/index.html index 30f0a72..b490cc7 100644 --- a/template/default/index.html +++ b/template/default/index.html @@ -2,7 +2,7 @@ <html> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title>VDRAdmin-AM <?% version %?> (<?% host %?>)</title> <link href="favicon.ico" rel="shortcut icon" /> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> diff --git a/template/default/navigation.html b/template/default/navigation.html index bdf06b1..14b76c1 100644 --- a/template/default/navigation.html +++ b/template/default/navigation.html @@ -1,7 +1,7 @@ <!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=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title>VDRAdmin-AM</title> <link type="text/css" href="style.css" rel="stylesheet" media="screen" /> <?% IF usercss %?> diff --git a/template/default/noauth.html b/template/default/noauth.html index 2d52b5e..3f6a4da 100644 --- a/template/default/noauth.html +++ b/template/default/noauth.html @@ -1,7 +1,7 @@ <!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=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title><?% gettext('Authorization Required') %?></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> <?% IF usercss %?> diff --git a/template/default/noperm.html b/template/default/noperm.html index 5d3674a..37b39ec 100644 --- a/template/default/noperm.html +++ b/template/default/noperm.html @@ -1,7 +1,7 @@ <!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=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title><?% title %?></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css"/> <?% IF usercss %?> diff --git a/template/default/prog_detail.html b/template/default/prog_detail.html index eedf611..d921c5b 100644 --- a/template/default/prog_detail.html +++ b/template/default/prog_detail.html @@ -2,7 +2,7 @@ <html> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title><?% title %?></title> <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> @@ -33,9 +33,11 @@ </span> <?% END %?> <?% IF recurl %?> - <span class="action record"> - <a href="javascript:void(opener.location.href='<?% recurl %?>');window.close()"><img src="bilder/rec_button.png" border="0" alt="<?% gettext('record') %?>" onmouseover="window.status='<?% gettext('record') %?>';return true" title="<?% gettext('record') %?>" /></a> - </span> + <?% UNLESS timerset %?> + <span class="action record"> + <a href="javascript:void(opener.location.href='<?% recurl %?>');window.close()"><img src="bilder/rec_button.png" border="0" alt="<?% gettext('record') %?>" onmouseover="window.status='<?% gettext('record') %?>';return true" title="<?% gettext('record') %?>" /></a> + </span> + <?% END %?> <?% END %?> <span class="action repeatings"> <a href="vdradmin.pl?search=<?% find_title %?>&aktion=prog_summary&submit=go11" target="main"><img src="bilder/find.png" border="0" alt="<?% gettext('search') %?>" onmouseover="window.status='<?% gettext('search') %?>';return true" title="<?% gettext('search') %?>" /></a> diff --git a/template/default/prog_detail_form.html b/template/default/prog_detail_form.html index 0e16a67..58e833a 100644 --- a/template/default/prog_detail_form.html +++ b/template/default/prog_detail_form.html @@ -2,7 +2,7 @@ <html> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title><?% title %?></title> <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> diff --git a/template/default/prog_list.html b/template/default/prog_list.html index 2b29375..f9013b5 100644 --- a/template/default/prog_list.html +++ b/template/default/prog_list.html @@ -2,7 +2,7 @@ <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title>VDRAdmin-AM - <?% gettext('Channels') %?></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> <?% IF usercss %?> @@ -94,8 +94,12 @@ <?% ELSE %?> <span class="action info"><img src="bilder/info_button_disabled.png" border="0" alt="noinfo" title="<?% gettext('No Information') %?>" /></span> <?% END %?> - <span class="action info"><a href="<?% bc.editurl %?>"><img src="bilder/edit.png" border="0" alt="edit" /></a></span> - <span class="action record"><a href="<?% bc.recurl %?>"><img src="bilder/rec_button.png" border="0" alt="record" title="<?% gettext('Record') %?>" /></a></span> + <span class="action info"><a href="<?% bc.editurl %?>"><img src="bilder/edit.png" border="0" alt="edit" /></a></span> + <?% UNLESS bc.timerset %?> + <span class="action record"> + <a href="<?% bc.recurl %?>"><img src="bilder/rec_button.png" border="0" alt="record" title="<?% gettext('Record') %?>" /></a> + </span> + <?% END %?> <?% IF bc.srch1_url %?> <span class="action imdb"><a href="<?% bc.srch1_url %?>" target="_blank"><img src="bilder/imdb.png" border="0" alt="IMDb" onmouseover="window.status='<?% bc.srch1_title %?>';return true" title="<?% bc.srch1_title %?>" /></a></span> <?% END %?> diff --git a/template/default/prog_list2.html b/template/default/prog_list2.html index d8ddf04..abd64dd 100644 --- a/template/default/prog_list2.html +++ b/template/default/prog_list2.html @@ -2,7 +2,7 @@ <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title>VDRAdmin-AM - <?% gettext('Playing Today') %?></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> <?% IF usercss %?> @@ -104,7 +104,11 @@ <span class="action info"><img src="bilder/info_button_disabled.png" border="0" title="<?% gettext('No Information') %?>" alt="noinfo"/></span> <?% END %?> <span class="action edit"><a href="<?% bc.editurl %?>"><img src="bilder/edit.png" border="0" title="<?% gettext('Edit') %?>" alt="edit"/></a></span> - <span class="action record"><a href="<?% bc.recurl %?>"><img src="bilder/rec_button.png" border="0" title="<?% gettext('Record') %?>" alt="record"/></a></span> + <?% UNLESS bc.timerset %?> + <span class="action record"> + <a href="<?% bc.recurl %?>"><img src="bilder/rec_button.png" border="0" title="<?% gettext('Record') %?>" alt="record"/></a> + </span> + <?% END %?> <?% IF bc.srch1_url %?> <span class="action imdb"><a href="<?% bc.srch1_url %?>" target="_blank"><img src="bilder/imdb.png" border="0" alt="IMDb" onmouseover="window.status='<?% bc.srch1_title %?>';return true" title="<?% bc.srch1_title %?>" /></a></span> <?% END %?> diff --git a/template/default/prog_summary.html b/template/default/prog_summary.html index f2160a8..5f64606 100644 --- a/template/default/prog_summary.html +++ b/template/default/prog_summary.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="refresh" content="600; URL=vdradmin.pl?aktion=prog_summary" /> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title>VDRAdmin-AM - <?% gettext('What\'s On Now?') %?></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> <?% IF usercss %?> @@ -99,9 +99,11 @@ <span class="action edit"> <a href="<?% row.editurl %?>"><img src="bilder/edit.png" border="0" alt="<?% gettext('Edit') %?>" onmouseover="window.status='<?% gettext('Edit') %?>';return true" title="<?% gettext('Edit') %?>" /></a> </span> - <span class="action record"> - <a href="<?% row.recurl %?>"><img src="bilder/rec_button.png" border="0" alt="<?% gettext('Record') %?>" onmouseover="window.status='<?% gettext('Record') %?>';return true" title="<?% gettext('Record') %?>" /></a> - </span> + <?% UNLESS row.timerset %?> + <span class="action record"> + <a href="<?% row.recurl %?>"><img src="bilder/rec_button.png" border="0" alt="<?% gettext('Record') %?>" onmouseover="window.status='<?% gettext('Record') %?>';return true" title="<?% gettext('Record') %?>" /></a> + </span> + <?% END %?> <?% END %?> <?% IF row.srch1_url %?> <span class="action imdb"> diff --git a/template/default/prog_summary2.html b/template/default/prog_summary2.html index 90feefc..864023c 100644 --- a/template/default/prog_summary2.html +++ b/template/default/prog_summary2.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="refresh" content="600; URL=vdradmin.pl?aktion=prog_summary" /> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title>VDRAdmin-AM - <?% gettext('What\'s On Now?') %?></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> <?% IF usercss %?> @@ -86,11 +86,18 @@ </a> <?% END %?> </div> + <div class="epg_subtitle"> +<?% IF config.EPG_SUBTITLE %?> <?% IF broadcast.subtitle %?> - <div class="epg_subtitle"><?% broadcast.subtitle %?></div> - <?% ELSE %?> - <div class="epg_subtitle"> </div> + <?% broadcast.subtitle %?> <?% END %?> +<?% END %?> +<?% IF config.EPG_SUMMARY %?> + <?% IF broadcast.summary %?> + <?% broadcast.summary %?> + <?% END %?> +<?% END %?> + </div> </td> <td class="col_channel"> <a id="<?% broadcast.anchor %?>" name="<?% broadcast.anchor %?>"></a> @@ -113,7 +120,11 @@ <span class="action info"><img src="bilder/info_button_disabled.png" border="0" alt="noinfo" title="<?% gettext('No Information') %?>" /></span> <?% END %?> <span class="action edit"><a href="<?% broadcast.editurl %?>"><img src="bilder/edit.png" border="0" alt="<?% gettext('Edit') %?>" onmouseover="window.status='<?% gettext('Edit') %?>';return true" title="<?% gettext('Edit') %?>" /></a></span> - <span class="action record"><a href="<?% broadcast.recurl %?>"><img src="bilder/rec_button.png" border="0" alt="<?% gettext('Record') %?>" onmouseover="window.status='<?% gettext('Record') %?>';return true" title="<?% gettext('Record') %?>" /></a></span> + <?% UNLESS broadcast.timerset %?> + <span class="action record"> + <a href="<?% broadcast.recurl %?>"><img src="bilder/rec_button.png" border="0" alt="<?% gettext('Record') %?>" onmouseover="window.status='<?% gettext('Record') %?>';return true" title="<?% gettext('Record') %?>" /></a> + </span> + <?% END %?> <?% IF broadcast.srch1_url %?> <span class="action imdb"><a href="<?% broadcast.srch1_url %?>" target="_blank"><img src="bilder/imdb.png" border="0" alt="IMDb" onmouseover="window.status='<?% broadcast.srch1_url %?>';return true" title="<?% broadcast.srch1_url %?>" /></a></span> <?% END %?> diff --git a/template/default/prog_timeline.html b/template/default/prog_timeline.html index b2c87b7..2db25ac 100644 --- a/template/default/prog_timeline.html +++ b/template/default/prog_timeline.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="refresh" content="600; URL=vdradmin.pl?aktion=prog_timeline" /> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title>VDRAdmin-AM - <?% gettext('Timeline') %?></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> <?% IF usercss %?> @@ -83,7 +83,7 @@ { if (redraw_w != GetWindowW() || redraw_h != GetWindowH()) { - Go('<?% nowurl %?>&time=<?% date.format(now_sec, '%H:%M') %?>'); + Go('<?% nowurl %?>&time=<?% date.format(now_sec, '%H:%M') %?>'); } } diff --git a/template/default/rc.html b/template/default/rc.html index 4f24e15..2f69401 100644 --- a/template/default/rc.html +++ b/template/default/rc.html @@ -2,7 +2,7 @@ <html> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title>VDRAdmin-AM - <?% gettext('Remote Control') %?> (<?% host %?>)</title> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> <?% IF usercss %?> diff --git a/template/default/rec_edit.html b/template/default/rec_edit.html index eb9cb3d..acdae13 100644 --- a/template/default/rec_edit.html +++ b/template/default/rec_edit.html @@ -2,7 +2,7 @@ <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title>VDRAdmin-AM - <?% gettext('Rename Recording') %?></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> <?% IF usercss %?> diff --git a/template/default/rec_list.html b/template/default/rec_list.html index c61629a..ed85ea0 100644 --- a/template/default/rec_list.html +++ b/template/default/rec_list.html @@ -2,7 +2,7 @@ <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title>VDRAdmin-AM - <?% gettext('Recordings') %?></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> <?% IF usercss %?> diff --git a/template/default/timer_list.html b/template/default/timer_list.html index e1b084d..e4fef1b 100644 --- a/template/default/timer_list.html +++ b/template/default/timer_list.html @@ -2,7 +2,7 @@ <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title>VDRAdmin-AM - <?% gettext('Timer') %?></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> <?% IF usercss %?> @@ -304,7 +304,7 @@ </td> <td class="col_name <?% IF timer.sortbyname %?>selected<?% END %?>"> <div <?% IF config.TM_TT_LIST %?>onmouseover="tip('VDR-<?% timer.id %?>'); return true;" onmouseout="untip(); return true;"<?% END %?>> - <?% IF timer.recording %?><img align="middle" src="bilder/rec.gif" border="0" alt="" /> <?% END %?> + <?% IF timer.recording && timer.active %?><img align="middle" src="bilder/rec.gif" border="0" alt="" /> <?% END %?> <?% IF timer.infurl %?> <a href="javascript:popup('<?% timer.infurl %?>', <?% config.GUI_POPUP_WIDTH %?>, <?% config.GUI_POPUP_HEIGHT %?>);"><?% timer.title %?></a> <?% ELSE %?> diff --git a/template/default/timer_new.html b/template/default/timer_new.html index 0f0b318..eaf8319 100644 --- a/template/default/timer_new.html +++ b/template/default/timer_new.html @@ -2,7 +2,7 @@ <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title>VDRAdmin-AM - <?% IF newtimer %?><?% gettext('Create New Timer') %?><?% ELSE %?><?% gettext('Edit Timer') %?><?% END %?></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> <?% IF usercss %?> diff --git a/template/default/tv.html b/template/default/tv.html index 429bb09..506b1ec 100644 --- a/template/default/tv.html +++ b/template/default/tv.html @@ -3,7 +3,7 @@ <head> <title>VDRAdmin-AM - <?% gettext('TV') %?> (<?% host %?>)</title> - <meta http-equiv="Content-Type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="Content-Type" content="text/html;charset=<?% charset %?>" /> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> <?% IF usercss %?> <link href="user.css" rel="stylesheet" media="screen" type="text/css" /> diff --git a/template/default/vdr_cmds.html b/template/default/vdr_cmds.html index 22df862..15536e5 100644 --- a/template/default/vdr_cmds.html +++ b/template/default/vdr_cmds.html @@ -2,7 +2,7 @@ <html id="scroller"> <head> - <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" /> + <meta http-equiv="content-type" content="text/html;charset=<?% charset %?>" /> <title>VDRAdmin-AM - <?% gettext('VDR Commands') %?></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> <?% IF usercss %?> |