diff options
| author | Andreas Mair <amair.sob@googlemail.com> | 2005-07-13 12:01:05 +0200 |
|---|---|---|
| committer | Andreas Mair <amair.sob@googlemail.com> | 2005-07-13 12:01:05 +0200 |
| commit | 8c5b06e471f1254d2e750dfba3154461eb3030bc (patch) | |
| tree | 70929fe39cea335cb034c380485aa118383fce21 /template/default | |
| parent | 1f33deeae237bdcc4281de03d268528d4a09edd3 (diff) | |
| download | vdradmin-am-0.97-am3.3.tar.gz vdradmin-am-0.97-am3.3.tar.bz2 | |
2005-07-12: 0.97-am3.3v0.97-am3.3
- Fixed problems with "$" in templates (Reported by All-Ex).
- Updated all help messages.
- Added beautified tooltips in at_timer_list, timer_list and prog_timeline.
- Changed saving of AutoTimer patterns: ":" -> "|" and "|" -> "\|".
- Added support for user.css for overwriting style.css (Must be located in same folder as vdradmind.conf). See user.css.example.
- Removed obsolete files (e.g. images).
- Merged style.css and navi.css.
- Reworked templates so that they use a lot of CSS (Tested using Konqueror 3.3.2 and Firefox 1.0.4).
- Fixed programming timers with special summary when using EPG_DIRECT (timer didn't get programmed) (Thanks to HolgerAusB for giving vital hints).
- Allow browsers to cache all files VDRAdmin sends, except "text/html". This should speed up VDRAdmin but changing the skin or css needs a "shift reload".
- Added support for VDR v1.3.25's info.vdr (Submitted by vejoun).
- Use localized date formates.
- Now using "video/x-mpegurl" MIME type instead of "audio/x-mpegurl" for streaming (Suggested by stefan.h).
- Added patches supplied by stefan.h:
-> using EPG's subtitle when found for AutoTimer else " " (that's the VDR way).
-> New config option VDRVFAT to find recordings if VDR has been compiled with or without VFAT define.
- Fixed calling reccmds on recordings in subdirs, manual recordings (@rectitle) and repeating timer's recordings without episode title.
- Fixed streaming of manual recordings (@rectitle) and repeating timer's recordings without episode title.
- VDRAdmin-AM now uses the required charsets setting in templates, so no need to write "&xyz;" things in .po files.
- Reworked templates to make better use of CSS (for example: timeline colours can be set by style.css).
- EPG_PRUNE now is the number of channels to fetch from VDR (had been one too less before).
- Added "install.sh" and "uninstall.sh" ("./install.sh -h" for help) (Requested by several people).
- Made "name" columns in lists wrapping again (Reported by vejoun).
- Deleting a single recording works again (Reported by vejoun).
- Fixed streaming of recordings in subdirs (Reported by vejoun).
- Added missing gray sign on deactivated AutoTimers (Reported by vejoun).
- Various other minor fixes.
Diffstat (limited to 'template/default')
31 files changed, 397 insertions, 362 deletions
diff --git a/template/default/at_timer_list.html b/template/default/at_timer_list.html index f753237..d24d8b1 100644 --- a/template/default/at_timer_list.html +++ b/template/default/at_timer_list.html @@ -9,9 +9,20 @@ <link href="user.css" rel="stylesheet" media="screen" type="text/css"/> </tmpl_if> <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> + <script type="text/javascript" language="JavaScript1.2" src="infobox.js"></script> </head> <body id="at_timer_list"> +<div id="infodiv" style="position:absolute; visibility:hidden; z-index:20; top:0px; left:0px;"></div> +<script language="JavaScript" type="text/javascript"> +<?% + FOREACH timer = at_timer_loop2; +%?> + maketip("VDR-<?% timer.id %?>", "<?% timer.pattern %?>", "<%! Priority: !%> <?% timer.prio %?><br /><%! Lifetime: !%> <?% timer.lft %?>"); +<?% + END +%?> +</script> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> <tr> <td class="col_left"> @@ -142,7 +153,7 @@ <tmpl_if stop><tmpl_var stop><tmpl_else>-</tmpl_if> </div> </td> - <td class="col_name" title="<%! Priority: !%> <tmpl_var prio> / <%! Lifetime: !%> <tmpl_var lft>" <tmpl_if sortbypattern>selected="yes"</tmpl_if>> + <td class="col_name" onMouseOver="tip('VDR-<tmpl_var id>'); return true;" onMouseOut="untip(); return true;" <tmpl_if sortbypattern>selected="yes"</tmpl_if>> <div> <tmpl_var pattern> </div> @@ -180,7 +191,7 @@ <table width="100%" border="0" cellspacing="0" cellpadding="0" id="buttons"> <tr> - <td> + <td align="left"> <table border="0" cellspacing="0" cellpadding="0"> <tr height="20"> <td width="12" height="20" background="bilder/gbutton_left.gif"></td> diff --git a/template/default/at_timer_new.html b/template/default/at_timer_new.html index c9f3458..afafbb2 100644 --- a/template/default/at_timer_new.html +++ b/template/default/at_timer_new.html @@ -11,7 +11,7 @@ <script type="text/javascript" language="JavaScript1.2" src="library.js"></script> </head> -<body id="at_new"> +<body id="at_timer_new"> <form action="<tmpl_var url>" method="get" name="FormName"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> <tr> diff --git a/template/default/bilder/aktion.gif b/template/default/bilder/aktion.gif Binary files differnew file mode 100644 index 0000000..8e33bce --- /dev/null +++ b/template/default/bilder/aktion.gif diff --git a/template/default/bilder/aktion.png b/template/default/bilder/aktion.png Binary files differdeleted file mode 100644 index ea9f270..0000000 --- a/template/default/bilder/aktion.png +++ /dev/null diff --git a/template/default/bilder/folder_video.gif b/template/default/bilder/folder_video.gif Binary files differnew file mode 100644 index 0000000..281fca7 --- /dev/null +++ b/template/default/bilder/folder_video.gif diff --git a/template/default/bilder/folder_video.png b/template/default/bilder/folder_video.png Binary files differdeleted file mode 100644 index 5d159d7..0000000 --- a/template/default/bilder/folder_video.png +++ /dev/null diff --git a/template/default/bilder/logo_linvdr.gif b/template/default/bilder/logo_linvdr.gif Binary files differindex d9d0398..93e1029 100644 --- a/template/default/bilder/logo_linvdr.gif +++ b/template/default/bilder/logo_linvdr.gif diff --git a/template/default/bilder/logo_other.gif b/template/default/bilder/logo_other.gif Binary files differindex 8344c58..bcc908c 100644 --- a/template/default/bilder/logo_other.gif +++ b/template/default/bilder/logo_other.gif diff --git a/template/default/copper/aktion.gif b/template/default/copper/aktion.gif Binary files differnew file mode 100644 index 0000000..8e33bce --- /dev/null +++ b/template/default/copper/aktion.gif diff --git a/template/default/copper/aktion.png b/template/default/copper/aktion.png Binary files differdeleted file mode 100644 index ea9f270..0000000 --- a/template/default/copper/aktion.png +++ /dev/null diff --git a/template/default/copper/folder_video.gif b/template/default/copper/folder_video.gif Binary files differnew file mode 100644 index 0000000..281fca7 --- /dev/null +++ b/template/default/copper/folder_video.gif diff --git a/template/default/copper/folder_video.png b/template/default/copper/folder_video.png Binary files differdeleted file mode 100644 index 6b08a90..0000000 --- a/template/default/copper/folder_video.png +++ /dev/null diff --git a/template/default/copper/style.css b/template/default/copper/style.css index d86876e..4cd96d4 100644 --- a/template/default/copper/style.css +++ b/template/default/copper/style.css @@ -8,13 +8,13 @@ textarea { background-color: #f9f7f6; color: black; font-weight: normal; font-si select { background-color: #f9f7f6; color: black; font-weight: normal; font-size: 11px; } b { font-weight: bold } i { font-style: italic } -.gbutton { color: black; font-weight: bold } -.submit, select[size="1"] { height: 20px; } +.gbutton { color: black; font-weight: bold; } +.submit { height: 20px; } h1 { margin-right: 12px; margin-left: 12px; font-size: 13px; font-weight: bold; color: black; display: inline; } -h2 { margin: 0px; font-size: 11px; font-weight: bold; color: black; } -h3 { margin: 0px 0px; font-size: 11px; font-weight: bold; color: black; } -h4 { margin: 0px 0px; font-size: 11px; font-weight: normal; font-style: italic; color: black; } +h2 { margin: 0px; font-size: 11px; font-weight: bold; color: black; display: inline; } +h3 { margin: 0px; font-size: 11px; font-weight: bold; color: black; } +h4 { margin: 0px; font-size: 11px; font-weight: normal; font-style: italic; color: black; } h5 { margin: 1px 5px; font-size: 11px; font-weight: normal; color: black; text-align: right; } label { cursor: default; } @@ -24,81 +24,103 @@ a:hover { color: #cc0000; text-decoration: none; } label + input { margin-left: 1em; } #tv input, #tv select, #tv h5 { font-weight: normal; font-size: 9px; display: inline; } -#prog_list h2 { display: inline; } -#prog_summary .heading div { margin: 10px 12px; } -#prog_summary .content { margin-right: 12px; margin-left: 12px } -#prog_summary h2 { display: inline; } -#rec_list .col_name div { font-weight: bold; } +#rec_list .col_name { font-weight: bold; } #error h2 { font-size: 11px; color: red; } .heading { height: 30px; } +.heading h2 { padding-left: 3px; padding-right: 3px; white-space: nowrap; } +.col_label, .col_value, .col_active, .col_channel, .col_start, .col_stop, .col_date, .col_time { padding-left: 3px; padding-right: 3px; white-space: nowrap; } .row_spacer td { height: 10px; } .row_odd, .row_even { height: 25px; } -.col_left, .col_right { width: 30px; height: 25px; } +.col_left, .col_right { min-width: 30px; max-width: 30px; width: 30px; height: 25px; } .col_channels { text-align: right; padding: 10px; width: 40%; } .col_wanted_channels { text-align: left; padding: 10px; width: 40%; } -.col_navi { text-align: right; } +.col_navi { text-align: right; white-space: nowrap; } .heading td[selected] { background-image: url("bilder/uebersicht_oben_selected.gif"); } .heading td { background-image: url("bilder/uebersicht_oben.gif"); } #prog_summary .heading td { background-image: none; } .heading .col_left { background-image: url("bilder/uebersicht_oben_links.gif"); } .heading .col_right { background-image: url("bilder/uebersicht_oben_rechts.gif"); } -.row_even>td[selected] { background-image: url("bilder/uebersicht_mitte_dark_selected.gif"); } -.row_even>td { background-image: url("bilder/uebersicht_mitte_dark.gif"); } -.row_even>.col_left { width: 30px; background-image: url("bilder/uebersicht_links_dark.gif"); } -.row_even>.col_right { width: 30px; background-image: url("bilder/uebersicht_rechts_dark.gif"); } -.row_odd>td[selected], .row_spacer>td[selected] { background-image: url("bilder/uebersicht_mitte_selected.gif"); } -.row_odd>td, .row_spacer>td { background-image: url("bilder/uebersicht_mitte.gif"); } -.row_odd>.col_left, .row_spacer>.col_left { width: 30px; background-image: url("bilder/uebersicht_links.gif"); } -.row_odd>.col_right, .row_spacer>.col_right { width: 30px; background-image: url("bilder/uebersicht_rechts.gif"); } -.footer>td[selected] { height: 30px; background-image: url("bilder/uebersicht_unten_selected.gif"); } -.footer>td { height: 30px; background-image: url("bilder/uebersicht_unten.gif"); } -.footer>.col_left { width: 30px; background-image: url("bilder/uebersicht_unten_links.gif"); } -.footer>.col_right { width: 30px; background-image: url("bilder/uebersicht_unten_rechts.gif"); } - -.heading h2 { margin-right: 5px; margin-left: 6px; white-space: nowrap; } -.row_odd td div, .row_even td div { margin: 3px 5px 0px 5px; white-space: nowrap; } - -.col_duration { width: 170px; vertical-align: top; } -.col_title { vertical-align: top; } -.col_info, .col_record { width: 65px; } -.col_active, .col_stream { width: 70px; } +.row_odd td[selected] { background-image: url("bilder/uebersicht_mitte_dark_selected.gif"); } +.row_odd td { background-image: url("bilder/uebersicht_mitte_dark.gif"); } +.row_odd .col_left { background-image: url("bilder/uebersicht_links_dark.gif"); } +.row_odd .col_right { background-image: url("bilder/uebersicht_rechts_dark.gif"); } +.row_even td[selected], .row_spacer td[selected] { background-image: url("bilder/uebersicht_mitte_selected.gif"); } +.row_even td, .row_spacer td { background-image: url("bilder/uebersicht_mitte.gif"); } +.row_even .col_left, .row_spacer .col_left { background-image: url("bilder/uebersicht_links.gif"); } +.row_even .col_right, .row_spacer .col_right { background-image: url("bilder/uebersicht_rechts.gif"); } +.footer td[selected] { height: 30px; background-image: url("bilder/uebersicht_unten_selected.gif"); } +.footer td { height: 30px; background-image: url("bilder/uebersicht_unten.gif"); } +.footer .col_left { background-image: url("bilder/uebersicht_unten_links.gif"); } +.footer .col_right { background-image: url("bilder/uebersicht_unten_rechts.gif"); } + +.col_duration { padding-left: 3px; padding-right: 3px; width: 120px; vertical-align: top; } +.col_name, .col_title * { padding-left: 3px; padding-right: 3px; min-width: 50px; white-space: normal; } +.col_info, .col_record { width: 65px; text-align: center; } +.col_active, .col_stream { width: 70px; max-width: 70px; } .col_channel { width: 120px; } -.col_start, .col_stop, .col_date, .col_time { width: 60px; text-align: right; } -.col_total, .col_new { width: 10px; text-align: center; padding-left: 3px; padding-right: 3px; } -.col_edit, .col_delete, .col_checkbox { text-align: center; width: 30px; } -.col_name div, .col_title div { white-space: normal; } +.col_start, .col_stop, .col_date, .col_time { width: 66px; text-align: right; } +.col_edit, .col_delete, .col_checkbox { text-align: center; width: 30px; max-width: 30px; } +#rec_list .col_date, #rec_list .col_time { width: 76px; } #heading { height: 39px; } #heading tr, #heading td { vertical-align: middle; } -#heading .col_left { width: 15px; background-image: url("bilder/nav_button_back_start.gif"); } +#heading .col_left { min-width: 15px; width: 15px; background-image: url("bilder/nav_button_back_start.gif"); } #heading .col_title { background-image: url("bilder/nav_button_back_mitte.gif"); } #heading .col_other { text-align: right; background-image: url("bilder/nav_button_back_mitte.gif"); } #heading .col_other span { float: right; } #heading .col_help { text-align: center; width: 45px; background-image: url("bilder/nav_button_back_mitte.gif"); } -#heading .col_right { width: 15px; background-image: url("bilder/nav_button_back_end.gif"); } +#heading .col_right { min-width: 15px; width: 15px; background-image: url("bilder/nav_button_back_end.gif"); } +#prog_timeline .row_even table td, #timer_list .row_even table td { background-image: none; } #prog_timeline #prgtable { border-left-color:#c4cdd7; border-bottom-color:#c4cdd7; } #prog_timeline #timertable { background:red; border-left-color:#ffcdd7; border-bottom-color:#ffcdd7; } #prog_timeline #timeline { background:red; } #prog_timeline .color_current { background-color: #e6eee9; } #prog_timeline .color_broadcast { background-color: #f7fffa; } #prog_timeline .color_timer { background-color: #ffeee9; } -#rec_list #path { margin: 1em 10px; } +#rec_list #path { margin: 1em 10px 0px 10px; } #timer_list .color_ok { background-color: #00a317; } #timer_list .color_conflict { background-color: #a11917; } #timer_list .color_collision { background-color: #858585; } #timer_list .color_inactive { background-color: #858585; } #timer_list #prgtable { border-left-color:#000000; border-right-color:#000000; } -.color1 { background-color: #e7e5e4; } -.color2 { background-color: #f2eeea; } +#prog_timeline .row_even table td.color1, #timer_list .row_even table td.color1 { background-color: #7e5e4; } +#prog_timeline .row_even table td.color2, #timer_list .row_even table td.color2 { background-color: #f2eeea; } + +#prog_detail td { white-space: normal; } +#prog_detail .heading h2 { white-space: normal; } #content { margin-top: 1em; } .group { margin-top: 0.5em; } #buttons { margin-top: 0.5em; text-align: right; } +/* Summary */ +#prog_summary .group { margin: 3px; float: left; } +#prog_summary h2 { padding: 0px; } +#prog_summary .heading { height: 29px; } +#prog_summary .heading td { height: 29px; width: 246px; background-image: url("bilder/sum_top_mid.gif"); white-space: nowrap; overflow: hidden; } +#prog_summary .heading .col_left { min-width: 12px; width: 12px; height: 29px; background-image: url("bilder/sum_top_left.gif"); } +#prog_summary .heading .col_right { min-width: 12px; width: 12px; height: 29px; background-image: url("bilder/sum_top_right.gif"); } +#prog_summary .row_odd td { width: 246px; height: 200px; background-image: url("bilder/sum_mid.gif"); vertical-align: top; } +#prog_summary .row_odd .col_left { min-width: 12px; width: 12px; height: 200px; background-image: url("bilder/sum_left.gif"); } +#prog_summary .row_odd .col_right { min-width: 12px; width: 12px; height: 200px; background-image: url("bilder/sum_right.gif"); } +#prog_summary .footer td { height: 38px; width: 246px; background-image: url("bilder/sum_bottom_mid.gif"); text-align: center; vertical-align: middle; } +#prog_summary .footer .col_left { min-width: 12px; width: 12px; height: 38px; background-image: url("bilder/sum_bottom_left.gif"); } +#prog_summary .footer .col_right { min-width: 12px; width: 12px; height: 38px; background-image: url("bilder/sum_bottom_right.gif"); } +#prog_summary .date { text-align: right; margin-top: 1em; float: left; } +#prog_summary .duration { text-align: right; margin-top: 1em; } +#prog_summary .title { margin-top: 1em; width: 246px; overflow: hidden; white-space: nowrap; } +#prog_summary .summary { margin-top: 1em; margin-bottom: 1em; width: 240px; height: 100px; overflow: hidden; white-space: normal; } + +/* Tooltips */ +.tt_table { width: 250px; border: 2px solid #333399; background-color: #ccccff; } +.tt_table th { background-color: #333399; font-weight: bold; color: white; padding-left: 2px; padding-right: 2px; } +.tt_table td { color: black; padding-left: 5px; padding-right: 5px; } + +/* Help */ #help dt { margin-top: 0.6em; font-weight: bold; font-style: italic; } #help dd dl dt { margin-top: 0.3em; font-weight: normal; font-style: italic; } #help dl { padding: 5px; } @@ -117,10 +139,10 @@ label + input { margin-left: 1em; } /* Navigation */ #navigation { margin: 0px; background-image: url("bilder/back.gif"); } -#navigation .logo { padding-top: 2em; padding-bottom: 3em; } +#navigation .logo { padding-top: 2em; padding-bottom: 3em; width: 150px; } +#navigation .navi { font-size: 12px; padding-top: 6px; height: 25px; text-align: center; width: 148px; } +#navigation .search { padding-top: 2em; font-size: 12px; width: 148px; text-align: center; } +#navigation .separator { height: 2px; background-image: url("bilder/separator.png"); width: 148px; } #navigation a { color: black; font-weight: bold; text-decoration: none; } #navigation a:hover { font-size: 13px; color: #ff0000 } -#navigation .navi { margin-left: 0.5em; font-size: 10px; height: 25px; } -#navigation .navi { padding-left: 0.5em; font-size: 12px; height: 25px; } -#navigation .search { padding-top: 2em; padding-left: 0.5em; font-size: 12px; } -#navigation .separator { height: 2px; background-image: url("bilder/separator.png"); } +#navigation input { width: 130px; } diff --git a/template/default/help_at_timer_list.html b/template/default/help_at_timer_list.html index 8262309..9f2c473 100644 --- a/template/default/help_at_timer_list.html +++ b/template/default/help_at_timer_list.html @@ -23,7 +23,7 @@ <td></td> <td class="col_right"></td> </tr> - <tr class="row_odd"> + <tr class="row_even"> <td class="col_left"></td> <td> <%! <p>Here you will find a listing of automatic timers (AutoTimer) known to VDRAdmin.</p> diff --git a/template/default/help_at_timer_new.html b/template/default/help_at_timer_new.html index 651508e..f417da8 100644 --- a/template/default/help_at_timer_new.html +++ b/template/default/help_at_timer_new.html @@ -29,7 +29,7 @@ <td></td> <td class="col_right"></td> </tr> - <tr class="row_odd"> + <tr class="row_even"> <td class="col_left"</td> <td> <%! <p>Here you can edit an automatic timer's (AutoTimer) settings.</p> diff --git a/template/default/help_config.html b/template/default/help_config.html index cafb824..acc7d59 100644 --- a/template/default/help_config.html +++ b/template/default/help_config.html @@ -26,7 +26,7 @@ <td></td> <td class="col_right"></td> </tr> - <tr class="row_odd"> + <tr class="row_even"> <td class="col_left"></td> <td> <%! <p>Here you can change general settings and base settings for timers, AutoTimers, channel selection and streaming parameters.</p> !%> diff --git a/template/default/help_no.html b/template/default/help_no.html index 54c86ec..ce4d70a 100644 --- a/template/default/help_no.html +++ b/template/default/help_no.html @@ -23,7 +23,7 @@ <td></td> <td class="col_right"></td> </tr> - <tr class="row_odd"> + <tr class="row_even"> <td class="col_left"></td> <td> <%! <p>No help available yet. For adding or changing text please contact <a href="mailto:mail@andreas.vdr-developer.org">mail@andreas.vdr-developer.org</a>.</p> !%> diff --git a/template/default/help_rec_list.html b/template/default/help_rec_list.html index ad4f2e0..da6ff33 100644 --- a/template/default/help_rec_list.html +++ b/template/default/help_rec_list.html @@ -23,7 +23,7 @@ <td></td> <td class="col_right"></td> </tr> - <tr class="row_odd"> + <tr class="row_even"> <td class="col_left"></td> <td> <%! <p>Here you will find a listing of recordings known to VDR. The headline will also show you VDR's total and free disk space.</p> diff --git a/template/default/help_timer_list.html b/template/default/help_timer_list.html index c28483f..3e6503a 100644 --- a/template/default/help_timer_list.html +++ b/template/default/help_timer_list.html @@ -23,7 +23,7 @@ <td></td> <td class="col_right"></td> </tr> - <tr class="row_odd"> + <tr class="row_even"> <td class="col_left"></td> <td> <%! <p>Here you will find a listing of timers known to VDR.</p> diff --git a/template/default/help_timer_new.html b/template/default/help_timer_new.html index 780fd6e..346dadb 100644 --- a/template/default/help_timer_new.html +++ b/template/default/help_timer_new.html @@ -26,7 +26,7 @@ <td></td> <td class="col_right"></td> </tr> - <tr class="row_odd"> + <tr class="row_even"> <td class="col_left"></td> <td> <%! <p>Here you can edit a timer's settings.</p> !%> diff --git a/template/default/infobox.js b/template/default/infobox.js index 590ffbd..5b81179 100644 --- a/template/default/infobox.js +++ b/template/default/infobox.js @@ -1,83 +1,83 @@ -//
-// Bubblehelp infoboxes, (C) 2002 Klaus Knopper <infobox@knopper.net>
-// You can copy/modify and distribute this code under the conditions
-// of the GNU GENERAL PUBLIC LICENSE Version 2.
-//
-var IWIDTH=250 // Tip box width
-var ns4 // Are we using Netscape4?
-var ie4 // Are we using Internet Explorer Version 4?
-var ie5 // Are we using Internet Explorer Version 5 and up?
-var kon // Are we using KDE Konqueror?
-var x,y,winW,winH // Current help position and main window size
-var idiv=null // Pointer to infodiv container
-var px="px" // position suffix with "px" in some cases
-
-function nsfix(){setTimeout("window.onresize = rebrowse", 2000);}
-
-function rebrowse(){window.location.reload();}
-
-function hascss(){ return gettip('infodiv')?true:false }
-
-function infoinit(){
- ns4=(document.layers)?true:false, ie4=(document.all)?true:false;
- ie5=((ie4)&&((navigator.userAgent.indexOf('MSIE 5')>0)||(navigator.userAgent.indexOf('MSIE 6')>0)))?true:false;
- kon=(navigator.userAgent.indexOf('konqueror')>0)?true:false;
- x=0;y=0;winW=800;winH=600;
- idiv=null;
- document.onmousemove = mousemove;
- if(ns4&&document.captureEvents) document.captureEvents(Event.MOUSEMOVE);
- // Workaround for just another netscape bug: Fix browser confusion on resize
- // obviously conqueror has a similar problem :-(
- if(ns4||kon){ nsfix() }
- if(ns4) { px=""; }
-}
-
-function untip(){
- if(idiv) idiv.visibility=ns4?"hide":"hidden";
- idiv=null;
-}
-
-function gettip(name){return (document.layers&&document.layers[name])?document.layers[name]:(document.all&&document.all[name]&&document.all[name].style)?document.all[name].style:document[name]?document[name]:(document.getElementById(name)?document.getElementById(name).style:0);}
-
-// Prepare tip boxes, but don't show them yet
-function maketip(name,title,text){
- if(hascss()) document.write('<div id="'+name+'" name="'+name+'" style="position:absolute; visibility:hidden; z-index:20; top:0'+px+'; left:0'+px+';"><table width='+IWIDTH+' border=0 cellpadding=2 cellspacing=0 bgcolor="#333399"><tr><td class="tiptd"><table width="100%" border=0 cellpadding=0 cellspacing=0><tr><th><span class="ptt"><b><font color="#FFFFFF">'+title+'</font></b></span></th></tr></table><table width="100%" border=0 cellpadding=2 cellspacing=0 bgcolor="#CCCCFF"><tr><td><span class="pst"><font color="#000000">'+text+'</font></span></td></tr></table></td></tr></table></div>'+"\n");
-}
-
-function tip(name){
- if(hascss()){
- if(idiv) untip();
- idiv=gettip(name);
- if(idiv){
- winW=(window.innerWidth)? window.innerWidth+window.pageXOffset-16:document.body.offsetWidth-20;
- winH=(window.innerHeight)?window.innerHeight+window.pageYOffset :document.body.offsetHeight;
- if(x<=0||y<=0){ // konqueror can't get mouse position
- x=(winW-IWIDTH)/2+(window.pageXOffset?window.pageXOffset:0); y=(winH-50)/2+(window.pageYOffset?window.pageYOffset:0); // middle of window
- }
- showtip();
- }
- }
-}
-
-function showtip(){
- idiv.left=(((x+260)<winW)?x+12:x-255)+px; idiv.top=(((y+90)<winH)?y+12:y-90)+px;
- idiv.visibility=ns4?"show":"visible";
-// window.status="idiv="+idiv+"X:"+(idiv.left?idiv.left:"NAN")+", Y:"+(idiv.top?idiv.top:"NAN")+", x:"+x+", y:"+y;
-}
-
-function mousemove(e){
- if(e) {x=e.pageX?e.pageX:e.clientX?e.clientX:0; y=e.pageY?e.pageY:e.clientY?e.clientY:0;}
- else if(event) {x=event.clientX; y=event.clientY;}
- else {x=0; y=0;}
- if((ie4||ie5) && document.documentElement) // Workaround for scroll offset of IE
- {
- x+=document.documentElement.scrollLeft;
- y+=document.documentElement.scrollTop;
- }
- if(idiv) showtip();
-}
-
-// Initialize after loading the page
-window.onload=infoinit;
-
-// EOF infobox.js
+// +// Bubblehelp infoboxes, (C) 2002 Klaus Knopper <infobox@knopper.net> +// You can copy/modify and distribute this code under the conditions +// of the GNU GENERAL PUBLIC LICENSE Version 2. +// +var IWIDTH=250 // Tip box width +var ns4 // Are we using Netscape4? +var ie4 // Are we using Internet Explorer Version 4? +var ie5 // Are we using Internet Explorer Version 5 and up? +var kon // Are we using KDE Konqueror? +var x,y,winW,winH // Current help position and main window size +var idiv=null // Pointer to infodiv container +var px="px" // position suffix with "px" in some cases + +function nsfix(){setTimeout("window.onresize = rebrowse", 2000);} + +function rebrowse(){window.location.reload();} + +function hascss(){ return gettip('infodiv')?true:false } + +function infoinit(){ + ns4=(document.layers)?true:false, ie4=(document.all)?true:false; + ie5=((ie4)&&((navigator.userAgent.indexOf('MSIE 5')>0)||(navigator.userAgent.indexOf('MSIE 6')>0)))?true:false; + kon=(navigator.userAgent.indexOf('konqueror')>0)?true:false; + x=0;y=0;winW=800;winH=600; + idiv=null; + document.onmousemove = mousemove; + if(ns4&&document.captureEvents) document.captureEvents(Event.MOUSEMOVE); + // Workaround for just another netscape bug: Fix browser confusion on resize + // obviously conqueror has a similar problem :-( + if(ns4||kon){ nsfix() } + if(ns4) { px=""; } +} + +function untip(){ + if(idiv) idiv.visibility=ns4?"hide":"hidden"; + idiv=null; +} + +function gettip(name){return (document.layers&&document.layers[name])?document.layers[name]:(document.all&&document.all[name]&&document.all[name].style)?document.all[name].style:document[name]?document[name]:(document.getElementById(name)?document.getElementById(name).style:0);} + +// Prepare tip boxes, but don't show them yet +function maketip(name,title,text){ + if(hascss()) document.write('<div id="'+name+'" name="'+name+'" style="position:absolute; visibility:hidden; z-index:20; top:0'+px+'; left:0'+px+';"><table border="0" cellpadding="0" cellspacing="0" class="tt_table"><tr><th class="tt_th">'+title+'</th></tr><tr><td class="tt_td">'+text+'</td></tr></table></div>'+"\n"); +} + +function tip(name){ + if(hascss()){ + if(idiv) untip(); + idiv=gettip(name); + if(idiv){ + winW=(window.innerWidth)? window.innerWidth+window.pageXOffset-16:document.body.offsetWidth-20; + winH=(window.innerHeight)?window.innerHeight+window.pageYOffset :document.body.offsetHeight; + if(x<=0||y<=0){ // konqueror can't get mouse position + x=(winW-IWIDTH)/2+(window.pageXOffset?window.pageXOffset:0); y=(winH-50)/2+(window.pageYOffset?window.pageYOffset:0); // middle of window + } + showtip(); + } + } +} + +function showtip(){ + idiv.left=(((x+260)<winW)?x+12:x-255)+px; idiv.top=(((y+90)<winH)?y+12:y-90)+px; + idiv.visibility=ns4?"show":"visible"; +// window.status="idiv="+idiv+"X:"+(idiv.left?idiv.left:"NAN")+", Y:"+(idiv.top?idiv.top:"NAN")+", x:"+x+", y:"+y; +} + +function mousemove(e){ + if(e) {x=e.pageX?e.pageX:e.clientX?e.clientX:0; y=e.pageY?e.pageY:e.clientY?e.clientY:0;} + else if(event) {x=event.clientX; y=event.clientY;} + else {x=0; y=0;} + if((ie4||ie5) && document.documentElement) // Workaround for scroll offset of IE + { + x+=document.documentElement.scrollLeft; + y+=document.documentElement.scrollTop; + } + if(idiv) showtip(); +} + +// Initialize after loading the page +window.onload=infoinit; + +// EOF infobox.js diff --git a/template/default/navigation.html b/template/default/navigation.html index 4a98047..24adc50 100644 --- a/template/default/navigation.html +++ b/template/default/navigation.html @@ -1,18 +1,16 @@ <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html> - <head> <meta http-equiv="content-type" content="text/html;<%! charset=ISO-8859-1 !%>" /> <title>VDRAdmin</title> - <link href="style.css" rel="stylesheet" media="screen" /> + <link type="text/css" href="style.css" rel="stylesheet" media="screen" /> <tmpl_if usercss> - <link href="user.css" rel="stylesheet" media="screen" /> + <link type="text/css" href="user.css" rel="stylesheet" media="screen" /> </tmpl_if> - <script> + <script type="text/javascript"> <!-- function rc_open() { - //window.open("./vdradmin.pl?aktion=rc_show", "_blank", "width=200, height=640, resizable=no, scrollbars=no, status=no, toolbar=no"); window.open("./vdradmin.pl?aktion=rc_show", "_blank", "width=213, height=510, resizable=no, scrollbars=no, status=no, toolbar=no"); } function tv_open() { @@ -23,63 +21,53 @@ </head> <body id="navigation"> - <form action="vdradmin.pl" method="get" name="FormName" target="main"> - <table width="150" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td 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.gif" alt="" height="50" width="150" border="0" /></tmpl_if></a> - </td> - </tr> - <tr><td class="separator"></td></tr> - <tr> - <td class="navi"><a href="vdradmin.pl?aktion=prog_summary" target="main"><%! What's On Now? !%></a></td> - </tr> - <tr><td class="separator"></td></tr> - <tr> - <td class="navi"><a href="vdradmin.pl?aktion=prog_list2" target="main"><%! Playing Today !%></a></td> - </tr> - <tr><td class="separator"></td></tr> - <tr> - <td class="navi"><a href="vdradmin.pl?aktion=prog_timeline" target="main"><%! Timeline !%></a></td> - </tr> - <tr><td class="separator"></td></tr> - <tr> - <td class="navi"><a href="vdradmin.pl?aktion=prog_list" target="main"><%! Channels !%></a></td> - </tr> - <tr><td class="separator"></td></tr> - <tr> - <td class="navi"><a href="vdradmin.pl?aktion=timer_list" target="main"><%! Timer !%></a></td> - </tr> - <tr><td class="separator"></td></tr> - <tr> - <td class="navi"><a href="vdradmin.pl?aktion=at_timer_list" target="main"><%! AutoTimer !%></a></td> - </tr> - <tr><td class="separator"></td></tr> - <tr> - <td class="navi"><a href="vdradmin.pl?aktion=rec_list" target="main"><%! Recordings !%></a></td> - </tr> - <tr><td class="separator"></td></tr> - <tr> - <td class="navi"><a href="vdradmin.pl?aktion=config" target="main"><%! Configuration !%></a></td> - </tr> - <tr><td class="separator"></td></tr> - <tr> - <td class="navi"><a href="javascript:rc_open();"><%! Remote Control !%></a></td> - </tr> - <tr><td class="separator"></td></tr> - <tr> - <td class="navi"><a href="javascript:tv_open();"><%! Watch TV !%></a></td> - </tr> - <tr><td class="separator"></td></tr> - <tr> - <td class="search"> - <input type="text" name="search" size="15" /> - <input type="submit" name="submit" value="<%! Search !%>" /> - <input type="hidden" name="aktion" value="prog_summary" /> - </td> - </tr> - </table> + <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="50px" width="150px" border="0" /></tmpl_if></a> + </div> + <div class="separator"></div> + <div class="navi"> + <a href="vdradmin.pl?aktion=prog_summary" target="main"><%! What's On Now? !%></a> + </div> + <div class="separator"></div> + <div class="navi"> + <a href="vdradmin.pl?aktion=prog_list2" target="main"><%! Playing Today !%></a> + </div> + <div class="separator"></div> + <div class="navi"> + <a href="vdradmin.pl?aktion=prog_timeline" target="main"><%! Timeline !%></a> + </div> + <div class="separator"></div> + <div class="navi"> + <a href="vdradmin.pl?aktion=prog_list" target="main"><%! Channels !%> + </div> + <div class="separator"></div> + <div class="navi"> + <a href="vdradmin.pl?aktion=timer_list" target="main"><%! Timer !%></a> + </div> + <div class="separator"></div> + <div class="navi"> + <a href="vdradmin.pl?aktion=at_timer_list" target="main"><%! AutoTimer !%></a> + </div> + <div class="separator"></div> + <div class="navi"> + <a href="vdradmin.pl?aktion=rec_list" target="main"><%! Recordings !%></a> + </div> + <div class="separator"></div> + <div class="navi"> + <a href="vdradmin.pl?aktion=config" target="main"><%! Configuration !%></a> + </div> + <div class="separator"></div> + <div class="navi"> + <a href="javascript:rc_open();"><%! Remote Control !%></a> + </div> + <div class="separator"></div> + <div class="navi"> + <a href="vdradmin.pl?aktion=tv_show" target="main"><%! Watch TV !%></a> + </div> + <form action="vdradmin.pl" method="get" name="FormName" target="main" class="search"> + <input type="text" name="search" /> + <input type="submit" name="submit" value="<%! Search !%>" /> + <input type="hidden" name="aktion" value="prog_summary" /> </form> </body> - </html> diff --git a/template/default/prog_detail.html b/template/default/prog_detail.html index f8589d3..d62f677 100644 --- a/template/default/prog_detail.html +++ b/template/default/prog_detail.html @@ -25,13 +25,14 @@ <td></td> <td class="col_right"></td> </tr> - <tr class="row_odd"> + <tr class="row_even"> <td class="col_left"></td> <td> <h3><tmpl_var title></h3> <tmpl_if subtitle> - <h4><tmpl_var subtitle></h4><br /> + <h4><tmpl_var subtitle></h4> </tmpl_if> + <br /> <tmpl_var text><br /><br /> <a href="javascript:window.close()">[<%! close !%>]</a> <tmpl_if date> diff --git a/template/default/prog_list.html b/template/default/prog_list.html index 1470195..f4fc6c7 100644 --- a/template/default/prog_list.html +++ b/template/default/prog_list.html @@ -44,9 +44,7 @@ <table width="100%" border="0" cellspacing="0" cellpadding="0" class="group"> <tr class="heading"> <td class="col_left"></td> - <td colspan="3"> - <h2><tmpl_var title></h2> - </td> + <td colspan="3"><h2><tmpl_var title></h2></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> @@ -62,26 +60,22 @@ <tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>"> <td class="col_left"><a name="<tmpl_var anchor>"> </a></td> <td class="col_duration"> - <div><tmpl_var emit> - <tmpl_var duration> <%! o'clock !%></div> + <tmpl_var emit> - <tmpl_var duration> </td> <td class="col_title"> - <div> - <h3><tmpl_var title></h3> - <tmpl_unless subtitle><br /></tmpl_unless> - <h4><tmpl_var subtitle></h4> - </div> + <h3><tmpl_var title></h3> + <tmpl_unless subtitle><br /></tmpl_unless> + <h4><tmpl_var subtitle></h4> </td> <td class="col_info"> - <div> - <tmpl_if infurl> - <a href="javascript:popup('<tmpl_var infurl>');"><img src="bilder/info_button.gif" border="0" alt="info" /></a> - <tmpl_else> - <img src="bilder/info_button_disabled.gif" border="0" alt="noinfo" /> - </tmpl_if> - </div> + <tmpl_if infurl> + <a href="javascript:popup('<tmpl_var infurl>');"><img src="bilder/info_button.gif" border="0" alt="info" /></a> + <tmpl_else> + <img src="bilder/info_button_disabled.gif" border="0" alt="noinfo" /> + </tmpl_if> </td> <td class="col_record"> - <div><a href="<tmpl_var recurl>"><img src="bilder/rec_button.gif" border="0" alt="record" /></a></div> + <a href="<tmpl_var recurl>"><img src="bilder/rec_button.gif" border="0" alt="record" /></a> </td> <td class="col_right"></td> </tr> diff --git a/template/default/prog_list2.html b/template/default/prog_list2.html index a087698..bbe7768 100644 --- a/template/default/prog_list2.html +++ b/template/default/prog_list2.html @@ -66,16 +66,16 @@ <tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>"> <td class="col_left"><a name="<tmpl_var anchor>"> </a></td> <td class="col_duration"> - <div><tmpl_var emit> - <tmpl_var duration> <%! o'clock !%></div> + <tmpl_var emit> - <tmpl_var duration> </td> <td class="col_title"> - <div><h3><tmpl_var title></h3><tmpl_unless subtitle><br /></tmpl_unless><h4><tmpl_var subtitle></h4></div> + <h3><tmpl_var title></h3><tmpl_unless subtitle><br /></tmpl_unless><h4><tmpl_var subtitle></h4> </td> <td class="col_info"> - <div><tmpl_if infurl><a href="javascript:popup('<tmpl_var infurl>');"><img src="bilder/info_button.gif" border="0" /></a><tmpl_else><img src="bilder/info_button_disabled.gif" border="0" /></tmpl_if></div> + <tmpl_if infurl><a href="javascript:popup('<tmpl_var infurl>');"><img src="bilder/info_button.gif" border="0" /></a><tmpl_else><img src="bilder/info_button_disabled.gif" border="0" /></tmpl_if> </td> <td class="col_record"> - <div><a href="<tmpl_var recurl>"><img src="bilder/rec_button.gif" border="0" /></a></div> + <a href="<tmpl_var recurl>"><img src="bilder/rec_button.gif" border="0" /></a> </td> <td class="col_right"></td> </tr> diff --git a/template/default/prog_summary.html b/template/default/prog_summary.html index dbbda85..606b76d 100644 --- a/template/default/prog_summary.html +++ b/template/default/prog_summary.html @@ -56,6 +56,8 @@ <h3><tmpl_var title></h3> <tmpl_if subtitle> <h4><tmpl_var subtitle></h4> + <tmpl_else> + <h4> </h4> </tmpl_if> </div> <div class="summary"> diff --git a/template/default/prog_timeline.html b/template/default/prog_timeline.html index 5f9e61d..046b368 100644 --- a/template/default/prog_timeline.html +++ b/template/default/prog_timeline.html @@ -64,9 +64,25 @@ } } </script> + <script type="text/javascript" language="JavaScript1.2" src="infobox.js"></script> </head> <body id="prog_timeline"> +<div id="infodiv" style="position:absolute; visibility:hidden; z-index:20; top:0px; left:0px;"></div> +<script language="JavaScript" type="text/javascript"> +<?% + FOREACH name = shows2.keys.nsort; + counter = 0; + FOREACH show = shows2.${name}; +%?> + maketip("VDR-<?% show.vdr_id %?>-<?% counter %?>", "<?% show.title %?>", "<%! Duration: !%> <?% date.format(show.start, '%H:%M') %?> - <?% date.format(show.stop, '%H:%M') %?> (<?% (show.stop - show.start) / 60 %?><%! min !%>)" ); +<?% + counter = counter + 1; + END; + END; +%?> +</script> + <form action="<?% nowurl %?>" method="get" name="FormName"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="heading"> <tr> @@ -101,18 +117,7 @@ <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" width="28" height="17" /> - <?% ELSE %?> - <a href="<?% nowurl %?>&time=<?% akt_stunde - zeitrahmen | format('%02d') %?><?% akt_minute | format('%02d') %?>"> - <img src="bilder/pfeile_nachlinks.gif" border="0" width="28" height="17" /> - </a> - <?% END %?> - <a href="<?% nowurl %?>&time=<?% bis_stunde | format('%02d') %?><?% akt_minute | format('%02d') %?>"> - <img src="bilder/pfeile_nachrechts.gif" border="0" width="29" height="17" /> - </a> - </td> + <td class="col_navi"><?% IF akt_stunde <= jetzt_stunde %?><img src="bilder/pfeile_nachlinks_soft.gif" border="0" width="28" height="17" /><?% ELSE %?><a href="<?% nowurl %?>&time=<?% akt_stunde - zeitrahmen | format('%02d') %?><?% akt_minute | format('%02d') %?>"><img src="bilder/pfeile_nachlinks.gif" border="0" width="28" height="17" /></a><?% END %?><a href="<?% nowurl %?>&time=<?% bis_stunde | format('%02d') %?><?% akt_minute | format('%02d') %?>"><img src="bilder/pfeile_nachrechts.gif" border="0" width="29" height="17" /></a></td> <td class="col_right"></td> </tr> <tr class="row_spacer"> @@ -120,7 +125,7 @@ <td colspan="4"></td> <td class="col_right"></td> </tr> - <tr class="row_odd"> + <tr class="row_even"> <td class="col_left"></td> <td colspan="4"> <table border="0" cellpadding="0" cellspacing="0" width="1"> @@ -139,7 +144,7 @@ <tr> <td class="color1"><img src="bilder/spacer.gif" width="<?% seite %?>" height="1" border="0" /><br /></td> <?% WHILE minute < bis %?> - <td width="1%" align="left" valign="bottom" class=<?% minute % 10 ? "color1" : "color2" %?>> + <td width="1%" height="10px" align="left" valign="bottom" class=<?% minute % 10 ? "color1" : "color2" %?>> <?% IF minute % 15 %?> <img src="bilder/pixel.gif" width="1" height="5" border="0" /> <?% ELSE %?> @@ -168,6 +173,7 @@ <nobr> <?% z = 0; + counter = 0; FOREACH show = shows.${name}; start_stunde = date.format(show.start, '%H') - akt_stunde; # start_stunde = (start_stunde < 0 ? 0 : start_stunde); @@ -210,23 +216,22 @@ td_class = show.timer ? "color_timer" : td_class %?> <table border="0" align="left" cellpadding="0" cellspacing="0" id=<?% show.timer ? "timertable" : "prgtable" %?>> <tr> - <td width="1" class="<?% td_class %?>"> + <td width="1" class="<?% td_class %?>" onMouseOver="tip('VDR-<?% show.vdr_id %?>-<?% counter %?>'); return true;" onMouseOut="untip(); return true;"> <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 %?> - <span title="<?% show.title %?> (<?% date.format(show.start, '%H:%M') %?> - <?% date.format(show.stop, '%H:%M') %?>, <?% (show.stop - show.start) / 60 %?><%! min !%>)"> <?% IF laenge_chars > 2 %?> <?% show.title | truncate( laenge_chars ) %?> <?% ELSE %?> <img src="bilder/spacer.gif" width="<?% laenge_pix %?>" height="8" border="0" hspace="0" /> <?% END %?> - </span> <?% IF show.summary %?></a><?% END %?> </nobr> </td> </tr> </table> <?% + counter = counter +1 ; END; z = z + 1; old_start_minute = start_minute; diff --git a/template/default/rec_list.html b/template/default/rec_list.html index 152a863..7694224 100644 --- a/template/default/rec_list.html +++ b/template/default/rec_list.html @@ -31,21 +31,30 @@ </tr> </table> - <table width="100%" border="0" cellspacing="0" cellpadding="0" id="path"> - <tr> - <td> + <div id="path"> <tmpl_loop path> >> <tmpl_if url><a href="<tmpl_var url>"><tmpl_var name></a><tmpl_else><tmpl_var name></tmpl_if> </tmpl_loop> - </td> - </tr> - </table> + </div> <form action="<tmpl_var url>" method="get" name="FormName"> <table width="100%" border="0" cellspacing="0" cellpadding="0" id="content" class="list"> + <colgroup> + <col class="col_left"/> + <col class="col_date"/> + <col class="col_time"/> + <col class="col_name"/> + <col class="col_edit"/> + <col class="col_delete"/> + <col class="col_checkbox"/> +<tmpl_if stream_rec_on> + <col class="col_stream"/> +</tmpL_if> + <col class="col_right"/> + </colgroup> <tr class="heading"> <td class="col_left"></td> - <td colspan="2" class="col_date" <tmpl_if sortbydate>selected="yes"</tmpl_if>> + <td class="col_date" <tmpl_if sortbydate>selected="yes"</tmpl_if>> <h2> <a href="<tmpl_var sortbydateurl>"><%! Date !%> <tmpl_if sortbydate> @@ -56,7 +65,7 @@ </a> </h2> </td> - <td colspan="2" class="col_time" <tmpl_if sortbytime>selected="yes"</tmpl_if>> + <td class="col_time" <tmpl_if sortbytime>selected="yes"</tmpl_if>> <h2> <a href="<tmpl_var sortbytimeurl>"><%! Time !%> <tmpl_if sortbytime> @@ -88,8 +97,8 @@ </tr> <tr class="row_spacer"> <td class="col_left"></td> - <td colspan="2" class="col_date" <tmpl_if sortbydate>selected="yes"</tmpl_if>></td> - <td colspan="2" class="col_time" <tmpl_if sortbytime>selected="yes"</tmpl_if>></td> + <td class="col_date" <tmpl_if sortbydate>selected="yes"</tmpl_if>></td> + <td class="col_time" <tmpl_if sortbytime>selected="yes"</tmpl_if>></td> <td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>></td> <td colspan="<tmpl_if stream_rec_on>4<tmpl_else>3</tmpl_if>"></td> <td class="col_right"></td> @@ -99,18 +108,12 @@ <tr class="<tmpl_if __ODD__>row_odd<tmpl_else>row_even</tmpl_if>"> <td class="col_left"></td> <td class="col_date" <tmpl_if sortbydate>selected="yes"</tmpl_if>> - <div><tmpl_var date></div> - </td> - <td class="col_total" <tmpl_if sortbydate>selected="yes"</tmpl_if>> - <div> - <tmpl_if isfolder> <%! Total !%></tmpl_if> - </div> + <span class="date"><tmpl_var date></span> + <tmpl_if isfolder><span class="total"><%! Total !%></span></tmpl_if> </td> <td class="col_time" <tmpl_if sortbytime>selected="yes"</tmpl_if>> - <div><tmpl_var time></div> - </td> - <td class="col_new" <tmpl_if sortbytime>selected="yes"</tmpl_if>> - <div> + <span class="time"><tmpl_var time></span> + <span class="new"> <tmpl_if isfolder> <%! New !%> <tmpl_else> @@ -118,43 +121,33 @@ <%! New !%> </tmpl_if> </tmpl_if> - </div> + </span> </td> <td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>> - <div> - <tmpl_if isfolder> - <a href="<tmpl_var infurl>"><img align="absmiddle" src="bilder/folder_video.png" border="0" /> <tmpl_var name></a> - <tmpl_else> - <a href="javascript:popup('<tmpl_var infurl>');"><img align="absmiddle" src="bilder/aktion.png" border="0" /> <tmpl_var name></a> - </tmpl_if> - </div> + <tmpl_if isfolder> + <a href="<tmpl_var infurl>"><img align="absmiddle" src="bilder/folder_video.gif" border="0" /> <tmpl_var name></a> + <tmpl_else> + <a href="javascript:popup('<tmpl_var infurl>');"><img align="absmiddle" src="bilder/aktion.gif" border="0" /> <tmpl_var name></a> + </tmpl_if> </td> <td class="col_edit"> - <div> - <tmpl_unless isfolder> - <a href="<tmpl_var editurl>"><img src="bilder/edit.gif" alt="rename" title="<%! Rename !%>" height="17" width="17" border="0" /></a> - </tmpl_unless> - </div> + <tmpl_unless isfolder> + <a href="<tmpl_var editurl>"><img src="bilder/edit.gif" alt="rename" title="<%! Rename !%>" height="17" width="17" border="0" /></a> + </tmpl_unless> </td> <td class="col_delete"> - <div> - <tmpl_unless isfolder> - <a href="javascript:del('<%! Delete recording? !%>', '<tmpl_var delurl>');"><img src="bilder/delete.gif" alt="delete" title="<%! Delete !%>" height="17" width="17" border="0" /></a> - </tmpl_unless> - </div> + <tmpl_unless isfolder> + <a href="javascript:del('<%! Delete recording? !%>', '<tmpl_var delurl>');"><img src="bilder/delete.gif" alt="delete" title="<%! Delete !%>" height="17" width="17" border="0" /></a> + </tmpl_unless> </td> <td class="col_checkbox"> - <div> - <tmpl_unless isfolder><input type="checkbox" name="xxxx_<tmpl_var id>" /></tmpl_unless> - </div> + <tmpl_unless isfolder><input type="checkbox" name="xxxx_<tmpl_var id>" /></tmpl_unless> </td> <tmpl_if stream_rec_on> <td class="col_stream"> - <div> - <tmpl_unless isfolder> - <a href="<tmpl_var streamurl>"><img src="bilder/stream.jpg" alt="stream" title="<%! Stream !%>" height="17" border="0" /></a> - </tmpl_unless> - </div> + <tmpl_unless isfolder> + <a href="<tmpl_var streamurl>"><img src="bilder/stream.jpg" alt="stream" title="<%! Stream !%>" height="17" border="0" /></a> + </tmpl_unless> </td> </tmpl_if> <td class="col_right"></td> @@ -163,8 +156,8 @@ <tr class="footer"> <td class="col_left"></td> - <td colspan="2" class="col_date" <tmpl_if sortbydate>selected="yes"</tmpl_if>></td> - <td colspan="2" class="col_time" <tmpl_if sortbytime>selected="yes"</tmpl_if>></td> + <td class="col_date" <tmpl_if sortbydate>selected="yes"</tmpl_if>></td> + <td class="col_time" <tmpl_if sortbytime>selected="yes"</tmpl_if>></td> <td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>></td> <td colspan="<tmpl_if stream_rec_on>4<tmpl_else>3</tmpl_if>"></td> <td class="col_right"></td> @@ -179,7 +172,7 @@ <option value="<tmpl_var id>"><tmpl_var title></option> </tmpl_loop> </select> - <input type="submit" class="submit" name="rec_runcmd" value="<%! Run !%>" onclick="return confirm(<%! Really run this command? !%>)" /> + <input type="submit" class="submit" name="rec_runcmd" value="<%! Run !%>" onclick="return confirm('<%! Really run this command? !%>')" /> </tmpl_if> <input type="submit" class="submit" name="rec_delete" value="<%! Delete Selected Recordings !%>" onclick="return mdel('<%! Delete all selected recordings? !%>');" /> </div> diff --git a/template/default/style.css b/template/default/style.css index 714b637..3f57d09 100644 --- a/template/default/style.css +++ b/template/default/style.css @@ -2,7 +2,7 @@ #rc, #tv { background-color: black; margin: 0px; } body { background-color: #c4cdd7; margin: 3px; } form { margin: 0px; } -td { color: black; font-weight: normal; font-size: 11px; } +td, div { color: black; font-weight: normal; font-size: 11px; } input { color: black; font-weight: normal; font-size: 11px; } textarea { color: black; font-weight: normal; font-size: 11px; } select { color: black; font-weight: normal; font-size: 11px; } @@ -12,9 +12,9 @@ i { font-style: italic } .submit { height: 20px; } h1 { margin-right: 12px; margin-left: 12px; font-size: 13px; font-weight: bold; color: black; display: inline; } -h2 { margin: 0px; font-size: 11px; font-weight: bold; color: black; } -h3 { margin: 0px 0px; font-size: 11px; font-weight: bold; color: black; } -h4 { margin: 0px 0px; font-size: 11px; font-weight: normal; font-style: italic; color: black; } +h2 { margin: 0px; font-size: 11px; font-weight: bold; color: black; display: inline; } +h3 { margin: 0px; font-size: 11px; font-weight: bold; color: black; } +h4 { margin: 0px; font-size: 11px; font-weight: normal; font-style: italic; color: black; } h5 { margin: 1px 5px; font-size: 11px; font-weight: normal; color: black; text-align: right; } label { cursor: default; } @@ -24,96 +24,103 @@ a:hover { color: gray; text-decoration: none; } label + input { margin-left: 1em; } #tv input, #tv select, #tv h5 { font-weight: normal; font-size: 9px; display: inline; } -#prog_list h2 { display: inline; } -#rec_list .col_name div { font-weight: bold; } +#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; color: red; } .heading { height: 30px; } +.heading h2 { padding-left: 3px; padding-right: 3px; white-space: nowrap; } +.col_label, .col_value, .col_active, .col_channel, .col_start, .col_stop, .col_date, .col_time { padding-left: 3px; padding-right: 3px; white-space: nowrap; } .row_spacer td { height: 10px; } .row_odd, .row_even { height: 25px; } -.col_left, .col_right { width: 30px; height: 25px; } +.col_left, .col_right { min-width: 30px; max-width: 30px; width: 30px; height: 25px; } .col_channels { text-align: right; padding: 10px; width: 40%; } .col_wanted_channels { text-align: left; padding: 10px; width: 40%; } -.col_navi { text-align: right; } +.col_navi { text-align: right; white-space: nowrap; } .heading td[selected] { background-image: url("bilder/uebersicht_oben_selected.gif"); } .heading td { background-image: url("bilder/uebersicht_oben.gif"); } .heading .col_left { background-image: url("bilder/uebersicht_oben_links.gif"); } .heading .col_right { background-image: url("bilder/uebersicht_oben_rechts.gif"); } -.row_even>td[selected] { background-image: url("bilder/uebersicht_mitte_dark_selected.gif"); } -.row_even>td { background-image: url("bilder/uebersicht_mitte_dark.gif"); } -.row_even>.col_left { width: 30px; background-image: url("bilder/uebersicht_links_dark.gif"); } -.row_even>.col_right { width: 30px; background-image: url("bilder/uebersicht_rechts_dark.gif"); } -.row_odd>td[selected], .row_spacer>td[selected] { background-image: url("bilder/uebersicht_mitte_selected.gif"); } -.row_odd>td, .row_spacer>td { background-image: url("bilder/uebersicht_mitte.gif"); } -.row_odd>.col_left, .row_spacer>.col_left { width: 30px; background-image: url("bilder/uebersicht_links.gif"); } -.row_odd>.col_right, .row_spacer>.col_right { width: 30px; background-image: url("bilder/uebersicht_rechts.gif"); } -.footer>td[selected] { height: 30px; background-image: url("bilder/uebersicht_unten_selected.gif"); } -.footer>td { height: 30px; background-image: url("bilder/uebersicht_unten.gif"); } -.footer>.col_left { width: 30px; background-image: url("bilder/uebersicht_unten_links.gif"); } -.footer>.col_right { width: 30px; background-image: url("bilder/uebersicht_unten_rechts.gif"); } - -.heading h2 { margin-right: 5px; margin-left: 6px; white-space: nowrap; } -.row_odd td div, .row_even td div { margin: 3px 5px 0px 5px; white-space: nowrap; } - -.col_duration { width: 170px; vertical-align: top; } -.col_title { vertical-align: top; } -.col_info, .col_record { width: 65px; } -.col_active, .col_stream { width: 70px; } +.row_odd td[selected] { background-image: url("bilder/uebersicht_mitte_dark_selected.gif"); } +.row_odd td { background-image: url("bilder/uebersicht_mitte_dark.gif"); } +.row_odd .col_left { background-image: url("bilder/uebersicht_links_dark.gif"); } +.row_odd .col_right { background-image: url("bilder/uebersicht_rechts_dark.gif"); } +.row_even td[selected], .row_spacer td[selected] { background-image: url("bilder/uebersicht_mitte_selected.gif"); } +.row_even td, .row_spacer td { background-image: url("bilder/uebersicht_mitte.gif"); } +.row_even .col_left, .row_spacer .col_left { background-image: url("bilder/uebersicht_links.gif"); } +.row_even .col_right, .row_spacer .col_right { background-image: url("bilder/uebersicht_rechts.gif"); } +.footer td[selected] { height: 30px; background-image: url("bilder/uebersicht_unten_selected.gif"); } +.footer td { height: 30px; background-image: url("bilder/uebersicht_unten.gif"); } +.footer .col_left { background-image: url("bilder/uebersicht_unten_links.gif"); } +.footer .col_right { background-image: url("bilder/uebersicht_unten_rechts.gif"); } + +.col_duration { padding-left: 3px; padding-right: 3px; width: 120px; vertical-align: top; } +.col_name, .col_title * { padding-left: 3px; padding-right: 3px; min-width: 50px; white-space: normal; } +.col_info, .col_record { width: 65px; text-align: center; } +.col_active, .col_stream { width: 70px; max-width: 70px; } .col_channel { width: 120px; } -.col_start, .col_stop, .col_date, .col_time { width: 60px; text-align: right; } -.col_total, .col_new { width: 10px; text-align: center; padding-left: 3px; padding-right: 3px; } -.col_edit, .col_delete, .col_checkbox { text-align: center; width: 30px; } -.col_name div, .col_title div { white-space: normal; } +.col_start, .col_stop, .col_date, .col_time { width: 66px; text-align: right; } +.col_edit, .col_delete, .col_checkbox { text-align: center; width: 30px; max-width: 30px; } +#rec_list .col_date, #rec_list .col_time { width: 76px; } #heading { height: 39px; } #heading tr, #heading td { vertical-align: middle; } -#heading .col_left { width: 15px; background-image: url("bilder/nav_button_back_start.gif"); } +#heading .col_left { min-width: 15px; width: 15px; background-image: url("bilder/nav_button_back_start.gif"); } #heading .col_title { background-image: url("bilder/nav_button_back_mitte.gif"); } #heading .col_other { text-align: right; background-image: url("bilder/nav_button_back_mitte.gif"); } #heading .col_other span { float: right; } #heading .col_help { text-align: center; width: 45px; background-image: url("bilder/nav_button_back_mitte.gif"); } -#heading .col_right { width: 15px; background-image: url("bilder/nav_button_back_end.gif"); } +#heading .col_right { min-width: 15px; width: 15px; background-image: url("bilder/nav_button_back_end.gif"); } -#prog_timeline #prgtable td.col_content, #prog_timeline #timeline td.col_content { background-image: none; } +#prog_timeline .row_even table td, #timer_list .row_even table td { background-image: none; } #prog_timeline #prgtable { border-left-color:#c4cdd7; border-bottom-color:#c4cdd7; } #prog_timeline #timertable { background:red; border-left-color:#ffcdd7; border-bottom-color:#ffcdd7; } #prog_timeline #timeline { background:red; } #prog_timeline .color_current { background-color: #f7fffa; } #prog_timeline .color_broadcast { background-color: #e6eee9; } #prog_timeline .color_timer { background-color: #ffeee9; } -#rec_list #path { margin: 1em 10px; } +#rec_list #path { margin: 1em 10px 0px 10px; } #timer_list .color_ok { background-color: #00a317; } #timer_list .color_conflict { background-color: #a11917; } #timer_list .color_collision { background-color: #ffde62; } #timer_list .color_inactive { background-color: #858585; } #timer_list #prgtable { border-left-color:#000000; border-right-color:#000000; } -.color1 { background-color: #e6eff9; } -.color2 { background-color: #d5dee8; } +#prog_timeline .row_even table td.color1, #timer_list .row_even table td.color1 { background-color: #e6eff9; } +#prog_timeline .row_even table td.color2, #timer_list .row_even table td.color2 { background-color: #d5dee8; } + +#prog_detail td { white-space: normal; } +#prog_detail .heading h2 { white-space: normal; } #content { margin-top: 1em; } .group { margin-top: 0.5em; } #buttons { margin-top: 0.5em; text-align: right; } -#prog_summary .group { margin: 3px; width: 272px; display: inline; float: left; } -#prog_summary h2 { display: inline; } +/* Summary */ +#prog_summary .group { margin: 3px; float: left; } +#prog_summary h2 { padding: 0px; } #prog_summary .heading { height: 29px; } -#prog_summary .heading td { height: 29px; width: 240px; background-image: url("bilder/sum_top_mid.gif"); white-space: nowrap; overflow: hidden; } -#prog_summary .heading .col_left { width: 12px; height: 29px; background-image: url("bilder/sum_top_left.gif"); } -#prog_summary .heading .col_right { width: 12px; height: 29px; background-image: url("bilder/sum_top_right.gif"); } -#prog_summary .row_odd>td { width: 246px; height: 300px; background-image: url("bilder/sum_mid.gif"); vertical-align: top; } -#prog_summary .row_odd>.col_left { width: 12px; height: 300px; background-image: url("bilder/sum_left.gif"); } -#prog_summary .row_odd>.col_right { width: 12px; height: 300px; background-image: url("bilder/sum_right.gif"); } -#prog_summary .footer>td { height: 38px; width: 240px; background-image: url("bilder/sum_bottom_mid.gif"); text-align: center; vertical-align: middle; } -#prog_summary .footer .col_left { width: 12px; height: 38px; background-image: url("bilder/sum_bottom_left.gif"); } -#prog_summary .footer .col_right { width: 12px; height: 38px; background-image: url("bilder/sum_bottom_right.gif"); } +#prog_summary .heading td { height: 29px; width: 246px; background-image: url("bilder/sum_top_mid.gif"); white-space: nowrap; overflow: hidden; } +#prog_summary .heading .col_left { min-width: 12px; width: 12px; height: 29px; background-image: url("bilder/sum_top_left.gif"); } +#prog_summary .heading .col_right { min-width: 12px; width: 12px; height: 29px; background-image: url("bilder/sum_top_right.gif"); } +#prog_summary .row_odd td { width: 246px; height: 200px; background-image: url("bilder/sum_mid.gif"); vertical-align: top; } +#prog_summary .row_odd .col_left { min-width: 12px; width: 12px; height: 200px; background-image: url("bilder/sum_left.gif"); } +#prog_summary .row_odd .col_right { min-width: 12px; width: 12px; height: 200px; background-image: url("bilder/sum_right.gif"); } +#prog_summary .footer td { height: 38px; width: 246px; background-image: url("bilder/sum_bottom_mid.gif"); text-align: center; vertical-align: middle; } +#prog_summary .footer .col_left { min-width: 12px; width: 12px; height: 38px; background-image: url("bilder/sum_bottom_left.gif"); } +#prog_summary .footer .col_right { min-width: 12px; width: 12px; height: 38px; background-image: url("bilder/sum_bottom_right.gif"); } #prog_summary .date { text-align: right; margin-top: 1em; float: left; } #prog_summary .duration { text-align: right; margin-top: 1em; } -#prog_summary .title { margin-top: 1em; width: 240px; overflow: hidden; } -#prog_summary .summary { margin-top: 1em; margin-bottom: 1em; width: 240px; height: 190px; overflow: hidden; white-space: normal; } +#prog_summary .title { margin-top: 1em; width: 246px; overflow: hidden; white-space: nowrap; } +#prog_summary .summary { margin-top: 1em; margin-bottom: 1em; width: 240px; height: 100px; overflow: hidden; white-space: normal; } + +/* Tooltips */ +.tt_table { width: 250px; border: 2px solid #333399; background-color: #ccccff; } +.tt_table th { background-color: #333399; font-weight: bold; color: white; padding-left: 2px; padding-right: 2px; } +.tt_table td { color: black; padding-left: 5px; padding-right: 5px; } +/* Help */ #help dt { margin-top: 0.6em; font-weight: bold; font-style: italic; } #help dd dl dt { margin-top: 0.3em; font-weight: normal; font-style: italic; } #help dl { padding: 5px; } @@ -132,11 +139,10 @@ label + input { margin-left: 1em; } /* Navigation */ #navigation { margin: 0px; background-image: url("bilder/back.gif"); } -#navigation .logo { padding-top: 2em; padding-bottom: 3em; } +#navigation .logo { padding-top: 2em; padding-bottom: 3em; width: 150px; } +#navigation .navi { font-size: 12px; padding-top: 6px; height: 25px; text-align: center; width: 148px; } +#navigation .search { padding-top: 2em; font-size: 12px; width: 148px; text-align: center; } +#navigation .separator { height: 2px; background-image: url("bilder/separator.png"); width: 148px; } #navigation a { color: black; font-weight: bold; text-decoration: none; } -#navigation a:hover { color: black; font-weight: bold; text-decoration: underline; } -#navigation .navi { padding-left: 0.5em; font-size: 12px; height: 25px; text-align: center; } -#navigation .search { padding-top: 2em; padding-left: 0.5em; padding-right: 0.5em; font-size: 12px; } -#navigation input { width: 100%; } -#navigation .separator { height: 2px; background-image: url("bilder/separator.png"); } - +#navigation a:hover { text-decoration: underline; } +#navigation input { width: 130px; } diff --git a/template/default/timer_list.html b/template/default/timer_list.html index 02b94f3..afc95a1 100644 --- a/template/default/timer_list.html +++ b/template/default/timer_list.html @@ -19,14 +19,10 @@ <div id="infodiv" style="position:absolute; visibility:hidden; z-index:20; top:0px; left:0px;"></div> <script language="JavaScript" type="text/javascript"> <?% - sender=""; FOREACH timer = timers2; - IF timer.cdesc != sender && timer.starttime <= current && timer.stoptime >= current; - sender=timer.cdesc; %?> - maketip('VDR-<?% timer.vdr_id %?>', '<?% timer.title %?>', '<%! Priority: !%> <?% timer.prio %?><br /><%! Lifetime: !%> <?% timer.lft %?><br /><%! Duration: !%> (<?% timer.start %?> - <?% timer.stop %?>, <?% timer.duration %?><%! min !%>)' ); + maketip("VDR-<?% timer.id %?>", "<?% timer.title %?>", "<%! Priority: !%> <?% timer.prio %?><br /><%! Lifetime: !%> <?% timer.lft %?><br /><%! Duration: !%> <?% timer.start %?> - <?% timer.stop %?> (<?% timer.duration %?><%! min !%>)" ); <?% - END; END; %?> </script> @@ -83,7 +79,7 @@ <td colspan="2"></td> <td class="col_right"></td> </tr> - <tr class="row_odd"> + <tr class="row_even"> <td class="col_left"></td> <td colspan="2" align="center"> <table cellspacing="0" cellpadding="0" border="0"> @@ -97,7 +93,7 @@ ende=((stunde * 60 / faktor) +0.5 ) | format('%i'); %?> - <td class=<?% (stunde % 2) == 1 ? "color2" : "color1" %?> align="center"><img src="bilder/spacer.gif" width="<?% ende-pos %?>" height="1" border="0" /><br /><?% stunde - 1 %?></td> + <td class="<?% (stunde % 2) == 1 ? 'color2' : 'color1' %?>" align="center"><img src="bilder/spacer.gif" width="<?% ende-pos %?>" height="1" border="0" /><br /><?% stunde - 1 %?></td> <?% pos=ende; END; @@ -121,7 +117,7 @@ <table cellspacing="0" cellpadding="0" border="0"> <tr> - <td class="<?% (programm % 2) == 0 ? color2 : color1 %?>" height="20" width="100"><img src="bilder/spacer.gif" width="100" height="1" border="0" /><br /><b><?% sender | truncate(11) %?></b></td> + <td class="<?% (programm % 2) == 0 ? 'color2' : 'color1' %?>" height="20" width="100"><img src="bilder/spacer.gif" width="100" height="1" border="0" /><br /><b><?% sender | truncate(11) %?></b></td> <?% pos=0; @@ -154,19 +150,19 @@ IF start>pos; %?> - <td class="<?% (programm % 2) == 0 ? color2 : color1 %?>"><img src="bilder/spacer.gif" width="<?% start-pos %?>" height="1" border="0" /><br /></td> + <td class="<?% (programm % 2) == 0 ? 'color2' : 'color1' %?>"><img src="bilder/spacer.gif" width="<?% start-pos %?>" height="1" border="0" /><br /></td> <?% pos=start; END; IF ende - pos < 2; %?> - <td class="<?% td_class %?>"><span onMouseOver="tip('VDR-<?% timer.vdr_id %?>'); return true;" onMouseOut="untip(); return true;" xtitle="<?% sendung.title %?> / <%! Priority: !%> <?% timer.prio %?> / <%! Lifetime: !%> <?% timer.lft %?> / <%! Duration: !%> (<?% timer.start %?> - <?% timer.stop %?>, <?% timer.duration %?><%! min !%>)"><img src="bilder/spacer.gif" width="<?% ende - pos %?>" height="20" border="0" /></span></td> + <td class="<?% td_class %?>"><span onMouseOver="tip('VDR-<?% sendung.id %?>'); return true;" onMouseOut="untip(); return true;"><img src="bilder/spacer.gif" width="<?% ende - pos %?>" height="20" border="0" /></span></td> <?% ELSE; %?> - <td class="<?% td_class %?>" id="prgtable"><span onMouseOver="tip('VDR-<?% timer.vdr_id %?>'); return true;" onMouseOut="untip(); return true;" xtitle="<?% sendung.title %?> / <%! Priority: !%> <?% timer.prio %?> / <%! Lifetime: !%> <?% timer.lft %?> / <%! Duration: !%> (<?% timer.start %?> - <?% timer.stop %?>, <?% timer.duration %?><%! min !%>)"><img src="bilder/spacer.gif" width="<?% ende - pos - 2 %?>" height="20" border="0" /></span></td> + <td class="<?% td_class %?>" id="prgtable"><span onMouseOver="tip('VDR-<?% sendung.id %?>'); return true;" onMouseOut="untip(); return true;"><img src="bilder/spacer.gif" width="<?% ende - pos - 2 %?>" height="20" border="0" /></span></td> <?% END; @@ -175,7 +171,7 @@ END; IF pos<tablaenge; %?> - <td class="<?% (programm % 2) == 0 ? color2 : color1 %?>"><img src="bilder/spacer.gif" width="<?% tablaenge - pos %?>" height="1" border="0" /><br /></td> + <td class="<?% (programm % 2) == 0 ? 'color2' : 'color1' %?>"><img src="bilder/spacer.gif" width="<?% tablaenge - pos %?>" height="1" border="0" /><br /></td> <?% END; @@ -207,6 +203,19 @@ <form action="<tmpl_var url>" method="get" name="FormName"> <table width="100%" border="0" cellspacing="0" cellpadding="0" class="list"> + <colgroup> + <col class="col_left"/> + <col class="col_active"/> + <col class="col_channel"/> + <col class="col_date"/> + <col class="col_start"/> + <col class="col_stop"/> + <col class="col_name"/> + <col class0"col_edit"/> + <col class="col_delete"/> + <col class="col_checkbox"/> + <col class="col_right"/> + </colgroup> <tr class="heading"> <td class="col_left"></td> <td class="col_active" <tmpl_if sortbyactive>selected="yes"</tmpl_if>> @@ -333,7 +342,7 @@ <div><tmpl_var stop></div> </td> <td class="col_name" <tmpl_if sortbyname>selected="yes"</tmpl_if>> - <div title="<%! Priority: !%> <tmpl_var prio> / <%! Lifetime: !%> <tmpl_var lft>"> + <div onMouseOver="tip('VDR-<tmpl_var id>'); return true;" onMouseOut="untip(); return true;"> <tmpl_if recording><img align="absmiddle" src="bilder/rec.gif" border="0" /> </tmpl_if> <tmpl_if infurl> <a href="javascript:popup('<tmpl_var infurl>');"><tmpl_var title></a> diff --git a/template/default/tv.html b/template/default/tv.html index 723b68c..fc606e0 100644 --- a/template/default/tv.html +++ b/template/default/tv.html @@ -58,6 +58,10 @@ WebcamUpdate(); }; } + + function tv_open() { + window.open("./vdradmin.pl?aktion=tv_show&new_win=1", "_blank", "width=615, height=548, resizable=yes, scrollbars=no, status=no, toolbar=no"); + } //--> </script> </head> @@ -193,7 +197,7 @@ <input type="button" class="submit" name="livebild" value='<%! G !%>' title="<%! Grab the picture! !%>" onClick="WebcamUpdate()" /> </nobr> </td> - <td colspan="2"></td> + <td colspan="2" align="right"><tmpl_unless new_win><a href="javascript:tv_open();"><%! Open in separate window !%></a> </tmpl_unless></td> </tr> <tr> <td colspan="3"></td> |
