summaryrefslogtreecommitdiff
path: root/template/default/tv.html
diff options
context:
space:
mode:
authorAndreas Mair <amair.sob@googlemail.com>2007-08-17 14:21:52 +0200
committerAndreas Mair <amair.sob@googlemail.com>2007-08-17 14:21:52 +0200
commit5eb0558b86988c43a9f36516eb42e1f150fe498e (patch)
treea15f0d2029cac6c05fb488eaab2c3235d69a2fda /template/default/tv.html
parent12afd457f85ae4c80446787ec2a37f5a0c30e3fb (diff)
downloadvdradmin-am-5eb0558b86988c43a9f36516eb42e1f150fe498e.tar.gz
vdradmin-am-5eb0558b86988c43a9f36516eb42e1f150fe498e.tar.bz2
2007-08-17: 3.6.0betav3.6.0beta
- Added: export of channels in each channel group as m3u playlist in vdr_cmds. - Added: channel list to rc. - Added: VDRAdmin-AM now holds four default channel groups: all channels / selected channels / tv channels / radio channels. - Reworked: Logging; Use "LOGFILE = stderr" if you want logging to stderr. - Added: If background EPG refreshes are enabled, VDRAdmin-AM will try to read the EPG data from VDR at startup and if VDR can't be reached it will try every minute until it can read the EPG data. - Added: New option in configuration for enabling/disabling background EPG refreshes. - Changed: default for tv.html to only show the grabbed picture (for VDR streamingtool). - Added: config option "Show channels without EPG information" - Fixed: wrong background color for some broadcasts having timers in prog_timeline. - Fixed: Last frame now shows "REC" (see bug report #249). - Fixed: Reduce memory usage of EPG tree. - Fixed: Priority and lifetime can be set to "0" (See bug report #232). - Changed: Priority/Lifetime/Buffer Start/Buffer Stop in (Auto)Timer can now be empty ("") which means "use default set in configuration". - New: configure options for AutoTimer: start/stop buffer. - Fixed: Handle symbolic links when find'ing video files for a recording. - Added: "stderr" as special LOGFILE target to log to stderr (=console?). - Fixed: LOGFILE config file option. - Fixed: Allow more than two characters in EPGsearch's "record" action (See bug report #286). - Changed: Join CACHE_TIMEOUT and AT_TIMEOUT to their minimum in CACHE_TIMEOUT. - Added: New buttons in EPG views to edit the EPG entry (Based on patch by Christoph Haubrich). - Added: New "--pid" vdradmind.pl to set the used pidfile. - Added: extended information in m3u file used for livetv streaming (Submitted by Samuli Sorvakko). - Changed: IMDb search URL can be modified. - Added: Optional user defined external search (Based on suggestion by Axel Röhken). - Fixed: Saving of wrong timer if repeating timers have no day set (= "-------"). - Added: Record button to epgsearch result list if no timer is set. - Added: Support for epgsearch's timer checking. - Changed: Minimum required epgsearch release to 0.9.21. - Fixed: Disable EPG_DIRECT because it no longer works with the "lste" speedup patch. - Minor bugfixes and improvements.
Diffstat (limited to 'template/default/tv.html')
-rw-r--r--template/default/tv.html40
1 files changed, 30 insertions, 10 deletions
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>