[Fmsystem-commits] [10485] logistic: datetime on activity

[Sigurd Nes]

Revision: 10485
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10485
Author:   sigurdne
Date:     2012-11-06 12:24:24 +0000 (Tue, 06 Nov 2012)
Log Message:
-----------
logistic: datetime on activity

Modified Paths:
--------------
    trunk/logistic/inc/class.uiactivity.inc.php
    trunk/logistic/templates/base/activity/add_activity_item.xsl
    trunk/logistic/templates/base/activity/view_activity_item.xsl

Modified: trunk/logistic/inc/class.uiactivity.inc.php
===================================================================
--- trunk/logistic/inc/class.uiactivity.inc.php 2012-11-06 12:07:16 UTC (rev 
10484)
+++ trunk/logistic/inc/class.uiactivity.inc.php 2012-11-06 12:24:24 UTC (rev 
10485)
@@ -450,8 +450,8 @@
                        $this->use_yui_editor('description');
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('logistic') . '::' . lang('Add activity');
 
-                       $GLOBALS['phpgw']->jqcal->add_listener('start_date');
-                       $GLOBALS['phpgw']->jqcal->add_listener('end_date');
+                       $GLOBALS['phpgw']->jqcal->add_listener('start_date', 
'datetime');
+                       $GLOBALS['phpgw']->jqcal->add_listener('end_date', 
'datetime');
                        
                        self::add_javascript('logistic', 'logistic', 
'activity.js');
                        self::render_template_xsl('activity/add_activity_item', 
$data);

Modified: trunk/logistic/templates/base/activity/add_activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/add_activity_item.xsl        
2012-11-06 12:07:16 UTC (rev 10484)
+++ trunk/logistic/templates/base/activity/add_activity_item.xsl        
2012-11-06 12:24:24 UTC (rev 10485)
@@ -1,5 +1,6 @@
 <xsl:template match="data" 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>
 
 <xsl:call-template name="yui_phpgw_i18n"/>
 <div class="yui-navset yui-navset-top">
@@ -143,14 +144,14 @@
                                                                        <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
                                                                </xsl:if>
                                                                <div 
class="help_text"><xsl:value-of select="php:function('lang','Give start date to 
activity')" /></div>
-                                                               <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="activity/start_date != ''">
-                                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $date_format, 
number(activity/start_date))"/></xsl:attribute>
+                                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $datetime_format, 
number(activity/start_date))"/></xsl:attribute>
                                                        </xsl:if>
                                                </input>
                                                        </xsl:when>
                                                        <xsl:otherwise>
-                                                       <span><xsl:value-of 
select="php:function('date', $date_format, 
number(activity/start_date))"/></span>
+                                                       <span><xsl:value-of 
select="php:function('date', $datetime_format, 
number(activity/start_date))"/></span>
                                                        </xsl:otherwise>
                                                </xsl:choose>
                                        </dd>
@@ -165,14 +166,14 @@
                                                                        <div 
class='input_error_msg'><xsl:value-of select="php:function('lang', $error_msg)" 
/></div>
                                                                </xsl:if>
                                                                <div 
class="help_text"><xsl:value-of select="php:function('lang','Give end date to 
activity')" /></div>
-                                                               <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="activity/end_date != ''">
-                                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $date_format, 
number(activity/end_date))"/></xsl:attribute>
+                                                       <xsl:attribute 
name="value"><xsl:value-of select="php:function('date', $datetime_format, 
number(activity/end_date))"/></xsl:attribute>
                                                        </xsl:if>
                                                </input>
                                                        </xsl:when>
                                                        <xsl:otherwise>
-                                                       <span><xsl:value-of 
select="php:function('date', $date_format, number(activity/end_date))"/></span>
+                                                       <span><xsl:value-of 
select="php:function('date', $datetime_format, 
number(activity/end_date))"/></span>
                                                        </xsl:otherwise>
                                                </xsl:choose>
                                        </dd>

Modified: trunk/logistic/templates/base/activity/view_activity_item.xsl
===================================================================
--- trunk/logistic/templates/base/activity/view_activity_item.xsl       
2012-11-06 12:07:16 UTC (rev 10484)
+++ trunk/logistic/templates/base/activity/view_activity_item.xsl       
2012-11-06 12:24:24 UTC (rev 10485)
@@ -1,5 +1,6 @@
 <xsl:template name="activity_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">
@@ -30,13 +31,13 @@
                                                <label 
for="start_date"><xsl:value-of select="php:function('lang','Start date')" 
/></label>
                                        </dt>
                                        <dd>
-                                               <span><xsl:value-of 
select="php:function('date', $date_format, 
number(activity/start_date))"/></span>
+                                               <span><xsl:value-of 
select="php:function('date', $datetime_format, 
number(activity/start_date))"/></span>
                                        </dd>
                                        <dt>
                                                <label 
for="end_date"><xsl:value-of select="php:function('lang','End date')" /></label>
                                        </dt>
                                        <dd>
-                                               <span><xsl:value-of 
select="php:function('date', $date_format, number(activity/end_date))"/></span>
+                                               <span><xsl:value-of 
select="php:function('date', $datetime_format, 
number(activity/end_date))"/></span>
                                        </dd>
                                        <dt>
                                                <label 
for="end_date">Ansvarlig</label>