[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8038]
From: |
Erik Holm-Larsen |
Subject: |
[Fmsystem-commits] [8038] |
Date: |
Mon, 07 Nov 2011 10:02:20 +0000 |
Revision: 8038
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8038
Author: erikhl
Date: 2011-11-07 10:02:19 +0000 (Mon, 07 Nov 2011)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uiprocedure.inc.php
trunk/controller/templates/base/procedure_item.xsl
Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php 2011-11-07 08:46:51 UTC
(rev 8037)
+++ trunk/controller/inc/class.uiprocedure.inc.php 2011-11-07 10:02:19 UTC
(rev 8038)
@@ -351,9 +351,7 @@
'value_id'
=> !empty($procedure) ? $procedure->get_id() : 0,
'img_go_home' =>
'rental/templates/base/images/32x32/actions/go-home.png',
'procedure'
=> $procedure_array,
- 'start_date' =>
$procedure_start_date,
- 'end_date'
=> $procedure_end_date,
- 'revision_date' =>
$procedure_revision_date,
+ 'dateformat' =>
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
'values'
=> $table_values,
'table_header' =>
$table_header,
);
Modified: trunk/controller/templates/base/procedure_item.xsl
===================================================================
--- trunk/controller/templates/base/procedure_item.xsl 2011-11-07 08:46:51 UTC
(rev 8037)
+++ trunk/controller/templates/base/procedure_item.xsl 2011-11-07 10:02:19 UTC
(rev 8038)
@@ -3,6 +3,7 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl">
<xsl:call-template name="yui_booking_i18n"/>
+<xsl:variable name="dateformat"><xsl:value-of select="dateformat"
/></xsl:variable>
<div class="identifier-header">
<h1><img src="{img_go_home}" />
<xsl:value-of select="php:function('lang', 'Procedure')" />
@@ -54,20 +55,46 @@
<label
for="start_date"><xsl:value-of select="php:function('lang','Procedure start
date')" /></label>
</dt>
<dd>
- <xsl:value-of
disable-output-escaping="yes" select="start_date"/>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <xsl:value-of
disable-output-escaping="yes" select="start_date"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable
name="startdate"><xsl:value-of select="procedure/start_date" /></xsl:variable>
+ <xsl:value-of
select="php:function('date', $dateformat, $startdate)" />
+ </xsl:otherwise>
+ </xsl:choose>
</dd>
<dt>
<label
for="revision_date"><xsl:value-of select="php:function('lang','Procedure
revision date')" /></label>
</dt>
<dd>
- <xsl:value-of
disable-output-escaping="yes" select="revision_date"/>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <xsl:value-of
disable-output-escaping="yes" select="revision_date"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:if
test="procedure/revision_date != 0">
+ <xsl:variable
name="revisiondate"><xsl:value-of select="procedure/revision_date"
/></xsl:variable>
+ <xsl:value-of
select="php:function('date', $dateformat, $revisiondate)" />
+ </xsl:if>
+ </xsl:otherwise>
+ </xsl:choose>
</dd>
- <xsl:if test="end_date != ''">
+ <xsl:if test="procedure/end_date != 0">
<dt>
<label
for="end_date"><xsl:value-of select="php:function('lang','Procedure end date')"
/></label>
</dt>
<dd>
- <xsl:value-of
disable-output-escaping="yes" select="end_date"/>
+ <xsl:choose>
+ <xsl:when test="editable">
+ <xsl:value-of
disable-output-escaping="yes" select="end_date"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:variable
name="enddate"><xsl:value-of select="procedure/end_date" /></xsl:variable>
+ <xsl:value-of
select="php:function('date', $dateformat, $enddate)" />
+ </xsl:otherwise>
+ </xsl:choose>
</dd>
</xsl:if>
<dt>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8038],
Erik Holm-Larsen <=