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.

1 files changed, 64 insertions, 58 deletions

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; }