summaryrefslogtreecommitdiff
path: root/template
diff options
context:
space:
mode:
Diffstat (limited to 'template')
-rw-r--r--template/default/about.html2
-rw-r--r--template/default/config.html95
-rw-r--r--template/default/default/rec.gifbin1006 -> 412 bytes
-rw-r--r--template/default/default/udef_search.pngbin0 -> 299 bytes
-rw-r--r--template/default/epgsearch_list.html8
-rw-r--r--template/default/epgsearch_new.html11
-rw-r--r--template/default/help_config.html34
-rw-r--r--template/default/help_edit_epg.html47
-rw-r--r--template/default/navigation.html6
-rw-r--r--template/default/prog_detail.html16
-rw-r--r--template/default/prog_detail_form.html96
-rw-r--r--template/default/prog_list.html14
-rw-r--r--template/default/prog_list2.html32
-rw-r--r--template/default/prog_summary.html20
-rw-r--r--template/default/prog_summary2.html18
-rw-r--r--template/default/prog_timeline.html9
-rw-r--r--template/default/rc.html33
-rw-r--r--template/default/timeline.js33
-rw-r--r--template/default/timer_new.html23
-rw-r--r--template/default/tv.html40
-rw-r--r--template/default/vdr_cmds.html12
21 files changed, 471 insertions, 78 deletions
diff --git a/template/default/about.html b/template/default/about.html
index 6b7227e..f17ba2b 100644
--- a/template/default/about.html
+++ b/template/default/about.html
@@ -70,7 +70,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="0" class="group">
<tr class="heading">
- <td colspan="2"><h2><?% gettext('Informations') %?></h2></td>
+ <td colspan="2"><h2><?% gettext('Information') %?></h2></td>
</tr>
<tr class="row_even">
<td class="col_label"><h5><?% gettext('VDRAdmin-AM version:') %?></h5></td>
diff --git a/template/default/config.html b/template/default/config.html
index 54c3ea8..8ea5bb6 100644
--- a/template/default/config.html
+++ b/template/default/config.html
@@ -187,55 +187,49 @@
</td>
</tr>
<tr class="row_even">
- <td class="col_label"><h5><?% gettext('Timeout:') %?></h5></td>
- <td class="col_value"><input type="text" name="AT_TIMEOUT" value="<?% config.AT_TIMEOUT %?>" size="4" /> <?% gettext('minutes') %?></td>
- </tr>
- <tr class="row_odd">
<td class="col_label"><h5><?% gettext('Priority:') %?></h5></td>
<td class="col_value"><input type="text" name="AT_PRIORITY" value="<?% config.AT_PRIORITY %?>" size="2" maxlength="2" /></td>
</tr>
- <tr class="row_even">
+ <tr class="row_odd">
<td class="col_label"><h5><?% gettext('Lifetime:') %?></h5></td>
<td class="col_value"><input type="text" name="AT_LIFETIME" value="<?% config.AT_LIFETIME %?>" size="2" maxlength="2" /></td>
</tr>
-<!--
- <tr class="row_odd">
+ <tr class="row_even">
<td class="col_label"><h5><?% gettext('Time Margin at Start:') %?></h5></td>
<td class="col_value"><input type="text" name="AT_MARGIN_BEGIN" value="<?% config.AT_MARGIN_BEGIN %?>" size="2" maxlength="2" /></td>
</tr>
- <tr class="row_even">
+ <tr class="row_odd">
<td class="col_label"><h5><?% gettext('Time Margin at Stop:') %?></h5></td>
<td class="col_value"><input type="text" name="AT_MARGIN_END" value="<?% config.AT_MARGIN_END %?>" size="2" maxlength="2" /></td>
</tr>
--->
- <tr class="row_odd">
+ <tr class="row_even">
<td class="col_label"><h5><?% gettext('Send email after programming timer:') %?></h5></td>
<td class="col_value">
<input type="radio" name="AT_SENDMAIL" value="1" id="at_sendmail_yes" <?% IF config.AT_SENDMAIL %?>checked="checked"<?% END %?> /><label for="at_sendmail_yes"><?% gettext('Yes') %?></label>
<input type="radio" name="AT_SENDMAIL" value="0" id="at_sendmail_no" <?% UNLESS config.AT_SENDMAIL %?>checked="checked"<?% END %?> /><label for="at_sendmail_no"><?% gettext('No') %?></label>
</td>
</tr>
- <tr class="row_even">
+ <tr class="row_odd">
<td class="col_label"><h5><?% gettext('Send email as:') %?></h5></td>
<td class="col_value"><input type="text" name="MAIL_FROM" value="<?% config.MAIL_FROM %?>" size="20" maxlength="100" /></td>
</tr>
- <tr class="row_odd">
+ <tr class="row_even">
<td class="col_label"><h5><?% gettext('Send email to:') %?></h5></td>
<td class="col_value"><input type="text" name="MAIL_TO" value="<?% config.MAIL_TO %?>" size="20" maxlength="100" /></td>
</tr>
- <tr class="row_even">
+ <tr class="row_odd">
<td class="col_label"><h5><?% gettext('Mail server:') %?></h5></td>
<td class="col_value"><input type="text" name="MAIL_SERVER" value="<?% config.MAIL_SERVER %?>" size="20" maxlength="100" /></td>
</tr>
- <tr class="row_odd">
+ <tr class="row_even">
<td class="col_label"><h5><?% gettext('SMTPAuth user:') %?></h5></td>
<td class="col_value"><input type="text" name="MAIL_AUTH_USER" value="<?% config.MAIL_AUTH_USER %?>" size="20" maxlength="100" /></td>
</tr>
- <tr class="row_even">
+ <tr class="row_odd">
<td class="col_label"><h5><?% gettext('SMTPAuth password:') %?></h5></td>
<td class="col_value"><input type="password" name="MAIL_AUTH_PASS" value="<?% config.MAIL_AUTH_PASS %?>" size="20" maxlength="100" /></td>
</tr>
- <tr class="row_odd">
+ <tr class="row_even">
<td class="col_label"><h5><?% gettext('Tooltips:') %?></h5></td>
<td class="col_value">
<input type="radio" name="AT_TOOLTIP" value="1" id="at_tooltip_yes" <?% IF config.AT_TOOLTIP %?>checked="checked"<?% END %?> /><label for="at_tooltip_yes"><?% gettext('Yes') %?></label>
@@ -348,8 +342,53 @@
<table border="0" cellspacing="0" cellpadding="0" class="group">
<tr class="heading">
+ <td colspan="2"><h2><?% gettext('External Search') %?></h2></td>
+ </tr>
+ <tr class="row_odd">
+ <td valign="top" class="col_label"><h5>Internet Movie Database (IMDb):</h5></td>
+ <td class="col_value">
+ <?% gettext('Active:') %?>
+ <input type="radio" name="SRCH1_ACTIVE" value="1" id="srch1_active_yes" <?% IF config.SRCH1_ACTIVE %?>checked="checked"<?% END %?> /><label for="srch1_active_yes"><?% gettext('Yes') %?></label>
+ <input type="radio" name="SRCH1_ACTIVE" value="0" id="srch1_active_no" <?% UNLESS config.SRCH1_ACTIVE %?>checked="checked"<?% END %?> /><label for="srch1_active_no"><?% gettext('No') %?></label>
+ <br />
+ <?% gettext('URL:') %?>
+ <input type="text" name="SRCH1_URL" value="<?% config.SRCH1_URL %?>" size="40" maxlength="256" />
+ <br />
+ <?% gettext('Title:') %?>
+ <input type="text" name="SRCH1_TITLE" value="<?% config.SRCH1_TITLE %?>" size="40" maxlength="256" />
+ </td>
+ </tr>
+ <tr class="row_even">
+ <td valign="top" class="col_label"><h5><?% gettext('User-defined search:') %?></h5></td>
+ <td class="col_value">
+ <?% gettext('Active:') %?>
+ <input type="radio" name="SRCH2_ACTIVE" value="1" id="srch2_active_yes" <?% IF config.SRCH2_ACTIVE %?>checked="checked"<?% END %?> /><label for="srch2_active_yes"><?% gettext('Yes') %?></label>
+ <input type="radio" name="SRCH2_ACTIVE" value="0" id="srch2_active_no" <?% UNLESS config.SRCH2_ACTIVE %?>checked="checked"<?% END %?> /><label for="srch2_active_no"><?% gettext('No') %?></label>
+ <br />
+ <?% gettext('URL:') %?>
+ <input type="text" name="SRCH2_URL" value="<?% config.SRCH2_URL %?>" size="40" maxlength="256" />
+ <br />
+ <?% gettext('Title:') %?>
+ <input type="text" name="SRCH2_TITLE" value="<?% config.SRCH2_TITLE %?>" size="40" maxlength="256" />
+ </td>
+ </tr>
+ </table>
+
+ <table border="0" cellspacing="0" cellpadding="0" class="group">
+ <tr class="heading">
<td colspan="2"><h2><?% gettext('Expert') %?></h2></td>
</tr>
+ <tr class="row_odd">
+ <td class="col_label"><h5><?% gettext('Update EPG data in background:') %?></h5></td>
+ <td class="col_value">
+ <input type="radio" name="CACHE_BG_UPDATE" value="1" id="cbgupd_yes" <?% IF config.CACHE_BG_UPDATE %?>checked="checked"<?% END %?> /><label for="cbgupd_yes"><?% gettext('Yes') %?></label>
+ <input type="radio" name="CACHE_BG_UPDATE" value="0" id="cbgupd_no" <?% UNLESS config.CACHE_BG_UPDATE %?>checked="checked"<?% END %?> /><label for="cbgupd_no"><?% gettext('No') %?></label>
+ </td>
+ </tr>
+ <tr class="row_even">
+ <td class="col_label"><h5><?% gettext('Update EPG every:') %?></h5></td>
+ <td class="col_value"><input type="text" name="CACHE_TIMEOUT" value="<?% config.CACHE_TIMEOUT %?>" size="4" /> <?% gettext('minutes') %?></td>
+ </tr>
<!-- no longer supported
<tr class="row_odd">
<td class="col_label"><h5><?% gettext('Read EPG directly using epg.data:') %?></h5></td>
@@ -376,14 +415,22 @@
<tr class="heading">
<td colspan="3"><h2><?% gettext('Channel Selections') %?></h2></td>
</tr>
+ <tr class="row_odd">
+ <td class="col_label"><h5><?% gettext('Show channels without EPG information:') %?></h5></td>
+ <td class="col_value" colspan="2">
+ <input type="radio" name="CHANNELS_WITHOUT_EPG" value="1" id="chnoepg_yes" <?% IF config.CHANNELS_WITHOUT_EPG %?>checked="checked"<?% END %?> /><label for="chnoepg_yes"><?% gettext('Yes') %?></label>
+ <input type="radio" name="CHANNELS_WITHOUT_EPG" value="0" id="chnoepg_no" <?% UNLESS config.CHANNELS_WITHOUT_EPG %?>checked="checked"<?% END %?> /><label for="chnoepg_no"><?% gettext('No') %?></label>
+ </td>
+ </tr>
+<!-- Now can be set in individual section
<tr class="row_odd">
<td class="col_label"><h5><?% gettext('In "Timeline"?') %?></h5></td>
<td class="col_value" colspan="2">
<input type="radio" name="CHANNELS_WANTED_TIMELINE" value="1" id="tl_yes" <?% IF config.CHANNELS_WANTED_TIMELINE %?>checked="checked"<?% END %?> /><label for="tl_yes"><?% gettext('Yes') %?></label>
<input type="radio" name="CHANNELS_WANTED_TIMELINE" value="0" id="tl_no" <?% UNLESS config.CHANNELS_WANTED_TIMELINE %?>checked="checked"<?% END %?> /><label for="tl_no"><?% gettext('No') %?></label>
</td>
- </tr>
- <tr class="row_even">
+ </tr>
+ <tr class="row_odd">
<td class="col_label"><h5><?% gettext('In "Channels"?') %?></h5></td>
<td class="col_value" colspan="2">
<input type="radio" name="CHANNELS_WANTED_PRG" value="1" id="prg_yes" <?% IF config.CHANNELS_WANTED_PRG %?>checked="checked"<?% END %?> /><label for="prg_yes"><?% gettext('Yes') %?></label>
@@ -404,13 +451,22 @@
<input type="radio" name="CHANNELS_WANTED_SUMMARY" value="0" id="sum_no" <?% UNLESS config.CHANNELS_WANTED_SUMMARY %?>checked="checked"<?% END %?> /><label for="sum_no"><?% gettext('No') %?></label>
</td>
</tr>
- <tr class="row_odd">
+-->
+<?% IF features.AUTOTIMER %?>
+ <tr class="row_even">
<td class="col_label"><h5><?% gettext('In "AutoTimer"?') %?></h5></td>
<td class="col_value" colspan="2">
<input type="radio" name="CHANNELS_WANTED_AUTOTIMER" value="1" id="wat_yes" <?% IF config.CHANNELS_WANTED_AUTOTIMER %?>checked="checked"<?% END %?> /><label for="wat_yes"><?% gettext('Yes') %?></label>
<input type="radio" name="CHANNELS_WANTED_AUTOTIMER" value="0" id="wat_no" <?% UNLESS config.CHANNELS_WANTED_AUTOTIMER %?>checked="checked"<?% END %?> /><label for="wat_no"><?% gettext('No') %?></label>
</td>
</tr>
+<?% ELSE %?>
+ <tr class="row_even">
+ <td class="col_label"><h5>&nbsp;</h5></td>
+ <td class="col_value" colspan="2">&nbsp;</td>
+ </tr>
+<?% END %?>
+<!-- Now can be set in individual section
<tr class="row_even">
<td class="col_label"><h5><?% gettext('In "Watch TV"?') %?></h5></td>
<td class="col_value" colspan="2">
@@ -418,6 +474,7 @@
<input type="radio" name="CHANNELS_WANTED_WATCHTV" value="0" id="wtv_no" <?% UNLESS config.CHANNELS_WANTED_WATCHTV %?>checked="checked"<?% END %?> /><label for="wtv_no"><?% gettext('No') %?></label>
</td>
</tr>
+-->
<tr class="row_odd">
<td class="col_channels">
<select name="all_channels" size="8" multiple="multiple" class="channels">
diff --git a/template/default/default/rec.gif b/template/default/default/rec.gif
index afb3199..be39357 100644
--- a/template/default/default/rec.gif
+++ b/template/default/default/rec.gif
Binary files differ
diff --git a/template/default/default/udef_search.png b/template/default/default/udef_search.png
new file mode 100644
index 0000000..b7fde46
--- /dev/null
+++ b/template/default/default/udef_search.png
Binary files differ
diff --git a/template/default/epgsearch_list.html b/template/default/epgsearch_list.html
index 38c3dbe..bc96c64 100644
--- a/template/default/epgsearch_list.html
+++ b/template/default/epgsearch_list.html
@@ -222,13 +222,14 @@
<td class="col_center"><h2><?% gettext('Title') %?></h2></td>
<td class="col_channel"><h2><?% gettext('Channel') %?></h2></td>
<td class="col_folder"><h2><?% gettext('Stored in') %?></h2></td>
+ <td class="col_buttons"></td>
</tr>
-->
<?% FOREACH matches;
IF olddate != date;
olddate = date; %?>
<tr class="newday">
- <td colspan="4"><span class="date_long"><?% date %?></span></td>
+ <td colspan="5"><span class="date_long"><?% date %?></span></td>
</tr>
<?% END %?>
<tr class="<?% IF loop.count % 2 == 0 %?>row_even<?% ELSE %?>row_odd<?% END %?>">
@@ -257,6 +258,11 @@
<td class="col_folder">
<?% folder %?>
</td>
+ <td class="col_folder">
+ <?% IF recurl %?>
+ <span class="action record"><a href="<?% recurl %?>"><img src="bilder/rec_button.png" border="0" alt="record" title="<?% gettext('Record') %?>" /></a></span>
+ <?% END %?>
+ </td>
</tr>
<?% END %?>
</table>
diff --git a/template/default/epgsearch_new.html b/template/default/epgsearch_new.html
index 2c5deae..2fa9428 100644
--- a/template/default/epgsearch_new.html
+++ b/template/default/epgsearch_new.html
@@ -170,7 +170,7 @@
IF olddate != date;
olddate = date; %?>
<tr class="newday">
- <td colspan="4"><span class="date_long"><?% date %?></span></td>
+ <td colspan="5"><span class="date_long"><?% date %?></span></td>
</tr>
<?% END %?>
<tr class="<?% IF loop.count % 2 == 0 %?>row_even<?% ELSE %?>row_odd<?% END %?>">
@@ -199,6 +199,11 @@
<td class="col_folder">
<?% folder %?>
</td>
+ <td class="col_folder">
+ <?% IF recurl %?>
+ <span class="action record"><a href="<?% recurl %?>"><img src="bilder/rec_button.png" border="0" alt="record" title="<?% gettext('Record') %?>" /></a></span>
+ <?% END %?>
+ </td>
</tr>
<?% END %?>
</table>
@@ -515,13 +520,13 @@
<tr class="row_even">
<td class="col_label"><h5><?% gettext('Time Margin at Start:') %?></h5></td>
<td class="col_value">
- <input type="text" name="bstart" value="<?% epgsearch.bstart %?>" size="2" maxlength="2" /> <?% gettext('minutes') %?>
+ <input type="text" name="bstart" value="<?% epgsearch.bstart %?>" size="5" maxlength="5" /> <?% gettext('minutes') %?>
</td>
</tr>
<tr class="row_odd">
<td class="col_label"><h5><?% gettext('Time Margin at Stop:') %?></h5></td>
<td class="col_value">
- <input type="text" name="bstop" value="<?% epgsearch.bstop %?>" size="2" maxlength="2" /> <?% gettext('minutes') %?>
+ <input type="text" name="bstop" value="<?% epgsearch.bstop %?>" size="5" maxlength="5" /> <?% gettext('minutes') %?>
</td>
</tr>
<tr class="row_even">
diff --git a/template/default/help_config.html b/template/default/help_config.html
index 16f6fb0..c56e5a7 100644
--- a/template/default/help_config.html
+++ b/template/default/help_config.html
@@ -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="#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="#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>
@@ -93,12 +93,14 @@
<dl>
<dt><?% gettext('Active:') %?></dt>
<dd><?% gettext('Activate or deactivate the AutoTimer function.') %?></dd>
- <dt><?% gettext('Timeout:') %?></dt>
- <dd><?% gettext('The interval, the the EPG data is checked for updating the AutoTimers.') %?></dd>
<dt><?% gettext('Priority:') %?></dt>
<dd><?% gettext('An integer in the range <strong>0...99</strong>, defining the <strong>priority</strong> of this timer and of recordings created by this timer. <strong>0</strong> represents the lowest value, <strong>99</strong> the highest. The priority is used to decide which timer shall be started in case there are two or more timers with the exact same <strong>start</strong> time. The first timer in the list with the highest priority will be used.<br /><br />This value is also stored with the recording and is later used to decide which recording to remove from disk in order to free space for a new recording. If the disk runs full and a new recording needs more space, an existing recording with the lowest priority (and which has exceeded its guaranteed <strong>lifetime</strong>) will be removed.<br /><br />If all available DVB cards are currently occupied, a timer with a higher priority will interrupt the timer with the lowest priority in order to start recording.') %?></dd>
<dt><?% gettext('Lifetime:') %?></dt>
<dd><?% gettext('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><?% gettext('Time Margin at Start:') %?></dt>
+ <dd><?% gettext('The number of minutes VDRAdmin-AM subtracts from the broadcasts start time found in the EPG.') %?></dd>
+ <dt><?% gettext('Time Margin at Stop:') %?></dt>
+ <dd><?% gettext('The number of minutes VDRAdmin-AM adds to the broadcasts stop time found in the EPG.') %?></dd>
<dt><?% gettext('Send email after programming timer:') %?></dt>
<dd><?% gettext('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><?% gettext('Send email as:') %?></dt>
@@ -124,9 +126,9 @@
<dt><?% gettext('Lifetime:') %?></dt>
<dd><?% gettext('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><?% gettext('Time Margin at Start:') %?></dt>
- <dd><?% gettext('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>
+ <dd><?% gettext('The number of minutes VDRAdmin-AM subtracts from the broadcasts start time found in the EPG.') %?></dd>
<dt><?% gettext('Time Margin at Stop:') %?></dt>
- <dd><?% gettext('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>
+ <dd><?% gettext('The number of minutes VDRAdmin-AM adds to the broadcasts stop time found in the EPG.') %?></dd>
<dt><?% gettext('Tooltips in timeline:') %?></dt>
<dd><?% gettext('Here you can (de-)activate the tooltips in the timeline.') %?></dd>
<dt><?% gettext('Tooltips in list:') %?></dt>
@@ -159,9 +161,27 @@
<div class="top_link">[<a href="#top"><?% gettext('Top') %?></a>]</div>
</div>
+ <div class="group"><a id="ext_search" name="ext_search"></a><h3><?% gettext('External Search') %?></h3>
+ <?% gettext('<p>Here you can define two external searches that you can access in the EPG views. You simply have to find the required URL and where the search pattern has to be located. %TITLE% will be substituted by the boadcast\'s EPG title.</p>') %?>
+ <?% gettext('Some examples:') %?>
+ <dl>
+ <dt>Internet Movie Database (IMDb): (<a href="http://www.imdb.com/">http://www.imdb.com/</a>)</dt>
+ <dd>http://akas.imdb.com/Tsearch?title=%TITLE%</dd>
+ <dt>VideoDB: (<a href="http://videodb.sf.net">videodb.sf.net</a>)</dt>
+ <dd>
+ http://www.videodb.net/videodb/search.php?q=%TITLE%&engine=videodb&owner=Guest&fields%5B%5D=title<br />
+ Please change the hostname to your local needs!
+ </dd>
+ </dl>
+ </div>
+
<div class="group"><a id="expert" name="expert"></a><h3><?% gettext('Expert') %?></h3>
<?% gettext('<p>This section is for experts <strong>only</strong>, i.e. you know what you are doing!</p>') %?>
<dl>
+ <dt><?% gettext('Update EPG data in background:') %?></dt>
+ <dd><?% gettext('If set to "yes" VDRAdmin-AM will periodically refresh its local EPG cache. Else the EPG will be refreshed if the user accesses any EPG view at the web interface and the timeout set at "Update EPG every" has been reached.') %?></dd>
+ <dt><?% gettext('Update EPG every:') %?></dt>
+ <dd><?% gettext('The interval, the EPG data is refreshed from VDR and AutoTimer updates are performed (if AutoTimer feature is used).') %?></dd>
<!--
<dt><?% gettext('Read EPG directly using epg.data:') %?></dt>
<dd><?% gettext('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>
@@ -178,6 +198,10 @@
<?% gettext('<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="&gt;&gt;&gt;&gt;&gt;"/>. 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="&lt;&lt;&lt;&lt;&lt;"/>.</p>') %?>
+ <dl>
+ <dt><?% gettext('Show channels without EPG information:') %?></dt>
+ <dd><?% gettext('Usually channels that don\'t have EPG information are hidden in all EPG views. If you don\'t want them to be hidden you have to set this option to "yes".') %?></dt>
+ </dl>
<div class="top_link">[<a href="#top"><?% gettext('Top') %?></a>]</div>
</div>
</td>
diff --git a/template/default/help_edit_epg.html b/template/default/help_edit_epg.html
new file mode 100644
index 0000000..3ca1e49
--- /dev/null
+++ b/template/default/help_edit_epg.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<!-- This help is partly taken from the VDR man page, Copyright (c) by Klaus Schmidinger -->
+
+<html id="scroller">
+
+<head>
+ <meta http-equiv="content-type" content="text/html;charset=<?% gettext('ISO-8859-1') %?>" />
+ <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" />
+ <?% IF usercss %?>
+ <link href="user.css" rel="stylesheet" media="screen" type="text/css" />
+ <?% END %?>
+</head>
+
+<body id="timer_new" class="help" onload="window.focus()">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" id="help" class="group">
+ <tr class="heading">
+ <td><h2><?% gettext('Edit EPG') %?></h2></td>
+ </tr>
+ <tr class="row_even">
+ <td>
+ <?% gettext('<p>Here you can edit the descriptive fields of an existing EPG entry.</p>') %?>
+ <dl>
+ <dt><?% gettext('Channel (readonly)') %?>:</dt>
+ <dd><?% gettext('This is the channel of the EPG entry. It cannot be changed.') %?></dd>
+ <dt><?% gettext('Time (readonly)') %?>:</dt>
+ <dd><?% gettext('This is the start and end time of the entry. It cannot be changed.') %?></dd>
+ <dt><?% gettext('Title') %?>:</dt>
+ <dd><?% gettext('Change this string to give this EPG Entry a new title. It must consist of only one line of text.') %?></dd>
+ <dt><?% gettext('Subtitle') %?>:</dt>
+ <dd><?% gettext('Change this string to give this EPG Entry a new subtitle. It must consist of only one line of text.') %?></dd>
+ <dt><?% gettext('Description') %?>:</dt>
+ <dd><?% gettext('Change the text in this field to edit the description of this entry. The text can consist of one or more lines.') %?></dd>
+ <dt><?% gettext('VPS (readonly)') %?>:</dt>
+ <dd><?% gettext('If available this field shows the vps time of the EPG entry. It cannot be changed.') %?></dd>
+ <dt><?% gettext('Video tracks (readonly)') %?>:</dt>
+ <dd><?% gettext('If available this field shows the video track(s). It cannot be changed.') %?></dd>
+ <dt><?% gettext('Audio tracks (readonly)') %?>:</dt>
+ <dd><?% gettext('If available this field shows the audio track(s). It cannot be changed.') %?></dd>
+ </dl>
+ </td>
+ </tr>
+ </table>
+</body>
+</html>
diff --git a/template/default/navigation.html b/template/default/navigation.html
index 7ef88be..c85eb5b 100644
--- a/template/default/navigation.html
+++ b/template/default/navigation.html
@@ -11,10 +11,10 @@
<script type="text/javascript">
<!--
function rc_open() {
- window.open("./vdradmin.pl?aktion=rc_show", "vdradminRC", "width=200, height=510, resizable=no, scrollbars=no, status=no, toolbar=no");
+ window.open("./vdradmin.pl?aktion=rc_show&full_rc=1", "vdradminRC", "width=200, height=510, resizable=no, scrollbars=no, status=no, toolbar=no");
}
function tv_open() {
- window.open("./vdradmin.pl?aktion=tv_show", "vdradminTV", "width=615, height=548, resizable=yes, scrollbars=no, status=no, toolbar=no");
+ window.open("./vdradmin.pl?aktion=tv_show&amp;full_tv=1", "vdradminTV", "width=615, height=548, resizable=yes, scrollbars=no, status=no, toolbar=no");
}
// -->
</script>
@@ -57,7 +57,7 @@
<a href="javascript:rc_open();"><?% gettext('Remote Control') %?></a>
</div>
<div class="navi" id="tv">
- <a href="vdradmin.pl?aktion=tv_show" target="main"><?% gettext('Watch TV') %?></a>
+ <a href="vdradmin.pl?aktion=tv_show&amp;full_tv=1" target="main"><?% gettext('Watch TV') %?></a>
</div>
<div class="navi" id="commands">
<a href="vdradmin.pl?aktion=vdr_cmds" target="main"><?% gettext('Commands') %?></a>
diff --git a/template/default/prog_detail.html b/template/default/prog_detail.html
index f35e94f..eedf611 100644
--- a/template/default/prog_detail.html
+++ b/template/default/prog_detail.html
@@ -40,10 +40,18 @@
<span class="action repeatings">
<a href="vdradmin.pl?search=<?% find_title %?>&amp;aktion=prog_summary&amp;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>
</span>
+ <span class="action edit">
+ <a href="javascript:void(opener.location.href='<?% editurl %?>'); window.close()"><img src="bilder/edit.png" border="0" alt="<?% gettext('edit') %?>" onmouseover="window.status='<?% gettext('edit') %?>';return true" title="<?% gettext('edit') %?>" /></a>
+ </span>
+ <?% END %?>
+ <?% IF srch1_url %?>
+ <span class="action imdb">
+ <a href="<?% srch1_url %?>" target="_blank"><img src="bilder/imdb.png" border="0" alt="IMDb" onmouseover="window.status='<?% srch1_title %?>';return true" title="<?% srch1_title %?>" /></a>
+ </span>
<?% END %?>
- <?% IF imdburl %?>
+ <?% IF srch2_url %?>
<span class="action imdb">
- <a href="<?% imdburl %?>" target="_blank" title="<?% gettext('Lookup movie in the Internet-Movie-Database (IMDb)') %?>"><img src="bilder/imdb.png" border="0" alt="IMDb" onmouseover="window.status='IMDb';return true" title="IMDb" /></a>
+ <a href="<?% srch2_url %?>" target="_blank"><img src="bilder/udef_search.png" border="0" alt="Search" onmouseover="window.status='<?% broadcast.srch2_url %?>';return true" title="<?% broadcast.srch2_url %?>" /></a>
</span>
<?% END %?>
</td>
@@ -55,13 +63,13 @@
<div class="epg_summary"><?% text %?></div>
<?% IF video %?>
<div class="epg_video">
- <h4><?% gettext('Video tracks:') %?></h4>
+ <h4><?% gettext('Video tracks:') %?></h4>&nbsp;
<?% video %?>
</div>
<?% END %?>
<?% IF audio %?>
<div class="epg_audio">
- <h4><?% gettext('Audio tracks:') %?></h4>
+ <h4><?% gettext('Audio tracks:') %?></h4>&nbsp;
<?% audio %?>
</div>
<?% END %?>
diff --git a/template/default/prog_detail_form.html b/template/default/prog_detail_form.html
new file mode 100644
index 0000000..0a6f582
--- /dev/null
+++ b/template/default/prog_detail_form.html
@@ -0,0 +1,96 @@
+<!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') %?>" />
+ <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" />
+ <?% IF usercss %?>
+ <link href="user.css" rel="stylesheet" media="screen" type="text/css" />
+ <?% END %?>
+</head>
+
+<body id="prog_detail_form"">
+ <form action="<?% url %?>" method="get" name="EPGform">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
+ <tr>
+ <td class="col_title">
+ <h1><?% gettext('Edit EPG') %?></h1>
+ </td>
+<?% IF help_url %?>
+ <td class="col_help">
+ <a href="javascript:open_help('<?% help_url %?>');"><img src="bilder/help.png" border="0" alt="help" title="<?% gettext('Help') %?>"/></a>
+ </td>
+<?% END %?>
+ </tr>
+ </table>
+
+ <div id="content">
+ <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group">
+ <?% tr_class = "row_odd" %?>
+ <tr class="<?% tr_class %?>">
+ <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
+ <td class="col_label"><h5><?% gettext('Channel') %?>:</h5></td>
+ <td class="col_value"><?% channel_name %?></td>
+ </tr>
+ <tr class="<?% tr_class %?>">
+ <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
+ <td class="col_label"><h5><?% gettext('Time') %?>:</h5></td>
+ <td class="col_value"><?% start_hr %?></td>
+ </tr>
+ <tr class="<?% tr_class %?>">
+ <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
+ <td class="col_label"><h5><?% gettext('Title') %?>:</h5></td>
+ <td class="col_value"><input type="text" name="title" value="<?% title %?>" size="80" /></td>
+ </tr>
+ <tr class="<?% tr_class %?>">
+ <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
+ <td class="col_label"><h5><?% gettext('Subtitle') %?>:</h5></td>
+ <td class="col_value"><input type="text" name="subtitle" value="<?% subtitle %?>" size="80" /></td>
+ </tr>
+ <tr class="<?% tr_class %?>">
+ <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
+ <td class="col_label" valign="top"><h5><?% gettext('Description') %?>:</h5></td>
+ <td class="col_value"><textarea name="description" rows="8" cols="80"><?% description %?></textarea></td>
+ </tr>
+ <?% IF vps %?>
+ <tr class="<?% tr_class %?>">
+ <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
+ <td class="col_label"><h5><?% gettext('VPS') %?>:</h5></td>
+ <td class="col_value"><?% vps %?></td>
+ </tr>
+ <?% END %?>
+ <?% IF video %?>
+ <tr class="<?% tr_class %?>">
+ <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
+ <td class="col_label"><h5><?% gettext('Video tracks') %?>:</h5></td>
+ <td class="col_value"><?% video %?></td>
+ </tr>
+ <?% END %?>
+ <?% IF audio %?>
+ <tr class="<?% tr_class %?>">
+ <?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
+ <td class="col_label"><h5><?% gettext('Audio tracks') %?>:</h5></td>
+ <td class="col_value"><?% audio %?></td>
+ </tr>
+ <?% END %?>
+ </table>
+ </div>
+
+ <div id="buttons">
+ <input type="submit" class="submit" name="save" value="<?% gettext('Save') %?>" />
+ <input type="submit" class="submit" name="exit" value="<?% gettext('Cancel') %?>" />
+ </div>
+ <input type="hidden" name="aktion" value="prog_detail_aktion" />
+ <?% IF referer %?>
+ <input type="hidden" name="referer" value="<?% referer %?>" />
+ <?% END %?>
+ <input type="hidden" name="vdr_id" value="<?% vdr_id %?>" />
+ <input type="hidden" name="epg_id" value="<?% epg_id %?>" />
+ <input type="hidden" name="start" value="<?% start %?>" />
+ <input type="hidden" name="duration" value="<?% duration %?>" />
+ </form>
+</body>
+
+</html>
diff --git a/template/default/prog_list.html b/template/default/prog_list.html
index 083b15f..4686982 100644
--- a/template/default/prog_list.html
+++ b/template/default/prog_list.html
@@ -28,6 +28,12 @@
<?% END %?>
</td>
<td class="col_other">
+ <?% gettext('Channel group:') %?>
+ <select name="select_wanted_channels" size="1" class="submit" onchange="window.open(this.options[this.selectedIndex].value,'main')">
+<?% FOREACH ch_grp = ch_groups %?>
+ <option value="<?% ch_grp.url %?>" <?% IF ch_grp.selected %?>selected="selected"<?% END %?> ><?% ch_grp.title %?></option>
+<?% END %?>
+ </select>
<?% IF chanloop.size() > 0 %?>
<?% gettext('Channel:') %?>&nbsp;
<select name="vdr_id" class="submit" onchange="window.open('<?% url %?>?aktion=prog_list&amp;vdr_id=' + this.options[this.selectedIndex].value,'main')">
@@ -84,9 +90,13 @@
<?% 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>
- <?% IF bc.imdburl %?>
- <span class="action imdb"><a href="<?% bc.imdburl %?>" target="_blank"><img src="bilder/imdb.png" border="0" alt="IMDb" onmouseover="window.status='<?% gettext('Lookup movie in the Internet-Movie-Database (IMDb)') %?>';return true" title="<?% gettext('Lookup movie in the Internet-Movie-Database (IMDb)') %?>" /></a></span>
+ <?% 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 %?>
+ <?% IF bc.srch2_url %?>
+ <span class="action imdb"><a href="<?% bc.srch2_url %?>" target="_blank"><img src="bilder/udef_search.png" border="0" alt="Search" onmouseover="window.status='<?% bc.srch2_title %?>';return true" title="<?% bc.srch2_title %?>" /></a></span>
<?% END %?>
</td>
</tr>
diff --git a/template/default/prog_list2.html b/template/default/prog_list2.html
index fa36f7f..f22ab09 100644
--- a/template/default/prog_list2.html
+++ b/template/default/prog_list2.html
@@ -31,6 +31,12 @@
<?% gettext('o\'clock') %?>
</td>
<td class="col_navi">
+ <?% gettext('Channel group:') %?>
+ <select name="select_wanted_channels" size="1" class="submit" onchange="window.open(this.options[this.selectedIndex].value,'main')">
+<?% FOREACH ch_grp = ch_groups %?>
+ <option value="<?% ch_grp.url %?>" <?% IF ch_grp.selected %?>selected="selected"<?% END %?> ><?% ch_grp.title %?></option>
+<?% END %?>
+ </select>
<?% IF days.size() > 0 %?>
<?% IF prevdayurl %?><a href="<?% prevdayurl %?>"><img src="bilder/pfeile_nachlinks.png" border="0" alt="" /></a><?% ELSE %?><img src="bilder/pfeile_nachlinks_soft.png" border="0" alt="" /><?% END %?>
<select name="days" size="1" onchange="window.open(this.options[this.selectedIndex].value,'main')"> <?% FOREACH d = days %?>
@@ -65,7 +71,7 @@
<?% UNLESS bc.endd %?>
<tr class="<?% IF loop.count() % 2 == 0 %?>row_even<?% ELSE %?>row_odd<?% END %?>">
<td class="col_duration">
- <a id="<?% bc.anchor %?>" name="<?% bc.anchor %?>"><?% bc.emit %?> - <?% bc.duration %?></a>
+ <?% IF bc.anchor %?><a id="<?% bc.anchor %?>" name="<?% bc.anchor %?>"><?% bc.emit %?> - <?% bc.duration %?></a><?% END %?>
</td>
<td class="col_title">
<div class="epg_title">
@@ -86,15 +92,21 @@
</div>
</td>
<td class="col_buttons">
- <span class="action repeatings"><a href="vdradmin.pl?search=<?% bc.find_title %?>&amp;aktion=prog_summary&amp;submit=go11"><img src="bilder/find.png" border="0" alt="<?% gettext('Search for other show times') %?>" onmouseover="window.status='<?% gettext('Search for other show times') %?>';return true" title="<?% gettext('Search for other show times') %?>" /></a></span>
- <?% IF bc.infurl %?>
- <span class="action info"><a href="javascript:popup('<?% bc.infurl %?>');"><img src="bilder/info_button.png" border="0" title="<?% gettext('More Information') %?>" alt="info"/></a></span>
- <?% ELSE %?>
- <span class="action info"><img src="bilder/info_button_disabled.png" border="0" title="<?% gettext('No Information') %?>" alt="noinfo"/></span>
- <?% END %?>
- <span class="action record"><a href="<?% bc.recurl %?>"><img src="bilder/rec_button.png" border="0" title="<?% gettext('Record') %?>" alt="record"/></a></span>
- <?% IF bc.imdburl %?>
- <span class="action imdb"><a href="<?% bc.imdburl %?>" target="_blank"><img src="bilder/imdb.png" border="0" alt="IMDb" onmouseover="window.status='<?% gettext('Lookup movie in the Internet-Movie-Database (IMDb)') %?>';return true" title="<?% gettext('Lookup movie in the Internet-Movie-Database (IMDb)') %?>" /></a></span>
+ <?% IF bc.anchor %?>
+ <span class="action repeatings"><a href="vdradmin.pl?search=<?% bc.find_title %?>&amp;aktion=prog_summary&amp;submit=go11"><img src="bilder/find.png" border="0" alt="<?% gettext('Search for other show times') %?>" onmouseover="window.status='<?% gettext('Search for other show times') %?>';return true" title="<?% gettext('Search for other show times') %?>" /></a></span>
+ <?% IF bc.infurl %?>
+ <span class="action info"><a href="javascript:popup('<?% bc.infurl %?>');"><img src="bilder/info_button.png" border="0" title="<?% gettext('More Information') %?>" alt="info"/></a></span>
+ <?% ELSE %?>
+ <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>
+ <?% 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 %?>
+ <?% IF bc.srch2_url %?>
+ <span class="action imdb"><a href="<?% bc.srch2_url %?>" target="_blank"><img src="bilder/udef_search.png" border="0" alt="Search" onmouseover="window.status='<?% bc.srch2_title %?>';return true" title="<?% bc.srch2_title %?>" /></a></span>
+ <?% END %?>
<?% END %?>
</td>
</tr>
diff --git a/template/default/prog_summary.html b/template/default/prog_summary.html
index 74031ed..49106af 100644
--- a/template/default/prog_summary.html
+++ b/template/default/prog_summary.html
@@ -20,6 +20,14 @@
<h1><?% title %?></h1>
</td>
<td class="col_other">
+<?% UNLESS searchresults %?>
+ <?% gettext('Channel group:') %?>
+ <select name="select_wanted_channels" size="1" class="submit" onchange="window.open(this.options[this.selectedIndex].value,'main')">
+<?% FOREACH ch_grp = ch_groups %?>
+ <option value="<?% ch_grp.url %?>" <?% IF ch_grp.selected %?>selected="selected"<?% END %?> ><?% ch_grp.title %?></option>
+<?% END %?>
+ </select>
+<?% END %?>
[<a href="<?% switchview_url %?>"><?% switchview_text %?></a>]
</td>
<?% IF times.size() > 0 %?>
@@ -84,20 +92,26 @@
<img src="bilder/info_button_disabled.png" border="0" alt="noinfo" title="<?% gettext('No Information') %?>" />
<?% END %?>
</span>
+ <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>
<?% END %?>
- <?% IF row.imdburl %?>
+ <?% IF row.srch1_url %?>
<span class="action imdb">
- <a href="<?% row.imdburl %?>" target="_blank"><img src="bilder/imdb.png" border="0" alt="IMDb" onmouseover="window.status='<?% gettext('Lookup movie in the Internet-Movie-Database (IMDb)') %?>';return true" title="<?% gettext('Lookup movie in the Internet-Movie-Database (IMDb)') %?>" /></a>
+ <a href="<?% row.srch1_url %?>" target="_blank"><img src="bilder/imdb.png" border="0" alt="IMDb" onmouseover="window.status='<?% row.srch1_title %?>';return true" title="<?% row.srch1_title %?>" /></a>
</span>
<?% END %?>
+ <?% IF row.srch2_url %?>
+ <span class="action imdb"><a href="<?% row.srch2_url %?>" target="_blank"><img src="bilder/udef_search.png" border="0" alt="Search" onmouseover="window.status='<?% row.srch2_title %?>';return true" title="<?% row.srch2_title %?>" /></a></span>
+ <?% END %?>
</td>
<td class="col_epg">
<div class="date_long"><?% row.longdate %?></div>
<div class="time_duration">
- <?% IF row.start %?><span class="time_start"><?% row.start %?></span>-<span class="time_stop"><?% row.stop %?></span><?% END %?>
+ <span class="time_start"><?% IF row.start %?><?% row.start %?></span>-<span class="time_stop"><?% row.stop %?><?% ELSE %?>&nbsp;<?% END %?></span>
</div>
<div class="epg_title">
<?% IF row.summary %?>
diff --git a/template/default/prog_summary2.html b/template/default/prog_summary2.html
index e572a09..e657eb0 100644
--- a/template/default/prog_summary2.html
+++ b/template/default/prog_summary2.html
@@ -20,6 +20,14 @@
<h1><?% title %?></h1>
</td>
<td class="col_other">
+<?% UNLESS searchresults %?>
+ <?% gettext('Channel group:') %?>
+ <select name="select_wanted_channels" size="1" class="submit" onchange="window.open(this.options[this.selectedIndex].value,'main')">
+<?% FOREACH ch_grp = ch_groups %?>
+ <option value="<?% ch_grp.url %?>" <?% IF ch_grp.selected %?>selected="selected"<?% END %?> ><?% ch_grp.title %?></option>
+<?% END %?>
+ </select>
+<?% END %?>
[<a href="<?% switchview_url %?>"><?% switchview_text %?></a>]
</td>
<?% IF times.size() > 0 %?>
@@ -54,7 +62,7 @@
<?% END %?>
<tr class="<?% tr_class %?>">
<td class="col_duration">
- <span class="time_duration"><span class="time_start"><?% broadcast.start %?></span> - <span class="time_stop"><?% broadcast.stop %?></span></span>
+ <span class="time_duration"><span class="time_start"><?% IF broadcast.start %?><?% broadcast.start %?></span> - <span class="time_stop"><?% broadcast.stop %?><?% END %?></span></span>
<?% IF broadcast.show_percent %?>
<table border="0" cellspacing="0" cellpadding="0" class="percent" title="<?% broadcast.elapsed_min %?>min&nbsp;/&nbsp;<?% broadcast.length_min %?>min">
<tr>
@@ -100,9 +108,13 @@
<?% 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 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>
- <?% IF broadcast.imdburl %?>
- <span class="action imdb"><a href="<?% broadcast.imdburl %?>" target="_blank"><img src="bilder/imdb.png" border="0" alt="IMDb" onmouseover="window.status='<?% gettext('Lookup movie in the Internet-Movie-Database (IMDb)') %?>';return true" title="<?% gettext('Lookup movie in the Internet-Movie-Database (IMDb)') %?>" /></a></span>
+ <?% 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 %?>
+ <?% IF broadcast.srch2_url %?>
+ <span class="action imdb"><a href="<?% broadcast.srch2_url %?>" target="_blank"><img src="bilder/udef_search.png" border="0" alt="Search" onmouseover="window.status='<?% broadcast.srch2_title %?>';return true" title="<?% broadcast.srch2_title %?>" /></a></span>
<?% END %?>
<?% END %?>
</td>
diff --git a/template/default/prog_timeline.html b/template/default/prog_timeline.html
index d48d6e5..f0bf83f 100644
--- a/template/default/prog_timeline.html
+++ b/template/default/prog_timeline.html
@@ -132,7 +132,7 @@
<?%
FOREACH show = shows2.${name};
%?>
- events[<?% counter %?>] = AddEvent(<?% counter %?>, <?% show.vdr_id %?>, <?% show.anchor %?>, <?% show.start %?>, <?% show.stop %?>, "<?% show.title | html %?>", <?% show.timer %?>, <?% show.summary ? 1 : 0 %?>);
+ events[<?% counter %?>] = AddEvent(<?% counter %?>, <?% show.vdr_id %?>, "<?% show.anchor %?>", <?% show.start %?>, <?% show.stop %?>, "<?% show.title | html %?>", <?% show.timer %?>, <?% show.summary ? 1 : 0 %?>);
<?%
counter = counter + 1;
END;
@@ -155,6 +155,13 @@
<h1><?% date.format(now_sec, "%A,") %?>&nbsp;<?% now %?>&nbsp;<?% gettext('o\'clock') %?></h1>
</td>
<td class="col_other">
+ <?% gettext('Channel group:') %?>
+ <select name="select_wanted_channels" size="1" class="submit" onchange="window.open(this.options[this.selectedIndex].value, '_self')">
+<?% FOREACH ch_grp = ch_groups %?>
+ <option value="<?% ch_grp.url %?>" <?% IF ch_grp.selected %?>selected="selected"<?% END %?> ><?% ch_grp.title %?></option>
+<?% END %?>
+ </select>
+ &nbsp;
<?% gettext('What\'s on:') %?>&nbsp;
<select name="Auswahl" class="submit" onchange="Go(this.form.Auswahl.options[this.form.Auswahl.options.selectedIndex].value)">
<?% select_now = (now == date.format(date.now, '%H:%M')) %?>
diff --git a/template/default/rc.html b/template/default/rc.html
index 1567847..652a879 100644
--- a/template/default/rc.html
+++ b/template/default/rc.html
@@ -19,6 +19,11 @@
</head>
<body id="rc" onload="window.focus()">
+<?% IF full_rc %?>
+ <table height="510" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td>
+<?% END %?>
<table width="200" height="510" border="0" cellspacing="0" cellpadding="0" class="rc">
<tr>
<td></td>
@@ -114,5 +119,33 @@
<td></td>
</tr>
</table>
+<?% IF full_rc %?>
+ </td>
+ <td id="sect_channels">
+ <table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td>
+ <select name="select_wanted_channels" size="1" class="submit" onchange="window.open(this.options[this.selectedIndex].value, '_self')" style="width:100%">
+<?% FOREACH ch_grp = ch_groups %?>
+ <option value="<?% ch_grp.url %?>" <?% IF ch_grp.selected %?>selected="selected"<?% END %?> ><?% ch_grp.title %?></option>
+<?% END %?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <select name="channel" size="27" onchange="javascript:switch_channel('./vdradmin.pl?aktion=tv_switch&amp;channel=' + encodeURIComponent(this.options[this.selectedIndex].value));" style="width:100%">
+<?% FOREACH chan = channels %?>
+ <option value="<?% chan.vdr_id %?>" <?% IF chan.cur %?>selected="selected"<?% END %?>><?% chan.name | html %?></option>
+<?% END %?>
+ </select>
+<!-- <a class="submit" href="javascript:switch_by_select();">Switch</a>-->
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ </table>
+<?% END %?>
</body>
</html>
diff --git a/template/default/timeline.js b/template/default/timeline.js
index b5bc510..75aa6c4 100644
--- a/template/default/timeline.js
+++ b/template/default/timeline.js
@@ -139,7 +139,7 @@ function TimeLine(_req_sec, _now_url, _px_per_min, _end_min)
/*##########################################################################*/
function BuildOption(time, selected, text)
{
- W('<option value="' + tl.now_url);
+ W('<option value="' + tl.now_url);
if (time)
{
W('&amp;time=' + time + '&amp;frame=' + tl.first_sec);
@@ -311,6 +311,8 @@ function BuildChannel(channel, td_class)
W('<td class="' + td_class + '">');
W('<nobr>');
var old_stop_min = 0;
+ if (channel.events[0].start_sec > 0)
+ {
for (var i = 0; i < channel.events.length; i++)
{
var event = channel.events[i];
@@ -325,10 +327,10 @@ function BuildChannel(channel, td_class)
if (start_min < old_stop_min)
{
start_min = old_stop_min;
- if (start_min > 0)
- {
- td_class = "color_spacer"; /* overlapped event */
- }
+ if (start_min > 0 && !event.timer)
+ {
+ td_class = "color_spacer"; /* overlapped event */
+ }
}
if (stop_min > tl.end_min) stop_min = tl.end_min;
@@ -368,6 +370,11 @@ function BuildChannel(channel, td_class)
{
BuildSpacer((tl.end_min - old_stop_min) * tl.px_per_min);
}
+ }
+ else
+ {
+ BuildNoEPG(channel.events[0], tl.end_min * tl.px_per_min);
+ }
W('</nobr>');
W('</td>');
W('</tr>');
@@ -407,7 +414,7 @@ function BuildEvent(vdr_id, counter, event, td_class, px_w)
{
anchor_start = '<a href="javascript:popup('
+ "'./vdradmin.pl?aktion=prog_detail&amp;epg_id="
- + event.epg_id + "&amp;vdr_id=" + vdr_id + "');" + '">';
+ + event.epg_id + "&amp;vdr_id=" + vdr_id + "');" + '">';
anchor_end = '</a>';
}
W(anchor_start);
@@ -419,6 +426,20 @@ function BuildEvent(vdr_id, counter, event, td_class, px_w)
W('</table>');
}
+function BuildNoEPG(event, width)
+{
+ W('<table border="0" align="left" cellpadding="0" cellspacing="0" width="' + width + '" class="prgtable">');
+ W('<tr>');
+ W('<td width="1" class="color_spacer">');
+ W('<img src="bilder/spacer.gif" width="1" height="1" border="0" /><br />');
+ W('<nobr>');
+ W(event.title);
+ W('</nobr>');
+ W('</td>');
+ W('</tr>');
+ W('</table>');
+}
+
function DrawTimeLine()
{
var tab = document.getElementById("row_timeline");
diff --git a/template/default/timer_new.html b/template/default/timer_new.html
index a32635c..37b86b1 100644
--- a/template/default/timer_new.html
+++ b/template/default/timer_new.html
@@ -11,6 +11,8 @@
<script type="text/javascript" language="JavaScript1.2" src="library.js"></script>
<script type="text/javascript" language="JavaScript1.2">
<!--
+ var defaultDate = "";
+
function cTimer(idx) {
var Timer = "";
var dor = document.form.dor.value;
@@ -23,11 +25,17 @@
} else {
Timer = Timer + "-";
}
- document.form.dor.value = Timer + StartDay;
}
+ if (Timer == "-------") {
+ document.form.dor.value = defaultDate;
+ eCheckbox(defaultDate);
+ } else {
+ document.form.dor.value = Timer + StartDay;
+ }
}
function eCheckbox(complTimer) {
+ defaultDate = complTimer;
if(complTimer.length == 7 || complTimer.length == 18) {
for(var i = 0; i <= 6; i++) {
if(complTimer.substring(i, i + 1) != "-") {
@@ -65,7 +73,8 @@
<input type="radio" name="active" value="0" id="active_no" <?% UNLESS active %?>checked="checked"<?% END %?> /><label for="active_no"><?% gettext('No') %?></label>
</td>
</tr>
-<?% IF features.AUTOTIMER %?>
+<?% UNLESS hide_at_check %?>
+ <?% IF features.AUTOTIMER || features.EPGSEARCH %?>
<tr class="<?% tr_class %?>">
<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
<td class="col_label"><h5><?% gettext('AutoTimer Checking:') %?></h5></td>
@@ -78,6 +87,7 @@
<input type="radio" name="autotimer" value="0" id="event_off" <?% IF autotimer == 0 %?>checked="checked"<?% END %?> /><label for="event_off"><?% gettext('off') %?></label>
</td>
</tr>
+ <?% END %?>
<?% END %?>
<tr class="<?% tr_class %?>">
<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
@@ -114,7 +124,7 @@
<input type="text" name="startm" value="<?% startm %?>" size="2" maxlength="2" />
&nbsp;<?% gettext('o\'clock') %?>
<?% IF bstart %?>
- (<?% gettext('Buffer:') %?> <?% bstart %?> <?% gettext('minutes') %?>)
+ (<?% gettext('Buffer:') %?>&nbsp;<?% bstart %?>&nbsp;<?% gettext('minutes') %?>)
<?% END %?>
</td>
</tr>
@@ -127,7 +137,7 @@
<input type="text" name="stopm" value="<?% stopm %?>" size="2" maxlength="2" />
&nbsp;<?% gettext('o\'clock') %?>
<?% IF bstop %?>
- (<?% gettext('Buffer:') %?> <?% bstop %?> <?% gettext('minutes') %?>)
+ (<?% gettext('Buffer:') %?>&nbsp;<?% bstop %?>&nbsp;<?% gettext('minutes') %?>)
<?% END %?>
</td>
</tr>
@@ -154,7 +164,7 @@
<tr class="<?% tr_class %?>">
<?% tr_class = (tr_class == "row_odd" ? "row_even" : "row_odd") %?>
<td class="col_label" valign="top"><h5><?% gettext('Summary:') %?></h5><h6>(<?% gettext('readonly') %?>)</h6></td>
- <td class="col_value"><textarea name="summary" rows="6" cols="80" readonly="readonly"><?% summary %?></textarea></td>
+ <td class="col_value"><textarea name="summary" rows="6" cols="80" readonly="readonly"><?% summary | html %?></textarea></td>
</tr>
<?% IF pattern %?>
<tr class="<?% tr_class %?>">
@@ -170,6 +180,9 @@
<input type="submit" class="submit" name="exit" value="<?% gettext('Cancel') %?>" />
</div>
<input type="hidden" name="aktion" value="timer_add" />
+ <?% IF tool %?>
+ <input type="hidden" name="tool" value="<?% tool %?>" />
+ <?% END %?>
<?% IF referer %?>
<input type="hidden" name="referer" value="<?% referer %?>" />
<?% END %?>
diff --git a/template/default/tv.html b/template/default/tv.html
index 8b85826..0a9d103 100644
--- a/template/default/tv.html
+++ b/template/default/tv.html
@@ -13,7 +13,11 @@
<!--
var timeout;
var interval = <?% interval %?>;
- var size = "<?% size %?>";
+ <?% IF full_tv %?>
+ var size = "<?% size %?>";
+ <?% ELSE %?>
+ var size = "half";
+ <?% END %?>
function switch_by_select() {
for (i = 0; i < document.forms[0].channel.length; ++i)
@@ -35,6 +39,7 @@
Before = new Date();
NewPicUrl = "<?% url %?>&size=" + size + "&interval=" + interval + "&rand=" + Before.getTime();
document.Bild.src = NewPicUrl;
+//TODO document.getElementById('sect_tv').style.width = (size == 'full' ? 780 : (size == 'half' ? 400 : 210));
if(interval > 0) {
After = new Date();
wait_sec = (interval * 1000) - (After - Before);
@@ -61,7 +66,7 @@
}
function tv_open() {
- window.open("./vdradmin.pl?aktion=tv_show&new_win=1", "vdradminTV", "width=615, height=548, resizable=yes, scrollbars=no, status=no, toolbar=no");
+ window.open("./vdradmin.pl?aktion=tv_show&new_win=1&full_tv=1", "vdradminTV", "width=615, height=548, resizable=yes, scrollbars=no, status=no, toolbar=no");
}
//-->
</script>
@@ -69,7 +74,7 @@
<body onload="window.focus();WebcamUpdate()" id="tv">
<form action="<?% url %?>" method="get" name="liveform">
-<?% UNLESS tv_only %?>
+<?% IF full_tv %?>
<table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading">
<tr>
<td class="col_title"><h1><?% gettext('TV') %?></h1></td>
@@ -101,11 +106,11 @@
<table border="0" cellspacing="0" cellpadding="0" id="content">
<tr>
- <td id="sect_tv">
+ <td id="sect_tv" width="<?% IF size == 'full' %?>780<?% ELSE %?><?% IF size == 'half' %?>400<?% ELSE %?>210<?% END %?><?% END %?>" align="center">
<img name="Bild" src="<?% url %?>" border="1" hspace="2" vspace="2" class="tv" alt="" />
<img src="bilder/spacer.gif" name="switchimage" width="2" height="1" alt="" />
</td>
-<?% UNLESS tv_only %?>
+<?% IF full_tv %?>
<td id="sect_rc">
<table width="200" border="0" cellspacing="0" cellpadding="0">
<tr>
@@ -194,15 +199,30 @@
</table>
</td>
<td id="sect_channels">
- <select name="channel" size="32" onchange="javascript:switch_channel('./vdradmin.pl?aktion=tv_switch&amp;channel=' + encodeURIComponent(this.options[this.selectedIndex].value));">
+ <table border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td>
+ <select name="select_wanted_channels" size="1" class="submit" onchange="window.open(this.options[this.selectedIndex].value,'main')" style="width:100%">
+<?% FOREACH ch_grp = ch_groups %?>
+ <option value="<?% ch_grp.url %?>" <?% IF ch_grp.selected %?>selected="selected"<?% END %?> ><?% ch_grp.title %?></option>
+<?% END %?>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <select name="channel" size="32" onchange="javascript:switch_channel('./vdradmin.pl?aktion=tv_switch&amp;channel=' + encodeURIComponent(this.options[this.selectedIndex].value));" style="width:100%">
<?% FOREACH chan = channels %?>
- <option value="<?% chan.vdr_id %?>" <?% IF chan.cur %?>selected="selected"<?% END %?>><?% chan.name | html %?></option>
+ <option value="<?% chan.vdr_id %?>" <?% IF chan.cur %?>selected="selected"<?% END %?>><?% chan.name | html %?></option>
<?% END %?>
- </select>
-<!-- <a class="submit" href="javascript:switch_by_select();">Switch</a>-->
+ </select>
+<!-- <a class="submit" href="javascript:switch_by_select();">Switch</a>-->
+ </td>
+ </tr>
+ </table>
</td>
<?% END %?>
-<?% UNLESS tv_only %?>
+<?% IF full_tv %?>
<?% END %?>
</tr>
</table>
diff --git a/template/default/vdr_cmds.html b/template/default/vdr_cmds.html
index 8038d9f..1177103 100644
--- a/template/default/vdr_cmds.html
+++ b/template/default/vdr_cmds.html
@@ -26,6 +26,14 @@
<form action="<?% url %?>" method="get" name="FormName">
<table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="group">
<tr class="row_odd">
+ <td class="col_label"><h5><?% gettext('Export channels as playlist:') %?></h5></td>
+ <td class="col_value">
+<?% FOREACH cmd = export_cmds %?>
+ [<a href="<?% cmd.url %?>"><?% cmd.text %?></a>]
+<?% END %?>
+ </td>
+ </tr>
+ <tr class="row_even">
<td class="col_label"><h5><?% gettext('Number of lines to show:') %?></h5></td>
<td class="col_value">
<select name="max_lines">
@@ -36,7 +44,7 @@
</select>
</td>
</tr>
- <tr class="row_even">
+ <tr class="row_odd">
<td class="col_label"><h5><?% gettext('SVDRP commands:') %?></h5></td>
<td class="col_value">
<input type="text" name="svdrp_cmd" value="<?% svdrp_cmd %?>"/>
@@ -44,7 +52,7 @@
</td>
</tr>
<?% IF commands.size() > 0 %?>
- <tr class="row_odd">
+ <tr class="row_even">
<td class="col_label"><h5><?% gettext('Commands defined in commands.conf:') %?></h5></td>
<td class="col_value">
<select name="vdr_cmd" class="submit">