summaryrefslogtreecommitdiff
path: root/template/default/epgsearch_new.html
diff options
context:
space:
mode:
authorAndreas Mair <amair.sob@googlemail.com>2010-03-13 14:39:33 +0100
committerAndreas Mair <amair.sob@googlemail.com>2010-03-13 14:39:33 +0100
commit0d228055e708d997a0be7ea0a5b602cc2611ab41 (patch)
treed7856ea72290d07d31e5ea727ccfdb42a1ca350a /template/default/epgsearch_new.html
parent958739d6b84d31402b01ec1b7048cd5ccb59f5e4 (diff)
downloadvdradmin-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/default/epgsearch_new.html')
-rw-r--r--template/default/epgsearch_new.html72
1 files changed, 66 insertions, 6 deletions
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 %?>
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 01:03:49 +0000