* AUTOTIMER: use startdate/stopdate to limit search for time ranges

* Skins: marks was'nt visable

3 files changed, 22 insertions, 24 deletions

diff --git a/skins/deltab/rdisplay.tmpl b/skins/deltab/rdisplay.tmpl
index 1417e8c..776c24a 100644
--- a/skins/deltab/rdisplay.tmpl
+++ b/skins/deltab/rdisplay.tmpl
@@ -4,7 +4,16 @@
 <?% subtitle = data.SubTitle %?>
 <?% id = data.RecordId %?>
 <?% allowplay = 1 IF allow('rplay') or allow('playrecord') %?>
-
+<?%-  IF data.Type == 'RADIO';
+          mylist = [ "images/audio", global.imagetyp ];
+          files =  [ mylist.join('.') ];
+       ELSIF param.previews.size <= 0;
+          mylist = [ "images/movie", global.imagetyp ];
+          files = mylist.join('.');
+       ELSE;
+          files = param.previews; 
+       END;
+  -%?>
 
 <script language="javascript" type="text/javascript">
 <!--
@@ -12,9 +21,8 @@
     document.forms.offset.__start.value = wert;
   }  
   function playstart(cmd) {
-    var url = '?cmd='+cmd + '&data=<?% id %?>&__start=' + document.forms.offset.__start.value;
-      location.href = url;
-    }
+    var url = '?cmd='+ cmd + '&data=<?% id %?>&__start=' + document.forms.offset.__start.value;
+    location.href = url;
   }
 -->
 </script>
@@ -32,16 +40,6 @@
 <?% END %?>
 <?% ######################################################################## %?>
 <?% BLOCK image %?>
-	<?%-  IF data.Type == 'RADIO';
-            mylist = [ "images/audio", global.imagetyp ];
-            files =  [ mylist.join('.') ];
-         ELSIF param.previews.size <= 0;
-            mylist = [ "images/movie", global.imagetyp ];
-            files = mylist.join('.');
-         ELSE;
-            files = param.previews; 
-         END;
-    -%?>
 						<?% IF files.size %?>
 						<table summary="">
 							<tr>
@@ -113,7 +111,7 @@
         <td colspan="<?% colspan %?>" style="white-space: nowrap">
 		<?%- secold = 0;
 	        c = -1;
-	        ml = d.split(',');
+	        ml = data.Marks.split(',');
 		-%?>
 		<?% IF ml.size > 1 %?>
 		<?%- 
@@ -135,7 +133,7 @@
             IF data.Duration > secold;
             class = (class == 'marksright2' ? 'marksright1' : 'marksright2'); 
             percent = ((data.Duration - secold) / data.Duration) * width;
-            -%?><img class="<?% class %?>" src="images/blank.gif" width="<?% ( percent - 1 ) div 1 %?>" height="12" title="<?% (c < 0 ? "0:00:00.00" : ml.$c) %?> - <?% data.Duration div 3600 %?>:<?% data.Duration div 60 mod 60 | format('%02d') %?>:<?% data.Duration mod 60 | format('%02d') %?>" />
+            -%?><img class="<?% class %?>" src="images/blank.gif" width="<?% ( percent - 1 ) div 1 %?>" height="12" title="<?% (c < 0 ? "0:00:00.00" : ml.$c) %?> - <?% PROCESS hfs d=data.Duration %?>" />
             <?% END %?>
         <?% ELSE %?>
 			<img class="marksleft" src="images/blank.gif" width="0" height="12" /><img class="marksright2" src="images/blank.gif" width="<?% width %?>" height="12" />
diff --git a/skins/stone/rdisplay.tmpl b/skins/stone/rdisplay.tmpl
index 47f9c0f..b97053b 100644
--- a/skins/stone/rdisplay.tmpl
+++ b/skins/stone/rdisplay.tmpl
@@ -117,7 +117,7 @@
 <?% END %?>
 <?% ######################################################################## %?>
 <?% BLOCK marks # (c) xpix %?>
-    <?% width = 500 #data.Duration > 7200 ? 600 : 500 %?>
+    <?% width = 550 %?>
     <table  width="<?% width %?>" align="center" summary="">
     <tr>
         <?%- c = 0; 
@@ -162,7 +162,7 @@
         <td colspan="<?% colspan %?>" style="white-space: nowrap">
 		<?%- secold = 0;
 	        c = -1;
-	        ml = d.split(',');
+	        ml = data.Marks.split(',');
 		-%?>
 		<?% IF ml.size > 1 %?>
 		<?%- 
@@ -184,7 +184,7 @@
             IF data.Duration > secold;
             class = (class == 'marksright2' ? 'marksright1' : 'marksright2'); 
             percent = ((data.Duration - secold) / data.Duration) * width;
-            -%?><img class="<?% class %?>" src="images/blank.gif" width="<?% ( percent - 1 ) div 1 %?>" height="12" title="<?% (c < 0 ? "0:00:00.00" : ml.$c) %?> - "<?% PROCESS hfs d=data.Duration %?>" />
+            -%?><img class="<?% class %?>" src="images/blank.gif" width="<?% ( percent - 1 ) div 1 %?>" height="12" title="<?% (c < 0 ? "0:00:00.00" : ml.$c) %?> - <?% PROCESS hfs d=data.Duration %?>" />
             <?% END %?>
         <?% ELSE %?>
 			<img class="marksleft" src="images/blank.gif" width="0" height="12" /><img class="marksright2" src="images/blank.gif" width="<?% width %?>" height="12" />
@@ -249,7 +249,7 @@
 							</tr>
 							<tr>
 								<td colspan="2">
-						            <?% PROCESS marks d=data.Marks %?>
+						            <?% PROCESS marks %?>
 					            </td>
 							</tr>
                             <tr>
diff --git a/skins/stone_flat/rdisplay.tmpl b/skins/stone_flat/rdisplay.tmpl
index 00c3c37..a6608d7 100644
--- a/skins/stone_flat/rdisplay.tmpl
+++ b/skins/stone_flat/rdisplay.tmpl
@@ -117,7 +117,7 @@
 <?% END %?>
 <?% ######################################################################## %?>
 <?% BLOCK marks # (c) xpix %?>
-    <?% width = 450 #data.Duration > 7200 ? 600 : 500 %?>
+    <?% width = 550 %?>
     <table  width="<?% width %?>" align="center" summary="">
     <tr>
         <?%- c = 0; 
@@ -162,7 +162,7 @@
         <td colspan="<?% colspan %?>" style="white-space: nowrap">
 		<?%- secold = 0;
 	        c = -1;
-	        ml = d.split(',');
+	        ml = data.Marks.split(',');
 		-%?>
 		<?% IF ml.size > 1 %?>
 		<?%- 
@@ -184,7 +184,7 @@
             IF data.Duration > secold;
             class = (class == 'marksright2' ? 'marksright1' : 'marksright2'); 
             percent = ((data.Duration - secold) / data.Duration) * width;
-            -%?><img class="<?% class %?>" src="images/blank.gif" width="<?% ( percent - 1 ) div 1 %?>" height="12" title="<?% (c < 0 ? "0:00:00.00" : ml.$c) %?> - <?% data.Duration div 3600 %?>:<?% data.Duration div 60 mod 60 | format('%02d') %?>:<?% data.Duration mod 60 | format('%02d') %?>" />
+            -%?><img class="<?% class %?>" src="images/blank.gif" width="<?% ( percent - 1 ) div 1 %?>" height="12" title="<?% (c < 0 ? "0:00:00.00" : ml.$c) %?> - <?% PROCESS hfs d=data.Duration %?>" />
             <?% END %?>
         <?% ELSE %?>
 			<img class="marksleft" src="images/blank.gif" width="0" height="12" /><img class="marksright2" src="images/blank.gif" width="<?% width %?>" height="12" />
@@ -249,7 +249,7 @@
 							</tr>
 							<tr>
 								<td colspan="2">
-						            <?% PROCESS marks d=data.Marks %?>
+						            <?% PROCESS marks %?>
 					            </td>
 							</tr>
                             <tr>