fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [15409] custom fields


From: sigurdne
Subject: [Fmsystem-commits] [15409] custom fields
Date: Wed, 3 Aug 2016 11:52:24 +0000 (UTC)

Revision: 15409
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15409
Author:   sigurdne
Date:     2016-08-03 11:52:23 +0000 (Wed, 03 Aug 2016)
Log Message:
-----------
custom fields

Modified Paths:
--------------
    trunk/admin/inc/class.ui_custom.inc.php
    trunk/admin/templates/base/custom.xsl
    trunk/phpgwapi/inc/class.custom_fields.inc.php
    trunk/phpgwapi/inc/class.phpgw.inc.php
    trunk/property/inc/class.bogeneric.inc.php
    trunk/property/inc/class.custom_fields.inc.php
    trunk/property/templates/base/admin_entity.xsl

Modified: trunk/admin/inc/class.ui_custom.inc.php
===================================================================
--- trunk/admin/inc/class.ui_custom.inc.php     2016-08-03 11:51:59 UTC (rev 
15408)
+++ trunk/admin/inc/class.ui_custom.inc.php     2016-08-03 11:52:23 UTC (rev 
15409)
@@ -368,10 +368,25 @@
                                'menu_selection' => 
$GLOBALS['phpgw_info']['flags']['menu_selection']
                        );
 
-                       $multiple_choice = '';
-                       if(isset($values['column_info']['type']) && 
($values['column_info']['type'] == 'R' || $values['column_info']['type'] == 
'CH' || $values['column_info']['type'] == 'LB'))
+                       $multiple_choice = false;
+                       $custom_get_list = false;
+                       $custom_get_single = false;
+                       switch ($values['column_info']['type'])
                        {
-                               $multiple_choice = True;
+                               case 'R':
+                               case 'CH':
+                               case 'LB':
+                                       $multiple_choice = true;
+                                       break;
+                               case 'custom1':
+                                       $custom_get_list = true;
+                                       break;
+                               case 'custom2':
+                               case 'custom3':
+                                       $custom_get_list = true;
+                                       $custom_get_single = true;
+                                       break;
+                               default:
                        }
 
 //_debug_array($values);
@@ -386,6 +401,8 @@
                                'lang_new_value_statustext'                     
=> lang('New value for multiple choice'),
                                'multiple_choice'                               
        => $multiple_choice,
                                'value_choice'                                  
 => (isset($values['choice']) ? $values['choice'] : ''),
+                               'custom_get_list' => $custom_get_list,
+                               'custom_get_single' => $custom_get_single,
                                'lang_delete_value'                             
        => lang('Delete value'),
                                'lang_value'                                    
        => lang('value'),
                                'lang_delete_choice_statustext'         => 
lang('Delete this value from the list of multiple choice'),
@@ -444,7 +461,11 @@
                                'value_helpmsg'                                 
        => isset($values['helpmsg']) ? $values['helpmsg'] : '',
                                'lang_helpmsg'                                  
        => lang('help message'),
                                'lang_helpmsg_statustext'                       
=> lang('Enables help message for this attribute'),
-                               'value_location'                                
        => $location
+                               'value_location'                                
        => $location,
+                               'value_get_list_function' => 
$values['get_list_function'],
+                               'value_get_list_function_input' => 
print_r($values['get_list_function_input'], true),
+                               'value_get_single_function' => 
$values['get_single_function'],
+                               'value_get_single_function_input' => 
print_r($values['get_single_function_input'], true),
                        );
 //_debug_array($values);
 

Modified: trunk/admin/templates/base/custom.xsl
===================================================================
--- trunk/admin/templates/base/custom.xsl       2016-08-03 11:51:59 UTC (rev 
15408)
+++ trunk/admin/templates/base/custom.xsl       2016-08-03 11:52:23 UTC (rev 
15409)
@@ -1,59 +1,59 @@
 <!-- $Id$ -->
 
 <xsl:template name="custom">
-               <xsl:choose>
-                       <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="list_custom_function">
-                               <xsl:apply-templates 
select="list_custom_function"/>
-                       </xsl:when>
-                       <xsl:when test="edit_custom_function">
-                               <xsl:apply-templates 
select="edit_custom_function"/>
-                       </xsl:when>
-               </xsl:choose>
+       <xsl:choose>
+               <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="list_custom_function">
+                       <xsl:apply-templates select="list_custom_function"/>
+               </xsl:when>
+               <xsl:when test="edit_custom_function">
+                       <xsl:apply-templates select="edit_custom_function"/>
+               </xsl:when>
+       </xsl:choose>
 </xsl:template>
        
 <xsl:template match="table_add">
-                       <tr>
-                               <td height="50">
+       <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="onMouseover">
-                                                               
<xsl:text>window.status='</xsl:text>
-                                                                       
<xsl:value-of select="lang_add_standardtext"/>
-                                                               <xsl:text>'; 
return true;</xsl:text>
-                                                       </xsl:attribute>
-                                               </input>
-                                       </form>
-                               </td>
-                               <td height="50">
+                       <form method="post" action="{$add_action}">
+                               <input type="submit" name="add" 
value="{$lang_add}" onMouseout="window.status='';return true;">
+                                       <xsl:attribute name="onMouseover">
+                                               
<xsl:text>window.status='</xsl:text>
+                                               <xsl:value-of 
select="lang_add_standardtext"/>
+                                               <xsl:text>'; return 
true;</xsl:text>
+                                       </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="onMouseover">
-                                                               
<xsl:text>window.status='</xsl:text>
-                                                                       
<xsl:value-of select="lang_add_standardtext"/>
-                                                               <xsl:text>'; 
return true;</xsl:text>
-                                                       </xsl:attribute>
-                                               </input>
-                                       </form>
-                               </td>
-                       </tr>
+                       <form method="post" action="{$done_action}">
+                               <input type="submit" name="add" 
value="{$lang_done}" onMouseout="window.status='';return true;">
+                                       <xsl:attribute name="onMouseover">
+                                               
<xsl:text>window.status='</xsl:text>
+                                               <xsl:value-of 
select="lang_add_standardtext"/>
+                                               <xsl:text>'; return 
true;</xsl:text>
+                                       </xsl:attribute>
+                               </input>
+                       </form>
+               </td>
+       </tr>
 </xsl:template>
 
 
@@ -61,38 +61,38 @@
 
 <xsl:template match="list_attribute">
                
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                       <tr>
-                               <td class="th_text" align="left">
-                                       <xsl:value-of select="lang_appname"/>
-                                       <xsl:text>: </xsl:text>
-                                       <xsl:value-of select="appname"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td align="left">
-                                       <xsl:call-template 
name="filter_location"/>
-                               </td>
+       <table width="100%" cellpadding="2" cellspacing="2" align="center">
+               <tr>
+                       <td class="th_text" align="left">
+                               <xsl:value-of select="lang_appname"/>
+                               <xsl:text>: </xsl:text>
+                               <xsl:value-of select="appname"/>
+                       </td>
+               </tr>
+               <tr>
+                       <td align="left">
+                               <xsl:call-template name="filter_location"/>
+                       </td>
 
-                               <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 class="pure-table pure-table-bordered">
-                               <xsl:apply-templates 
select="table_header_attrib"/>
-                               <xsl:choose>
-                                       <xsl:when test="values_attrib != ''">
-                                       <xsl:apply-templates 
select="values_attrib"/>
-                                       </xsl:when>
-                               </xsl:choose>
-                               <xsl:apply-templates select="table_add"/>
-               </table>
+                       <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 class="pure-table pure-table-bordered">
+               <xsl:apply-templates select="table_header_attrib"/>
+               <xsl:choose>
+                       <xsl:when test="values_attrib != ''">
+                               <xsl:apply-templates select="values_attrib"/>
+                       </xsl:when>
+               </xsl:choose>
+               <xsl:apply-templates select="table_add"/>
+       </table>
 </xsl:template>
 
 <xsl:template match="table_header_attrib">
@@ -102,36 +102,36 @@
        <xsl:variable name="sort_name">
                <xsl:value-of select="sort_name"/>
        </xsl:variable>
-               <tr class="th">
-                       <th class="th_text" width="10%" align="left">
+       <tr class="th">
+               <th class="th_text" width="10%" align="left">
                        <a href="{$sort_name}">
                                <xsl:value-of select="lang_name"/>
                        </a>
-                       </th>
-                       <th class="th_text" width="20%" align="left">
-                               <xsl:value-of select="lang_descr"/>
-                       </th>
-                       <th class="th_text" width="1%" align="left">
-                               <xsl:value-of select="lang_datatype"/>
-                       </th>
+               </th>
+               <th class="th_text" width="20%" align="left">
+                       <xsl:value-of select="lang_descr"/>
+               </th>
+               <th class="th_text" width="1%" align="left">
+                       <xsl:value-of select="lang_datatype"/>
+               </th>
                <th class="th_text" width="1%" align="center">
                        <xsl:value-of select="lang_group"/>
                </th>
-                       <th class="th_text" width="5%" align="center">
+               <th class="th_text" width="5%" align="center">
                        <a href="{$sort_sorting}">
                                <xsl:value-of select="lang_sorting"/>
                        </a>
-                       </th>
-                       <th class="th_text" width="1%" align="center">
-                               <xsl:value-of select="lang_search"/>
-                       </th>
-                       <th class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_edit"/>
-                       </th>
-                       <th class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_delete"/>
-                       </th>
-               </tr>
+               </th>
+               <th class="th_text" width="1%" align="center">
+                       <xsl:value-of select="lang_search"/>
+               </th>
+               <th class="th_text" width="5%" align="center">
+                       <xsl:value-of select="lang_edit"/>
+               </th>
+               <th class="th_text" width="5%" align="center">
+                       <xsl:value-of select="lang_delete"/>
+               </th>
+       </tr>
 </xsl:template>
 
 <xsl:template match="values_attrib"> 
@@ -147,268 +147,268 @@
        <xsl:variable name="lang_delete_text">
                <xsl:value-of select="lang_delete_text"/>
        </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>
-                                       <xsl:value-of select="input_text"/>
-                               </td>
-                               <td>
-                                       <xsl:value-of select="datatype"/>
-                               </td>
+       <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>
+                       <xsl:value-of select="input_text"/>
+               </td>
+               <td>
+                       <xsl:value-of select="datatype"/>
+               </td>
                <td align="right">
                        <xsl:value-of select="group_id"/>
                </td>
-                               <td>
-                                       <table align="left">
-                                               <tr>
-                                                       <td>
-                                                               <xsl:value-of 
select="sorting"/>
-                                                       </td>
+               <td>
+                       <table align="left">
+                               <tr>
+                                       <td>
+                                               <xsl:value-of select="sorting"/>
+                                       </td>
 
-                                                       <td align="left">
+                                       <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: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>
+                                       </td>
 
-                                               </tr>
-                                       </table>
-                               </td>
-                               <td align="center">
-                                       <xsl:value-of select="search"/>
-                               </td>
-                               <td align="center">
+                               </tr>
+                       </table>
+               </td>
+               <td align="center">
+                       <xsl:value-of select="search"/>
+               </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_text}';return true;" 
onMouseout="window.status='';return true;">
                                <xsl:value-of select="text_edit"/>
                        </a>
-                               </td>
-                               <td align="center">
+               </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_text}';return true;" 
onMouseout="window.status='';return true;">
                                <xsl:value-of select="text_delete"/>
                        </a>
-                               </td>
-                       </tr>
+               </td>
+       </tr>
 </xsl:template>
 
 
 <!-- add attribute / edit attribute -->
 
 <xsl:template match="edit_attrib" xmlns:php="http://php.net/xsl";>
-               <div align="left">
+       <div align="left">
 
-                       <xsl:variable name="form_action">
-                               <xsl:value-of select="form_action"/>
-                       </xsl:variable>
-                       <form method="post" action="{$form_action}">
+               <xsl:variable name="form_action">
+                       <xsl:value-of select="form_action"/>
+               </xsl:variable>
+               <form method="post" action="{$form_action}">
                
-               <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
-                       <xsl:choose>
-                               <xsl:when test="msgbox_data != ''">
-                                       <tr>
-                                               <td align="left" colspan="3">
-                                                       <xsl:call-template 
name="msgbox"/>
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
+                       <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
+                               <xsl:choose>
+                                       <xsl:when test="msgbox_data != ''">
+                                               <tr>
+                                                       <td align="left" 
colspan="3">
+                                                               
<xsl:call-template name="msgbox"/>
+                                                       </td>
+                                               </tr>
+                                       </xsl:when>
+                               </xsl:choose>
                        
 
-                       <tr>
-                               <td class="th_text" align="left">
-                                       <xsl:value-of 
select="php:function('lang', 'appname')" />
-                               </td>
-                               <td class="th_text" align="left">
-                                       <xsl:value-of select="appname"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td class="th_text" align="left">
-                                       <xsl:value-of select="lang_location"/>
-                                       <xsl:value-of 
select="php:function('lang', 'location')" />
-                               </td>
-                               <td align="left">
-                                       <xsl:choose>
-                                               <xsl:when test="value_location 
!= ''">
-                                                       <xsl:value-of 
select="value_location"/>
-                                                       <input type="hidden" 
name="location" value="{value_location}" />
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:call-template 
name="select_location"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                       </tr>
-                       <xsl:choose>
-                               <xsl:when test="value_id != ''">
-                                       <tr>
-                                               <td valign="top">
-                                       <xsl:value-of 
select="php:function('lang', 'Attribute ID')" />
-                                               </td>
-                                               <td>
-                                                       <xsl:value-of 
select="value_id"/>
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
-                       <tr>
-                               <td valign="top">
-                                       <xsl:value-of 
select="php:function('lang', 'column name')" />
-                               </td>
-                               <td>
-                                       <input type="text" 
name="values[column_name]" value="{value_column_name}" maxlength="20">
-                                               <xsl:attribute name="title">
-                                                   <xsl:value-of 
select="php:function('lang', 'enter the name for the column')" />
-                                               </xsl:attribute>
-                                       </input>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td valign="top">
-                                       <xsl:value-of 
select="php:function('lang', 'input text')" />
-                               </td>
-                               <td>
-                                       <input type="text" 
name="values[input_text]" value="{value_input_text}" maxlength="20">
-                                               <xsl:attribute name="title">
-                                                   <xsl:value-of 
select="php:function('lang', 'enter the input text for records')" />
-                                               </xsl:attribute>
-                                       </input>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td valign="top">
-                                       <xsl:value-of 
select="php:function('lang', 'statustext')" />
-                               </td>
-                               <td>
-                                       <textarea cols="60" rows="10" 
name="values[statustext]" wrap="virtual">
-                                               <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="php:function('lang', 'Enter a statustext for the inputfield in forms')" 
/>
-                                               </xsl:attribute>
-                                               <xsl:value-of 
select="value_statustext"/>               
-                                       </textarea>
+                               <tr>
+                                       <td class="th_text" align="left">
+                                               <xsl:value-of 
select="php:function('lang', 'appname')" />
+                                       </td>
+                                       <td class="th_text" align="left">
+                                               <xsl:value-of select="appname"/>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td class="th_text" align="left">
+                                               <xsl:value-of 
select="lang_location"/>
+                                               <xsl:value-of 
select="php:function('lang', 'location')" />
+                                       </td>
+                                       <td align="left">
+                                               <xsl:choose>
+                                                       <xsl:when 
test="value_location != ''">
+                                                               <xsl:value-of 
select="value_location"/>
+                                                               <input 
type="hidden" name="location" value="{value_location}" />
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                               
<xsl:call-template name="select_location"/>
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                       </td>
+                               </tr>
+                               <xsl:choose>
+                                       <xsl:when test="value_id != ''">
+                                               <tr>
+                                                       <td valign="top">
+                                                               <xsl:value-of 
select="php:function('lang', 'Attribute ID')" />
+                                                       </td>
+                                                       <td>
+                                                               <xsl:value-of 
select="value_id"/>
+                                                       </td>
+                                               </tr>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="php:function('lang', 'column name')" />
+                                       </td>
+                                       <td>
+                                               <input type="text" 
name="values[column_name]" value="{value_column_name}" maxlength="20">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="php:function('lang', 'enter the name for the column')" />
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="php:function('lang', 'input text')" />
+                                       </td>
+                                       <td>
+                                               <input type="text" 
name="values[input_text]" value="{value_input_text}" maxlength="20">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="php:function('lang', 'enter the input text for records')" />
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="php:function('lang', 'statustext')" />
+                                       </td>
+                                       <td>
+                                               <textarea cols="60" rows="10" 
name="values[statustext]" wrap="virtual">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="php:function('lang', 'Enter a statustext for the inputfield in forms')" 
/>
+                                                       </xsl:attribute>
+                                                       <xsl:value-of 
select="value_statustext"/>
+                                               </textarea>
 
-                               </td>
-                       </tr>
-                       <tr>
-                               <td valign="top">
-                                       <xsl:value-of 
select="php:function('lang', 'group')" />
-                               </td>
-                               <td valign="top">
-                                       <select name="values[group_id]" 
class="forms">
-                                               <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="php:function('lang', 'select a group')" />
-                                               </xsl:attribute>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="php:function('lang', 'group')" />
+                                       </td>
+                                       <td valign="top">
+                                               <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/options"/>
-                                       </select>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td valign="top">
-                                       <xsl:value-of 
select="php:function('lang', 'datatype')" />
-                               </td>
-                               <td valign="top">
+                                                               <xsl:value-of 
select="php:function('lang', 'no group')" />
+                                                       </option>
+                                                       <xsl:apply-templates 
select="attrib_group_list/options"/>
+                                               </select>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="php:function('lang', 'datatype')" />
+                                       </td>
+                                       <td valign="top">
                                                <xsl:variable 
name="lang_datatype_statustext">
                                                        <xsl:value-of 
select="lang_datatype_statustext"/>
                                                </xsl:variable>
-                                       <select 
name="values[column_info][type]" class="forms">
+                                               <select 
name="values[column_info][type]" class="forms">
                                                        <option value="">
                                                                <xsl:value-of 
select="lang_no_datatype"/>
                                                        </option>
-                                               <xsl:apply-templates 
select="datatype_list"/>
-                                       </select>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td valign="top">
-                                       <xsl:value-of select="lang_precision"/>
-                               </td>
-                               <td>
-                                       <input type="text" 
name="values[column_info][precision]" value="{value_precision}">
-                                               <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="lang_precision_statustext"/>
-                                               </xsl:attribute>
-                                       </input>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td valign="top">
-                                       <xsl:value-of select="lang_scale"/>
-                               </td>
-                               <td>
-                                       <input type="text" 
name="values[column_info][scale]" value="{value_scale}">
-                                               <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="lang_scale_statustext"/>
-                                               </xsl:attribute>
-                                       </input>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td valign="top">
-                                       <xsl:value-of select="lang_default"/>
-                               </td>
-                               <td>
-                                       <input type="text" 
name="values[column_info][default]" value="{value_default}">
-                                               <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="lang_default_statustext"/>
-                                               </xsl:attribute>
-                                       </input>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td valign="top">
-                                       <xsl:value-of select="lang_nullable"/>
-                               </td>
-                               <td valign="top">
+                                                       <xsl:apply-templates 
select="datatype_list"/>
+                                               </select>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="lang_precision"/>
+                                       </td>
+                                       <td>
+                                               <input type="text" 
name="values[column_info][precision]" value="{value_precision}">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_precision_statustext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="lang_scale"/>
+                                       </td>
+                                       <td>
+                                               <input type="text" 
name="values[column_info][scale]" value="{value_scale}">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_scale_statustext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="lang_default"/>
+                                       </td>
+                                       <td>
+                                               <input type="text" 
name="values[column_info][default]" value="{value_default}">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_default_statustext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="lang_nullable"/>
+                                       </td>
+                                       <td valign="top">
                                                <xsl:variable 
name="lang_nullable_statustext">
                                                        <xsl:value-of 
select="lang_nullable_statustext"/>
                                                </xsl:variable>
-                                       <select 
name="values[column_info][nullable]" class="forms">
+                                               <select 
name="values[column_info][nullable]" class="forms">
                                                        <option value="">
                                                                <xsl:value-of 
select="lang_select_nullable"/>
                                                        </option>
-                                               <xsl:apply-templates 
select="nullable_list"/>
-                                       </select>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td>
-                                       <xsl:value-of select="lang_list"/>
-                               </td>
-                               <td>
-                                       <xsl:choose>
+                                                       <xsl:apply-templates 
select="nullable_list"/>
+                                               </select>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>
+                                               <xsl:value-of 
select="lang_list"/>
+                                       </td>
+                                       <td>
+                                               <xsl:choose>
                                                        <xsl:when 
test="value_list = 1">
                                                                <input 
type="checkbox" name="values[list]" value="1" checked="checked" 
onMouseout="window.status='';return true;">
                                                                        
<xsl:attribute name="title">
@@ -423,15 +423,15 @@
                                                                        
</xsl:attribute>
                                                                </input>
                                                        </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td>
-                                       <xsl:value-of 
select="lang_include_search"/>
-                               </td>
-                               <td>
-                                       <xsl:choose>
+                                               </xsl:choose>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>
+                                               <xsl:value-of 
select="lang_include_search"/>
+                                       </td>
+                                       <td>
+                                               <xsl:choose>
                                                        <xsl:when 
test="value_search = 1">
                                                                <input 
type="checkbox" name="values[search]" value="1" checked="checked">
                                                                        
<xsl:attribute name="title">
@@ -446,15 +446,15 @@
                                                                        
</xsl:attribute>
                                                                </input>
                                                        </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td>
-                                       <xsl:value-of select="lang_history"/>
-                               </td>
-                               <td>
-                                       <xsl:choose>
+                                               </xsl:choose>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>
+                                               <xsl:value-of 
select="lang_history"/>
+                                       </td>
+                                       <td>
+                                               <xsl:choose>
                                                        <xsl:when 
test="value_history = 1">
                                                                <input 
type="checkbox" name="values[history]" value="1" checked="checked">
                                                                        
<xsl:attribute name="title">
@@ -469,15 +469,15 @@
                                                                        
</xsl:attribute>
                                                                </input>
                                                        </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td>
-                                       <xsl:value-of select="lang_disabled"/>
-                               </td>
-                               <td>
-                                       <xsl:choose>
+                                               </xsl:choose>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>
+                                               <xsl:value-of 
select="lang_disabled"/>
+                                       </td>
+                                       <td>
+                                               <xsl:choose>
                                                        <xsl:when 
test="value_disabled = 1">
                                                                <input 
type="checkbox" name="values[disabled]" value="1" checked="checked">
                                                                        
<xsl:attribute name="title">
@@ -492,51 +492,109 @@
                                                                        
</xsl:attribute>
                                                                </input>
                                                        </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                       </tr>
+                                               </xsl:choose>
+                                       </td>
+                               </tr>
        
-                       <tr>
-                               <td valign="top">
-                                       <xsl:value-of select="lang_helpmsg"/>
-                               </td>
-                               <td>
-                                       <textarea cols="60" rows="10" 
name="values[helpmsg]" wrap="virtual">
-                                               <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="lang_helpmsg_statustext"/>
-                                               </xsl:attribute>
-                                               <xsl:value-of 
select="value_helpmsg"/>          
-                                       </textarea>
-                               </td>
-                       </tr>
+                               <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="lang_helpmsg"/>
+                                       </td>
+                                       <td>
+                                               <textarea cols="60" rows="10" 
name="values[helpmsg]" wrap="virtual">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_helpmsg_statustext"/>
+                                                       </xsl:attribute>
+                                                       <xsl:value-of 
select="value_helpmsg"/>
+                                               </textarea>
+                                       </td>
+                               </tr>
        
-                       <xsl:choose>
-                               <xsl:when test="multiple_choice != ''">
-                                       <tr>
-                                               <td valign="top">
-                                                       <xsl:value-of 
select="lang_choice"/>
-                                               </td>
-                                               <td align="right">
-                                                       <xsl:call-template 
name="choice"/>
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
-                       <tr height="50">
-                               <td>
+                               <xsl:choose>
+                                       <xsl:when test="multiple_choice = 1">
+                                               <tr>
+                                                       <td valign="top">
+                                                               <xsl:value-of 
select="lang_choice"/>
+                                                       </td>
+                                                       <td align="right">
+                                                               
<xsl:call-template name="choice"/>
+                                                       </td>
+                                               </tr>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <xsl:choose>
+                                       <xsl:when test="custom_get_list = 1">
+                                               <tr>
+                                                       <td>
+                                                               <xsl:value-of 
select="php:function('lang', 'custom get list function')"/>
+                                                       </td>
+                                                       <td>
+                                                               <input 
type="text" name="values[get_list_function]" value="{value_get_list_function}" 
size="60">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:text>&lt;app&gt;.&lt;class&gt;.&lt;function&gt;</xsl:text>
+                                                                       
</xsl:attribute>
+                                                               </input>
+                                                       </td>
+                                               </tr>
+                                               <tr>
+                                                       <td>
+                                                               <xsl:value-of 
select="php:function('lang', 'get list function input')"/>
+                                                       </td>
+                                                       <td>
+                                                               <textarea 
cols="60" rows="10" name="values[get_list_function_input]">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:text>parameter1 = value1, parameter2 = value2...</xsl:text>
+                                                                       
</xsl:attribute>
+                                                                       
<xsl:value-of select="value_get_list_function_input"/>
+                                                               </textarea>
+                                                       </td>
+                                               </tr>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <xsl:choose>
+                                       <xsl:when test="custom_get_single = 1">
+                                               <tr>
+                                                       <td>
+                                                               <xsl:value-of 
select="php:function('lang', 'custom get single function')"/>
+                                                       </td>
+                                                       <td>
+                                                               <input 
type="text" name="values[get_single_function]" 
value="{value_get_single_function}" size="60">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:text>&lt;app&gt;.&lt;class&gt;.&lt;function&gt;</xsl:text>
+                                                                       
</xsl:attribute>
+                                                               </input>
+                                                       </td>
+                                               </tr>
+                                               <tr>
+                                                       <td>
+                                                               <xsl:value-of 
select="php:function('lang', 'get single function input')"/>
+                                                       </td>
+                                                       <td>
+                                                       <textarea cols="60" 
rows="10" name="values[get_single_function_input]">
+                                                               <xsl:attribute 
name="title">
+                                                                       
<xsl:text>parameter1 = value1, parameter2 = value2...</xsl:text>
+                                                               </xsl:attribute>
+                                                               <xsl:value-of 
select="value_get_single_function_input"/>
+                                                       </textarea>
+                                                       </td>
+                                               </tr>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <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}">
-                                               <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="lang_save_attribtext"/>
-                                               </xsl:attribute>
-                                       </input>
-                               </td>
-                       </tr>
-               </table>
-                       </form>
-                       <table>
+                                               <input type="submit" 
name="values[save]" value="{$lang_save}">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_save_attribtext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+                       </table>
+               </form>
+               <table>
                        <tr>
                                <td>
                                        <xsl:variable name="done_action">
@@ -555,7 +613,7 @@
                                </td>
                        </tr>
                </table>
-               </div>
+       </div>
 </xsl:template>
 
 <!-- add attribute group / edit attribute group -->
@@ -705,38 +763,38 @@
 
 <xsl:template match="list_custom_function">
                
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                       <tr>
-                               <td class="th_text" align="left">
-                                       <xsl:value-of select="lang_appname"/>
-                                       <xsl:text>: </xsl:text>
-                                       <xsl:value-of select="appname"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td align="left">
-                                       <xsl:call-template 
name="filter_location"/>
-                               </td>
+       <table width="100%" cellpadding="2" cellspacing="2" align="center">
+               <tr>
+                       <td class="th_text" align="left">
+                               <xsl:value-of select="lang_appname"/>
+                               <xsl:text>: </xsl:text>
+                               <xsl:value-of select="appname"/>
+                       </td>
+               </tr>
+               <tr>
+                       <td align="left">
+                               <xsl:call-template name="filter_location"/>
+                       </td>
 
-                               <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"  class="pure-table pure-table-bordered">
-                       <xsl:apply-templates 
select="table_header_custom_function"/>
-                       <xsl:choose>
-                               <xsl:when test="values_custom_function != ''">
-                                       <xsl:apply-templates 
select="values_custom_function"/>
-                               </xsl:when>
-                       </xsl:choose>
-                       <xsl:apply-templates select="table_add"/>
-               </table>
+                       <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"  
class="pure-table pure-table-bordered">
+               <xsl:apply-templates select="table_header_custom_function"/>
+               <xsl:choose>
+                       <xsl:when test="values_custom_function != ''">
+                               <xsl:apply-templates 
select="values_custom_function"/>
+                       </xsl:when>
+               </xsl:choose>
+               <xsl:apply-templates select="table_add"/>
+       </table>
 </xsl:template>
 <xsl:template match="table_header_custom_function">
        <xsl:variable name="sort_sorting">
@@ -745,36 +803,36 @@
        <xsl:variable name="sort_name">
                <xsl:value-of select="sort_name"/>
        </xsl:variable>
-               <tr class="th">
-                       <td class="th_text" width="10%" align="left">
+       <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="20%" align="left">
-                               <xsl:value-of select="lang_descr"/>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_pre_commit"/>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_client_side"/>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_active"/>
-                       </td>
-                       <td class="th_text" width="10%" align="center">
+               </td>
+               <td class="th_text" width="20%" align="left">
+                       <xsl:value-of select="lang_descr"/>
+               </td>
+               <td class="th_text" width="5%" align="center">
+                       <xsl:value-of select="lang_pre_commit"/>
+               </td>
+               <td class="th_text" width="5%" align="center">
+                       <xsl:value-of select="lang_client_side"/>
+               </td>
+               <td class="th_text" width="5%" align="center">
+                       <xsl:value-of select="lang_active"/>
+               </td>
+               <td class="th_text" width="10%" 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>
+               </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>
 
 <xsl:template match="values_custom_function"> 
@@ -790,166 +848,166 @@
        <xsl:variable name="lang_delete_text">
                <xsl:value-of select="lang_delete_text"/>
        </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="file_name"/>
-                               </td>
-                               <td>
-                                       <xsl:value-of select="descr"/>
-                               </td>
-                               <td align = 'center'>
-                                       <xsl:value-of select="pre_commit"/>
-                               </td>
-                               <td align = 'center'>
-                                       <xsl:value-of select="client_side"/>
-                               </td>
-                               <td align = 'center'>
-                                       <xsl:value-of select="active"/>
-                               </td>
-                               <td>
-                                       <table align="left">
-                                               <tr>
-                                                       <td>
-                                                               <xsl:value-of 
select="sorting"/>
-                                                       </td>
+       <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="file_name"/>
+               </td>
+               <td>
+                       <xsl:value-of select="descr"/>
+               </td>
+               <td align = 'center'>
+                       <xsl:value-of select="pre_commit"/>
+               </td>
+               <td align = 'center'>
+                       <xsl:value-of select="client_side"/>
+               </td>
+               <td align = 'center'>
+                       <xsl:value-of select="active"/>
+               </td>
+               <td>
+                       <table align="left">
+                               <tr>
+                                       <td>
+                                               <xsl:value-of select="sorting"/>
+                                       </td>
 
-                                                       <td align="left">
+                                       <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: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>
+                                       </td>
 
-                                               </tr>
-                                       </table>
-                               </td>
-                               <td align="center">
+                               </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_text}';return true;" 
onMouseout="window.status='';return true;">
                                <xsl:value-of select="text_edit"/>
                        </a>
-                               </td>
-                               <td align="center">
+               </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_text}';return true;" 
onMouseout="window.status='';return true;">
                                <xsl:value-of select="text_delete"/>
                        </a>
-                               </td>
-                       </tr>
+               </td>
+       </tr>
 </xsl:template>
 
 
 <!-- add custom_function / edit custom_function -->
 
 <xsl:template match="edit_custom_function" xmlns:php="http://php.net/xsl";>
-               <div align="left">
+       <div align="left">
 
                <form method="post" action="{form_action}">
-               <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
-                       <xsl:choose>
-                               <xsl:when test="msgbox_data != ''">
-                                       <tr>
-                                               <td align="left" colspan="3">
-                                                       <xsl:call-template 
name="msgbox"/>
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
+                       <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
+                               <xsl:choose>
+                                       <xsl:when test="msgbox_data != ''">
+                                               <tr>
+                                                       <td align="left" 
colspan="3">
+                                                               
<xsl:call-template name="msgbox"/>
+                                                       </td>
+                                               </tr>
+                                       </xsl:when>
+                               </xsl:choose>
 
-                       <tr>
-                               <td class="th_text" align="left">
-                                       <xsl:value-of select="lang_appname"/>
-                               </td>
-                               <td class="th_text" align="left">
-                                       <xsl:value-of select="appname"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td class="th_text" align="left">
-                                       <xsl:value-of select="lang_location"/>
-                               </td>
-                               <td class="th_text" align="left">
-                                       <xsl:value-of select="location"/>
-                               </td>
-                       </tr>
-                       <xsl:choose>
-                               <xsl:when test="value_id != ''">
-                                       <tr>
-                                               <td valign="top">
-                                                       <xsl:value-of 
select="lang_id"/>
-                                               </td>
-                                               <td>
-                                                       <xsl:value-of 
select="value_id"/>
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
-                       <tr>
-                               <td valign="top">
-                                       <xsl:value-of select="lang_descr"/>
-                               </td>
-                               <td>
-                                       <textarea cols="60" rows="10" 
name="values[descr]" wrap="virtual" onMouseout="window.status='';return true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
+                               <tr>
+                                       <td class="th_text" align="left">
+                                               <xsl:value-of 
select="lang_appname"/>
+                                       </td>
+                                       <td class="th_text" align="left">
+                                               <xsl:value-of select="appname"/>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td class="th_text" align="left">
+                                               <xsl:value-of 
select="lang_location"/>
+                                       </td>
+                                       <td class="th_text" align="left">
+                                               <xsl:value-of 
select="location"/>
+                                       </td>
+                               </tr>
+                               <xsl:choose>
+                                       <xsl:when test="value_id != ''">
+                                               <tr>
+                                                       <td valign="top">
+                                                               <xsl:value-of 
select="lang_id"/>
+                                                       </td>
+                                                       <td>
+                                                               <xsl:value-of 
select="value_id"/>
+                                                       </td>
+                                               </tr>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="lang_descr"/>
+                                       </td>
+                                       <td>
+                                               <textarea cols="60" rows="10" 
name="values[descr]" wrap="virtual" onMouseout="window.status='';return true;">
+                                                       <xsl:attribute 
name="onMouseover">
+                                                               
<xsl:text>window.status='</xsl:text>
                                                                <xsl:value-of 
select="lang_descr_custom_functiontext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                               <xsl:value-of 
select="value_descr"/>            
-                                       </textarea>
+                                                               <xsl:text>'; 
return true;</xsl:text>
+                                                       </xsl:attribute>
+                                                       <xsl:value-of 
select="value_descr"/>
+                                               </textarea>
 
-                               </td>
-                       </tr>
-                       <tr>
-                               <td valign="top">
-                                       <xsl:value-of 
select="lang_custom_function"/>
-                               </td>
-                               <td valign="top">
-                                       <select 
name="values[custom_function_file]" class="forms">
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="lang_custom_function"/>
+                                       </td>
+                                       <td valign="top">
+                                               <select 
name="values[custom_function_file]" class="forms">
                                                        <option value="">
                                                                <xsl:value-of 
select="lang_no_custom_function"/>
                                                        </option>
-                                               <xsl:apply-templates 
select="custom_function_list"/>
-                                       </select>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td>
-                                       <xsl:value-of select="lang_active"/>
-                               </td>
-                               <td>
-                                       <xsl:choose>
+                                                       <xsl:apply-templates 
select="custom_function_list"/>
+                                               </select>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>
+                                               <xsl:value-of 
select="lang_active"/>
+                                       </td>
+                                       <td>
+                                               <xsl:choose>
                                                        <xsl:when 
test="value_active = 1">
                                                                <input 
type="checkbox" name="values[active]" value="1" checked="checked" 
onMouseout="window.status='';return true;">
                                                                        
<xsl:attribute name="onMouseover">
                                                                                
<xsl:text>window.status='</xsl:text>
-                                                                               
        <xsl:value-of select="lang_active_statustext"/>
+                                                                               
<xsl:value-of select="lang_active_statustext"/>
                                                                                
<xsl:text>'; return true;</xsl:text>
                                                                        
</xsl:attribute>
                                                                </input>
@@ -958,64 +1016,64 @@
                                                                <input 
type="checkbox" name="values[active]" value="1" 
onMouseout="window.status='';return true;">
                                                                        
<xsl:attribute name="onMouseover">
                                                                                
<xsl:text>window.status='</xsl:text>
-                                                                               
        <xsl:value-of select="lang_active_statustext"/>
+                                                                               
<xsl:value-of select="lang_active_statustext"/>
                                                                                
<xsl:text>'; return true;</xsl:text>
                                                                        
</xsl:attribute>
                                                                </input>
                                                        </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td>
-                                       <xsl:value-of 
select="php:function('lang', 'pre commit')"/>
-                               </td>
-                               <td>
-                                       <input type="checkbox" 
name="values[pre_commit]" value="1">
-                                               <xsl:attribute name="title">
-                                                       <xsl:text>otherwise: 
post commit</xsl:text>
-                                               </xsl:attribute>
-                                               <xsl:if test="value_pre_commit 
= '1'">
-                                                       <xsl:attribute 
name="checked">
-                                                               
<xsl:text>checked</xsl:text>
-                                               </xsl:attribute>
-                                               </xsl:if>
-                                       </input>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td>
-                                       <xsl:value-of 
select="php:function('lang', 'client-side')"/>
-                               </td>
-                               <td>
-                                       <input type="checkbox" 
name="values[client_side]" value="1">
-                                               <xsl:attribute name="title">
-                                                       <xsl:text>otherwise: 
server-side</xsl:text>
-                                               </xsl:attribute>
-                                               <xsl:if test="value_client_side 
= '1'">
-                                                       <xsl:attribute 
name="checked">
-                                                               
<xsl:text>checked</xsl:text>
-                                               </xsl:attribute>
-                                               </xsl:if>
-                                       </input>
-                               </td>
-                       </tr>
-                       <tr height="50">
-                               <td>
+                                               </xsl:choose>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>
+                                               <xsl:value-of 
select="php:function('lang', 'pre commit')"/>
+                                       </td>
+                                       <td>
+                                               <input type="checkbox" 
name="values[pre_commit]" value="1">
+                                                       <xsl:attribute 
name="title">
+                                                               
<xsl:text>otherwise: post commit</xsl:text>
+                                                       </xsl:attribute>
+                                                       <xsl:if 
test="value_pre_commit = '1'">
+                                                               <xsl:attribute 
name="checked">
+                                                                       
<xsl:text>checked</xsl:text>
+                                                               </xsl:attribute>
+                                                       </xsl:if>
+                                               </input>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>
+                                               <xsl:value-of 
select="php:function('lang', 'client-side')"/>
+                                       </td>
+                                       <td>
+                                               <input type="checkbox" 
name="values[client_side]" value="1">
+                                                       <xsl:attribute 
name="title">
+                                                               
<xsl:text>otherwise: server-side</xsl:text>
+                                                       </xsl:attribute>
+                                                       <xsl:if 
test="value_client_side = '1'">
+                                                               <xsl:attribute 
name="checked">
+                                                                       
<xsl:text>checked</xsl:text>
+                                                               </xsl:attribute>
+                                                       </xsl:if>
+                                               </input>
+                                       </td>
+                               </tr>
+                               <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="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
+                                               <input type="submit" 
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return 
true;">
+                                                       <xsl:attribute 
name="onMouseover">
+                                                               
<xsl:text>window.status='</xsl:text>
                                                                <xsl:value-of 
select="lang_save_custom_functiontext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                               </td>
-                       </tr>
-               </table>
-       </form>
+                                                               <xsl:text>'; 
return true;</xsl:text>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+                       </table>
+               </form>
                <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
                        <tr>
                                <td>
@@ -1029,7 +1087,7 @@
                                                <input type="submit" 
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_custom_functiontext"/>
+                                                               <xsl:value-of 
select="lang_done_custom_functiontext"/>
                                                                <xsl:text>'; 
return true;</xsl:text>
                                                        </xsl:attribute>
                                                </input>
@@ -1037,7 +1095,7 @@
                                </td>
                        </tr>
                </table>
-               </div>
+       </div>
 </xsl:template>
 
 
@@ -1048,18 +1106,18 @@
        <xsl:variable name="id">
                <xsl:value-of select="id"/>
        </xsl:variable>
-               <xsl:choose>
-                       <xsl:when test="selected">
+       <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>
+               </xsl:when>
+               <xsl:otherwise>
                        <option value="{$id}">
                                <xsl:value-of disable-output-escaping="yes" 
select="name"/>
                        </option>
-                       </xsl:otherwise>
-               </xsl:choose>
+               </xsl:otherwise>
+       </xsl:choose>
 </xsl:template>
 
 <!-- datatype_list --> 
@@ -1068,29 +1126,29 @@
        <xsl:variable name="id">
                <xsl:value-of select="id"/>
        </xsl:variable>
-               <xsl:choose>
-                       <xsl:when test="selected">
+       <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>
+               </xsl:when>
+               <xsl:otherwise>
                        <option value="{$id}">
                                <xsl:value-of disable-output-escaping="yes" 
select="name"/>
                        </option>
-                       </xsl:otherwise>
-               </xsl:choose>
+               </xsl:otherwise>
+       </xsl:choose>
 </xsl:template>
 
 <!-- custom_function_list -->  
 
 <xsl:template match="custom_function_list">
-               <option value="{id}">
-                       <xsl:if test="selected = 1">
-                               <xsl:attribute name="selected" value="selected" 
/>
-                       </xsl:if>
-                       <xsl:value-of disable-output-escaping="yes" 
select="name"/>
-               </option>
+       <option value="{id}">
+               <xsl:if test="selected = 1">
+                       <xsl:attribute name="selected" value="selected" />
+               </xsl:if>
+               <xsl:value-of disable-output-escaping="yes" select="name"/>
+       </option>
 </xsl:template>
 
 <!-- nullable_list --> 
@@ -1099,41 +1157,41 @@
        <xsl:variable name="id">
                <xsl:value-of select="id"/>
        </xsl:variable>
-               <xsl:choose>
-                       <xsl:when test="selected">
+       <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>
+               </xsl:when>
+               <xsl:otherwise>
                        <option value="{$id}">
                                <xsl:value-of disable-output-escaping="yes" 
select="name"/>
                        </option>
-                       </xsl:otherwise>
-               </xsl:choose>
+               </xsl:otherwise>
+       </xsl:choose>
 </xsl:template>
 
 <xsl:template name="choice" xmlns:php="http://php.net/xsl";>
-                       <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')" />
-                                               </td>
-                                               <td class="th_text" width="40%" 
align="left">
-                                                       <xsl:value-of 
select="php:function('lang', 'value')" />
-                                               </td>
-                                               <td class="th_text" width="40%" 
align="left">
-                                                       <xsl:value-of 
select="php:function('lang', 'title')" />
-                                               </td>
-                                               <td class="th_text" width="5%" 
align="left">
-                                                       <xsl:value-of 
select="php:function('lang', 'order')" />
-                                               </td>
-                                               <td class="th_text" width="10%" 
align="center">
-                                                       <xsl:value-of 
select="lang_delete_value"/>
-                                               </td>
-                                       </tr>
+       <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')" />
+                                       </td>
+                                       <td class="th_text" width="40%" 
align="left">
+                                               <xsl:value-of 
select="php:function('lang', 'value')" />
+                                       </td>
+                                       <td class="th_text" width="40%" 
align="left">
+                                               <xsl:value-of 
select="php:function('lang', 'title')" />
+                                       </td>
+                                       <td class="th_text" width="5%" 
align="left">
+                                               <xsl:value-of 
select="php:function('lang', 'order')" />
+                                       </td>
+                                       <td class="th_text" width="10%" 
align="center">
+                                               <xsl:value-of 
select="lang_delete_value"/>
+                                       </td>
+                               </tr>
                                <xsl:for-each select="value_choice" >
                                        <tr>
                                                <xsl:attribute name="class">
@@ -1149,71 +1207,71 @@
                                                                </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="left">
-                                               <input type="textbox" 
name="values[title_choice][{id}]" value="{title}" 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}">
-                                                       <xsl:attribute 
name="onMouseover">
-                                                               
<xsl:text>window.status='</xsl:text>
+                                               <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="left">
+                                                       <input type="textbox" 
name="values[title_choice][{id}]" value="{title}" 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}">
+                                                               <xsl:attribute 
name="onMouseover">
+                                                                       
<xsl:text>window.status='</xsl:text>
                                                                        
<xsl:value-of select="//lang_delete_choice_statustext"/>
-                                                               <xsl:text>'; 
return true;</xsl:text>
-                                                       </xsl:attribute>
-                                               </input>
-                                       </td>
+                                                                       
<xsl:text>'; return true;</xsl:text>
+                                                               </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">
-                                       <input type="text" 
name="values[new_choice_id]" size = '3'>
-                                               <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="php:function('lang', 'new id for multiple choice')"/>
-                                               </xsl:attribute>
-                                       </input>
-                               </td>
-                               <td valign="top">
-                                       <input type="text" 
name="values[new_choice]" onMouseout="window.status='';return true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_new_value_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                               </td>
-                       </tr>
-                       </table>
+                       </xsl:when>
+               </xsl:choose>
+               <tr>
+                       <td valign="top" colspan='2'>
+                               <xsl:value-of select="lang_new_value"/>
+                       </td>
+                       <td valign="top">
+                               <input type="text" name="values[new_choice_id]" 
size = '3'>
+                                       <xsl:attribute name="title">
+                                               <xsl:value-of 
select="php:function('lang', 'new id for multiple choice')"/>
+                                       </xsl:attribute>
+                               </input>
+                       </td>
+                       <td valign="top">
+                               <input type="text" name="values[new_choice]" 
onMouseout="window.status='';return true;">
+                                       <xsl:attribute name="onMouseover">
+                                               
<xsl:text>window.status='</xsl:text>
+                                               <xsl:value-of 
select="lang_new_value_statustext"/>
+                                               <xsl:text>'; return 
true;</xsl:text>
+                                       </xsl:attribute>
+                               </input>
+                       </td>
+               </tr>
+       </table>
 </xsl:template>
 <xsl:template match="options">
-               <option value="{id}">
-                       <xsl:if test="selected != 0">
-                               <xsl:attribute name="selected" value="selected" 
/>
-                       </xsl:if>
-                       <xsl:value-of disable-output-escaping="yes" 
select="name"/>
-               </option>
+       <option value="{id}">
+               <xsl:if test="selected != 0">
+                       <xsl:attribute name="selected" value="selected" />
+               </xsl:if>
+               <xsl:value-of disable-output-escaping="yes" select="name"/>
+       </option>
 </xsl:template>

Modified: trunk/phpgwapi/inc/class.custom_fields.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.custom_fields.inc.php      2016-08-03 11:51:59 UTC 
(rev 15408)
+++ trunk/phpgwapi/inc/class.custom_fields.inc.php      2016-08-03 11:52:23 UTC 
(rev 15409)
@@ -2121,7 +2121,7 @@
                        }
                        else
                        {
-                               $_test_input = 
str_replace(array("\n","\r","\t", 'Array', 'array', '[', ']', '(', ')', ' ', 
'&gt;'), array(',','','','','','','','','','',''), stripslashes($data));
+                               $_test_input = 
str_replace(array("&#61;","\n","\r","\t", 'Array', 'array', '[', ']', '(', ')', 
' ', '&gt','&#59;','&#40;', '&#41;'), 
array('=',',','','','','','','','','','','','','',''), 
stripslashes(htmlspecialchars_decode($data)));
                                $_test_input= explode(',', $_test_input);
                                if(is_array($_test_input))
                                {

Modified: trunk/phpgwapi/inc/class.phpgw.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.phpgw.inc.php      2016-08-03 11:51:59 UTC (rev 
15408)
+++ trunk/phpgwapi/inc/class.phpgw.inc.php      2016-08-03 11:52:23 UTC (rev 
15409)
@@ -462,7 +462,7 @@
                                        default:
                                                $value = filter_var($value, 
FILTER_SANITIZE_STRING, FILTER_FLAG_NO_ENCODE_QUOTES);
                                                $value = 
htmlspecialchars($value, ENT_QUOTES, 'UTF-8');
-                                               $value = str_replace(array('(', 
')', ';', '=', '--'),array('&#40;', '&#41;', '&#59;', 
'&#61;','&#8722;&#8722;'), $value); // prevent SQL-injection
+                                               $value = 
str_replace(array(';','(', ')', '=', '--'),array('&#59;','&#40;', '&#41;', 
'&#61;','&#8722;&#8722;'), $value); // prevent SQL-injection
                                                break;
 
                                        case 'boolean':

Modified: trunk/property/inc/class.bogeneric.inc.php
===================================================================
--- trunk/property/inc/class.bogeneric.inc.php  2016-08-03 11:51:59 UTC (rev 
15408)
+++ trunk/property/inc/class.bogeneric.inc.php  2016-08-03 11:52:23 UTC (rev 
15409)
@@ -45,7 +45,8 @@
                var $allrows;
                var $public_functions = array
                        (
-                       'get_autocomplete' => true
+                       'get_autocomplete'      => true,
+                       'get_single_name'       => true
                );
 
                function __construct( $session = false )
@@ -335,8 +336,16 @@
                function get_autocomplete()
                {
                        $this->get_location_info();
-                       $values = $this->read();
 
+                       $query = phpgw::get_var('query');
+
+                       $params = array(
+                               'results' => phpgw::get_var('length', 'int', 
'REQUEST', 10),
+                               'query' => $query,
+                       );
+
+                       $values = $this->read($params);
+
                        foreach ($values as &$entry)
                        {
                                if ($entry['parent_id'])
@@ -347,6 +356,23 @@
                        return array('ResultSet' => array('Result' => $values));
                }
 
+
+               public function get_single_name( $data = array() )
+               {
+                       $this->get_location_info($data['type']);
+                       $values = $this->so->read_single(array('id' => 
$data['id']));
+//                     $values['path'] = $values['name'];
+//                     if ($values['parent_id'])
+//                     {
+//                             $path = $this->so->get_path(array('type' => 
$data['type'], 'id' => $values['parent_id']));
+//                             if ($path)
+//                             {
+//                                     $values['path'] .= '::' . implode(' > 
', $path);
+//                             }
+//                     }
+                       return $values['name'];
+               }
+
                public function edit_field( $data = array() )
                {
                        return $this->so->edit_field($data);

Modified: trunk/property/inc/class.custom_fields.inc.php
===================================================================
--- trunk/property/inc/class.custom_fields.inc.php      2016-08-03 11:51:59 UTC 
(rev 15408)
+++ trunk/property/inc/class.custom_fields.inc.php      2016-08-03 11:52:23 UTC 
(rev 15409)
@@ -293,8 +293,12 @@
                                {
                                        if ($attributes['value'] && 
$attributes['get_single_function'])
                                        {
-                                               if 
(!$attributes['get_single_function_input'])
+                                               if 
($attributes['get_single_function_input'] && 
is_array($attributes['get_single_function_input']))
                                                {
+                                                       
$attributes['get_single_function_input'] = 
array_merge(array('id'=>$attributes['value']),$attributes['get_single_function_input']);
+                                               }
+                                               else
+                                               {
                                                        
$attributes['get_single_function_input'] = $attributes['value'];
                                                }
                                                $attributes['custom_name'] = 
execMethod($attributes['get_single_function'], 
$attributes['get_single_function_input']);

Modified: trunk/property/templates/base/admin_entity.xsl
===================================================================
--- trunk/property/templates/base/admin_entity.xsl      2016-08-03 11:51:59 UTC 
(rev 15408)
+++ trunk/property/templates/base/admin_entity.xsl      2016-08-03 11:52:23 UTC 
(rev 15409)
@@ -1,435 +1,435 @@
 
 <!-- $Id$ -->
 <xsl:template match="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="list_attribute_group">
-                               <xsl:apply-templates 
select="list_attribute_group"/>
-                       </xsl:when>
-                       <xsl:when test="edit_attrib_group">
-                               <xsl:apply-templates 
select="edit_attrib_group"/>
-                       </xsl:when>
-                       <xsl:when test="edit_attrib">
-                               <xsl:apply-templates select="edit_attrib"/>
-                       </xsl:when>
-                       <xsl:when test="list_config">
-                               <xsl:apply-templates select="list_config"/>
-                       </xsl:when>
-                       <xsl:when test="edit_config">
-                               <xsl:apply-templates select="edit_config"/>
-                       </xsl:when>
-                       <xsl:when test="list_category">
-                               <xsl:apply-templates select="list_category"/>
-                       </xsl:when>
-                       <xsl:when test="list_custom_function">
-                               <xsl:apply-templates 
select="list_custom_function"/>
-                       </xsl:when>
-                       <xsl:when test="edit_custom_function">
-                               <xsl:apply-templates 
select="edit_custom_function"/>
-                       </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="list_attribute_group">
+                       <xsl:apply-templates select="list_attribute_group"/>
+               </xsl:when>
+               <xsl:when test="edit_attrib_group">
+                       <xsl:apply-templates select="edit_attrib_group"/>
+               </xsl:when>
+               <xsl:when test="edit_attrib">
+                       <xsl:apply-templates select="edit_attrib"/>
+               </xsl:when>
+               <xsl:when test="list_config">
+                       <xsl:apply-templates select="list_config"/>
+               </xsl:when>
+               <xsl:when test="edit_config">
+                       <xsl:apply-templates select="edit_config"/>
+               </xsl:when>
+               <xsl:when test="list_category">
+                       <xsl:apply-templates select="list_category"/>
+               </xsl:when>
+               <xsl:when test="list_custom_function">
+                       <xsl:apply-templates select="list_custom_function"/>
+               </xsl:when>
+               <xsl:when test="edit_custom_function">
+                       <xsl:apply-templates select="edit_custom_function"/>
+               </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"/>
+       <xsl:apply-templates select="menu"/>
        <table class="pure-table pure-table-bordered">
-                       <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"/>
-                       <xsl:apply-templates select="values"/>
-                       <xsl:apply-templates select="table_add"/>
-               </table>
+               <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"/>
+               <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">
-                               <a href="{$sort_id}">
-                                       <xsl:value-of select="lang_id"/>
-                               </a>
-                       </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 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: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">
+                       <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 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">
-               <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>
+       <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="descr"/>
+               </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_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>
+
+<!-- New template-->
+<xsl:template match="list_category">
+       <xsl:apply-templates select="menu"/>
+       <table class="pure-table pure-table-bordered">
                <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"/>
+                               <xsl:call-template name="search_field"/>
                        </td>
-                       <td align="left">
-                               <xsl:value-of select="name"/>
+               </tr>
+               <tr>
+                       <td class="th_text" align="left">
+                               <xsl:value-of select="lang_entity"/>
+                               <xsl:text>: </xsl:text>
+                               <xsl:value-of select="entity_name"/>
                        </td>
-                       <td align="left">
-                               <xsl:value-of select="descr"/>
+               </tr>
+               <tr>
+                       <td colspan="3" width="100%">
+                               <xsl:call-template name="nextmatchs"/>
                        </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_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>
+       </table>
+       <table class="pure-table pure-table-bordered">
+               <xsl:apply-templates select="table_header_category"/>
+               <xsl:apply-templates select="values_category"/>
+               <xsl:apply-templates select="table_add"/>
+       </table>
 </xsl:template>
 
 <!-- New template-->
-<xsl:template match="list_category">
-               <xsl:apply-templates select="menu"/>
-       <table class="pure-table pure-table-bordered">
-                       <tr>
-                               <td align="right">
-                                       <xsl:call-template name="search_field"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td class="th_text" align="left">
-                                       <xsl:value-of select="lang_entity"/>
-                                       <xsl:text>: </xsl:text>
-                                       <xsl:value-of select="entity_name"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td colspan="3" width="100%">
-                                       <xsl:call-template name="nextmatchs"/>
-                               </td>
-                       </tr>
-               </table>
-       <table class="pure-table pure-table-bordered">
-                       <xsl:apply-templates select="table_header_category"/>
-                       <xsl:apply-templates select="values_category"/>
-                       <xsl:apply-templates select="table_add"/>
-               </table>
+<xsl:template match="table_header_category">
+       <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="5%" align="right">
+                       <a href="{$sort_id}">
+                               <xsl:value-of select="lang_id"/>
+                       </a>
+               </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_prefix"/>
+               </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">
+                       <xsl:value-of select="lang_attribute"/>
+               </td>
+               <td class="th_text" width="5%" align="center">
+                       <xsl:value-of select="lang_custom_function"/>
+               </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="table_header_category">
-               <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="5%" align="right">
-                               <a href="{$sort_id}">
-                                       <xsl:value-of select="lang_id"/>
-                               </a>
-                       </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_prefix"/>
-                       </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">
-                               <xsl:value-of select="lang_attribute"/>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_custom_function"/>
-                       </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 match="values_category">
+       <xsl:variable name="lang_attribute_standardtext">
+               <xsl:value-of select="lang_attribute_standardtext"/>
+       </xsl:variable>
+       <xsl:variable name="lang_custom_function_standardtext">
+               <xsl:value-of select="lang_custom_function_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="descr"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="prefix"/>
+               </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_custom_function">
+                               <xsl:value-of select="link_custom_function"/>
+                       </xsl:variable>
+                       <a href="{$link_custom_function}" 
onMouseover="window.status='{$lang_custom_function_standardtext}';return true;" 
onMouseout="window.status='';return true;">
+                               <xsl:value-of select="text_custom_function"/>
+                       </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>
 
 <!-- New template-->
-<xsl:template match="values_category">
-               <xsl:variable name="lang_attribute_standardtext">
-                       <xsl:value-of select="lang_attribute_standardtext"/>
-               </xsl:variable>
-               <xsl:variable name="lang_custom_function_standardtext">
-                       <xsl:value-of 
select="lang_custom_function_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>
+<xsl:template match="list_config">
+       <xsl:apply-templates select="menu"/>
+       <table class="pure-table pure-table-bordered">
                <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"/>
+                               <xsl:call-template name="search_field"/>
                        </td>
-                       <td align="left">
-                               <xsl:value-of select="name"/>
+               </tr>
+               <tr>
+                       <td colspan="3" width="100%">
+                               <xsl:call-template name="nextmatchs"/>
                        </td>
-                       <td align="left">
-                               <xsl:value-of select="descr"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="prefix"/>
-                       </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_custom_function">
-                                       <xsl:value-of 
select="link_custom_function"/>
-                               </xsl:variable>
-                               <a href="{$link_custom_function}" 
onMouseover="window.status='{$lang_custom_function_standardtext}';return true;" 
onMouseout="window.status='';return true;">
-                                       <xsl:value-of 
select="text_custom_function"/>
-                               </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>
-
-<!-- New template-->
-<xsl:template match="list_config">
-               <xsl:apply-templates select="menu"/>
+       </table>
        <table class="pure-table pure-table-bordered">
-                       <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 class="pure-table pure-table-bordered">
-                       <xsl:apply-templates select="table_header_list_config"/>
-                       <xsl:apply-templates select="values_list_config"/>
-               </table>
+               <xsl:apply-templates select="table_header_list_config"/>
+               <xsl:apply-templates select="values_list_config"/>
+       </table>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="table_header_list_config">
-               <xsl:variable name="sort_column_name">
-                       <xsl:value-of select="sort_column_name"/>
-               </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="center">
-                               <a href="{$sort_column_name}">
-                                       <xsl:value-of 
select="lang_column_name"/>
-                               </a>
-                       </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="5%" align="center">
-                               <xsl:value-of select="lang_edit"/>
-                       </td>
-               </tr>
+       <xsl:variable name="sort_column_name">
+               <xsl:value-of select="sort_column_name"/>
+       </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="center">
+                       <a href="{$sort_column_name}">
+                               <xsl:value-of select="lang_column_name"/>
+                       </a>
+               </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="5%" align="center">
+                       <xsl:value-of select="lang_edit"/>
+               </td>
+       </tr>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="values_list_config">
-               <xsl:variable name="lang_edit_standardtext">
-                       <xsl:value-of select="lang_edit_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="left">
-                               <xsl:value-of select="column_name"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="name"/>
-                       </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>
-               </tr>
+       <xsl:variable name="lang_edit_standardtext">
+               <xsl:value-of select="lang_edit_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="left">
+                       <xsl:value-of select="column_name"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="name"/>
+               </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>
+       </tr>
 </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="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                       <xsl:value-of 
select="lang_add_standardtext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </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="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                       <xsl:value-of 
select="lang_add_standardtext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                               </form>
-                       </td>
-               </tr>
+       <tr>
+               <td height="50">
+                       <xsl:variable name="add_action">
+                               <xsl:value-of select="add_action"/>
+                       </xsl:variable>
+                       <xsl:variable name="lang_add">
+                               <xsl:value-of select="lang_add"/>
+                       </xsl:variable>
+                       <form method="post" action="{$add_action}">
+                               <input type="submit" name="add" 
value="{$lang_add}" onMouseout="window.status='';return true;">
+                                       <xsl:attribute name="onMouseover">
+                                               
<xsl:text>window.status='</xsl:text>
+                                               <xsl:value-of 
select="lang_add_standardtext"/>
+                                               <xsl:text>'; return 
true;</xsl:text>
+                                       </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="onMouseover">
+                                               
<xsl:text>window.status='</xsl:text>
+                                               <xsl:value-of 
select="lang_add_standardtext"/>
+                                               <xsl:text>'; return 
true;</xsl:text>
+                                       </xsl:attribute>
+                               </input>
+                       </form>
+               </td>
+       </tr>
 </xsl:template>
 
 <!-- add / edit  -->
@@ -440,17 +440,17 @@
        </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 name="form" class="pure-form pure-form-aligned" method="post" 
id="form" action="{$form_action}">
                <div id="tab-content">
                        <xsl:value-of disable-output-escaping="yes" 
select="tabs"/>
@@ -488,7 +488,7 @@
                                                                <label>
                                                                        
<xsl:value-of select="php:function('lang', 'category')"/>
                                                                </label>
-                                                                       
<xsl:value-of select="value_id"/>
+                                                               <xsl:value-of 
select="value_id"/>
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
@@ -498,26 +498,26 @@
                                                </label>
                                                                
                                                <input type="text" 
data-validation="required" name="values[name]" 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="php:function('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="lang_location_form != ''">
@@ -525,26 +525,26 @@
                                                                <label>
                                                                        
<xsl:value-of select="lang_location_form"/>
                                                                </label>
-                                                                       
<xsl:choose>
-                                                                               
<xsl:when test="value_location_form = 1">
-                                                                               
        <input type="checkbox" name="values[location_form]" value="1" 
checked="checked" onMouseout="window.status='';return true;">
-                                                                               
                <xsl:attribute name="onMouseover">
-                                                                               
                        <xsl:text>window.status='</xsl:text>
-                                                                               
                        <xsl:value-of select="lang_location_form_statustext"/>
-                                                                               
                        <xsl:text>'; return true;</xsl:text>
-                                                                               
                </xsl:attribute>
-                                                                               
        </input>
-                                                                               
</xsl:when>
-                                                                               
<xsl:otherwise>
-                                                                               
        <input type="checkbox" name="values[location_form]" value="1" 
onMouseout="window.status='';return true;">
-                                                                               
                <xsl:attribute name="onMouseover">
-                                                                               
                        <xsl:text>window.status='</xsl:text>
-                                                                               
                        <xsl:value-of select="lang_location_form_statustext"/>
-                                                                               
                        <xsl:text>'; return true;</xsl:text>
-                                                                               
                </xsl:attribute>
-                                                                               
        </input>
-                                                                               
</xsl:otherwise>
-                                                                       
</xsl:choose>
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="value_location_form = 1">
+                                                                               
<input type="checkbox" name="values[location_form]" value="1" checked="checked" 
onMouseout="window.status='';return true;">
+                                                                               
        <xsl:attribute name="onMouseover">
+                                                                               
                <xsl:text>window.status='</xsl:text>
+                                                                               
                <xsl:value-of select="lang_location_form_statustext"/>
+                                                                               
                <xsl:text>'; return true;</xsl:text>
+                                                                               
        </xsl:attribute>
+                                                                               
</input>
+                                                                       
</xsl:when>
+                                                                       
<xsl:otherwise>
+                                                                               
<input type="checkbox" name="values[location_form]" value="1" 
onMouseout="window.status='';return true;">
+                                                                               
        <xsl:attribute name="onMouseover">
+                                                                               
                <xsl:text>window.status='</xsl:text>
+                                                                               
                <xsl:value-of select="lang_location_form_statustext"/>
+                                                                               
                <xsl:text>'; return true;</xsl:text>
+                                                                               
        </xsl:attribute>
+                                                                               
</input>
+                                                                       
</xsl:otherwise>
+                                                               </xsl:choose>
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
@@ -554,26 +554,26 @@
                                                                <label>
                                                                        
<xsl:value-of select="lang_documentation"/>
                                                                </label>
-                                                                       
<xsl:choose>
-                                                                               
<xsl:when test="value_documentation = 1">
-                                                                               
        <input type="checkbox" name="values[documentation]" value="1" 
checked="checked" onMouseout="window.status='';return true;">
-                                                                               
                <xsl:attribute name="onMouseover">
-                                                                               
                        <xsl:text>window.status='</xsl:text>
-                                                                               
                        <xsl:value-of select="lang_documentation_statustext"/>
-                                                                               
                        <xsl:text>'; return true;</xsl:text>
-                                                                               
                </xsl:attribute>
-                                                                               
        </input>
-                                                                               
</xsl:when>
-                                                                               
<xsl:otherwise>
-                                                                               
        <input type="checkbox" name="values[documentation]" value="1" 
onMouseout="window.status='';return true;">
-                                                                               
                <xsl:attribute name="onMouseover">
-                                                                               
                        <xsl:text>window.status='</xsl:text>
-                                                                               
                        <xsl:value-of select="lang_documentation_statustext"/>
-                                                                               
                        <xsl:text>'; return true;</xsl:text>
-                                                                               
                </xsl:attribute>
-                                                                               
        </input>
-                                                                               
</xsl:otherwise>
-                                                                       
</xsl:choose>
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="value_documentation = 1">
+                                                                               
<input type="checkbox" name="values[documentation]" value="1" checked="checked" 
onMouseout="window.status='';return true;">
+                                                                               
        <xsl:attribute name="onMouseover">
+                                                                               
                <xsl:text>window.status='</xsl:text>
+                                                                               
                <xsl:value-of select="lang_documentation_statustext"/>
+                                                                               
                <xsl:text>'; return true;</xsl:text>
+                                                                               
        </xsl:attribute>
+                                                                               
</input>
+                                                                       
</xsl:when>
+                                                                       
<xsl:otherwise>
+                                                                               
<input type="checkbox" name="values[documentation]" value="1" 
onMouseout="window.status='';return true;">
+                                                                               
        <xsl:attribute name="onMouseover">
+                                                                               
                <xsl:text>window.status='</xsl:text>
+                                                                               
                <xsl:value-of select="lang_documentation_statustext"/>
+                                                                               
                <xsl:text>'; return true;</xsl:text>
+                                                                               
        </xsl:attribute>
+                                                                               
</input>
+                                                                       
</xsl:otherwise>
+                                                               </xsl:choose>
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
@@ -611,13 +611,13 @@
                                                                <label>
                                                                        
<xsl:value-of select="php:function('lang', 'prefix')"/>
                                                                </label>
-                                                                       <input 
type="text" name="values[prefix]" value="{value_prefix}" 
onMouseout="window.status='';return true;">
-                                                                               
<xsl:attribute name="onMouseover">
-                                                                               
        <xsl:text>window.status='</xsl:text>
-                                                                               
        <xsl:value-of select="lang_prefix_standardtext"/>
-                                                                               
        <xsl:text>'; return true;</xsl:text>
-                                                                               
</xsl:attribute>
-                                                                       </input>
+                                                               <input 
type="text" name="values[prefix]" value="{value_prefix}" 
onMouseout="window.status='';return true;">
+                                                                       
<xsl:attribute name="onMouseover">
+                                                                               
<xsl:text>window.status='</xsl:text>
+                                                                               
<xsl:value-of select="lang_prefix_standardtext"/>
+                                                                               
<xsl:text>'; return true;</xsl:text>
+                                                                       
</xsl:attribute>
+                                                               </input>
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
@@ -630,16 +630,16 @@
                                                                        
</xsl:variable>
                                                                        
<xsl:value-of select="$lang_org_unit"/>
                                                                </label>
-                                                                       <input 
type="checkbox" name="values[org_unit]" value="1">
-                                                                               
<xsl:attribute name="title">
+                                                               <input 
type="checkbox" name="values[org_unit]" value="1">
+                                                                       
<xsl:attribute name="title">
                                                                                
<xsl:value-of select="php:function('lang', 'department')"/>
-                                                                               
        </xsl:attribute>
-                                                                               
<xsl:if test="value_org_unit = '1'">
-                                                                               
        <xsl:attribute name="checked">
-                                                                               
                <xsl:text>checked</xsl:text>
-                                                                               
        </xsl:attribute>
-                                                                               
</xsl:if>
-                                                                       </input>
+                                                                       
</xsl:attribute>
+                                                                       <xsl:if 
test="value_org_unit = '1'">
+                                                                               
<xsl:attribute name="checked">
+                                                                               
        <xsl:text>checked</xsl:text>
+                                                                               
</xsl:attribute>
+                                                                       
</xsl:if>
+                                                               </input>
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
@@ -650,16 +650,16 @@
                                                                <label>
                                                                        
<xsl:value-of select="php:function('lang', 'lookup tenant')"/>
                                                                </label>
-                                                                       <input 
type="checkbox" name="values[lookup_tenant]" value="1">
-                                                                               
<xsl:attribute name="title">
-                                                                               
        <xsl:value-of select="php:function('lang', 'If this entity type is to 
look up tenants')"/>
+                                                               <input 
type="checkbox" name="values[lookup_tenant]" value="1">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="php:function('lang', 'If this entity type is to look up 
tenants')"/>
+                                                                       
</xsl:attribute>
+                                                                       <xsl:if 
test="value_lookup_tenant = '1'">
+                                                                               
<xsl:attribute name="checked">
+                                                                               
        <xsl:text>checked</xsl:text>
                                                                                
</xsl:attribute>
-                                                                               
<xsl:if test="value_lookup_tenant = '1'">
-                                                                               
        <xsl:attribute name="checked">
-                                                                               
                <xsl:text>checked</xsl:text>
-                                                                               
        </xsl:attribute>
-                                                                               
</xsl:if>
-                                                                       </input>
+                                                                       
</xsl:if>
+                                                               </input>
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
@@ -669,16 +669,16 @@
                                                                <label>
                                                                        
<xsl:value-of select="php:function('lang', 'tracking helpdesk')"/>
                                                                </label>
-                                                                       <input 
type="checkbox" name="values[tracking]" value="1">
-                                                                               
<xsl:attribute name="title">
-                                                                               
        <xsl:value-of select="php:function('lang', 'activate tracking of dates 
in helpdesk main list')"/>
+                                                               <input 
type="checkbox" name="values[tracking]" value="1">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="php:function('lang', 'activate tracking of dates in 
helpdesk main list')"/>
+                                                                       
</xsl:attribute>
+                                                                       <xsl:if 
test="value_tracking = '1'">
+                                                                               
<xsl:attribute name="checked">
+                                                                               
        <xsl:text>checked</xsl:text>
                                                                                
</xsl:attribute>
-                                                                               
<xsl:if test="value_tracking = '1'">
-                                                                               
        <xsl:attribute name="checked">
-                                                                               
                <xsl:text>checked</xsl:text>
-                                                                               
        </xsl:attribute>
-                                                                               
</xsl:if>
-                                                                       </input>
+                                                                       
</xsl:if>
+                                                               </input>
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
@@ -688,16 +688,16 @@
                                                                <label>
                                                                        
<xsl:value-of select="php:function('lang', 'enable file upload')"/>
                                                                </label>
-                                                                       <input 
type="checkbox" name="values[fileupload]" value="1">
-                                                                               
<xsl:attribute name="title">
-                                                                               
        <xsl:value-of select="php:function('lang', 'If files can be uploaded 
for this category')"/>
+                                                               <input 
type="checkbox" name="values[fileupload]" value="1">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="php:function('lang', 'If files can be uploaded for this 
category')"/>
+                                                                       
</xsl:attribute>
+                                                                       <xsl:if 
test="value_fileupload = '1'">
+                                                                               
<xsl:attribute name="checked">
+                                                                               
        <xsl:text>checked</xsl:text>
                                                                                
</xsl:attribute>
-                                                                               
<xsl:if test="value_fileupload = '1'">
-                                                                               
        <xsl:attribute name="checked">
-                                                                               
                <xsl:text>checked</xsl:text>
-                                                                               
        </xsl:attribute>
-                                                                               
</xsl:if>
-                                                                       </input>
+                                                                       
</xsl:if>
+                                                               </input>
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
@@ -707,16 +707,16 @@
                                                                <label>
                                                                        
<xsl:value-of select="php:function('lang', 'jasper upload')"/>
                                                                </label>
-                                                                       <input 
type="checkbox" name="values[jasperupload]" value="1">
-                                                                               
<xsl:attribute name="title">
-                                                                               
        <xsl:value-of select="php:function('lang', 'allow to upload definition 
of jasper reports')"/>
+                                                               <input 
type="checkbox" name="values[jasperupload]" value="1">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="php:function('lang', 'allow to upload definition of 
jasper reports')"/>
+                                                                       
</xsl:attribute>
+                                                                       <xsl:if 
test="value_jasperupload = '1'">
+                                                                               
<xsl:attribute name="checked">
+                                                                               
        <xsl:text>checked</xsl:text>
                                                                                
</xsl:attribute>
-                                                                               
<xsl:if test="value_jasperupload = '1'">
-                                                                               
        <xsl:attribute name="checked">
-                                                                               
                <xsl:text>checked</xsl:text>
-                                                                               
        </xsl:attribute>
-                                                                               
</xsl:if>
-                                                                       </input>
+                                                                       
</xsl:if>
+                                                               </input>
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
@@ -726,16 +726,16 @@
                                                                <label>
                                                                        
<xsl:value-of select="php:function('lang', 'Link from location')"/>
                                                                </label>
-                                                                       <input 
type="checkbox" name="values[loc_link]" value="1">
-                                                                               
<xsl:attribute name="title">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Enable link from location 
detail')"/>
+                                                               <input 
type="checkbox" name="values[loc_link]" value="1">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="php:function('lang', 'Enable link from location 
detail')"/>
+                                                                       
</xsl:attribute>
+                                                                       <xsl:if 
test="value_loc_link = '1'">
+                                                                               
<xsl:attribute name="checked">
+                                                                               
        <xsl:text>checked</xsl:text>
                                                                                
</xsl:attribute>
-                                                                               
<xsl:if test="value_loc_link = '1'">
-                                                                               
        <xsl:attribute name="checked">
-                                                                               
                <xsl:text>checked</xsl:text>
-                                                                               
        </xsl:attribute>
-                                                                               
</xsl:if>
-                                                                       </input>
+                                                                       
</xsl:if>
+                                                               </input>
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
@@ -745,16 +745,16 @@
                                                                <label>
                                                                        
<xsl:value-of select="php:function('lang', 'start project')"/>
                                                                </label>
-                                                                       <input 
type="checkbox" name="values[start_project]" value="1">
-                                                                               
<xsl:attribute name="title">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Enable start project from 
this category')"/>
+                                                               <input 
type="checkbox" name="values[start_project]" value="1">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="php:function('lang', 'Enable start project from this 
category')"/>
+                                                                       
</xsl:attribute>
+                                                                       <xsl:if 
test="value_start_project = '1'">
+                                                                               
<xsl:attribute name="checked">
+                                                                               
        <xsl:text>checked</xsl:text>
                                                                                
</xsl:attribute>
-                                                                               
<xsl:if test="value_start_project = '1'">
-                                                                               
        <xsl:attribute name="checked">
-                                                                               
                <xsl:text>checked</xsl:text>
-                                                                               
        </xsl:attribute>
-                                                                               
</xsl:if>
-                                                                       </input>
+                                                                       
</xsl:if>
+                                                               </input>
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
@@ -764,16 +764,16 @@
                                                                <label>
                                                                        
<xsl:value-of select="php:function('lang', 'start ticket')"/>
                                                                </label>
-                                                                       <input 
type="checkbox" name="values[start_ticket]" value="1">
-                                                                               
<xsl:attribute name="title">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Enable start ticket from 
this category')"/>
+                                                               <input 
type="checkbox" name="values[start_ticket]" value="1">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="php:function('lang', 'Enable start ticket from this 
category')"/>
+                                                                       
</xsl:attribute>
+                                                                       <xsl:if 
test="value_start_ticket = '1'">
+                                                                               
<xsl:attribute name="checked">
+                                                                               
        <xsl:text>checked</xsl:text>
                                                                                
</xsl:attribute>
-                                                                               
<xsl:if test="value_start_ticket = '1'">
-                                                                               
        <xsl:attribute name="checked">
-                                                                               
                <xsl:text>checked</xsl:text>
-                                                                               
        </xsl:attribute>
-                                                                               
</xsl:if>
-                                                                       </input>
+                                                                       
</xsl:if>
+                                                               </input>
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
@@ -781,62 +781,62 @@
                                                <label>
                                                        <xsl:value-of 
select="php:function('lang', 'is eav')"/>
                                                </label>
-                                                       <input type="checkbox" 
name="values[is_eav]" value="1">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="php:function('lang', 'This category is modelled in the 
database as a xml adapted entity attribute value model')"/>
+                                               <input type="checkbox" 
name="values[is_eav]" value="1">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="php:function('lang', 'This category is modelled in the database as a 
xml adapted entity attribute value model')"/>
+                                                       </xsl:attribute>
+                                                       <xsl:if 
test="value_is_eav = '1'">
+                                                               <xsl:attribute 
name="checked">
+                                                                       
<xsl:text>checked</xsl:text>
                                                                </xsl:attribute>
-                                                               <xsl:if 
test="value_is_eav = '1'">
-                                                                       
<xsl:attribute name="checked">
-                                                                               
<xsl:text>checked</xsl:text>
-                                                                       
</xsl:attribute>
-                                                               </xsl:if>
-                                                               <xsl:if 
test="value_is_eav = '1' or value_id != ''">
-                                                                       
<xsl:attribute name="disabled">
-                                                                               
<xsl:text>disabled</xsl:text>
-                                                                       
</xsl:attribute>
-                                                               </xsl:if>
-                                                       </input>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="value_is_eav = '1'">
-                                                                       <input 
type="hidden" name="values[is_eav]" value="1"/>
-                                                               </xsl:when>
-                                                       </xsl:choose>
+                                                       </xsl:if>
+                                                       <xsl:if 
test="value_is_eav = '1' or value_id != ''">
+                                                               <xsl:attribute 
name="disabled">
+                                                                       
<xsl:text>disabled</xsl:text>
+                                                               </xsl:attribute>
+                                                       </xsl:if>
+                                               </input>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="value_is_eav = '1'">
+                                                               <input 
type="hidden" name="values[is_eav]" value="1"/>
+                                                       </xsl:when>
+                                               </xsl:choose>
                                        </div>
                                        <div class="pure-control-group">
                                                <label>
                                                        <xsl:value-of 
select="php:function('lang', 'enable bulk')"/>
                                                </label>
-                                                       <input type="checkbox" 
name="values[enable_bulk]" value="1">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="php:function('lang', 'This category is allowed to 
reperesent bulk entities')"/>
+                                               <input type="checkbox" 
name="values[enable_bulk]" value="1">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="php:function('lang', 'This category is allowed to reperesent bulk 
entities')"/>
+                                                       </xsl:attribute>
+                                                       <xsl:if 
test="value_enable_bulk = '1'">
+                                                               <xsl:attribute 
name="checked">
+                                                                       
<xsl:text>checked</xsl:text>
                                                                </xsl:attribute>
-                                                               <xsl:if 
test="value_enable_bulk = '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', 'enable controller')"/>
                                                </label>
-                                                       <input type="checkbox" 
name="values[enable_controller]" value="1">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="php:function('lang', 'This category is allowed to link to 
controller')"/>
+                                               <input type="checkbox" 
name="values[enable_controller]" value="1">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="php:function('lang', 'This category is allowed to link to 
controller')"/>
+                                                       </xsl:attribute>
+                                                       <xsl:if 
test="value_enable_controller > '0'">
+                                                               <xsl:attribute 
name="checked">
+                                                                       
<xsl:text>checked</xsl:text>
                                                                </xsl:attribute>
-                                                               <xsl:if 
test="value_enable_controller > '0'">
-                                                                       
<xsl:attribute name="checked">
-                                                                               
<xsl:text>checked</xsl:text>
-                                                                       
</xsl:attribute>
-                                                               </xsl:if>
-                                                               <xsl:if 
test="value_enable_controller > '1'">
-                                                                       
<xsl:attribute name="disabled">
-                                                                               
<xsl:text>disabled</xsl:text>
-                                                                       
</xsl:attribute>
-                                                               </xsl:if>
+                                                       </xsl:if>
+                                                       <xsl:if 
test="value_enable_controller > '1'">
+                                                               <xsl:attribute 
name="disabled">
+                                                                       
<xsl:text>disabled</xsl:text>
+                                                               </xsl:attribute>
+                                                       </xsl:if>
 
-                                                       </input>
+                                               </input>
                                        </div>
                                        <xsl:choose>
                                                <xsl:when 
test="lang_location_level != ''">
@@ -844,29 +844,29 @@
                                                                <label>
                                                                        
<xsl:value-of select="lang_location_level"/>
                                                                </label>
-                                                                       
<xsl:variable name="lang_location_level_statustext">
-                                                                               
<xsl:value-of select="lang_location_level_statustext"/>
-                                                                       
</xsl:variable>
-                                                                       <select 
name="values[location_level]" class="forms" 
onMouseover="window.status='{$lang_location_level_statustext}'; return true;" 
onMouseout="window.status='';return true;">
-                                                                               
<option value="">
-                                                                               
        <xsl:value-of select="lang_no_location_level"/>
-                                                                               
</option>
-                                                                               
<xsl:apply-templates select="location_level_list/options"/>
-                                                                       
</select>
+                                                               <xsl:variable 
name="lang_location_level_statustext">
+                                                                       
<xsl:value-of select="lang_location_level_statustext"/>
+                                                               </xsl:variable>
+                                                               <select 
name="values[location_level]" class="forms" 
onMouseover="window.status='{$lang_location_level_statustext}'; return true;" 
onMouseout="window.status='';return true;">
+                                                                       <option 
value="">
+                                                                               
<xsl:value-of select="lang_no_location_level"/>
+                                                                       
</option>
+                                                                       
<xsl:apply-templates select="location_level_list/options"/>
+                                                               </select>
                                                        </div>
                                                        <div 
class="pure-control-group">
                                                                <label>
                                                                        
<xsl:value-of select="lang_location_link_level"/>
                                                                </label>
-                                                                       
<xsl:variable name="lang_location_link_level_statustext">
-                                                                               
<xsl:value-of select="lang_location_link_level_statustext"/>
-                                                                       
</xsl:variable>
-                                                                       <select 
name="values[location_link_level]" 
title="{$lang_location_link_level_statustext}">
-                                                                               
<option value="">
-                                                                               
        <xsl:value-of select="lang_no_location_link_level"/>
-                                                                               
</option>
-                                                                               
<xsl:apply-templates select="location_link_level_list/options"/>
-                                                                       
</select>
+                                                               <xsl:variable 
name="lang_location_link_level_statustext">
+                                                                       
<xsl:value-of select="lang_location_link_level_statustext"/>
+                                                               </xsl:variable>
+                                                               <select 
name="values[location_link_level]" 
title="{$lang_location_link_level_statustext}">
+                                                                       <option 
value="">
+                                                                               
<xsl:value-of select="lang_no_location_link_level"/>
+                                                                       
</option>
+                                                                       
<xsl:apply-templates select="location_link_level_list/options"/>
+                                                               </select>
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
@@ -877,9 +877,9 @@
                                                <label>
                                                        <xsl:value-of 
select="$lang_entity_group"/>
                                                </label>
-                                                       <select 
name="values[entity_group_id]" title="$lang_entity_group">
-                                                               
<xsl:apply-templates select="entity_group_list/options"/>
-                                                       </select>
+                                               <select 
name="values[entity_group_id]" title="$lang_entity_group">
+                                                       <xsl:apply-templates 
select="entity_group_list/options"/>
+                                               </select>
                                        </div>
                                        <xsl:choose>
                                                <xsl:when test="category_list 
!= '' and value_id = ''">
@@ -887,12 +887,12 @@
                                                                <label>
                                                                        
<xsl:value-of select="php:function('lang', 'template')"/>
                                                                </label>
-                                                                       <select 
id="category_template" name="values[category_template]" 
onChange="get_template_attributes()">
-                                                                               
<option value="">
-                                                                               
        <xsl:value-of select="php:function('lang', 'select template')"/>
-                                                                               
</option>
-                                                                               
<xsl:apply-templates select="category_list"/>
-                                                                       
</select>
+                                                               <select 
id="category_template" name="values[category_template]" 
onChange="get_template_attributes()">
+                                                                       <option 
value="">
+                                                                               
<xsl:value-of select="php:function('lang', 'select template')"/>
+                                                                       
</option>
+                                                                       
<xsl:apply-templates select="category_list"/>
+                                                               </select>
                                                        </div>
                                                        <div 
class="pure-control-group">
                                                                <label>
@@ -909,7 +909,7 @@
                                                                                
</xsl:call-template>
                                                                        
</xsl:if>
                                                                </xsl:for-each>
-                                                                       <input 
type="hidden" name="template_attrib" value=""/>
+                                                               <input 
type="hidden" name="template_attrib" value=""/>
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
@@ -925,337 +925,337 @@
                                </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>
-               <!--  DATATABLE DEFINITIONS-->
-               <script type="text/javascript">
-                       var base_java_url = <xsl:value-of 
select="base_java_url"/>;
-               </script>
+                                               <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>
+       <!--  DATATABLE DEFINITIONS-->
+       <script type="text/javascript">
+               var base_java_url = <xsl:value-of select="base_java_url"/>;
+       </script>
 </xsl:template>
 
 <!-- list attribute -->
 <xsl:template match="list_attribute">
        <table class="pure-table pure-table-bordered">
-                       <tr>
-                               <td align="right">
-                                       <xsl:call-template name="search_field"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td class="th_text" align="left">
-                                       <xsl:value-of select="lang_entity"/>
-                                       <xsl:text>: </xsl:text>
-                                       <xsl:value-of select="entity_name"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td class="th_text" align="left">
-                                       <xsl:value-of select="lang_category"/>
-                                       <xsl:text>: </xsl:text>
-                                       <xsl:value-of select="category_name"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td colspan="3" width="100%">
-                                       <xsl:call-template name="nextmatchs"/>
-                               </td>
-                       </tr>
-               </table>
-       <table class="pure-table pure-table-bordered">
-                       <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_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>
+               <tr>
+                       <td align="right">
+                               <xsl:call-template name="search_field"/>
                        </td>
-                       <td class="th_text" width="20%" align="left">
-                               <xsl:value-of select="lang_descr"/>
+               </tr>
+               <tr>
+                       <td class="th_text" align="left">
+                               <xsl:value-of select="lang_entity"/>
+                               <xsl:text>: </xsl:text>
+                               <xsl:value-of select="entity_name"/>
                        </td>
-                       <td class="th_text" width="1%" align="left">
-                               <xsl:value-of select="lang_datatype"/>
+               </tr>
+               <tr>
+                       <td class="th_text" align="left">
+                               <xsl:value-of select="lang_category"/>
+                               <xsl:text>: </xsl:text>
+                               <xsl:value-of select="category_name"/>
                        </td>
-                       <td class="th_text" width="1%" align="left">
-                               <xsl:value-of select="lang_attrib_group"/>
+               </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="1%" align="center">
-                               <xsl:value-of select="lang_search"/>
-                       </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 class="pure-table pure-table-bordered">
+               <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_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="20%" align="left">
+                       <xsl:value-of select="lang_descr"/>
+               </td>
+               <td class="th_text" width="1%" align="left">
+                       <xsl:value-of select="lang_datatype"/>
+               </td>
+               <td class="th_text" width="1%" align="left">
+                       <xsl:value-of select="lang_attrib_group"/>
+               </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="1%" align="center">
+                       <xsl:value-of select="lang_search"/>
+               </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_edit_text">
-                       <xsl:value-of select="lang_edit_text"/>
-               </xsl:variable>
-               <xsl:variable name="lang_delete_text">
-                       <xsl:value-of select="lang_delete_text"/>
-               </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>
-                               <xsl:value-of select="input_text"/>
-                       </td>
-                       <td>
-                               <xsl:value-of select="datatype"/>
-                       </td>
-                       <td>
-                               <xsl:value-of select="attrib_group"/>
-                       </td>
-                       <td>
+       <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_edit_text">
+               <xsl:value-of select="lang_edit_text"/>
+       </xsl:variable>
+       <xsl:variable name="lang_delete_text">
+               <xsl:value-of select="lang_delete_text"/>
+       </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>
+                       <xsl:value-of select="input_text"/>
+               </td>
+               <td>
+                       <xsl:value-of select="datatype"/>
+               </td>
+               <td>
+                       <xsl:value-of select="attrib_group"/>
+               </td>
+               <td>
                        <table class="pure-table pure-table-bordered">
-                                       <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:value-of select="search"/>
-                       </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_text}';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_text}';return true;" 
onMouseout="window.status='';return true;">
-                                       <xsl:value-of select="text_delete"/>
-                               </a>
-                       </td>
-               </tr>
+                               <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:value-of select="search"/>
+               </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_text}';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_text}';return true;" 
onMouseout="window.status='';return true;">
+                               <xsl:value-of select="text_delete"/>
+                       </a>
+               </td>
+       </tr>
 </xsl:template>
 
 <!-- New template-->
 <!-- list attribute_group -->
 <xsl:template match="list_attribute_group">
        <table class="pure-table pure-table-bordered">
-                       <tr>
-                               <td align="right">
-                                       <xsl:call-template name="search_field"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td class="th_text" align="left">
-                                       <xsl:value-of select="lang_entity"/>
-                                       <xsl:text>: </xsl:text>
-                                       <xsl:value-of select="entity_name"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td class="th_text" align="left">
-                                       <xsl:value-of select="lang_category"/>
-                                       <xsl:text>: </xsl:text>
-                                       <xsl:value-of select="category_name"/>
-                               </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_group"/>
-                       <xsl:apply-templates select="values_attrib_group"/>
-                       <xsl:apply-templates select="table_add"/>
-               </table>
-</xsl:template>
-
-<!-- New template-->
-<xsl:template match="table_header_attrib_group">
-               <xsl:variable name="sort_sorting">
-                       <xsl:value-of select="sort_sorting"/>
-               </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>
+               <tr>
+                       <td align="right">
+                               <xsl:call-template name="search_field"/>
                        </td>
-                       <td class="th_text" width="20%" align="left">
-                               <xsl:value-of select="lang_descr"/>
+               </tr>
+               <tr>
+                       <td class="th_text" align="left">
+                               <xsl:value-of select="lang_entity"/>
+                               <xsl:text>: </xsl:text>
+                               <xsl:value-of select="entity_name"/>
                        </td>
-                       <td class="th_text" width="5%" align="center">
-                               <a href="{$sort_sorting}">
-                                       <xsl:value-of select="lang_sorting"/>
-                               </a>
+               </tr>
+               <tr>
+                       <td class="th_text" align="left">
+                               <xsl:value-of select="lang_category"/>
+                               <xsl:text>: </xsl:text>
+                               <xsl:value-of select="category_name"/>
                        </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_edit"/>
+               </tr>
+               <tr>
+                       <td colspan="3" width="100%">
+                               <xsl:call-template name="nextmatchs"/>
                        </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_group"/>
+               <xsl:apply-templates select="values_attrib_group"/>
+               <xsl:apply-templates select="table_add"/>
+       </table>
 </xsl:template>
 
 <!-- New template-->
+<xsl:template match="table_header_attrib_group">
+       <xsl:variable name="sort_sorting">
+               <xsl:value-of select="sort_sorting"/>
+       </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="20%" align="left">
+                       <xsl:value-of select="lang_descr"/>
+               </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_group">
-               <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_edit_text">
-                       <xsl:value-of select="lang_edit_text"/>
-               </xsl:variable>
-               <xsl:variable name="lang_delete_text">
-                       <xsl:value-of select="lang_delete_text"/>
-               </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="name"/>
-                       </td>
-                       <td>
-                               <xsl:value-of select="descr"/>
-                       </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_text}';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_text}';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_edit_text">
+               <xsl:value-of select="lang_edit_text"/>
+       </xsl:variable>
+       <xsl:variable name="lang_delete_text">
+               <xsl:value-of select="lang_delete_text"/>
+       </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="name"/>
+               </td>
+               <td>
+                       <xsl:value-of select="descr"/>
+               </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_text}';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_text}';return true;" 
onMouseout="window.status='';return true;">
+                               <xsl:value-of select="text_delete"/>
+                       </a>
+               </td>
+       </tr>
 </xsl:template>
 
 <!-- add attribute group / edit attribute group -->
@@ -1266,17 +1266,17 @@
        </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"/>
@@ -1284,111 +1284,111 @@
                                                    
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="lang_entity"/>
+                                               <xsl:value-of 
select="lang_entity"/>
                                        </label>
-                                                       <xsl:value-of 
select="entity_name"/>
+                                       <xsl:value-of select="entity_name"/>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="lang_category"/>
+                                               <xsl:value-of 
select="lang_category"/>
                                        </label>
-                                                       <xsl:value-of 
select="category_name"/>
+                                       <xsl:value-of select="category_name"/>
                                </div>
-                                       <xsl:choose>
-                                               <xsl:when test="value_id != ''">
+                               <xsl:choose>
+                                       <xsl:when test="value_id != ''">
                                                <div class="pure-control-group">
                                                        <label>
-                                                                       
<xsl:value-of select="lang_id"/>
+                                                               <xsl:value-of 
select="lang_id"/>
                                                        </label>
-                                                                       
<xsl:value-of select="value_id"/>
+                                                       <xsl:value-of 
select="value_id"/>
                                                </div>
-                                               </xsl:when>
-                                       </xsl:choose>
-                                       <xsl:choose>
-                                               <xsl:when test="parent_list != 
''">
+                                       </xsl:when>
+                               </xsl:choose>
+                               <xsl:choose>
+                                       <xsl:when test="parent_list != ''">
                                                <div class="pure-control-group">
                                                        <label>
-                                                                       
<xsl:value-of select="php:function('lang', 'parent')"/>
+                                                               <xsl:value-of 
select="php:function('lang', 'parent')"/>
                                                        </label>
-                                                                       <select 
id="parent_id" name="values[parent_id]">
-                                                                               
<option value="">
-                                                                               
        <xsl:value-of select="php:function('lang', 'select parent')"/>
-                                                                               
</option>
-                                                                               
<xsl:apply-templates select="parent_list"/>
-                                                                       
</select>
+                                                       <select id="parent_id" 
name="values[parent_id]">
+                                                               <option 
value="">
+                                                                       
<xsl:value-of select="php:function('lang', 'select parent')"/>
+                                                               </option>
+                                                               
<xsl:apply-templates select="parent_list"/>
+                                                       </select>
                                                </div>
-                                               </xsl:when>
-                                       </xsl:choose>
+                                       </xsl:when>
+                               </xsl:choose>
 
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="lang_group_name"/>
+                                               <xsl:value-of 
select="lang_group_name"/>
                                        </label>
                                        <input type="text" 
data-validation="required" name="values[group_name]" value="{value_group_name}" 
maxlength="100" onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
-                                                                       
<xsl:value-of select="lang_group_name_statustext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
-                                                               </xsl:attribute>
-                                                       </input>
+                                               <xsl:attribute 
name="onMouseover">
+                                                       
<xsl:text>window.status='</xsl:text>
+                                                       <xsl:value-of 
select="lang_group_name_statustext"/>
+                                                       <xsl:text>'; return 
true;</xsl:text>
+                                               </xsl:attribute>
+                                       </input>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="lang_descr"/>
+                                               <xsl:value-of 
select="lang_descr"/>
                                        </label>
                                        <input type="text" 
data-validation="required" name="values[descr]" value="{value_descr}" size="60" 
maxlength="150" onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
-                                                                       
<xsl:value-of select="lang_descr_statustext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
-                                                               </xsl:attribute>
-                                                       </input>
+                                               <xsl:attribute 
name="onMouseover">
+                                                       
<xsl:text>window.status='</xsl:text>
+                                                       <xsl:value-of 
select="lang_descr_statustext"/>
+                                                       <xsl:text>'; return 
true;</xsl:text>
+                                               </xsl:attribute>
+                                       </input>
                                </div>
                                <div class="pure-control-group">
                                        <label>
-                                                       <xsl:value-of 
select="lang_remark"/>
+                                               <xsl:value-of 
select="lang_remark"/>
                                        </label>
-                                                       <textarea cols="60" 
rows="10" name="values[remark]" onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
-                                                                       
<xsl:value-of select="lang_remark_statustext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
-                                                               </xsl:attribute>
-                                                               <xsl:value-of 
select="value_remark"/>
-                                                       </textarea>
+                                       <textarea cols="60" rows="10" 
name="values[remark]" onMouseout="window.status='';return true;">
+                                               <xsl:attribute 
name="onMouseover">
+                                                       
<xsl:text>window.status='</xsl:text>
+                                                       <xsl:value-of 
select="lang_remark_statustext"/>
+                                                       <xsl:text>'; return 
true;</xsl:text>
+                                               </xsl:attribute>
+                                               <xsl:value-of 
select="value_remark"/>
+                                       </textarea>
                                </div>
                                <div class="pure-control-group">
-                                                       <xsl:variable 
name="lang_save">
-                                                               <xsl:value-of 
select="lang_save"/>
-                                                       </xsl:variable>
+                                       <xsl:variable name="lang_save">
+                                               <xsl:value-of 
select="lang_save"/>
+                                       </xsl:variable>
                                        <input type="submit" class="pure-button 
pure-button-primary" name="values[save]" value="{$lang_save}" 
onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
-                                                                       
<xsl:value-of select="lang_save_attribtext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
-                                                               </xsl:attribute>
-                                                       </input>
+                                               <xsl:attribute 
name="onMouseover">
+                                                       
<xsl:text>window.status='</xsl:text>
+                                                       <xsl:value-of 
select="lang_save_attribtext"/>
+                                                       <xsl:text>'; return 
true;</xsl:text>
+                                               </xsl:attribute>
+                                       </input>
                                </div>
                        </div>
                </div>
-                               </form>
+       </form>
        <div class="pure-control-group">
-                                               <xsl:variable 
name="done_action">
-                                                       <xsl:value-of 
select="done_action"/>
-                                               </xsl:variable>
-                                               <xsl:variable name="lang_done">
-                                                       <xsl:value-of 
select="lang_done"/>
-                                               </xsl:variable>
-                                               <form method="post" 
action="{$done_action}">
+               <xsl:variable name="done_action">
+                       <xsl:value-of select="done_action"/>
+               </xsl:variable>
+               <xsl:variable name="lang_done">
+                       <xsl:value-of select="lang_done"/>
+               </xsl:variable>
+               <form method="post" action="{$done_action}">
                        <input type="submit" class="pure-button 
pure-button-primary" name="done" value="{$lang_done}" 
onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
-                                                                       
<xsl:value-of select="lang_done_attribtext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </form>
-               </div>
+                               <xsl:attribute name="onMouseover">
+                                       <xsl:text>window.status='</xsl:text>
+                                       <xsl:value-of 
select="lang_done_attribtext"/>
+                                       <xsl:text>'; return true;</xsl:text>
+                               </xsl:attribute>
+                       </input>
+               </form>
+       </div>
 </xsl:template>
 
 <!-- add attribute / edit attribute -->
@@ -1401,45 +1401,45 @@
                <xsl:value-of disable-output-escaping="yes" select="tabs"/>
                <div class="yui-content">
                        <div id="general">
-               <div align="left">
-                       <xsl:variable name="form_action">
-                                       <xsl:value-of select="form_action"/>
-                               </xsl:variable>
+                               <div align="left">
+                                       <xsl:variable name="form_action">
+                                               <xsl:value-of 
select="form_action"/>
+                                       </xsl:variable>
                                        <form method="post" class="pure-form 
pure-form-aligned" action="{$form_action}">
                                                <dl>
-                               <xsl:choose>
-                                       <xsl:when test="msgbox_data != ''">
+                                                       <xsl:choose>
+                                                               <xsl:when 
test="msgbox_data != ''">
                                                                        <dt>
-                                                               
<xsl:call-template name="msgbox"/>
+                                                                               
<xsl:call-template name="msgbox"/>
                                                                        </dt>
-                                       </xsl:when>
-                               </xsl:choose>
+                                                               </xsl:when>
+                                                       </xsl:choose>
                                                </dl>
                                                <div class="pure-control-group">
                                                        <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'entity')"/>
+                                                               <xsl:value-of 
select="php:function('lang', 'entity')"/>
                                                        </label>
                                                        <xsl:value-of 
select="entity_name"/>
                                                </div>
                                                <div class="pure-control-group">
                                                        <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'category')"/>
+                                                               <xsl:value-of 
select="php:function('lang', 'category')"/>
                                                        </label>
                                                        <xsl:value-of 
select="category_name"/>
                                                </div>
-                                       <xsl:choose>
-                                               <xsl:when test="value_id != ''">
+                                               <xsl:choose>
+                                                       <xsl:when 
test="value_id != ''">
                                                                <div 
class="pure-control-group">
                                                                        <label>
-                                                                       
<xsl:value-of select="php:function('lang', 'attribute id')"/>
+                                                                               
<xsl:value-of select="php:function('lang', 'attribute id')"/>
                                                                        </label>
                                                                        
<xsl:value-of select="value_id"/>
                                                                </div>
-                                               </xsl:when>
-                                       </xsl:choose>
+                                                       </xsl:when>
+                                               </xsl:choose>
                                                <div class="pure-control-group">
                                                        <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'column name')"/>
+                                                               <xsl:value-of 
select="php:function('lang', 'column name')"/>
                                                        </label>
                                                        <input type="text" 
name="values[column_name]" value="{value_column_name}" maxlength="50">
                                                                <xsl:attribute 
name="title">
@@ -1449,7 +1449,7 @@
                                                </div>
                                                <div class="pure-control-group">
                                                        <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'input text')"/>
+                                                               <xsl:value-of 
select="php:function('lang', 'input text')"/>
                                                        </label>
                                                        <input type="text" 
name="values[input_text]" value="{value_input_text}" size="60" maxlength="255">
                                                                <xsl:attribute 
name="title">
@@ -1459,7 +1459,7 @@
                                                </div>
                                                <div class="pure-control-group">
                                                        <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'statustext')"/>
+                                                               <xsl:value-of 
select="php:function('lang', 'statustext')"/>
                                                        </label>
                                                        <textarea cols="60" 
rows="10" name="values[statustext]" maxlength="255">
                                                                <xsl:attribute 
name="title">
@@ -1470,7 +1470,7 @@
                                                </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">
@@ -1484,7 +1484,7 @@
                                                </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">
                                                                <xsl:attribute 
name="title">
@@ -1498,7 +1498,7 @@
                                                </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">
@@ -1508,7 +1508,7 @@
                                                </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">
@@ -1518,7 +1518,7 @@
                                                </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">
@@ -1528,7 +1528,7 @@
                                                </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]">
                                                                <xsl:attribute 
name="title">
@@ -1542,7 +1542,7 @@
                                                </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">
@@ -1557,7 +1557,7 @@
                                                </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">
@@ -1572,7 +1572,7 @@
                                                </div>
                                                <div class="pure-control-group">
                                                        <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'history')"/>
+                                                               <xsl:value-of 
select="php:function('lang', 'history')"/>
                                                        </label>
                                                        <input type="checkbox" 
name="values[history]" value="1">
                                                                <xsl:if 
test="value_history = 1">
@@ -1587,7 +1587,7 @@
                                                </div>
                                                <div class="pure-control-group">
                                                        <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'disabled')"/>
+                                                               <xsl:value-of 
select="php:function('lang', 'disabled')"/>
                                                        </label>
                                                        <input type="checkbox" 
name="values[disabled]" value="1">
                                                                <xsl:if 
test="value_disabled = 1">
@@ -1603,7 +1603,7 @@
 
                                                <div class="pure-control-group">
                                                        <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'short description')"/>
+                                                               <xsl:value-of 
select="php:function('lang', 'short description')"/>
                                                        </label>
                                                        <input type="text" 
name="values[short_description]" value="{value_short_description}" size = "2" 
maxlength= "2">
                                                                <xsl:attribute 
name="title">
@@ -1614,7 +1614,7 @@
 
                                                <div class="pure-control-group">
                                                        <label>
-                                                       <xsl:value-of 
select="php:function('lang', 'help message')"/>
+                                                               <xsl:value-of 
select="php:function('lang', 'help message')"/>
                                                        </label>
                                                        <textarea cols="60" 
rows="10" name="values[helpmsg]">
                                                                <xsl:attribute 
name="title">
@@ -1624,11 +1624,11 @@
                                                        </textarea>
                                                </div>
 
-                                       <xsl:choose>
-                                               <xsl:when test="datatype = 
'link'">
+                                               <xsl:choose>
+                                                       <xsl:when 
test="datatype = 'link'">
                                                                <div 
class="pure-control-group">
                                                                        <label>
-                                                                       
<xsl:value-of select="php:function('lang', 'action')"/>
+                                                                               
<xsl:value-of select="php:function('lang', 'action')"/>
                                                                        </label>
                                                                        
<textarea cols="60" rows="10" name="values[javascript_action]">
                                                                                
<xsl:attribute name="title">
@@ -1637,24 +1637,24 @@
                                                                                
<xsl:value-of select="value_javascript_action"/>
                                                                        
</textarea>
                                                                </div>
-                                               </xsl:when>
-                                       </xsl:choose>
+                                                       </xsl:when>
+                                               </xsl:choose>
 
-                                       <xsl:choose>
-                                               <xsl:when test="multiple_choice 
= 1">
+                                               <xsl:choose>
+                                                       <xsl:when 
test="multiple_choice = 1">
                                                                <div 
class="pure-control-group">
                                                                        <label>
-                                                                       
<xsl:value-of select="php:function('lang', 'choice')"/>
+                                                                               
<xsl:value-of select="php:function('lang', 'choice')"/>
                                                                        </label>
                                                                        
<xsl:call-template name="choice"/>
                                                                </div>
-                                               </xsl:when>
-                                       </xsl:choose>
-                                       <xsl:choose>
-                                               <xsl:when test="custom_get_list 
= 1">
+                                                       </xsl:when>
+                                               </xsl:choose>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="custom_get_list = 1">
                                                                <div 
class="pure-control-group">
                                                                        <label>
-                                                                       
<xsl:value-of select="php:function('lang', 'custom get list function')"/>
+                                                                               
<xsl:value-of select="php:function('lang', 'custom get list function')"/>
                                                                        </label>
                                                                        <input 
type="text" name="values[get_list_function]" value="{value_get_list_function}" 
size="60">
                                                                                
<xsl:attribute name="title">
@@ -1664,7 +1664,7 @@
                                                                </div>
                                                                <div 
class="pure-control-group">
                                                                        <label>
-                                                                       
<xsl:value-of select="php:function('lang', 'get list function input')"/>
+                                                                               
<xsl:value-of select="php:function('lang', 'get list function input')"/>
                                                                        </label>
                                                                        
<textarea cols="60" rows="10" name="values[get_list_function_input]">
                                                                                
<xsl:attribute name="title">
@@ -1673,13 +1673,13 @@
                                                                                
<xsl:value-of select="value_get_list_function_input"/>
                                                                        
</textarea>
                                                                </div>
-                                               </xsl:when>
-                                       </xsl:choose>
-                                       <xsl:choose>
-                                               <xsl:when 
test="custom_get_single = 1">
+                                                       </xsl:when>
+                                               </xsl:choose>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="custom_get_single = 1">
                                                                <div 
class="pure-control-group">
                                                                        <label>
-                                                                       
<xsl:value-of select="php:function('lang', 'custom get single function')"/>
+                                                                               
<xsl:value-of select="php:function('lang', 'custom get single function')"/>
                                                                        </label>
                                                                        <input 
type="text" name="values[get_single_function]" 
value="{value_get_single_function}" size="60">
                                                                                
<xsl:attribute name="title">
@@ -1689,7 +1689,7 @@
                                                                </div>
                                                                <div 
class="pure-control-group">
                                                                        <label>
-                                                                       
<xsl:value-of select="php:function('lang', 'get single function input')"/>
+                                                                               
<xsl:value-of select="php:function('lang', 'get single function input')"/>
                                                                        </label>
                                                                        
<textarea cols="60" rows="10" name="values[get_single_function_input]">
                                                                                
<xsl:attribute name="title">
@@ -1698,8 +1698,8 @@
                                                                                
<xsl:value-of select="value_get_single_function_input"/>
                                                                        
</textarea>
                                                                </div>
-                                               </xsl:when>
-                                       </xsl:choose>
+                                                       </xsl:when>
+                                               </xsl:choose>
                                                <div class="pure-control-group">
                                                        <xsl:variable 
name="lang_save">
                                                                <xsl:value-of 
select="php:function('lang', 'save')"/>
@@ -1710,7 +1710,7 @@
                                                                </xsl:attribute>
                                                        </input>
                                                </div>
-                               </form>
+                                       </form>
                                        <div class="pure-control-group">
                                                <xsl:variable 
name="done_action">
                                                        <xsl:value-of 
select="done_action"/>
@@ -1725,7 +1725,7 @@
                                                                </xsl:attribute>
                                                        </input>
                                                </form>
-               </div>
+                                       </div>
                                </div>
                        </div>
                </div>
@@ -1735,154 +1735,154 @@
 <!-- list custom_function -->
 <xsl:template match="list_custom_function">
        <table class="pure-table pure-table-bordered">
-                       <tr>
-                               <td align="right">
-                                       <xsl:call-template name="search_field"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td class="th_text" align="left">
-                                       <xsl:value-of select="lang_entity"/>
-                                       <xsl:text>: </xsl:text>
-                                       <xsl:value-of select="entity_name"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td class="th_text" align="left">
-                                       <xsl:value-of select="lang_category"/>
-                                       <xsl:text>: </xsl:text>
-                                       <xsl:value-of select="category_name"/>
-                               </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_custom_function"/>
-                       <xsl:choose>
-                               <xsl:when test="values_custom_function != ''">
-                                       <xsl:apply-templates 
select="values_custom_function"/>
-                               </xsl:when>
-                       </xsl:choose>
-                       <xsl:apply-templates select="table_add"/>
-               </table>
-</xsl:template>
-
-<!-- New template-->
-<xsl:template match="table_header_custom_function">
-               <xsl:variable name="sort_sorting">
-                       <xsl:value-of select="sort_sorting"/>
-               </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>
+               <tr>
+                       <td align="right">
+                               <xsl:call-template name="search_field"/>
                        </td>
-                       <td class="th_text" width="20%" align="left">
-                               <xsl:value-of select="lang_descr"/>
+               </tr>
+               <tr>
+                       <td class="th_text" align="left">
+                               <xsl:value-of select="lang_entity"/>
+                               <xsl:text>: </xsl:text>
+                               <xsl:value-of select="entity_name"/>
                        </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_active"/>
+               </tr>
+               <tr>
+                       <td class="th_text" align="left">
+                               <xsl:value-of select="lang_category"/>
+                               <xsl:text>: </xsl:text>
+                               <xsl:value-of select="category_name"/>
                        </td>
-                       <td class="th_text" width="10%" align="center">
-                               <a href="{$sort_sorting}">
-                                       <xsl:value-of select="lang_sorting"/>
-                               </a>
+               </tr>
+               <tr>
+                       <td colspan="3" width="100%">
+                               <xsl:call-template name="nextmatchs"/>
                        </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_custom_function"/>
+               <xsl:choose>
+                       <xsl:when test="values_custom_function != ''">
+                               <xsl:apply-templates 
select="values_custom_function"/>
+                       </xsl:when>
+               </xsl:choose>
+               <xsl:apply-templates select="table_add"/>
+       </table>
 </xsl:template>
 
 <!-- New template-->
+<xsl:template match="table_header_custom_function">
+       <xsl:variable name="sort_sorting">
+               <xsl:value-of select="sort_sorting"/>
+       </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="20%" align="left">
+                       <xsl:value-of select="lang_descr"/>
+               </td>
+               <td class="th_text" width="5%" align="center">
+                       <xsl:value-of select="lang_active"/>
+               </td>
+               <td class="th_text" width="10%" 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_custom_function">
-               <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_edit_text">
-                       <xsl:value-of select="lang_edit_text"/>
-               </xsl:variable>
-               <xsl:variable name="lang_delete_text">
-                       <xsl:value-of select="lang_delete_text"/>
-               </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="file_name"/>
-                       </td>
-                       <td>
-                               <xsl:value-of select="descr"/>
-                       </td>
-                       <td align="center">
-                               <xsl:value-of select="active"/>
-                       </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_text}';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_text}';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_edit_text">
+               <xsl:value-of select="lang_edit_text"/>
+       </xsl:variable>
+       <xsl:variable name="lang_delete_text">
+               <xsl:value-of select="lang_delete_text"/>
+       </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="file_name"/>
+               </td>
+               <td>
+                       <xsl:value-of select="descr"/>
+               </td>
+               <td align="center">
+                       <xsl:value-of select="active"/>
+               </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_text}';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_text}';return true;" 
onMouseout="window.status='';return true;">
+                               <xsl:value-of select="text_delete"/>
+                       </a>
+               </td>
+       </tr>
 </xsl:template>
 
 <!-- add custom_function / edit custom_function -->
@@ -1894,32 +1894,32 @@
        <div id="tab-content">
                <xsl:value-of disable-output-escaping="yes" select="tabs"/>
                <div id="general">
-               <div align="left">
+                       <div align="left">
                                <xsl:variable name="form_action">
                                        <xsl:value-of select="form_action"/>
                                </xsl:variable>
                                <form method="post" class="pure-form 
pure-form-aligned" action="{$form_action}">
                                        <dl>
-                               <xsl:choose>
-                                       <xsl:when test="msgbox_data != ''">
+                                               <xsl:choose>
+                                                       <xsl:when 
test="msgbox_data != ''">
                                                                <dt>
-                                                               
<xsl:call-template name="msgbox"/>
+                                                                       
<xsl:call-template name="msgbox"/>
                                                                </dt>
-                                       </xsl:when>
-                               </xsl:choose>
+                                                       </xsl:when>
+                                               </xsl:choose>
                                        </dl>
                                        <div class="pure-control-group">
                                                <label>
                                                        <xsl:value-of 
select="lang_entity"/>
                                                </label>
 
-                                                       <xsl:value-of 
select="entity_name"/>
+                                               <xsl:value-of 
select="entity_name"/>
                                        </div>
                                        <div class="pure-control-group">
                                                <label>
                                                        <xsl:value-of 
select="lang_category"/>
                                                </label>
-                                                       <xsl:value-of 
select="category_name"/>
+                                               <xsl:value-of 
select="category_name"/>
                                        </div>
                                        <xsl:choose>
                                                <xsl:when test="value_id != ''">
@@ -1927,7 +1927,7 @@
                                                                <label>
                                                                        
<xsl:value-of select="lang_id"/>
                                                                </label>
-                                                                       
<xsl:value-of select="value_id"/>
+                                                               <xsl:value-of 
select="value_id"/>
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
@@ -1935,100 +1935,100 @@
                                                <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_custom_functiontext"/>
-                                                                       
<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_custom_functiontext"/>
+                                                               <xsl:text>'; 
return true;</xsl:text>
+                                                       </xsl:attribute>
+                                                       <xsl:value-of 
select="value_descr"/>
+                                               </textarea>
                                        </div>
                                        <div class="pure-control-group">
                                                <label>
                                                        <xsl:value-of 
select="lang_custom_function"/>
                                                </label>
-                                                       <xsl:variable 
name="lang_custom_function_statustext">
-                                                               <xsl:value-of 
select="lang_custom_function_statustext"/>
-                                                       </xsl:variable>
-                                                       <select 
name="values[custom_function_file]" class="forms" 
onMouseover="window.status='{$lang_custom_function_statustext}'; return true;" 
onMouseout="window.status='';return true;">
-                                                               <option 
value="">
-                                                                       
<xsl:value-of select="lang_no_custom_function"/>
-                                                               </option>
-                                                               
<xsl:apply-templates select="custom_function_list"/>
-                                                       </select>
+                                               <xsl:variable 
name="lang_custom_function_statustext">
+                                                       <xsl:value-of 
select="lang_custom_function_statustext"/>
+                                               </xsl:variable>
+                                               <select 
name="values[custom_function_file]" class="forms" 
onMouseover="window.status='{$lang_custom_function_statustext}'; return true;" 
onMouseout="window.status='';return true;">
+                                                       <option value="">
+                                                               <xsl:value-of 
select="lang_no_custom_function"/>

@@ Diff output truncated at 153600 characters. @@



reply via email to

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