summaryrefslogtreecommitdiff
path: root/template
diff options
context:
space:
mode:
authorAndreas Mair <amair.sob@googlemail.com>2007-12-19 08:22:58 +0100
committerAndreas Mair <amair.sob@googlemail.com>2007-12-19 08:22:58 +0100
commitd48934f53b4c3d3b0bb9087d87cc13b60b79839e (patch)
tree14a1d6a2a1b4a242616fd9bb06462b91b57017d3 /template
parent7d3a17c4924b5d367f76a0febfefe6ff1e7880d1 (diff)
downloadvdradmin-am-3.6.1.tar.gz
vdradmin-am-3.6.1.tar.bz2
2007-12-19: 3.6.1v3.6.1
- Fixed: show textfield if no locales found. - Updated for infoboxes.js. - Fixed: wrong sorting in find results. - Changed: Remove leading and trailing whitespaces from a timer's title (Reported by Derek). - Changed: Minimal required EPGsearch version to v0.9.23. - Added: Support for features introduced in EPGsearch v0.9.23 (e.g. auto delete searches, timeframe for searches). - Fixed: Close connection to VDR after AutoTimer update (Reported by Leo @vdr-portal.de).
Diffstat (limited to 'template')
-rw-r--r--template/default/about.html34
-rw-r--r--template/default/config.html2
-rw-r--r--template/default/epgsearch_new.html65
-rw-r--r--template/default/infobox.js12
4 files changed, 97 insertions, 16 deletions
diff --git a/template/default/about.html b/template/default/about.html
index f17ba2b..5bcba29 100644
--- a/template/default/about.html
+++ b/template/default/about.html
@@ -14,6 +14,40 @@
<body id="about" onload="window.focus()">
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="group">
<tr class="heading">
+ <td colspan="2"><h2><?% gettext('License') %?></h2></td>
+ </tr>
+ <tr class="row_even">
+ <td class="col_label"><h5></h5></td>
+ <td class="col_value">
+ <p>
+ <strong>VDRAdmin-AM</strong> © 2005-2007 Andreas Mair.
+ </p>
+ <p>
+ This program is free software; you can redistribute it and/or modify<br />
+ it under the terms of the <a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html" target="_blank">GNU General Public License</a> as published by<br />
+ the Free Software Foundation; either version 2 of the License, or<br />
+ (at your option) any later version.
+ </p>
+ <p>
+ This program is distributed in the hope that it will be useful,<br />
+ but WITHOUT ANY WARRANTY; without even the implied warranty of<br />
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the<br />
+ GNU General Public License for more details.
+ </p>
+ <p>
+ You should have received a copy of the GNU General Public License along<br />
+ with this program; if not, write to the Free Software Foundation, Inc.,<br />
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ </p>
+
+ <p><strong>Bubblehelp infoboxes</strong> (templates/default/infobox.js) is licensed under <a href ="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html" target="_blank">GNU GENERAL PUBLIC LICENSE Version 2 (GPLv2)</a>.</p>
+ <p><strong>Crystal Theme Icons</strong> are licensed under <a href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html" target="_blank">GNU LESSER GENERAL PUBLIC LICENSE v2.1 (LGPLv2.1)</a>.</p>
+ </td>
+ </tr>
+ </table>
+
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group">
+ <tr class="heading">
<td colspan="2"><h2><?% gettext('Authors') %?></h2></td>
</tr>
<tr class="row_even">
diff --git a/template/default/config.html b/template/default/config.html
index 8ea5bb6..8688afc 100644
--- a/template/default/config.html
+++ b/template/default/config.html
@@ -81,7 +81,7 @@
<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
<td class="col_label"><h5><?% gettext('Language:') %?></h5></td>
<td class="col_value">
-<?% IF MY_LOCALES %?>
+<?% IF MY_LOCALES.size() > 0 %?>
<select class="submit" name="LANG">
<?% FOREACH locale = MY_LOCALES %?>
<option value="<?% locale.id %?>" <?% IF locale.cur %?>selected="selected"<?% END %?>><?% locale.name %?></option>
diff --git a/template/default/epgsearch_new.html b/template/default/epgsearch_new.html
index 2fa9428..993ab8a 100644
--- a/template/default/epgsearch_new.html
+++ b/template/default/epgsearch_new.html
@@ -27,6 +27,7 @@
changedAction(document.getElementById("select_action"));
changedHasAction(document.getElementById("has_action"));
changedAvoidRepeats(document.getElementById("avoid_repeats"));
+ changedAutoDelete(document.getElementById("select_autodelete"));
}
function changedSearchMode(mySelect)
@@ -59,6 +60,7 @@
function changedUseExtEpg(myCheckbox)
{
document.getElementById("use_extepg_settings").style.display = (myCheckbox.checked ? "block" : "none");
+ document.getElementById("set_ignore_missing_epgcats").style.display = (myCheckbox.checked ? "block" : "none");
}
function changedUseTime(myCheckbox)
@@ -81,19 +83,31 @@
document.getElementById("select_blacklists").style.display = (mySelect.options[mySelect.selectedIndex].value == 1 ? "block" : "none");
}
- function changedHasAction(myCheckbox)
+ function changedHasAction(mySelect)
{
- if (myCheckbox.checked)
- {
- document.getElementById("set_action").style.display = "inline";
- changedAction(document.getElementById("select_action"));
- }
- else
+ if (mySelect.options[mySelect.selectedIndex].value == 0)
{
document.getElementById("set_action").style.display = "none";
+ document.getElementById("set_autodelete").style.display = "none";
+ document.getElementById("set_action_timeframe").style.display = "none";
document.getElementById("action_record_settings").style.display = "none";
document.getElementById("action_switch_settings").style.display = "none";
}
+ else
+ {
+ if (mySelect.options[mySelect.selectedIndex].value == 2)
+ {
+ document.getElementById("set_action_timeframe").style.display = "block";
+ }
+ else
+ {
+ document.getElementById("set_action_timeframe").style.display = "none";
+ }
+
+ document.getElementById("set_action").style.display = "inline";
+ document.getElementById("set_autodelete").style.display = "block";
+ changedAction(document.getElementById("select_action"));
+ }
}
function changedAction(mySelect)
@@ -117,6 +131,12 @@
}
}
+ function changedAutoDelete(mySelect)
+ {
+ document.getElementById("del_after_recs").style.display = (mySelect.options[mySelect.selectedIndex].value == 1 ? "block" : "none");
+ document.getElementById("del_after_days").style.display = (mySelect.options[mySelect.selectedIndex].value == 2 ? "block" : "none");
+ }
+
function changedAvoidRepeats(myCheckbox)
{
document.getElementById("avoid_repeats_settings").style.display = (myCheckbox.checked ? "block" : "none");
@@ -265,6 +285,9 @@
<td class="col_label" valign="top"><h5><?% gettext('Use extended EPG info:') %?></h5></td>
<td class="col_value">
<input type="checkbox" name="use_extepg" value="1" id="use_extepg" <?% IF epgsearch.use_extepg %?>checked="checked"<?% END %?> onclick="javascript:changedUseExtEpg(this)" /><br/>
+ <div id="set_ignore_missing_epgcats">
+ <input type="checkbox" name="ignore_missing_epgcats" value="1" <?% IF epgsearch.ignore_missing_epgcats %?>checked="checked"<?% END %?>> <?% gettext('Ignore missing categories?') %?>
+ </div><br/>
<div id="use_extepg_settings">
<?% FOREACH ext = extepg %?>
<table border="0" cellspacing="0" cellpadding="0">
@@ -424,9 +447,13 @@
<?% END %?>
<tr class="<?% tr_class %?>">
<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
- <td class="col_label"><h5><?% gettext('Use as Search Timer:') %?></h5></td>
+ <td class="col_label" valign="top"><h5><?% gettext('Use as Search Timer:') %?></h5></td>
<td class="col_value">
- <input type="checkbox" name="has_action" value="1" <?% IF epgsearch.has_action %?>checked="checked"<?% END %?> onclick="javascript:changedHasAction(this)" id="has_action" />
+ <select onchange="javascript:changedHasAction(this)" id="has_action" name="has_action">
+ <option value="0" <?% IF epgsearch.has_action == 0 %?>selected="selected"<?% END %?>><?% gettext('no') %?></option>
+ <option value="1" <?% IF epgsearch.has_action == 1 %?>selected="selected"<?% END %?>><?% gettext('yes') %?></option>
+ <option value="2" <?% IF epgsearch.has_action == 2 %?>selected="selected"<?% END %?>><?% gettext('user-defined') %?></option>
+ </select>
<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>
@@ -434,6 +461,25 @@
<option value="2" <?% IF epgsearch.action == 2 %?>selected="selected"<?% END %?>><?% gettext('switch only') %?></option>
</select>
</span>
+ <div id="set_action_timeframe">
+ <?% gettext('First day:') %?> <input type="text" name="searchtimer_from" id="searchtimer_from" value="<?% epgsearch.searchtimer_from %?>" size="12"/>
+ &nbsp;
+ <?% gettext('Last day:') %?> <input type="text" name="searchtimer_until" id="searchtimer_until" value="<?% epgsearch.searchtimer_until %?>" size="12"/>
+ </div>
+ <div id="set_autodelete">
+ <?% gettext('Auto delete:') %?>&nbsp;
+ <select onchange="javascript:changedAutoDelete(this)" id="select_autodelete" name="autodelete">
+ <option value="0" <?% IF epgsearch.autodelete == 0 %?>selected="selected"<?% END %?>><?% gettext('no') %?></option>
+ <option value="1" <?% IF epgsearch.autodelete == 1 %?>selected="selected"<?% END %?>><?% gettext('count recordings') %?></option>
+ <option value="2" <?% IF epgsearch.autodelete == 2 %?>selected="selected"<?% END %?>><?% gettext('count days') %?></option>
+ </select>
+ <div id="del_after_recs">
+ <?% gettext('After ... recordings:') %?> <input type="text" name="del_after_recs" value="<?% epgsearch.del_after_recs %?>" size="5"/>
+ </div>
+ <div id="del_after_days">
+ <?% gettext('After ... days after first recording:') %?> <input type="text" name="del_after_days" value="<?% epgsearch.del_after_days %?>" size="5"/>
+ </div>
+ </div>
</td>
</tr>
</table>
@@ -571,6 +617,7 @@
<?% IF do_edit %?>
<input type="hidden" name="id" value="<?% epgsearch.id %?>" />
<?% END %?>
+ <input type="hidden" name="results_menu" value="<?% epgsearch.results_menu %?>" />
<input type="hidden" name="unused" value="<?% epgsearch.unused %?>" />
</form>
</body>
diff --git a/template/default/infobox.js b/template/default/infobox.js
index 699e97c..6c578b4 100644
--- a/template/default/infobox.js
+++ b/template/default/infobox.js
@@ -1,5 +1,5 @@
//
-// Bubblehelp infoboxes, (C) 2002 Klaus Knopper <infobox@knopper.net>
+// Bubblehelp infoboxes, (C) 2007 Klaus Knopper <infobox@knopper.net>
// You can copy/modify and distribute this code under the conditions
// of the GNU GENERAL PUBLIC LICENSE Version 2.
//
@@ -49,8 +49,11 @@ function tip(name){
if(idiv) untip();
idiv=gettip(name);
if(idiv){
- winW=(window.innerWidth)? window.innerWidth+window.pageXOffset-16:document.body.offsetWidth-20;
- winH=(window.innerHeight)?window.innerHeight+window.pageYOffset :document.body.offsetHeight;
+ // winW=(window.innerWidth)? window.innerWidth+window.pageXOffset-16:document.body.offsetWidth-20;
+ // winH=(window.innerHeight)?window.innerHeight+window.pageYOffset :document.body.offsetHeight;
+ // IE standards compliant mode compatibility partly contributed by Stefan Neufeind
+ winW=(window.innerWidth)? window.innerWidth+window.pageXOffset-16:(document.documentElement&&document.documentElement.clientWidth)?document.documentElement.clientWidth-20:document.body.offsetWidth-20;
+ winH=(window.innerHeight)?window.innerHeight+window.pageYOffset :(document.documentElement&&document.documentElement.clientHeight)?document.documentElement.clientHeight:document.body.offsetHeight;
if(x<=0||y<=0){ // konqueror can't get mouse position
x=(winW-IWIDTH)/2+(window.pageXOffset?window.pageXOffset:0); y=(winH-50)/2+(window.pageYOffset?window.pageYOffset:0); // middle of window
}
@@ -60,11 +63,8 @@ function tip(name){
}
function showtip(){
- if (isNaN(x)) return;
-
idiv.left=(((x+260)<winW)?x+12:x-255)+px; idiv.top=(((y+90)<winH)?y+12:y-90)+px;
idiv.visibility=ns4?"show":"visible";
-// window.status="idiv="+idiv+"X:"+(idiv.left?idiv.left:"NAN")+", Y:"+(idiv.top?idiv.top:"NAN")+", x:"+x+", y:"+y;
}
function mousemove(e){
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-20 19:39:21 +0000