fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [16938] Stable: Merge 16935:16937 from trunk


From: sigurdne
Subject: [Fmsystem-commits] [16938] Stable: Merge 16935:16937 from trunk
Date: Tue, 1 Aug 2017 05:24:27 -0400 (EDT)

Revision: 16938
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16938
Author:   sigurdne
Date:     2017-08-01 05:24:26 -0400 (Tue, 01 Aug 2017)
Log Message:
-----------
Stable: Merge 16935:16937 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/addressbook/inc/class.menu.inc.php
    branches/Version-2_0-branch/addressbook/setup/phpgw_no.lang
    branches/Version-2_0-branch/property/inc/class.boadmin_entity.inc.php
    branches/Version-2_0-branch/property/inc/class.uisubstitute.inc.php
    branches/Version-2_0-branch/property/inc/class.uitts.inc.php
    branches/Version-2_0-branch/property/setup/phpgw_no.lang
    branches/Version-2_0-branch/property/templates/base/admin_entity.xsl
    branches/Version-2_0-branch/property/templates/base/agreement.xsl
    branches/Version-2_0-branch/property/templates/base/attrib_history.xsl
    branches/Version-2_0-branch/property/templates/base/custom.xsl
    branches/Version-2_0-branch/property/templates/base/entity.xsl
    branches/Version-2_0-branch/property/templates/base/generic_document.xsl
    branches/Version-2_0-branch/property/templates/base/investment.xsl
    branches/Version-2_0-branch/property/templates/base/location.xsl
    branches/Version-2_0-branch/property/templates/base/project.xsl
    branches/Version-2_0-branch/property/templates/base/report.xsl
    branches/Version-2_0-branch/property/templates/base/request.xsl
    branches/Version-2_0-branch/property/templates/base/responsible.xsl
    branches/Version-2_0-branch/property/templates/base/s_agreement.xsl
    branches/Version-2_0-branch/property/templates/base/substitute.xsl
    branches/Version-2_0-branch/property/templates/base/tenant_claim.xsl
    branches/Version-2_0-branch/property/templates/base/tts.xsl
    branches/Version-2_0-branch/property/templates/base/workorder.xsl

Property Changed:
----------------
    branches/Version-2_0-branch/

Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch 2017-08-01 09:24:26 UTC (rev 16938)

Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
 /branches/dev-syncromind:13653
 /branches/dev-syncromind-2:14933-16846
 /branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934,16936-16937
\ No newline at end of property
Modified: branches/Version-2_0-branch/addressbook/inc/class.menu.inc.php
===================================================================
--- branches/Version-2_0-branch/addressbook/inc/class.menu.inc.php      
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/addressbook/inc/class.menu.inc.php      
2017-08-01 09:24:26 UTC (rev 16938)
@@ -95,7 +95,7 @@
 
                                        array
                                        (
-                                               'text'  => 'Notes Types 
Manager',
+                                               'text'  => 
$GLOBALS['phpgw']->translation->translate('Notes Types Manager', array(), true),
                                                'url'   =>  
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'addressbook.uicatalog_contact_note_type.view') )
                                        ),
 

Modified: branches/Version-2_0-branch/addressbook/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/addressbook/setup/phpgw_no.lang 2017-08-01 
09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/addressbook/setup/phpgw_no.lang 2017-08-01 
09:24:26 UTC (rev 16938)
@@ -17,3 +17,8 @@
 tomorrow is %1's birthday.     common  no      I morgen er det %1's fødselsdag.
 work phone     addressbook     no      Arbeids telefon
 zip code       addressbook     no      Postnummer
+communication types manager    common  no      Kommunikasjonstyper
+communication descriptions manager     common  no      
Kommunikasjonstypebeskrivelse
+location manager       common  no      Lokasjonstyper
+Notes Types Manager    common  no      Notattyper
+custom fields on org-person    common  no      Egentilpassede felt for 
org-person
\ No newline at end of file

Modified: branches/Version-2_0-branch/property/inc/class.boadmin_entity.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.boadmin_entity.inc.php       
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/inc/class.boadmin_entity.inc.php       
2017-08-01 09:24:26 UTC (rev 16938)
@@ -595,9 +595,9 @@
                        return $this->so->get_path($entity_id, $node);
                }
 
-               function read_category_tree2( $entity_id, $table )
+               function read_category_tree2( $entity_id )
                {
-                       return $this->so->read_category_tree2($entity_id, 
$table);
+                       return $this->so->read_category_tree2($entity_id);
                }
 
                function get_children2( $entity_id, $parent, $level, $reset = 
false, $table )

Modified: branches/Version-2_0-branch/property/inc/class.uisubstitute.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uisubstitute.inc.php 
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/inc/class.uisubstitute.inc.php 
2017-08-01 09:24:26 UTC (rev 16938)
@@ -149,6 +149,7 @@
 
                        self::add_javascript('property', 'portico', 
'substitute.index.js');
 
+                       self::add_jquery_translation($data);
                        
$GLOBALS['phpgw']->xslttpl->add_file(array('substitute', 'datatable_inline'));
                        $GLOBALS['phpgw']->xslttpl->set_var('phpgw', 
array('table' => $data));
                }

Modified: branches/Version-2_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uitts.inc.php        
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/inc/class.uitts.inc.php        
2017-08-01 09:24:26 UTC (rev 16938)
@@ -1708,6 +1708,7 @@
                        phpgwapi_jquery::formvalidator_generate(array('date', 
'security','file'));
                        $this->_insert_custom_js();
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('property') . ' - ' . $appname . ': ' . $function_msg;
+                       self::add_jquery_translation($data);
                        $GLOBALS['phpgw']->xslttpl->add_file(array('tts', 
'files', 'attributes_form'));
                        $GLOBALS['phpgw']->xslttpl->set_var('phpgw', 
array('add' => $data));
                        //      $GLOBALS['phpgw']->xslttpl->pp();
@@ -3109,6 +3110,7 @@
                        $appname = lang('helpdesk');
                        $function_msg = lang('view ticket detail');
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('property') . ' - ' . $appname . ': ' . $function_msg;
+                       self::add_jquery_translation($data);
                        $GLOBALS['phpgw']->xslttpl->set_var('phpgw', 
array('view' => $data));
                }
 

Modified: branches/Version-2_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/property/setup/phpgw_no.lang    2017-08-01 
09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/setup/phpgw_no.lang    2017-08-01 
09:24:26 UTC (rev 16938)
@@ -2221,4 +2221,7 @@
 workorder recalculate actual cost      property        no      Rekalkuler 
faktisk kostnad for bestillinger
 none selected  property        no      Ingen valgt
 direction      property        no      Retning
-directory      property        no      Katalog
\ No newline at end of file
+directory      property        no      Katalog
+select template        property        no      Velg mal
+select parent  property        no      Velg forelder
+attribute groups       property        no      Attributtgrupper
\ No newline at end of file

Modified: branches/Version-2_0-branch/property/templates/base/admin_entity.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/admin_entity.xsl        
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/templates/base/admin_entity.xsl        
2017-08-01 09:24:26 UTC (rev 16938)
@@ -3,6 +3,7 @@
 <xsl:template match="data">
        <xsl:choose>
                <xsl:when test="edit">
+                       <xsl:call-template name="jquery_phpgw_i18n"/>
                        <xsl:apply-templates select="edit"/>
                </xsl:when>
                <xsl:when test="list_attribute">

Modified: branches/Version-2_0-branch/property/templates/base/agreement.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/agreement.xsl   
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/templates/base/agreement.xsl   
2017-08-01 09:24:26 UTC (rev 16938)
@@ -1,5 +1,6 @@
   <!-- $Id$ -->
        <xsl:template match="data">
+               <xsl:call-template name="jquery_phpgw_i18n"/>
                <xsl:choose>
                        <xsl:when test="edit">
                                <xsl:apply-templates select="edit"/>

Modified: branches/Version-2_0-branch/property/templates/base/attrib_history.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/attrib_history.xsl      
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/templates/base/attrib_history.xsl      
2017-08-01 09:24:26 UTC (rev 16938)
@@ -2,12 +2,12 @@
 <!-- $Id$ -->
 <!-- attrib_history -->
 <xsl:template match="data">
+       <xsl:call-template name="jquery_phpgw_i18n"/>
        <xsl:choose>
                <xsl:when test="attrib_history">
                        <xsl:apply-templates select="attrib_history"/>
                </xsl:when>
        </xsl:choose>
-       <xsl:call-template name="jquery_phpgw_i18n"/>
 </xsl:template>
 
 <xsl:template match="attrib_history">

Modified: branches/Version-2_0-branch/property/templates/base/custom.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/custom.xsl      
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/templates/base/custom.xsl      
2017-08-01 09:24:26 UTC (rev 16938)
@@ -1,6 +1,7 @@
 
 <!-- $Id$ -->
 <xsl:template match="data">
+       <xsl:call-template name="jquery_phpgw_i18n"/>
        <xsl:choose>
                <xsl:when test="edit">
                        <xsl:apply-templates select="edit"/>

Modified: branches/Version-2_0-branch/property/templates/base/entity.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/entity.xsl      
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/templates/base/entity.xsl      
2017-08-01 09:24:26 UTC (rev 16938)
@@ -1,6 +1,7 @@
 
 <!-- $Id$ -->
 <xsl:template match="data">
+       <xsl:call-template name="jquery_phpgw_i18n"/>
        <xsl:choose>
                <xsl:when test="edit">
                        <xsl:apply-templates select="edit"/>
@@ -15,7 +16,6 @@
                        <xsl:apply-templates select="add_inventory"/>
                </xsl:when>
        </xsl:choose>
-       <xsl:call-template name="jquery_phpgw_i18n"/>
 </xsl:template>
 
 

Modified: 
branches/Version-2_0-branch/property/templates/base/generic_document.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/generic_document.xsl    
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/templates/base/generic_document.xsl    
2017-08-01 09:24:26 UTC (rev 16938)
@@ -23,209 +23,211 @@
                                <xsl:value-of disable-output-escaping="yes" 
select="tabs"/>
 
                                <div id="generic">
-                                               <xsl:choose>
-                                                       <xsl:when 
test="document/id!=''">
-                                                               <div 
class="pure-control-group">
-                                                                       <label>
-                                                                               
<xsl:value-of select="php:function('lang', 'id')" />
-                                                                       </label>
-                                                                       
<xsl:value-of select="document/id"/>
-                                                                       <input 
type="hidden" name="id" id="id" value="{document/id}"/>
+                                       <xsl:choose>
+                                               <xsl:when 
test="document/id!=''">
+                                                       <div 
class="pure-control-group">
+                                                               <label>
+                                                                       
<xsl:value-of select="php:function('lang', 'id')" />
+                                                               </label>
+                                                               <xsl:value-of 
select="document/id"/>
+                                                               <input 
type="hidden" name="id" id="id" value="{document/id}"/>
 
-                                                               </div>
-                                                       </xsl:when>
-                                               </xsl:choose>
+                                                       </div>
+                                               </xsl:when>
+                                       </xsl:choose>
 
-                                               <xsl:choose>
-                                                       <xsl:when 
test="location_data2!=''">
-                                                               <xsl:choose>
-                                                                       
<xsl:when test="editable = 1">
-                                                                               
<xsl:call-template name="location_form2"/>
-                                                                       
</xsl:when>
-                                                                       
<xsl:otherwise>
-                                                                               
<xsl:call-template name="location_view2"/>
-                                                                       
</xsl:otherwise>
-                                                               </xsl:choose>
-                                                       </xsl:when>
-                                               </xsl:choose>
-
-                                               <div class="pure-control-group">
-                                                       <label for="name">
-                                                               <xsl:value-of 
select="php:function('lang', 'name')" />
-                                                       </label>
+                                       <xsl:choose>
+                                               <xsl:when 
test="location_data2!=''">
                                                        <xsl:choose>
                                                                <xsl:when 
test="editable = 1">
-                                                                       <input 
id="title" name='values[title]' type="text" value="{document/title}">
-                                                                               
<xsl:attribute name="data-validation">
-                                                                               
        <xsl:text>required</xsl:text>
-                                                                               
</xsl:attribute>
-                                                                               
<xsl:attribute name="data-validation-error-msg">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Please enter a title !')"/>
-                                                                               
</xsl:attribute>
-                                                                       </input>
+                                                                       
<xsl:call-template name="location_form2"/>
                                                                </xsl:when>
                                                                <xsl:otherwise>
-                                                                       
<xsl:value-of select="document/title" />
+                                                                       
<xsl:call-template name="location_view2"/>
                                                                </xsl:otherwise>
                                                        </xsl:choose>
-                                               </div>
+                                               </xsl:when>
+                                       </xsl:choose>
 
-                                               <div class="pure-control-group" 
>
-                                                       <label for="name">
-                                                               <xsl:value-of 
select="php:function('lang', 'description')" />
-                                                       </label>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="editable = 1">
-                                                                       
<textarea id="descr" rows="6" style="width:40%; resize:none;" 
name="values[descr]">
-                                                                               
<xsl:attribute name="data-validation">
-                                                                               
        <xsl:text>required</xsl:text>
-                                                                               
</xsl:attribute>
-                                                                               
<xsl:attribute name="data-validation-error-msg">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Please enter a description 
!')"/>
-                                                                               
</xsl:attribute>
-                                                                               
<xsl:value-of select="document/descr" disable-output-escaping="yes"/>
-                                                                       
</textarea>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
+                                       <div class="pure-control-group">
+                                               <label for="name">
+                                                       <xsl:value-of 
select="php:function('lang', 'name')" />
+                                               </label>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="editable = 1">
+                                                               <input 
id="title" name='values[title]' type="text" value="{document/title}">
+                                                                       
<xsl:attribute name="data-validation">
+                                                                               
<xsl:text>required</xsl:text>
+                                                                       
</xsl:attribute>
+                                                                       
<xsl:attribute name="data-validation-error-msg">
+                                                                               
<xsl:value-of select="php:function('lang', 'Please enter a title !')"/>
+                                                                       
</xsl:attribute>
+                                                               </input>
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                               <xsl:value-of 
select="document/title" />
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                       </div>
+
+                                       <div class="pure-control-group" >
+                                               <label for="name">
+                                                       <xsl:value-of 
select="php:function('lang', 'description')" />
+                                               </label>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="editable = 1">
+                                                               <textarea 
id="descr" rows="6" style="width:40%; resize:none;" name="values[descr]">
+                                                                       
<xsl:attribute name="data-validation">
+                                                                               
<xsl:text>required</xsl:text>
+                                                                       
</xsl:attribute>
+                                                                       
<xsl:attribute name="data-validation-error-msg">
+                                                                               
<xsl:value-of select="php:function('lang', 'Please enter a description !')"/>
+                                                                       
</xsl:attribute>
                                                                        
<xsl:value-of select="document/descr" disable-output-escaping="yes"/>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </div>
+                                                               </textarea>
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                               <xsl:value-of 
select="document/descr" disable-output-escaping="yes"/>
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                       </div>
 
-                                               <div class="pure-control-group">
-                                                       <label for="category">
-                                                               <xsl:value-of 
select="php:function('lang', 'category')" />
-                                                               <br/>
-                                                               <h3>-or 
multiple &quot;TAGS&quot;</h3>
-                                                       </label>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="editable = 1">
-                                                                       <select 
id="cat_id" name="values[cat_id]">
-                                                                               
<xsl:attribute name="data-validation">
-                                                                               
        <xsl:text>required</xsl:text>
-                                                                               
</xsl:attribute>
-                                                                               
<xsl:attribute name="data-validation-error-msg">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Please enter a category 
!')"/>
-                                                                               
</xsl:attribute>
-                                                                               
<xsl:apply-templates select="categories/options"/>
-                                                                       
</select>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:for-each select="categories/options">
-                                                                               
<xsl:if test="selected = 'selected' or selected = 1">
-                                                                               
        <xsl:value-of disable-output-escaping="yes" select="name"/>
-                                                                               
</xsl:if>
-                                                                       
</xsl:for-each>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </div>
+                                       <div class="pure-control-group">
+                                               <label for="category">
+                                                       <xsl:value-of 
select="php:function('lang', 'category')" />
+                                                       <br/>
+                                                       <h3>-or multiple 
&quot;TAGS&quot;</h3>
+                                               </label>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="editable = 1">
+                                                               <select 
id="cat_id" name="values[cat_id]">
+                                                                       
<xsl:attribute name="data-validation">
+                                                                               
<xsl:text>required</xsl:text>
+                                                                       
</xsl:attribute>
+                                                                       
<xsl:attribute name="data-validation-error-msg">
+                                                                               
<xsl:value-of select="php:function('lang', 'Please enter a category !')"/>
+                                                                       
</xsl:attribute>
+                                                                       
<xsl:apply-templates select="categories/options"/>
+                                                               </select>
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                               <xsl:for-each 
select="categories/options">
+                                                                       <xsl:if 
test="selected = 'selected' or selected = 1">
+                                                                               
<xsl:value-of disable-output-escaping="yes" select="name"/>
+                                                                       
</xsl:if>
+                                                               </xsl:for-each>
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                       </div>
                         
-                                               <div class="pure-control-group">
-                                                       <label for="date">
-                                                               <xsl:value-of 
select="php:function('lang', 'date')" />
-                                                       </label>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="editable = 1">
-                                                                       <input 
id="report_date" name='values[report_date]' type="text" 
value="{document/report_date}"
+                                       <div class="pure-control-group">
+                                               <label for="date">
+                                                       <xsl:value-of 
select="php:function('lang', 'date')" />
+                                               </label>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="editable = 1">
+                                                               <input 
id="report_date" name='values[report_date]' type="text" 
value="{document/report_date}"
                                                                                
   data-validation="date" data-validation-format="dd/mm/yyyy"/>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:value-of select="document/report_date"/>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </div>
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                               <xsl:value-of 
select="document/report_date"/>
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                       </div>
 
-                                               <div class="pure-control-group">
-                                                       <label for="status">
-                                                               <xsl:value-of 
select="php:function('lang', 'status')" />
-                                                       </label>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="editable = 1">
-                                                                       <select 
id="status_id" name="values[status_id]">
-                                                                               
<xsl:attribute name="data-validation">
-                                                                               
        <xsl:text>required</xsl:text>
-                                                                               
</xsl:attribute>
-                                                                               
<xsl:attribute name="data-validation-error-msg">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Please enter a status !')"/>
-                                                                               
</xsl:attribute>
-                                                                               
<xsl:apply-templates select="status_list/options"/>
-                                                                       
</select>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:for-each select="status_list/options">
-                                                                               
<xsl:if test="selected = 'selected' or selected = 1">
-                                                                               
        <xsl:value-of disable-output-escaping="yes" select="name"/>
-                                                                               
</xsl:if>
-                                                                       
</xsl:for-each>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </div>
+                                       <div class="pure-control-group">
+                                               <label for="status">
+                                                       <xsl:value-of 
select="php:function('lang', 'status')" />
+                                               </label>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="editable = 1">
+                                                               <select 
id="status_id" name="values[status_id]">
+                                                                       
<xsl:attribute name="data-validation">
+                                                                               
<xsl:text>required</xsl:text>
+                                                                       
</xsl:attribute>
+                                                                       
<xsl:attribute name="data-validation-error-msg">
+                                                                               
<xsl:value-of select="php:function('lang', 'Please enter a status !')"/>
+                                                                       
</xsl:attribute>
+                                                                       
<xsl:apply-templates select="status_list/options"/>
+                                                               </select>
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                               <xsl:for-each 
select="status_list/options">
+                                                                       <xsl:if 
test="selected = 'selected' or selected = 1">
+                                                                               
<xsl:value-of disable-output-escaping="yes" select="name"/>
+                                                                       
</xsl:if>
+                                                               </xsl:for-each>
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                       </div>
 
-                                               <div class="pure-control-group">
-                                                       <label 
for="coordinator">
-                                                               <xsl:value-of 
select="lang_coordinator" />
-                                                       </label>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="editable = 1">
-                                                                       <!--div 
class="autocomplete"-->
-                                                                       <input 
type="hidden" id="coordinator_id" name="values[coordinator_id]"  
value="{document/coordinator_id}"/>
-                                                                       <input 
type="text" id="coordinator_name" name="values[coordinator_name]" 
value="{document/coordinator_name}">
-                                                                       </input>
-                                                                       <div 
id="coordinator_container"/>
-                                                                       
<!--/div-->
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:value-of select="document/coordinator_name" />
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </div>
+                                       <div class="pure-control-group">
+                                               <label for="coordinator">
+                                                       <xsl:value-of 
select="lang_coordinator" />
+                                               </label>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="editable = 1">
+                                                               <!--div 
class="autocomplete"-->
+                                                               <input 
type="hidden" id="coordinator_id" name="values[coordinator_id]"  
value="{document/coordinator_id}"/>
+                                                               <input 
type="text" id="coordinator_name" name="values[coordinator_name]" 
value="{document/coordinator_name}">
+                                                               </input>
+                                                               <div 
id="coordinator_container"/>
+                                                               <!--/div-->
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                               <xsl:value-of 
select="document/coordinator_name" />
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                       </div>
 
-                                               <div class="pure-control-group">
-                                                       <label for="vendor">
-                                                               <xsl:value-of 
select="php:function('lang', 'vendor')" />
-                                                       </label>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="editable = 1">
-                                                                       <!--div 
class="autocomplete"-->
-                                                                       <input 
type="hidden" id="vendor_id" name="values[vendor_id]"  
value="{document/vendor_id}"/>
-                                                                       <input 
type="text" id="vendor_name" name="values[vendor_name]" 
value="{document/vendor_name}">
-                                                                       </input>
-                                                                       <div 
id="vendor_container"/>
-                                                                       
<!--/div-->
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:value-of select="document/vendor_name" />
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </div>
-                                               <div class="pure-control-group">
-                                                       <label>
-                                                               <xsl:value-of 
select="php:function('lang', 'file')"/>
-                                                       </label>
-                                                       <a 
href="{link_file}"><xsl:value-of select="file_name" /></a>
-                                               </div>
-                                               <div class="pure-control-group">
-                                                       <label>
-                                                               <xsl:value-of 
select="php:function('lang', 'Path')"/>
-                                                       </label>
-                                                               <div 
class='pure-custom'>
-                                                                       
<xsl:value-of disable-output-escaping="yes" select="document/paths"/>
-                                                               </div>          
                                                
-                                               </div>
+                                       <div class="pure-control-group">
+                                               <label for="vendor">
+                                                       <xsl:value-of 
select="php:function('lang', 'vendor')" />
+                                               </label>
                                                <xsl:choose>
                                                        <xsl:when 
test="editable = 1">
-                                                               <div 
class="pure-control-group">
-                                                                       <label>
-                                                                               
<xsl:value-of select="php:function('lang', 'upload file')"/>
-                                                                       </label>
-                                                                       <input 
type="file" name="file" size="40">
-                                                                               
<xsl:attribute name="title">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Select file to upload')"/>
-                                                                               
</xsl:attribute>
-                                                                       </input>
-                                                               </div>
+                                                               <!--div 
class="autocomplete"-->
+                                                               <input 
type="hidden" id="vendor_id" name="values[vendor_id]"  
value="{document/vendor_id}"/>
+                                                               <input 
type="text" id="vendor_name" name="values[vendor_name]" 
value="{document/vendor_name}">
+                                                               </input>
+                                                               <div 
id="vendor_container"/>
+                                                               <!--/div-->
                                                        </xsl:when>
+                                                       <xsl:otherwise>
+                                                               <xsl:value-of 
select="document/vendor_name" />
+                                                       </xsl:otherwise>
                                                </xsl:choose>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label>
+                                                       <xsl:value-of 
select="php:function('lang', 'file')"/>
+                                               </label>
+                                               <a href="{link_file}">
+                                                       <xsl:value-of 
select="file_name" />
+                                               </a>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label>
+                                                       <xsl:value-of 
select="php:function('lang', 'Path')"/>
+                                               </label>
+                                               <div class='pure-custom'>
+                                                       <xsl:value-of 
disable-output-escaping="yes" select="document/paths"/>
+                                               </div>
+                                       </div>
+                                       <xsl:choose>
+                                               <xsl:when test="editable = 1">
+                                                       <div 
class="pure-control-group">
+                                                               <label>
+                                                                       
<xsl:value-of select="php:function('lang', 'upload file')"/>
+                                                               </label>
+                                                               <input 
type="file" name="file" size="40">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="php:function('lang', 'Select file to upload')"/>
+                                                                       
</xsl:attribute>
+                                                               </input>
+                                                       </div>
+                                               </xsl:when>
+                                       </xsl:choose>
                                </div>
 
                                <xsl:choose>

Modified: branches/Version-2_0-branch/property/templates/base/investment.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/investment.xsl  
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/templates/base/investment.xsl  
2017-08-01 09:24:26 UTC (rev 16938)
@@ -1,14 +1,14 @@
 
 <!-- $Id$ -->
 <xsl:template match="data">
-               <xsl:choose>
-                       <xsl:when test="add">
-                               <xsl:apply-templates select="add"/>
-                       </xsl:when>
-                       <xsl:when test="history">
-                               <xsl:apply-templates select="history"/>
-                       </xsl:when>
-               </xsl:choose>
+       <xsl:choose>
+               <xsl:when test="add">
+                       <xsl:apply-templates select="add"/>
+               </xsl:when>
+               <xsl:when test="history">
+                       <xsl:apply-templates select="history"/>
+               </xsl:when>
+       </xsl:choose>
 </xsl:template>
 
 
@@ -15,15 +15,15 @@
 <xsl:template match="history">
        <xsl:call-template name="top-toolbar" />
        <div>
-                               <xsl:choose>
-                                       <xsl:when test="msgbox_data != ''">
+               <xsl:choose>
+                       <xsl:when test="msgbox_data != ''">
                                <dl>
                                        <dt>
-                                                               
<xsl:call-template name="msgbox"/>
+                                               <xsl:call-template 
name="msgbox"/>
                                        </dt>
                                </dl>
-                                       </xsl:when>
-                               </xsl:choose>
+                       </xsl:when>
+               </xsl:choose>
                <div id="message" class='message'/>
                <xsl:for-each select="datatable_def">
                        <xsl:if test="container = 'datatable-container_0'">
@@ -61,8 +61,8 @@
                        <div class="pure-u-2-3">
                                <xsl:for-each select="top_toolbar">
                                        <a class="pure-button 
pure-button-primary" href="{url}">
-                               <xsl:value-of select="value"/>
-                                               </a>
+                                               <xsl:value-of select="value"/>
+                                       </a>
                                </xsl:for-each>
                        </div>
                </div>
@@ -81,23 +81,23 @@
                                                                        <div>
                                                                                
<input id="filter_{name}" name="filter_{name}" type="text"></input>
                                                                        </div>
-                                       </xsl:when>
+                                                               </xsl:when>
                                                                <xsl:when 
test="type='button'">
                                                                        <button 
id="{id}" type="{type}" class="pure-button pure-button-primary" 
onclick="{action}">
                                                                                
<xsl:value-of select="value"/>
                                                                        
</button>
-                                       </xsl:when>
+                                                               </xsl:when>
                                                                <xsl:when 
test="type='label'">
-                               <xsl:value-of select="value"/>
-                               </xsl:when>
-                               <xsl:otherwise>
+                                                                       
<xsl:value-of select="value"/>
+                                                               </xsl:when>
+                                                               <xsl:otherwise>
                                                                        <input 
id="{id}" type="{type}" name="{name}" value="{value}">
                                                                                
<xsl:if test="type = 'checkbox' and checked = '1'">
                                                                                
        <xsl:attribute name="checked">checked</xsl:attribute>
                                                                                
</xsl:if>
                                                                        </input>
-                               </xsl:otherwise>
-                       </xsl:choose>
+                                                               </xsl:otherwise>
+                                                       </xsl:choose>
                                                </xsl:for-each>
                                        </div>
                                </div>
@@ -109,121 +109,121 @@
 
 <!-- add -->
 <xsl:template match="add">
-               <script type="text/javascript">
-                       self.name="first_Window";
-                       function location_lookup()
-                       {
-                               Window1=window.open('<xsl:value-of 
select="location_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
-                       }
-               </script>
+       <script type="text/javascript">
+               self.name="first_Window";
+               function location_lookup()
+               {
+               Window1=window.open('<xsl:value-of 
select="location_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
+               }
+       </script>
        <dl>
-                               <xsl:choose>
-                                       <xsl:when test="msgbox_data != ''">
-                                               <tr>
-                                                       <td align="left" 
colspan="3">
-                                                               
<xsl:call-template name="msgbox"/>
-                                                       </td>
-                                               </tr>
-                                       </xsl:when>
-                               </xsl:choose>
+               <xsl:choose>
+                       <xsl:when test="msgbox_data != ''">
+                               <tr>
+                                       <td align="left" colspan="3">
+                                               <xsl:call-template 
name="msgbox"/>
+                                       </td>
+                               </tr>
+                       </xsl:when>
+               </xsl:choose>
        </dl>
-                               <xsl:variable name="form_action">
-                                       <xsl:value-of select="form_action"/>
-                               </xsl:variable>
+       <xsl:variable name="form_action">
+               <xsl:value-of select="form_action"/>
+       </xsl:variable>
        <form method="post" class="pure-form pure-form-aligned" id="form" 
action="{$form_action}" name="form">
                <div id="tab-content">
                        <xsl:value-of disable-output-escaping="yes" 
select="tabs"/>
                        <div id="general">
-                                       <xsl:call-template 
name="location_form"/>
+                               <xsl:call-template name="location_form"/>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="lang_write_off_period"/>
+                                               <xsl:value-of 
select="lang_write_off_period"/>
                                        </label>
                                        <xsl:call-template 
name="cat_select_investment" />
-                                                       <xsl:text>  </xsl:text>
-                                                       <xsl:value-of 
select="lang_new"/>
+                                       <xsl:text>  </xsl:text>
+                                       <xsl:value-of select="lang_new"/>
                                        <input type="text"  id="numperiod" 
name="values[new_period]" value="{value_new_period}" size="3" 
onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
-                                                                       
<xsl:value-of select="lang_new_period_statustext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
-                                                               </xsl:attribute>
-                                                       </input>
+                                               <xsl:attribute 
name="onMouseover">
+                                                       
<xsl:text>window.status='</xsl:text>
+                                                       <xsl:value-of 
select="lang_new_period_statustext"/>
+                                                       <xsl:text>'; return 
true;</xsl:text>
+                                               </xsl:attribute>
+                                       </input>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="lang_type"/>
+                                               <xsl:value-of 
select="lang_type"/>
                                        </label>
-                                                       <xsl:call-template 
name="filter_select"/>
+                                       <xsl:call-template 
name="filter_select"/>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="lang_amount"/>
+                                               <xsl:value-of 
select="lang_amount"/>
                                        </label>
-                                                       <input type="text" 
name="values[initial_value]" value="{value_inital_value}" 
onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
-                                                                       
<xsl:value-of select="lang_value_statustext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
-                                                               </xsl:attribute>
-                                                       </input>
+                                       <input type="text" 
name="values[initial_value]" value="{value_inital_value}" 
onMouseout="window.status='';return true;">
+                                               <xsl:attribute 
name="onMouseover">
+                                                       
<xsl:text>window.status='</xsl:text>
+                                                       <xsl:value-of 
select="lang_value_statustext"/>
+                                                       <xsl:text>'; return 
true;</xsl:text>
+                                               </xsl:attribute>
+                                       </input>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="lang_date"/>
+                                               <xsl:value-of 
select="lang_date"/>
                                        </label>
-                                                       <input type="text" 
id="values_date" name="values[date]" size="10" value="{value_date}" 
readonly="readonly" onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
-                                                                       
<xsl:value-of select="lang_date_statustext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
-                                                               </xsl:attribute>
-                                                       </input>
+                                       <input type="text" id="values_date" 
name="values[date]" size="10" value="{value_date}" readonly="readonly" 
onMouseout="window.status='';return true;">
+                                               <xsl:attribute 
name="onMouseover">
+                                                       
<xsl:text>window.status='</xsl:text>
+                                                       <xsl:value-of 
select="lang_date_statustext"/>
+                                                       <xsl:text>'; return 
true;</xsl:text>
+                                               </xsl:attribute>
+                                       </input>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="lang_descr"/>
+                                               <xsl:value-of 
select="lang_descr"/>
                                        </label>
-                                                       <input type="text" 
name="values[descr]" value="{value_descr}" onMouseout="window.status='';return 
true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
-                                                                       
<xsl:value-of select="lang_name_statustext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
-                                                               </xsl:attribute>
-                                                       </input>
+                                       <input type="text" name="values[descr]" 
value="{value_descr}" onMouseout="window.status='';return true;">
+                                               <xsl:attribute 
name="onMouseover">
+                                                       
<xsl:text>window.status='</xsl:text>
+                                                       <xsl:value-of 
select="lang_name_statustext"/>
+                                                       <xsl:text>'; return 
true;</xsl:text>
+                                               </xsl:attribute>
+                                       </input>
                                </div>
                                <div class="pure-control-group">
-                                                       <xsl:variable 
name="lang_save">
-                                                               <xsl:value-of 
select="lang_save"/>
-                                                       </xsl:variable>
+                                       <xsl:variable name="lang_save">
+                                               <xsl:value-of 
select="lang_save"/>
+                                       </xsl:variable>
                                        <input type="submit" class="pure-button 
pure-button-primary" name="values[save]" value="{$lang_save}" 
onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
-                                                                       
<xsl:value-of select="lang_save_statustext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
-                                                               </xsl:attribute>
-                                                       </input>
+                                               <xsl:attribute 
name="onMouseover">
+                                                       
<xsl:text>window.status='</xsl:text>
+                                                       <xsl:value-of 
select="lang_save_statustext"/>
+                                                       <xsl:text>'; return 
true;</xsl:text>
+                                               </xsl:attribute>
+                                       </input>
                                </div>
                        </div>
                </div>
-                               </form>
+       </form>
        <div class="pure-control-group">
-                                               <xsl:variable 
name="done_action">
-                                                       <xsl:value-of 
select="done_action"/>
-                                               </xsl:variable>
-                                               <xsl:variable name="lang_done">
-                                                       <xsl:value-of 
select="lang_done"/>
-                                               </xsl:variable>
-                                               <form method="post" 
action="{$done_action}">
+               <xsl:variable name="done_action">
+                       <xsl:value-of select="done_action"/>
+               </xsl:variable>
+               <xsl:variable name="lang_done">
+                       <xsl:value-of select="lang_done"/>
+               </xsl:variable>
+               <form method="post" action="{$done_action}">
                        <input type="submit" class="pure-button 
pure-button-primary" name="done" value="{$lang_done}" 
onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
-                                                                       
<xsl:value-of select="lang_done_statustext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </form>
-               </div>
+                               <xsl:attribute name="onMouseover">
+                                       <xsl:text>window.status='</xsl:text>
+                                       <xsl:value-of 
select="lang_done_statustext"/>
+                                       <xsl:text>'; return true;</xsl:text>
+                               </xsl:attribute>
+                       </input>
+               </form>
+       </div>
        <script type="text/javascript">
                $.formUtils.addValidator({
                name : 'write_period_num',

Modified: branches/Version-2_0-branch/property/templates/base/location.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/location.xsl    
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/templates/base/location.xsl    
2017-08-01 09:24:26 UTC (rev 16938)
@@ -1,5 +1,6 @@
   <!-- $Id$ -->
        <xsl:template match="data">
+               <xsl:call-template name="jquery_phpgw_i18n"/>
                <xsl:choose>
                        <xsl:when test="edit">
                                <xsl:apply-templates select="edit"/>
@@ -20,7 +21,6 @@
                                <xsl:apply-templates select="list"/>
                        </xsl:otherwise>
                </xsl:choose>
-               <xsl:call-template name="jquery_phpgw_i18n"/>
        </xsl:template>
 
        <!-- New template-->
@@ -118,175 +118,175 @@
 
                </td>
                </tr>-->
-               </table>
-               <div class="datatable-container">
-                       <table width="100%" class="datatable" cellpadding="2" 
cellspacing="2" align="center">
-                               <tr class="th">
-                                       <xsl:choose>
-                                               <xsl:when test="//lookup=1">
-                                                       <td>
-                                                       </td>
-                                               </xsl:when>
-                                       </xsl:choose>
-                                       <xsl:for-each select="table_header">
-                                               <td class="th_text" 
width="{with}" align="{align}">
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="sort!=''">
-                                                                       <a 
href="{sort}" onMouseover="window.status='{header}';return true;" 
onMouseout="window.status='';return true;">
-                                                                               
<xsl:value-of select="header"/>
-                                                                       </a>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:value-of select="header"/>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
+       </table>
+       <div class="datatable-container">
+               <table width="100%" class="datatable" cellpadding="2" 
cellspacing="2" align="center">
+                       <tr class="th">
+                               <xsl:choose>
+                                       <xsl:when test="//lookup=1">
+                                               <td>
                                                </td>
-                                       </xsl:for-each>
-                               </tr>
-                               <xsl:call-template name="list_values"/>
-                               <xsl:choose>
-                                       <xsl:when test="lookup='' and table_add 
!=''">
-                                               <xsl:apply-templates 
select="table_add"/>
                                        </xsl:when>
                                </xsl:choose>
+                               <xsl:for-each select="table_header">
+                                       <td class="th_text" width="{with}" 
align="{align}">
+                                               <xsl:choose>
+                                                       <xsl:when 
test="sort!=''">
+                                                               <a 
href="{sort}" onMouseover="window.status='{header}';return true;" 
onMouseout="window.status='';return true;">
+                                                                       
<xsl:value-of select="header"/>
+                                                               </a>
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                               <xsl:value-of 
select="header"/>
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                       </td>
+                               </xsl:for-each>
+                       </tr>
+                       <xsl:call-template name="list_values"/>
+                       <xsl:choose>
+                               <xsl:when test="lookup='' and table_add !=''">
+                                       <xsl:apply-templates 
select="table_add"/>
+                               </xsl:when>
+                       </xsl:choose>
+               </table>
+       </div>
+       <xsl:call-template name="datatable-yui-definition"/>
+       <xsl:choose>
+               <xsl:when test="lookup=1">
+                       <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
+                               <tr>
+                                       <td colspan="3" width="100%">
+                                               <xsl:call-template 
name="nextmatchs"/>
+                                       </td>
+                               </tr>
                        </table>
-               </div>
-               <xsl:call-template name="datatable-yui-definition"/>
-               <xsl:choose>
-                       <xsl:when test="lookup=1">
-                               <table width="100%" cellpadding="2" 
cellspacing="2" align="center">
-                                       <tr>
-                                               <td colspan="3" width="100%">
-                                                       <xsl:call-template 
name="nextmatchs"/>
-                                               </td>
-                                       </tr>
-                               </table>
-                       </xsl:when>
-               </xsl:choose>
+               </xsl:when>
+       </xsl:choose>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template name="list_values">
-               <xsl:for-each select="values">
-                       <tr>
-                               <xsl:attribute name="class">
+       <xsl:for-each select="values">
+               <tr>
+                       <xsl:attribute name="class">
+                               <xsl:choose>
+                                       <xsl:when test="@class">
+                                               <xsl:value-of select="@class"/>
+                                       </xsl:when>
+                                       <xsl:when test="position() mod 2 = 0">
+                                               <xsl:text>row_off</xsl:text>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <xsl:text>row_on</xsl:text>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </xsl:attribute>
+                       <form>
+                               <xsl:choose>
+                                       <xsl:when test="//lookup=1">
+                                               <td>
+                                                       <xsl:for-each 
select="hidden">
+                                                               <input 
type="hidden" name="{name}" value="{value}"/>
+                                                       </xsl:for-each>
+                                               </td>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <xsl:for-each select="row">
                                        <xsl:choose>
-                                               <xsl:when test="@class">
-                                                       <xsl:value-of 
select="@class"/>
+                                               <xsl:when test="link">
+                                                       <td class="small_text" 
align="center">
+                                                               <a 
href="{link}" onMouseover="window.status='{statustext}';return true;" 
onMouseout="window.status='';return true;" target="{target}">
+                                                                       
<xsl:value-of select="text"/>
+                                                               </a>
+                                                       </td>
                                                </xsl:when>
-                                               <xsl:when test="position() mod 
2 = 0">
-                                                       
<xsl:text>row_off</xsl:text>
-                                               </xsl:when>
                                                <xsl:otherwise>
-                                                       
<xsl:text>row_on</xsl:text>
+                                                       <td class="small_text" 
align="{align}">
+                                                               <xsl:value-of 
select="value"/>
+                                                       </td>
                                                </xsl:otherwise>
                                        </xsl:choose>
-                               </xsl:attribute>
-                               <form>
                                        <xsl:choose>
-                                               <xsl:when test="//lookup=1">
-                                                       <td>
-                                                               <xsl:for-each 
select="hidden">
-                                                                       <input 
type="hidden" name="{name}" value="{value}"/>
-                                                               </xsl:for-each>
-                                                       </td>
+                                               <xsl:when test="lookup=1">
+                                                       <xsl:if 
test="position() = last()">
+                                                               <td 
class="small_text" align="center">
+                                                                       <input 
type="button" name="select" value="{//lang_select}" 
onClick="{//exchange_values}" onMouseout="window.status='';return true;">
+                                                                               
<xsl:attribute name="onMouseover">
+                                                                               
        <xsl:text>window.status='</xsl:text>
+                                                                               
        <xsl:value-of select="lang_select_statustext"/>
+                                                                               
        <xsl:text>'; return true;</xsl:text>
+                                                                               
</xsl:attribute>
+                                                                       </input>
+                                                               </td>
+                                                       </xsl:if>
                                                </xsl:when>
                                        </xsl:choose>
-                                       <xsl:for-each select="row">
-                                               <xsl:choose>
-                                                       <xsl:when test="link">
-                                                               <td 
class="small_text" align="center">
-                                                                       <a 
href="{link}" onMouseover="window.status='{statustext}';return true;" 
onMouseout="window.status='';return true;" target="{target}">
-                                                                               
<xsl:value-of select="text"/>
-                                                                       </a>
-                                                               </td>
-                                                       </xsl:when>
-                                                       <xsl:otherwise>
-                                                               <td 
class="small_text" align="{align}">
-                                                                       
<xsl:value-of select="value"/>
-                                                               </td>
-                                                       </xsl:otherwise>
-                                               </xsl:choose>
-                                               <xsl:choose>
-                                                       <xsl:when 
test="lookup=1">
-                                                               <xsl:if 
test="position() = last()">
-                                                                       <td 
class="small_text" align="center">
-                                                                               
<input type="button" name="select" value="{//lang_select}" 
onClick="{//exchange_values}" onMouseout="window.status='';return true;">
-                                                                               
        <xsl:attribute name="onMouseover">
-                                                                               
                <xsl:text>window.status='</xsl:text>
-                                                                               
                <xsl:value-of select="lang_select_statustext"/>
-                                                                               
                <xsl:text>'; return true;</xsl:text>
-                                                                               
        </xsl:attribute>
-                                                                               
</input>
-                                                                       </td>
-                                                               </xsl:if>
-                                                       </xsl:when>
-                                               </xsl:choose>
-                                       </xsl:for-each>
-                               </form>
-                       </tr>
-               </xsl:for-each>
+                               </xsl:for-each>
+                       </form>
+               </tr>
+       </xsl:for-each>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="table_add">
-               <tr>
-                       <td height="50">
-                               <xsl:variable name="add_action">
-                                       <xsl:value-of select="add_action"/>
-                               </xsl:variable>
-                               <xsl:variable name="lang_add">
-                                       <xsl:value-of select="lang_add"/>
-                               </xsl:variable>
-                               <form method="post" action="{$add_action}">
-                                       <input type="submit" name="" 
value="{$lang_add}" onMouseout="window.status='';return true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                       <xsl:value-of 
select="lang_add_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                               </form>
-                       </td>
-               </tr>
+       <tr>
+               <td height="50">
+                       <xsl:variable name="add_action">
+                               <xsl:value-of select="add_action"/>
+                       </xsl:variable>
+                       <xsl:variable name="lang_add">
+                               <xsl:value-of select="lang_add"/>
+                       </xsl:variable>
+                       <form method="post" action="{$add_action}">
+                               <input type="submit" name="" 
value="{$lang_add}" onMouseout="window.status='';return true;">
+                                       <xsl:attribute name="onMouseover">
+                                               
<xsl:text>window.status='</xsl:text>
+                                               <xsl:value-of 
select="lang_add_statustext"/>
+                                               <xsl:text>'; return 
true;</xsl:text>
+                                       </xsl:attribute>
+                               </input>
+                       </form>
+               </td>
+       </tr>
 </xsl:template>
 
 <!-- New template-->
 <!-- add / edit -->
 <xsl:template xmlns:php="http://php.net/xsl"; match="edit">
-               <script type="text/javascript">
-                       function street_lookup()
-                       {
-                               var oArgs = {<xsl:value-of 
select="street_link"/>};
-                               var strURL = phpGWLink('index.php', oArgs);
+       <script type="text/javascript">
+               function street_lookup()
+               {
+               var oArgs = {<xsl:value-of select="street_link"/>};
+               var strURL = phpGWLink('index.php', oArgs);
                TINY.box.show({iframe:strURL, 
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
 mask:true, animate:true, close: true});
-                       }
-                       function tenant_lookup()
-                       {
-                               var oArgs = {<xsl:value-of 
select="tenant_link"/>};
-                               var strURL = phpGWLink('index.php', oArgs);
+               }
+               function tenant_lookup()
+               {
+               var oArgs = {<xsl:value-of select="tenant_link"/>};
+               var strURL = phpGWLink('index.php', oArgs);
                TINY.box.show({iframe:strURL, 
boxid:"frameless",width:750,height:450,fixed:false,maskid:"darkmask",maskopacity:40,
 mask:true, animate:true, close: true});
-                       }
-               </script>
-               <script type="text/javascript">
-                       self.name="first_Window";
-                       <xsl:value-of select="lookup_functions"/>
-               </script>
+               }
+       </script>
+       <script type="text/javascript">
+               self.name="first_Window";
+               <xsl:value-of select="lookup_functions"/>
+       </script>
 
-               <script type="text/javascript">
-                       function set_tab(active_tab)
-                       {
-                               document.form.active_tab.value = active_tab;    
                
-                       }
-               </script>
+       <script type="text/javascript">
+               function set_tab(active_tab)
+               {
+               document.form.active_tab.value = active_tab;
+               }
+       </script>
        <dl>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="msgbox_data != ''">
+               <xsl:choose>
+                       <xsl:when test="msgbox_data != ''">
                                <dt>
-                                                                               
        <xsl:call-template name="msgbox"/>
+                                       <xsl:call-template name="msgbox"/>
                                </dt>
-                                                               </xsl:when>
-                                                       </xsl:choose>
+                       </xsl:when>
+               </xsl:choose>
        </dl>
        <div id="location_edit_tabview">
                <xsl:variable name="form_action">
@@ -297,202 +297,202 @@
                                <xsl:value-of disable-output-escaping="yes" 
select="tabs"/>
                                <div id="general">
                                        <fieldset>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="change_type_list != ''">
+                                               <xsl:choose>
+                                                       <xsl:when 
test="change_type_list != ''">
                                                                <div 
class="pure-control-group">
                                                                        <label 
for="name">
-                                                                               
        <xsl:value-of select="lang_change_type"/>
+                                                                               
<xsl:value-of select="lang_change_type"/>
                                                                        </label>
-                                                                               
        <xsl:variable name="lang_change_type_statustext">
-                                                                               
                <xsl:value-of select="lang_change_type_statustext"/>
-                                                                               
        </xsl:variable>
-                                                                               
        <select name="change_type" class="forms" 
onMouseover="window.status='{$lang_change_type_statustext}'; return true;" 
onMouseout="window.status='';return true;">
-                                                                               
                <option value="">
-                                                                               
                        <xsl:value-of select="lang_no_change_type"/>
-                                                                               
                </option>
-                                                                               
                <xsl:apply-templates select="change_type_list"/>
-                                                                               
        </select>
+                                                                       
<xsl:variable name="lang_change_type_statustext">
+                                                                               
<xsl:value-of select="lang_change_type_statustext"/>
+                                                                       
</xsl:variable>
+                                                                       <select 
name="change_type" class="forms" 
onMouseover="window.status='{$lang_change_type_statustext}'; return true;" 
onMouseout="window.status='';return true;">
+                                                                               
<option value="">
+                                                                               
        <xsl:value-of select="lang_no_change_type"/>
+                                                                               
</option>
+                                                                               
<xsl:apply-templates select="change_type_list"/>
+                                                                       
</select>
                                                                </div>
-                                                               </xsl:when>
-                                                       </xsl:choose>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="lookup_type='form'">
-                                                                       
<xsl:call-template name="location_form"/>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:call-template name="location_view"/>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                                       <xsl:for-each 
select="additional_fields">
+                                                       </xsl:when>
+                                               </xsl:choose>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="lookup_type='form'">
+                                                               
<xsl:call-template name="location_form"/>
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                               
<xsl:call-template name="location_view"/>
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                               <xsl:for-each 
select="additional_fields">
                                                        <div 
class="pure-control-group">
                                                                <label 
for="name">
-                                                                               
<xsl:value-of select="input_text"/>
+                                                                       
<xsl:value-of select="input_text"/>
                                                                </label>
-                                                                               
<xsl:choose>
-                                                                               
        <xsl:when test="datatype ='text'">
-                                                                               
                <textarea cols="60" rows="4" name="{input_name}" 
onMouseout="window.status='';return true;">
-                                                                               
                        <xsl:attribute name="onMouseover">
-                                                                               
                                <xsl:text>window.status='</xsl:text>
-                                                                               
                                <xsl:value-of select="statustext"/>
-                                                                               
                                <xsl:text>'; return true;</xsl:text>
-                                                                               
                        </xsl:attribute>
-                                                                               
                        <xsl:value-of select="value"/>
-                                                                               
                </textarea>
-                                                                               
        </xsl:when>
-                                                                               
        <xsl:when test="datatype ='date'">
-                                                                               
                <input type="text" name="{input_name}" value="{value}" 
onFocus="{//dateformat_validate}" onKeyUp="{//onKeyUp}" onBlur="{//onBlur}" 
size="12" maxlength="10" onMouseout="window.status='';return true;">
-                                                                               
                        <xsl:attribute name="onMouseover">
-                                                                               
                                <xsl:text>window.status='</xsl:text>
-                                                                               
                                <xsl:value-of select="descr"/>
-                                                                               
                                <xsl:text>'; return true;</xsl:text>
-                                                                               
                        </xsl:attribute>
-                                                                               
                </input>
-                                                                               
                <xsl:text>[</xsl:text>
-                                                                               
                <xsl:value-of select="//lang_dateformat"/>
-                                                                               
                <xsl:text>]</xsl:text>
-                                                                               
        </xsl:when>
-                                                                               
        <xsl:otherwise>
-                                                                               
                <input type="text" name="{input_name}" value="{value}" 
size="{size}" onMouseout="window.status='';return true;">
-                                                                               
                        <xsl:attribute name="title">
-                                                                               
                                <xsl:value-of select="statustext"/>
-                                                                               
                        </xsl:attribute>
-                                                                               
                </input>
-                                                                               
        </xsl:otherwise>
-                                                                               
</xsl:choose>
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="datatype ='text'">
+                                                                               
<textarea cols="60" rows="4" name="{input_name}" 
onMouseout="window.status='';return true;">
+                                                                               
        <xsl:attribute name="onMouseover">
+                                                                               
                <xsl:text>window.status='</xsl:text>
+                                                                               
                <xsl:value-of select="statustext"/>
+                                                                               
                <xsl:text>'; return true;</xsl:text>
+                                                                               
        </xsl:attribute>
+                                                                               
        <xsl:value-of select="value"/>
+                                                                               
</textarea>
+                                                                       
</xsl:when>
+                                                                       
<xsl:when test="datatype ='date'">
+                                                                               
<input type="text" name="{input_name}" value="{value}" 
onFocus="{//dateformat_validate}" onKeyUp="{//onKeyUp}" onBlur="{//onBlur}" 
size="12" maxlength="10" onMouseout="window.status='';return true;">
+                                                                               
        <xsl:attribute name="onMouseover">
+                                                                               
                <xsl:text>window.status='</xsl:text>
+                                                                               
                <xsl:value-of select="descr"/>
+                                                                               
                <xsl:text>'; return true;</xsl:text>
+                                                                               
        </xsl:attribute>
+                                                                               
</input>
+                                                                               
<xsl:text>[</xsl:text>
+                                                                               
<xsl:value-of select="//lang_dateformat"/>
+                                                                               
<xsl:text>]</xsl:text>
+                                                                       
</xsl:when>
+                                                                       
<xsl:otherwise>
+                                                                               
<input type="text" name="{input_name}" value="{value}" size="{size}" 
onMouseout="window.status='';return true;">
+                                                                               
        <xsl:attribute name="title">
+                                                                               
                <xsl:value-of select="statustext"/>
+                                                                               
        </xsl:attribute>
+                                                                               
</input>
+                                                                       
</xsl:otherwise>
+                                                               </xsl:choose>
                                                        </div>
-                                                       </xsl:for-each>
+                                               </xsl:for-each>
                                                <div class="pure-control-group">
                                                        <label>
-                                                                       
<xsl:value-of select="lang_category"/>
+                                                               <xsl:value-of 
select="lang_category"/>
                                                        </label>
-                                                                       
<xsl:call-template name="cat_select"/>
+                                                       <xsl:call-template 
name="cat_select"/>
                                                </div>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="edit_part_of_town = 1">
+                                               <xsl:choose>
+                                                       <xsl:when 
test="edit_part_of_town = 1">
                                                                <div 
class="pure-control-group">
                                                                        <label>
-                                                                               
        <xsl:value-of select="lang_part_of_town"/>
+                                                                               
<xsl:value-of select="lang_part_of_town"/>
                                                                        </label>
-                                                                               
        <xsl:call-template name="select_part_of_town"/>
+                                                                       
<xsl:call-template name="select_part_of_town"/>
                                                                </div>
-                                                               </xsl:when>
-                                                       </xsl:choose>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="edit_owner = 1">
+                                                       </xsl:when>
+                                               </xsl:choose>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="edit_owner = 1">
                                                                <div 
class="pure-control-group">
                                                                        <label>
-                                                                               
        <xsl:value-of select="lang_owner"/>
+                                                                               
<xsl:value-of select="lang_owner"/>
                                                                        </label>
-                                                                               
        <xsl:variable name="lang_owner_statustext">
-                                                                               
                <xsl:value-of select="lang_owner_statustext"/>
-                                                                               
        </xsl:variable>
-                                                                               
        <select name="owner_id" class="forms" 
onMouseover="window.status='{$lang_owner_statustext}'; return true;" 
onMouseout="window.status='';return true;">
-                                                                               
                <option value="">
-                                                                               
                        <xsl:value-of select="lang_select_owner"/>
-                                                                               
                </option>
-                                                                               
                <xsl:apply-templates select="owner_list"/>
-                                                                               
        </select>
+                                                                       
<xsl:variable name="lang_owner_statustext">
+                                                                               
<xsl:value-of select="lang_owner_statustext"/>
+                                                                       
</xsl:variable>
+                                                                       <select 
name="owner_id" class="forms" 
onMouseover="window.status='{$lang_owner_statustext}'; return true;" 
onMouseout="window.status='';return true;">
+                                                                               
<option value="">
+                                                                               
        <xsl:value-of select="lang_select_owner"/>
+                                                                               
</option>
+                                                                               
<xsl:apply-templates select="owner_list"/>
+                                                                       
</select>
                                                                </div>
-                                                               </xsl:when>
-                                                       </xsl:choose>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="edit_street = 1">
+                                                       </xsl:when>
+                                               </xsl:choose>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="edit_street = 1">
                                                                <div 
class="pure-control-group">
                                                                        <label>
-                                                                               
        <a href="javascript:street_lookup()" 
onMouseover="window.status='{lang_select_street_help}';return true;" 
onMouseout="window.status='';return true;">
-                                                                               
                <xsl:value-of select="lang_street"/>
-                                                                               
        </a>
+                                                                               
<a href="javascript:street_lookup()" 
onMouseover="window.status='{lang_select_street_help}';return true;" 
onMouseout="window.status='';return true;">
+                                                                               
        <xsl:value-of select="lang_street"/>
+                                                                               
</a>
                                                                        </label>
-                                                                               
        <input type="hidden" name="street_id" value="{value_street_id}"/>
-                                                                               
        <input size="30" type="text" name="street_name" 
value="{value_street_name}" onClick="street_lookup();" readonly="readonly">
-                                                                               
                <xsl:attribute name="onMouseover">
-                                                                               
                        <xsl:text>window.status='</xsl:text>
-                                                                               
                        <xsl:value-of select="lang_select_street_help"/>
-                                                                               
                        <xsl:text>'; return true;</xsl:text>
-                                                                               
                </xsl:attribute>
-                                                                               
        </input>
-                                                                               
        <input size="4" type="text" name="street_number" 
value="{value_street_number}">
-                                                                               
                <xsl:attribute name="onMouseover">
-                                                                               
                        <xsl:text>window.status='</xsl:text>
-                                                                               
                        <xsl:value-of select="lang_street_num_statustext"/>
-                                                                               
                        <xsl:text>'; return true;</xsl:text>
-                                                                               
                </xsl:attribute>
-                                                                               
        </input>
+                                                                       <input 
type="hidden" name="street_id" value="{value_street_id}"/>
+                                                                       <input 
size="30" type="text" name="street_name" value="{value_street_name}" 
onClick="street_lookup();" readonly="readonly">
+                                                                               
<xsl:attribute name="onMouseover">
+                                                                               
        <xsl:text>window.status='</xsl:text>
+                                                                               
        <xsl:value-of select="lang_select_street_help"/>
+                                                                               
        <xsl:text>'; return true;</xsl:text>
+                                                                               
</xsl:attribute>
+                                                                       </input>
+                                                                       <input 
size="4" type="text" name="street_number" value="{value_street_number}">
+                                                                               
<xsl:attribute name="onMouseover">
+                                                                               
        <xsl:text>window.status='</xsl:text>
+                                                                               
        <xsl:value-of select="lang_street_num_statustext"/>
+                                                                               
        <xsl:text>'; return true;</xsl:text>
+                                                                               
</xsl:attribute>
+                                                                       </input>
                                                                </div>
-                                                               </xsl:when>
-                                                       </xsl:choose>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="edit_tenant = 1">
+                                                       </xsl:when>
+                                               </xsl:choose>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="edit_tenant = 1">
                                                                <div 
class="pure-control-group">
                                                                        <label>
-                                                                               
        <a href="javascript:tenant_lookup()" 
onMouseover="window.status='{lang_tenant_statustext}';return true;" 
onMouseout="window.status='';return true;">
-                                                                               
                <xsl:value-of select="lang_tenant"/>
-                                                                               
        </a>
+                                                                               
<a href="javascript:tenant_lookup()" 
onMouseover="window.status='{lang_tenant_statustext}';return true;" 
onMouseout="window.status='';return true;">
+                                                                               
        <xsl:value-of select="lang_tenant"/>
+                                                                               
</a>
                                                                        </label>
-                                                                               
        <input type="hidden" name="tenant_id" value="{value_tenant_id}"/>
-                                                                               
        <input size="{size_last_name}" type="text" name="last_name" 
value="{value_last_name}" onClick="tenant_lookup();" readonly="readonly">
-                                                                               
                <xsl:attribute name="onMouseover">
-                                                                               
                        <xsl:text>window.status='</xsl:text>
-                                                                               
                        <xsl:value-of select="lang_tenant_statustext"/>
-                                                                               
                        <xsl:text>'; return true;</xsl:text>
-                                                                               
                </xsl:attribute>
-                                                                               
        </input>
-                                                                               
        <input size="{size_first_name}" type="text" name="first_name" 
value="{value_first_name}" onClick="tenant_lookup();" readonly="readonly">
-                                                                               
                <xsl:attribute name="title">
-                                                                               
                        <xsl:value-of select="lang_tenant_statustext"/>
-                                                                               
                </xsl:attribute>
-                                                                               
        </input>
+                                                                       <input 
type="hidden" name="tenant_id" value="{value_tenant_id}"/>
+                                                                       <input 
size="{size_last_name}" type="text" name="last_name" value="{value_last_name}" 
onClick="tenant_lookup();" readonly="readonly">
+                                                                               
<xsl:attribute name="onMouseover">
+                                                                               
        <xsl:text>window.status='</xsl:text>
+                                                                               
        <xsl:value-of select="lang_tenant_statustext"/>
+                                                                               
        <xsl:text>'; return true;</xsl:text>
+                                                                               
</xsl:attribute>
+                                                                       </input>
+                                                                       <input 
size="{size_first_name}" type="text" name="first_name" 
value="{value_first_name}" onClick="tenant_lookup();" readonly="readonly">
+                                                                               
<xsl:attribute name="title">
+                                                                               
        <xsl:value-of select="lang_tenant_statustext"/>
+                                                                               
</xsl:attribute>
+                                                                       </input>
                                                                </div>
-                                                               </xsl:when>
-                                                       </xsl:choose>
-                                                       <xsl:apply-templates 
select="attributes_general/attributes"/>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="entities_link != ''">
+                                                       </xsl:when>
+                                               </xsl:choose>
+                                               <xsl:apply-templates 
select="attributes_general/attributes"/>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="entities_link != ''">
                                                                <div 
class="pure-control-group">
                                                                        <label>
-                                                                               
        <xsl:value-of select="lang_related_info"/>
+                                                                               
<xsl:value-of select="lang_related_info"/>
                                                                        </label>
                                                                        <div 
class="pure-custom">
-                                                                               
                <xsl:apply-templates select="entities_link"/>
+                                                                               
<xsl:apply-templates select="entities_link"/>
                                                                        </div>
                                                                </div>
-                                                               </xsl:when>
-                                                       </xsl:choose>
+                                                       </xsl:when>
+                                               </xsl:choose>
                                        </fieldset>
-                                       </div>
-                                       <xsl:call-template 
name="attributes_values"/>
-                                       <xsl:choose>
-                                               <xsl:when test="roles != ''">
-                                                       <div id="roles">
+                               </div>
+                               <xsl:call-template name="attributes_values"/>
+                               <xsl:choose>
+                                       <xsl:when test="roles != ''">
+                                               <div id="roles">
                                                        <fieldset>
                                                                <table 
class="display cell-border compact responsive no-wrap dataTable dtr-inline">
                                                                        <thead>
                                                                                
<tr role="row">
                                                                                
        <td>
-                                                                               
        <xsl:value-of select="php:function('lang', 'role')"/>
-                                                                               
</td>
-                                                                               
        <td>
-                                                                               
        <xsl:value-of select="php:function('lang', 'contact')"/>
-                                                                               
</td>
-                                                                               
        <td>
-                                                                               
        <xsl:value-of select="php:function('lang', 'responsibility')"/>
-                                                                               
</td>
-                                                                       </tr>
-                                                                       </thead>
-                                                                       <tbody>
-                                                                       
<xsl:for-each select="roles">
-                                                                               
        <tr class="odd">
-                                                                               
        <td>
-                                                                               
                <xsl:value-of select="name"/>
+                                                                               
                <xsl:value-of select="php:function('lang', 'role')"/>
                                                                                
        </td>
                                                                                
        <td>
-                                                                               
                <xsl:value-of select="responsibility_contact"/>
+                                                                               
                <xsl:value-of select="php:function('lang', 'contact')"/>
                                                                                
        </td>
                                                                                
        <td>
-                                                                               
                <xsl:value-of select="responsibility_name"/>
+                                                                               
                <xsl:value-of select="php:function('lang', 'responsibility')"/>
                                                                                
        </td>
                                                                                
</tr>
-                                                                       
</xsl:for-each>
+                                                                       </thead>
+                                                                       <tbody>
+                                                                               
<xsl:for-each select="roles">
+                                                                               
        <tr class="odd">
+                                                                               
                <td>
+                                                                               
                        <xsl:value-of select="name"/>
+                                                                               
                </td>
+                                                                               
                <td>
+                                                                               
                        <xsl:value-of select="responsibility_contact"/>
+                                                                               
                </td>
+                                                                               
                <td>
+                                                                               
                        <xsl:value-of select="responsibility_name"/>
+                                                                               
                </td>
+                                                                               
        </tr>
+                                                                               
</xsl:for-each>
                                                                        </tbody>
                                                                        <tfoot>
                                                                                
<tr>
@@ -503,49 +503,49 @@
                                                                        </tfoot>
                                                                </table>
                                                        </fieldset>
+                                               </div>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <xsl:choose>
+                                       <xsl:when test="documents != ''">
+                                               <div id="document">
+                                                       <div 
class="pure-control-group">
+                                                               <label>
+                                                                       
<xsl:value-of select="php:function('lang', 'Doc type')" />
+                                                               </label>
+                                                               <select 
id="doc_type" name="doc_type">
+                                                                       
<xsl:apply-templates select="doc_type_filter/options"/>
+                                                               </select>
                                                        </div>
-                                               </xsl:when>
-                                       </xsl:choose>
-                                       <xsl:choose>
-                                               <xsl:when test="documents != 
''">
-                                                       <div id="document">     
                                                        
-                                                               <div 
class="pure-control-group">
-                                                                       <label>
-                                                                               
<xsl:value-of select="php:function('lang', 'Doc type')" />
-                                                                       </label>
-                                                                       <select 
id="doc_type" name="doc_type">
-                                                                               
<xsl:apply-templates select="doc_type_filter/options"/>
-                                                                       
</select>
-                                                               </div>          
                                                        
-                                                               <xsl:for-each 
select="datatable_def">
-                                                                       <xsl:if 
test="container = 'datatable-container_0'">
-                                                                               
<xsl:call-template name="table_setup">
-                                                                               
        <xsl:with-param name="container" select ='container'/>
-                                                                               
        <xsl:with-param name="requestUrl" select ='requestUrl' />
-                                                                               
        <xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
-                                                                               
        <xsl:with-param name="tabletools" select ='tabletools' />
-                                                                               
        <xsl:with-param name="data" select ='data' />
-                                                                               
        <xsl:with-param name="config" select ='config' />
-                                                                               
</xsl:call-template>
-                                                                       
</xsl:if>
-                                                               </xsl:for-each>
-                                                       </div>
-                                               </xsl:when>
-                                       </xsl:choose>
-                                       <div id="related">
-                                               <xsl:for-each 
select="datatable_def">
-                                                       <xsl:if test="container 
= 'datatable-container_1'">
-                                                               
<xsl:call-template name="table_setup">
-                                                                       
<xsl:with-param name="container" select ='container'/>
-                                                                       
<xsl:with-param name="requestUrl" select ='requestUrl' />
-                                                                       
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
-                                                                       
<xsl:with-param name="tabletools" select ='tabletools' />
-                                                                       
<xsl:with-param name="data" select ='data' />
-                                                                       
<xsl:with-param name="config" select ='config' />
-                                                               
</xsl:call-template>
-                                                       </xsl:if>
-                                               </xsl:for-each>
-                                       </div>
+                                                       <xsl:for-each 
select="datatable_def">
+                                                               <xsl:if 
test="container = 'datatable-container_0'">
+                                                                       
<xsl:call-template name="table_setup">
+                                                                               
<xsl:with-param name="container" select ='container'/>
+                                                                               
<xsl:with-param name="requestUrl" select ='requestUrl' />
+                                                                               
<xsl:with-param name="ColumnDefs" select ='ColumnDefs' />
+                                                                               
<xsl:with-param name="tabletools" select ='tabletools' />
+                                                                               
<xsl:with-param name="data" select ='data' />
+                                                                               
<xsl:with-param name="config" select ='config' />
+                                                                       
</xsl:call-template>
+                                                               </xsl:if>
+                                                       </xsl:for-each>
+                                               </div>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <div id="related">
+                                       <xsl:for-each select="datatable_def">
+                                               <xsl:if test="container = 
'datatable-container_1'">
+                                                       <xsl:call-template 
name="table_setup">
+                                                               <xsl:with-param 
name="container" select ='container'/>
+                                                               <xsl:with-param 
name="requestUrl" select ='requestUrl' />
+                                                               <xsl:with-param 
name="ColumnDefs" select ='ColumnDefs' />
+                                                               <xsl:with-param 
name="tabletools" select ='tabletools' />
+                                                               <xsl:with-param 
name="data" select ='data' />
+                                                               <xsl:with-param 
name="config" select ='config' />
+                                                       </xsl:call-template>
+                                               </xsl:if>
+                                       </xsl:for-each>
+                               </div>
                                <xsl:choose>
                                        <xsl:when test="check_history != ''">
                                                <script type="text/javascript">
@@ -567,244 +567,244 @@
                                                </div>
                                        </xsl:when>
                                </xsl:choose>
-                                       <xsl:for-each select="integration">
-                                               <div id="{section}">
+                               <xsl:for-each select="integration">
+                                       <div id="{section}">
                                                <fieldset>
                                                        <iframe 
id="{section}_content" width="100%" height="{height}">
                                                                <p>Your browser 
does not support iframes.</p>
                                                        </iframe>
                                                </fieldset>
-                                               </div>
-                                       </xsl:for-each>
-                               </div>
+                                       </div>
+                               </xsl:for-each>
+                       </div>
                        <div class="proplist-col">
-                                               <xsl:choose>
-                                                       <xsl:when test="edit != 
''">
-                                                                       
<xsl:variable name="lang_save">
-                                                                               
<xsl:value-of select="lang_save"/>
-                                                                       
</xsl:variable>
+                               <xsl:choose>
+                                       <xsl:when test="edit != ''">
+                                               <xsl:variable name="lang_save">
+                                                       <xsl:value-of 
select="lang_save"/>
+                                               </xsl:variable>
                                                <input type="submit" 
class="pure-button pure-button-primary" name="save" value="{$lang_save}">
-                                                                               
<xsl:attribute name="title">
-                                                                               
        <xsl:value-of select="lang_save_statustext"/>
-                                                                               
</xsl:attribute>
-                                                                       </input>
-                                                       </xsl:when>
-                                               </xsl:choose>
-                                               <xsl:variable name="lang_done">
-                                                       <xsl:value-of 
select="lang_done"/>
-                                               </xsl:variable>
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_save_statustext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <xsl:variable name="lang_done">
+                                       <xsl:value-of select="lang_done"/>
+                               </xsl:variable>
                                <input type="button" class="pure-button 
pure-button-primary" name="done" value="{$lang_done}" 
onClick="document.done_form.submit();">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_done_statustext"/>
-                                                               </xsl:attribute>
-                                                       </input>
+                                       <xsl:attribute name="title">
+                                               <xsl:value-of 
select="lang_done_statustext"/>
+                                       </xsl:attribute>
+                               </input>
                        </div>
-                                               </form>
+               </form>
                <xsl:variable name="done_action">
                        <xsl:value-of select="done_action"/>
                </xsl:variable>
                <form name="done_form" id="done_form" method="post" 
action="{$done_action}"></form>
-               </div>
+       </div>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="owner_list">
-               <xsl:variable name="id">
-                       <xsl:value-of select="id"/>
-               </xsl:variable>
-               <xsl:choose>
-                       <xsl:when test="selected">
-                               <option value="{$id}" selected="selected">
-                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
-                               </option>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <option value="{$id}">
-                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
-                               </option>
-                       </xsl:otherwise>
-               </xsl:choose>
+       <xsl:variable name="id">
+               <xsl:value-of select="id"/>
+       </xsl:variable>
+       <xsl:choose>
+               <xsl:when test="selected">
+                       <option value="{$id}" selected="selected">
+                               <xsl:value-of disable-output-escaping="yes" 
select="name"/>
+                       </option>
+               </xsl:when>
+               <xsl:otherwise>
+                       <option value="{$id}">
+                               <xsl:value-of disable-output-escaping="yes" 
select="name"/>
+                       </option>
+               </xsl:otherwise>
+       </xsl:choose>
 </xsl:template>
 
 
 <!-- update_cat -->
 <xsl:template match="update_cat">
-               <table cellpadding="2" cellspacing="2" align="center">
-                       <xsl:choose>
-                               <xsl:when test="msgbox_data != ''">
-                                       <tr>
-                                               <td align="left" colspan="3">
-                                                       <xsl:call-template 
name="msgbox"/>
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
-                       <tr>
-                               <td align="center" colspan="2">
-                                       <xsl:value-of 
select="lang_confirm_msg"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td>
-                                       <xsl:variable name="update_action">
-                                               <xsl:value-of 
select="update_action"/>
-                                       </xsl:variable>
-                                       <xsl:variable name="lang_yes">
-                                               <xsl:value-of 
select="lang_yes"/>
-                                       </xsl:variable>
-                                       <form method="POST" 
action="{$update_action}">
-                                               <input type="submit" 
class="forms" name="confirm" value="{$lang_yes}" 
onMouseout="window.status='';return true;">
-                                                       <xsl:attribute 
name="onMouseover">
-                                                               
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_yes_statustext"/>
-                                                               <xsl:text>'; 
return true;</xsl:text>
-                                                       </xsl:attribute>
-                                               </input>
-                                       </form>
-                               </td>
-                               <td align="right">
-                                       <xsl:variable name="done_action">
-                                               <xsl:value-of 
select="done_action"/>
-                                       </xsl:variable>
-                                       <a href="{$done_action}" 
onMouseout="window.status='';return true;">
+       <table cellpadding="2" cellspacing="2" align="center">
+               <xsl:choose>
+                       <xsl:when test="msgbox_data != ''">
+                               <tr>
+                                       <td align="left" colspan="3">
+                                               <xsl:call-template 
name="msgbox"/>
+                                       </td>
+                               </tr>
+                       </xsl:when>
+               </xsl:choose>
+               <tr>
+                       <td align="center" colspan="2">
+                               <xsl:value-of select="lang_confirm_msg"/>
+                       </td>
+               </tr>
+               <tr>
+                       <td>
+                               <xsl:variable name="update_action">
+                                       <xsl:value-of select="update_action"/>
+                               </xsl:variable>
+                               <xsl:variable name="lang_yes">
+                                       <xsl:value-of select="lang_yes"/>
+                               </xsl:variable>
+                               <form method="POST" action="{$update_action}">
+                                       <input type="submit" class="forms" 
name="confirm" value="{$lang_yes}" onMouseout="window.status='';return true;">
                                                <xsl:attribute 
name="onMouseover">
                                                        
<xsl:text>window.status='</xsl:text>
-                                                       <xsl:value-of 
select="lang_no_statustext"/>
+                                                       <xsl:value-of 
select="lang_yes_statustext"/>
                                                        <xsl:text>'; return 
true;</xsl:text>
                                                </xsl:attribute>
-                                               <xsl:value-of select="lang_no"/>
-                                       </a>
-                               </td>
-                       </tr>
-               </table>
+                                       </input>
+                               </form>
+                       </td>
+                       <td align="right">
+                               <xsl:variable name="done_action">
+                                       <xsl:value-of select="done_action"/>
+                               </xsl:variable>
+                               <a href="{$done_action}" 
onMouseout="window.status='';return true;">
+                                       <xsl:attribute name="onMouseover">
+                                               
<xsl:text>window.status='</xsl:text>
+                                               <xsl:value-of 
select="lang_no_statustext"/>
+                                               <xsl:text>'; return 
true;</xsl:text>
+                                       </xsl:attribute>
+                                       <xsl:value-of select="lang_no"/>
+                               </a>
+                       </td>
+               </tr>
+       </table>
 </xsl:template>
 
 <!-- stop -->
 <xsl:template match="stop">
-               <xsl:apply-templates select="menu"/>
-               <table cellpadding="2" cellspacing="2" align="center">
-                       <xsl:choose>
-                               <xsl:when test="msgbox_data != ''">
-                                       <tr>
-                                               <td align="left" colspan="3">
-                                                       <xsl:call-template 
name="msgbox"/>
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
-               </table>
+       <xsl:apply-templates select="menu"/>
+       <table cellpadding="2" cellspacing="2" align="center">
+               <xsl:choose>
+                       <xsl:when test="msgbox_data != ''">
+                               <tr>
+                                       <td align="left" colspan="3">
+                                               <xsl:call-template 
name="msgbox"/>
+                                       </td>
+                               </tr>
+                       </xsl:when>
+               </xsl:choose>
+       </table>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="entities_link">
-               <xsl:variable name="lang_entity_statustext">
-                       <xsl:value-of select="lang_entity_statustext"/>
-               </xsl:variable>
-               <xsl:variable name="entity_link">
-                       <xsl:value-of select="entity_link"/>
-               </xsl:variable>
+       <xsl:variable name="lang_entity_statustext">
+               <xsl:value-of select="lang_entity_statustext"/>
+       </xsl:variable>
+       <xsl:variable name="entity_link">
+               <xsl:value-of select="entity_link"/>
+       </xsl:variable>
        <div>
-                               <a href="{$entity_link}" 
onMouseover="window.status='{$lang_entity_statustext}';return true;" 
onMouseout="window.status='';return true;">
-                                       <xsl:value-of select="text_entity"/>
-                               </a>
+               <a href="{$entity_link}" 
onMouseover="window.status='{$lang_entity_statustext}';return true;" 
onMouseout="window.status='';return true;">
+                       <xsl:value-of select="text_entity"/>
+               </a>
        </div>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="document_link">
-               <xsl:variable name="lang_entity_statustext">
-                       <xsl:value-of select="lang_entity_statustext"/>
-               </xsl:variable>
-               <xsl:variable name="entity_link">
-                       <xsl:value-of select="entity_link"/>
-               </xsl:variable>
-               <tr>
-                       <td class="small_text" align="left">
-                               <a href="{$entity_link}" 
title="{$lang_entity_statustext}" onMouseout="window.status='';return true;">
-                                       <xsl:value-of select="text_entity"/>
-                               </a>
-                       </td>
-               </tr>
+       <xsl:variable name="lang_entity_statustext">
+               <xsl:value-of select="lang_entity_statustext"/>
+       </xsl:variable>
+       <xsl:variable name="entity_link">
+               <xsl:value-of select="entity_link"/>
+       </xsl:variable>
+       <tr>
+               <td class="small_text" align="left">
+                       <a href="{$entity_link}" 
title="{$lang_entity_statustext}" onMouseout="window.status='';return true;">
+                               <xsl:value-of select="text_entity"/>
+                       </a>
+               </td>
+       </tr>
 </xsl:template>
 
 
 <!-- New template-->
 <xsl:template match="summary">
-               <xsl:apply-templates select="menu"/>
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                       <tr>
-                               <td>
-                                       <xsl:call-template 
name="filter_district"/>
+       <xsl:apply-templates select="menu"/>
+       <table width="100%" cellpadding="2" cellspacing="2" align="center">
+               <tr>
+                       <td>
+                               <xsl:call-template name="filter_district"/>
+                       </td>
+                       <td>
+                               <xsl:call-template name="filter_part_of_town"/>
+                       </td>
+                       <td align="center">
+                               <xsl:call-template name="owner_filter"/>
+                       </td>
+                       <td class="small_text" valign="top" align="left">
+                               <xsl:variable name="link_download">
+                                       <xsl:value-of select="link_download"/>
+                               </xsl:variable>
+                               <xsl:variable name="lang_download_help">
+                                       <xsl:value-of 
select="lang_download_help"/>
+                               </xsl:variable>
+                               <xsl:variable name="lang_download">
+                                       <xsl:value-of select="lang_download"/>
+                               </xsl:variable>
+                               <a href="javascript:var 
w=window.open('{$link_download}','','left=50,top=100')" 
onMouseOver="overlib('{$lang_download_help}', CAPTION, '{$lang_download}')" 
onMouseOut="nd()">
+                                       <xsl:value-of select="lang_download"/>
+                               </a>
+                       </td>
+               </tr>
+       </table>
+       <table width="80%" cellpadding="2" cellspacing="2" align="center">
+               <tr class="th">
+                       <xsl:for-each select="table_header_summary">
+                               <td class="th_text" width="{with}" 
align="{align}">
+                                       <xsl:value-of select="header"/>
                                </td>
-                               <td>
-                                       <xsl:call-template 
name="filter_part_of_town"/>
-                               </td>
-                               <td align="center">
-                                       <xsl:call-template name="owner_filter"/>
-                               </td>
-                               <td class="small_text" valign="top" 
align="left">
-                                       <xsl:variable name="link_download">
-                                               <xsl:value-of 
select="link_download"/>
-                                       </xsl:variable>
-                                       <xsl:variable name="lang_download_help">
-                                               <xsl:value-of 
select="lang_download_help"/>
-                                       </xsl:variable>
-                                       <xsl:variable name="lang_download">
-                                               <xsl:value-of 
select="lang_download"/>
-                                       </xsl:variable>
-                                       <a href="javascript:var 
w=window.open('{$link_download}','','left=50,top=100')" 
onMouseOver="overlib('{$lang_download_help}', CAPTION, '{$lang_download}')" 
onMouseOut="nd()">
-                                               <xsl:value-of 
select="lang_download"/>
-                                       </a>
-                               </td>
-                       </tr>
-               </table>
-               <table width="80%" cellpadding="2" cellspacing="2" 
align="center">
-                       <tr class="th">
-                               <xsl:for-each select="table_header_summary">
-                                       <td class="th_text" width="{with}" 
align="{align}">
-                                               <xsl:value-of select="header"/>
-                                       </td>
-                               </xsl:for-each>
-                       </tr>
-                       <xsl:call-template name="list_values"/>
-               </table>
+                       </xsl:for-each>
+               </tr>
+               <xsl:call-template name="list_values"/>
+       </table>
 </xsl:template>
 
 <!-- change_type_list -->
 <xsl:template match="change_type_list">
-               <xsl:variable name="id">
-                       <xsl:value-of select="id"/>
-               </xsl:variable>
-               <xsl:choose>
-                       <xsl:when test="selected">
-                               <option value="{$id}" selected="selected">
-                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
-                               </option>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <option value="{$id}">
-                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
-                               </option>
-                       </xsl:otherwise>
-               </xsl:choose>
+       <xsl:variable name="id">
+               <xsl:value-of select="id"/>
+       </xsl:variable>
+       <xsl:choose>
+               <xsl:when test="selected">
+                       <option value="{$id}" selected="selected">
+                               <xsl:value-of disable-output-escaping="yes" 
select="name"/>
+                       </option>
+               </xsl:when>
+               <xsl:otherwise>
+                       <option value="{$id}">
+                               <xsl:value-of disable-output-escaping="yes" 
select="name"/>
+                       </option>
+               </xsl:otherwise>
+       </xsl:choose>
 </xsl:template>
 
 <!-- New template-->
 
 <xsl:template name="datatable-yui-definition">
-               <script type="text/javascript">
-                       var myColumnDefs = [
-                       <xsl:for-each select="//table_header">
-                               {
-                                       key: "<xsl:value-of select="name"/>",
-                                       label: "<xsl:value-of select="text"/>",
-                                       resizeable:true,
-                                       sortable: <xsl:value-of 
select="phpgw:conditional(not(sortable = 0), 'true', 'false')"/>,
-                                       visible: <xsl:value-of 
select="phpgw:conditional(not(visible = 0), 'true', 'false')"/>
-                               }<xsl:value-of 
select="phpgw:conditional(not(position() = last()), ',', '')"/>
-                       </xsl:for-each>
-                       ];
-               </script>
+       <script type="text/javascript">
+               var myColumnDefs = [
+               <xsl:for-each select="//table_header">
+                       {
+                       key: "<xsl:value-of select="name"/>",
+                       label: "<xsl:value-of select="text"/>",
+                       resizeable:true,
+                       sortable: <xsl:value-of 
select="phpgw:conditional(not(sortable = 0), 'true', 'false')"/>,
+                       visible: <xsl:value-of 
select="phpgw:conditional(not(visible = 0), 'true', 'false')"/>
+                       }<xsl:value-of select="phpgw:conditional(not(position() 
= last()), ',', '')"/>
+               </xsl:for-each>
+               ];
+       </script>
 </xsl:template>
 
 <xsl:template match="options">

Modified: branches/Version-2_0-branch/property/templates/base/project.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/project.xsl     
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/templates/base/project.xsl     
2017-08-01 09:24:26 UTC (rev 16938)
@@ -2,6 +2,7 @@
 <!-- $Id$ -->
 
 <xsl:template match="data">
+       <xsl:call-template name="jquery_phpgw_i18n"/>
        <xsl:choose>
                <xsl:when test="edit">
                        <xsl:apply-templates select="edit"/>

Modified: branches/Version-2_0-branch/property/templates/base/report.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/report.xsl      
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/templates/base/report.xsl      
2017-08-01 09:24:26 UTC (rev 16938)
@@ -11,7 +11,6 @@
                        <xsl:apply-templates select="lists"/>
                </xsl:otherwise>
        </xsl:choose>
-       <xsl:call-template name="jquery_phpgw_i18n"/>
 </xsl:template>
        
 <xsl:template match="lists">

Modified: branches/Version-2_0-branch/property/templates/base/request.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/request.xsl     
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/templates/base/request.xsl     
2017-08-01 09:24:26 UTC (rev 16938)
@@ -3,9 +3,11 @@
 <xsl:template match="data">
        <xsl:choose>
                <xsl:when test="edit">
+               <xsl:call-template name="jquery_phpgw_i18n"/>
                        <xsl:apply-templates select="edit"/>
                </xsl:when>
                <xsl:when test="view">
+               <xsl:call-template name="jquery_phpgw_i18n"/>
                        <xsl:apply-templates select="view"/>
                </xsl:when>
                <xsl:when test="priority_form">

Modified: branches/Version-2_0-branch/property/templates/base/responsible.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/responsible.xsl 
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/templates/base/responsible.xsl 
2017-08-01 09:24:26 UTC (rev 16938)
@@ -1,20 +1,20 @@
 
 <!-- $Id$ -->
 <xsl:template name="app_data">
-               <xsl:choose>
-                       <xsl:when test="edit">
-                               <xsl:apply-templates select="edit"/>
-                       </xsl:when>
-                       <xsl:when test="edit_contact">
-                               <xsl:apply-templates select="edit_contact"/>
-                       </xsl:when>
-                       <xsl:when test="list_contact">
-                               <xsl:apply-templates select="list_contact"/>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <xsl:apply-templates select="list_type"/>
-                       </xsl:otherwise>
-               </xsl:choose>
+       <xsl:choose>
+               <xsl:when test="edit">
+                       <xsl:apply-templates select="edit"/>
+               </xsl:when>
+               <xsl:when test="edit_contact">
+                       <xsl:apply-templates select="edit_contact"/>
+               </xsl:when>
+               <xsl:when test="list_contact">
+                       <xsl:apply-templates select="list_contact"/>
+               </xsl:when>
+               <xsl:otherwise>
+                       <xsl:apply-templates select="list_type"/>
+               </xsl:otherwise>
+       </xsl:choose>
 </xsl:template>
 
 <!-- add / edit responsibility type-->
@@ -27,94 +27,94 @@
        <div id="tab-content">
                <xsl:value-of disable-output-escaping="yes" select="tabs"/>
                <div id="general">
-               <xsl:variable name="form_action">
-                       <xsl:value-of select="form_action"/>
-               </xsl:variable>
+                       <xsl:variable name="form_action">
+                               <xsl:value-of select="form_action"/>
+                       </xsl:variable>
                        <div class="pure-control-group">
                                <dl>
-                                               <xsl:choose>
-                                                       <xsl:when 
test="msgbox_data != ''">
+                                       <xsl:choose>
+                                               <xsl:when test="msgbox_data != 
''">
                                                        <dt>
-                                                                               
<xsl:call-template name="msgbox"/>
+                                                               
<xsl:call-template name="msgbox"/>
                                                        </dt>
-                                                       </xsl:when>
-                                               </xsl:choose>
+                                               </xsl:when>
+                                       </xsl:choose>
                                </dl>
                                                        
                                <form name="form_app" class="pure-form 
pure-form-aligned" method="post" action="{$form_action}">
-                                               <xsl:choose>
-                                                       <xsl:when 
test="value_id != ''">
+                                       <xsl:choose>
+                                               <xsl:when test="value_id != ''">
                                                        <div 
class="pure-control-group">
                                                                <label>
-                                                                               
<xsl:value-of select="php:function('lang', 'id')"/>
+                                                                       
<xsl:value-of select="php:function('lang', 'id')"/>
                                                                </label>
-                                                                               
<xsl:value-of select="value_id"/>
+                                                               <xsl:value-of 
select="value_id"/>
                                                        </div>
-                                                       </xsl:when>
-                                               </xsl:choose>
+                                               </xsl:when>
+                                       </xsl:choose>
                                        <div class="pure-control-group">
                                                <label>
-                                                                       
<xsl:value-of select="php:function('lang', 'application')"/>
+                                                       <xsl:value-of 
select="php:function('lang', 'application')"/>
                                                </label>
-                                                                       <select 
name="appname" onChange="this.form.submit();">
-                                                                               
<xsl:attribute name="title">
-                                                                               
        <xsl:value-of select="php:function('lang', 'application')"/>
-                                                                               
</xsl:attribute>
-                                                                               
<xsl:apply-templates select="apps_list/options"/>
-                                                                       
</select>
+                                               <select name="appname" 
onChange="this.form.submit();">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="php:function('lang', 'application')"/>
+                                                       </xsl:attribute>
+                                                       <xsl:apply-templates 
select="apps_list/options"/>
+                                               </select>
                                        </div>
-                                               </form>
+                               </form>
                                <form name="form_location" class="pure-form 
pure-form-aligned" method="post" action="{$form_action}">
                                        <div class="pure-control-group">
                                                <label>
-                                                                       <input 
type="hidden" name="appname" value="{value_appname}"/>
-                                                                       
<xsl:value-of select="php:function('lang', 'location')"/>
+                                                       <input type="hidden" 
name="appname" value="{value_appname}"/>
+                                                       <xsl:value-of 
select="php:function('lang', 'location')"/>
                                                </label>
-                                                                       <select 
name="location" onChange="this.form.submit();">
-                                                                               
<xsl:attribute name="title">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Select submodule')"/>
-                                                                               
</xsl:attribute>
-                                                                               
<option value="">
-                                                                               
        <xsl:value-of select="php:function('lang', 'No location')"/>
-                                                                               
</option>
-                                                                               
<xsl:apply-templates select="location_list/options"/>
-                                                                       
</select>
+                                               <select name="location" 
onChange="this.form.submit();">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="php:function('lang', 'Select submodule')"/>
+                                                       </xsl:attribute>
+                                                       <option value="">
+                                                               <xsl:value-of 
select="php:function('lang', 'No location')"/>
+                                                       </option>
+                                                       <xsl:apply-templates 
select="location_list/options"/>
+                                               </select>
                                        </div>
-                                               </form>
+                               </form>
                                <div class="pure-control-group">
                                        <form name="form" class="pure-form 
pure-form-aligned" method="post" action="{$form_action}">
                                                <div class="pure-control-group">
                                                        <label>
-                                                                               
        <input type="hidden" name="values[appname]" value="{value_appname}"/>
-                                                                               
        <input type="hidden" name="values[location]" value="{value_location}"/>
-                                                                               
        <xsl:value-of select="php:function('lang', 'category')"/>
+                                                               <input 
type="hidden" name="values[appname]" value="{value_appname}"/>
+                                                               <input 
type="hidden" name="values[location]" value="{value_location}"/>
+                                                               <xsl:value-of 
select="php:function('lang', 'category')"/>
                                                        </label>
-                                                                               
        <xsl:call-template name="categories"/>
+                                                       <xsl:call-template 
name="categories"/>
                                                </div>
                                                <div class="pure-control-group">
                                                        <label>
-                                                                               
        <xsl:value-of select="php:function('lang', 'name')"/>
+                                                               <xsl:value-of 
select="php:function('lang', 'name')"/>
                                                        </label>
-                                                                               
        <input type="text" name="values[name]" value="{value_name}" size="60">
-                                                                               
                <xsl:attribute name="title">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'name')"/>
-                                                                               
                </xsl:attribute>
-                                                                               
        </input>
+                                                       <input type="text" 
name="values[name]" value="{value_name}" size="60">
+                                                               <xsl:attribute 
name="title">
+                                                                       
<xsl:value-of select="php:function('lang', 'name')"/>
+                                                               </xsl:attribute>
+                                                       </input>
                                                </div>
                                                <div class="pure-control-group">
                                                        <label>
-                                                                               
        <xsl:value-of select="php:function('lang', 'descr')"/>
+                                                               <xsl:value-of 
select="php:function('lang', 'descr')"/>
                                                        </label>
-                                                                               
        <textarea cols="60" rows="10" name="values[descr]">
-                                                                               
                <xsl:attribute name="title">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'descr')"/>
-                                                                               
                </xsl:attribute>
-                                                                               
                <xsl:value-of select="value_descr"/>
-                                                                               
        </textarea>
+                                                       <textarea cols="60" 
rows="10" name="values[descr]">
+                                                               <xsl:attribute 
name="title">
+                                                                       
<xsl:value-of select="php:function('lang', 'descr')"/>
+                                                               </xsl:attribute>
+                                                               <xsl:value-of 
select="value_descr"/>
+                                                       </textarea>
                                                </div>
                                                <div class="pure-control-group">
                                                        <label>
-                                                                               
        <xsl:value-of select="php:function('lang', 'details')"/>
+                                                               <xsl:value-of 
select="php:function('lang', 'details')"/>
                                                        </label>
                                                        <div class = 
'pure-u-md-1-2'>
                                                                <xsl:for-each 
select="datatable_def">
@@ -131,37 +131,37 @@
                                                        </div>
                                                </div>
                                                <div class="pure-control-group">
-                                                                               
                <xsl:variable name="lang_save">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'save')"/>
-                                                                               
                </xsl:variable>
-                                                                               
                <xsl:variable name="lang_apply">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'apply')"/>
-                                                                               
                </xsl:variable>
-                                                                               
                <xsl:variable name="lang_cancel">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'cancel')"/>
-                                                                               
                </xsl:variable>
+                                                       <xsl:variable 
name="lang_save">
+                                                               <xsl:value-of 
select="php:function('lang', 'save')"/>
+                                                       </xsl:variable>
+                                                       <xsl:variable 
name="lang_apply">
+                                                               <xsl:value-of 
select="php:function('lang', 'apply')"/>
+                                                       </xsl:variable>
+                                                       <xsl:variable 
name="lang_cancel">
+                                                               <xsl:value-of 
select="php:function('lang', 'cancel')"/>
+                                                       </xsl:variable>
                                                        <div 
class="pure-control-group">
                                                                <input 
type="submit" class="pure-button pure-button-primary" name="values[save]" 
value="{$lang_save}">
-                                                                               
                                        <xsl:attribute name="title">
-                                                                               
                                                <xsl:value-of 
select="php:function('lang', 'save')"/>
-                                                                               
                                        </xsl:attribute>
-                                                                               
                                </input>
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="php:function('lang', 'save')"/>
+                                                                       
</xsl:attribute>
+                                                               </input>
                                                                <input 
type="submit" class="pure-button pure-button-primary" name="values[apply]" 
value="{$lang_apply}">
-                                                                               
                                        <xsl:attribute name="title">
-                                                                               
                                                <xsl:value-of 
select="php:function('lang', 'apply')"/>
-                                                                               
                                        </xsl:attribute>
-                                                                               
                                </input>
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="php:function('lang', 'apply')"/>
+                                                                       
</xsl:attribute>
+                                                               </input>
                                                                <input 
type="submit" class="pure-button pure-button-primary" name="values[cancel]" 
value="{$lang_cancel}">
-                                                                               
                                        <xsl:attribute name="title">
-                                                                               
                                                <xsl:value-of 
select="php:function('lang', 'cancel')"/>
-                                                                               
                                        </xsl:attribute>
-                                                                               
                                </input>
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="php:function('lang', 'cancel')"/>
+                                                                       
</xsl:attribute>
+                                                               </input>
                                                        </div>
                                                </div>
-                                                       </form>
+                                       </form>
                                </div>
                        </div>
-               <!--  DATATABLE DEFINITIONS-->
+                       <!--  DATATABLE DEFINITIONS-->
                </div>
        </div>
 </xsl:template>
@@ -168,140 +168,140 @@
 
 <!-- add / edit  -->
 <xsl:template xmlns:php="http://php.net/xsl"; match="edit_role">
-               <xsl:variable name="form_action">
-                       <xsl:value-of select="form_action"/>
-               </xsl:variable>
+       <xsl:variable name="form_action">
+               <xsl:value-of select="form_action"/>
+       </xsl:variable>
        <div id="tab-content">
                <xsl:value-of disable-output-escaping="yes" select="tabs"/>
                <div id="general">
-               <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
-                       <tr>
-                               <td>
-                                       <table cellpadding="2" cellspacing="2" 
align="left">
-                                               <xsl:choose>
-                                                       <xsl:when 
test="msgbox_data != ''">
-                                                               <tr>
-                                                                       <td 
align="left" colspan="3">
-                                                                               
<xsl:call-template name="msgbox"/>
-                                                                       </td>
-                                                               </tr>
-                                                       </xsl:when>
-                                               </xsl:choose>
-                                       </table>
-                                       <tr>
-                                               <td>
-                                                       <form name="form" 
method="post" action="{$form_action}">
-                                                               <table 
cellpadding="2" cellspacing="2" align="left">
-                                                                       
<xsl:choose>
-                                                                               
<xsl:when test="value_id != ''">
-                                                                               
        <tr>
-                                                                               
                <td valign="top">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'id')"/>
-                                                                               
                </td>
-                                                                               
                <td>
-                                                                               
                        <xsl:value-of select="value_id"/>
-                                                                               
                </td>
-                                                                               
        </tr>
-                                                                               
</xsl:when>
-                                                                       
</xsl:choose>
+                       <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
+                               <tr>
+                                       <td>
+                                               <table cellpadding="2" 
cellspacing="2" align="left">
+                                                       <xsl:choose>
+                                                               <xsl:when 
test="msgbox_data != ''">
                                                                        <tr>
-                                                                               
<td>
-                                                                               
        <xsl:value-of select="php:function('lang', 'name')"/>
+                                                                               
<td align="left" colspan="3">
+                                                                               
        <xsl:call-template name="msgbox"/>
                                                                                
</td>
-                                                                               
<td>
-                                                                               
        <input type="text" name="values[name]" value="{value_name}" size="60">
-                                                                               
                <xsl:attribute name="title">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'name')"/>
-                                                                               
                </xsl:attribute>
-                                                                               
        </input>
-                                                                               
</td>
                                                                        </tr>
-                                                                       <tr>
-                                                                               
<td valign="top">
-                                                                               
        <xsl:value-of select="php:function('lang', 'descr')"/>
-                                                                               
</td>
-                                                                               
<td>
-                                                                               
        <textarea cols="60" rows="10" name="values[remark]">
-                                                                               
                <xsl:attribute name="title">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'descr')"/>
-                                                                               
                </xsl:attribute>
-                                                                               
                <xsl:value-of select="value_remark"/>
-                                                                               
        </textarea>
-                                                                               
</td>
-                                                                       </tr>
-                                                                       <tr>
-                                                                               
<td>
-                                                                               
        <xsl:value-of select="php:function('lang', 'responsibility')"/>
-                                                                               
</td>
-                                                                               
<td align="left">
-                                                                               
        <select name="values[responsibility_id]">
-                                                                               
                <xsl:attribute name="title">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'Select 
submodule')"/>
-                                                                               
                </xsl:attribute>
-                                                                               
                <option value="">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'select')"/>
-                                                                               
                </option>
-                                                                               
                <xsl:apply-templates select="responsibility_list/options"/>
-                                                                               
        </select>
-                                                                               
</td>
-                                                                       </tr>
-
-                                                                       <tr>
-                                                                               
<td valign = 'top'>
-                                                                               
        <xsl:value-of select="php:function('lang', 'location level')"/>
-                                                                               
</td>
-                                                                               
<td align="left">
-                                                                               
        <table>
-                                                                               
                <xsl:apply-templates select="level_list/checkbox"/>
-                                                                               
        </table>
-                                                                               
</td>
-                                                                       </tr>
-
-                                                                       <tr>
-                                                                               
<td colspan="2">
-                                                                               
        <table cellpadding="2" cellspacing="2" width="50%" align="center">
-                                                                               
                <xsl:variable name="lang_save">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'save')"/>
-                                                                               
                </xsl:variable>
-                                                                               
                <xsl:variable name="lang_apply">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'apply')"/>
-                                                                               
                </xsl:variable>
-                                                                               
                <xsl:variable name="lang_cancel">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'cancel')"/>
-                                                                               
                </xsl:variable>
-                                                                               
                <tr height="50">
-                                                                               
                        <td>
-                                                                               
                                <input type="submit" name="values[save]" 
value="{$lang_save}">
-                                                                               
                                        <xsl:attribute name="title">
-                                                                               
                                                <xsl:value-of 
select="php:function('lang', 'save')"/>
-                                                                               
                                        </xsl:attribute>
-                                                                               
                                </input>
+                                                               </xsl:when>
+                                                       </xsl:choose>
+                                               </table>
+                                               <tr>
+                                                       <td>
+                                                               <form 
name="form" method="post" action="{$form_action}">
+                                                                       <table 
cellpadding="2" cellspacing="2" align="left">
+                                                                               
<xsl:choose>
+                                                                               
        <xsl:when test="value_id != ''">
+                                                                               
                <tr>
+                                                                               
                        <td valign="top">
+                                                                               
                                <xsl:value-of select="php:function('lang', 
'id')"/>
                                                                                
                        </td>
                                                                                
                        <td>
-                                                                               
                                <input type="submit" name="values[apply]" 
value="{$lang_apply}">
-                                                                               
                                        <xsl:attribute name="title">
-                                                                               
                                                <xsl:value-of 
select="php:function('lang', 'apply')"/>
-                                                                               
                                        </xsl:attribute>
-                                                                               
                                </input>
+                                                                               
                                <xsl:value-of select="value_id"/>
                                                                                
                        </td>
-                                                                               
                        <td>
-                                                                               
                                <input type="submit" name="values[cancel]" 
value="{$lang_cancel}">
-                                                                               
                                        <xsl:attribute name="title">
-                                                                               
                                                <xsl:value-of 
select="php:function('lang', 'cancel')"/>
-                                                                               
                                        </xsl:attribute>
-                                                                               
                                </input>
-                                                                               
                        </td>
                                                                                
                </tr>
-                                                                               
        </table>
-                                                                               
</td>
-                                                                       </tr>
-                                                               </table>
-                                                       </form>
-                                               </td>
-                                       </tr>
-                               </td>
-                       </tr>
-               </table>
+                                                                               
        </xsl:when>
+                                                                               
</xsl:choose>
+                                                                               
<tr>
+                                                                               
        <td>
+                                                                               
                <xsl:value-of select="php:function('lang', 'name')"/>
+                                                                               
        </td>
+                                                                               
        <td>
+                                                                               
                <input type="text" name="values[name]" value="{value_name}" 
size="60">
+                                                                               
                        <xsl:attribute name="title">
+                                                                               
                                <xsl:value-of select="php:function('lang', 
'name')"/>
+                                                                               
                        </xsl:attribute>
+                                                                               
                </input>
+                                                                               
        </td>
+                                                                               
</tr>
+                                                                               
<tr>
+                                                                               
        <td valign="top">
+                                                                               
                <xsl:value-of select="php:function('lang', 'descr')"/>
+                                                                               
        </td>
+                                                                               
        <td>
+                                                                               
                <textarea cols="60" rows="10" name="values[remark]">
+                                                                               
                        <xsl:attribute name="title">
+                                                                               
                                <xsl:value-of select="php:function('lang', 
'descr')"/>
+                                                                               
                        </xsl:attribute>
+                                                                               
                        <xsl:value-of select="value_remark"/>
+                                                                               
                </textarea>
+                                                                               
        </td>
+                                                                               
</tr>
+                                                                               
<tr>
+                                                                               
        <td>
+                                                                               
                <xsl:value-of select="php:function('lang', 'responsibility')"/>
+                                                                               
        </td>
+                                                                               
        <td align="left">
+                                                                               
                <select name="values[responsibility_id]">
+                                                                               
                        <xsl:attribute name="title">
+                                                                               
                                <xsl:value-of select="php:function('lang', 
'Select submodule')"/>
+                                                                               
                        </xsl:attribute>
+                                                                               
                        <option value="">
+                                                                               
                                <xsl:value-of select="php:function('lang', 
'select')"/>
+                                                                               
                        </option>
+                                                                               
                        <xsl:apply-templates 
select="responsibility_list/options"/>
+                                                                               
                </select>
+                                                                               
        </td>
+                                                                               
</tr>
+
+                                                                               
<tr>
+                                                                               
        <td valign = 'top'>
+                                                                               
                <xsl:value-of select="php:function('lang', 'location level')"/>
+                                                                               
        </td>
+                                                                               
        <td align="left">
+                                                                               
                <table>
+                                                                               
                        <xsl:apply-templates select="level_list/checkbox"/>
+                                                                               
                </table>
+                                                                               
        </td>
+                                                                               
</tr>
+
+                                                                               
<tr>
+                                                                               
        <td colspan="2">
+                                                                               
                <table cellpadding="2" cellspacing="2" width="50%" 
align="center">
+                                                                               
                        <xsl:variable name="lang_save">
+                                                                               
                                <xsl:value-of select="php:function('lang', 
'save')"/>
+                                                                               
                        </xsl:variable>
+                                                                               
                        <xsl:variable name="lang_apply">
+                                                                               
                                <xsl:value-of select="php:function('lang', 
'apply')"/>
+                                                                               
                        </xsl:variable>
+                                                                               
                        <xsl:variable name="lang_cancel">
+                                                                               
                                <xsl:value-of select="php:function('lang', 
'cancel')"/>
+                                                                               
                        </xsl:variable>
+                                                                               
                        <tr height="50">
+                                                                               
                                <td>
+                                                                               
                                        <input type="submit" 
name="values[save]" value="{$lang_save}">
+                                                                               
                                                <xsl:attribute name="title">
+                                                                               
                                                        <xsl:value-of 
select="php:function('lang', 'save')"/>
+                                                                               
                                                </xsl:attribute>
+                                                                               
                                        </input>
+                                                                               
                                </td>
+                                                                               
                                <td>
+                                                                               
                                        <input type="submit" 
name="values[apply]" value="{$lang_apply}">
+                                                                               
                                                <xsl:attribute name="title">
+                                                                               
                                                        <xsl:value-of 
select="php:function('lang', 'apply')"/>
+                                                                               
                                                </xsl:attribute>
+                                                                               
                                        </input>
+                                                                               
                                </td>
+                                                                               
                                <td>
+                                                                               
                                        <input type="submit" 
name="values[cancel]" value="{$lang_cancel}">
+                                                                               
                                                <xsl:attribute name="title">
+                                                                               
                                                        <xsl:value-of 
select="php:function('lang', 'cancel')"/>
+                                                                               
                                                </xsl:attribute>
+                                                                               
                                        </input>
+                                                                               
                                </td>
+                                                                               
                        </tr>
+                                                                               
                </table>
+                                                                               
        </td>
+                                                                               
</tr>
+                                                                       </table>
+                                                               </form>
+                                                       </td>
+                                               </tr>
+                                       </td>
+                               </tr>
+                       </table>
                </div>
        </div>
 </xsl:template>
@@ -308,382 +308,382 @@
 
 <!-- New template-->
 <xsl:template match="list_contact">
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                       <xsl:choose>
-                               <xsl:when test="msgbox_data != ''">
-                                       <tr>
-                                               <td align="left" colspan="3">
-                                                       <xsl:call-template 
name="msgbox"/>
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
-                       <tr>
-                               <td class="th_text" align="left">
-                                       <xsl:value-of select="location_name"/>
-                                       <xsl:choose>
-                                               <xsl:when test="category_name 
!= ''">
-                                                       <xsl:text>::</xsl:text>
-                                                       <xsl:value-of 
select="category_name"/>
-                                               </xsl:when>
-                                       </xsl:choose>
-                                       <xsl:text>::</xsl:text>
-                                       <xsl:value-of select="type_name"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td align="right">
-                                       <xsl:call-template name="search_field"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td colspan="3" width="100%">
-                                       <xsl:call-template name="nextmatchs"/>
-                               </td>
-                       </tr>
-               </table>
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                       <xsl:apply-templates select="table_header_contact"/>
-                       <xsl:choose>
-                               <xsl:when test="values_contact != ''">
-                                       <xsl:apply-templates 
select="values_contact"/>
-                               </xsl:when>
-                       </xsl:choose>
-                       <xsl:apply-templates select="table_add"/>
-               </table>
+       <table width="100%" cellpadding="2" cellspacing="2" align="center">
+               <xsl:choose>
+                       <xsl:when test="msgbox_data != ''">
+                               <tr>
+                                       <td align="left" colspan="3">
+                                               <xsl:call-template 
name="msgbox"/>
+                                       </td>
+                               </tr>
+                       </xsl:when>
+               </xsl:choose>
+               <tr>
+                       <td class="th_text" align="left">
+                               <xsl:value-of select="location_name"/>
+                               <xsl:choose>
+                                       <xsl:when test="category_name != ''">
+                                               <xsl:text>::</xsl:text>
+                                               <xsl:value-of 
select="category_name"/>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <xsl:text>::</xsl:text>
+                               <xsl:value-of select="type_name"/>
+                       </td>
+               </tr>
+               <tr>
+                       <td align="right">
+                               <xsl:call-template name="search_field"/>
+                       </td>
+               </tr>
+               <tr>
+                       <td colspan="3" width="100%">
+                               <xsl:call-template name="nextmatchs"/>
+                       </td>
+               </tr>
+       </table>
+       <table width="100%" cellpadding="2" cellspacing="2" align="center">
+               <xsl:apply-templates select="table_header_contact"/>
+               <xsl:choose>
+                       <xsl:when test="values_contact != ''">
+                               <xsl:apply-templates select="values_contact"/>
+                       </xsl:when>
+               </xsl:choose>
+               <xsl:apply-templates select="table_add"/>
+       </table>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="table_header_contact">
-               <xsl:variable name="sort_location">
-                       <xsl:value-of select="sort_location"/>
-               </xsl:variable>
-               <xsl:variable name="sort_active_from">
-                       <xsl:value-of select="sort_active_from"/>
-               </xsl:variable>
-               <xsl:variable name="sort_active_to">
-                       <xsl:value-of select="sort_active_to"/>
-               </xsl:variable>
-               <tr class="th">
-                       <td class="th_text" width="20%" align="center">
-                               <xsl:value-of select="lang_contact"/>
-                       </td>
-                       <td class="th_text" width="10%" align="left">
-                               <a href="{$sort_location}">
-                                       <xsl:value-of select="lang_location"/>
-                               </a>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_item"/>
-                       </td>
-                       <td class="th_text" width="5%" align="left">
-                               <a href="{$sort_active_from}">
-                                       <xsl:value-of 
select="lang_active_from"/>
-                               </a>
-                       </td>
-                       <td class="th_text" width="5%" align="left">
-                               <a href="{$sort_active_to}">
-                                       <xsl:value-of select="lang_active_to"/>
-                               </a>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_created_on"/>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_created_by"/>
-                       </td>
-                       <td class="th_text" width="40%" align="left">
-                               <xsl:value-of select="lang_remark"/>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_edit"/>
-                       </td>
-                       <!--
+       <xsl:variable name="sort_location">
+               <xsl:value-of select="sort_location"/>
+       </xsl:variable>
+       <xsl:variable name="sort_active_from">
+               <xsl:value-of select="sort_active_from"/>
+       </xsl:variable>
+       <xsl:variable name="sort_active_to">
+               <xsl:value-of select="sort_active_to"/>
+       </xsl:variable>
+       <tr class="th">
+               <td class="th_text" width="20%" align="center">
+                       <xsl:value-of select="lang_contact"/>
+               </td>
+               <td class="th_text" width="10%" align="left">
+                       <a href="{$sort_location}">
+                               <xsl:value-of select="lang_location"/>
+                       </a>
+               </td>
                <td class="th_text" width="5%" align="center">
+                       <xsl:value-of select="lang_item"/>
+               </td>
+               <td class="th_text" width="5%" align="left">
+                       <a href="{$sort_active_from}">
+                               <xsl:value-of select="lang_active_from"/>
+                       </a>
+               </td>
+               <td class="th_text" width="5%" align="left">
+                       <a href="{$sort_active_to}">
+                               <xsl:value-of select="lang_active_to"/>
+                       </a>
+               </td>
+               <td class="th_text" width="5%" align="center">
+                       <xsl:value-of select="lang_created_on"/>
+               </td>
+               <td class="th_text" width="5%" align="center">
+                       <xsl:value-of select="lang_created_by"/>
+               </td>
+               <td class="th_text" width="40%" align="left">
+                       <xsl:value-of select="lang_remark"/>
+               </td>
+               <td class="th_text" width="5%" align="center">
+                       <xsl:value-of select="lang_edit"/>
+               </td>
+               <!--
+               <td class="th_text" width="5%" align="center">
                <xsl:value-of select="lang_delete"/>
                </td>
                -->
-               </tr>
+       </tr>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="values_contact">
-               <tr>
-                       <xsl:attribute name="class">
-                               <xsl:choose>
-                                       <xsl:when test="position() mod 2 = 0">
-                                               <xsl:text>row_off</xsl:text>
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <xsl:text>row_on</xsl:text>
-                                       </xsl:otherwise>
-                               </xsl:choose>
-                       </xsl:attribute>
-                       <td align="left">
-                               <xsl:value-of select="contact_name"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="location_code"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="item"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="active_from"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="active_to"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="created_on"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="created_by"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="remark"/>
-                       </td>
+       <tr>
+               <xsl:attribute name="class">
                        <xsl:choose>
-                               <xsl:when test="link_edit != ''">
-                                       <td align="center" 
title="{lang_edit_text}">
-                                               <xsl:variable name="link_edit">
-                                                       <xsl:value-of 
select="link_edit"/>
-                                               </xsl:variable>
-                                               <a href="{link_edit}">
-                                                       <xsl:value-of 
select="text_edit"/>
-                                               </a>
-                                       </td>
+                               <xsl:when test="position() mod 2 = 0">
+                                       <xsl:text>row_off</xsl:text>
                                </xsl:when>
+                               <xsl:otherwise>
+                                       <xsl:text>row_on</xsl:text>
+                               </xsl:otherwise>
                        </xsl:choose>
-                       <xsl:choose>
-                               <xsl:when test="link_delete != ''">
-                                       <td align="center" 
title="{lang_delete_text}">
-                                               <xsl:variable 
name="link_delete">
-                                                       <xsl:value-of 
select="link_delete"/>
-                                               </xsl:variable>
-                                               <a href="{link_delete}">
-                                                       <xsl:value-of 
select="text_delete"/>
-                                               </a>
-                                       </td>
-                               </xsl:when>
-                       </xsl:choose>
-               </tr>
+               </xsl:attribute>
+               <td align="left">
+                       <xsl:value-of select="contact_name"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="location_code"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="item"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="active_from"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="active_to"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="created_on"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="created_by"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="remark"/>
+               </td>
+               <xsl:choose>
+                       <xsl:when test="link_edit != ''">
+                               <td align="center" title="{lang_edit_text}">
+                                       <xsl:variable name="link_edit">
+                                               <xsl:value-of 
select="link_edit"/>
+                                       </xsl:variable>
+                                       <a href="{link_edit}">
+                                               <xsl:value-of 
select="text_edit"/>
+                                       </a>
+                               </td>
+                       </xsl:when>
+               </xsl:choose>
+               <xsl:choose>
+                       <xsl:when test="link_delete != ''">
+                               <td align="center" title="{lang_delete_text}">
+                                       <xsl:variable name="link_delete">
+                                               <xsl:value-of 
select="link_delete"/>
+                                       </xsl:variable>
+                                       <a href="{link_delete}">
+                                               <xsl:value-of 
select="text_delete"/>
+                                       </a>
+                               </td>
+                       </xsl:when>
+               </xsl:choose>
+       </tr>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="table_add">
-               <xsl:variable name="add_action">
-                       <xsl:value-of select="add_action"/>
-               </xsl:variable>
-               <xsl:variable name="lang_add">
-                       <xsl:value-of select="lang_add"/>
-               </xsl:variable>
-               <tr>
-                       <td height="50">
-                               <form method="post" action="{$add_action}">
-                                       <input type="submit" name="add" 
value="{$lang_add}">
-                                               <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="lang_add_statustext"/>
-                                               </xsl:attribute>
-                                       </input>
-                               </form>
-                       </td>
-                       <xsl:choose>
-                               <xsl:when test="cancel_action != ''">
-                                       <td height="50">
-                                               <form method="post" 
action="{cancel_action}">
-                                                       <input type="submit" 
name="add" value="{lang_cancel}">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_cancel_statustext"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </form>
-                                       </td>
-                               </xsl:when>
-                       </xsl:choose>
-               </tr>
+       <xsl:variable name="add_action">
+               <xsl:value-of select="add_action"/>
+       </xsl:variable>
+       <xsl:variable name="lang_add">
+               <xsl:value-of select="lang_add"/>
+       </xsl:variable>
+       <tr>
+               <td height="50">
+                       <form method="post" action="{$add_action}">
+                               <input type="submit" name="add" 
value="{$lang_add}">
+                                       <xsl:attribute name="title">
+                                               <xsl:value-of 
select="lang_add_statustext"/>
+                                       </xsl:attribute>
+                               </input>
+                       </form>
+               </td>
+               <xsl:choose>
+                       <xsl:when test="cancel_action != ''">
+                               <td height="50">
+                                       <form method="post" 
action="{cancel_action}">
+                                               <input type="submit" name="add" 
value="{lang_cancel}">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_cancel_statustext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </form>
+                               </td>
+                       </xsl:when>
+               </xsl:choose>
+       </tr>
 </xsl:template>
 
 <!-- add / edit contact-->
 <xsl:template match="edit_contact">
-               <div align="left">
-                       <xsl:variable name="form_action">
-                               <xsl:value-of select="form_action"/>
-                       </xsl:variable>
-                       <form method="post" action="{$form_action}" name="form">
-                               <table cellpadding="2" cellspacing="2" 
width="80%" align="center">
-                                       <xsl:choose>
-                                               <xsl:when test="msgbox_data != 
''">
+       <div align="left">
+               <xsl:variable name="form_action">
+                       <xsl:value-of select="form_action"/>
+               </xsl:variable>
+               <form method="post" action="{$form_action}" name="form">
+                       <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
+                               <xsl:choose>
+                                       <xsl:when test="msgbox_data != ''">
+                                               <tr>
+                                                       <td align="left" 
colspan="3">
+                                                               
<xsl:call-template name="msgbox"/>
+                                                       </td>
+                                               </tr>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <tr>
+                                       <td>
+                                               <xsl:value-of 
select="lang_location"/>
+                                       </td>
+                                       <td>
+                                               <xsl:value-of 
select="value_location_name"/>
+                                       </td>
+                               </tr>
+                               <xsl:choose>
+                                       <xsl:when test="value_id != ''">
+                                               <tr>
+                                                       <td valign="top" 
width="30%">
+                                                               <xsl:value-of 
select="lang_id"/>
+                                                       </td>
+                                                       <td align="left">
+                                                               <xsl:value-of 
select="value_id"/>
+                                                       </td>
+                                               </tr>
+                                               <tr>
+                                                       <td valign="top">
+                                                               <xsl:value-of 
select="lang_entry_date"/>
+                                                       </td>
+                                                       <td>
+                                                               <xsl:value-of 
select="value_entry_date"/>
+                                                       </td>
+                                               </tr>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <tr>
+                                       <td>
+                                               <xsl:value-of 
select="lang_responsibility"/>
+                                       </td>
+                                       <td>
+                                               <input type="text" 
name="responsibility_id" value="{value_responsibility_id}" readonly="readonly" 
size="5" onMouseout="window.status='';return true;">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_responsibility_status_text"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                               <input size="30" type="text" 
name="responsibility_name" value="{value_responsibility_name}" 
readonly="readonly">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_responsibility_status_text"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>
+                                               <xsl:value-of 
select="lang_contact"/>
+                                       </td>
+                                       <td>
+                                               <input type="text" 
name="contact" value="{value_contact_id}" onClick="lookup_contact()" 
readonly="readonly" size="5" onMouseout="window.status='';return true;">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_contact_status_text"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                               <input size="30" type="text" 
name="contact_name" value="{value_contact_name}" onClick="lookup_contact()" 
readonly="readonly">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_contact_status_text"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+                               <xsl:call-template name="location_form"/>
+                               <tr>
+                                       <td>
+                                               <xsl:value-of 
select="lang_active_from"/>
+                                       </td>
+                                       <td>
+                                               <input type="text" 
id="values_active_from" name="values[active_from]" size="10" 
value="{value_active_from}" readonly="readonly" 
onMouseout="window.status='';return true;">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_active_from_statustext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>
+                                               <xsl:value-of 
select="lang_active_to"/>
+                                       </td>
+                                       <td>
+                                               <input type="text" 
id="values_active_to" name="values[active_to]" size="10" 
value="{value_active_to}" readonly="readonly" 
onMouseout="window.status='';return true;">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_active_to_statustext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td valign="top" 
title="{lang_remark_status_text}">
+                                               <xsl:value-of 
select="lang_remark"/>
+                                       </td>
+                                       <td>
+                                               <textarea cols="60" rows="10" 
name="values[remark]" onMouseout="window.status='';return true;">
+                                                       <xsl:value-of 
select="value_remark"/>
+                                               </textarea>
+                                       </td>
+                               </tr>
+                               <tr height="50">
+                                       <td colspan="2" align="center">
+                                               <table>
                                                        <tr>
-                                                               <td 
align="left" colspan="3">
-                                                                       
<xsl:call-template name="msgbox"/>
+                                                               <td 
valign="bottom">
+                                                                       
<xsl:variable name="lang_save">
+                                                                               
<xsl:value-of select="lang_save"/>
+                                                                       
</xsl:variable>
+                                                                       <input 
type="submit" name="values[save]" value="{$lang_save}" 
onMouseout="window.status='';return true;">
+                                                                               
<xsl:attribute name="title">
+                                                                               
        <xsl:value-of select="lang_save_status_text"/>
+                                                                               
</xsl:attribute>
+                                                                       </input>
                                                                </td>
-                                                       </tr>
-                                               </xsl:when>
-                                       </xsl:choose>
-                                       <tr>
-                                               <td>
-                                                       <xsl:value-of 
select="lang_location"/>
-                                               </td>
-                                               <td>
-                                                       <xsl:value-of 
select="value_location_name"/>
-                                               </td>
-                                       </tr>
-                                       <xsl:choose>
-                                               <xsl:when test="value_id != ''">
-                                                       <tr>
-                                                               <td 
valign="top" width="30%">
-                                                                       
<xsl:value-of select="lang_id"/>
+                                                               <td 
valign="bottom">
+                                                                       
<xsl:variable name="lang_apply">
+                                                                               
<xsl:value-of select="lang_apply"/>
+                                                                       
</xsl:variable>
+                                                                       <input 
type="submit" name="values[apply]" value="{$lang_apply}" 
onMouseout="window.status='';return true;">
+                                                                               
<xsl:attribute name="title">
+                                                                               
        <xsl:value-of select="lang_apply_status_text"/>
+                                                                               
</xsl:attribute>
+                                                                       </input>
                                                                </td>
-                                                               <td 
align="left">
-                                                                       
<xsl:value-of select="value_id"/>
+                                                               <td 
align="left" valign="bottom">
+                                                                       
<xsl:variable name="lang_cancel">
+                                                                               
<xsl:value-of select="lang_cancel"/>
+                                                                       
</xsl:variable>
+                                                                       <input 
type="submit" name="values[cancel]" value="{$lang_cancel}" 
onMouseout="window.status='';return true;">
+                                                                               
<xsl:attribute name="title">
+                                                                               
        <xsl:value-of select="lang_cancel_status_text"/>
+                                                                               
</xsl:attribute>
+                                                                       </input>
                                                                </td>
                                                        </tr>
-                                                       <tr>
-                                                               <td 
valign="top">
-                                                                       
<xsl:value-of select="lang_entry_date"/>
-                                                               </td>
-                                                               <td>
-                                                                       
<xsl:value-of select="value_entry_date"/>
-                                                               </td>
-                                                       </tr>
-                                               </xsl:when>
-                                       </xsl:choose>
-                                       <tr>
-                                               <td>
-                                                       <xsl:value-of 
select="lang_responsibility"/>
-                                               </td>
-                                               <td>
-                                                       <input type="text" 
name="responsibility_id" value="{value_responsibility_id}" readonly="readonly" 
size="5" onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_responsibility_status_text"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                                       <input size="30" 
type="text" name="responsibility_name" value="{value_responsibility_name}" 
readonly="readonly">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_responsibility_status_text"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>
-                                                       <xsl:value-of 
select="lang_contact"/>
-                                               </td>
-                                               <td>
-                                                       <input type="text" 
name="contact" value="{value_contact_id}" onClick="lookup_contact()" 
readonly="readonly" size="5" onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_contact_status_text"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                                       <input size="30" 
type="text" name="contact_name" value="{value_contact_name}" 
onClick="lookup_contact()" readonly="readonly">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_contact_status_text"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </td>
-                                       </tr>
-                                       <xsl:call-template 
name="location_form"/>
-                                       <tr>
-                                               <td>
-                                                       <xsl:value-of 
select="lang_active_from"/>
-                                               </td>
-                                               <td>
-                                                       <input type="text" 
id="values_active_from" name="values[active_from]" size="10" 
value="{value_active_from}" readonly="readonly" 
onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_active_from_statustext"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>
-                                                       <xsl:value-of 
select="lang_active_to"/>
-                                               </td>
-                                               <td>
-                                                       <input type="text" 
id="values_active_to" name="values[active_to]" size="10" 
value="{value_active_to}" readonly="readonly" 
onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_active_to_statustext"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td valign="top" 
title="{lang_remark_status_text}">
-                                                       <xsl:value-of 
select="lang_remark"/>
-                                               </td>
-                                               <td>
-                                                       <textarea cols="60" 
rows="10" name="values[remark]" onMouseout="window.status='';return true;">
-                                                               <xsl:value-of 
select="value_remark"/>
-                                                       </textarea>
-                                               </td>
-                                       </tr>
-                                       <tr height="50">
-                                               <td colspan="2" align="center">
-                                                       <table>
-                                                               <tr>
-                                                                       <td 
valign="bottom">
-                                                                               
<xsl:variable name="lang_save">
-                                                                               
        <xsl:value-of select="lang_save"/>
-                                                                               
</xsl:variable>
-                                                                               
<input type="submit" name="values[save]" value="{$lang_save}" 
onMouseout="window.status='';return true;">
-                                                                               
        <xsl:attribute name="title">
-                                                                               
                <xsl:value-of select="lang_save_status_text"/>
-                                                                               
        </xsl:attribute>
-                                                                               
</input>
-                                                                       </td>
-                                                                       <td 
valign="bottom">
-                                                                               
<xsl:variable name="lang_apply">
-                                                                               
        <xsl:value-of select="lang_apply"/>
-                                                                               
</xsl:variable>
-                                                                               
<input type="submit" name="values[apply]" value="{$lang_apply}" 
onMouseout="window.status='';return true;">
-                                                                               
        <xsl:attribute name="title">
-                                                                               
                <xsl:value-of select="lang_apply_status_text"/>
-                                                                               
        </xsl:attribute>
-                                                                               
</input>
-                                                                       </td>
-                                                                       <td 
align="left" valign="bottom">
-                                                                               
<xsl:variable name="lang_cancel">
-                                                                               
        <xsl:value-of select="lang_cancel"/>
-                                                                               
</xsl:variable>
-                                                                               
<input type="submit" name="values[cancel]" value="{$lang_cancel}" 
onMouseout="window.status='';return true;">
-                                                                               
        <xsl:attribute name="title">
-                                                                               
                <xsl:value-of select="lang_cancel_status_text"/>
-                                                                               
        </xsl:attribute>
-                                                                               
</input>
-                                                                       </td>
-                                                               </tr>
-                                                       </table>
-                                               </td>
-                                       </tr>
-                               </table>
-                       </form>
-               </div>
+                                               </table>
+                                       </td>
+                               </tr>
+                       </table>
+               </form>
+       </div>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="options">
-               <option value="{id}">
-                       <xsl:if test="selected != 0">
-                               <xsl:attribute name="selected" 
value="selected"/>
-                       </xsl:if>
-                       <xsl:value-of disable-output-escaping="yes" 
select="name"/>
-               </option>
+       <option value="{id}">
+               <xsl:if test="selected != 0">
+                       <xsl:attribute name="selected" value="selected"/>
+               </xsl:if>
+               <xsl:value-of disable-output-escaping="yes" select="name"/>
+       </option>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="checkbox">
-               <tr>
-                       <td value="{id}">
-                               <input type="checkbox" 
name="values[location_level][]" value="{id}">
-                                       <xsl:attribute name="title">
-                                               <xsl:value-of select="name"/>
-                                       </xsl:attribute>
-                                       <xsl:if test="selected != 0">
-                                               <xsl:attribute name="checked" 
value="checked"/>
-                                       </xsl:if>
-                               </input>
-                               <xsl:value-of select="name"/>
-                       </td>
-               </tr>
+       <tr>
+               <td value="{id}">
+                       <input type="checkbox" name="values[location_level][]" 
value="{id}">
+                               <xsl:attribute name="title">
+                                       <xsl:value-of select="name"/>
+                               </xsl:attribute>
+                               <xsl:if test="selected != 0">
+                                       <xsl:attribute name="checked" 
value="checked"/>
+                               </xsl:if>
+                       </input>
+                       <xsl:value-of select="name"/>
+               </td>
+       </tr>
 </xsl:template>

Modified: branches/Version-2_0-branch/property/templates/base/s_agreement.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/s_agreement.xsl 
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/templates/base/s_agreement.xsl 
2017-08-01 09:24:26 UTC (rev 16938)
@@ -1,5 +1,6 @@
   <!-- $Id$ -->
 <xsl:template match="data">
+       <xsl:call-template name="jquery_phpgw_i18n"/>
        <xsl:choose>
                <xsl:when test="add">
                        <xsl:apply-templates select="add"/>

Modified: branches/Version-2_0-branch/property/templates/base/substitute.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/substitute.xsl  
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/templates/base/substitute.xsl  
2017-08-01 09:24:26 UTC (rev 16938)
@@ -10,6 +10,7 @@
 </xsl:template>
 
 <xsl:template match="table" xmlns:php="http://php.net/xsl";>
+       <xsl:call-template name="jquery_phpgw_i18n"/>
        <style type="text/css">
                #box { width: 200px; height: 5px; background: blue; }
                select { width: 200px; }

Modified: branches/Version-2_0-branch/property/templates/base/tenant_claim.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/tenant_claim.xsl        
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/templates/base/tenant_claim.xsl        
2017-08-01 09:24:26 UTC (rev 16938)
@@ -1,6 +1,7 @@
 
 <!-- $Id$ -->
 <xsl:template match="data">
+       <xsl:call-template name="jquery_phpgw_i18n"/>
        <xsl:choose>
                <xsl:when test="edit">
                        <xsl:apply-templates select="edit"/>

Modified: branches/Version-2_0-branch/property/templates/base/tts.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/tts.xsl 2017-08-01 
09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/templates/base/tts.xsl 2017-08-01 
09:24:26 UTC (rev 16938)
@@ -10,7 +10,6 @@
                        <xsl:apply-templates select="view"/>
                </xsl:when>
        </xsl:choose>
-       <xsl:call-template name="jquery_phpgw_i18n"/>
 </xsl:template>
 
 <!-- add -->
@@ -230,6 +229,7 @@
 
 <!-- view -->
 <xsl:template xmlns:php="http://php.net/xsl"; match="view">
+       <xsl:call-template name="jquery_phpgw_i18n"/>
        <style type="text/css">
                #floating-box {
                position: relative;

Modified: branches/Version-2_0-branch/property/templates/base/workorder.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/workorder.xsl   
2017-08-01 09:22:16 UTC (rev 16937)
+++ branches/Version-2_0-branch/property/templates/base/workorder.xsl   
2017-08-01 09:24:26 UTC (rev 16938)
@@ -1,6 +1,7 @@
 
 <!-- $Id$ -->
 <xsl:template match="data">
+       <xsl:call-template name="jquery_phpgw_i18n"/>
        <xsl:choose>
                <xsl:when test="edit">
                        <xsl:apply-templates select="edit"/>
@@ -12,7 +13,6 @@
                        <xsl:apply-templates select="view"/>
                </xsl:when>
        </xsl:choose>
-       <xsl:call-template name="jquery_phpgw_i18n"/>
 </xsl:template>
 
 <!-- New template-->




reply via email to

[Prev in Thread] Current Thread [Next in Thread]