[Fmsystem-commits] [7690]

[Erik Holm-Larsen]

Revision: 7690
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7690
Author:   erikhl
Date:     2011-09-20 11:56:25 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/inc/class.uicontrol.inc.php
    trunk/controller/templates/base/control.xsl

Modified: trunk/controller/inc/class.uicontrol.inc.php
===================================================================
--- trunk/controller/inc/class.uicontrol.inc.php        2011-09-20 11:53:45 UTC 
(rev 7689)
+++ trunk/controller/inc/class.uicontrol.inc.php        2011-09-20 11:56:25 UTC 
(rev 7690)
@@ -76,7 +76,8 @@
                        (
                                'tabs'                                          
=> phpgwapi_yui::tabview_generate($tabs, 'details'),
                                'resource'                                      
=> $resource,
-                               'date'                                          
=> 
$GLOBALS['phpgw']->yuical->add_listener('date',date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
 time())),
+                               'start_date'                            => 
$GLOBALS['phpgw']->yuical->add_listener('start_date',date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
 time())),
+                               'end_date'                                      
=> 
$GLOBALS['phpgw']->yuical->add_listener('end_date',date($GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'],
 time())),
                                'value_id'                                      
=> !empty($control) ? $control->get_id() : 0,
                                'img_go_home'                           => 
'rental/templates/base/images/32x32/actions/go-home.png',
                                'editable'                                      
=> true,

Modified: trunk/controller/templates/base/control.xsl
===================================================================
--- trunk/controller/templates/base/control.xsl 2011-09-20 11:53:45 UTC (rev 
7689)
+++ trunk/controller/templates/base/control.xsl 2011-09-20 11:56:25 UTC (rev 
7690)
@@ -29,13 +29,13 @@
                                                <label 
for="start_date">Startdato</label>
                                        </dt>
                                        <dd>
-                                               <xsl:value-of 
disable-output-escaping="yes" select="date"/>
+                                               <xsl:value-of 
disable-output-escaping="yes" select="start_date"/>
                                        </dd>
                                        <dt>
                                                <label 
for="end_date">Sluttdato</label>
                                        </dt>
                                        <dd>
-                                               <xsl:value-of 
disable-output-escaping="yes" select="date"/>
+                                               <xsl:value-of 
disable-output-escaping="yes" select="end_date"/>
                                        </dd>
                                        <dt>
                                                <label>Frekvenstype</label>