fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [16332] admin entity form


From: sigurdne
Subject: [Fmsystem-commits] [16332] admin entity form
Date: Fri, 17 Feb 2017 08:37:28 -0500 (EST)

Revision: 16332
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16332
Author:   sigurdne
Date:     2017-02-17 08:37:27 -0500 (Fri, 17 Feb 2017)
Log Message:
-----------
admin entity form

Modified Paths:
--------------
    trunk/property/inc/class.uiadmin_entity.inc.php
    trunk/property/templates/base/admin.xsl
    trunk/property/templates/base/admin_entity.xsl

Added Paths:
-----------
    trunk/property/js/portico/admin_entity.edit.js

Modified: trunk/property/inc/class.uiadmin_entity.inc.php
===================================================================
--- trunk/property/inc/class.uiadmin_entity.inc.php     2017-02-17 09:20:25 UTC 
(rev 16331)
+++ trunk/property/inc/class.uiadmin_entity.inc.php     2017-02-17 13:37:27 UTC 
(rev 16332)
@@ -753,6 +753,7 @@
                                        'date', 'security', 'file'))
                        );
 
+                       $GLOBALS['phpgw']->js->validate_file('portico', 
'admin_entity.edit', 'property');
                        $appname = lang('entity');
 
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang($this->type_app[$this->type]) . ' - ' . $appname . ': ' . $function_msg;

Added: trunk/property/js/portico/admin_entity.edit.js
===================================================================
--- trunk/property/js/portico/admin_entity.edit.js                              
(rev 0)
+++ trunk/property/js/portico/admin_entity.edit.js      2017-02-17 13:37:27 UTC 
(rev 16332)
@@ -0,0 +1,4 @@
+this.onActionsClick = function ()
+{
+       document.form.submit();
+};

Modified: trunk/property/templates/base/admin.xsl
===================================================================
--- trunk/property/templates/base/admin.xsl     2017-02-17 09:20:25 UTC (rev 
16331)
+++ trunk/property/templates/base/admin.xsl     2017-02-17 13:37:27 UTC (rev 
16332)
@@ -1,817 +1,815 @@
 
 <!-- $Id$ -->
 <xsl:template name="app_data">
-               <xsl:choose>
-                       <xsl:when test="edit_id">
-                               <xsl:apply-templates select="edit_id"/>
-                       </xsl:when>
-                       <xsl:when test="contact_info">
-                               <xsl:apply-templates select="contact_info"/>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <xsl:apply-templates select="list_permission"/>
-                       </xsl:otherwise>
-               </xsl:choose>
+       <xsl:choose>
+               <xsl:when test="edit_id">
+                       <xsl:apply-templates select="edit_id"/>
+               </xsl:when>
+               <xsl:when test="contact_info">
+                       <xsl:apply-templates select="contact_info"/>
+               </xsl:when>
+               <xsl:otherwise>
+                       <xsl:apply-templates select="list_permission"/>
+               </xsl:otherwise>
+       </xsl:choose>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="list_permission">
-               <table class="pure-table pure-table-bordered">
+       <table class="pure-table pure-table-bordered">
+               <xsl:choose>
+                       <xsl:when test="msgbox_data != ''">
+                               <tr>
+                                       <td align="left" colspan="4">
+                                               <xsl:call-template 
name="msgbox"/>
+                                       </td>
+                               </tr>
+                       </xsl:when>
+               </xsl:choose>
+               <tr>
+                       <td>
+                               <xsl:call-template name="filter_location"/>
+                       </td>
+                       <td align="center">
+                               <xsl:call-template name="cat_filter"/>
+                       </td>
                        <xsl:choose>
-                               <xsl:when test="msgbox_data != ''">
-                                       <tr>
-                                               <td align="left" colspan="4">
-                                                       <xsl:call-template 
name="msgbox"/>
-                                               </td>
-                                       </tr>
+                               <xsl:when test="is_admin != '' and grant= 1">
+                                       <td align="center">
+                                               <xsl:call-template 
name="group_filter"/>
+                                       </td>
                                </xsl:when>
                        </xsl:choose>
-                       <tr>
-                               <td>
-                                       <xsl:call-template 
name="filter_location"/>
+                       <td align="right">
+                               <xsl:call-template name="search_field"/>
+                       </td>
+               </tr>
+               <tr>
+                       <td colspan="4" width="100%">
+                               <xsl:call-template name="nextmatchs"/>
+                       </td>
+               </tr>
+       </table>
+       <xsl:variable name="form_action">
+               <xsl:value-of select="form_action"/>
+       </xsl:variable>
+       <form method="post" action="{$form_action}">
+               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
+                       <tr height="30">
+                               <td valign="top" align="left">
+                                       <xsl:value-of 
select="lang_enable_inheritance"/>
+                                       <xsl:text>: </xsl:text>
+                                       <input type="checkbox" 
name="enable_inheritance" value="true" 
title="{lang_enable_inheritance_statustext}"/>
                                </td>
-                               <td align="center">
-                                       <xsl:call-template name="cat_filter"/>
-                               </td>
+                       </tr>
+                       <tr class="th">
                                <xsl:choose>
-                                       <xsl:when test="is_admin != '' and 
grant= 1">
-                                               <td align="center">
-                                                       <xsl:call-template 
name="group_filter"/>
+                                       <xsl:when test="values_groups!=''">
+                                               <td class="th_text" width="10%" 
align="center">
+                                                       <xsl:value-of 
select="lang_groups"/>
                                                </td>
+                                               <td>
+                                               </td>
                                        </xsl:when>
                                </xsl:choose>
-                               <td align="right">
-                                       <xsl:call-template name="search_field"/>
-                               </td>
                        </tr>
-                       <tr>
-                               <td colspan="4" width="100%">
-                                       <xsl:call-template name="nextmatchs"/>
-                               </td>
+                       <xsl:apply-templates select="values_groups"/>
+                       <tr class="th">
+                               <xsl:choose>
+                                       <xsl:when test="values_users!=''">
+                                               <td class="th_text" width="10%" 
align="center">
+                                                       <xsl:value-of 
select="lang_users"/>
+                                               </td>
+                                               <td>
+                                               </td>
+                                       </xsl:when>
+                               </xsl:choose>
                        </tr>
-               </table>
-                       <xsl:variable name="form_action">
-                               <xsl:value-of select="form_action"/>
-                       </xsl:variable>
-                       <form method="post" action="{$form_action}">
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                               <tr height="30">
-                                       <td valign="top" align="left">
-                                               <xsl:value-of 
select="lang_enable_inheritance"/>
-                                               <xsl:text>: </xsl:text>
-                                               <input type="checkbox" 
name="enable_inheritance" value="true" 
title="{lang_enable_inheritance_statustext}"/>
-                                       </td>
-                               </tr>
-                               <tr class="th">
-                                       <xsl:choose>
-                                               <xsl:when 
test="values_groups!=''">
-                                                       <td class="th_text" 
width="10%" align="center">
-                                                               <xsl:value-of 
select="lang_groups"/>
-                                                       </td>
-                                                       <td>
-                                                       </td>
-                                               </xsl:when>
-                                       </xsl:choose>
-                               </tr>
-                               <xsl:apply-templates select="values_groups"/>
-                               <tr class="th">
-                                       <xsl:choose>
-                                               <xsl:when 
test="values_users!=''">
-                                                       <td class="th_text" 
width="10%" align="center">
-                                                               <xsl:value-of 
select="lang_users"/>
-                                                       </td>
-                                                       <td>
-                                                       </td>
-                                               </xsl:when>
-                                       </xsl:choose>
-                               </tr>
-                               <xsl:apply-templates select="values_users"/>
-                               <tr height="50">
-                                       <td>
-                                               <xsl:variable name="location">
-                                                       <xsl:value-of 
select="location"/>
-                                               </xsl:variable>
-                                               <xsl:variable name="processed">
-                                                       <xsl:value-of 
select="processed"/>
-                                               </xsl:variable>
-                                               <xsl:variable name="lang_save">
-                                                       <xsl:value-of 
select="lang_save"/>
-                                               </xsl:variable>
-                                               <INPUT type="hidden" 
name="location" value="{$location}"/>
-                                               <INPUT type="hidden" 
name="processed" value="{$processed}"/>
-                                               <input type="submit" 
name="set_permission" value="{$lang_save}">
-                                                       <xsl:attribute 
name="title">
-                                                               <xsl:value-of 
select="lang_save_statustext"/>
-                                                       </xsl:attribute>
-                                               </input>
-                                       </td>
-                               </tr>
-               </table>
-                       </form>
-       <table>
-                       <tr>
+                       <xsl:apply-templates select="values_users"/>
+                       <tr height="50">
                                <td>
-                                       <xsl:variable name="done_action">
-                                               <xsl:value-of 
select="done_action"/>
+                                       <xsl:variable name="location">
+                                               <xsl:value-of 
select="location"/>
                                        </xsl:variable>
-                                       <xsl:variable name="lang_done">
-                                               <xsl:value-of 
select="lang_done"/>
+                                       <xsl:variable name="processed">
+                                               <xsl:value-of 
select="processed"/>
                                        </xsl:variable>
-                                       <form method="post" 
action="{$done_action}">
-                                               <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_statustext"/>
-                                                               <xsl:text>'; 
return true;</xsl:text>
-                                                       </xsl:attribute>
-                                               </input>
-                                       </form>
+                                       <xsl:variable name="lang_save">
+                                               <xsl:value-of 
select="lang_save"/>
+                                       </xsl:variable>
+                                       <INPUT type="hidden" name="location" 
value="{$location}"/>
+                                       <INPUT type="hidden" name="processed" 
value="{$processed}"/>
+                                       <input type="submit" 
name="set_permission" value="{$lang_save}">
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="lang_save_statustext"/>
+                                               </xsl:attribute>
+                                       </input>
                                </td>
                        </tr>
                </table>
+       </form>
+       <table>
+               <tr>
+                       <td>
+                               <xsl:variable name="done_action">
+                                       <xsl:value-of select="done_action"/>
+                               </xsl:variable>
+                               <xsl:variable name="lang_done">
+                                       <xsl:value-of select="lang_done"/>
+                               </xsl:variable>
+                               <form method="post" action="{$done_action}">
+                                       <input type="submit" name="done" 
value="{$lang_done}">
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="lang_done_statustext"/>
+                                               </xsl:attribute>
+                                       </input>
+                               </form>
+                       </td>
+               </tr>
+       </table>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="values_groups">
-               <xsl:choose>
-                       <xsl:when test="account_id !=''">
-                               <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>
-                                               <table class="pure-table 
pure-table-bordered"  width="100%" cellpadding="2" cellspacing="2" 
align="center">
+       <xsl:choose>
+               <xsl:when test="account_id !=''">
+                       <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>
+                                       <table class="pure-table 
pure-table-bordered"  width="100%" cellpadding="2" cellspacing="2" 
align="center">
                                                <thead>
                                                        <tr>
                                                                
<xsl:call-template name="value_header"/>
                                                        </tr>
                                                </thead>
-                                                       <tr>
-                                                               
<xsl:call-template name="right"/>
-                                                       </tr>
-                                                       <tr>
-                                                               
<xsl:call-template name="mask"/>
-                                                       </tr>
-                                                       <tr>
-                                                               
<xsl:call-template name="result"/>
-                                                       </tr>
-                                               </table>
-                                       </td>
-                               </tr>
-                       </xsl:when>
-               </xsl:choose>
+                                               <tr>
+                                                       <xsl:call-template 
name="right"/>
+                                               </tr>
+                                               <tr>
+                                                       <xsl:call-template 
name="mask"/>
+                                               </tr>
+                                               <tr>
+                                                       <xsl:call-template 
name="result"/>
+                                               </tr>
+                                       </table>
+                               </td>
+                       </tr>
+               </xsl:when>
+       </xsl:choose>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="values_users">
-               <xsl:choose>
-                       <xsl:when test="account_id !=''">
-                               <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>
-                                               <table class="pure-table 
pure-table-bordered"  width="100%" cellpadding="2" cellspacing="2" 
align="center">
+       <xsl:choose>
+               <xsl:when test="account_id !=''">
+                       <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>
+                                       <table class="pure-table 
pure-table-bordered"  width="100%" cellpadding="2" cellspacing="2" 
align="center">
                                                <thead>
                                                        <tr>
                                                                
<xsl:call-template name="value_header"/>
                                                        </tr>
                                                </thead>
-                                                       <tr>
-                                                               
<xsl:call-template name="right"/>
-                                                       </tr>
-                                                       <tr>
-                                                               
<xsl:call-template name="mask"/>
-                                                       </tr>
-                                                       <tr>
-                                                               
<xsl:call-template name="result"/>
-                                                       </tr>
-                                               </table>
-                                       </td>
-                               </tr>
-                       </xsl:when>
-               </xsl:choose>
+                                               <tr>
+                                                       <xsl:call-template 
name="right"/>
+                                               </tr>
+                                               <tr>
+                                                       <xsl:call-template 
name="mask"/>
+                                               </tr>
+                                               <tr>
+                                                       <xsl:call-template 
name="result"/>
+                                               </tr>
+                                       </table>
+                               </td>
+                       </tr>
+               </xsl:when>
+       </xsl:choose>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template name="value_header">
-               <td>
-               </td>
+       <td>
+       </td>
        <td align="center">
-                       <xsl:value-of select="lang_read"/>
-               </td>
+               <xsl:value-of select="lang_read"/>
+       </td>
        <td align="center">
-                       <xsl:value-of select="lang_add"/>
-               </td>
+               <xsl:value-of select="lang_add"/>
+       </td>
        <td align="center">
-                       <xsl:value-of select="lang_edit"/>
-               </td>
+               <xsl:value-of select="lang_edit"/>
+       </td>
        <td align="center">
-                       <xsl:value-of select="lang_delete"/>
-               </td>
-               <xsl:choose>
-                       <xsl:when test="//permission= 1">
+               <xsl:value-of select="lang_delete"/>
+       </td>
+       <xsl:choose>
+               <xsl:when test="//permission= 1">
                        <td align="center">
-                                       <xsl:value-of select="lang_manage"/>
-                               </td>
-                       </xsl:when>
-               </xsl:choose>
-               <xsl:choose>
+                               <xsl:value-of select="lang_manage"/>
+                       </td>
+               </xsl:when>
+       </xsl:choose>
+       <xsl:choose>
                <xsl:when test="//location='.invoice' and //permission= 1 and 
type= 'users'">
                        <td align="center">
-                                       <xsl:value-of select="lang_janitor"/>
-                               </td>
+                               <xsl:value-of select="lang_janitor"/>
+                       </td>
                        <td align="center">
-                                       <xsl:value-of select="lang_supervisor"/>
-                               </td>
+                               <xsl:value-of select="lang_supervisor"/>
+                       </td>
                        <td align="center">
-                                       <xsl:value-of 
select="lang_budget_responsible"/>
-                               </td>
+                               <xsl:value-of select="lang_budget_responsible"/>
+                       </td>
                        <td align="center">
-                                       <xsl:value-of select="lang_initials"/>
-                               </td>
-                       </xsl:when>
-               </xsl:choose>
+                               <xsl:value-of select="lang_initials"/>
+                       </td>
+               </xsl:when>
+       </xsl:choose>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template name="right">
-               <td align="left">
-                       <xsl:value-of select="lang_right"/>
-               </td>
-               <td align="center">
-                       <xsl:choose>
-                               <xsl:when test="type = 'users'">
-                                       <xsl:choose>
-                                               <xsl:when test="read_right = 
'checked'">
-                                                       <input type="checkbox" 
name="values[right][{account_id}_1]" value="1" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:when test="read_right = 
'from_group'">
-                                                       <input type="checkbox" 
name="" checked="checked" disabled="disabled"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[right][{account_id}_1]" value="1"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:choose>
-                                               <xsl:when test="read_right = 
'checked'">
-                                                       <input type="checkbox" 
name="values[right][{account_id}_1]" value="1" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:when test="read_right = 
'from_group'">
-                                                       <input type="checkbox" 
name="values[right][{account_id}_1]" value="1" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[right][{account_id}_1]" value="1"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </td>
-               <td align="center">
-                       <xsl:choose>
-                               <xsl:when test="type = 'users'">
-                                       <xsl:choose>
-                                               <xsl:when test="add_right = 
'checked'">
-                                                       <input type="checkbox" 
name="values[right][{account_id}_2]" value="2" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:when test="add_right = 
'from_group'">
-                                                       <input type="checkbox" 
name="" checked="checked" disabled="disabled"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[right][{account_id}_2]" value="2"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:choose>
-                                               <xsl:when test="add_right = 
'checked'">
-                                                       <input type="checkbox" 
name="values[right][{account_id}_2]" value="2" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:when test="add_right = 
'from_group'">
-                                                       <input type="checkbox" 
name="values[right][{account_id}_2]" value="2" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[right][{account_id}_2]" value="2"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </td>
-               <td align="center">
-                       <xsl:choose>
-                               <xsl:when test="type = 'users'">
-                                       <xsl:choose>
-                                               <xsl:when test="edit_right = 
'checked'">
-                                                       <input type="checkbox" 
name="values[right][{account_id}_4]" value="4" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:when test="edit_right = 
'from_group'">
-                                                       <input type="checkbox" 
name="" checked="checked" disabled="disabled"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[right][{account_id}_4]" value="4"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:choose>
-                                               <xsl:when test="edit_right = 
'checked'">
-                                                       <input type="checkbox" 
name="values[right][{account_id}_4]" value="4" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:when test="edit_right = 
'from_group'">
-                                                       <input type="checkbox" 
name="values[right][{account_id}_4]" value="4" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[right][{account_id}_4]" value="4"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </td>
-               <td align="center">
-                       <xsl:choose>
-                               <xsl:when test="type = 'users'">
-                                       <xsl:choose>
-                                               <xsl:when test="delete_right = 
'checked'">
-                                                       <input type="checkbox" 
name="values[right][{account_id}_8]" value="8" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:when test="delete_right = 
'from_group'">
-                                                       <input type="checkbox" 
name="" checked="checked" disabled="disabled"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[right][{account_id}_8]" value="8"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:choose>
-                                               <xsl:when test="delete_right = 
'checked'">
-                                                       <input type="checkbox" 
name="values[right][{account_id}_8]" value="8" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:when test="delete_right = 
'from_group'">
-                                                       <input type="checkbox" 
name="values[right][{account_id}_8]" value="8" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[right][{account_id}_8]" value="8"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </td>
+       <td align="left">
+               <xsl:value-of select="lang_right"/>
+       </td>
+       <td align="center">
                <xsl:choose>
-                       <xsl:when test="//permission= 1">
-                               <td align="center">
-                                       <xsl:choose>
-                                               <xsl:when test="type = 'users'">
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="manage_right = 'checked'">
-                                                                       <input 
type="checkbox" name="values[right][{account_id}_16]" value="16" 
checked="checked"/>
-                                                               </xsl:when>
-                                                               <xsl:when 
test="manage_right = 'from_group'">
-                                                                       <input 
type="checkbox" name="" checked="checked" disabled="disabled"/>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       <input 
type="checkbox" name="values[right][{account_id}_16]" value="16"/>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="manage_right = 'checked'">
-                                                                       <input 
type="checkbox" name="values[right][{account_id}_16]" value="16" 
checked="checked"/>
-                                                               </xsl:when>
-                                                               <xsl:when 
test="manage_right = 'from_group'">
-                                                                       <input 
type="checkbox" name="values[right][{account_id}_16]" value="16" 
checked="checked"/>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       <input 
type="checkbox" name="values[right][{account_id}_16]" value="16"/>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
+                       <xsl:when test="type = 'users'">
+                               <xsl:choose>
+                                       <xsl:when test="read_right = 'checked'">
+                                               <input type="checkbox" 
name="values[right][{account_id}_1]" value="1" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:when test="read_right = 
'from_group'">
+                                               <input type="checkbox" name="" 
checked="checked" disabled="disabled"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <input type="checkbox" 
name="values[right][{account_id}_1]" value="1"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
                        </xsl:when>
+                       <xsl:otherwise>
+                               <xsl:choose>
+                                       <xsl:when test="read_right = 'checked'">
+                                               <input type="checkbox" 
name="values[right][{account_id}_1]" value="1" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:when test="read_right = 
'from_group'">
+                                               <input type="checkbox" 
name="values[right][{account_id}_1]" value="1" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <input type="checkbox" 
name="values[right][{account_id}_1]" value="1"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </xsl:otherwise>
                </xsl:choose>
+       </td>
+       <td align="center">
                <xsl:choose>
-                       <xsl:when test="//location='.invoice' and //permission= 
1 and type= 'users'">
-                               <td align="center">
-                                       <xsl:choose>
-                                               <xsl:when test="janitor_right = 
'checked'">
-                                                       <INPUT type="checkbox" 
name="values[right][{account_id}_32]" value="32" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <INPUT type="checkbox" 
name="values[right][{account_id}_32]" value="32"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                               <td align="center">
-                                       <xsl:choose>
-                                               <xsl:when 
test="supervisor_right = 'checked'">
-                                                       <INPUT type="checkbox" 
name="values[right][{account_id}_64]" value="64" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <INPUT type="checkbox" 
name="values[right][{account_id}_64]" value="64"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                               <td align="center">
-                                       <xsl:choose>
-                                               <xsl:when 
test="budget_responsible_right = 'checked'">
-                                                       <INPUT type="checkbox" 
name="values[right][{account_id}_128]" value="128" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <INPUT type="checkbox" 
name="values[right][{account_id}_128]" value="128"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                               <td align="center">
-                                       <INPUT type="text" size="4" 
name="initials[{account_id}]" value="{initials}"/>
-                               </td>
+                       <xsl:when test="type = 'users'">
+                               <xsl:choose>
+                                       <xsl:when test="add_right = 'checked'">
+                                               <input type="checkbox" 
name="values[right][{account_id}_2]" value="2" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:when test="add_right = 
'from_group'">
+                                               <input type="checkbox" name="" 
checked="checked" disabled="disabled"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <input type="checkbox" 
name="values[right][{account_id}_2]" value="2"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
                        </xsl:when>
+                       <xsl:otherwise>
+                               <xsl:choose>
+                                       <xsl:when test="add_right = 'checked'">
+                                               <input type="checkbox" 
name="values[right][{account_id}_2]" value="2" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:when test="add_right = 
'from_group'">
+                                               <input type="checkbox" 
name="values[right][{account_id}_2]" value="2" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <input type="checkbox" 
name="values[right][{account_id}_2]" value="2"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </xsl:otherwise>
                </xsl:choose>
+       </td>
+       <td align="center">
+               <xsl:choose>
+                       <xsl:when test="type = 'users'">
+                               <xsl:choose>
+                                       <xsl:when test="edit_right = 'checked'">
+                                               <input type="checkbox" 
name="values[right][{account_id}_4]" value="4" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:when test="edit_right = 
'from_group'">
+                                               <input type="checkbox" name="" 
checked="checked" disabled="disabled"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <input type="checkbox" 
name="values[right][{account_id}_4]" value="4"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <xsl:choose>
+                                       <xsl:when test="edit_right = 'checked'">
+                                               <input type="checkbox" 
name="values[right][{account_id}_4]" value="4" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:when test="edit_right = 
'from_group'">
+                                               <input type="checkbox" 
name="values[right][{account_id}_4]" value="4" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <input type="checkbox" 
name="values[right][{account_id}_4]" value="4"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </xsl:otherwise>
+               </xsl:choose>
+       </td>
+       <td align="center">
+               <xsl:choose>
+                       <xsl:when test="type = 'users'">
+                               <xsl:choose>
+                                       <xsl:when test="delete_right = 
'checked'">
+                                               <input type="checkbox" 
name="values[right][{account_id}_8]" value="8" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:when test="delete_right = 
'from_group'">
+                                               <input type="checkbox" name="" 
checked="checked" disabled="disabled"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <input type="checkbox" 
name="values[right][{account_id}_8]" value="8"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <xsl:choose>
+                                       <xsl:when test="delete_right = 
'checked'">
+                                               <input type="checkbox" 
name="values[right][{account_id}_8]" value="8" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:when test="delete_right = 
'from_group'">
+                                               <input type="checkbox" 
name="values[right][{account_id}_8]" value="8" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <input type="checkbox" 
name="values[right][{account_id}_8]" value="8"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </xsl:otherwise>
+               </xsl:choose>
+       </td>
+       <xsl:choose>
+               <xsl:when test="//permission= 1">
+                       <td align="center">
+                               <xsl:choose>
+                                       <xsl:when test="type = 'users'">
+                                               <xsl:choose>
+                                                       <xsl:when 
test="manage_right = 'checked'">
+                                                               <input 
type="checkbox" name="values[right][{account_id}_16]" value="16" 
checked="checked"/>
+                                                       </xsl:when>
+                                                       <xsl:when 
test="manage_right = 'from_group'">
+                                                               <input 
type="checkbox" name="" checked="checked" disabled="disabled"/>
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                               <input 
type="checkbox" name="values[right][{account_id}_16]" value="16"/>
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="manage_right = 'checked'">
+                                                               <input 
type="checkbox" name="values[right][{account_id}_16]" value="16" 
checked="checked"/>
+                                                       </xsl:when>
+                                                       <xsl:when 
test="manage_right = 'from_group'">
+                                                               <input 
type="checkbox" name="values[right][{account_id}_16]" value="16" 
checked="checked"/>
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                               <input 
type="checkbox" name="values[right][{account_id}_16]" value="16"/>
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </td>
+               </xsl:when>
+       </xsl:choose>
+       <xsl:choose>
+               <xsl:when test="//location='.invoice' and //permission= 1 and 
type= 'users'">
+                       <td align="center">
+                               <xsl:choose>
+                                       <xsl:when test="janitor_right = 
'checked'">
+                                               <INPUT type="checkbox" 
name="values[right][{account_id}_32]" value="32" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <INPUT type="checkbox" 
name="values[right][{account_id}_32]" value="32"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </td>
+                       <td align="center">
+                               <xsl:choose>
+                                       <xsl:when test="supervisor_right = 
'checked'">
+                                               <INPUT type="checkbox" 
name="values[right][{account_id}_64]" value="64" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <INPUT type="checkbox" 
name="values[right][{account_id}_64]" value="64"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </td>
+                       <td align="center">
+                               <xsl:choose>
+                                       <xsl:when 
test="budget_responsible_right = 'checked'">
+                                               <INPUT type="checkbox" 
name="values[right][{account_id}_128]" value="128" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <INPUT type="checkbox" 
name="values[right][{account_id}_128]" value="128"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </td>
+                       <td align="center">
+                               <INPUT type="text" size="4" 
name="initials[{account_id}]" value="{initials}"/>
+                       </td>
+               </xsl:when>
+       </xsl:choose>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template name="mask">
-               <td align="left">
-                       <xsl:value-of select="lang_mask"/>
-               </td>
-               <td align="center">
-                       <xsl:choose>
-                               <xsl:when test="type = 'users'">
-                                       <xsl:choose>
-                                               <xsl:when test="read_mask = 
'checked'">
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_1]" value="1" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:when test="read_mask = 
'from_group'">
-                                                       <input type="checkbox" 
name="" checked="checked" disabled="disabled"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_1]" value="1"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:choose>
-                                               <xsl:when test="read_mask = 
'checked'">
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_1]" value="1" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:when test="read_mask = 
'from_group'">
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_1]" value="1" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_1]" value="1"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </td>
-               <td align="center">
-                       <xsl:choose>
-                               <xsl:when test="type = 'users'">
-                                       <xsl:choose>
-                                               <xsl:when test="add_mask = 
'checked'">
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_2]" value="2" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:when test="add_mask = 
'from_group'">
-                                                       <input type="checkbox" 
name="" checked="checked" disabled="disabled"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_2]" value="2"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:choose>
-                                               <xsl:when test="add_mask = 
'checked'">
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_2]" value="2" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:when test="add_mask = 
'from_group'">
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_2]" value="2" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_2]" value="2"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </td>
-               <td align="center">
-                       <xsl:choose>
-                               <xsl:when test="type = 'users'">
-                                       <xsl:choose>
-                                               <xsl:when test="edit_mask = 
'checked'">
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_4]" value="4" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:when test="edit_mask = 
'from_group'">
-                                                       <input type="checkbox" 
name="" checked="checked" disabled="disabled"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_4]" value="4"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:choose>
-                                               <xsl:when test="edit_mask = 
'checked'">
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_4]" value="4" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:when test="edit_mask = 
'from_group'">
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_4]" value="4" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_4]" value="4"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </td>
-               <td align="center">
-                       <xsl:choose>
-                               <xsl:when test="type = 'users'">
-                                       <xsl:choose>
-                                               <xsl:when test="delete_mask = 
'checked'">
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_8]" value="8" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:when test="delete_mask = 
'from_group'">
-                                                       <input type="checkbox" 
name="" checked="checked" disabled="disabled"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_8]" value="8"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:choose>
-                                               <xsl:when test="delete_mask = 
'checked'">
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_8]" value="8" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:when test="delete_mask = 
'from_group'">
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_8]" value="8" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[mask][{account_id}_8]" value="8"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </td>
+       <td align="left">
+               <xsl:value-of select="lang_mask"/>
+       </td>
+       <td align="center">
                <xsl:choose>
-                       <xsl:when test="//permission= 1">
-                               <td align="center">
-                                       <xsl:choose>
-                                               <xsl:when test="type = 'users'">
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="manage_mask = 'checked'">
-                                                                       <input 
type="checkbox" name="values[mask][{account_id}_16]" value="16" 
checked="checked"/>
-                                                               </xsl:when>
-                                                               <xsl:when 
test="manage_mask = 'from_group'">
-                                                                       <input 
type="checkbox" name="" checked="checked" disabled="disabled"/>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       <input 
type="checkbox" name="values[mask][{account_id}_16]" value="16"/>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="manage_mask = 'checked'">
-                                                                       <input 
type="checkbox" name="values[mask][{account_id}_16]" value="16" 
checked="checked"/>
-                                                               </xsl:when>
-                                                               <xsl:when 
test="manage_mask = 'from_group'">
-                                                                       <input 
type="checkbox" name="values[mask][{account_id}_16]" value="16" 
checked="checked"/>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       <input 
type="checkbox" name="values[mask][{account_id}_16]" value="16"/>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
+                       <xsl:when test="type = 'users'">
+                               <xsl:choose>
+                                       <xsl:when test="read_mask = 'checked'">
+                                               <input type="checkbox" 
name="values[mask][{account_id}_1]" value="1" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:when test="read_mask = 
'from_group'">
+                                               <input type="checkbox" name="" 
checked="checked" disabled="disabled"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <input type="checkbox" 
name="values[mask][{account_id}_1]" value="1"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
                        </xsl:when>
+                       <xsl:otherwise>
+                               <xsl:choose>
+                                       <xsl:when test="read_mask = 'checked'">
+                                               <input type="checkbox" 
name="values[mask][{account_id}_1]" value="1" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:when test="read_mask = 
'from_group'">
+                                               <input type="checkbox" 
name="values[mask][{account_id}_1]" value="1" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <input type="checkbox" 
name="values[mask][{account_id}_1]" value="1"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </xsl:otherwise>
                </xsl:choose>
+       </td>
+       <td align="center">
                <xsl:choose>
-                       <xsl:when test="//location='.invoice' and //permission= 
1 and type= 'users'">
-                               <td align="center">
-                                       <xsl:choose>
-                                               <xsl:when test="janitor_mask = 
'checked'">
-                                                       <INPUT type="checkbox" 
name="values[mask][{account_id}_32]" value="32" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <INPUT type="checkbox" 
name="values[mask][{account_id}_32]" value="32"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                               <td align="center">
-                                       <xsl:choose>
-                                               <xsl:when test="supervisor_mask 
= 'checked'">
-                                                       <INPUT type="checkbox" 
name="values[mask][{account_id}_64]" value="64" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <INPUT type="checkbox" 
name="values[mask][{account_id}_64]" value="64"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                               <td align="center">
-                                       <xsl:choose>
-                                               <xsl:when 
test="budget_responsible_mask = 'checked'">
-                                                       <INPUT type="checkbox" 
name="values[mask][{account_id}_128]" value="128" checked="checked"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <INPUT type="checkbox" 
name="values[mask][{account_id}_128]" value="128"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                               <td>
-                               </td>
+                       <xsl:when test="type = 'users'">
+                               <xsl:choose>
+                                       <xsl:when test="add_mask = 'checked'">
+                                               <input type="checkbox" 
name="values[mask][{account_id}_2]" value="2" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:when test="add_mask = 
'from_group'">
+                                               <input type="checkbox" name="" 
checked="checked" disabled="disabled"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <input type="checkbox" 
name="values[mask][{account_id}_2]" value="2"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
                        </xsl:when>
+                       <xsl:otherwise>
+                               <xsl:choose>
+                                       <xsl:when test="add_mask = 'checked'">
+                                               <input type="checkbox" 
name="values[mask][{account_id}_2]" value="2" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:when test="add_mask = 
'from_group'">
+                                               <input type="checkbox" 
name="values[mask][{account_id}_2]" value="2" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <input type="checkbox" 
name="values[mask][{account_id}_2]" value="2"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </xsl:otherwise>
                </xsl:choose>
+       </td>
+       <td align="center">
+               <xsl:choose>
+                       <xsl:when test="type = 'users'">
+                               <xsl:choose>
+                                       <xsl:when test="edit_mask = 'checked'">
+                                               <input type="checkbox" 
name="values[mask][{account_id}_4]" value="4" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:when test="edit_mask = 
'from_group'">
+                                               <input type="checkbox" name="" 
checked="checked" disabled="disabled"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <input type="checkbox" 
name="values[mask][{account_id}_4]" value="4"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <xsl:choose>
+                                       <xsl:when test="edit_mask = 'checked'">
+                                               <input type="checkbox" 
name="values[mask][{account_id}_4]" value="4" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:when test="edit_mask = 
'from_group'">
+                                               <input type="checkbox" 
name="values[mask][{account_id}_4]" value="4" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <input type="checkbox" 
name="values[mask][{account_id}_4]" value="4"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </xsl:otherwise>
+               </xsl:choose>
+       </td>
+       <td align="center">
+               <xsl:choose>
+                       <xsl:when test="type = 'users'">
+                               <xsl:choose>
+                                       <xsl:when test="delete_mask = 
'checked'">
+                                               <input type="checkbox" 
name="values[mask][{account_id}_8]" value="8" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:when test="delete_mask = 
'from_group'">
+                                               <input type="checkbox" name="" 
checked="checked" disabled="disabled"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <input type="checkbox" 
name="values[mask][{account_id}_8]" value="8"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <xsl:choose>
+                                       <xsl:when test="delete_mask = 
'checked'">
+                                               <input type="checkbox" 
name="values[mask][{account_id}_8]" value="8" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:when test="delete_mask = 
'from_group'">
+                                               <input type="checkbox" 
name="values[mask][{account_id}_8]" value="8" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <input type="checkbox" 
name="values[mask][{account_id}_8]" value="8"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </xsl:otherwise>
+               </xsl:choose>
+       </td>
+       <xsl:choose>
+               <xsl:when test="//permission= 1">
+                       <td align="center">
+                               <xsl:choose>
+                                       <xsl:when test="type = 'users'">
+                                               <xsl:choose>
+                                                       <xsl:when 
test="manage_mask = 'checked'">
+                                                               <input 
type="checkbox" name="values[mask][{account_id}_16]" value="16" 
checked="checked"/>
+                                                       </xsl:when>
+                                                       <xsl:when 
test="manage_mask = 'from_group'">
+                                                               <input 
type="checkbox" name="" checked="checked" disabled="disabled"/>
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                               <input 
type="checkbox" name="values[mask][{account_id}_16]" value="16"/>
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <xsl:choose>
+                                                       <xsl:when 
test="manage_mask = 'checked'">
+                                                               <input 
type="checkbox" name="values[mask][{account_id}_16]" value="16" 
checked="checked"/>
+                                                       </xsl:when>
+                                                       <xsl:when 
test="manage_mask = 'from_group'">
+                                                               <input 
type="checkbox" name="values[mask][{account_id}_16]" value="16" 
checked="checked"/>
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                               <input 
type="checkbox" name="values[mask][{account_id}_16]" value="16"/>
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </td>
+               </xsl:when>
+       </xsl:choose>
+       <xsl:choose>
+               <xsl:when test="//location='.invoice' and //permission= 1 and 
type= 'users'">
+                       <td align="center">
+                               <xsl:choose>
+                                       <xsl:when test="janitor_mask = 
'checked'">
+                                               <INPUT type="checkbox" 
name="values[mask][{account_id}_32]" value="32" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <INPUT type="checkbox" 
name="values[mask][{account_id}_32]" value="32"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </td>
+                       <td align="center">
+                               <xsl:choose>
+                                       <xsl:when test="supervisor_mask = 
'checked'">
+                                               <INPUT type="checkbox" 
name="values[mask][{account_id}_64]" value="64" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <INPUT type="checkbox" 
name="values[mask][{account_id}_64]" value="64"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </td>
+                       <td align="center">
+                               <xsl:choose>
+                                       <xsl:when test="budget_responsible_mask 
= 'checked'">
+                                               <INPUT type="checkbox" 
name="values[mask][{account_id}_128]" value="128" checked="checked"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <INPUT type="checkbox" 
name="values[mask][{account_id}_128]" value="128"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </td>
+                       <td>
+                       </td>
+               </xsl:when>
+       </xsl:choose>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template name="result">
-               <td align="left">
-                       <xsl:value-of select="lang_result"/>
-               </td>
-               <td align="center">
-                       <xsl:choose>
-                               <xsl:when test="read_result = 'checked'">
-                                       <INPUT type="checkbox" name="" 
checked="checked" disabled="disabled"/>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <INPUT type="checkbox" name="" 
disabled="disabled"/>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </td>
-               <td align="center">
-                       <xsl:choose>
-                               <xsl:when test="add_result = 'checked'">
-                                       <INPUT type="checkbox" name="" 
checked="checked" disabled="disabled"/>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <INPUT type="checkbox" name="" 
disabled="disabled"/>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </td>
-               <td align="center">
-                       <xsl:choose>
-                               <xsl:when test="edit_result = 'checked'">
-                                       <INPUT type="checkbox" name="" 
checked="checked" disabled="disabled"/>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <INPUT type="checkbox" name="" 
disabled="disabled"/>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </td>
-               <td align="center">
-                       <xsl:choose>
-                               <xsl:when test="delete_result = 'checked'">
-                                       <INPUT type="checkbox" name="" 
checked="checked" disabled="disabled"/>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <INPUT type="checkbox" name="" 
disabled="disabled"/>
-                               </xsl:otherwise>
-                       </xsl:choose>
-               </td>
+       <td align="left">
+               <xsl:value-of select="lang_result"/>
+       </td>
+       <td align="center">
                <xsl:choose>
-                       <xsl:when test="//permission= 1">
-                               <td align="center">
-                                       <xsl:choose>
-                                               <xsl:when test="manage_result = 
'checked'">
-                                                       <INPUT type="checkbox" 
name="" checked="checked" disabled="disabled"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <INPUT type="checkbox" 
name="" disabled="disabled"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
+                       <xsl:when test="read_result = 'checked'">
+                               <INPUT type="checkbox" name="" 
checked="checked" disabled="disabled"/>
                        </xsl:when>
+                       <xsl:otherwise>
+                               <INPUT type="checkbox" name="" 
disabled="disabled"/>
+                       </xsl:otherwise>
                </xsl:choose>
+       </td>
+       <td align="center">
                <xsl:choose>
-                       <xsl:when test="//location='.invoice' and //permission= 
1 and type= 'users'">
-                               <td align="center">
-                                       <xsl:choose>
-                                               <xsl:when test="janitor_result 
= 'checked'">
-                                                       <INPUT type="checkbox" 
name="" checked="checked" disabled="disabled"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <INPUT type="checkbox" 
name="" disabled="disabled"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                               <td align="center">
-                                       <xsl:choose>
-                                               <xsl:when 
test="supervisor_result = 'checked'">
-                                                       <INPUT type="checkbox" 
name="" checked="checked" disabled="disabled"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <INPUT type="checkbox" 
name="" disabled="disabled"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                               <td align="center">
-                                       <xsl:choose>
-                                               <xsl:when 
test="budget_responsible_result = 'checked'">
-                                                       <INPUT type="checkbox" 
name="" checked="checked" disabled="disabled"/>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <INPUT type="checkbox" 
name="" disabled="disabled"/>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </td>
-                               <td>
-                               </td>
+                       <xsl:when test="add_result = 'checked'">
+                               <INPUT type="checkbox" name="" 
checked="checked" disabled="disabled"/>
                        </xsl:when>
+                       <xsl:otherwise>
+                               <INPUT type="checkbox" name="" 
disabled="disabled"/>
+                       </xsl:otherwise>
                </xsl:choose>
-</xsl:template>
-
-<!-- edit_id -->
-<xsl:template xmlns:php="http://php.net/xsl"; match="id_values">
-               <xsl:variable name="value">
-                       <xsl:value-of select="value"/>
-               </xsl:variable>
-               <xsl:variable name="key_id">
-                       <xsl:value-of select="key_id"/>
-               </xsl:variable>
-               <xsl:variable name="descr">
-                       <xsl:value-of select="descr"/>
-               </xsl:variable>
-               <xsl:variable name="name">
-                       <xsl:value-of select="name"/>
-               </xsl:variable>
-               <tr>
-                       <xsl:attribute name="class">
+       </td>
+       <td align="center">
+               <xsl:choose>
+                       <xsl:when test="edit_result = 'checked'">
+                               <INPUT type="checkbox" name="" 
checked="checked" disabled="disabled"/>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <INPUT type="checkbox" name="" 
disabled="disabled"/>
+                       </xsl:otherwise>
+               </xsl:choose>
+       </td>
+       <td align="center">
+               <xsl:choose>
+                       <xsl:when test="delete_result = 'checked'">
+                               <INPUT type="checkbox" name="" 
checked="checked" disabled="disabled"/>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <INPUT type="checkbox" name="" 
disabled="disabled"/>
+                       </xsl:otherwise>
+               </xsl:choose>
+       </td>
+       <xsl:choose>
+               <xsl:when test="//permission= 1">
+                       <td align="center">
                                <xsl:choose>
-                                       <xsl:when test="@class">
-                                               <xsl:value-of select="@class"/>
+                                       <xsl:when test="manage_result = 
'checked'">
+                                               <INPUT type="checkbox" name="" 
checked="checked" disabled="disabled"/>
                                        </xsl:when>
-                                       <xsl:when test="position() mod 2 = 0">
-                                               <xsl:text>row_off</xsl:text>
+                                       <xsl:otherwise>
+                                               <INPUT type="checkbox" name="" 
disabled="disabled"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </td>
+               </xsl:when>
+       </xsl:choose>
+       <xsl:choose>
+               <xsl:when test="//location='.invoice' and //permission= 1 and 
type= 'users'">
+                       <td align="center">
+                               <xsl:choose>
+                                       <xsl:when test="janitor_result = 
'checked'">
+                                               <INPUT type="checkbox" name="" 
checked="checked" disabled="disabled"/>
                                        </xsl:when>
                                        <xsl:otherwise>
-                                               <xsl:text>row_on</xsl:text>
+                                               <INPUT type="checkbox" name="" 
disabled="disabled"/>
                                        </xsl:otherwise>
                                </xsl:choose>
-                       </xsl:attribute>
+                       </td>
                        <td align="center">
-                               <INPUT type="checkbox" name="values[select][]" 
value="{$name}">
-                                       <xsl:if test="old = '1'">
-                                               <xsl:attribute name="disabled">
-                                                       
<xsl:text>disabled</xsl:text>
-                                               </xsl:attribute>
-                                       </xsl:if>
-                               </INPUT>
+                               <xsl:choose>
+                                       <xsl:when test="supervisor_result = 
'checked'">
+                                               <INPUT type="checkbox" name="" 
checked="checked" disabled="disabled"/>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <INPUT type="checkbox" name="" 
disabled="disabled"/>
+                                       </xsl:otherwise>
+                               </xsl:choose>
                        </td>
-                       <td align="left">
-                               <xsl:value-of select="descr"/>
-                       </td>
-                       <td>
-                               <INPUT type="text" name="values[{$name}]" 
value="{$value}"/>
-                       </td>
-                       <td>
+                       <td align="center">
                                <xsl:choose>
-                                       <xsl:when test="old != '1'">
-                                               <input type="text" 
id="date_{$name}" name="values[start_date][{$name}]" size="10" 
value="{start_date}" readonly="readonly">
-                                                       <xsl:attribute 
name="title">
-                                                               <xsl:value-of 
select="lang_date_statustext"/>
-                                                       </xsl:attribute>
-                                               </input>
+                                       <xsl:when 
test="budget_responsible_result = 'checked'">
+                                               <INPUT type="checkbox" name="" 
checked="checked" disabled="disabled"/>
                                        </xsl:when>
                                        <xsl:otherwise>
-                                               <xsl:value-of 
select="start_date"/>
+                                               <INPUT type="checkbox" name="" 
disabled="disabled"/>
                                        </xsl:otherwise>
                                </xsl:choose>
                        </td>
-               </tr>
+                       <td>
+                       </td>
+               </xsl:when>
+       </xsl:choose>
 </xsl:template>
 
+<!-- edit_id -->
+<xsl:template xmlns:php="http://php.net/xsl"; match="id_values">
+       <xsl:variable name="value">
+               <xsl:value-of select="value"/>
+       </xsl:variable>
+       <xsl:variable name="key_id">
+               <xsl:value-of select="key_id"/>
+       </xsl:variable>
+       <xsl:variable name="descr">
+               <xsl:value-of select="descr"/>
+       </xsl:variable>
+       <xsl:variable name="name">
+               <xsl:value-of select="name"/>
+       </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="center">
+                       <INPUT type="checkbox" name="values[select][]" 
value="{$name}">
+                               <xsl:if test="old = '1'">
+                                       <xsl:attribute name="disabled">
+                                               <xsl:text>disabled</xsl:text>
+                                       </xsl:attribute>
+                               </xsl:if>
+                       </INPUT>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="descr"/>
+               </td>
+               <td>
+                       <INPUT type="text" name="values[{$name}]" 
value="{$value}"/>
+               </td>
+               <td>
+                       <xsl:choose>
+                               <xsl:when test="old != '1'">
+                                       <input type="text" id="date_{$name}" 
name="values[start_date][{$name}]" size="10" value="{start_date}" 
readonly="readonly">
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="lang_date_statustext"/>
+                                               </xsl:attribute>
+                                       </input>
+                               </xsl:when>
+                               <xsl:otherwise>
+                                       <xsl:value-of select="start_date"/>
+                               </xsl:otherwise>
+                       </xsl:choose>
+               </td>
+       </tr>
+</xsl:template>
+
 <!-- New template-->
 <xsl:template xmlns:php="http://php.net/xsl"; name="id_table_header">
        <thead>
@@ -848,46 +846,46 @@
                                        </tr>
                                </xsl:when>
                        </xsl:choose>
-                               <xsl:call-template name="id_table_header"/>
-                               <xsl:apply-templates select="id_values"/>
-                               <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_statustext"/>
-                                                       </xsl:attribute>
-                                               </input>
-                                       </td>
-                               </tr>
-               </table>
-                       </form>
-       <table>
-                       <tr>
+                       <xsl:call-template name="id_table_header"/>
+                       <xsl:apply-templates select="id_values"/>
+                       <tr height="50">
                                <td>
-                                       <xsl:variable name="done_action">
-                                               <xsl:value-of 
select="done_action"/>
+                                       <xsl:variable name="lang_save">
+                                               <xsl:value-of 
select="lang_save"/>
                                        </xsl:variable>
-                                       <xsl:variable name="lang_done">
-                                               <xsl:value-of 
select="lang_done"/>
-                                       </xsl:variable>
-                                       <form method="post" 
action="{$done_action}">
-                                               <input type="submit" 
name="done" value="{$lang_done}">
-                                                       <xsl:attribute 
name="title">
-                                                               <xsl:value-of 
select="lang_done_statustext"/>
-                                                       </xsl:attribute>
-                                               </input>
-                                       </form>
+                                       <input type="submit" 
name="values[save]" value="{$lang_save}">
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="lang_save_statustext"/>
+                                               </xsl:attribute>
+                                       </input>
                                </td>
                        </tr>
                </table>
+       </form>
+       <table>
+               <tr>
+                       <td>
+                               <xsl:variable name="done_action">
+                                       <xsl:value-of select="done_action"/>
+                               </xsl:variable>
+                               <xsl:variable name="lang_done">
+                                       <xsl:value-of select="lang_done"/>
+                               </xsl:variable>
+                               <form method="post" action="{$done_action}">
+                                       <input type="submit" name="done" 
value="{$lang_done}">
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="lang_done_statustext"/>
+                                               </xsl:attribute>
+                                       </input>
+                               </form>
+                       </td>
+               </tr>
+       </table>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="contact_info">
-               <div align="left">
+       <div align="left">
                <xsl:variable name="form_action">
                        <xsl:value-of select="form_action"/>
                </xsl:variable>
@@ -910,227 +908,227 @@
                                                <xsl:call-template 
name="user_id_filter"/>
                                        </td>
                                </tr>
-                                       <tr>
-                                               <td valign="top">
-                                                       <xsl:value-of 
select="lang_email"/>
-                                               </td>
-                                               <td>
-                                                       <input type="hidden" 
name="user_id" value="{value_user_id}"/>
-                                                       <input type="hidden" 
name="values[old_email]" value="{value_old_email}"/>
+                               <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="lang_email"/>
+                                       </td>
+                                       <td>
+                                               <input type="hidden" 
name="user_id" value="{value_user_id}"/>
+                                               <input type="hidden" 
name="values[old_email]" value="{value_old_email}"/>
                                                <input type="text" size="30" 
name="values[email]" value="{value_email}">
                                                        <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_email_statustext"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td valign="top">
-                                                       <xsl:value-of 
select="lang_phone"/>
-                                               </td>
-                                               <td>
-                                                       <input type="hidden" 
name="values[old_phone]" value="{value_old_phone}"/>
+                                                               <xsl:value-of 
select="lang_email_statustext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="lang_phone"/>
+                                       </td>
+                                       <td>
+                                               <input type="hidden" 
name="values[old_phone]" value="{value_old_phone}"/>
                                                <input type="text" size="30" 
name="values[phone]" value="{value_phone}">
                                                        <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_phone_statustext"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td valign="top">
-                                                       <xsl:value-of 
select="lang_approval_from"/>
-                                               </td>
-                                               <td align="left">
-                                                       <input type="hidden" 
name="values[old_approval_from]" value="{value_old_approval_from}"/>
-                                                       <xsl:variable 
name="lang_approval_from_statustext">
-                                                               <xsl:value-of 
select="lang_approval_from_statustext"/>
-                                                       </xsl:variable>
+                                                               <xsl:value-of 
select="lang_phone_statustext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="lang_approval_from"/>
+                                       </td>
+                                       <td align="left">
+                                               <input type="hidden" 
name="values[old_approval_from]" value="{value_old_approval_from}"/>
+                                               <xsl:variable 
name="lang_approval_from_statustext">
+                                                       <xsl:value-of 
select="lang_approval_from_statustext"/>
+                                               </xsl:variable>
                                                <select 
name="values[approval_from]" title="{$lang_approval_from_statustext}">
-                                                               <option 
value="">
-                                                                       
<xsl:value-of select="lang_no_user"/>
-                                                               </option>
-                                                               
<xsl:apply-templates select="approval_from"/>
-                                                       </select>
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td valign="top">
-                                                       <xsl:value-of 
select="lang_default_vendor_category"/>
-                                               </td>
-                                               <td align="left">
-                                                       <input type="hidden" 
name="values[old_default_vendor_category]" 
value="{value_old_default_vendor_category}"/>
-                                                       <xsl:variable 
name="lang_default_vendor_category_statustext">
-                                                               <xsl:value-of 
select="lang_default_vendor_category_statustext"/>
-                                                       </xsl:variable>
+                                                       <option value="">
+                                                               <xsl:value-of 
select="lang_no_user"/>
+                                                       </option>
+                                                       <xsl:apply-templates 
select="approval_from"/>
+                                               </select>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="lang_default_vendor_category"/>
+                                       </td>
+                                       <td align="left">
+                                               <input type="hidden" 
name="values[old_default_vendor_category]" 
value="{value_old_default_vendor_category}"/>
+                                               <xsl:variable 
name="lang_default_vendor_category_statustext">
+                                                       <xsl:value-of 
select="lang_default_vendor_category_statustext"/>
+                                               </xsl:variable>
                                                <select 
name="values[default_vendor_category]"  
title="{$lang_default_vendor_category_statustext}">
-                                                               <option 
value="">
-                                                                       
<xsl:value-of select="lang_no_cat"/>
-                                                               </option>
-                                                               
<xsl:apply-templates select="vendor_category"/>
-                                                       </select>
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td valign="top">
-                                                       <xsl:value-of 
select="lang_default_tts_category"/>
-                                               </td>
-                                               <td align="left">
-                                                       <input type="hidden" 
name="values[old_default_tts_category]" 
value="{value_old_default_tts_category}"/>
+                                                       <option value="">
+                                                               <xsl:value-of 
select="lang_no_cat"/>
+                                                       </option>
+                                                       <xsl:apply-templates 
select="vendor_category"/>
+                                               </select>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="lang_default_tts_category"/>
+                                       </td>
+                                       <td align="left">
+                                               <input type="hidden" 
name="values[old_default_tts_category]" 
value="{value_old_default_tts_category}"/>
                                                <select 
name="values[default_tts_category]" 
title="{lang_default_tts_category_statustext}">
-                                                               <option 
value="">
-                                                                       
<xsl:value-of select="lang_no_cat"/>
-                                                               </option>
-                                                               
<xsl:apply-templates select="tts_category"/>
-                                                       </select>
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td valign="top">
-                                                       <xsl:value-of 
select="lang_account_select"/>
-                                               </td>
-                                               <td align="left">
-                                                       <input type="hidden" 
name="values[old_assigntodefault]" value="{value_old_assigntodefault}"/>
-                                                       <select 
name="values[assigntodefault]" class="forms">
-                                                               <option 
value="">
-                                                                       
<xsl:value-of select="lang_no_assigntodefault"/>
-                                                               </option>
-                                                               
<xsl:apply-templates select="account_list_tts"/>
-                                                       </select>
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td valign="top">
-                                                       <xsl:value-of 
select="lang_group_select"/>
-                                               </td>
-                                               <td align="left">
-                                                       <input type="hidden" 
name="values[old_groupdefault]" value="{value_old_groupdefault}"/>
-                                                       <select 
name="values[groupdefault]" class="forms">
-                                                               <option 
value="">
-                                                                       
<xsl:value-of select="lang_no_groupdefault"/>
-                                                               </option>
-                                                               
<xsl:apply-templates select="group_list_tts"/>
-                                                       </select>
-                                               </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}">
-                                                       <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_save_statustext"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </td>
-                                       </tr>
-                       </table>
-                               </form>
-               <table>
+                                                       <option value="">
+                                                               <xsl:value-of 
select="lang_no_cat"/>
+                                                       </option>
+                                                       <xsl:apply-templates 
select="tts_category"/>
+                                               </select>
+                                       </td>
+                               </tr>
                                <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="lang_account_select"/>
+                                       </td>
+                                       <td align="left">
+                                               <input type="hidden" 
name="values[old_assigntodefault]" value="{value_old_assigntodefault}"/>
+                                               <select 
name="values[assigntodefault]" class="forms">
+                                                       <option value="">
+                                                               <xsl:value-of 
select="lang_no_assigntodefault"/>
+                                                       </option>
+                                                       <xsl:apply-templates 
select="account_list_tts"/>
+                                               </select>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td valign="top">
+                                               <xsl:value-of 
select="lang_group_select"/>
+                                       </td>
+                                       <td align="left">
+                                               <input type="hidden" 
name="values[old_groupdefault]" value="{value_old_groupdefault}"/>
+                                               <select 
name="values[groupdefault]" class="forms">
+                                                       <option value="">
+                                                               <xsl:value-of 
select="lang_no_groupdefault"/>
+                                                       </option>
+                                                       <xsl:apply-templates 
select="group_list_tts"/>
+                                               </select>
+                                       </td>
+                               </tr>
+                               <tr height="50">
                                        <td>
-                                               <xsl:variable 
name="done_action">
-                                                       <xsl:value-of 
select="done_action"/>
+                                               <xsl:variable name="lang_save">
+                                                       <xsl:value-of 
select="lang_save"/>
                                                </xsl:variable>
-                                               <xsl:variable name="lang_done">
-                                                       <xsl:value-of 
select="lang_done"/>
-                                               </xsl:variable>
-                                               <form method="post" 
action="{$done_action}">
-                                               <input type="submit" 
name="done" value="{$lang_done}">
+                                               <input type="submit" 
name="values[save]" value="{$lang_save}">
                                                        <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_done_statustext"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </form>
+                                                               <xsl:value-of 
select="lang_save_statustext"/>
+                                                       </xsl:attribute>
+                                               </input>
                                        </td>
                                </tr>
                        </table>
-               </div>
+               </form>
+               <table>
+                       <tr>
+                               <td>
+                                       <xsl:variable name="done_action">
+                                               <xsl:value-of 
select="done_action"/>
+                                       </xsl:variable>
+                                       <xsl:variable name="lang_done">
+                                               <xsl:value-of 
select="lang_done"/>
+                                       </xsl:variable>
+                                       <form method="post" 
action="{$done_action}">
+                                               <input type="submit" 
name="done" value="{$lang_done}">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_done_statustext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </form>
+                               </td>
+                       </tr>
+               </table>
+       </div>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="approval_from">
-               <xsl:variable name="user_id">
-                       <xsl:value-of select="user_id"/>
-               </xsl:variable>
-               <xsl:choose>
-                       <xsl:when test="selected">
-                               <option value="{$user_id}" selected="selected">
-                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
-                               </option>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <option value="{$user_id}">
-                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
-                               </option>
-                       </xsl:otherwise>
-               </xsl:choose>
+       <xsl:variable name="user_id">
+               <xsl:value-of select="user_id"/>
+       </xsl:variable>
+       <xsl:choose>
+               <xsl:when test="selected">
+                       <option value="{$user_id}" selected="selected">
+                               <xsl:value-of disable-output-escaping="yes" 
select="name"/>
+                       </option>
+               </xsl:when>
+               <xsl:otherwise>
+                       <option value="{$user_id}">
+                               <xsl:value-of disable-output-escaping="yes" 
select="name"/>
+                       </option>
+               </xsl:otherwise>
+       </xsl:choose>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="vendor_category">
-               <xsl:variable name="cat_id">
-                       <xsl:value-of select="cat_id"/>
-               </xsl:variable>
-               <xsl:choose>
-                       <xsl:when test="selected='selected' or selected = 1">
-                               <option value="{$cat_id}" selected="selected">
-                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
-                               </option>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <option value="{$cat_id}">
-                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
-                               </option>
-                       </xsl:otherwise>
-               </xsl:choose>
+       <xsl:variable name="cat_id">
+               <xsl:value-of select="cat_id"/>
+       </xsl:variable>
+       <xsl:choose>
+               <xsl:when test="selected='selected' or selected = 1">
+                       <option value="{$cat_id}" selected="selected">
+                               <xsl:value-of disable-output-escaping="yes" 
select="name"/>
+                       </option>
+               </xsl:when>
+               <xsl:otherwise>
+                       <option value="{$cat_id}">
+                               <xsl:value-of disable-output-escaping="yes" 
select="name"/>
+                       </option>
+               </xsl:otherwise>
+       </xsl:choose>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="tts_category">
-               <xsl:choose>
-                       <xsl:when test="selected='selected' or selected = 1">
-                               <option value="{cat_id}" selected="selected">
-                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
-                               </option>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <option value="{cat_id}">
-                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
-                               </option>
-                       </xsl:otherwise>
-               </xsl:choose>
+       <xsl:choose>
+               <xsl:when test="selected='selected' or selected = 1">
+                       <option value="{cat_id}" selected="selected">
+                               <xsl:value-of disable-output-escaping="yes" 
select="name"/>
+                       </option>
+               </xsl:when>
+               <xsl:otherwise>
+                       <option value="{cat_id}">
+                               <xsl:value-of disable-output-escaping="yes" 
select="name"/>
+                       </option>
+               </xsl:otherwise>
+       </xsl:choose>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="group_list_tts">
-               <xsl:choose>
-                       <xsl:when test="selected='1'">
-                               <option value="{id}" selected="selected">
-                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
-                               </option>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <option value="{id}">
-                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
-                               </option>
-                       </xsl:otherwise>
-               </xsl:choose>
+       <xsl:choose>
+               <xsl:when test="selected='1'">
+                       <option value="{id}" selected="selected">
+                               <xsl:value-of disable-output-escaping="yes" 
select="name"/>
+                       </option>
+               </xsl:when>
+               <xsl:otherwise>
+                       <option value="{id}">
+                               <xsl:value-of disable-output-escaping="yes" 
select="name"/>
+                       </option>
+               </xsl:otherwise>
+       </xsl:choose>
 </xsl:template>
 
 <!-- New template-->
 <xsl:template match="account_list_tts">
-               <xsl:choose>
-                       <xsl:when test="selected='1'">
-                               <option value="{id}" selected="selected">
-                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
-                               </option>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <option value="{id}">
-                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
-                               </option>
-                       </xsl:otherwise>
-               </xsl:choose>
+       <xsl:choose>
+               <xsl:when test="selected='1'">
+                       <option value="{id}" selected="selected">
+                               <xsl:value-of disable-output-escaping="yes" 
select="name"/>
+                       </option>
+               </xsl:when>
+               <xsl:otherwise>
+                       <option value="{id}">
+                               <xsl:value-of disable-output-escaping="yes" 
select="name"/>
+                       </option>
+               </xsl:otherwise>
+       </xsl:choose>
 </xsl:template>

Modified: trunk/property/templates/base/admin_entity.xsl
===================================================================
--- trunk/property/templates/base/admin_entity.xsl      2017-02-17 09:20:25 UTC 
(rev 16331)
+++ trunk/property/templates/base/admin_entity.xsl      2017-02-17 13:37:27 UTC 
(rev 16332)
@@ -41,7 +41,7 @@
 <!-- New template-->
 <xsl:template match="list">
        <xsl:apply-templates select="menu"/>
-       <table class="pure-table pure-table-bordered">
+       <table class="pure-table pure-table-bordered pure-table-striped">
                <tr>
                        <td align="right">
                                <xsl:call-template name="search_field"/>
@@ -132,7 +132,7 @@
                        <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;">
+                       <a href="{$link_categories}" 
onMouseover="window.status='{lang_category_text}';return true;">
                                <xsl:value-of select="text_categories"/>
                        </a>
                </td>
@@ -140,7 +140,7 @@
                        <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;">
+                       <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_standardtext}';return true;">
                                <xsl:value-of select="text_edit"/>
                        </a>
                </td>
@@ -148,7 +148,7 @@
                        <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;">
+                       <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_standardtext}';return true;">
                                <xsl:value-of select="text_delete"/>
                        </a>
                </td>
@@ -158,7 +158,7 @@
 <!-- New template-->
 <xsl:template match="list_category">
        <xsl:apply-templates select="menu"/>
-       <table class="pure-table pure-table-bordered">
+       <table class="pure-table pure-table-bordered pure-table-striped">
                <tr>
                        <td align="right">
                                <xsl:call-template name="search_field"/>
@@ -177,7 +177,7 @@
                        </td>
                </tr>
        </table>
-       <table class="pure-table pure-table-bordered">
+       <table class="pure-table pure-table-bordered pure-table-striped">
                <xsl:apply-templates select="table_header_category"/>
                <xsl:apply-templates select="values_category"/>
                <xsl:apply-templates select="table_add"/>
@@ -271,7 +271,7 @@
                        <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;">
+                       <a href="{$link_attribute_group}" 
onMouseover="window.status='';return true;">
                                <xsl:value-of select="text_attribute_group"/>
                        </a>
                </td>
@@ -279,7 +279,7 @@
                        <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;">
+                       <a href="{$link_attribute}" 
onMouseover="window.status='{$lang_attribute_standardtext}';return true;">
                                <xsl:value-of select="text_attribute"/>
                        </a>
                </td>
@@ -287,7 +287,7 @@
                        <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;">
+                       <a href="{$link_custom_function}" 
onMouseover="window.status='{$lang_custom_function_standardtext}';return true;">
                                <xsl:value-of select="text_custom_function"/>
                        </a>
                </td>
@@ -295,7 +295,7 @@
                        <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;">
+                       <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_standardtext}';return true;">
                                <xsl:value-of select="text_edit"/>
                        </a>
                </td>
@@ -303,7 +303,7 @@
                        <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;">
+                       <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_standardtext}';return true;">
                                <xsl:value-of select="text_delete"/>
                        </a>
                </td>
@@ -313,7 +313,7 @@
 <!-- New template-->
 <xsl:template match="list_config">
        <xsl:apply-templates select="menu"/>
-       <table class="pure-table pure-table-bordered">
+       <table class="pure-table pure-table-bordered pure-table-striped">
                <tr>
                        <td align="right">
                                <xsl:call-template name="search_field"/>
@@ -325,7 +325,7 @@
                        </td>
                </tr>
        </table>
-       <table class="pure-table pure-table-bordered">
+       <table class="pure-table pure-table-bordered pure-table-striped">
                <xsl:apply-templates select="table_header_list_config"/>
                <xsl:apply-templates select="values_list_config"/>
        </table>
@@ -385,7 +385,7 @@
                        <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;">
+                       <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_standardtext}';return true;">
                                <xsl:value-of select="text_edit"/>
                        </a>
                </td>
@@ -403,7 +403,7 @@
                                <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;">
+                               <input type="submit" name="add" 
value="{$lang_add}">
                                        <xsl:attribute name="onMouseover">
                                                
<xsl:text>window.status='</xsl:text>
                                                <xsl:value-of 
select="lang_add_standardtext"/>
@@ -420,7 +420,7 @@
                                <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;">
+                               <input type="submit" name="add" 
value="{$lang_done}">
                                        <xsl:attribute name="onMouseover">
                                                
<xsl:text>window.status='</xsl:text>
                                                <xsl:value-of 
select="lang_add_standardtext"/>
@@ -440,15 +440,15 @@
                var base_java_url = <xsl:value-of select="base_java_url"/>;
        </script>
        
-       <dl>
-               <xsl:choose>
-                       <xsl:when test="msgbox_data != ''">
+       <xsl:choose>
+               <xsl:when test="msgbox_data != ''">
+                       <dl>
                                <dt>
                                        <xsl:call-template name="msgbox"/>
                                </dt>
-                       </xsl:when>
-               </xsl:choose>
-       </dl>
+                       </dl>
+               </xsl:when>
+       </xsl:choose>
        <xsl:variable name="form_action">
                <xsl:value-of select="form_action"/>
        </xsl:variable>
@@ -456,8 +456,8 @@
                <div id="tab-content">
                        <xsl:value-of disable-output-escaping="yes" 
select="tabs"/>
                        <div id="general">
-                               <table cellpadding="2" cellspacing="2" 
width="80%" align="center">
-                                                    
+                               <fieldset>
+
                                        <div class="pure-control-group">
                                                <label>
                                                        <xsl:value-of 
select="lang_entity"/>
@@ -484,7 +484,7 @@
                                                </xsl:when>
                                        </xsl:choose>
                                        <xsl:choose>
-                                               <xsl:when test="value_id != ''">
+                                               <xsl:when test="value_id > 0">
                                                        <div 
class="pure-control-group">
                                                                <label>
                                                                        
<xsl:value-of select="php:function('lang', 'category')"/>
@@ -498,11 +498,9 @@
                                                        <xsl:value-of 
select="php:function('lang', 'name')"/>
                                                </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>
+                                               <input type="text" 
data-validation="required" name="values[name]" value="{value_name}">
+                                                       <xsl:attribute 
name="title">
                                                                <xsl:value-of 
select="lang_name_standardtext"/>
-                                                               <xsl:text>'; 
return true;</xsl:text>
                                                        </xsl:attribute>
                                                </input>
                                                                
@@ -511,11 +509,9 @@
                                                <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>
+                                               <textarea cols="60" rows="10" 
name="values[descr]">
+                                                       <xsl:attribute 
name="title">
                                                                <xsl:value-of 
select="lang_descr_standardtext"/>
-                                                               <xsl:text>'; 
return true;</xsl:text>
                                                        </xsl:attribute>
                                                        <xsl:value-of 
select="value_descr"/>
                                                </textarea>
@@ -528,20 +524,16 @@
                                                                </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>
+                                                                               
<input type="checkbox" name="values[location_form]" value="1" checked="checked">
+                                                                               
        <xsl:attribute name="title">
                                                                                
                <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>
+                                                                               
<input type="checkbox" name="values[location_form]" value="1">
+                                                                               
        <xsl:attribute name="title">
                                                                                
                <xsl:value-of select="lang_location_form_statustext"/>
-                                                                               
                <xsl:text>'; return true;</xsl:text>
                                                                                
        </xsl:attribute>
                                                                                
</input>
                                                                        
</xsl:otherwise>
@@ -557,20 +549,16 @@
                                                                </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>
+                                                                               
<input type="checkbox" name="values[documentation]" value="1" checked="checked">
+                                                                               
        <xsl:attribute name="title">
                                                                                
                <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>
+                                                                               
<input type="checkbox" name="values[documentation]" value="1">
+                                                                               
        <xsl:attribute name="title">
                                                                                
                <xsl:value-of select="lang_documentation_statustext"/>
-                                                                               
                <xsl:text>'; return true;</xsl:text>
                                                                                
        </xsl:attribute>
                                                                                
</input>
                                                                        
</xsl:otherwise>
@@ -579,44 +567,14 @@
                                                </xsl:when>
                                        </xsl:choose>
                                        <xsl:choose>
-                                               <xsl:when 
test="value_location_form = 1">
-                                                       <tr>
-                                                               <td 
valign="top">
-                                                                       
<xsl:value-of select="lang_include_in_location_form"/>
-                                                               </td>
-                                                               <td>
-                                                                       
<xsl:call-template name="include_list"/>
-                                                               </td>
-                                                       </tr>
-                                                       <tr>
-                                                               <td 
valign="top">
-                                                                       
<xsl:value-of select="lang_include_this_entity"/>
-                                                               </td>
-                                                               <td>
-                                                                       
<xsl:call-template name="include_list_2"/>
-                                                               </td>
-                                                       </tr>
-                                                       <tr>
-                                                               <td 
valign="top">
-                                                                       
<xsl:value-of select="lang_start_this_entity"/>
-                                                               </td>
-                                                               <td>
-                                                                       
<xsl:call-template name="include_list_3"/>
-                                                               </td>
-                                                       </tr>
-                                               </xsl:when>
-                                       </xsl:choose>
-                                       <xsl:choose>
                                                <xsl:when test="edit_prefix != 
''">
                                                        <div 
class="pure-control-group">
                                                                <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>
+                                                               <input 
type="text" name="values[prefix]" value="{value_prefix}">
+                                                                       
<xsl:attribute name="title">
                                                                                
<xsl:value-of select="lang_prefix_standardtext"/>
-                                                                               
<xsl:text>'; return true;</xsl:text>
                                                                        
</xsl:attribute>
                                                                </input>
                                                        </div>
@@ -791,7 +749,7 @@
                                                                        
<xsl:text>checked</xsl:text>
                                                                </xsl:attribute>
                                                        </xsl:if>
-                                                       <xsl:if 
test="value_is_eav = '1' or value_id != ''">
+                                                       <xsl:if 
test="value_is_eav = '1' or value_id > 0">
                                                                <xsl:attribute 
name="disabled">
                                                                        
<xsl:text>disabled</xsl:text>
                                                                </xsl:attribute>
@@ -845,10 +803,10 @@
                                                                <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;">
+                                                               <select 
name="values[location_level]" class="forms">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="lang_location_level_statustext"/>
+                                                                       
</xsl:attribute>
                                                                        <option 
value="">
                                                                                
<xsl:value-of select="lang_no_location_level"/>
                                                                        
</option>
@@ -883,6 +841,35 @@
                                                </select>
                                        </div>
                                        <xsl:choose>
+                                               <xsl:when 
test="value_location_form = 1">
+                                                       <div 
class="pure-control-group">
+                                                               <label>
+                                                                       
<xsl:value-of select="lang_include_in_location_form"/>
+                                                               </label>
+                                                               <div 
class="pure-custom" >
+                                                                       
<xsl:call-template name="include_list"/>
+                                                               </div>
+                                                       </div>
+                                                       <div 
class="pure-control-group">
+                                                               <label>
+                                                                       
<xsl:value-of select="lang_include_this_entity"/>
+                                                               </label>
+                                                               <div 
class="pure-custom" >
+                                                                       
<xsl:call-template name="include_list_2"/>
+                                                               </div>
+                                                       </div>
+                                                       <div 
class="pure-control-group">
+                                                               <label>
+                                                                       
<xsl:value-of select="lang_start_this_entity"/>
+                                                               </label>
+                                                               <div 
class="pure-custom" >
+                                                                       
<xsl:call-template name="include_list_3"/>
+                                                               </div>
+                                                       </div>
+                                               </xsl:when>
+                                       </xsl:choose>
+
+                                       <xsl:choose>
                                                <xsl:when test="category_list 
!= '' and value_id = ''">
                                                        <div 
class="pure-control-group">
                                                                <label>
@@ -914,16 +901,14 @@
                                                        </div>
                                                </xsl:when>
                                        </xsl:choose>
-                                       <tr height="50">
-                                               <td>
-                                                       <input type="button" 
class="pure-button pure-button-primary" name="values[save]" value="{lang_save}" 
onClick="onActionsClick();">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="php:function('lang', 'save')"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </td>
-                                       </tr>
-                               </table>
+                                       <div class="pure-controls">
+                                               <input type="button" 
class="pure-button pure-button-primary" name="values[save]" value="{lang_save}" 
onClick="onActionsClick();">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="php:function('lang', 'save')"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </div>
+                               </fieldset>
                        </div>
                </div>
        </form>
@@ -937,11 +922,13 @@
                                        <xsl:value-of select="lang_done"/>
                                </xsl:variable>
                                <form method="post" action="{$done_action}">
-                                       <input type="submit" class="pure-button 
pure-button-primary" name="done" value="{$lang_done}">
-                                               <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="lang_done_standardtext"/>
-                                               </xsl:attribute>
-                                       </input>
+                                       <div class="pure-controls">
+                                               <input type="submit" 
class="pure-button pure-button-primary" name="done" value="{$lang_done}">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_done_standardtext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </div>
                                </form>
                        </td>
                </tr>
@@ -950,7 +937,7 @@
 
 <!-- list attribute -->
 <xsl:template match="list_attribute">
-       <table class="pure-table pure-table-bordered">
+       <table class="pure-table pure-table-bordered pure-table-striped">
                <tr>
                        <td align="right">
                                <xsl:call-template name="search_field"/>
@@ -976,7 +963,7 @@
                        </td>
                </tr>
        </table>
-       <table class="pure-table pure-table-bordered">
+       <table class="pure-table pure-table-bordered pure-table-striped">
                <xsl:apply-templates select="table_header_attrib"/>
                <xsl:apply-templates select="values_attrib"/>
                <xsl:apply-templates select="table_add"/>
@@ -1064,7 +1051,7 @@
                        <xsl:value-of select="attrib_group"/>
                </td>
                <td>
-                       <table class="pure-table pure-table-bordered">
+                       <table class="pure-table pure-table-bordered 
pure-table-striped">
                                <tr>
                                        <td>
                                                <xsl:value-of select="sorting"/>
@@ -1073,7 +1060,7 @@
                                                <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;">
+                                               <a href="{$link_up}" 
onMouseover="window.status='{$lang_up_text}';return true;">
                                                        <xsl:value-of 
select="text_up"/>
                                                </a>
                                                <xsl:text> | </xsl:text>
@@ -1080,7 +1067,7 @@
                                                <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;">
+                                               <a href="{$link_down}" 
onMouseover="window.status='{$lang_down_text}';return true;">
                                                        <xsl:value-of 
select="text_down"/>
                                                </a>
                                        </td>
@@ -1094,7 +1081,7 @@
                        <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;">
+                       <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_text}';return true;">
                                <xsl:value-of select="text_edit"/>
                        </a>
                </td>
@@ -1102,7 +1089,7 @@
                        <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;">
+                       <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_text}';return true;">
                                <xsl:value-of select="text_delete"/>
                        </a>
                </td>
@@ -1112,7 +1099,7 @@
 <!-- New template-->
 <!-- list attribute_group -->
 <xsl:template match="list_attribute_group">
-       <table class="pure-table pure-table-bordered">
+       <table class="pure-table pure-table-bordered pure-table-striped">
                <tr>
                        <td align="right">
                                <xsl:call-template name="search_field"/>
@@ -1220,7 +1207,7 @@
                                                <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;">
+                                               <a href="{$link_up}" 
onMouseover="window.status='{$lang_up_text}';return true;">
                                                        <xsl:value-of 
select="text_up"/>
                                                </a>
                                                <xsl:text> | </xsl:text>
@@ -1227,7 +1214,7 @@
                                                <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;">
+                                               <a href="{$link_down}" 
onMouseover="window.status='{$lang_down_text}';return true;">
                                                        <xsl:value-of 
select="text_down"/>
                                                </a>
                                        </td>
@@ -1238,7 +1225,7 @@
                        <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;">
+                       <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_text}';return true;">
                                <xsl:value-of select="text_edit"/>
                        </a>
                </td>
@@ -1246,7 +1233,7 @@
                        <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;">
+                       <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_text}';return true;">
                                <xsl:value-of select="text_delete"/>
                        </a>
                </td>
@@ -1319,7 +1306,7 @@
                                        <label>
                                                <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;">
+                                       <input type="text" 
data-validation="required" name="values[group_name]" value="{value_group_name}" 
maxlength="100">
                                                <xsl:attribute 
name="onMouseover">
                                                        
<xsl:text>window.status='</xsl:text>
                                                        <xsl:value-of 
select="lang_group_name_statustext"/>
@@ -1331,7 +1318,7 @@
                                        <label>
                                                <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;">
+                                       <input type="text" 
data-validation="required" name="values[descr]" value="{value_descr}" size="60" 
maxlength="150">
                                                <xsl:attribute 
name="onMouseover">
                                                        
<xsl:text>window.status='</xsl:text>
                                                        <xsl:value-of 
select="lang_descr_statustext"/>
@@ -1343,7 +1330,7 @@
                                        <label>
                                                <xsl:value-of 
select="lang_remark"/>
                                        </label>
-                                       <textarea cols="60" rows="10" 
name="values[remark]" onMouseout="window.status='';return true;">
+                                       <textarea cols="60" rows="10" 
name="values[remark]">
                                                <xsl:attribute 
name="onMouseover">
                                                        
<xsl:text>window.status='</xsl:text>
                                                        <xsl:value-of 
select="lang_remark_statustext"/>
@@ -1356,7 +1343,7 @@
                                        <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;">
+                                       <input type="submit" class="pure-button 
pure-button-primary" name="values[save]" value="{$lang_save}">
                                                <xsl:attribute 
name="onMouseover">
                                                        
<xsl:text>window.status='</xsl:text>
                                                        <xsl:value-of 
select="lang_save_attribtext"/>
@@ -1375,7 +1362,7 @@
                        <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;">
+                       <input type="submit" class="pure-button 
pure-button-primary" name="done" value="{$lang_done}">
                                <xsl:attribute name="onMouseover">
                                        <xsl:text>window.status='</xsl:text>
                                        <xsl:value-of 
select="lang_done_attribtext"/>
@@ -1729,7 +1716,7 @@
 
 <!-- list custom_function -->
 <xsl:template match="list_custom_function">
-       <table class="pure-table pure-table-bordered">
+       <table class="pure-table pure-table-bordered pure-table-striped">
                <tr>
                        <td align="right">
                                <xsl:call-template name="search_field"/>
@@ -1847,7 +1834,7 @@
                                                <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;">
+                                               <a href="{$link_up}" 
onMouseover="window.status='{$lang_up_text}';return true;">
                                                        <xsl:value-of 
select="text_up"/>
                                                </a>
                                                <xsl:text> | </xsl:text>
@@ -1854,7 +1841,7 @@
                                                <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;">
+                                               <a href="{$link_down}" 
onMouseover="window.status='{$lang_down_text}';return true;">
                                                        <xsl:value-of 
select="text_down"/>
                                                </a>
                                        </td>
@@ -1865,7 +1852,7 @@
                        <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;">
+                       <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_text}';return true;">
                                <xsl:value-of select="text_edit"/>
                        </a>
                </td>
@@ -1873,7 +1860,7 @@
                        <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;">
+                       <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_text}';return true;">
                                <xsl:value-of select="text_delete"/>
                        </a>
                </td>
@@ -1930,7 +1917,7 @@
                                                <label>
                                                        <xsl:value-of 
select="lang_descr"/>
                                                </label>
-                                               <textarea cols="60" rows="10" 
name="values[descr]" onMouseout="window.status='';return true;">
+                                               <textarea cols="60" rows="10" 
name="values[descr]">
                                                        <xsl:attribute 
name="onMouseover">
                                                                
<xsl:text>window.status='</xsl:text>
                                                                <xsl:value-of 
select="lang_descr_custom_functiontext"/>
@@ -1946,7 +1933,7 @@
                                                <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;">
+                                               <select 
name="values[custom_function_file]" class="forms" 
onMouseover="window.status='{$lang_custom_function_statustext}'; return true;">
                                                        <option value="">
                                                                <xsl:value-of 
select="lang_no_custom_function"/>
                                                        </option>
@@ -1959,7 +1946,7 @@
                                                </label>
                                                <xsl:choose>
                                                        <xsl:when 
test="value_active = 1">
-                                                               <input 
type="checkbox" name="values[active]" value="1" checked="checked" 
onMouseout="window.status='';return true;">
+                                                               <input 
type="checkbox" name="values[active]" value="1" checked="checked">
                                                                        
<xsl:attribute name="onMouseover">
                                                                                
<xsl:text>window.status='</xsl:text>
                                                                                
<xsl:value-of select="lang_active_statustext"/>
@@ -1968,7 +1955,7 @@
                                                                </input>
                                                        </xsl:when>
                                                        <xsl:otherwise>
-                                                               <input 
type="checkbox" name="values[active]" value="1" 
onMouseout="window.status='';return true;">
+                                                               <input 
type="checkbox" name="values[active]" value="1">
                                                                        
<xsl:attribute name="onMouseover">
                                                                                
<xsl:text>window.status='</xsl:text>
                                                                                
<xsl:value-of select="lang_active_statustext"/>
@@ -1997,7 +1984,7 @@
                                                <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;">
+                                               <input type="submit" 
class="pure-button pure-button-primary" name="values[save]" 
value="{$lang_save}">
                                                        <xsl:attribute 
name="onMouseover">
                                                                
<xsl:text>window.status='</xsl:text>
                                                                <xsl:value-of 
select="lang_save_custom_functiontext"/>
@@ -2015,7 +2002,7 @@
                                                <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;">
+                                               <input type="submit" 
class="pure-button pure-button-primary" name="done" value="{$lang_done}">
                                                        <xsl:attribute 
name="onMouseover">
                                                                
<xsl:text>window.status='</xsl:text>
                                                                <xsl:value-of 
select="lang_done_custom_functiontext"/>
@@ -2148,7 +2135,7 @@
        <xsl:variable name="lang_delete_title">
                <xsl:value-of select="php:function('lang', 'delete this value 
from the list of multiple choice')"/>
        </xsl:variable>
-       <table class="pure-table pure-table-bordered">
+       <table class="pure-table pure-table-bordered pure-table-striped">
                <thead>
                        <tr>
                                <th width="5%" align="left">
@@ -2245,7 +2232,7 @@
 
 <!-- New template-->
 <xsl:template name="include_list">
-       <table class="pure-table pure-table-bordered">
+       <table class="pure-table pure-table-bordered pure-table-striped">
                <tr class="th">
                        <td class="th_text" width="85%" align="left">
                                <xsl:value-of select="lang_name"/>
@@ -2256,19 +2243,6 @@
                </tr>
                <xsl:for-each select="include_list">
                        <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>
@@ -2275,20 +2249,16 @@
                                <td align="center">
                                        <xsl:choose>
                                                <xsl:when 
test="selected='selected' or selected = 1">
-                                                       <input type="checkbox" 
name="values[lookup_entity][]" value="{id}" checked="checked" 
onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
+                                                       <input type="checkbox" 
name="values[lookup_entity][]" value="{id}" checked="checked">
+                                                               <xsl:attribute 
name="title">
                                                                        
<xsl:value-of select="//lang_include_statustext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
                                                                </xsl:attribute>
                                                        </input>
                                                </xsl:when>
                                                <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[lookup_entity][]" value="{id}" onMouseout="window.status='';return 
true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
+                                                       <input type="checkbox" 
name="values[lookup_entity][]" value="{id}">
+                                                               <xsl:attribute 
name="title">
                                                                        
<xsl:value-of select="//lang_include_statustext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
                                                                </xsl:attribute>
                                                        </input>
                                                </xsl:otherwise>
@@ -2301,7 +2271,7 @@
 
 <!-- New template-->
 <xsl:template name="include_list_2">
-       <table class="pure-table pure-table-bordered">
+       <table class="pure-table pure-table-bordered pure-table-striped">
                <tr class="th">
                        <td class="th_text" width="85%" align="left">
                                <xsl:value-of select="lang_name"/>
@@ -2312,19 +2282,6 @@
                </tr>
                <xsl:for-each select="include_list_2">
                        <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>
@@ -2331,20 +2288,16 @@
                                <td align="center">
                                        <xsl:choose>
                                                <xsl:when 
test="selected='selected' or selected = 1">
-                                                       <input type="checkbox" 
name="values[include_entity_for][]" value="{id}" checked="checked" 
onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
+                                                       <input type="checkbox" 
name="values[include_entity_for][]" value="{id}" checked="checked">
+                                                               <xsl:attribute 
name="title">
                                                                        
<xsl:value-of select="//lang_include_2_statustext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
                                                                </xsl:attribute>
                                                        </input>
                                                </xsl:when>
                                                <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[include_entity_for][]" value="{id}" 
onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
+                                                       <input type="checkbox" 
name="values[include_entity_for][]" value="{id}">
+                                                               <xsl:attribute 
name="title">
                                                                        
<xsl:value-of select="//lang_include_2_statustext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
                                                                </xsl:attribute>
                                                        </input>
                                                </xsl:otherwise>
@@ -2357,7 +2310,7 @@
 
 <!-- New template-->
 <xsl:template name="include_list_3">
-       <table class="pure-table pure-table-bordered">
+       <table class="pure-table pure-table-bordered pure-table-striped">
                <tr class="th">
                        <td class="th_text" width="85%" align="left">
                                <xsl:value-of select="lang_name"/>
@@ -2368,19 +2321,6 @@
                </tr>
                <xsl:for-each select="include_list_3">
                        <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>
@@ -2387,15 +2327,13 @@
                                <td align="center">
                                        <xsl:choose>
                                                <xsl:when 
test="selected='selected' or selected = 1">
-                                                       <input type="checkbox" 
name="values[start_entity_from][]" value="{id}" checked="checked" 
onMouseout="window.status='';return true;">
+                                                       <input type="checkbox" 
name="values[start_entity_from][]" value="{id}" checked="checked">
                                                        </input>
                                                </xsl:when>
                                                <xsl:otherwise>
-                                                       <input type="checkbox" 
name="values[start_entity_from][]" value="{id}" 
onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
+                                                       <input type="checkbox" 
name="values[start_entity_from][]" value="{id}">
+                                                               <xsl:attribute 
name="title">
                                                                        
<xsl:value-of select="//lang_include_3_statustext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
                                                                </xsl:attribute>
                                                        </input>
                                                </xsl:otherwise>




reply via email to

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