From 3112e5ba1215481ff4f9f7c41f762beecbd0eda7 Mon Sep 17 00:00:00 2001
From: Andreas Brachold <vdr07@deltab.de>
Date: Fri, 2 Nov 2007 16:34:09 +0000
Subject: * xstyle fix some warnings

---
 skins/xstyle/bloecke/percentbar.tmpl | 8 ++++----
 skins/xstyle/now.tmpl                | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/skins/xstyle/bloecke/percentbar.tmpl b/skins/xstyle/bloecke/percentbar.tmpl
index d128e39..67322c2 100644
--- a/skins/xstyle/bloecke/percentbar.tmpl
+++ b/skins/xstyle/bloecke/percentbar.tmpl
@@ -9,13 +9,13 @@
      %?>
 
 <div align="center" style='position:absolute'>
-    <img src="<?% ground %?>" width="<?% barwidth %?>" title='<?% percent | format "%02d" %?>%'>
-    <div style='position:absolute; top:0px; left:0px; clip:rect(0px, <?% percent * barexp  | format "%d" %?>px, 50px, 0px)'>
-    <img src="<?% over %?>" width="<?% barwidth %?>" title='<?% percent | format "%02d" %?>%'>
+    <img src="<?% ground %?>" width="<?% barwidth %?>" title='<?% percent div 1 %?>%'>
+    <div style='position:absolute; top:0px; left:0px; clip:rect(0px, <?% ( percent * barexp ) div 1 %?>px, 50px, 0px)'>
+    <img src="<?% over %?>" width="<?% barwidth %?>" title='<?% percent div 1 %?>%'>
     </div>
     <?% IF barwidth > 200 %?>
     <div style='position:absolute; top:10px; right:<?% 15 %?>px; color:#FFFFFF;font-weight:bold'>
-    <?% percent | format "%02d" %?>%<?% IF eta %?> (<?% eta %?>)<?% END %?>
+    <?% percent div 1 | format "%02d" %?>%<?% IF eta %?> (<?% eta %?>)<?% END %?>
     </div>
     <?% END %?>
 </div>
diff --git a/skins/xstyle/now.tmpl b/skins/xstyle/now.tmpl
index 65904f1..f50b047 100644
--- a/skins/xstyle/now.tmpl
+++ b/skins/xstyle/now.tmpl
@@ -7,7 +7,7 @@
 <?%
     USE date( );
     zeitformat = gettext("%A the %D at %H:%M o'clock");
-    IF cgi.param('data') > 2400;
+    IF cgi.param('data') && cgi.param('data') > 2400;
         t = date.format(cgi.param('data'), '%H:%M');
         day = date.format(cgi.param('data'), zeitformat, locale) ;
     ELSIF cgi.param('data') && param.zeit;
@@ -78,7 +78,7 @@
                 <td><?% IF param.timers.${id} && param.timers.${id}.Status %?><b><?% END %?><?% stop %?><?% IF param.timers.${id} && param.timers.${id}.Status %?></b><?% END %?></td>
                 <?% UNLESS duration > 100 OR duration <= 0 %?>
                 <td width="100" valign='bottom'><nobr>
-                    <?% per = (100 - duration) + 0.999 | format('%d'); per = (per > 100 ? 100 : per)  %?>
+                    <?% per = (100 - duration) + 0.999 div 1; per = (per > 100 ? 100 : per)  %?>
                     <?% INCLUDE 'bloecke/percentbar.tmpl' barwidth=100 percent=per color_switch=1 %?>
                 </td>
                 <?% END %?>
-- 
cgit v1.2.3