[Fmsystem-commits] [10474] logistic: datetime handling

[Sigurd Nes]

Revision: 10474
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10474
Author:   sigurdne
Date:     2012-11-06 09:47:48 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
logistic: datetime handling

Modified Paths:
--------------
    trunk/logistic/templates/base/css/base.css
    trunk/logistic/templates/base/requirement/requirement_item.xsl

Modified: trunk/logistic/templates/base/css/base.css
===================================================================
--- trunk/logistic/templates/base/css/base.css  2012-11-06 09:17:05 UTC (rev 
10473)
+++ trunk/logistic/templates/base/css/base.css  2012-11-06 09:47:48 UTC (rev 
10474)
@@ -928,7 +928,7 @@
 
 input.datetime {
   text-align: right;
-  width: 100px;
+  width: 110px;
 }
 
 /* =======================================  CHECK LIST  
========================================= */

Modified: trunk/logistic/templates/base/requirement/requirement_item.xsl
===================================================================
--- trunk/logistic/templates/base/requirement/requirement_item.xsl      
2012-11-06 09:17:05 UTC (rev 10473)
+++ trunk/logistic/templates/base/requirement/requirement_item.xsl      
2012-11-06 09:47:48 UTC (rev 10474)
@@ -1,5 +1,6 @@
 <xsl:template name="requirement_details" xmlns:php="http://php.net/xsl";>
 <xsl:variable name="date_format"><xsl:value-of 
select="php:function('get_phpgw_info', 
'user|preferences|common|dateformat')"/></xsl:variable>
+<xsl:variable name="datetime_format"><xsl:value-of 
select="$date_format"/><xsl:text> H:i</xsl:text></xsl:variable>
 
 <div class="content-wrp">
        <div id="details">
@@ -21,15 +22,15 @@
                                                                <xsl:variable 
name="error_msg"><xsl:value-of select="requirement/error_msg_array/start_date" 
/></xsl:variable>
                                                                <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
                                                        </xsl:if>
-                                                       <input class="date" 
id="start_date" name="start_date" type="text">
+                                                       <input class="datetime" 
id="start_date" name="start_date" type="text">
                                                    <xsl:if 
test="requirement/start_date != ''">
-                                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $date_format, 
number(requirement/start_date))"/></xsl:attribute>
+                                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $datetime_format, 
number(requirement/start_date))"/></xsl:attribute>
                                                    </xsl:if>
                                        </input>
                                        <span class="help_text line">Angi 
startdato for aktiviteten</span>
                                                </xsl:when>
                                                <xsl:otherwise>
-                                               <span><xsl:value-of 
select="php:function('date', $date_format, 
number(requirement/start_date))"/></span>
+                                               <span><xsl:value-of 
select="php:function('date', $datetime_format, 
number(requirement/start_date))"/></span>
                                                </xsl:otherwise>
                                        </xsl:choose>
                                </dd>
@@ -43,15 +44,15 @@
                                                                <xsl:variable 
name="error_msg"><xsl:value-of select="requirement/error_msg_array/end_date" 
/></xsl:variable>
                                                                <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
                                                        </xsl:if>
-                                                       <input class="date" 
id="end_date" name="end_date" type="text">
+                                                       <input class="datetime" 
id="end_date" name="end_date" type="text">
                                                <xsl:if 
test="requirement/end_date != ''">
-                                               <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $date_format, 
number(requirement/end_date))"/></xsl:attribute>
+                                               <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $datetime_format, 
number(requirement/end_date))"/></xsl:attribute>
                                                </xsl:if>
                                        </input>
                                        <span class="help_text line">Angi 
startdato for aktiviteten</span>
                                                </xsl:when>
                                                <xsl:otherwise>
-                                               <span><xsl:value-of 
select="php:function('date', $date_format, 
number(requirement/end_date))"/></span>
+                                               <span><xsl:value-of 
select="php:function('date', $datetime_format, 
number(requirement/end_date))"/></span>
                                                </xsl:otherwise>
                                        </xsl:choose>
                                </dd>