summaryrefslogtreecommitdiff
path: root/template
diff options
context:
space:
mode:
Diffstat (limited to 'template')
-rw-r--r--[-rwxr-xr-x]template/default/default/logo.png (renamed from template/default/default/logo_other.png)bin4122 -> 4122 bytes
-rw-r--r--template/default/default/logo_linvdr.gifbin2551 -> 0 bytes
-rw-r--r--template/default/favicon.icobin3262 -> 0 bytes
-rw-r--r--template/default/navigation.html2
-rw-r--r--template/default/prog_summary.html4
-rw-r--r--template/default/prog_timeline.html10
-rw-r--r--template/default/style.css19
-rw-r--r--template/default/timeline.js38
8 files changed, 44 insertions, 29 deletions
diff --git a/template/default/default/logo_other.png b/template/default/default/logo.png
index ff68769..ff68769 100755..100644
--- a/template/default/default/logo_other.png
+++ b/template/default/default/logo.png
Binary files differ
diff --git a/template/default/default/logo_linvdr.gif b/template/default/default/logo_linvdr.gif
deleted file mode 100644
index 504265b..0000000
--- a/template/default/default/logo_linvdr.gif
+++ /dev/null
Binary files differ
diff --git a/template/default/favicon.ico b/template/default/favicon.ico
deleted file mode 100644
index 4f30dbc..0000000
--- a/template/default/favicon.ico
+++ /dev/null
Binary files differ
diff --git a/template/default/navigation.html b/template/default/navigation.html
index 3bf3754..2cbd194 100644
--- a/template/default/navigation.html
+++ b/template/default/navigation.html
@@ -22,7 +22,7 @@
<body id="navigation">
<div class="logo">
- <a href="./" target="_top"><tmpl_if linvdr><img src="bilder/logo_linvdr.gif" alt="" height="50" width="150" border="0" /><tmpl_else><img src="bilder/logo_other.png" alt="" height="50" width="150" border="0" /></tmpl_if></a>
+ <a href="./" target="_top"><img src="bilder/logo.png" alt="" height="50" width="150" border="0" /></a>
</div>
<div class="nav_bar">
<div class="navi" id="prog_summary">
diff --git a/template/default/prog_summary.html b/template/default/prog_summary.html
index 40c9782..8600489 100644
--- a/template/default/prog_summary.html
+++ b/template/default/prog_summary.html
@@ -114,9 +114,7 @@
&nbsp;
</tmpl_if>
</div>
- <tmpl_if summary>
- <div class="epg_summary"><tmpl_var summary></div>
- </tmpl_if>
+ <div class="epg_summary"><tmpl_var summary></div>
</td>
</tr>
</table>
diff --git a/template/default/prog_timeline.html b/template/default/prog_timeline.html
index 406fe0d..69d3fff 100644
--- a/template/default/prog_timeline.html
+++ b/template/default/prog_timeline.html
@@ -39,6 +39,7 @@
margin:0px;
text-align:left;
table-layout:fixed;
+ overflow:hidden;
}
td.prgname {
margin: 0 2px;
@@ -189,7 +190,7 @@
<td class="col_other">
<%! What's on: !%>&nbsp;
<select name="Auswahl" class="submit" onChange="Go(this.form.Auswahl.options[this.form.Auswahl.options.selectedIndex].value)" width="100">
- <option value="<?% nowurl %?>"></option>
+ <option value="<?% nowurl %?>">-</option>
<?% select_now = (now == date.format(date.now, '%H:%M')) %?>
<option value="<?% nowurl %?>" <?% "selected" IF select_now %?>><%! now !%></option>
<?% FOREACH timer = times %?>
@@ -209,6 +210,13 @@
var tl = new TimeLine(<?% now_sec %?>, "<?% nowurl %?>", <?% px_per_min %?>, <?% end_min %?>);
BuildContent();
</script>
+ <noscript>
+ <p>
+ <center>
+ <h1><%! You need JavaScript to use the timeline! !%></h1>
+ </center>
+ </p>
+ </noscript>
</form>
</body>
</html>
diff --git a/template/default/style.css b/template/default/style.css
index 79c2d64..301e377 100644
--- a/template/default/style.css
+++ b/template/default/style.css
@@ -478,24 +478,27 @@ body.help .heading {
top: 32px;
left: 3px;
}
+#prog_timeline .timertable,
#prog_timeline .prgtable {
- border-color: #c4cdd7;
-}
-#prog_timeline .timertable {
- background: red;
- border-color: #ffcdd7;
+ border-color: #6d96a9;
}
#prog_timeline #timeline {
background: red;
}
#prog_timeline .color_current {
- background-color: #e6ffe9;
+/*TODO xbackground-color: #e6ffe9;*/
+ background-color: #b4e29c;
+}
+#prog_timeline .color_summary {
+ background-color: #dee6ee;
}
#prog_timeline .color_broadcast {
- background-color: #f7fffa;
+/*TODO background-color: #f7fffa;*/
+ background-color: #ffffff;
}
#prog_timeline .color_timer {
- background-color: #ffeee9;
+/*TODO xbackground-color: #ffeee9;*/
+ background-color: #ffb2b4;
}
#prog_timeline .color_spacer {
background-color: #e0e0e0;
diff --git a/template/default/timeline.js b/template/default/timeline.js
index a4a7750..7dd5a53 100644
--- a/template/default/timeline.js
+++ b/template/default/timeline.js
@@ -78,17 +78,15 @@ function TimeLine(_req_sec, _now_url, _px_per_min, _end_min)
{
this.table_w = this.innerWidth - 8;
}
-// this.px_per_min = _px_per_min;
-
- this.table_w10 = Div(this.table_w, 10);
- my_min = this.table_w10 < 100 ? 100 : this.table_w10;
- this.px_per_min = Div((this.table_w - my_min), _end_min);
+ //this.table_w -= tab.offsetLeft;
+ this.px_per_min = _px_per_min;
-// this.end_min = Div(this.table_w - this.name_w, this.px_per_min);
-// if (this.end_min > _end_min)
-// {
+ this.end_min = Div(this.table_w - this.name_w, this.px_per_min);
+ if (this.end_min > _end_min)
+ {
+ this.px_per_min = Div(this.table_w - this.name_w, _end_min);
this.end_min = _end_min;
-// }
+ }
this.end_min -= this.end_min % 30;
this.event_w = this.end_min * this.px_per_min;
this.name_w = this.table_w - this.event_w;
@@ -132,7 +130,7 @@ function BuildHeader()
+ '&nbsp;' + trans.to + '&nbsp;'
+ format_date('%H:%M', tl.end_sec) + '&nbsp;' + trans.o_clock);
W('</h2>');
- W('<br/>');
+ W('<br />');
W('</td>');
W('<td id="header_navi" class="col_navi">');
if (tl.start_sec < tl.first_sec + 1800)
@@ -190,7 +188,7 @@ function BuildTimeScale()
var w = tl.px_per_min * (tl.end_min - min < 30) ? tl.end_min - min : 30;
var t = tl.start_sec + min * 60;
W('<td colspan="6" class="' + c + '">');
- W('<img src="bilder/spacer.gif" width="' + w + '" height="1" border="0" /><br/>');
+ W('<img src="bilder/spacer.gif" width="' + w + '" height="1" border="0" /><br />');
W('<span class="date_time">' + format_date('%H:%M', t) + '</span>');
W('</td>');
}
@@ -202,7 +200,7 @@ function BuildTimeScale()
var c = min % 10 ? 'color1' : 'color2';
var w = tl.px_per_min * 5;
W('<td width="' + tl.px_per_min + '" height="' + tl.min5_h + '" class="' + c + '">');
- W('<img src="bilder/spacer.gif" width="' + w + '" height="1" border="0" /><br/>');
+ W('<img src="bilder/spacer.gif" width="' + w + '" height="1" border="0" /><br />');
W('</td>');
}
W('</tr>');
@@ -225,7 +223,7 @@ function BuildChannel(channel, td_class)
W('<tr>');
/* Channel name */
W('<td width="' + tl.name_w + '" class="' + td_class + '">');
- W('<img src="bilder/spacer.gif" width="' + tl.name_w + '" height="1" border="0"/><br/>');
+ W('<img src="bilder/spacer.gif" width="' + tl.name_w + '" height="1" border="0"/><br />');
W('<nobr>');
W('<a href="' + channel.url + '" class="channel_name">');
W(channel.name);
@@ -271,7 +269,11 @@ function BuildChannel(channel, td_class)
{
td_class = "color_current";
}
- else
+ else if (event.summary)
+ {
+ td_class = "color_summary";
+ }
+ else
{
td_class = "color_broadcast";
}
@@ -286,6 +288,10 @@ function BuildChannel(channel, td_class)
BuildEvent(channel.vdr_id, i, event, td_class, px_w);
old_stop_min = stop_min;
}
+ if (old_stop_min < tl.end_min)
+ {
+ BuildSpacer((tl.end_min - old_stop_min) * tl.px_per_min);
+ }
W('</nobr>');
W('</td>');
W('</tr>');
@@ -296,9 +302,9 @@ function BuildSpacer(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('<img src="bilder/spacer.gif" width="1" height="1" border="0"/><br />');
W('<nobr>');
- W('<img src="bilder/spacer.gif" width="1" height="8" border="0"/>');
+ W('<img src="bilder/spacer.gif" width="1" height="8" border="0"/>&nbsp;');
W('</nobr>');
W('</td>');
W('</tr>');
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-21 02:35:28 +0000