diff options
author | Andreas Mair <amair.sob@googlemail.com> | 2007-08-17 14:21:52 +0200 |
---|---|---|
committer | Andreas Mair <amair.sob@googlemail.com> | 2007-08-17 14:21:52 +0200 |
commit | 5eb0558b86988c43a9f36516eb42e1f150fe498e (patch) | |
tree | a15f0d2029cac6c05fb488eaab2c3235d69a2fda /template/default/timeline.js | |
parent | 12afd457f85ae4c80446787ec2a37f5a0c30e3fb (diff) | |
download | vdradmin-am-3.6.0beta.tar.gz vdradmin-am-3.6.0beta.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/timeline.js')
-rw-r--r-- | template/default/timeline.js | 33 |
1 files changed, 27 insertions, 6 deletions
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('&time=' + time + '&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&epg_id="
- + event.epg_id + "&vdr_id=" + vdr_id + "');" + '">';
+ + event.epg_id + "&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");
|