[Fmsystem-commits] [11276] property: date info

[Sigurd Nes]

Revision: 11276
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11276
Author:   sigurdne
Date:     2013-09-06 09:24:58 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
property: date info

Modified Paths:
--------------
    trunk/property/inc/class.uitenant_claim.inc.php
    trunk/property/templates/base/tenant_claim.xsl

Modified: trunk/property/inc/class.uitenant_claim.inc.php
===================================================================
--- trunk/property/inc/class.uitenant_claim.inc.php     2013-09-05 13:13:55 UTC 
(rev 11275)
+++ trunk/property/inc/class.uitenant_claim.inc.php     2013-09-06 09:24:58 UTC 
(rev 11276)
@@ -307,7 +307,7 @@
                        $uicols['name'][7]['name'] = 'name';
                        $uicols['name'][7]['value'] = 'name';
 
-                       $uicols['name'][8]['name'] = 'time created';
+                       $uicols['name'][8]['name'] = 'entry date';
                        $uicols['name'][8]['value'] = 'entry_date';
 
                        $uicols['name'][9]['name'] = 'user';
@@ -850,6 +850,7 @@
                                        'workorder_link'                        
                => $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uiworkorder.view')),
                                        'lang_start_date'                       
                => lang('Project start date'),
                                        'value_start_date'                      
                => $project_values['start_date'],
+                                       'value_entry_date'                      
                => $values['entry_date'] ? 
$GLOBALS['phpgw']->common->show_date($values['entry_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'])
 : '',
 
                                        'property_js'                           
                => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
                                        'base_java_url'                         
                => json_encode(array(menuaction => 
"property.uitenant_claim.edit",claim_id=>$claim_id)),
@@ -1214,8 +1215,7 @@
 
                                        'done_action'                           
                => $GLOBALS['phpgw']->link('/index.php',array('menuaction'=> 
'property.uitenant_claim.index')),
                                        'lang_done'                             
                        => lang('done'),
-                                       'value_date'                            
                => 
$GLOBALS['phpgw']->common->show_date($tenant_claim['entry_date'])
-
+                                       'value_entry_date'                      
                => $values['entry_date'] ? 
$GLOBALS['phpgw']->common->show_date($values['entry_date'],$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'])
 : '',
                                );
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('Tenant claim') . '::' . lang('view claim');
 

Modified: trunk/property/templates/base/tenant_claim.xsl
===================================================================
--- trunk/property/templates/base/tenant_claim.xsl      2013-09-05 13:13:55 UTC 
(rev 11275)
+++ trunk/property/templates/base/tenant_claim.xsl      2013-09-06 09:24:58 UTC 
(rev 11276)
@@ -201,6 +201,14 @@
                                                </tr>
                                                <tr>
                                                        <td valign="top">
+                                                               <xsl:value-of 
select="php:function('lang', 'entry date')" />
+                                                       </td>
+                                                       <td>
+                                                               <xsl:value-of 
select="value_entry_date"/>
+                                                       </td>
+                                               </tr>
+                                               <tr>
+                                                       <td valign="top">
                                                                <xsl:value-of 
select="lang_start_date"/>
                                                        </td>
                                                        <td>
@@ -376,7 +384,7 @@
 
        <!-- New template-->
        <!-- view -->
-       <xsl:template match="view">
+       <xsl:template match="view" xmlns:php="http://php.net/xsl";>
                <div align="left">
                        <table cellpadding="2" cellspacing="2" width="79%" 
align="left">
                                <tr>
@@ -556,6 +564,15 @@
                                </tr>
                                <tr>
                                        <td valign="top">
+                                               <xsl:value-of 
select="php:function('lang', 'entry date')" />
+                                       </td>
+                                       <td>
+                                               <xsl:value-of 
select="value_entry_date"/>
+                                       </td>
+                               </tr>
+
+                               <tr>
+                                       <td valign="top">
                                                <xsl:value-of 
select="lang_start_date"/>
                                        </td>
                                        <td>