Update of /var/cvs/applications/editwizard/templates/data/xsl
In directory james.mmbase.org:/tmp/cvs-serv27470

Modified Files:
      Tag: MMBase-1_8
        wizard.xsl 
Log Message:
  MMB-1774


See also: 
http://cvs.mmbase.org/viewcvs/applications/editwizard/templates/data/xsl
See also: http://www.mmbase.org/jira/browse/MMB-1774


Index: wizard.xsl
===================================================================
RCS file: /var/cvs/applications/editwizard/templates/data/xsl/wizard.xsl,v
retrieving revision 1.160.2.20
retrieving revision 1.160.2.21
diff -u -b -r1.160.2.20 -r1.160.2.21
--- wizard.xsl  29 Oct 2008 13:58:18 -0000      1.160.2.20
+++ wizard.xsl  13 Jan 2009 14:27:38 -0000      1.160.2.21
@@ -13,7 +13,7 @@
     @author Nico Klasens
     @author Martijn Houtman
     @author Robin van Meteren
-    @version $Id: wizard.xsl,v 1.160.2.20 2008/10/29 13:58:18 michiel Exp $
+    @version $Id: wizard.xsl,v 1.160.2.21 2009/01/13 14:27:38 michiel Exp $
 
     This xsl uses Xalan functionality to call java classes
     to format dates and call functions on nodes
@@ -932,10 +932,18 @@
   </xsl:template>
 
   <xsl:template name="ftype-datetime-time">
+
+    <xsl:variable name="tz">
+      <xsl:choose>
+        <xsl:when test="@ftype = 'duration'">UTC</xsl:when>
+        <xsl:otherwise><xsl:value-of 
select="string($timezone)"/></xsl:otherwise>
+      </xsl:choose>
+    </xsl:variable>
+
     <select name="interna...@fieldname}_hours" super="{...@fieldname}">
       <xsl:call-template name="loop-options">
         <xsl:with-param name="value">0</xsl:with-param>
-        <xsl:with-param name="selected" select="date:getHours(string(value), 
string($timezone))" />
+        <xsl:with-param name="selected" select="date:getHours(string(value), 
$tz)" />
         <xsl:with-param name="end" select="23" />
       </xsl:call-template>
     </select>
@@ -943,7 +951,7 @@
     <select name="interna...@fieldname}_minutes" super="{...@fieldname}">
       <xsl:call-template name="loop-options">
         <xsl:with-param name="value">0</xsl:with-param>
-        <xsl:with-param name="selected" select="date:getMinutes(string(value), 
string($timezone))" />
+        <xsl:with-param name="selected" select="date:getMinutes(string(value), 
$tz)" />
         <xsl:with-param name="end" select="59" />
       </xsl:call-template>
     </select>
@@ -952,7 +960,7 @@
       <select name="interna...@fieldname}_seconds" super="{...@fieldname}">
         <xsl:call-template name="loop-options">
           <xsl:with-param name="value">0</xsl:with-param>
-          <xsl:with-param name="selected" 
select="date:getSeconds(string(value), string($timezone))" />
+          <xsl:with-param name="selected" 
select="date:getSeconds(string(value), $tz)" />
           <xsl:with-param name="end" select="59" />
         </xsl:call-template>
       </select>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to