fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [16889] Stable: Merge 16886:16888 from trunk


From: sigurdne
Subject: [Fmsystem-commits] [16889] Stable: Merge 16886:16888 from trunk
Date: Wed, 28 Jun 2017 09:59:00 -0400 (EDT)

Revision: 16889
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16889
Author:   sigurdne
Date:     2017-06-28 09:59:00 -0400 (Wed, 28 Jun 2017)
Log Message:
-----------
Stable: Merge 16886:16888 from trunk

Modified Paths:
--------------
    branches/Version-2_0-branch/eventplanner/inc/class.boevents.inc.php
    branches/Version-2_0-branch/eventplanner/inc/class.soevents.inc.php
    branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php
    branches/Version-2_0-branch/eventplanner/inc/model/class.events.inc.php
    branches/Version-2_0-branch/property/templates/base/admin_location.xsl

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

Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-06-28 13:57:36 UTC (rev 16888)
+++ branches/Version-2_0-branch 2017-06-28 13:59:00 UTC (rev 16889)

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
\ 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
\ No newline at end of property
Modified: branches/Version-2_0-branch/eventplanner/inc/class.boevents.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.boevents.inc.php 
2017-06-28 13:57:36 UTC (rev 16888)
+++ branches/Version-2_0-branch/eventplanner/inc/class.boevents.inc.php 
2017-06-28 13:59:00 UTC (rev 16889)
@@ -89,11 +89,13 @@
                        $dateformat = 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
                        foreach ($values['results'] as &$entry)
                        {
+                               $date_end =  
eventplanner_soevents::get_instance()->get_date_end($entry['id']);
+
                                $entry['status'] = 
$status_text[$entry['status']];
                                $entry['created'] = 
$GLOBALS['phpgw']->common->show_date($entry['created']);
                                $entry['modified'] = 
$GLOBALS['phpgw']->common->show_date($entry['modified']);
                                $entry['date_start'] = 
$GLOBALS['phpgw']->common->show_date($entry['date_start'], $dateformat);
-                               $entry['date_end'] = 
$GLOBALS['phpgw']->common->show_date($entry['date_end'], $dateformat);
+                               $entry['date_end'] = 
$GLOBALS['phpgw']->common->show_date($date_end, $dateformat);
                                $entry['case_officer_id'] = 
$entry['case_officer_id'] ? 
$GLOBALS['phpgw']->accounts->get($entry['case_officer_id'])->__toString() : '';
                        }
                        return $values;

Modified: branches/Version-2_0-branch/eventplanner/inc/class.soevents.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.soevents.inc.php 
2017-06-28 13:57:36 UTC (rev 16888)
+++ branches/Version-2_0-branch/eventplanner/inc/class.soevents.inc.php 
2017-06-28 13:59:00 UTC (rev 16889)
@@ -60,4 +60,12 @@
                {
                        //nothing;
                }
+
+               public function get_date_end( $application_id )
+               {
+                       $sql = "SELECT max(to_) as date_end FROM 
eventplanner_calendar WHERE application_id = " . (int) $application_id;
+                       $this->db->query($sql,__LINE__,__FILE__);
+                       $this->db->next_record();
+                       return $this->db->f('date_end');
+               }
        }
\ No newline at end of file

Modified: branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php 
2017-06-28 13:57:36 UTC (rev 16888)
+++ branches/Version-2_0-branch/eventplanner/inc/class.uievents.inc.php 
2017-06-28 13:59:00 UTC (rev 16889)
@@ -51,10 +51,6 @@
                        $this->bo = createObject('eventplanner.boevents');
                        $this->cats = & $this->bo->cats;
                        $this->fields = eventplanner_events::get_fields();
-                       unset($this->fields['modified']);
-                       unset($this->fields['created']);
-                       unset($this->fields['contact_email']);
-                       unset($this->fields['case_officer_name']);
                        $this->permissions = 
eventplanner_events::get_instance()->get_permission_array();
                        $this->currentapp = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        self::set_active_menu("{$this->currentapp}::events");

Modified: 
branches/Version-2_0-branch/eventplanner/inc/model/class.events.inc.php
===================================================================
--- branches/Version-2_0-branch/eventplanner/inc/model/class.events.inc.php     
2017-06-28 13:57:36 UTC (rev 16888)
+++ branches/Version-2_0-branch/eventplanner/inc/model/class.events.inc.php     
2017-06-28 13:59:00 UTC (rev 16889)
@@ -51,4 +51,65 @@
                {
                        return new eventplanner_events();
                }
+               public static function get_fields($debug = true)
+               {
+                       $currentapp = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
+
+                       $fields = array(
+                               'id' => array('action'=> PHPGW_ACL_READ,
+                                       'type' => 'int',
+                                       'label' => 'id',
+                                       'sortable'=> true,
+                                       'formatter' => 
'JqueryPortico.formatLink',
+                                       'public' => true,
+                                       ),
+                               'title' => array('action'=> PHPGW_ACL_READ | 
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
+                                       'type' => 'string',
+                                       'label' => 'title',
+                                       'sortable' => false,
+                                       'query' => true,
+                                       'public' => true,
+                                       ),
+                               'contact_email' => array(
+                                       'action'=> PHPGW_ACL_READ | 
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
+                                       'type' => 'string',
+                                       'required' => true,
+                                       'query' => true,
+                                       'sf_validator' => 
createObject('booking.sfValidatorEmail', array(), array('invalid' => '%field% 
is invalid')),
+                                       'label' => 'contact email',
+                                       'history' => true,
+                                       ),
+                               'vendor_name' => array('action'=>  
PHPGW_ACL_READ,
+                                       'type' => 'string',
+                                       'query' => true,
+                                       'label' => 'vendor',
+                                       'join' => array(
+                                               'table' => 
'eventplanner_vendor',
+                                               'fkey' => 'vendor_id',
+                                               'key' => 'id',
+                                               'column' => 'name'
+                                               )
+                                       ),
+                               'date_start' => array('action'=> PHPGW_ACL_READ 
| PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
+                                       'type' => 'date',
+                                       'label' => 'date start',
+                                       'sortable' => true,
+                                       'history' => true
+                                       ),
+                               'date_end' => array('action'=> PHPGW_ACL_READ | 
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
+                                       'type' => 'date',
+                                       'label' => 'date end',
+                                       'history' => true
+                                       ),
+                               'number_of_units' => array('action'=> 
PHPGW_ACL_READ | PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
+                                       'type' => 'int',
+                                       'label' => 'number of units',
+                                       'required' => true,
+                                       'history' => true
+                                       )
+                       );
+
+                       return $fields;
+               }
+
        }

Modified: branches/Version-2_0-branch/property/templates/base/admin_location.xsl
===================================================================
--- branches/Version-2_0-branch/property/templates/base/admin_location.xsl      
2017-06-28 13:57:36 UTC (rev 16888)
+++ branches/Version-2_0-branch/property/templates/base/admin_location.xsl      
2017-06-28 13:59:00 UTC (rev 16889)
@@ -1,84 +1,84 @@
 
 <!-- $Id$ -->
 <xsl:template name="app_data">
-               <xsl:choose>
-                       <xsl:when test="edit">
-                               <xsl:apply-templates select="edit"/>
-                       </xsl:when>
-                       <xsl:when test="list_attribute">
-                               <xsl:apply-templates select="list_attribute"/>
-                       </xsl:when>
-                       <xsl:when test="edit_attrib">
-                               <xsl:apply-templates select="edit_attrib"/>
-                       </xsl:when>
-                       <xsl:when test="edit_config">
-                               <xsl:apply-templates select="edit_config"/>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <xsl:apply-templates select="list"/>
-                       </xsl:otherwise>
-               </xsl:choose>
+       <xsl:choose>
+               <xsl:when test="edit">
+                       <xsl:apply-templates select="edit"/>
+               </xsl:when>
+               <xsl:when test="list_attribute">
+                       <xsl:apply-templates select="list_attribute"/>
+               </xsl:when>
+               <xsl:when test="edit_attrib">
+                       <xsl:apply-templates select="edit_attrib"/>
+               </xsl:when>
+               <xsl:when test="edit_config">
+                       <xsl:apply-templates select="edit_config"/>
+               </xsl:when>
+               <xsl:otherwise>
+                       <xsl:apply-templates select="list"/>
+               </xsl:otherwise>
+       </xsl:choose>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="list">
-               <xsl:apply-templates select="menu"/>
-               <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 align="right">
-                                       <xsl:call-template name="search_field"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td colspan="3" width="100%">
-                                       <xsl:call-template name="nextmatchs"/>
-                                       <!--<xsl:with-param 
name="nextmatchs_params"/>
+       <xsl:apply-templates select="menu"/>
+       <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 align="right">
+                               <xsl:call-template name="search_field"/>
+                       </td>
+               </tr>
+               <tr>
+                       <td colspan="3" width="100%">
+                               <xsl:call-template name="nextmatchs"/>
+                               <!--<xsl:with-param name="nextmatchs_params"/>
                                </xsl:call-template> -->
-                               </td>
-                       </tr>
-               </table>
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                       <xsl:apply-templates select="table_header"/>
-                       <xsl:apply-templates select="values"/>
-                       <xsl:apply-templates select="table_add"/>
-               </table>
+                       </td>
+               </tr>
+       </table>
+       <table width="100%" cellpadding="2" cellspacing="2" align="center">
+               <xsl:apply-templates select="table_header"/>
+               <xsl:apply-templates select="values"/>
+               <xsl:apply-templates select="table_add"/>
+       </table>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="table_header">
-               <xsl:variable name="sort_id">
-                       <xsl:value-of select="sort_id"/>
-               </xsl:variable>
-               <xsl:variable name="sort_name">
-                       <xsl:value-of select="sort_name"/>
-               </xsl:variable>
-               <tr class="th">
-                       <td class="th_text" width="10%" align="right">
+       <xsl:variable name="sort_id">
+               <xsl:value-of select="sort_id"/>
+       </xsl:variable>
+       <xsl:variable name="sort_name">
+               <xsl:value-of select="sort_name"/>
+       </xsl:variable>
+       <tr class="th">
+               <td class="th_text" width="10%" align="right">
                        <a href="{$sort_id}">
                                <xsl:value-of select="lang_id"/>
                        </a>
-                       </td>
-                       <td class="th_text" width="10%" align="center">
+               </td>
+               <td class="th_text" width="10%" align="center">
                        <a href="{$sort_name}">
                                <xsl:value-of select="lang_name"/>
                        </a>
-                       </td>
-                       <td class="th_text" width="20%" align="center">
-                               <xsl:value-of select="lang_descr"/>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_categories"/>
-                       </td>
+               </td>
+               <td class="th_text" width="20%" align="center">
+                       <xsl:value-of select="lang_descr"/>
+               </td>
                <td class="th_text" width="5%" align="center">
+                       <xsl:value-of select="lang_categories"/>
+               </td>
+               <td class="th_text" width="5%" align="center">
                        <xsl:value-of select="lang_attribute_group"/>
                </td>
                <td class="th_text" width="5%" align="center">
@@ -90,89 +90,89 @@
                <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">
-               <xsl:variable name="lang_attribute_standardtext">
-                       <xsl:value-of select="lang_delete_standardtext"/>
-               </xsl:variable>
-               <xsl:variable name="lang_edit_standardtext">
-                       <xsl:value-of select="lang_edit_standardtext"/>
-               </xsl:variable>
-               <xsl:variable name="lang_delete_standardtext">
-                       <xsl:value-of select="lang_delete_standardtext"/>
-               </xsl:variable>
-               <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>
-                       <td align="right">
-                               <xsl:value-of select="id"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="name"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="first"/>
-                       </td>
-                       <td align="center">
-                               <xsl:variable name="link_categories">
-                                       <xsl:value-of select="link_categories"/>
-                               </xsl:variable>
-                               <a href="{$link_categories}" 
onMouseover="window.status='{lang_category_text}';return true;" 
onMouseout="window.status='';return true;">
-                                       <xsl:value-of select="text_categories"/>
-                               </a>
-                       </td>
-                       <td align="center">
-                               <xsl:variable name="link_attribute_group">
-                                       <xsl:value-of 
select="link_attribute_group"/>
-                               </xsl:variable>
-                               <a href="{$link_attribute_group}" 
onMouseover="window.status='';return true;" onMouseout="window.status='';return 
true;">
-                                       <xsl:value-of 
select="text_attribute_group"/>
-                               </a>
-                       </td>
-                       <td align="center">
-                               <xsl:variable name="link_attribute">
-                                       <xsl:value-of select="link_attribute"/>
-                               </xsl:variable>
-                               <a href="{$link_attribute}" 
onMouseover="window.status='{$lang_attribute_standardtext}';return true;" 
onMouseout="window.status='';return true;">
-                                       <xsl:value-of select="text_attribute"/>
-                               </a>
-                       </td>
-                       <td align="center">
-                               <xsl:variable name="link_edit">
-                                       <xsl:value-of select="link_edit"/>
-                               </xsl:variable>
-                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_standardtext}';return true;" 
onMouseout="window.status='';return true;">
-                                       <xsl:value-of select="text_edit"/>
-                               </a>
-                       </td>
-                       <td align="center">
-                               <xsl:variable name="link_delete">
-                                       <xsl:value-of select="link_delete"/>
-                               </xsl:variable>
-                               <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_standardtext}';return true;" 
onMouseout="window.status='';return true;">
-                                       <xsl:value-of select="text_delete"/>
-                               </a>
-                       </td>
-               </tr>
+       <xsl:variable name="lang_attribute_standardtext">
+               <xsl:value-of select="lang_delete_standardtext"/>
+       </xsl:variable>
+       <xsl:variable name="lang_edit_standardtext">
+               <xsl:value-of select="lang_edit_standardtext"/>
+       </xsl:variable>
+       <xsl:variable name="lang_delete_standardtext">
+               <xsl:value-of select="lang_delete_standardtext"/>
+       </xsl:variable>
+       <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>
+               <td align="right">
+                       <xsl:value-of select="id"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="name"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="first"/>
+               </td>
+               <td align="center">
+                       <xsl:variable name="link_categories">
+                               <xsl:value-of select="link_categories"/>
+                       </xsl:variable>
+                       <a href="{$link_categories}" 
onMouseover="window.status='{lang_category_text}';return true;" 
onMouseout="window.status='';return true;">
+                               <xsl:value-of select="text_categories"/>
+                       </a>
+               </td>
+               <td align="center">
+                       <xsl:variable name="link_attribute_group">
+                               <xsl:value-of select="link_attribute_group"/>
+                       </xsl:variable>
+                       <a href="{$link_attribute_group}" 
onMouseover="window.status='';return true;" onMouseout="window.status='';return 
true;">
+                               <xsl:value-of select="text_attribute_group"/>
+                       </a>
+               </td>
+               <td align="center">
+                       <xsl:variable name="link_attribute">
+                               <xsl:value-of select="link_attribute"/>
+                       </xsl:variable>
+                       <a href="{$link_attribute}" 
onMouseover="window.status='{$lang_attribute_standardtext}';return true;" 
onMouseout="window.status='';return true;">
+                               <xsl:value-of select="text_attribute"/>
+                       </a>
+               </td>
+               <td align="center">
+                       <xsl:variable name="link_edit">
+                               <xsl:value-of select="link_edit"/>
+                       </xsl:variable>
+                       <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_standardtext}';return true;" 
onMouseout="window.status='';return true;">
+                               <xsl:value-of select="text_edit"/>
+                       </a>
+               </td>
+               <td align="center">
+                       <xsl:variable name="link_delete">
+                               <xsl:value-of select="link_delete"/>
+                       </xsl:variable>
+                       <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_standardtext}';return true;" 
onMouseout="window.status='';return true;">
+                               <xsl:value-of select="text_delete"/>
+                       </a>
+               </td>
+       </tr>
 </xsl:template>
 
 <!-- edit_config  -->
 <xsl:template match="edit_config">
-               <div align="left">
+       <div align="left">
                <xsl:variable name="form_action">
                        <xsl:value-of select="form_action"/>
                </xsl:variable>
@@ -188,103 +188,103 @@
                                                </tr>
                                        </xsl:when>
                                </xsl:choose>
-                                       <xsl:for-each select="location_list">
-                                               <tr>
-                                                       <td class="th_text" 
align="left">
-                                                               <xsl:value-of 
select="id"/>
-                                                               <xsl:text> 
</xsl:text>
-                                                               <xsl:value-of 
select="name"/>
-                                                       </td>
-                                                       <td align="left">
-                                                               <xsl:choose>
-                                                                       
<xsl:when test="selected='selected' or selected = 1">
-                                                                               
<input type="radio" name="values[{//column_name}]" value="{id}" 
checked="checked" onMouseout="window.status='';return true;">
-                                                                               
        <xsl:attribute name="title">
-                                                                               
                <xsl:value-of select="//lang_config_statustext"/>
-                                                                               
        </xsl:attribute>
-                                                                               
</input>
-                                                                       
</xsl:when>
-                                                                       
<xsl:otherwise>
-                                                                               
<input type="radio" name="values[{//column_name}]" value="{id}" 
onMouseout="window.status='';return true;">
-                                                                               
        <xsl:attribute name="title">
-                                                                               
                <xsl:value-of select="//lang_config_statustext"/>
-                                                                               
        </xsl:attribute>
-                                                                               
</input>
-                                                                       
</xsl:otherwise>
-                                                               </xsl:choose>
-                                                       </td>
-                                               </tr>
-                                       </xsl:for-each>
-                                       <tr height="50">
-                                               <td>
-                                                       <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_standardtext"/>
-                                                               </xsl:attribute>
-                                                       </input>
+                               <xsl:for-each select="location_list">
+                                       <tr>
+                                               <td class="th_text" 
align="left">
+                                                       <xsl:value-of 
select="id"/>
+                                                       <xsl:text> </xsl:text>
+                                                       <xsl:value-of 
select="name"/>
                                                </td>
+                                               <td align="left">
+                                                       <xsl:choose>
+                                                               <xsl:when 
test="selected='selected' or selected = 1">
+                                                                       <input 
type="radio" name="values[{//column_name}]" value="{id}" checked="checked" 
onMouseout="window.status='';return true;">
+                                                                               
<xsl:attribute name="title">
+                                                                               
        <xsl:value-of select="//lang_config_statustext"/>
+                                                                               
</xsl:attribute>
+                                                                       </input>
+                                                               </xsl:when>
+                                                               <xsl:otherwise>
+                                                                       <input 
type="radio" name="values[{//column_name}]" value="{id}" 
onMouseout="window.status='';return true;">
+                                                                               
<xsl:attribute name="title">
+                                                                               
        <xsl:value-of select="//lang_config_statustext"/>
+                                                                               
</xsl:attribute>
+                                                                       </input>
+                                                               </xsl:otherwise>
+                                                       </xsl:choose>
+                                               </td>
                                        </tr>
-                       </table>
-                               </form>
-               <table>
-                               <tr>
+                               </xsl:for-each>
+                               <tr height="50">
                                        <td>
-                                               <xsl:variable 
name="done_action">
-                                                       <xsl:value-of 
select="done_action"/>
+                                               <xsl:variable name="lang_save">
+                                                       <xsl:value-of 
select="lang_save"/>
                                                </xsl:variable>
-                                               <xsl:variable name="lang_done">
-                                                       <xsl:value-of 
select="lang_done"/>
-                                               </xsl:variable>
-                                               <form method="post" 
action="{$done_action}">
-                                                       <input type="submit" 
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_done_standardtext"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </form>
+                                               <input type="submit" 
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return 
true;">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_save_standardtext"/>
+                                                       </xsl:attribute>
+                                               </input>
                                        </td>
                                </tr>
                        </table>
-               </div>
+               </form>
+               <table>
+                       <tr>
+                               <td>
+                                       <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" 
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_done_standardtext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </form>
+                               </td>
+                       </tr>
+               </table>
+       </div>
 </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="add" 
value="{$lang_add}" onMouseout="window.status='';return true;">
-                                               <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="lang_add_standardtext"/>
-                                               </xsl:attribute>
-                                       </input>
-                               </form>
-                       </td>
-                       <td height="50">
-                               <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" name="add" 
value="{$lang_done}" onMouseout="window.status='';return true;">
-                                               <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="lang_add_standardtext"/>
-                                               </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="add" 
value="{$lang_add}" onMouseout="window.status='';return true;">
+                                       <xsl:attribute name="title">
+                                               <xsl:value-of 
select="lang_add_standardtext"/>
+                                       </xsl:attribute>
+                               </input>
+                       </form>
+               </td>
+               <td height="50">
+                       <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" name="add" 
value="{$lang_done}" onMouseout="window.status='';return true;">
+                                       <xsl:attribute name="title">
+                                               <xsl:value-of 
select="lang_add_standardtext"/>
+                                       </xsl:attribute>
+                               </input>
+                       </form>
+               </td>
+       </tr>
 </xsl:template>
 
 <!-- add / edit  -->
@@ -293,25 +293,25 @@
                self.name="first_Window";
                <xsl:value-of select="lookup_functions"/>
        </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>
-                               <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" 
name="form" action="{$form_action}">
                <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">
-                                    
+
                                        <div class="pure-control-group">
                                                <label>
                                                        <xsl:choose>
@@ -322,13 +322,13 @@
                                                                </xsl:otherwise>
                                                        </xsl:choose>
                                                </label>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="value_id != ''">
-                                                                       
<xsl:value-of select="value_id"/>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="value_id != ''">
+                                                               <xsl:value-of 
select="value_id"/>
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
                                        </div>
                                        <div class="pure-control-group">
                                                <label>
@@ -335,25 +335,25 @@
                                                        <xsl:value-of 
select="lang_name"/>
                                                </label>
                                                <input type="text" 
name="values[name]" data-validation="required" value="{value_name}" 
onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
-                                                                       
<xsl:value-of select="lang_name_standardtext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
-                                                               </xsl:attribute>
-                                                       </input>
+                                                       <xsl:attribute 
name="onMouseover">
+                                                               
<xsl:text>window.status='</xsl:text>
+                                                               <xsl:value-of 
select="lang_name_standardtext"/>
+                                                               <xsl:text>'; 
return true;</xsl:text>
+                                                       </xsl:attribute>
+                                               </input>
                                        </div>
                                        <div class="pure-control-group">
                                                <label>
                                                        <xsl:value-of 
select="lang_descr"/>
                                                </label>
-                                                       <textarea cols="60" 
rows="10" name="values[descr]" onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
-                                                                       
<xsl:value-of select="lang_descr_standardtext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
-                                                               </xsl:attribute>
-                                                               <xsl:value-of 
select="value_descr"/>
-                                                       </textarea>
+                                               <textarea cols="60" rows="10" 
name="values[descr]" onMouseout="window.status='';return true;">
+                                                       <xsl:attribute 
name="onMouseover">
+                                                               
<xsl:text>window.status='</xsl:text>
+                                                               <xsl:value-of 
select="lang_descr_standardtext"/>
+                                                               <xsl:text>'; 
return true;</xsl:text>
+                                                       </xsl:attribute>
+                                                       <xsl:value-of 
select="value_descr"/>
+                                               </textarea>
                                        </div>
                                        <xsl:choose>
                                                <xsl:when test="value_id != ''">
@@ -369,31 +369,31 @@
                                                                <label>
                                                                        
<xsl:value-of select="php:function('lang', 'list address')"/>
                                                                </label>
-                                                                       <input 
type="checkbox" name="values[list_address]" value="1">
-                                                                               
<xsl:attribute name="title">
-                                                                               
        <xsl:value-of select="php:function('lang', 'list address at this 
level')"/>
+                                                               <input 
type="checkbox" name="values[list_address]" value="1">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="php:function('lang', 'list address at this level')"/>
+                                                                       
</xsl:attribute>
+                                                                       <xsl:if 
test="value_list_address = '1'">
+                                                                               
<xsl:attribute name="checked">
+                                                                               
        <xsl:text>checked</xsl:text>
                                                                                
</xsl:attribute>
-                                                                               
<xsl:if test="value_list_address = '1'">
-                                                                               
        <xsl:attribute name="checked">
-                                                                               
                <xsl:text>checked</xsl:text>
-                                                                               
        </xsl:attribute>
-                                                                               
</xsl:if>
-                                                                       </input>
+                                                                       
</xsl:if>
+                                                               </input>
                                                        </div>
                                                        <div 
class="pure-control-group">
                                                                <label>
                                                                        
<xsl:value-of select="php:function('lang', 'list documents')"/>
                                                                </label>
-                                                                       <input 
type="checkbox" name="values[list_documents]" value="1">
-                                                                               
<xsl:attribute name="title">
-                                                                               
        <xsl:value-of select="php:function('lang', 'list documents at level')"/>
+                                                               <input 
type="checkbox" name="values[list_documents]" value="1">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="php:function('lang', 'list documents at level')"/>
+                                                                       
</xsl:attribute>
+                                                                       <xsl:if 
test="value_list_documents = '1'">
+                                                                               
<xsl:attribute name="checked">
+                                                                               
        <xsl:text>checked</xsl:text>
                                                                                
</xsl:attribute>
-                                                                               
<xsl:if test="value_list_documents = '1'">
-                                                                               
        <xsl:attribute name="checked">
-                                                                               
                <xsl:text>checked</xsl:text>
-                                                                               
        </xsl:attribute>
-                                                                               
</xsl:if>
-                                                                       </input>
+                                                                       
</xsl:if>
+                                                               </input>
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
@@ -414,177 +414,177 @@
                                </table>
                        </div>
                </div>
-                               </form>
+       </form>
        <table>
-                               <tr>
-                                       <td>
-                                               <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}">
+               <tr>
+                       <td>
+                               <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_standardtext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </form>
-                                       </td>
-                               </tr>
-                       </table>
+                                               <xsl:attribute 
name="onMouseover">
+                                                       
<xsl:text>window.status='</xsl:text>
+                                                       <xsl:value-of 
select="lang_done_standardtext"/>
+                                                       <xsl:text>'; return 
true;</xsl:text>
+                                               </xsl:attribute>
+                                       </input>
+                               </form>
+                       </td>
+               </tr>
+       </table>
 </xsl:template>
 
 <!-- New template-->
 <!-- list attribute -->
 <xsl:template match="list_attribute">
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                       <tr>
-                               <td align="left">
-                                       <xsl:value-of select="lang_type"/>
-                                       <xsl:text>: </xsl:text>
-                                       <xsl:value-of select="value_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_attrib"/>
-                       <xsl:apply-templates select="values_attrib"/>
-                       <xsl:apply-templates select="table_add"/>
-               </table>
-</xsl:template>
-
-<!-- New template-->
-<xsl:template match="table_header_attrib">
-               <xsl:variable name="sort_sorting">
-                       <xsl:value-of select="sort_sorting"/>
-               </xsl:variable>
-               <xsl:variable name="sort_id">
-                       <xsl:value-of select="sort_id"/>
-               </xsl:variable>
-               <xsl:variable name="sort_name">
-                       <xsl:value-of select="sort_name"/>
-               </xsl:variable>
-               <tr class="th">
-                       <td class="th_text" width="10%" align="left">
-                               <a href="{$sort_name}">
-                                       <xsl:value-of select="lang_name"/>
-                               </a>
+       <table width="100%" cellpadding="2" cellspacing="2" align="center">
+               <tr>
+                       <td align="left">
+                               <xsl:value-of select="lang_type"/>
+                               <xsl:text>: </xsl:text>
+                               <xsl:value-of select="value_type_name"/>
                        </td>
-                       <td class="th_text" width="10%" align="left">
-                               <xsl:value-of select="lang_descr"/>
+               </tr>
+               <tr>
+                       <td align="right">
+                               <xsl:call-template name="search_field"/>
                        </td>
-                       <td class="th_text" width="1%" align="center">
-                               <xsl:value-of select="lang_datatype"/>
+               </tr>
+               <tr>
+                       <td colspan="3" width="100%">
+                               <xsl:call-template name="nextmatchs"/>
                        </td>
-                       <td class="th_text" width="5%" align="center">
-                               <a href="{$sort_sorting}">
-                                       <xsl:value-of select="lang_sorting"/>
-                               </a>
-                       </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>
+       </table>
+       <table width="100%" cellpadding="2" cellspacing="2" align="center">
+               <xsl:apply-templates select="table_header_attrib"/>
+               <xsl:apply-templates select="values_attrib"/>
+               <xsl:apply-templates select="table_add"/>
+       </table>
 </xsl:template>
 
 <!-- New template-->
+<xsl:template match="table_header_attrib">
+       <xsl:variable name="sort_sorting">
+               <xsl:value-of select="sort_sorting"/>
+       </xsl:variable>
+       <xsl:variable name="sort_id">
+               <xsl:value-of select="sort_id"/>
+       </xsl:variable>
+       <xsl:variable name="sort_name">
+               <xsl:value-of select="sort_name"/>
+       </xsl:variable>
+       <tr class="th">
+               <td class="th_text" width="10%" align="left">
+                       <a href="{$sort_name}">
+                               <xsl:value-of select="lang_name"/>
+                       </a>
+               </td>
+               <td class="th_text" width="10%" align="left">
+                       <xsl:value-of select="lang_descr"/>
+               </td>
+               <td class="th_text" width="1%" align="center">
+                       <xsl:value-of select="lang_datatype"/>
+               </td>
+               <td class="th_text" width="5%" align="center">
+                       <a href="{$sort_sorting}">
+                               <xsl:value-of select="lang_sorting"/>
+                       </a>
+               </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>
+</xsl:template>
+
+<!-- New template-->
 <xsl:template match="values_attrib">
-               <xsl:variable name="lang_up_text">
-                       <xsl:value-of select="lang_up_text"/>
-               </xsl:variable>
-               <xsl:variable name="lang_down_text">
-                       <xsl:value-of select="lang_down_text"/>
-               </xsl:variable>
-               <xsl:variable name="lang_attribute_attribtext">
-                       <xsl:value-of select="lang_delete_attribtext"/>
-               </xsl:variable>
-               <xsl:variable name="lang_edit_attribtext">
-                       <xsl:value-of select="lang_edit_attribtext"/>
-               </xsl:variable>
-               <xsl:variable name="lang_delete_attribtext">
-                       <xsl:value-of select="lang_delete_attribtext"/>
-               </xsl:variable>
-               <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>
-                       <td align="left">
-                               <xsl:value-of select="column_name"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="input_text"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="datatype"/>
-                       </td>
-                       <td>
-                               <table align="left">
-                                       <tr>
-                                               <td>
-                                                       <xsl:value-of 
select="sorting"/>
-                                               </td>
-                                               <td align="left">
-                                                       <xsl:variable 
name="link_up">
-                                                               <xsl:value-of 
select="link_up"/>
-                                                       </xsl:variable>
-                                                       <a href="{$link_up}" 
onMouseover="window.status='{$lang_up_text}';return true;" 
onMouseout="window.status='';return true;">
-                                                               <xsl:value-of 
select="text_up"/>
-                                                       </a>
-                                                       <xsl:text> | </xsl:text>
-                                                       <xsl:variable 
name="link_down">
-                                                               <xsl:value-of 
select="link_down"/>
-                                                       </xsl:variable>
-                                                       <a href="{$link_down}" 
onMouseover="window.status='{$lang_down_text}';return true;" 
onMouseout="window.status='';return true;">
-                                                               <xsl:value-of 
select="text_down"/>
-                                                       </a>
-                                               </td>
-                                       </tr>
-                               </table>
-                       </td>
-                       <td align="center">
-                               <xsl:variable name="link_edit">
-                                       <xsl:value-of select="link_edit"/>
-                               </xsl:variable>
-                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_attribtext}';return true;" 
onMouseout="window.status='';return true;">
-                                       <xsl:value-of select="text_edit"/>
-                               </a>
-                       </td>
-                       <td align="center">
-                               <xsl:variable name="link_delete">
-                                       <xsl:value-of select="link_delete"/>
-                               </xsl:variable>
-                               <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_attribtext}';return true;" 
onMouseout="window.status='';return true;">
-                                       <xsl:value-of select="text_delete"/>
-                               </a>
-                       </td>
-               </tr>
+       <xsl:variable name="lang_up_text">
+               <xsl:value-of select="lang_up_text"/>
+       </xsl:variable>
+       <xsl:variable name="lang_down_text">
+               <xsl:value-of select="lang_down_text"/>
+       </xsl:variable>
+       <xsl:variable name="lang_attribute_attribtext">
+               <xsl:value-of select="lang_delete_attribtext"/>
+       </xsl:variable>
+       <xsl:variable name="lang_edit_attribtext">
+               <xsl:value-of select="lang_edit_attribtext"/>
+       </xsl:variable>
+       <xsl:variable name="lang_delete_attribtext">
+               <xsl:value-of select="lang_delete_attribtext"/>
+       </xsl:variable>
+       <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>
+               <td align="left">
+                       <xsl:value-of select="column_name"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="input_text"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="datatype"/>
+               </td>
+               <td>
+                       <table align="left">
+                               <tr>
+                                       <td>
+                                               <xsl:value-of select="sorting"/>
+                                       </td>
+                                       <td align="left">
+                                               <xsl:variable name="link_up">
+                                                       <xsl:value-of 
select="link_up"/>
+                                               </xsl:variable>
+                                               <a href="{$link_up}" 
onMouseover="window.status='{$lang_up_text}';return true;" 
onMouseout="window.status='';return true;">
+                                                       <xsl:value-of 
select="text_up"/>
+                                               </a>
+                                               <xsl:text> | </xsl:text>
+                                               <xsl:variable name="link_down">
+                                                       <xsl:value-of 
select="link_down"/>
+                                               </xsl:variable>
+                                               <a href="{$link_down}" 
onMouseover="window.status='{$lang_down_text}';return true;" 
onMouseout="window.status='';return true;">
+                                                       <xsl:value-of 
select="text_down"/>
+                                               </a>
+                                       </td>
+                               </tr>
+                       </table>
+               </td>
+               <td align="center">
+                       <xsl:variable name="link_edit">
+                               <xsl:value-of select="link_edit"/>
+                       </xsl:variable>
+                       <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_attribtext}';return true;" 
onMouseout="window.status='';return true;">
+                               <xsl:value-of select="text_edit"/>
+                       </a>
+               </td>
+               <td align="center">
+                       <xsl:variable name="link_delete">
+                               <xsl:value-of select="link_delete"/>
+                       </xsl:variable>
+                       <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_attribtext}';return true;" 
onMouseout="window.status='';return true;">
+                               <xsl:value-of select="text_delete"/>
+                       </a>
+               </td>
+       </tr>
 </xsl:template>
 
 <!-- add attribute / edit attribute -->
@@ -594,17 +594,17 @@
                <xsl:value-of select="lookup_functions"/>
        </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>
-                               <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" 
name="form" action="{$form_action}">
                <div id="tab-content">
                        <xsl:value-of disable-output-escaping="yes" 
select="tabs"/>
@@ -611,433 +611,433 @@
                        <div id="general">
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="value_id != ''">
-                                                                       
<xsl:value-of select="lang_id"/>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="value_id != ''">
+                                                               <xsl:value-of 
select="lang_id"/>
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
                                        </label>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="value_id != ''">
-                                                                       
<xsl:value-of select="value_id"/>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
+                                       <xsl:choose>
+                                               <xsl:when test="value_id != ''">
+                                                       <xsl:value-of 
select="value_id"/>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                               </xsl:otherwise>
+                                       </xsl:choose>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="lang_column_name"/>
+                                               <xsl:value-of 
select="lang_column_name"/>
                                        </label>
                                        <input type="text" 
data-validation="required" name="values[column_name]" 
value="{value_column_name}" maxlength="20">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_column_name_statustext"/>
-                                                               </xsl:attribute>
-                                                       </input>
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="lang_column_name_statustext"/>
+                                               </xsl:attribute>
+                                       </input>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="lang_input_text"/>
+                                               <xsl:value-of 
select="lang_input_text"/>
                                        </label>
                                        <input type="text" 
data-validation="required" name="values[input_text]" value="{value_input_text}" 
size="60" maxlength="50">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_input_text_statustext"/>
-                                                               </xsl:attribute>
-                                                       </input>
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="lang_input_text_statustext"/>
+                                               </xsl:attribute>
+                                       </input>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="lang_statustext"/>
+                                               <xsl:value-of 
select="lang_statustext"/>
                                        </label>
                                        <textarea cols="60" rows="10" 
data-validation="required" name="values[statustext]">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_statustext_attribtext"/>
-                                                               </xsl:attribute>
-                                                               <xsl:value-of 
select="value_statustext"/>
-                                                       </textarea>
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="lang_statustext_attribtext"/>
+                                               </xsl:attribute>
+                                               <xsl:value-of 
select="value_statustext"/>
+                                       </textarea>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="lang_location_type"/>
+                                               <xsl:value-of 
select="lang_location_type"/>
                                        </label>
-                                                       <xsl:variable 
name="lang_entity_statustext">
-                                                               <xsl:value-of 
select="lang_entity_statustext"/>
-                                                       </xsl:variable>
-                                                       <xsl:variable 
name="select_location_type">
-                                                               <xsl:value-of 
select="select_location_type"/>
-                                                       </xsl:variable>
+                                       <xsl:variable 
name="lang_entity_statustext">
+                                               <xsl:value-of 
select="lang_entity_statustext"/>
+                                       </xsl:variable>
+                                       <xsl:variable 
name="select_location_type">
+                                               <xsl:value-of 
select="select_location_type"/>
+                                       </xsl:variable>
                                        <select name="{$select_location_type}" 
class="forms" title="{$lang_entity_statustext}" data-validation="required">
-                                                               <option 
value="">
-                                                                       
<xsl:value-of select="lang_no_location_type"/>
-                                                               </option>
-                                                               
<xsl:apply-templates select="entity_list"/>
-                                                       </select>
+                                               <option value="">
+                                                       <xsl:value-of 
select="lang_no_location_type"/>
+                                               </option>
+                                               <xsl:apply-templates 
select="entity_list"/>
+                                       </select>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'group')"/>
+                                               <xsl:value-of 
select="php:function('lang', 'group')"/>
                                        </label>
-                                                       <select 
name="values[group_id]" class="forms">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="php:function('lang', 'select a group')"/>
-                                                               </xsl:attribute>
-                                                               <option 
value="">
-                                                                       
<xsl:value-of select="php:function('lang', 'no group')"/>
-                                                               </option>
-                                                               
<xsl:apply-templates select="attrib_group_list"/>
-                                                       </select>
+                                       <select name="values[group_id]" 
class="forms">
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="php:function('lang', 'select a group')"/>
+                                               </xsl:attribute>
+                                               <option value="">
+                                                       <xsl:value-of 
select="php:function('lang', 'no group')"/>
+                                               </option>
+                                               <xsl:apply-templates 
select="attrib_group_list"/>
+                                       </select>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'datatype')"/>
+                                               <xsl:value-of 
select="php:function('lang', 'datatype')"/>
                                        </label>
                                        <select 
name="values[column_info][type]" class="forms" data-validation="required">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="php:function('lang', 'select a datatype')"/>
-                                                               </xsl:attribute>
-                                                               <option 
value="">
-                                                                       
<xsl:value-of select="php:function('lang', 'no datatype')"/>
-                                                               </option>
-                                                               
<xsl:apply-templates select="datatype_list"/>
-                                                       </select>
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="php:function('lang', 'select a datatype')"/>
+                                               </xsl:attribute>
+                                               <option value="">
+                                                       <xsl:value-of 
select="php:function('lang', 'no datatype')"/>
+                                               </option>
+                                               <xsl:apply-templates 
select="datatype_list"/>
+                                       </select>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'precision')"/>
+                                               <xsl:value-of 
select="php:function('lang', 'precision')"/>
                                        </label>
-                                                       <input type="text" 
name="values[column_info][precision]" value="{value_precision}">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="php:function('lang', 'enter the record length')"/>
-                                                               </xsl:attribute>
-                                                       </input>
+                                       <input type="text" 
name="values[column_info][precision]" value="{value_precision}">
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="php:function('lang', 'enter the record length')"/>
+                                               </xsl:attribute>
+                                       </input>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'scale')"/>
+                                               <xsl:value-of 
select="php:function('lang', 'scale')"/>
                                        </label>
-                                                       <input type="text" 
name="values[column_info][scale]" value="{value_scale}">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="php:function('lang', 'enter the scale if type is 
decimal')"/>
-                                                               </xsl:attribute>
-                                                       </input>
+                                       <input type="text" 
name="values[column_info][scale]" value="{value_scale}">
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="php:function('lang', 'enter the scale if type is decimal')"/>
+                                               </xsl:attribute>
+                                       </input>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'default')"/>
+                                               <xsl:value-of 
select="php:function('lang', 'default')"/>
                                        </label>
-                                                       <input type="text" 
name="values[column_info][default]" value="{value_default}">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="php:function('lang', 'enter the default value')"/>
-                                                               </xsl:attribute>
-                                                       </input>
+                                       <input type="text" 
name="values[column_info][default]" value="{value_default}">
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="php:function('lang', 'enter the default value')"/>
+                                               </xsl:attribute>
+                                       </input>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'nullable')"/>
+                                               <xsl:value-of 
select="php:function('lang', 'nullable')"/>
                                        </label>
                                        <select 
name="values[column_info][nullable]" data-validation="required">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="php:function('lang', 'chose if this column is 
nullable')"/>
-                                                               </xsl:attribute>
-                                                               <option 
value="">
-                                                                       
<xsl:value-of select="php:function('lang', 'select nullable')"/>
-                                                               </option>
-                                                               
<xsl:apply-templates select="nullable_list"/>
-                                                       </select>
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="php:function('lang', 'chose if this column is nullable')"/>
+                                               </xsl:attribute>
+                                               <option value="">
+                                                       <xsl:value-of 
select="php:function('lang', 'select nullable')"/>
+                                               </option>
+                                               <xsl:apply-templates 
select="nullable_list"/>
+                                       </select>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'show in lookup forms')"/>
+                                               <xsl:value-of 
select="php:function('lang', 'show in lookup forms')"/>
                                        </label>
-                                                       <input type="checkbox" 
name="values[lookup_form]" value="1">
-                                                               <xsl:if 
test="value_lookup_form = 1">
-                                                                       
<xsl:attribute name="checked">
-                                                                               
<xsl:text>checked</xsl:text>
-                                                                       
</xsl:attribute>
-                                                               </xsl:if>
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="php:function('lang', 'check to show this attribue in 
lookup forms')"/>
-                                                               </xsl:attribute>
-                                                       </input>
+                                       <input type="checkbox" 
name="values[lookup_form]" value="1">
+                                               <xsl:if test="value_lookup_form 
= 1">
+                                                       <xsl:attribute 
name="checked">
+                                                               
<xsl:text>checked</xsl:text>
+                                                       </xsl:attribute>
+                                               </xsl:if>
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="php:function('lang', 'check to show this attribue in lookup forms')"/>
+                                               </xsl:attribute>
+                                       </input>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'show in list')"/>
+                                               <xsl:value-of 
select="php:function('lang', 'show in list')"/>
                                        </label>
-                                                       <input type="checkbox" 
name="values[list]" value="1">
-                                                               <xsl:if 
test="value_list = 1">
-                                                                       
<xsl:attribute name="checked">
-                                                                               
<xsl:text>checked</xsl:text>
-                                                                       
</xsl:attribute>
-                                                               </xsl:if>
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="php:function('lang', 'check to show this attribute in 
entity list')"/>
-                                                               </xsl:attribute>
-                                                       </input>
+                                       <input type="checkbox" 
name="values[list]" value="1">
+                                               <xsl:if test="value_list = 1">
+                                                       <xsl:attribute 
name="checked">
+                                                               
<xsl:text>checked</xsl:text>
+                                                       </xsl:attribute>
+                                               </xsl:if>
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="php:function('lang', 'check to show this attribute in entity list')"/>
+                                               </xsl:attribute>
+                                       </input>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'include in search')"/>
+                                               <xsl:value-of 
select="php:function('lang', 'include in search')"/>
                                        </label>
-                                                       <input type="checkbox" 
name="values[search]" value="1">
-                                                               <xsl:if 
test="value_search = 1">
-                                                                       
<xsl:attribute name="checked">
-                                                                               
<xsl:text>checked</xsl:text>
-                                                                       
</xsl:attribute>
-                                                               </xsl:if>
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="php:function('lang', 'check to show this attribute in 
location list')"/>
-                                                               </xsl:attribute>
-                                                       </input>
+                                       <input type="checkbox" 
name="values[search]" value="1">
+                                               <xsl:if test="value_search = 1">
+                                                       <xsl:attribute 
name="checked">
+                                                               
<xsl:text>checked</xsl:text>
+                                                       </xsl:attribute>
+                                               </xsl:if>
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="php:function('lang', 'check to show this attribute in location list')"/>
+                                               </xsl:attribute>
+                                       </input>
                                </div>
-                                       <xsl:choose>
-                                               <xsl:when test="multiple_choice 
!= ''">
+                               <xsl:choose>
+                                       <xsl:when test="multiple_choice != ''">
                                                <div class="pure-control-group">
                                                        <label>
-                                                                       
<xsl:value-of select="lang_choice"/>
+                                                               <xsl:value-of 
select="lang_choice"/>
                                                        </label>
-                                                                       
<xsl:call-template name="choice"/>
+                                                       <xsl:call-template 
name="choice"/>
                                                </div>
-                                               </xsl:when>
-                                       </xsl:choose>
+                                       </xsl:when>
+                               </xsl:choose>
                                <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="title">
-                                                                       
<xsl:value-of select="lang_save_attribtext"/>
-                                                               </xsl:attribute>
-                                                       </input>
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="lang_save_attribtext"/>
+                                               </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}">
-                       <input type="submit" class="pure-button 
pure-button-primary" name="done" value="{$lang_done}" 
onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_done_attribtext"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </form>
-               </div>
+               <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}">
+                               <xsl:attribute name="title">
+                                       <xsl:value-of 
select="lang_done_attribtext"/>
+                               </xsl:attribute>
+                       </input>
+               </form>
+       </div>
 </xsl:template>
 
 <!-- New template-->
 <!-- entity_list -->
 <xsl:template match="entity_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-->
 <!-- attrib_group_list -->
 <xsl:template match="attrib_group_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-->
 <!-- datatype_list -->
 <xsl:template match="datatype_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-->
 <!-- nullable_list -->
 <xsl:template match="nullable_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 xmlns:php="http://php.net/xsl"; name="choice">
-               <table cellpadding="2" cellspacing="2" width="80%" align="left">
-                       <xsl:choose>
-                               <xsl:when test="value_choice!=''">
-                                       <tr class="th">
-                                               <td class="th_text" width="5%" 
align="left">
-                                                       <xsl:value-of 
select="php:function('lang', 'id')"/>
+       <table class="pure-table pure-table-bordered pure-table-striped">
+               <xsl:choose>
+                       <xsl:when test="value_choice!=''">
+                               <tr class="th">
+                                       <td class="th_text" width="5%" 
align="left">
+                                               <xsl:value-of 
select="php:function('lang', 'id')"/>
+                                       </td>
+                                       <td class="th_text" width="85%" 
align="left">
+                                               <xsl:value-of 
select="php:function('lang', 'value')"/>
+                                       </td>
+                                       <td class="th_text" width="85%" 
align="left">
+                                               <xsl:value-of 
select="php:function('lang', 'order')"/>
+                                       </td>
+                                       <td class="th_text" width="15%" 
align="center">
+                                               <xsl:value-of 
select="lang_delete_value"/>
+                                       </td>
+                               </tr>
+                               <xsl:for-each select="value_choice">
+                                       <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>
+                                               <td align="left">
+                                                       <xsl:value-of 
select="id"/>
                                                </td>
-                                               <td class="th_text" width="85%" 
align="left">
-                                                       <xsl:value-of 
select="php:function('lang', 'value')"/>
+                                               <td align="left">
+                                                       <input type="textbox" 
name="values[edit_choice][{id}]" value="{value}" size="15">
+                                                               <xsl:attribute 
name="title">
+                                                                       
<xsl:value-of select="php:function('lang', 'value')"/>
+                                                               </xsl:attribute>
+                                                       </input>
                                                </td>
-                                               <td class="th_text" width="85%" 
align="left">
-                                                       <xsl:value-of 
select="php:function('lang', 'order')"/>
+                                               <td align="center">
+                                                       <input type="textbox" 
name="values[order_choice][{id}]" value="{order}" size="4">
+                                                               <xsl:attribute 
name="title">
+                                                                       
<xsl:value-of select="php:function('lang', 'order')"/>
+                                                               </xsl:attribute>
+                                                       </input>
                                                </td>
-                                               <td class="th_text" width="15%" 
align="center">
-                                                       <xsl:value-of 
select="lang_delete_value"/>
+                                               <td align="center">
+                                                       <input type="checkbox" 
name="values[delete_choice][]" value="{id}" onMouseout="window.status='';return 
true;">
+                                                               <xsl:attribute 
name="title">
+                                                                       
<xsl:value-of select="//lang_delete_choice_statustext"/>
+                                                               </xsl:attribute>
+                                                       </input>
                                                </td>
                                        </tr>
-                                       <xsl:for-each select="value_choice">
-                                               <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>
-                                                       <td align="left">
-                                                               <xsl:value-of 
select="id"/>
-                                                       </td>
-                                                       <td align="left">
-                                                               <input 
type="textbox" name="values[edit_choice][{id}]" value="{value}" size="15">
-                                                                       
<xsl:attribute name="title">
-                                                                               
<xsl:value-of select="php:function('lang', 'value')"/>
-                                                                       
</xsl:attribute>
-                                                               </input>
-                                                       </td>
-                                                       <td align="center">
-                                                               <input 
type="textbox" name="values[order_choice][{id}]" value="{order}" size="4">
-                                                                       
<xsl:attribute name="title">
-                                                                               
<xsl:value-of select="php:function('lang', 'order')"/>
-                                                                       
</xsl:attribute>
-                                                               </input>
-                                                       </td>
-                                                       <td align="center">
-                                                               <input 
type="checkbox" name="values[delete_choice][]" value="{id}" 
onMouseout="window.status='';return true;">
-                                                                       
<xsl:attribute name="title">
-                                                                               
<xsl:value-of select="//lang_delete_choice_statustext"/>
-                                                                       
</xsl:attribute>
-                                                               </input>
-                                                       </td>
-                                               </tr>
-                                       </xsl:for-each>
-                               </xsl:when>
-                       </xsl:choose>
-                       <tr>
-                               <td valign="top" colspan="2">
-                                       <xsl:value-of select="lang_new_value"/>
-                               </td>
-                               <td valign="top" colspan="2">
-                                       <input type="text" 
name="values[new_choice]" onMouseout="window.status='';return true;">
-                                               <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="lang_new_value_statustext"/>
-                                               </xsl:attribute>
-                                       </input>
-                               </td>
-                       </tr>
-               </table>
+                               </xsl:for-each>
+                       </xsl:when>
+               </xsl:choose>
+               <tr>
+                       <td valign="top" colspan="2">
+                               <xsl:value-of select="lang_new_value"/>
+                       </td>
+                       <td valign="top" colspan="2">
+                               <input type="text" name="values[new_choice]" 
onMouseout="window.status='';return true;">
+                                       <xsl:attribute name="title">
+                                               <xsl:value-of 
select="lang_new_value_statustext"/>
+                                       </xsl:attribute>
+                               </input>
+                       </td>
+               </tr>
+       </table>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template name="list_info">
-               <table cellpadding="2" cellspacing="2" width="80%" align="left">
-                       <tr class="th">
-                               <td class="th_text" width="85%" align="left">
-                                       <xsl:value-of select="lang_location"/>
+       <table cellpadding="2" cellspacing="2" width="80%" align="left">
+               <tr class="th">
+                       <td class="th_text" width="85%" align="left">
+                               <xsl:value-of select="lang_location"/>
+                       </td>
+                       <td class="th_text" width="15%" align="center">
+                               <xsl:value-of select="lang_select"/>
+                       </td>
+               </tr>
+               <xsl:for-each select="value_list_info">
+                       <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>
+                               <td align="left">
+                                       <xsl:value-of select="name"/>
+                                       <xsl:text> </xsl:text>
                                </td>
-                               <td class="th_text" width="15%" align="center">
-                                       <xsl:value-of select="lang_select"/>
+                               <td align="center">
+                                       <xsl:choose>
+                                               <xsl:when 
test="selected='selected' or selected = 1">
+                                                       <input type="checkbox" 
name="values[list_info][{id}]" value="{id}" checked="checked" 
onMouseout="window.status='';return true;">
+                                                               <xsl:attribute 
name="title">
+                                                                       
<xsl:value-of select="//lang_list_type_statustext"/>
+                                                               </xsl:attribute>
+                                                       </input>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <input type="checkbox" 
name="values[list_info][{id}]" value="{id}" onMouseout="window.status='';return 
true;">
+                                                               <xsl:attribute 
name="title">
+                                                                       
<xsl:value-of select="//lang_list_type_statustext"/>
+                                                               </xsl:attribute>
+                                                       </input>
+                                               </xsl:otherwise>
+                                       </xsl:choose>
                                </td>
                        </tr>
-                       <xsl:for-each select="value_list_info">
-                               <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>
-                                       <td align="left">
-                                               <xsl:value-of select="name"/>
-                                               <xsl:text> </xsl:text>
-                                       </td>
-                                       <td align="center">
-                                               <xsl:choose>
-                                                       <xsl:when 
test="selected='selected' or selected = 1">
-                                                               <input 
type="checkbox" name="values[list_info][{id}]" value="{id}" checked="checked" 
onMouseout="window.status='';return true;">
-                                                                       
<xsl:attribute name="title">
-                                                                               
<xsl:value-of select="//lang_list_type_statustext"/>
-                                                                       
</xsl:attribute>
-                                                               </input>
-                                                       </xsl:when>
-                                                       <xsl:otherwise>
-                                                               <input 
type="checkbox" name="values[list_info][{id}]" value="{id}" 
onMouseout="window.status='';return true;">
-                                                                       
<xsl:attribute name="title">
-                                                                               
<xsl:value-of select="//lang_list_type_statustext"/>
-                                                                       
</xsl:attribute>
-                                                               </input>
-                                                       </xsl:otherwise>
-                                               </xsl:choose>
-                                       </td>
-                               </tr>
-                       </xsl:for-each>
-               </table>
+               </xsl:for-each>
+       </table>
 </xsl:template>




reply via email to

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