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, 22 insertions, 13 deletions

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" />&nbsp;</tmpl_if>
 							<tmpl_if infurl>
 								<a href="javascript:popup('<tmpl_var infurl>');"><tmpl_var title></a>