[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10449] controller: change datepicker
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [10449] controller: change datepicker |
Date: |
Sun, 04 Nov 2012 13:14:31 +0000 |
Revision: 10449
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10449
Author: sigurdne
Date: 2012-11-04 13:14:30 +0000 (Sun, 04 Nov 2012)
Log Message:
-----------
controller: change datepicker
Modified Paths:
--------------
trunk/controller/inc/class.uiprocedure.inc.php
trunk/controller/templates/base/procedure/procedure_item.xsl
Modified: trunk/controller/inc/class.uiprocedure.inc.php
===================================================================
--- trunk/controller/inc/class.uiprocedure.inc.php 2012-11-04 12:40:15 UTC
(rev 10448)
+++ trunk/controller/inc/class.uiprocedure.inc.php 2012-11-04 13:14:30 UTC
(rev 10449)
@@ -378,14 +378,22 @@
'label' =>
lang('View_documents_for_procedure')
));
+
$GLOBALS['phpgw']->jqcal->add_listener('start_date');
+
$GLOBALS['phpgw']->jqcal->add_listener('end_date');
+
$GLOBALS['phpgw']->jqcal->add_listener('revision_date');
+
+ $end_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_end_date() ? $procedure->get_end_date():'');
+ $revision_date =
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_revision_date() ? $procedure->get_revision_date():'');
+
+
$data = array
(
'tabs'
=> $GLOBALS['phpgw']->common->create_tabs($tabs, 0),
'view'
=> "view_procedure",
'value_id'
=> !empty($procedure) ? $procedure->get_id() : 0,
- 'start_date' =>
$GLOBALS['phpgw']->yuical->add_listener('start_date',date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
($procedure->get_start_date())?$procedure->get_start_date():time())),
- 'end_date'
=>
$GLOBALS['phpgw']->yuical->add_listener('end_date',date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
($procedure->get_end_date())?$procedure->get_end_date():'')),
- 'revision_date' =>
$GLOBALS['phpgw']->yuical->add_listener('revision_date',date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
($procedure->get_revision_date())?$procedure->get_revision_date():'')),
+ 'start_date' =>
date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
$procedure->get_start_date() ? $procedure->get_start_date():time()),
+ 'end_date'
=> $end_date ? $end_date : '',
+ 'revision_date' =>
$revision_date ? $revision_date : '',
'editable'
=> true,
'procedure'
=> $procedure_array,
//'control_area'
=> array('options' => $control_area_options),
Modified: trunk/controller/templates/base/procedure/procedure_item.xsl
===================================================================
--- trunk/controller/templates/base/procedure/procedure_item.xsl
2012-11-04 12:40:15 UTC (rev 10448)
+++ trunk/controller/templates/base/procedure/procedure_item.xsl
2012-11-04 13:14:30 UTC (rev 10449)
@@ -52,11 +52,11 @@
<dd>
<xsl:choose>
<xsl:when test="editable">
- <xsl:value-of
disable-output-escaping="yes" select="start_date"/>
+ <input type="text"
id="start_date" name="start_date" size="10" value="{start_date}"
readonly="readonly">
+ </input>
</xsl:when>
<xsl:otherwise>
- <xsl:variable
name="startdate"><xsl:value-of select="procedure/start_date" /></xsl:variable>
- <xsl:value-of
select="php:function('date', $date_format, $startdate)" />
+ <xsl:value-of
select="start_date" />
</xsl:otherwise>
</xsl:choose>
</dd>
@@ -66,32 +66,28 @@
<dd>
<xsl:choose>
<xsl:when test="editable">
- <xsl:value-of
disable-output-escaping="yes" select="revision_date"/>
+ <input type="text"
id="revision_date" name="revision_date" size="10" value="{revision_date}"
readonly="readonly">
+ </input>
</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', $date_format, $revisiondate)" />
- </xsl:if>
+ <xsl:value-of
select="revision_date" />
</xsl:otherwise>
</xsl:choose>
</dd>
- <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:choose>
<xsl:when test="editable">
- <xsl:value-of
disable-output-escaping="yes" select="end_date"/>
+ <input type="text"
id="end_date" name="end_date" size="10" value="{end_date}" readonly="readonly">
+ </input>
</xsl:when>
<xsl:otherwise>
- <xsl:variable
name="enddate"><xsl:value-of select="procedure/end_date" /></xsl:variable>
- <xsl:value-of
select="php:function('date', $date_format, $enddate)" />
+ <xsl:value-of
select="end_date" />
</xsl:otherwise>
</xsl:choose>
</dd>
- </xsl:if>
<dt>
<label
for="purpose"><xsl:value-of select="php:function('lang','Procedure purpose')"
/></label>
</dt>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10449] controller: change datepicker,
Sigurd Nes <=