diff options
| author | Andreas Mair <amair.sob@googlemail.com> | 2006-05-24 14:00:09 +0200 |
|---|---|---|
| committer | Andreas Mair <amair.sob@googlemail.com> | 2006-05-24 14:00:09 +0200 |
| commit | 9e8fe7b8ec42e928db062413ee824b7b4ec13132 (patch) | |
| tree | 661dd0a6ea202dab5d13ce710fcb98bb25626374 /template/default | |
| parent | b8893f9631d2ea760848ba6c56c22d45f8413591 (diff) | |
| download | vdradmin-am-3.4.6beta2.tar.gz vdradmin-am-3.4.6beta2.tar.bz2 | |
2006-05-24: 3.4.6beta2v3.4.6beta2
- Added: VPS time, audio and video tracks to prog_detail if available.
- Added: class names for action icons (info, record...) for hiding single items (not yet finished).
- Added: ids for navigation items, see user.css_example for hiding single items.
- Changed: Icons for stream and switch TV.
- Replaced: "default" skin by "default.png" skin.
- Added: Link from pattern title in AutoTimer list to AutoTimer edit (Requested by Tarandor).
- Reworked: prog_timeline; still needs some beautification (Based on patch submitted by Torsten Herz).
- Fixed: IMDb link in prog_summary listview (Reported by heiwil).
- Fixed: detection of valid Locale::gettext calls.
Diffstat (limited to 'template/default')
112 files changed, 284 insertions, 286 deletions
diff --git a/template/default/about.html b/template/default/about.html index efd1de8..f83e479 100644 --- a/template/default/about.html +++ b/template/default/about.html @@ -74,7 +74,7 @@ <tr class="row_even"> <td class="col_left"></td> <td class="col_label"><h5><%! French: !%></h5></td> - <td class="col_value"><!-- <%! At the moment unmaintained, former translations by: !%> -->Trois Six, Pierre ERRAUD, map, lobotomise, bads</td> + <td class="col_value"><!-- <%! At the moment unmaintained, former translations by: !%> -->Trois Six (also at vdrportal.de), map, lobotomise, bads, Mickaël Nival</td> <td class="col_right"></td> </tr> <tr class="row_even"> @@ -147,7 +147,7 @@ <td class="col_left"></td> <td> <ul> - <li><%! If you need help please first try to use the online help you'll find on some pages. You can access it by clicking <img src="bilder/help.gif"/>. !%></li> + <li><%! If you need help please first try to use the online help you'll find on some pages. You can access it by clicking <img src="bilder/help.png"/>. !%></li> <li><%! If this doesn't provide the information you need you can try to get help at <a href="http://www.vdrportal.de" target="_blank">VDR-Portal</a> if you understand German language. Please use the announcement thread if possible, search for: !%> "[ANNOUNCE] VDRAdmin-AM-<tmpl_var myversion>"</li> <li><%! If you think you have found a bug please check that it's a new one and report it in the <a href="http://www.vdr-developer.org/mantisbt/main_page.php" target="_blank">VDRAdmin-AM BugTracking system</a>. !%></li> </td> diff --git a/template/default/at_timer_list.html b/template/default/at_timer_list.html index be356ae..4d12316 100644 --- a/template/default/at_timer_list.html +++ b/template/default/at_timer_list.html @@ -41,7 +41,7 @@ </td> <tmpl_if name="help_url"> <td class="col_help"> - <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.gif" border="0" alt="help" title="<%! Help !%>"/></a> + <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.png" border="0" alt="help" title="<%! Help !%>"/></a> </td> </tmpl_if> <td class="col_right"></td> @@ -130,9 +130,9 @@ <td class="col_active <tmpl_if sortbyactive>selected</tmpl_if>"> <div> <tmpl_if active> - <a href="<tmpl_var toggleurl>"><img src="bilder/poempl_gruen.gif" alt="" align="middle" border="0"/> <%! Yes !%></a> + <a href="<tmpl_var toggleurl>"><img src="bilder/poempl_gruen.png" alt="" align="middle" border="0"/> <%! Yes !%></a> <tmpl_else> - <a href="<tmpl_var toggleurl>"><img src="bilder/poempl_grau.gif" alt="" align="middle" border="0"/> <%! No !%></a> + <a href="<tmpl_var toggleurl>"><img src="bilder/poempl_grau.png" alt="" align="middle" border="0"/> <%! No !%></a> </tmpl_if> </div> </td> @@ -153,17 +153,17 @@ </td> <td class="col_name <tmpl_if sortbypattern>selected</tmpl_if>" <?% IF config.AT_TOOLTIP %?>onMouseOver="tip('VDR-<tmpl_var id>'); return true;" onMouseOut="untip(); return true;"<?% END %?>> <div> - <tmpl_var pattern> + <a href="<tmpl_var modurl>" title="<%! Edit !%>"><tmpl_var pattern></a> </div> </td> <td class="col_edit"> <div> - <a href="<tmpl_var modurl>"><img src="bilder/edit.gif" alt="edit" border="0" title="<%! Edit !%>"/></a> + <a href="<tmpl_var modurl>"><img src="bilder/edit.png" alt="edit" border="0" title="<%! Edit !%>"/></a> </div> </td> <td class="col_delete"> <div> - <a href="javascript:del('<%! Delete timer? !%>\n\n"<tmpl_var pattern_js>"', '<tmpl_var delurl>');"><img src="bilder/delete.gif" alt="delete" border="0" title="<%! Delete !%>"/></a> + <a href="javascript:del('<%! Delete timer? !%>\n\n"<tmpl_var pattern_js>"', '<tmpl_var delurl>');"><img src="bilder/delete.png" alt="delete" border="0" title="<%! Delete !%>"/></a> </div> </td> <td class="col_checkbox"> diff --git a/template/default/at_timer_new.html b/template/default/at_timer_new.html index 4b6ec1c..2a3d88f 100644 --- a/template/default/at_timer_new.html +++ b/template/default/at_timer_new.html @@ -21,7 +21,7 @@ </td> <tmpl_if name="help_url"> <td class="col_help"> - <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.gif" border="0" alt="help" title="<%! Help !%>"/></a> + <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.png" border="0" alt="help" title="<%! Help !%>"/></a> </td> </tmpl_if> <td class="col_right"></td> diff --git a/template/default/config.html b/template/default/config.html index f6515da..1256609 100644 --- a/template/default/config.html +++ b/template/default/config.html @@ -30,7 +30,7 @@ </td> <tmpl_if name="help_url"> <td class="col_help"> - <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.gif" border="0" alt="help" title="<%! Help !%>" /></a> + <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.png" border="0" alt="help" title="<%! Help !%>" /></a> </td> </tmpl_if> <td class="col_right"></td> diff --git a/template/default/default.png/aktion.gif b/template/default/default.png/aktion.gif Binary files differdeleted file mode 100644 index 8e33bce..0000000 --- a/template/default/default.png/aktion.gif +++ /dev/null diff --git a/template/default/default.png/favicon.ico b/template/default/default.png/favicon.ico deleted file mode 120000 index 590c73f..0000000 --- a/template/default/default.png/favicon.ico +++ /dev/null @@ -1 +0,0 @@ -../default/favicon.ico
\ No newline at end of file diff --git a/template/default/default.png/fern_03.jpg b/template/default/default.png/fern_03.jpg deleted file mode 120000 index a73b886..0000000 --- a/template/default/default.png/fern_03.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_03.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_05.jpg b/template/default/default.png/fern_05.jpg deleted file mode 120000 index 81cd633..0000000 --- a/template/default/default.png/fern_05.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_05.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_06.jpg b/template/default/default.png/fern_06.jpg deleted file mode 120000 index 891a880..0000000 --- a/template/default/default.png/fern_06.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_06.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_07.jpg b/template/default/default.png/fern_07.jpg deleted file mode 120000 index d10abe2..0000000 --- a/template/default/default.png/fern_07.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_07.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_08.jpg b/template/default/default.png/fern_08.jpg deleted file mode 120000 index 37bc79e..0000000 --- a/template/default/default.png/fern_08.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_08.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_09.jpg b/template/default/default.png/fern_09.jpg deleted file mode 120000 index 94ef462..0000000 --- a/template/default/default.png/fern_09.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_09.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_10.jpg b/template/default/default.png/fern_10.jpg deleted file mode 120000 index 52a5791..0000000 --- a/template/default/default.png/fern_10.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_10.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_11.jpg b/template/default/default.png/fern_11.jpg deleted file mode 120000 index ffacfc2..0000000 --- a/template/default/default.png/fern_11.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_11.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_12.jpg b/template/default/default.png/fern_12.jpg deleted file mode 120000 index 1d2a1e4..0000000 --- a/template/default/default.png/fern_12.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_12.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_13.jpg b/template/default/default.png/fern_13.jpg deleted file mode 120000 index 4bb4d24..0000000 --- a/template/default/default.png/fern_13.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_13.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_15.jpg b/template/default/default.png/fern_15.jpg deleted file mode 120000 index 2e16151..0000000 --- a/template/default/default.png/fern_15.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_15.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_18.jpg b/template/default/default.png/fern_18.jpg deleted file mode 120000 index 260762b..0000000 --- a/template/default/default.png/fern_18.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_18.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_19.jpg b/template/default/default.png/fern_19.jpg deleted file mode 120000 index 71d0e26..0000000 --- a/template/default/default.png/fern_19.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_19.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_22.jpg b/template/default/default.png/fern_22.jpg deleted file mode 120000 index d6d7bbf..0000000 --- a/template/default/default.png/fern_22.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_22.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_23.jpg b/template/default/default.png/fern_23.jpg deleted file mode 120000 index 748d9e2..0000000 --- a/template/default/default.png/fern_23.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_23.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_24.jpg b/template/default/default.png/fern_24.jpg deleted file mode 120000 index 235b4fe..0000000 --- a/template/default/default.png/fern_24.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_24.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_25.jpg b/template/default/default.png/fern_25.jpg deleted file mode 120000 index aef9084..0000000 --- a/template/default/default.png/fern_25.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_25.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_28.jpg b/template/default/default.png/fern_28.jpg deleted file mode 120000 index aa724fc..0000000 --- a/template/default/default.png/fern_28.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_28.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_31.jpg b/template/default/default.png/fern_31.jpg deleted file mode 120000 index 6c00cbd..0000000 --- a/template/default/default.png/fern_31.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_31.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_32.jpg b/template/default/default.png/fern_32.jpg deleted file mode 120000 index 419397e..0000000 --- a/template/default/default.png/fern_32.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_32.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_33.jpg b/template/default/default.png/fern_33.jpg deleted file mode 120000 index 84a2837..0000000 --- a/template/default/default.png/fern_33.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_33.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_36.jpg b/template/default/default.png/fern_36.jpg deleted file mode 120000 index 41f3b14..0000000 --- a/template/default/default.png/fern_36.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_36.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_39.jpg b/template/default/default.png/fern_39.jpg deleted file mode 120000 index 29d7fcf..0000000 --- a/template/default/default.png/fern_39.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_39.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_40.jpg b/template/default/default.png/fern_40.jpg deleted file mode 120000 index 6fcfcdf..0000000 --- a/template/default/default.png/fern_40.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_40.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_back.jpg b/template/default/default.png/fern_back.jpg deleted file mode 120000 index da989c7..0000000 --- a/template/default/default.png/fern_back.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_back.jpg
\ No newline at end of file diff --git a/template/default/default.png/fern_mute.jpg b/template/default/default.png/fern_mute.jpg deleted file mode 120000 index ba82e75..0000000 --- a/template/default/default.png/fern_mute.jpg +++ /dev/null @@ -1 +0,0 @@ -../default/fern_mute.jpg
\ No newline at end of file diff --git a/template/default/default.png/folder_video.gif b/template/default/default.png/folder_video.gif Binary files differdeleted file mode 100644 index 281fca7..0000000 --- a/template/default/default.png/folder_video.gif +++ /dev/null diff --git a/template/default/default.png/logo_linvdr.gif b/template/default/default.png/logo_linvdr.gif Binary files differdeleted file mode 100644 index 504265b..0000000 --- a/template/default/default.png/logo_linvdr.gif +++ /dev/null diff --git a/template/default/default.png/noise.gif b/template/default/default.png/noise.gif deleted file mode 120000 index bd128d4..0000000 --- a/template/default/default.png/noise.gif +++ /dev/null @@ -1 +0,0 @@ -../default/noise.gif
\ No newline at end of file diff --git a/template/default/default.png/poempl_gelb.gif b/template/default/default.png/poempl_gelb.gif Binary files differdeleted file mode 100644 index 84f5f20..0000000 --- a/template/default/default.png/poempl_gelb.gif +++ /dev/null diff --git a/template/default/default.png/sauerei.gif b/template/default/default.png/sauerei.gif deleted file mode 120000 index ed778bd..0000000 --- a/template/default/default.png/sauerei.gif +++ /dev/null @@ -1 +0,0 @@ -../default/sauerei.gif
\ No newline at end of file diff --git a/template/default/default.png/sortiert_asc.gif b/template/default/default.png/sortiert_asc.gif Binary files differdeleted file mode 100644 index 00e2b49..0000000 --- a/template/default/default.png/sortiert_asc.gif +++ /dev/null diff --git a/template/default/default.png/sortiert_desc.gif b/template/default/default.png/sortiert_desc.gif Binary files differdeleted file mode 100644 index 62fd5fa..0000000 --- a/template/default/default.png/sortiert_desc.gif +++ /dev/null diff --git a/template/default/default.png/spacer.gif b/template/default/default.png/spacer.gif deleted file mode 120000 index eded4af..0000000 --- a/template/default/default.png/spacer.gif +++ /dev/null @@ -1 +0,0 @@ -../default/spacer.gif
\ No newline at end of file diff --git a/template/default/default.png/style.css b/template/default/default.png/style.css deleted file mode 120000 index 2bc3133..0000000 --- a/template/default/default.png/style.css +++ /dev/null @@ -1 +0,0 @@ -../default/style.css
\ No newline at end of file diff --git a/template/default/default.png/sum_info.gif b/template/default/default.png/sum_info.gif deleted file mode 120000 index 1f6b354..0000000 --- a/template/default/default.png/sum_info.gif +++ /dev/null @@ -1 +0,0 @@ -info_button.gif
\ No newline at end of file diff --git a/template/default/default.png/sum_info_disabled.gif b/template/default/default.png/sum_info_disabled.gif deleted file mode 120000 index 79cb731..0000000 --- a/template/default/default.png/sum_info_disabled.gif +++ /dev/null @@ -1 +0,0 @@ -info_button_disabled.gif
\ No newline at end of file diff --git a/template/default/default.png/sum_rec.gif b/template/default/default.png/sum_rec.gif deleted file mode 120000 index 70db950..0000000 --- a/template/default/default.png/sum_rec.gif +++ /dev/null @@ -1 +0,0 @@ -rec_button.gif
\ No newline at end of file diff --git a/template/default/default.png/sum_view.gif b/template/default/default.png/sum_view.gif deleted file mode 120000 index c32d82c..0000000 --- a/template/default/default.png/sum_view.gif +++ /dev/null @@ -1 +0,0 @@ -view.gif
\ No newline at end of file diff --git a/template/default/default.png/tv_bottom.gif b/template/default/default.png/tv_bottom.gif deleted file mode 120000 index 455ffd7..0000000 --- a/template/default/default.png/tv_bottom.gif +++ /dev/null @@ -1 +0,0 @@ -../default/tv_bottom.gif
\ No newline at end of file diff --git a/template/default/default.png/view.gif b/template/default/default.png/view.gif Binary files differdeleted file mode 100644 index f403f7b..0000000 --- a/template/default/default.png/view.gif +++ /dev/null diff --git a/template/default/default/aktion.gif b/template/default/default/aktion.gif Binary files differdeleted file mode 100644 index 1c031f6..0000000 --- a/template/default/default/aktion.gif +++ /dev/null diff --git a/template/default/default/aktion.png b/template/default/default/aktion.png Binary files differnew file mode 100644 index 0000000..6c5f692 --- /dev/null +++ b/template/default/default/aktion.png diff --git a/template/default/default/close.gif b/template/default/default/close.gif Binary files differdeleted file mode 100644 index 31e02b1..0000000 --- a/template/default/default/close.gif +++ /dev/null diff --git a/template/default/default.png/close.gif b/template/default/default/close.png Binary files differindex 1144a38..1144a38 100644 --- a/template/default/default.png/close.gif +++ b/template/default/default/close.png diff --git a/template/default/default/delete.gif b/template/default/default/delete.gif Binary files differdeleted file mode 100644 index cd2a7a8..0000000 --- a/template/default/default/delete.gif +++ /dev/null diff --git a/template/default/default.png/delete.gif b/template/default/default/delete.png Binary files differindex a0f5483..a0f5483 100644 --- a/template/default/default.png/delete.gif +++ b/template/default/default/delete.png diff --git a/template/default/default/edit.gif b/template/default/default/edit.gif Binary files differdeleted file mode 100644 index 91d452c..0000000 --- a/template/default/default/edit.gif +++ /dev/null diff --git a/template/default/default.png/edit.gif b/template/default/default/edit.png Binary files differindex fc9884b..fc9884b 100644 --- a/template/default/default.png/edit.gif +++ b/template/default/default/edit.png diff --git a/template/default/default.png/sum_find.gif b/template/default/default/find.png Binary files differindex bee286a..bee286a 100644 --- a/template/default/default.png/sum_find.gif +++ b/template/default/default/find.png diff --git a/template/default/default/folder_video.gif b/template/default/default/folder_video.gif Binary files differdeleted file mode 100644 index 5122d4d..0000000 --- a/template/default/default/folder_video.gif +++ /dev/null diff --git a/template/default/default/folder_video.png b/template/default/default/folder_video.png Binary files differnew file mode 100644 index 0000000..5d159d7 --- /dev/null +++ b/template/default/default/folder_video.png diff --git a/template/default/default/help.gif b/template/default/default/help.gif Binary files differdeleted file mode 100644 index 8acd8f1..0000000 --- a/template/default/default/help.gif +++ /dev/null diff --git a/template/default/default.png/help.gif b/template/default/default/help.png Binary files differindex 4ed65a9..4ed65a9 100644 --- a/template/default/default.png/help.gif +++ b/template/default/default/help.png diff --git a/template/default/default/imdb.gif b/template/default/default/imdb.gif Binary files differdeleted file mode 100644 index 0dd8b28..0000000 --- a/template/default/default/imdb.gif +++ /dev/null diff --git a/template/default/default.png/imdb.gif b/template/default/default/imdb.png Binary files differindex 6983d44..6983d44 100644 --- a/template/default/default.png/imdb.gif +++ b/template/default/default/imdb.png diff --git a/template/default/default/info_button.gif b/template/default/default/info_button.gif Binary files differdeleted file mode 100644 index 9eebb26..0000000 --- a/template/default/default/info_button.gif +++ /dev/null diff --git a/template/default/default.png/info_button.gif b/template/default/default/info_button.png Binary files differindex 0d826bb..0d826bb 100644 --- a/template/default/default.png/info_button.gif +++ b/template/default/default/info_button.png diff --git a/template/default/default/info_button_disabled.gif b/template/default/default/info_button_disabled.gif Binary files differdeleted file mode 100644 index 36832f8..0000000 --- a/template/default/default/info_button_disabled.gif +++ /dev/null diff --git a/template/default/default.png/info_button_disabled.gif b/template/default/default/info_button_disabled.png Binary files differindex 8c6f0fd..8c6f0fd 100644 --- a/template/default/default.png/info_button_disabled.gif +++ b/template/default/default/info_button_disabled.png diff --git a/template/default/default/logo_other.gif b/template/default/default/logo_other.gif Binary files differdeleted file mode 100755 index 32f9216..0000000 --- a/template/default/default/logo_other.gif +++ /dev/null diff --git a/template/default/default.png/logo_other.gif b/template/default/default/logo_other.png Binary files differindex ff68769..ff68769 100755 --- a/template/default/default.png/logo_other.gif +++ b/template/default/default/logo_other.png diff --git a/template/default/default/pfeile_nachlinks.gif b/template/default/default/pfeile_nachlinks.gif Binary files differdeleted file mode 100644 index c6aad29..0000000 --- a/template/default/default/pfeile_nachlinks.gif +++ /dev/null diff --git a/template/default/default.png/pfeile_nachlinks.gif b/template/default/default/pfeile_nachlinks.png Binary files differindex f258c11..f258c11 100644 --- a/template/default/default.png/pfeile_nachlinks.gif +++ b/template/default/default/pfeile_nachlinks.png diff --git a/template/default/default/pfeile_nachlinks_soft.gif b/template/default/default/pfeile_nachlinks_soft.gif Binary files differdeleted file mode 100644 index cd9de2f..0000000 --- a/template/default/default/pfeile_nachlinks_soft.gif +++ /dev/null diff --git a/template/default/default.png/pfeile_nachlinks_soft.gif b/template/default/default/pfeile_nachlinks_soft.png Binary files differindex a70bfa8..a70bfa8 100644 --- a/template/default/default.png/pfeile_nachlinks_soft.gif +++ b/template/default/default/pfeile_nachlinks_soft.png diff --git a/template/default/default/pfeile_nachrechts.gif b/template/default/default/pfeile_nachrechts.gif Binary files differdeleted file mode 100644 index 1a99590..0000000 --- a/template/default/default/pfeile_nachrechts.gif +++ /dev/null diff --git a/template/default/default.png/pfeile_nachrechts.gif b/template/default/default/pfeile_nachrechts.png Binary files differindex c4e49ba..c4e49ba 100644 --- a/template/default/default.png/pfeile_nachrechts.gif +++ b/template/default/default/pfeile_nachrechts.png diff --git a/template/default/default/pfeile_nachrechts_soft.gif b/template/default/default/pfeile_nachrechts_soft.gif Binary files differdeleted file mode 100644 index d707fca..0000000 --- a/template/default/default/pfeile_nachrechts_soft.gif +++ /dev/null diff --git a/template/default/default.png/pfeile_nachrechts_soft.gif b/template/default/default/pfeile_nachrechts_soft.png Binary files differindex c5e1a89..c5e1a89 100644 --- a/template/default/default.png/pfeile_nachrechts_soft.gif +++ b/template/default/default/pfeile_nachrechts_soft.png diff --git a/template/default/default/poempl_gelb.gif b/template/default/default/poempl_gelb.gif Binary files differdeleted file mode 100644 index 72b30e5..0000000 --- a/template/default/default/poempl_gelb.gif +++ /dev/null diff --git a/template/default/default.png/poempl_gelb.png b/template/default/default/poempl_gelb.png Binary files differindex 4383006..4383006 100644 --- a/template/default/default.png/poempl_gelb.png +++ b/template/default/default/poempl_gelb.png diff --git a/template/default/default/poempl_grau.gif b/template/default/default/poempl_grau.gif Binary files differdeleted file mode 100644 index 78cf2b3..0000000 --- a/template/default/default/poempl_grau.gif +++ /dev/null diff --git a/template/default/default.png/poempl_grau.gif b/template/default/default/poempl_grau.png Binary files differindex 91af0d3..91af0d3 100644 --- a/template/default/default.png/poempl_grau.gif +++ b/template/default/default/poempl_grau.png diff --git a/template/default/default/poempl_gruen.gif b/template/default/default/poempl_gruen.gif Binary files differdeleted file mode 100644 index 1307e76..0000000 --- a/template/default/default/poempl_gruen.gif +++ /dev/null diff --git a/template/default/default.png/poempl_gruen.gif b/template/default/default/poempl_gruen.png Binary files differindex 1fbc164..1fbc164 100644 --- a/template/default/default.png/poempl_gruen.gif +++ b/template/default/default/poempl_gruen.png diff --git a/template/default/default/poempl_rot.gif b/template/default/default/poempl_rot.gif Binary files differdeleted file mode 100644 index 023b077..0000000 --- a/template/default/default/poempl_rot.gif +++ /dev/null diff --git a/template/default/default.png/poempl_rot.gif b/template/default/default/poempl_rot.png Binary files differindex 575b80d..575b80d 100644 --- a/template/default/default.png/poempl_rot.gif +++ b/template/default/default/poempl_rot.png diff --git a/template/default/default/rec_button.gif b/template/default/default/rec_button.gif Binary files differdeleted file mode 100644 index 0cf1dd0..0000000 --- a/template/default/default/rec_button.gif +++ /dev/null diff --git a/template/default/default.png/rec_button.gif b/template/default/default/rec_button.png Binary files differindex d9e1aca..d9e1aca 100644 --- a/template/default/default.png/rec_button.gif +++ b/template/default/default/rec_button.png diff --git a/template/default/default/separator.png b/template/default/default/separator.png Binary files differdeleted file mode 100644 index 1719049..0000000 --- a/template/default/default/separator.png +++ /dev/null diff --git a/template/default/default/stream.gif b/template/default/default/stream.gif Binary files differdeleted file mode 100644 index d038a79..0000000 --- a/template/default/default/stream.gif +++ /dev/null diff --git a/template/default/default/stream.png b/template/default/default/stream.png Binary files differnew file mode 100644 index 0000000..9de8a24 --- /dev/null +++ b/template/default/default/stream.png diff --git a/template/default/default/style.css b/template/default/default/style.css index 1014c32..6cfa02c 100644 --- a/template/default/default/style.css +++ b/template/default/default/style.css @@ -4,17 +4,18 @@ #rc, #tv { - background-color: black; margin: 0px; } body { background-color: #ffffff; margin: 3px; + padding: 0; } form { margin: 0px; + padding: 0; } td, @@ -41,10 +42,10 @@ select { font-weight: normal; font-size: 11px; } - +/* .submit { height: 20px; -} +}*/ h1 { margin-right: 5px; @@ -89,12 +90,9 @@ label { a, a:visited, -a:active { - color: black; - text-decoration: none; -} +a:active, a:hover { - color: gray; + color: black; text-decoration: none; } @@ -112,11 +110,6 @@ label + input { #rec_list .col_name { font-weight: bold; } -#prog_timeline a , -#prog_timeline a:visited, -#prog_timeline a:active { - color: blue; -} #error h2 { font-size: 11px; @@ -157,10 +150,6 @@ body.help .heading { margin-top: 0px; white-space: normal; } -.heading a:hover { - color: white; - text-decoration: none; -} .row_even td { background-color: #ffffff; @@ -201,27 +190,34 @@ body.help .heading { .col_navi { text-align: right; - background-color: #f6faff; + vertical-align: middle; white-space: nowrap; height: 17px; } -.col_navi img { - position: relative; - top: 2px; -} .list, .group { - margin-top: 0.6em; border: 1px solid #6d96a9; } .group td { padding: 2px; } +#prog_summary .action, +#prog_detail .action { + display: block; + margin: 5px 0 0 0; +} +.action { + margin: 0; + padding 0; + text-align: center; + width: 20px; +} + /* Summary */ #prog_summary .group { - margin: 3px 3px 0 0; + margin: 0 3px 3px 0; display: inline; float: left; } @@ -327,6 +323,7 @@ body.help .heading { margin-left: 2em; white-space: nowrap; } +#prog_detail .time_vps, #prog_detail .time_duration { margin-left: 2em; white-space: nowrap; @@ -374,12 +371,6 @@ body.help .heading { background-color: #f0faff; border-right: 1px solid #6d96a9; } -#prog_summary table.content td.col_buttons .item, -#prog_detail table.content td.col_buttons .item { - padding: 2px 0; - width: 20px; - text-align: center; -} #prog_list .heading td span, #prog_list .heading td { @@ -397,19 +388,12 @@ body.help .heading { white-space: nowrap; } -#content { - margin-top: 0.5em; -} - .col_duration { padding-left: 3px; padding-right: 3px; width: 100px; vertical-align: top; } -.col_duration a:hover { - color: black; -} .col_name, #content .col_title * { @@ -468,23 +452,26 @@ body.help .heading { width: 45px; } -#prog_timeline #prgtable { - border-left-color: #c4cdd7; - border-bottom-color: #c4cdd7; +#prog_timeline #content { + position: absolute; + top: 32px + 0.6em; + left: 3px; } -#prog_timeline #timertable { +#prog_timeline .prgtable { + border-color: #c4cdd7; +} +#prog_timeline .timertable { background: red; - border-left-color: #ffcdd7; - border-bottom-color: #ffcdd7; + border-color: #ffcdd7; } #prog_timeline #timeline { background: red; } #prog_timeline .color_current { - background-color: #f7fffa; + background-color: #e6eee9; } #prog_timeline .color_broadcast { - background-color: #e6eee9; + background-color: #f7fffa; } #prog_timeline .color_timer { background-color: #ffeee9; @@ -500,6 +487,9 @@ body.help .heading { white-space: normal; } +#timer_list .list { + margin-top: 0.6em; +} #timer_list .blackline { background-color: black; } @@ -534,10 +524,7 @@ body.help .heading { } #content { - margin-top: 1em; -} -.group { - margin-top: 0.5em; + margin-top: 0.6em; } #buttons { border: 1px solid #6d96a9; @@ -680,7 +667,7 @@ body.help .heading { /* Navigation */ #navigation { - margin: 0px; + margin: 0px 3px; } #navigation .nav_bar { border: 1px solid #6d96a9; @@ -705,13 +692,10 @@ body.help .heading { font-size: 12px; text-align: center; } -#navigation .separator { - display: none; -} #navigation a, #navigation a:visited, #navigation a:active { - color: #436976; + color: #6d96a9; font-weight: bold; text-decoration: none; border: 0px; diff --git a/template/default/default/sum_find.gif b/template/default/default/sum_find.gif Binary files differdeleted file mode 100644 index ff09179..0000000 --- a/template/default/default/sum_find.gif +++ /dev/null diff --git a/template/default/default/sum_find.png b/template/default/default/sum_find.png Binary files differnew file mode 100644 index 0000000..bee286a --- /dev/null +++ b/template/default/default/sum_find.png diff --git a/template/default/default/sum_info.gif b/template/default/default/sum_info.gif Binary files differdeleted file mode 100644 index b940f0e..0000000 --- a/template/default/default/sum_info.gif +++ /dev/null diff --git a/template/default/default/sum_info_disabled.gif b/template/default/default/sum_info_disabled.gif Binary files differdeleted file mode 100644 index 6ffdade..0000000 --- a/template/default/default/sum_info_disabled.gif +++ /dev/null diff --git a/template/default/default/sum_rec.gif b/template/default/default/sum_rec.gif Binary files differdeleted file mode 100644 index 0a01b08..0000000 --- a/template/default/default/sum_rec.gif +++ /dev/null diff --git a/template/default/default/sum_view.gif b/template/default/default/sum_view.gif Binary files differdeleted file mode 100644 index 5dbe443..0000000 --- a/template/default/default/sum_view.gif +++ /dev/null diff --git a/template/default/default/view.gif b/template/default/default/view.gif Binary files differdeleted file mode 100644 index 3434aa4..0000000 --- a/template/default/default/view.gif +++ /dev/null diff --git a/template/default/default.png/stream.gif b/template/default/default/view.png Binary files differindex 889003d..889003d 100644 --- a/template/default/default.png/stream.gif +++ b/template/default/default/view.png diff --git a/template/default/help_at_timer_list.html b/template/default/help_at_timer_list.html index a628a58..a321981 100644 --- a/template/default/help_at_timer_list.html +++ b/template/default/help_at_timer_list.html @@ -39,14 +39,14 @@ <dt>Quickly view its priority and lifetime</dt> <dd>By pointing the mouse cursor to the AutoTimer's title.</dd> <dt>Edit the AutoTimer</dt> - <dd>You can edit an AutoTimer by clicking <img src="bilder/edit.gif" alt="edit" />.</dd> + <dd>You can edit an AutoTimer by clicking <img src="bilder/edit.png" alt="edit" />.</dd> <dt>Delete the AutoTimer</dt> - <dd>To delete an AutoTimer you click <img src="bilder/delete.gif" alt="delete" />.</dd> + <dd>To delete an AutoTimer you click <img src="bilder/delete.png" alt="delete" />.</dd> </dl> </p> <p>Each AutoTimer's state is indicated by differently coloured images:<br /> - <img src="bilder/poempl_gruen.gif" alt="on" align="middle" /> AutoTimer is OK and will automatically program matching broadcasts.<br /> - <img src="bilder/poempl_grau.gif" alt="inactive" align="middle" /> AutoTimer is not active. + <img src="bilder/poempl_gruen.png" alt="on" align="middle" /> AutoTimer is OK and will automatically program matching broadcasts.<br /> + <img src="bilder/poempl_grau.png" alt="inactive" align="middle" /> AutoTimer is not active. </p> <p>In addition to these functions you can add a new AutoTimer by clicking <input type="submit" class="submit" value="New AutoTimer"/> at the top and you can delete a number of AutoTimers at once by checking the box in the last column of those timers and clicking <input type="submit" class="submit" value="Delete Selected AutoTimers"/>.</p> <p>Click <input type="submit" class="submit" value="Force Update"/> to force VDRAdmin-AM to reconnect to VDR, fetch the current EPG and check for matching AutoTimers.</p> !%> diff --git a/template/default/help_rec_list.html b/template/default/help_rec_list.html index 4a72d94..31984db 100644 --- a/template/default/help_rec_list.html +++ b/template/default/help_rec_list.html @@ -36,11 +36,11 @@ <dd>The time when the recording has been done. In case of folders this will show the number of <strong>new</strong> recordings the folder contains.</dd> <dt>Name</dt> <dd>The recording's or folder's name. Click it to show the recording's summary or descend into the folder.</dd> - <dt>Rename (<img src="bilder/edit.gif" alt="edit" />)</dt> + <dt>Rename (<img src="bilder/edit.png" alt="edit" />)</dt> <dd>Rename a recording.<br /><h4>Note:</h4>This only works if VDR has the <u>RENR</u> SVDRPort command which is no core VDR feature but is available through a patch. <span class="ref_file">vdr-aio21_svdrprename.patch</span> or <span class="ref_file">enAIO-v2.2+</span> provide this command.</dd> - <dt>Delete (<img src="bilder/delete.gif" alt="delete" />)</dt> + <dt>Delete (<img src="bilder/delete.png" alt="delete" />)</dt> <dd>Delete a recording.</dd> - <dt>Stream (<img src="bilder/stream.gif" alt="stream" />)</dt> + <dt>Stream (<img src="bilder/stream.png" alt="stream" />)</dt> <dd>This column is only shown if you activated and configured <span class="ref_label">Recordings Streaming</span> in the <span class="ref_menu">Configuration</span> menu. You can watch the recording at your workstation.</dd> </dl> </p> diff --git a/template/default/help_timer_list.html b/template/default/help_timer_list.html index f606040..7ddf15f 100644 --- a/template/default/help_timer_list.html +++ b/template/default/help_timer_list.html @@ -42,16 +42,16 @@ <dt>View its EPG entry</dt> <dd>Timers that have set <span class="ref_label">AutoTimer Checking</span> to "Transmission Identification" will show you the corresponding EPG entry if you click on the timer's title.</dd> <dt>Edit the timer</dt> - <dd>You can edit a timer by clicking <img src="bilder/edit.gif" alt="edit" />.</dd> + <dd>You can edit a timer by clicking <img src="bilder/edit.png" alt="edit" />.</dd> <dt>Delete the timer</dt> - <dd>To delete a timer you click <img src="bilder/delete.gif" alt="delete" />.</dd> + <dd>To delete a timer you click <img src="bilder/delete.png" alt="delete" />.</dd> </dl> </p> <p>Each timer's state is indicated by differently coloured boxes (in the chart view) or images (in the list view):<br /> - <span class="color_ok"> </span> / <img src="bilder/poempl_gruen.gif" alt="on" align="middle" /> Timer is OK and will record.<br /> - <span class="color_collision"> </span> / <img src="bilder/poempl_gelb.gif" alt="problem" align="middle" /> Timer conflicts with other timers. That's not critical, as long as you have enough DVB cards for the parallel recordings.<br /> - <span class="color_conflict"> </span> / <img src="bilder/poempl_rot.gif" alt="impossible" align="middle" /> Timer is critical and will most likely <strong>not</strong> record.<br /> - <span class="color_inactive"> </span> / <img src="bilder/poempl_grau.gif" alt="inactive" align="middle" /> Timer is not active. + <span class="color_ok"> </span> / <img src="bilder/poempl_gruen.png" alt="on" align="middle" /> Timer is OK and will record.<br /> + <span class="color_collision"> </span> / <img src="bilder/poempl_gelb.png" alt="problem" align="middle" /> Timer conflicts with other timers. That's not critical, as long as you have enough DVB cards for the parallel recordings.<br /> + <span class="color_conflict"> </span> / <img src="bilder/poempl_rot.png" alt="impossible" align="middle" /> Timer is critical and will most likely <strong>not</strong> record.<br /> + <span class="color_inactive"> </span> / <img src="bilder/poempl_grau.png" alt="inactive" align="middle" /> Timer is not active. </p> <p>In addition to these functions you can add a new timer by clicking <input type="submit" class="submit" value="New Timer"/> at the top and you can delete a number of timers at once by checking the box in the last column of those timers and clicking <input type="submit" class="submit" value="Delete Selected Timers"/>.</p> <p>You can <input type="submit" class="submit" value="activate"/> and <input type="submit" class="submit" value="inactivate"/> selected timers.</p> !%> diff --git a/template/default/navigation.html b/template/default/navigation.html index 7946c54..277e237 100644 --- a/template/default/navigation.html +++ b/template/default/navigation.html @@ -22,59 +22,46 @@ <body id="navigation"> <div class="logo"> - <a href="./" target="_top"><tmpl_if linvdr><img src="bilder/logo_linvdr.gif" alt="" height="50px" width="150px" border="0" /><tmpl_else><img src="bilder/logo_other.gif" alt="" height="50" width="150" border="0" /></tmpl_if></a> + <a href="./" target="_top"><tmpl_if linvdr><img src="bilder/logo_linvdr.gif" alt="" height="50px" width="150px" border="0" /><tmpl_else><img src="bilder/logo_other.png" alt="" height="50" width="150" border="0" /></tmpl_if></a> </div> <div class="nav_bar"> - <div class="separator"></div> - <div class="navi"> + <div class="navi" id="prog_summary"> <a href="vdradmin.pl?aktion=prog_summary" target="main"><%! What's On Now? !%></a> </div> - <div class="separator"></div> - <div class="navi"> + <div class="navi" id="prog_list2"> <a href="vdradmin.pl?aktion=prog_list2" target="main"><%! Playing Today !%></a> </div> - <div class="separator"></div> - <div class="navi"> + <div class="navi" id="prog_timeline"> <a href="vdradmin.pl?aktion=prog_timeline" target="main"><%! Timeline !%></a> </div> - <div class="separator"></div> - <div class="navi"> + <div class="navi" id="prog_list"> <a href="vdradmin.pl?aktion=prog_list" target="main"><%! Channels !%></a> </div> - <div class="separator"></div> - <div class="navi"> + <div class="navi" id="timer_list"> <a href="vdradmin.pl?aktion=timer_list" target="main"><%! Timer !%></a> </div> - <div class="separator"></div> - <div class="navi"> + <div class="navi" id="at_timer_list"> <a href="vdradmin.pl?aktion=at_timer_list" target="main"><%! AutoTimer !%></a> </div> - <div class="separator"></div> - <div class="navi"> + <div class="navi" id="rec_list"> <a href="vdradmin.pl?aktion=rec_list" target="main"><%! Recordings !%></a> </div> - <div class="separator"></div> - <div class="navi"> + <div class="navi" id="rc"> <a href="javascript:rc_open();"><%! Remote Control !%></a> </div> - <div class="separator"></div> - <div class="navi"> + <div class="navi" id="tv"> <a href="vdradmin.pl?aktion=tv_show" target="main"><%! Watch TV !%></a> </div> - <div class="separator"></div> - <div class="navi"> + <div class="navi" id="commands"> <a href="vdradmin.pl?aktion=vdr_cmds" target="main"><%! VDR Commands !%></a> </div> - <div class="separator"></div> - <div class="navi"> + <div class="navi" id="config"> <a href="vdradmin.pl?aktion=config" target="main"><%! Configuration !%></a> </div> - <div class="separator"></div> - <div class="navi"> + <div class="navi" id="about"> <a href="vdradmin.pl?aktion=about" target="main"><%! About !%> / <%! Help !%></a> </div> - <div class="separator"></div> <form action="vdradmin.pl" method="get" name="FormName" target="main" class="search"> <input type="text" name="search" /><br /> <input type="submit" name="submit" value="<%! Search !%>" /> diff --git a/template/default/prog_detail.html b/template/default/prog_detail.html index 7262fb9..d5fc830 100644 --- a/template/default/prog_detail.html +++ b/template/default/prog_detail.html @@ -16,7 +16,7 @@ <tr class="heading"> <td class="col_left"></td> <td class="col_content"> - <span class="channel_name"><tmpl_var channel_name></span><tmpl_if date><span class="date_long"><tmpl_var date></span><span class="time_duration"><span class="time_start"><tmpl_var start></span> - <span class="time_stop"><tmpl_var stop></span></span></tmpl_if> + <span class="channel_name"><tmpl_var channel_name></span><tmpl_if date><span class="date_long"><tmpl_var date></span><span class="time_duration"><span class="time_start"><tmpl_var start></span> - <span class="time_stop"><tmpl_var stop></span></span><tmpl_if vps><span class="time_vps"><%! VPS !%> <tmpl_var vps></span></tmpl_if></tmpl_if> </td> <td class="col_right"></td> </tr> @@ -31,18 +31,28 @@ <table border="0" cellspacing="0" cellpadding="0" class="content"> <tr> <td class="col_buttons"> - <span class="item"><a href="javascript:window.close()"><img src="bilder/close.gif" border="0" alt="<%! close !%>" onmouseover="window.status='<%! close !%>';return true" title="<%! close !%>" /></a></span> + <span class="action close"> + <a href="javascript:window.close()"><img src="bilder/close.png" border="0" alt="<%! close !%>" onmouseover="window.status='<%! close !%>';return true" title="<%! close !%>" /></a> + </span> <tmpl_if date> <tmpl_if switchurl> - <span class="item"><a href="javascript:callurl('<tmpl_var switchurl>')"><img src="bilder/sum_view.gif" border="0" alt="<%! view !%>" onmouseover="window.status='<%! view !%>';return true" title="<%! view !%>" /></a></span> + <span class="action switch"> + <a href="javascript:callurl('<tmpl_var switchurl>')"><img src="bilder/view.png" border="0" alt="<%! view !%>" onmouseover="window.status='<%! view !%>';return true" title="<%! view !%>" /></a> + </span> </tmpl_if> <tmpl_if recurl> - <span class="item"><a href="javascript:window.close();opener.location.href='<tmpl_var recurl>'"><img src="bilder/sum_rec.gif" border="0" alt="<%! record !%>" onmouseover="window.status='<%! record !%>';return true" title="<%! record !%>" /></a></span> + <span class="action record"> + <a href="javascript:window.close();opener.location.href='<tmpl_var recurl>'"><img src="bilder/rec_button.png" border="0" alt="<%! record !%>" onmouseover="window.status='<%! record !%>';return true" title="<%! record !%>" /></a> + </span> </tmpl_if> - <span class="item"><a href="vdradmin.pl?search=<tmpl_var find_title>&aktion=prog_summary&submit=go11" target="main"><img src="bilder/sum_find.gif" border="0" alt="<%! search !%>" onmouseover="window.status='<%! search !%>';return true" title="<%! search !%>" /></a></span> + <span class="action repeatings"> + <a href="vdradmin.pl?search=<tmpl_var find_title>&aktion=prog_summary&submit=go11" target="main"><img src="bilder/find.png" border="0" alt="<%! search !%>" onmouseover="window.status='<%! search !%>';return true" title="<%! search !%>" /></a> + </span> </tmpl_if> <tmpl_if imdburl> - <span class="item"><a href="<tmpl_var imdburl>" target="_blank" title="<%! Lookup movie in the Internet-Movie-Database (IMDb) !%>"><img src="bilder/imdb.gif" border="0" alt="IMDb" onmouseover="window.status='IMDb';return true" title="IMDb" /></a></span> + <span class="action imdb"> + <a href="<tmpl_var imdburl>" target="_blank" title="<%! 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> + </span> </tmpl_if> </td> <td class="col_epg"> @@ -63,7 +73,11 @@ <div class="epg_audio"> <h4><%! Audio tracks: !%></h4> <tmpl_loop audio> - <h5><%! Language: !%></h5> <tmpl_var lang> <h5><%! Description: !%></h5> <tmpl_var descr><br /> + <h5><%! Language: !%></h5> <tmpl_var lang> + <tmpl_if descr> + <h5><%! Description: !%></h5> <tmpl_var descr> + </tmpl_if> + <br /> </tmpl_loop> </div> </tmpl_if> diff --git a/template/default/prog_list.html b/template/default/prog_list.html index 9342782..beecd21 100644 --- a/template/default/prog_list.html +++ b/template/default/prog_list.html @@ -20,7 +20,7 @@ <h1> <a href="javascript:callurl('<tmpl_var switchurl>');" title="<%! TV select !%>"><tmpl_var progname></a> <tmpl_if stream_live_on> - <a href="<tmpl_var streamurl>" title="<%! Stream !%>"><img src="bilder/stream.gif" border="0" alt="<%! Stream !%>" onmouseover="window.status='<%! Stream !%>';return true" title="<%! Stream !%>" /></a> + <span class="action stream"><a href="<tmpl_var streamurl>" title="<%! Stream !%>"><img src="bilder/stream.png" border="0" alt="<%! Stream !%>" onmouseover="window.status='<%! Stream !%>';return true" title="<%! Stream !%>" /></a></span> </tmpl_if> </h1> </td> @@ -48,18 +48,7 @@ <span class="channel_name"><tmpl_var progname></span> <span class="date_long"><tmpl_var longdate></span> </td> - <td class="col_navi"> - <tmpl_if prev_channel> - <a href="<tmpl_var prev_channel>"><img src="bilder/pfeile_nachlinks.gif" border="0" /></a> - <tmpl_else> - <img src="bilder/pfeile_nachlinks_soft.gif" border="0" /> - </tmpl_if> - <tmpl_if next_channel> - <a href="<tmpl_var next_channel>"><img src="bilder/pfeile_nachrechts.gif" border="0" /></a> - <tmpl_else> - <img src="bilder/pfeile_nachrechts_soft.gif" border="0" /> - </tmpl_if> - </td> + <td class="col_navi"><tmpl_if prev_channel><a href="<tmpl_var prev_channel>"><img src="bilder/pfeile_nachlinks.png" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachlinks_soft.png" border="0" /></tmpl_if><tmpl_if next_channel><a href="<tmpl_var next_channel>"><img src="bilder/pfeile_nachrechts.png" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachrechts_soft.png" border="0" /></tmpl_if></td> <td class="col_right"></td> </tr> <tr class="row_spacer"> @@ -92,11 +81,11 @@ </td> <td class="col_buttons"> <tmpl_if infurl> - <a href="javascript:popup('<tmpl_var infurl>');" title="<%! More Information !%>"><img src="bilder/info_button.gif" border="0" alt="info" /></a> + <span class="action info"><a href="javascript:popup('<tmpl_var infurl>');" title="<%! More Information !%>"><img src="bilder/info_button.png" border="0" alt="info" /></a></span> <tmpl_else> - <img src="bilder/info_button_disabled.gif" border="0" alt="noinfo" title="<%! No Information !%>" /> + <span class="action info"><img src="bilder/info_button_disabled.png" border="0" alt="noinfo" title="<%! No Information !%>" /></span> </tmpl_if> - <a href="<tmpl_var recurl>"><img src="bilder/rec_button.gif" border="0" alt="record" title="<%! Record !%>" /></a> + <span class="action record"><a href="<tmpl_var recurl>"><img src="bilder/rec_button.png" border="0" alt="record" title="<%! Record !%>" /></a></span> </td> <td class="col_right"></td> </tr> diff --git a/template/default/prog_list2.html b/template/default/prog_list2.html index d454623..630eab1 100644 --- a/template/default/prog_list2.html +++ b/template/default/prog_list2.html @@ -31,22 +31,13 @@ <input type="text" size="5" maxlength="5" value="<tmpl_var now>" name="time"/> <%! o'clock !%> </td> - <td class="col_other"> - <tmpl_if prevdayurl> - <a href="<tmpl_var prevdayurl>"><img src="bilder/pfeile_nachlinks.gif" border="0" /></a> - <tmpl_else> - <img src="bilder/pfeile_nachlinks_soft.gif" border="0" /> - </tmpl_if> - <select name="days" size="1" onchange="window.open(this.options[this.selectedIndex].value,'main')"> -<tmpl_loop days> + <td class="col_navi"> + <tmpl_if prevdayurl><a href="<tmpl_var prevdayurl>"><img src="bilder/pfeile_nachlinks.png" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachlinks_soft.png" border="0" /></tmpl_if> + <select name="days" size="1" onchange="window.open(this.options[this.selectedIndex].value,'main')"> <tmpl_loop days> <option value="<tmpl_var id>" <tmpl_if sel>selected</tmpl_if>><tmpl_var name>.</option> </tmpl_loop> </select> - <tmpl_if nextdayurl> - <a href="<tmpl_var nextdayurl>"><img src="bilder/pfeile_nachrechts.gif" border="0" /></a> - <tmpl_else> - <img src="bilder/pfeile_nachrechts_soft.gif" border="0" /> - </tmpl_if> + <tmpl_if nextdayurl><a href="<tmpl_var nextdayurl>"><img src="bilder/pfeile_nachrechts.png" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachrechts_soft.png" border="0" /></tmpl_if> </td> <td class="col_right"></td> </tr> @@ -65,9 +56,9 @@ <span class="channel_name"><a href="<tmpl_var proglink>" title="<%! Channels !%>"><tmpl_var channel_name></a></span> <span class="date_long"><tmpl_var longdate></span> <tmpl_if stream_live_on> - <a href="<tmpl_var streamurl>" title="<%! Stream !%>"><img src="bilder/stream.gif" border="0" alt="<%! Stream !%>" onmouseover="window.status='<%! Stream !%>';return true" title="<%! Stream !%>" /></a> + <span class="action stream"><a href="<tmpl_var streamurl>" title="<%! Stream !%>"><img src="bilder/stream.png" border="0" alt="<%! Stream !%>" onmouseover="window.status='<%! Stream !%>';return true" title="<%! Stream !%>" /></a></span> </tmpl_if> - <a href="javascript:callurl('<tmpl_var switchurl>');" title="<%! TV select !%>"><img src="bilder/view.gif" border="0" alt="<%! TV select !%>" onmouseover="window.status='<%! TV select !%>';return true" title="<%! TV select !%>" /></a> + <span class="action switch"><a href="javascript:callurl('<tmpl_var switchurl>');" title="<%! TV select !%>"><img src="bilder/view.png" border="0" alt="<%! TV select !%>" onmouseover="window.status='<%! TV select !%>';return true" title="<%! TV select !%>" /></a></span> </td> <td class="col_right"></td> </tr> @@ -103,11 +94,11 @@ </td> <td class="col_buttons"> <tmpl_if infurl> - <a href="javascript:popup('<tmpl_var infurl>');"><img src="bilder/info_button.gif" border="0" title="<%! More Information !%>" alt="info"/></a> + <span class="action info"><a href="javascript:popup('<tmpl_var infurl>');"><img src="bilder/info_button.png" border="0" title="<%! More Information !%>" alt="info"/></a></span> <tmpl_else> - <img src="bilder/info_button_disabled.gif" border="0" title="<%! No Information !%>" alt="noinfo"/> + <span class="action info"><img src="bilder/info_button_disabled.png" border="0" title="<%! No Information !%>" alt="noinfo"/></span> </tmpl_if> - <a href="<tmpl_var recurl>"><img src="bilder/rec_button.gif" border="0" title="<%! Record !%>" alt="record"/></a> + <span class="action record"><a href="<tmpl_var recurl>"><img src="bilder/rec_button.png" border="0" title="<%! Record !%>" alt="record"/></a></span> </td> <td class="col_right"></td> </tr> diff --git a/template/default/prog_summary.html b/template/default/prog_summary.html index d9f899b..a7a300f 100644 --- a/template/default/prog_summary.html +++ b/template/default/prog_summary.html @@ -39,6 +39,7 @@ </table> <input type="hidden" name="aktion" value="prog_summary" /> + <div id="content"> <tmpl_loop rows> <tmpl_if longdate> <table border="0" cellspacing="0" cellpadding="0" class="group"> @@ -67,22 +68,34 @@ <tr> <td class="col_buttons"> <tmpl_if stream_live_on> - <span class="item"><a href="<tmpl_var streamurl>" title="<%! Stream !%>"><img src="bilder/stream.gif" border="0" alt="<%! Stream !%>" onmouseover="window.status='<%! Stream !%>';return true" title="<%! Stream !%>" /></a> + <span class="action stream"> + <a href="<tmpl_var streamurl>" title="<%! Stream !%>"><img src="bilder/stream.png" border="0" alt="<%! Stream !%>" onmouseover="window.status='<%! Stream !%>';return true" title="<%! Stream !%>" /></a> + </span> </tmpl_if> <tmpl_if recurl> <tmpl_if switchurl> - <span class="item"><a href="javascript:callurl('<tmpl_var switchurl>');"><img src="bilder/sum_view.gif" border="0" alt="<%! TV select !%>" onmouseover="window.status='<%! TV select !%>';return true" title="<%! TV select !%>" /></a></span> + <span class="action switch"> + <a href="javascript:callurl('<tmpl_var switchurl>');"><img src="bilder/view.png" border="0" alt="<%! TV select !%>" onmouseover="window.status='<%! TV select !%>';return true" title="<%! TV select !%>" /></a> + </span> </tmpl_if> - <span class="item"><a href="vdradmin.pl?search=<tmpl_var find_title>&aktion=prog_summary&submit=go11"><img src="bilder/sum_find.gif" border="0" alt="<%! Search for other show times !%>" onmouseover="window.status='<%! Search for other show times !%>';return true" title="<%! Search for other show times !%>" /></a></span> - <tmpl_if summary> - <span class="item"><a href="javascript:popup('<tmpl_var infurl>');"><img src="bilder/sum_info.gif" border="0" alt="<%! More Information !%>" onmouseover="window.status='<%! More Information !%>';return true" title="<%! More Information !%>" /></a></span> - <tmpl_else> - <span class="item"><img src="bilder/sum_info_disabled.gif" border="0" alt="noinfo" title="<%! No Information !%>" /></span> - </tmpl_if> - <span class="item"><a href="<tmpl_var recurl>"><img src="bilder/sum_rec.gif" border="0" alt="<%! Record !%>" onmouseover="window.status='<%! Record !%>';return true" title="<%! Record !%>" /></a></span> + <span class="action repeatings"> + <a href="vdradmin.pl?search=<tmpl_var find_title>&aktion=prog_summary&submit=go11"><img src="bilder/find.png" border="0" alt="<%! Search for other show times !%>" onmouseover="window.status='<%! Search for other show times !%>';return true" title="<%! Search for other show times !%>" /></a> + </span> + <span class="action info"> + <tmpl_if summary> + <a href="javascript:popup('<tmpl_var infurl>');"><img src="bilder/info_button.png" border="0" alt="<%! More Information !%>" onmouseover="window.status='<%! More Information !%>';return true" title="<%! More Information !%>" /></a> + <tmpl_else> + <img src="bilder/info_button_disabled.png" border="0" alt="noinfo" title="<%! No Information !%>" /> + </tmpl_if> + </span> + <span class="action record"> + <a href="<tmpl_var recurl>"><img src="bilder/rec_button.png" border="0" alt="<%! Record !%>" onmouseover="window.status='<%! Record !%>';return true" title="<%! Record !%>" /></a> + </span> </tmpl_if> <tmpl_if imdburl> - <span class="item"><a href="<tmpl_var imdburl>" target="_blank" title="<%! Lookup movie in the Internet-Movie-Database (IMDb) !%>"><img src="bilder/imdb.gif" border="0" alt="IMDb" onmouseover="window.status='IMDb';return true" title="IMDb" /></a></span> + <span class="action imdb"> + <a href="<tmpl_var imdburl>" target="_blank"><img src="bilder/imdb.png" border="0" alt="IMDb" onmouseover="window.status='<%! Lookup movie in the Internet-Movie-Database (IMDb) !%>';return true" title="<%! Lookup movie in the Internet-Movie-Database (IMDb) !%>" /></a> + </span> </tmpl_if> </td> <td class="col_epg"> @@ -118,6 +131,7 @@ </table> </tmpl_if> </tmpl_loop> + </div> </form> </body> </html> diff --git a/template/default/prog_summary2.html b/template/default/prog_summary2.html index bf12644..b5336e2 100644 --- a/template/default/prog_summary2.html +++ b/template/default/prog_summary2.html @@ -101,19 +101,21 @@ </td> <td class="col_buttons"> <?% IF broadcast.stream_live_on %?> - <a href="<?% broadcast.streamurl %?>"><img src="bilder/stream.gif" border="0" alt="<%! Stream !%>" onmouseover="window.status='<%! Stream !%>';return true" title="<%! Stream !%>" /></a> + <span class="action stream"><a href="<?% broadcast.streamurl %?>"><img src="bilder/stream.png" border="0" alt="<%! Stream !%>" onmouseover="window.status='<%! Stream !%>';return true" title="<%! Stream !%>" /></a></span> <?% END %?> <?% IF broadcast.recurl %?> - <a href="javascript:callurl('<?% broadcast.switchurl %?>');"><img src="bilder/sum_view.gif" border="0" alt="<%! TV select !%>" onmouseover="window.status='<%! TV select !%>';return true" title="<%! TV select !%>" /></a> - <a href="vdradmin.pl?search=<?% broadcast.find_title %?>&aktion=prog_summary&submit=go11"><img src="bilder/sum_find.gif" border="0" alt="<%! Search for other show times !%>" onmouseover="window.status='<%! Search for other show times !%>';return true" title="<%! Search for other show times !%>" /></a> + <span class="action switch"> + <a href="javascript:callurl('<?% broadcast.switchurl %?>');"><img src="bilder/view.png" border="0" alt="<%! TV select !%>" onmouseover="window.status='<%! TV select !%>';return true" title="<%! TV select !%>" /></a> + </span> + <span class="action repeatings"><a href="vdradmin.pl?search=<?% broadcast.find_title %?>&aktion=prog_summary&submit=go11"><img src="bilder/find.png" border="0" alt="<%! Search for other show times !%>" onmouseover="window.status='<%! Search for other show times !%>';return true" title="<%! Search for other show times !%>" /></a></span> <?% IF broadcast.summary %?> - <a href="javascript:popup('<?% broadcast.infurl %?>');"><img src="bilder/sum_info.gif" border="0" alt="<%! More Information !%>" onmouseover="window.status='<%! More Information !%>';return true" title="<%! More Information !%>" /></a> + <span class="action info"><a href="javascript:popup('<?% broadcast.infurl %?>');"><img src="bilder/info_button.png" border="0" alt="<%! More Information !%>" onmouseover="window.status='<%! More Information !%>';return true" title="<%! More Information !%>" /></a></span> <?% ELSE %?> - <img src="bilder/sum_info_disabled.gif" border="0" alt="noinfo" title="<%! No Information !%>" /> + <span class="action info"><img src="bilder/info_button_disabled.png" border="0" alt="noinfo" title="<%! No Information !%>" /></span> <?% END %?> - <a href="<?% broadcast.recurl %?>"><img src="bilder/sum_rec.gif" border="0" alt="<%! Record !%>" onmouseover="window.status='<%! Record !%>';return true" title="<%! Record !%>" /></a> + <span class="action record"><a href="<?% broadcast.recurl %?>"><img src="bilder/rec_button.png" border="0" alt="<%! Record !%>" onmouseover="window.status='<%! Record !%>';return true" title="<%! Record !%>" /></a></span> <?% IF broadcast.imdburl %?> - <a href="<tmpl_var broadcast.imdburl>" target="_blank" title="<%! Lookup movie in the Internet-Movie-Database (IMDb) !%>"><img src="bilder/imdb.gif" border="0" alt="IMDb" onmouseover="window.status='IMDb';return true" title="IMDb" /></a> + <span class="action imdb"><a href="<?% broadcast.imdburl %?>" target="_blank"><img src="bilder/imdb.png" border="0" alt="IMDb" onmouseover="window.status='<%! Lookup movie in the Internet-Movie-Database (IMDb) !%>';return true" title="<%! Lookup movie in the Internet-Movie-Database (IMDb) !%>" /></a></span> <?% END %?> <?% END %?> </td> diff --git a/template/default/prog_timeline.html b/template/default/prog_timeline.html index e335e85..fef4868 100644 --- a/template/default/prog_timeline.html +++ b/template/default/prog_timeline.html @@ -4,7 +4,7 @@ <head> <meta http-equiv="refresh" content="600; URL=vdradmin.pl?aktion=prog_timeline" /> <meta http-equiv="content-type" content="text/html;charset=<%! ISO-8859-1 !%>" /> - <title>VDRAdmin-AM - <%! What's On Now? !%></title> + <title>VDRAdmin-AM - <%! Timeline !%></title> <link href="style.css" rel="stylesheet" media="screen" type="text/css" /> <tmpl_if usercss> <link href="user.css" rel="stylesheet" media="screen" type="text/css" /> @@ -14,7 +14,6 @@ <?%- breite = 600; seite = 100; - left = 20; zeitrahmen = config.ZEITRAHMEN || 1; # Zeitrahmen der angezeigt werden soll in Stunden times = config.TIMES.split(',\s*'); @@ -30,6 +29,7 @@ ELSE; akt_sekunde = now_sec; END; + akt_sekunde = akt_sekunde - akt_sekunde % 60; bis = 60 * zeitrahmen; bis_sec = akt_sekunde + (bis * 60); @@ -39,17 +39,83 @@ minute = 0; z = 0; einheit = ((breite / bis) + 0.5) | format('%i'); + breite = bis * einheit; -%?> <style type="text/css"> - #prgtable { border-left-width:1px; border-left-style:solid; border-bottom-width:1px; border-bottom-style:solid; padding-left:1px; } - #timertable { border-left-width:1px; border-left-style:solid; border-bottom-width:1px; border-bottom-style:solid; padding-left:1px; } + table.prgname { + border-width:1px; + border-style:none; + border-spacing:0px; + padding:0px; + margin:0px; + text-align:left; + table-layout:fixed; + overflow:hidden; + } + td.prgname { + margin: 0 2px; + } + + .prgtable { + border-left-width:1px; + border-right-width:1px; + border-top-width:0px; + border-bottom-width:1px; + border-left-style:solid; + border-right-style:solid; + border-top-style:none; + border-bottom-style:solid; + border-spacing:0px; + padding:0px; + margin:0px; + text-align:left; + table-layout:fixed; + overflow:hidden; + } + .prgtable span, + .timertable span { + padding: 0 2px; + } + + .timertable { + border-left-width:1px; + border-right-width:1px; + border-top-width:0px; + border-bottom-width:1px; + border-left-style:solid; + border-right-style:solid; + border-top-style:none; + border-bottom-style:solid; + border-spacing:0px; + padding:0px; + margin:0px; + text-align:left; + table-layout:fixed; + overflow:hidden; + } + + .timestables { + border-left-width:1px; + border-right-width:1px; + border-top-width:0px; + border-bottom-width:1px; + border-left-style:solid; + border-right-style:solid; + border-top-style:none; + border-bottom-style:solid; + border-spacing:0px; + border-color:black; + padding:0px; + margin:0px; + table-layout:fixed; + } - <?% IF jetzt_stunde >= akt_stunde && jetzt_stunde < akt_stunde + zeitrahmen %?> - #timeline { position:absolute; filter:Alpha(opacity=50); top:150px; left:<?% left + seite + (einheit * diff_minute) + 30 %?>px; width:1px; height:<?% shows.keys.size * 21 + 2 %?>px; z-index:10; z-index:2; } + <?% IF (date.now >= akt_sekunde) && (date.now - akt_sekunde < bis_sec) %?> + #timeline { position:absolute; filter:Alpha(opacity=50); top:20px; left:<?% seite + (einheit * diff_minute) + 30 %?>px; width:1px; height:<?% shows.keys.size * 18 + 19 %?>px; z-index:10; z-index:2; } <?% END %?> - #bigtable { position:absolute; top:100px; left: <?% left %?>px; z-index: 1; } + #bigtable { position:absolute; top:0; left: 0; z-index: 1; } </style> <script type="text/javascript" language="JavaScript"> @@ -112,16 +178,17 @@ </tr> </table> - <!-- Vertikal ansicht TOP --> - <span id="timeline" class="timeline"><img src="bilder/spacer.gif" width="1" height="1" border="0" /></span> <div id="content"> - <!-- Zeitleiste --> - <table width="<?% breite + seite + 60 %?>" border="0" cellspacing="0" cellpadding="0" id="bigtable" class="list"> + <!-- Vertikal ansicht TOP --> + <span id="timeline"><img src="bilder/spacer.gif" width="1" height="1" border="0" /></span> + + <!-- Zeitleiste: akt="<?% date.format(akt_sekunde, '%H:%M:%S') %?>" jetzt="<?% date.format(date.now, '%H:%M:%S') %?>" --> + <table width="<?% breite + seite + 60 %?>" border="0" cellspacing="0" cellpadding="0" class="bigtable list"> <tr class="heading"> <td class="col_left"></td> <td colspan="3" width='<?% breite + seite %?>'><h2><%! Timeline: !%> <?% date.format(akt_sekunde, '%H:%M') %?> <%! o'clock !%> <%! to !%> <?% date.format(bis_sec, '%H:%M') %?> <%! o'clock !%></h2></td> - <td class="col_navi"><?% IF akt_stunde <= jetzt_stunde %?><img src="bilder/pfeile_nachlinks_soft.gif" border="0" /><?% ELSE %?><a href="<?% nowurl %?>&time=<?% akt_stunde - zeitrahmen | format('%02d') %?><?% akt_minute | format('%02d') %?>"><img src="bilder/pfeile_nachlinks.gif" border="0" /></a><?% END %?><a href="<?% nowurl %?>&time=<?% bis_stunde | format('%02d') %?><?% akt_minute | format('%02d') %?>"><img src="bilder/pfeile_nachrechts.gif" border="0" /></a></td> + <td class="col_navi"><?% IF akt_sekunde <= date.now %?><img src="bilder/pfeile_nachlinks_soft.png" border="0" /><?% ELSE %?><a href="<?% nowurl %?>&time=<?% akt_stunde - zeitrahmen | format('%02d') %?><?% akt_minute | format('%02d') %?>"><img src="bilder/pfeile_nachlinks.png" border="0" /></a><?% END %?><a href="<?% nowurl %?>&time=<?% bis_stunde | format('%02d') %?><?% akt_minute | format('%02d') %?>"><img src="bilder/pfeile_nachrechts.png" border="0" /></a></td> <td class="col_right"></td> </tr> <tr class="row_spacer"> @@ -132,114 +199,100 @@ <tr class="row_even"> <td class="col_left"></td> <td colspan="4"> - <table border="0" cellpadding="0" cellspacing="0" width="1"> + <table border="0" cellpadding="0" cellspacing="0" width="<?% seite + breite %?>" class="timestable"> <tr> - <td class="color1"><img src="bilder/spacer.gif" width="<?% seite %?>" height="1" border="0" /><br /></td> + <td><img src="bilder/spacer.gif" width="<?% seite %?>" height="1" border="0" /><br /></td> <?% WHILE minute < bis %?> - <td colspan="6" class='<?% minute % 60 ? "color1" : "color2" %?>'> + <td colspan="6" class="<?% minute % 60 ? 'color1' : 'color2' %?>"> <img src="bilder/spacer.gif" width="<?% einheit * 30 %?>" height="1" border="0" /><br /> <?% zeit = akt_sekunde + (minute * 60) %?> - <b><?% date.format(zeit, '%H:%M') %?></b> + <span class="date_time"><?% date.format(zeit, '%H:%M') %?></span> </td> <?% minute = minute + 30 %?> <?% END %?> </tr> <?% minute = 0 %?> <tr> - <td class="color1"><img src="bilder/spacer.gif" width="<?% seite %?>" height="1" border="0" /><br /></td> + <td><img src="bilder/spacer.gif" width="<?% seite %?>" height="1" border="0" /><br /></td> <?% WHILE minute < bis %?> - <td width="1%" height="10px" align="left" valign="bottom" class=<?% minute % 10 ? "color1" : "color2" %?>> - <?% IF minute % 15 %?> - <img src="bilder/spacer.gif" width="1" height="5" border="0" /> - <?% ELSE %?> - <img src="bilder/spacer.gif" width="1" height="10" border="0" /> - <?% END %?> + <!-- TODO: unit for next "width" and "height"? --> + <td width="<?% einheit * 5 %?>" height="10" align="left" valign="bottom" class="<?% minute % 10 ? 'color1' : 'color2' %?>"> + <img src="bilder/spacer.gif" width="<?% einheit * 5 %?>" height="10" border="0" /> </td> <?% minute = minute + 5 %?> <?% END %?> </tr> </table> - <table border="0" cellpadding="0" cellspacing="0" width="1"> -<!-- Sendernamen --> + <table border="0" cellpadding="0" cellspacing="0" width="<?% seite + breite %?>" class="prgname"> <?% b = 0; FOREACH name = shows.keys.nsort; - old_stop_minute = -1; - chars = seite / 10 | format('%i'); b = b + 1 %?> <tr> - <td valign="top" class=<?% b % 2 ? "color2" : "color1" %?>> + <!-- Sendername: "<?% shows.${name}.first.progname %?>" --> + <td width="<?% seite %?>" valign="top" class="prgname <?% b % 2 ? 'color2' : 'color1' %?>"> <img src="bilder/spacer.gif" width="<?% seite %?>" height="1" border="0" /><br /> - <a href="<?% shows.${name}.first.proglink %?>"><b><?% shows.${name}.first.progname | truncate(chars) %?></b></a> + <nobr><a href="<?% shows.${name}.first.proglink %?>" class="channel_name"><?% shows.${name}.first.progname %?></a></nobr> </td> <!-- Programm --> - <td colspan="<?% (bis / 5) %?>" class=<?% b % 2 ? "color2" : "color1" %?>> + <td colspan="<?% (bis / 5) %?>" class="<?% b % 2 ? 'color2' : 'color1' %?>"> <nobr> <?% - z = 0; counter = 0; + old_stop_minute = -1; FOREACH show = shows.${name}; - start_stunde = date.format(show.start, '%H') - akt_stunde; -# start_stunde = (start_stunde < 0 ? 0 : start_stunde); - start_minute = date.format(show.start, '%M') - akt_minute; - start_minute = (start_stunde * 60 ) + start_minute; - - show.stop = show.stop - 60; - stop_stunde = date.format(show.stop, '%H') - akt_stunde; - stop_stunde = (stop_stunde < 0 ? 0 : stop_stunde); - stop_minute = date.format(show.stop, '%M') - akt_minute; - stop_minute = (stop_stunde * 60 )+ stop_minute; + start_minute = (show.start - akt_sekunde) / 60 | format('%i'); + stop_minute = (show.stop - akt_sekunde) / 60 | format('%i'); IF start_minute < akt_minute; start_minute = 0; END; IF stop_minute > bis_minute; stop_minute = bis_minute; END; - laenge = stop_minute - start_minute; - laenge_pix = laenge * einheit; - laenge_chars = ((laenge_pix / 10) + 0.5) | format('%i'); - NEXT IF start_minute >= bis_minute; - IF start_minute >= old_stop_minute; - start_minute = start_minute + 1 IF start_minute == old_stop_minute; -%?> + laenge_pix = (stop_minute - start_minute) * einheit; - <?% IF start_minute > akt_minute && ! z %?> - <?% diff = (start_minute - akt_minute) * einheit %?> - <table border="0" align="left" cellpadding="0" cellspacing="0"> + IF show.timer; + td_class = "color_timer"; + ELSE; + td_class = date.now >= show.start && date.now < show.stop ? "color_current" : "color_broadcast"; + END; +%?> + +<!-- old_stop="<?% old_stop_minute %?>" start="<?% start_minute %?>" stop="<?% stop_minute %?>" bis="<?% bis_minute %?>" --> +<?% IF (start_minute >= old_stop_minute) && (start_minute < bis_minute) %?> +<?% IF old_stop_minute + 1 < start_minute %?> +<?% diff = (start_minute - old_stop_minute - 1) * einheit %?> +<!-- Spacer --> + <table border="0" align="left" cellpadding="0" cellspacing="0" width="<?% diff %?>" class="prgtable"> <tr> <td width="1"> - <img src="bilder/spacer.gif" width="<?% diff %?>" height="8" border="0" align="left" hspace="0" /> + <img src="bilder/spacer.gif" width="1" height="1" border="0" hspace="0" /><br/> + <nobr> + <img src="bilder/spacer.gif" width="1" height="8" border="0" hspace="0" /> + </nobr> </td> </tr> </table> <?% END %?> - - <?% IF old_stop_minute + 1 < start_minute && z %?> - <?% diff = (start_minute - old_stop_minute - 1) * einheit %?> - <img title="DiffMinute: <?% start_minute - old_stop_minute - 1 %?>" src="bilder/spacer.gif" width="<?% diff %?>" height="8" border="0" align="left" hspace="0" /> - <?% END %?> - <?% td_class = date.now > show.start && date.now < show.stop ? "color_current" : "color_broadcast"; - td_class = show.timer ? "color_timer" : td_class %?> - <table border="0" align="left" cellpadding="0" cellspacing="0" id=<?% show.timer ? "timertable" : "prgtable" %?>> + <!-- <?% show.vdr_id %?>-<?% counter %?>: "<?% show.title %?>" --> + <table border="0" align="left" cellpadding="0" cellspacing="0" width="<?% laenge_pix %?>" class=<?% show.timer ? "timertable" : "prgtable" %?>> <tr> <td width="1" class="<?% td_class %?>" <?% IF config.TL_TOOLTIP %?>onMouseOver="tip('VDR-<?% show.vdr_id %?>-<?% counter %?>'); return true;" onMouseOut="untip(); return true;"<?% END %?>> - <img src="bilder/spacer.gif" width="<?% laenge_pix %?>" height="1" border="0" hspace="0" /><br /> - <nobr> - <?% IF show.summary %?><a href="javascript:popup('./vdradmin.pl?aktion=prog_detail&epg_id=<?% show.anchor %?>&vdr_id=<?% show.vdr_id %?>');"><?% END %?> - <?% IF laenge_chars > 2 %?> - <?% show.title | truncate( laenge_chars ) %?> + <img src="bilder/spacer.gif" width="1" height="1" border="0" hspace="0" /><br /> + <span class="event"> + <?% IF show.summary %?> + <a href="javascript:popup('./vdradmin.pl?aktion=prog_detail&epg_id=<?% show.anchor %?>&vdr_id=<?% show.vdr_id %?>');"> + <?% show.title %?> + </a> <?% ELSE %?> - <img src="bilder/spacer.gif" width="<?% laenge_pix %?>" height="8" border="0" hspace="0" /> + <?% show.title %?> <?% END %?> - <?% IF show.summary %?></a><?% END %?> - </nobr> + </span> </td> </tr> </table> <?% - counter = counter +1 ; - END; - z = z + 1; - old_start_minute = start_minute; old_stop_minute = stop_minute; + END; + counter = counter + 1; END %?> </nobr> </td> diff --git a/template/default/rec_list.html b/template/default/rec_list.html index cbf4864..1cba17f 100644 --- a/template/default/rec_list.html +++ b/template/default/rec_list.html @@ -24,7 +24,7 @@ </td> <tmpl_if name="help_url"> <td class="col_help"> - <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.gif" border="0" alt="help" title="<%! Help !%>" /></a> + <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.png" border="0" alt="help" title="<%! Help !%>" /></a> </td> </tmpl_if> <td class="col_right"></td> @@ -126,25 +126,25 @@ </td> <td class="col_name <tmpl_if sortbyname>selected</tmpl_if>"> <tmpl_if isfolder> - <a href="<tmpl_var infurl><tmpl_var cur_sorting>"><img align="middle" src="bilder/folder_video.gif" border="0" /> <tmpl_var name></a> + <a href="<tmpl_var infurl><tmpl_var cur_sorting>"><img align="middle" src="bilder/folder_video.png" border="0" /> <tmpl_var name></a> <tmpl_else> - <a href="javascript:popup('<tmpl_var infurl>');"><img align="middle" src="bilder/aktion.gif" border="0" /> <tmpl_var name></a> + <a href="javascript:popup('<tmpl_var infurl>');"><img align="middle" src="bilder/aktion.png" border="0" /> <tmpl_var name></a> </tmpl_if> </td> <td class="col_edit"> <tmpl_unless isfolder> - <a href="<tmpl_var editurl><tmpl_var cur_sorting>"><img src="bilder/edit.gif" alt="rename" title="<%! Rename !%>" border="0" /></a> + <a href="<tmpl_var editurl><tmpl_var cur_sorting>"><img src="bilder/edit.png" alt="rename" title="<%! Rename !%>" border="0" /></a> </tmpl_unless> </td> <td class="col_delete"> <tmpl_unless isfolder> - <a href="javascript:del('<%! Delete recording? !%>\n\n"<tmpl_var name_js>"', '<tmpl_var delurl><tmpl_var cur_sorting>');"><img src="bilder/delete.gif" alt="delete" title="<%! Delete !%>" border="0" /></a> + <a href="javascript:del('<%! Delete recording? !%>\n\n"<tmpl_var name_js>"', '<tmpl_var delurl><tmpl_var cur_sorting>');"><img src="bilder/delete.png" alt="delete" title="<%! Delete !%>" border="0" /></a> </tmpl_unless> </td> <tmpl_if stream_rec_on> <td class="col_stream"> <tmpl_unless isfolder> - <a href="<tmpl_var streamurl>"><img src="bilder/stream.gif" alt="stream" title="<%! Stream !%>" border="0" /></a> + <a href="<tmpl_var streamurl>"><img src="bilder/stream.png" alt="stream" title="<%! Stream !%>" border="0" /></a> </tmpl_unless> </td> </tmpl_if> diff --git a/template/default/timer_list.html b/template/default/timer_list.html index 9e71e85..c6ec456 100644 --- a/template/default/timer_list.html +++ b/template/default/timer_list.html @@ -48,7 +48,7 @@ </td> <tmpl_if help_url> <td class="col_help"> - <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.gif" border="0" alt="help" title="<%! Help !%>" /></a> + <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.png" border="0" alt="help" title="<%! Help !%>" /></a> </td> </tmpl_if> <td class="col_right"></td> @@ -63,13 +63,13 @@ <td class="col_left"></td> <td><h2><tmpl_var title></h2></td> <td class="col_navi"> - <tmpl_if prevdayurl><a href="<tmpl_var prevdayurl>"><img src="bilder/pfeile_nachlinks.gif" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachlinks_soft.gif" border="0" /></tmpl_if> + <tmpl_if prevdayurl><a href="<tmpl_var prevdayurl>"><img src="bilder/pfeile_nachlinks.png" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachlinks_soft.png" border="0" /></tmpl_if> <select name="vdr_id" class="submit" onchange="window.open('<tmpl_var url>?aktion=timer_list&sortby=<tmpl_var sortby>&desc=<tmpl_var cur_desc>&timer=' + this.options[this.selectedIndex].value,'main')"> <tmpl_loop day_loop> <option value="<tmpl_var sortfield>" <tmpl_if current>selected</tmpl_if>><tmpl_var day></option> </tmpl_loop> </select> - <tmpl_if nextdayurl><a href="<tmpl_var nextdayurl>"><img src="bilder/pfeile_nachrechts.gif" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachrechts_soft.gif" border="0" /></tmpl_if> + <tmpl_if nextdayurl><a href="<tmpl_var nextdayurl>"><img src="bilder/pfeile_nachrechts.png" border="0" /></a><tmpl_else><img src="bilder/pfeile_nachrechts_soft.png" border="0" /></tmpl_if> </td> <td class="col_right"></td> </tr> @@ -308,16 +308,16 @@ <div> <a href="javascript:change('<%! Edit timer status? !%>','<tmpl_var toggleurl>&timer=<?% current %?>');"> <tmpl_if expr="(active%32768) == 0"> - <img src="bilder/poempl_grau.gif" alt="inactive" title="<%! This timer is inactive! !%>" align="middle" border="0" /> + <img src="bilder/poempl_grau.png" alt="inactive" title="<%! This timer is inactive! !%>" align="middle" border="0" /> <tmpl_else> <tmpl_if critical> - <img src="bilder/poempl_rot.gif" alt="impossible" title="<%! This timer is impossible! !%>" align="middle" border="0" /> + <img src="bilder/poempl_rot.png" alt="impossible" title="<%! This timer is impossible! !%>" align="middle" border="0" /> <tmpl_else> <tmpl_if collision> - <img src="bilder/poempl_gelb.gif" alt="nomore" title="<%! No more timers on other transponders possible! !%>" align="middle" border="0" /> + <img src="bilder/poempl_gelb.png" alt="nomore" title="<%! No more timers on other transponders possible! !%>" align="middle" border="0" /> <tmpl_else> <tmpl_if active> - <img src="bilder/poempl_gruen.gif" alt="possible" title="<%! Timer OK. !%>" align="middle" border="0" /> + <img src="bilder/poempl_gruen.png" alt="possible" title="<%! Timer OK. !%>" align="middle" border="0" /> </tmpl_if> </tmpl_if> </tmpl_if> @@ -352,10 +352,10 @@ </div> </td> <td class="col_edit"> - <div><a href="<tmpl_var modurl>"><img src="bilder/edit.gif" alt="edit" title="<%! Edit !%>" border="0" /></a></div> + <div><a href="<tmpl_var modurl>"><img src="bilder/edit.png" alt="edit" title="<%! Edit !%>" border="0" /></a></div> </td> <td class="col_delete"> - <div><a href="javascript:del('<%! Delete timer? !%>\n\n"<tmpl_var title_js>"','<tmpl_var delurl>');"><img src="bilder/delete.gif" alt="delete" title="<%! Delete !%>" border="0" /></a></div> + <div><a href="javascript:del('<%! Delete timer? !%>\n\n"<tmpl_var title_js>"','<tmpl_var delurl>');"><img src="bilder/delete.png" alt="delete" title="<%! Delete !%>" border="0" /></a></div> </td> <td class="col_checkbox"> <div><input type="checkbox" name="xxxx_<tmpl_var id>" /></div> diff --git a/template/default/timer_new.html b/template/default/timer_new.html index 20d4210..e915c6f 100644 --- a/template/default/timer_new.html +++ b/template/default/timer_new.html @@ -50,7 +50,7 @@ </td> <tmpl_if name="help_url"> <td class="col_help"> - <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.gif" border="0" alt="help" title="<%! Help !%>" /></a> + <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.png" border="0" alt="help" title="<%! Help !%>" /></a> </td> </tmpl_if> <td class="col_right"></td> diff --git a/template/default/vdr_cmds.html b/template/default/vdr_cmds.html index 57970ba..2a32e5b 100644 --- a/template/default/vdr_cmds.html +++ b/template/default/vdr_cmds.html @@ -18,7 +18,7 @@ <td class="col_title"><h1><%! VDR Commands !%></h1></td> <tmpl_if name="help_url"> <td class="col_help"> - <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.gif" border="0" alt="help" title="<%! Help !%>" /></a> + <a href="javascript:open_help('<tmpl_var help_url>');"><img src="bilder/help.png" border="0" alt="help" title="<%! Help !%>" /></a> </td> </tmpl_if> <td class="col_right"></td> |
