fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [8437] property: formatting


From: Sigurd Nes
Subject: [Fmsystem-commits] [8437] property: formatting
Date: Mon, 26 Dec 2011 19:11:48 +0000

Revision: 8437
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8437
Author:   sigurdne
Date:     2011-12-26 19:11:48 +0000 (Mon, 26 Dec 2011)
Log Message:
-----------
property: formatting

Modified Paths:
--------------
    trunk/property/templates/base/abook_form.xsl
    trunk/property/templates/base/abook_view.xsl
    trunk/property/templates/base/admin.xsl
    trunk/property/templates/base/admin_entity.xsl
    trunk/property/templates/base/admin_location.xsl
    trunk/property/templates/base/agreement.xsl
    trunk/property/templates/base/alarm.xsl
    trunk/property/templates/base/alarm_form.xsl
    trunk/property/templates/base/alarm_view.xsl
    trunk/property/templates/base/app_data.xsl
    trunk/property/templates/base/app_delete.xsl
    trunk/property/templates/base/async.xsl
    trunk/property/templates/base/attrib_history.xsl
    trunk/property/templates/base/attributes_form.xsl
    trunk/property/templates/base/attributes_view.xsl
    trunk/property/templates/base/b_account_form.xsl
    trunk/property/templates/base/b_account_view.xsl
    trunk/property/templates/base/branch_select.xsl
    trunk/property/templates/base/budget.xsl
    trunk/property/templates/base/building_part_select.xsl
    trunk/property/templates/base/calendar_info.xsl
    trunk/property/templates/base/cat_filter.xsl
    trunk/property/templates/base/cat_select.xsl
    trunk/property/templates/base/cat_sub_select.xsl
    trunk/property/templates/base/chapter_filter.xsl
    trunk/property/templates/base/chapter_select.xsl
    trunk/property/templates/base/choice.xsl
    trunk/property/templates/base/columns.xsl
    trunk/property/templates/base/confirm_custom.xsl
    trunk/property/templates/base/contact_form.xsl
    trunk/property/templates/base/contact_view.xsl
    trunk/property/templates/base/custom.xsl
    trunk/property/templates/base/date_search.xsl
    trunk/property/templates/base/dim_d_select.xsl
    trunk/property/templates/base/document.xsl
    trunk/property/templates/base/ecodimb_form.xsl
    trunk/property/templates/base/ecodimb_view.xsl
    trunk/property/templates/base/entity.xsl
    trunk/property/templates/base/event.xsl
    trunk/property/templates/base/event_form.xsl
    trunk/property/templates/base/event_schedule.xsl
    trunk/property/templates/base/event_schedule_week.xsl
    trunk/property/templates/base/event_view.xsl
    trunk/property/templates/base/files.xsl
    trunk/property/templates/base/fileuploader.xsl
    trunk/property/templates/base/filter_district.xsl
    trunk/property/templates/base/filter_filter.xsl
    trunk/property/templates/base/filter_location.xsl
    trunk/property/templates/base/filter_member_of.xsl
    trunk/property/templates/base/filter_part_of_town.xsl
    trunk/property/templates/base/filter_permission.xsl
    trunk/property/templates/base/filter_select.xsl
    trunk/property/templates/base/filter_submodule.xsl
    trunk/property/templates/base/filter_vendor.xsl
    trunk/property/templates/base/gab.xsl
    trunk/property/templates/base/generic.xsl
    trunk/property/templates/base/group_filter.xsl
    trunk/property/templates/base/group_select.xsl
    trunk/property/templates/base/grouping_select.xsl
    trunk/property/templates/base/help_data.xsl
    trunk/property/templates/base/hour_data_view.xsl
    trunk/property/templates/base/ifc.xsl
    trunk/property/templates/base/import.xsl
    trunk/property/templates/base/investment.xsl
    trunk/property/templates/base/invoice.xsl
    trunk/property/templates/base/invoice_reporting.xsl
    trunk/property/templates/base/jasper.xsl
    trunk/property/templates/base/location.xsl
    trunk/property/templates/base/location_form.xsl
    trunk/property/templates/base/location_view.xsl
    trunk/property/templates/base/lookup.xsl
    trunk/property/templates/base/menu.xsl
    trunk/property/templates/base/migrate.xsl
    trunk/property/templates/base/nextmatchs.xsl
    trunk/property/templates/base/no_access.xsl
    trunk/property/templates/base/owner_filter.xsl
    trunk/property/templates/base/owner_select.xsl
    trunk/property/templates/base/pricebook.xsl
    trunk/property/templates/base/project.xsl
    trunk/property/templates/base/project_group_form.xsl
    trunk/property/templates/base/project_group_view.xsl
    trunk/property/templates/base/receipt.xsl
    trunk/property/templates/base/request.xsl
    trunk/property/templates/base/responsible.xsl
    trunk/property/templates/base/s_agreement.xsl
    trunk/property/templates/base/search_field.xsl
    trunk/property/templates/base/search_field_grouped.xsl
    trunk/property/templates/base/select_district.xsl
    trunk/property/templates/base/select_location.xsl
    trunk/property/templates/base/select_multi_user.xsl
    trunk/property/templates/base/select_part_of_town.xsl
    trunk/property/templates/base/select_permission.xsl
    trunk/property/templates/base/select_submodule.xsl
    trunk/property/templates/base/select_vendor.xsl
    trunk/property/templates/base/status_filter.xsl
    trunk/property/templates/base/status_select.xsl
    trunk/property/templates/base/table_header.xsl
    trunk/property/templates/base/template.xsl
    trunk/property/templates/base/tenant_claim.xsl
    trunk/property/templates/base/tenant_form.xsl
    trunk/property/templates/base/tenant_view.xsl
    trunk/property/templates/base/tolerance_select.xsl
    trunk/property/templates/base/tts.xsl
    trunk/property/templates/base/unit_select.xsl
    trunk/property/templates/base/user_id_filter.xsl
    trunk/property/templates/base/user_id_select.xsl
    trunk/property/templates/base/user_lid_filter.xsl
    trunk/property/templates/base/user_lid_select.xsl
    trunk/property/templates/base/values.xsl
    trunk/property/templates/base/vendor_form.xsl
    trunk/property/templates/base/vendor_view.xsl
    trunk/property/templates/base/wo_hour.xsl
    trunk/property/templates/base/wo_hour_cat_filter.xsl
    trunk/property/templates/base/wo_hour_cat_select.xsl
    trunk/property/templates/base/workorder.xsl
    trunk/property/templates/base/yui_property_i18n.xsl

Modified: trunk/property/templates/base/abook_form.xsl
===================================================================
--- trunk/property/templates/base/abook_form.xsl        2011-12-25 20:48:28 UTC 
(rev 8436)
+++ trunk/property/templates/base/abook_form.xsl        2011-12-26 19:11:48 UTC 
(rev 8437)
@@ -1,21 +1,22 @@
-<!-- $Id$ -->
-
+  <!-- $Id$ -->
        <xsl:template name="abook_form">
                <xsl:apply-templates select="abook_data"/>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template match="abook_data">
                <script type="text/javascript">
                        self.name="first_Window";
                        function abook_lookup()
                        {
                                Window1=window.open('<xsl:value-of 
select="abook_link"/>',"Search","left=50,top=100,width=800,height=700,toolbar=no,scrollbars=yes,resizable=yes");
-                       }               
+                       }
                </script>
-
                <tr>
                        <td valign="top">
-                               <a href="javascript:abook_lookup()" 
onMouseover="window.status='{lang_select_abook_help}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="lang_contact"/></a>
+                               <a href="javascript:abook_lookup()" 
onMouseover="window.status='{lang_select_abook_help}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="lang_contact"/>
+                               </a>
                        </td>
                        <td>
                                <input size="5" type="text" name="vendor_id" 
value="{value_abid}" onClick="vendor_lookup();" readonly="readonly">
@@ -23,12 +24,11 @@
                                                <xsl:value-of 
select="lang_select_contact_help"/>
                                        </xsl:attribute>
                                </input>
-                               <input size="30" type="text" name="vendor_name" 
value="{value_contact_name}" onClick="abook_lookup();" readonly="readonly"> 
+                               <input size="30" type="text" name="vendor_name" 
value="{value_contact_name}" onClick="abook_lookup();" readonly="readonly">
                                        <xsl:attribute name="title">
                                                <xsl:value-of 
select="lang_select_contact_help"/>
                                        </xsl:attribute>
                                </input>
                        </td>
                </tr>
-
        </xsl:template>

Modified: trunk/property/templates/base/abook_view.xsl
===================================================================
--- trunk/property/templates/base/abook_view.xsl        2011-12-25 20:48:28 UTC 
(rev 8436)
+++ trunk/property/templates/base/abook_view.xsl        2011-12-26 19:11:48 UTC 
(rev 8437)
@@ -1,9 +1,9 @@
-<!-- $Id$ -->
-
+  <!-- $Id$ -->
        <xsl:template name="abook_view">
                <xsl:apply-templates select="abook_data"/>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template match="abook_data">
                <tr>
                        <td valign="top">

Modified: trunk/property/templates/base/admin.xsl
===================================================================
--- trunk/property/templates/base/admin.xsl     2011-12-25 20:48:28 UTC (rev 
8436)
+++ trunk/property/templates/base/admin.xsl     2011-12-26 19:11:48 UTC (rev 
8437)
@@ -1,5 +1,4 @@
-<!-- $Id$ -->
-
+  <!-- $Id$ -->
        <xsl:template name="app_data">
                <xsl:choose>
                        <xsl:when test="edit_id">
@@ -14,6 +13,7 @@
                </xsl:choose>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template match="list_permission">
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <xsl:choose>
@@ -32,7 +32,6 @@
                                <td align="center">
                                        <xsl:call-template name="cat_filter"/>
                                </td>
-
                                <xsl:choose>
                                        <xsl:when test="is_admin != '' and 
grant= 1">
                                                <td align="center">
@@ -51,7 +50,9 @@
                        </tr>
                </table>
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                       <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
+                       <xsl:variable name="form_action">
+                               <xsl:value-of select="form_action"/>
+                       </xsl:variable>
                        <form method="post" action="{$form_action}">
                                <tr height="30">
                                        <td valign="top" align="left">
@@ -84,15 +85,19 @@
                                        </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>
+                                               <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}" onMouseout="window.status='';return 
true;">
                                                        <xsl:attribute 
name="onMouseover">
                                                                
<xsl:text>window.status='</xsl:text>
@@ -100,14 +105,17 @@
                                                                <xsl:text>'; 
return true;</xsl:text>
                                                        </xsl:attribute>
                                                </input>
-
                                        </td>
                                </tr>
                        </form>
                        <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>
+                                       <xsl:variable name="done_action">
+                                               <xsl:value-of 
select="done_action"/>
+                                       </xsl:variable>
+                                       <xsl:variable name="lang_done">
+                                               <xsl:value-of 
select="lang_done"/>
+                                       </xsl:variable>
                                        <form method="post" 
action="{$done_action}">
                                                <input type="submit" 
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
                                                        <xsl:attribute 
name="onMouseover">
@@ -120,10 +128,9 @@
                                </td>
                        </tr>
                </table>
-
        </xsl:template>
 
-
+       <!-- New template-->
        <xsl:template match="values_groups">
                <xsl:choose>
                        <xsl:when test="account_id !=''">
@@ -141,7 +148,6 @@
                                                        </xsl:otherwise>
                                                </xsl:choose>
                                        </xsl:attribute>
-
                                        <td align="left">
                                                <xsl:value-of select="name"/>
                                        </td>
@@ -161,12 +167,12 @@
                                                        </tr>
                                                </table>
                                        </td>
-
                                </tr>
                        </xsl:when>
                </xsl:choose>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template match="values_users">
                <xsl:choose>
                        <xsl:when test="account_id !=''">
@@ -184,7 +190,6 @@
                                                        </xsl:otherwise>
                                                </xsl:choose>
                                        </xsl:attribute>
-
                                        <td align="left">
                                                <xsl:value-of select="name"/>
                                        </td>
@@ -204,12 +209,12 @@
                                                        </tr>
                                                </table>
                                        </td>
-
                                </tr>
                        </xsl:when>
                </xsl:choose>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template name="value_header">
                <td>
                </td>
@@ -245,17 +250,17 @@
                                </td>
                                <td class="th_text" align="center">
                                        <xsl:value-of select="lang_initials"/>
-                               </td>                                           
+                               </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>
@@ -409,7 +414,6 @@
                                </td>
                        </xsl:when>
                </xsl:choose>
-
                <xsl:choose>
                        <xsl:when test="//location='.invoice' and //permission= 
1 and type= 'users'">
                                <td align="center">
@@ -444,7 +448,7 @@
                                </td>
                                <td align="center">
                                        <INPUT type="text" size="4" 
name="initials[{account_id}]" value="{initials}"/>
-                               </td>                                           
+                               </td>
                        </xsl:when>
                        <xsl:otherwise>
                                <td>
@@ -454,11 +458,12 @@
                                <td>
                                </td>
                                <td>
-                               </td>                                           
+                               </td>
                        </xsl:otherwise>
                </xsl:choose>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template name="mask">
                <td align="left">
                        <xsl:value-of select="lang_mask"/>
@@ -650,11 +655,12 @@
                                        </xsl:choose>
                                </td>
                                <td>
-                               </td>                                           
+                               </td>
                        </xsl:when>
                </xsl:choose>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template name="result">
                <td align="left">
                        <xsl:value-of select="lang_result"/>
@@ -746,18 +752,25 @@
                                        </xsl:choose>
                                </td>
                                <td>
-                               </td>                                           
+                               </td>
                        </xsl:when>
                </xsl:choose>
        </xsl:template>
 
-<!-- edit_id -->       
-
+       <!-- 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>
+               <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>
@@ -772,7 +785,6 @@
                                        </xsl:otherwise>
                                </xsl:choose>
                        </xsl:attribute>
-
                        <td align="center">
                                <INPUT type="checkbox" name="values[select][]" 
value="{$name}">
                                        <xsl:if test="old = '1'">
@@ -789,23 +801,24 @@
                                <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>
-                                       <img id="date_{$name}-trigger" 
src="{//img_cal}" alt="{//lang_datetitle}" title="{//lang_datetitle}" 
style="cursor:pointer; cursor:hand;"/>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <xsl:value-of select="start_date"/>
-                               </xsl:otherwise>
-                       </xsl:choose>
+                               <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>
+                                               <img id="date_{$name}-trigger" 
src="{//img_cal}" alt="{//lang_datetitle}" title="{//lang_datetitle}" 
style="cursor:pointer; cursor:hand;"/>
+                                       </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">
                <tr class="th">
                        <td class="th_text" width="10%" align="center">
@@ -823,6 +836,7 @@
                </tr>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template xmlns:php="http://php.net/xsl"; match="edit_id">
                <table cellpadding="2" cellspacing="2" width="90%" 
align="center">
                        <xsl:choose>
@@ -834,13 +848,17 @@
                                        </tr>
                                </xsl:when>
                        </xsl:choose>
-                       <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
+                       <xsl:variable name="form_action">
+                               <xsl:value-of select="form_action"/>
+                       </xsl:variable>
                        <form method="post" action="{$form_action}">
-                               <xsl:call-template name="id_table_header"/> 
-                               <xsl:apply-templates select="id_values"/> 
+                               <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>
+                                               <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"/>
@@ -851,8 +869,12 @@
                        </form>
                        <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>
+                                       <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">
@@ -865,7 +887,7 @@
                </table>
        </xsl:template>
 
-
+       <!-- New template-->
        <xsl:template match="contact_info">
                <div align="left">
                        <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
@@ -886,7 +908,9 @@
                                                <xsl:call-template 
name="user_id_filter"/>
                                        </td>
                                </tr>
-                               <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
+                               <xsl:variable name="form_action">
+                                       <xsl:value-of select="form_action"/>
+                               </xsl:variable>
                                <form method="post" name="form" 
action="{$form_action}">
                                        <tr>
                                                <td valign="top">
@@ -925,9 +949,13 @@
                                                </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:variable 
name="lang_approval_from_statustext">
+                                                               <xsl:value-of 
select="lang_approval_from_statustext"/>
+                                                       </xsl:variable>
                                                        <select 
name="values[approval_from]" class="forms" 
onMouseover="window.status='{$lang_approval_from_statustext}'; return true;" 
onMouseout="window.status='';return true;">
-                                                               <option 
value=""><xsl:value-of select="lang_no_user"/></option>
+                                                               <option 
value="">
+                                                                       
<xsl:value-of select="lang_no_user"/>
+                                                               </option>
                                                                
<xsl:apply-templates select="approval_from"/>
                                                        </select>
                                                </td>
@@ -938,9 +966,13 @@
                                                </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>
+                                                       <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]" class="forms" 
onMouseover="window.status='{$lang_default_vendor_category_statustext}'; return 
true;" onMouseout="window.status='';return true;">
-                                                               <option 
value=""><xsl:value-of select="lang_no_cat"/></option>
+                                                               <option 
value="">
+                                                                       
<xsl:value-of select="lang_no_cat"/>
+                                                               </option>
                                                                
<xsl:apply-templates select="vendor_category"/>
                                                        </select>
                                                </td>
@@ -952,7 +984,9 @@
                                                <td align="left">
                                                        <input type="hidden" 
name="values[old_default_tts_category]" 
value="{value_old_default_tts_category}"/>
                                                        <select 
name="values[default_tts_category]" class="forms" 
title="{lang_default_tts_category_statustext}">
-                                                               <option 
value=""><xsl:value-of select="lang_no_cat"/></option>
+                                                               <option 
value="">
+                                                                       
<xsl:value-of select="lang_no_cat"/>
+                                                               </option>
                                                                
<xsl:apply-templates select="tts_category"/>
                                                        </select>
                                                </td>
@@ -964,7 +998,9 @@
                                                <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>
+                                                               <option 
value="">
+                                                                       
<xsl:value-of select="lang_no_assigntodefault"/>
+                                                               </option>
                                                                
<xsl:apply-templates select="account_list_tts"/>
                                                        </select>
                                                </td>
@@ -976,14 +1012,18 @@
                                                <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>
+                                                               <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>
+                                                       <xsl:variable 
name="lang_save">
+                                                               <xsl:value-of 
select="lang_save"/>
+                                                       </xsl:variable>
                                                        <input type="submit" 
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return 
true;">
                                                                <xsl:attribute 
name="onMouseover">
                                                                        
<xsl:text>window.status='</xsl:text>
@@ -993,12 +1033,15 @@
                                                        </input>
                                                </td>
                                        </tr>
-
                                </form>
                                <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>
+                                               <xsl:variable 
name="done_action">
+                                                       <xsl:value-of 
select="done_action"/>
+                                               </xsl:variable>
+                                               <xsl:variable name="lang_done">
+                                                       <xsl:value-of 
select="lang_done"/>
+                                               </xsl:variable>
                                                <form method="post" 
action="{$done_action}">
                                                        <input type="submit" 
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
                                                                <xsl:attribute 
name="onMouseover">
@@ -1014,59 +1057,88 @@
                </div>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template match="approval_from">
-               <xsl:variable name="user_id"><xsl:value-of 
select="user_id"/></xsl:variable>
+               <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>
+                               <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>
+                               <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:variable name="cat_id">
+                       <xsl:value-of select="cat_id"/>
+               </xsl:variable>
                <xsl:choose>
                        <xsl:when test="selected='selected'">
-                               <option value="{$cat_id}" 
selected="selected"><xsl:value-of disable-output-escaping="yes" 
select="name"/></option>
+                               <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>
+                               <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'">
-                               <option value="{cat_id}" 
selected="selected"><xsl:value-of disable-output-escaping="yes" 
select="name"/></option>
+                               <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>
+                               <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>
+                               <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>
+                               <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>
+                               <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>
+                               <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      2011-12-25 20:48:28 UTC 
(rev 8436)
+++ trunk/property/templates/base/admin_entity.xsl      2011-12-26 19:11:48 UTC 
(rev 8437)
@@ -1,5 +1,4 @@
-<!-- $Id$ -->
-
+  <!-- $Id$ -->
        <xsl:template name="app_data">
                <xsl:choose>
                        <xsl:when test="edit">
@@ -38,9 +37,9 @@
                </xsl:choose>
        </xsl:template>
 
-
-       <xsl:template match="list">             
-               <xsl:apply-templates select="menu"/> 
+       <!-- New template-->
+       <xsl:template match="list">
+               <xsl:apply-templates select="menu"/>
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <tr>
                                <td align="right">
@@ -60,15 +59,24 @@
                </table>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template match="table_header">
-               <xsl:variable name="sort_id"><xsl:value-of 
select="sort_id"/></xsl:variable>
-               <xsl:variable name="sort_name"><xsl:value-of 
select="sort_name"/></xsl:variable>
+               <xsl:variable name="sort_id">
+                       <xsl:value-of select="sort_id"/>
+               </xsl:variable>
+               <xsl:variable name="sort_name">
+                       <xsl:value-of select="sort_name"/>
+               </xsl:variable>
                <tr class="th">
                        <td class="th_text" width="10%" align="right">
-                               <a href="{$sort_id}"><xsl:value-of 
select="lang_id"/></a>
+                               <a href="{$sort_id}">
+                                       <xsl:value-of select="lang_id"/>
+                               </a>
                        </td>
                        <td class="th_text" width="10%" align="center">
-                               <a href="{$sort_name}"><xsl:value-of 
select="lang_name"/></a>
+                               <a href="{$sort_name}">
+                                       <xsl:value-of select="lang_name"/>
+                               </a>
                        </td>
                        <td class="th_text" width="20%" align="center">
                                <xsl:value-of select="lang_descr"/>
@@ -85,10 +93,17 @@
                </tr>
        </xsl:template>
 
-       <xsl:template match="values"> 
-               <xsl:variable name="lang_attribute_standardtext"><xsl:value-of 
select="lang_delete_standardtext"/></xsl:variable>
-               <xsl:variable name="lang_edit_standardtext"><xsl:value-of 
select="lang_edit_standardtext"/></xsl:variable>
-               <xsl:variable name="lang_delete_standardtext"><xsl:value-of 
select="lang_delete_standardtext"/></xsl:variable>
+       <!-- New template-->
+       <xsl:template match="values">
+               <xsl:variable name="lang_attribute_standardtext">
+                       <xsl:value-of select="lang_delete_standardtext"/>
+               </xsl:variable>
+               <xsl:variable name="lang_edit_standardtext">
+                       <xsl:value-of select="lang_edit_standardtext"/>
+               </xsl:variable>
+               <xsl:variable name="lang_delete_standardtext">
+                       <xsl:value-of select="lang_delete_standardtext"/>
+               </xsl:variable>
                <tr>
                        <xsl:attribute name="class">
                                <xsl:choose>
@@ -103,7 +118,6 @@
                                        </xsl:otherwise>
                                </xsl:choose>
                        </xsl:attribute>
-
                        <td align="right">
                                <xsl:value-of select="id"/>
                        </td>
@@ -114,22 +128,35 @@
                                <xsl:value-of select="descr"/>
                        </td>
                        <td align="center">
-                               <xsl:variable 
name="link_categories"><xsl:value-of select="link_categories"/></xsl:variable>
-                               <a href="{$link_categories}" 
onMouseover="window.status='{lang_category_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_categories"/></a>
+                               <xsl:variable name="link_categories">
+                                       <xsl:value-of select="link_categories"/>
+                               </xsl:variable>
+                               <a href="{$link_categories}" 
onMouseover="window.status='{lang_category_text}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_categories"/>
+                               </a>
                        </td>
                        <td align="center">
-                               <xsl:variable name="link_edit"><xsl:value-of 
select="link_edit"/></xsl:variable>
-                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_standardtext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_edit"/></a>
+                               <xsl:variable name="link_edit">
+                                       <xsl:value-of select="link_edit"/>
+                               </xsl:variable>
+                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_standardtext}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_edit"/>
+                               </a>
                        </td>
                        <td align="center">
-                               <xsl:variable name="link_delete"><xsl:value-of 
select="link_delete"/></xsl:variable>
-                               <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_standardtext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_delete"/></a>
+                               <xsl:variable name="link_delete">
+                                       <xsl:value-of select="link_delete"/>
+                               </xsl:variable>
+                               <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_standardtext}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_delete"/>
+                               </a>
                        </td>
                </tr>
        </xsl:template>
 
-       <xsl:template match="list_category">            
-               <xsl:apply-templates select="menu"/> 
+       <!-- New template-->
+       <xsl:template match="list_category">
+               <xsl:apply-templates select="menu"/>
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <tr>
                                <td align="right">
@@ -156,15 +183,24 @@
                </table>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template match="table_header_category">
-               <xsl:variable name="sort_id"><xsl:value-of 
select="sort_id"/></xsl:variable>
-               <xsl:variable name="sort_name"><xsl:value-of 
select="sort_name"/></xsl:variable>
+               <xsl:variable name="sort_id">
+                       <xsl:value-of select="sort_id"/>
+               </xsl:variable>
+               <xsl:variable name="sort_name">
+                       <xsl:value-of select="sort_name"/>
+               </xsl:variable>
                <tr class="th">
                        <td class="th_text" width="5%" align="right">
-                               <a href="{$sort_id}"><xsl:value-of 
select="lang_id"/></a>
+                               <a href="{$sort_id}">
+                                       <xsl:value-of select="lang_id"/>
+                               </a>
                        </td>
                        <td class="th_text" width="10%" align="center">
-                               <a href="{$sort_name}"><xsl:value-of 
select="lang_name"/></a>
+                               <a href="{$sort_name}">
+                                       <xsl:value-of select="lang_name"/>
+                               </a>
                        </td>
                        <td class="th_text" width="20%" align="center">
                                <xsl:value-of select="lang_descr"/>
@@ -190,11 +226,20 @@
                </tr>
        </xsl:template>
 
-       <xsl:template match="values_category"> 
-               <xsl:variable name="lang_attribute_standardtext"><xsl:value-of 
select="lang_attribute_standardtext"/></xsl:variable>
-               <xsl:variable 
name="lang_custom_function_standardtext"><xsl:value-of 
select="lang_custom_function_standardtext"/></xsl:variable>
-               <xsl:variable name="lang_edit_standardtext"><xsl:value-of 
select="lang_edit_standardtext"/></xsl:variable>
-               <xsl:variable name="lang_delete_standardtext"><xsl:value-of 
select="lang_delete_standardtext"/></xsl:variable>
+       <!-- New template-->
+       <xsl:template match="values_category">
+               <xsl:variable name="lang_attribute_standardtext">
+                       <xsl:value-of select="lang_attribute_standardtext"/>
+               </xsl:variable>
+               <xsl:variable name="lang_custom_function_standardtext">
+                       <xsl:value-of 
select="lang_custom_function_standardtext"/>
+               </xsl:variable>
+               <xsl:variable name="lang_edit_standardtext">
+                       <xsl:value-of select="lang_edit_standardtext"/>
+               </xsl:variable>
+               <xsl:variable name="lang_delete_standardtext">
+                       <xsl:value-of select="lang_delete_standardtext"/>
+               </xsl:variable>
                <tr>
                        <xsl:attribute name="class">
                                <xsl:choose>
@@ -209,7 +254,6 @@
                                        </xsl:otherwise>
                                </xsl:choose>
                        </xsl:attribute>
-
                        <td align="right">
                                <xsl:value-of select="id"/>
                        </td>
@@ -223,31 +267,51 @@
                                <xsl:value-of select="prefix"/>
                        </td>
                        <td align="center">
-                               <xsl:variable 
name="link_attribute_group"><xsl:value-of 
select="link_attribute_group"/></xsl:variable>
-                               <a href="{$link_attribute_group}" 
onMouseover="window.status='';return true;" onMouseout="window.status='';return 
true;"><xsl:value-of select="text_attribute_group"/></a>
+                               <xsl:variable name="link_attribute_group">
+                                       <xsl:value-of 
select="link_attribute_group"/>
+                               </xsl:variable>
+                               <a href="{$link_attribute_group}" 
onMouseover="window.status='';return true;" onMouseout="window.status='';return 
true;">
+                                       <xsl:value-of 
select="text_attribute_group"/>
+                               </a>
                        </td>
                        <td align="center">
-                               <xsl:variable 
name="link_attribute"><xsl:value-of select="link_attribute"/></xsl:variable>
-                               <a href="{$link_attribute}" 
onMouseover="window.status='{$lang_attribute_standardtext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_attribute"/></a>
+                               <xsl:variable name="link_attribute">
+                                       <xsl:value-of select="link_attribute"/>
+                               </xsl:variable>
+                               <a href="{$link_attribute}" 
onMouseover="window.status='{$lang_attribute_standardtext}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_attribute"/>
+                               </a>
                        </td>
                        <td align="center">
-                               <xsl:variable 
name="link_custom_function"><xsl:value-of 
select="link_custom_function"/></xsl:variable>
-                               <a href="{$link_custom_function}" 
onMouseover="window.status='{$lang_custom_function_standardtext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_custom_function"/></a>
+                               <xsl:variable name="link_custom_function">
+                                       <xsl:value-of 
select="link_custom_function"/>
+                               </xsl:variable>
+                               <a href="{$link_custom_function}" 
onMouseover="window.status='{$lang_custom_function_standardtext}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of 
select="text_custom_function"/>
+                               </a>
                        </td>
                        <td align="center">
-                               <xsl:variable name="link_edit"><xsl:value-of 
select="link_edit"/></xsl:variable>
-                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_standardtext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_edit"/></a>
+                               <xsl:variable name="link_edit">
+                                       <xsl:value-of select="link_edit"/>
+                               </xsl:variable>
+                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_standardtext}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_edit"/>
+                               </a>
                        </td>
                        <td align="center">
-                               <xsl:variable name="link_delete"><xsl:value-of 
select="link_delete"/></xsl:variable>
-                               <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_standardtext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_delete"/></a>
+                               <xsl:variable name="link_delete">
+                                       <xsl:value-of select="link_delete"/>
+                               </xsl:variable>
+                               <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_standardtext}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_delete"/>
+                               </a>
                        </td>
                </tr>
        </xsl:template>
 
-
-       <xsl:template match="list_config">              
-               <xsl:apply-templates select="menu"/> 
+       <!-- New template-->
+       <xsl:template match="list_config">
+               <xsl:apply-templates select="menu"/>
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <tr>
                                <td align="right">
@@ -266,15 +330,24 @@
                </table>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template match="table_header_list_config">
-               <xsl:variable name="sort_column_name"><xsl:value-of 
select="sort_column_name"/></xsl:variable>
-               <xsl:variable name="sort_name"><xsl:value-of 
select="sort_name"/></xsl:variable>
+               <xsl:variable name="sort_column_name">
+                       <xsl:value-of select="sort_column_name"/>
+               </xsl:variable>
+               <xsl:variable name="sort_name">
+                       <xsl:value-of select="sort_name"/>
+               </xsl:variable>
                <tr class="th">
                        <td class="th_text" width="10%" align="center">
-                               <a href="{$sort_column_name}"><xsl:value-of 
select="lang_column_name"/></a>
+                               <a href="{$sort_column_name}">
+                                       <xsl:value-of 
select="lang_column_name"/>
+                               </a>
                        </td>
                        <td class="th_text" width="10%" align="center">
-                               <a href="{$sort_name}"><xsl:value-of 
select="lang_name"/></a>
+                               <a href="{$sort_name}">
+                                       <xsl:value-of select="lang_name"/>
+                               </a>
                        </td>
                        <td class="th_text" width="5%" align="center">
                                <xsl:value-of select="lang_edit"/>
@@ -282,8 +355,11 @@
                </tr>
        </xsl:template>
 
-       <xsl:template match="values_list_config"> 
-               <xsl:variable name="lang_edit_standardtext"><xsl:value-of 
select="lang_edit_standardtext"/></xsl:variable>
+       <!-- New template-->
+       <xsl:template match="values_list_config">
+               <xsl:variable name="lang_edit_standardtext">
+                       <xsl:value-of select="lang_edit_standardtext"/>
+               </xsl:variable>
                <tr>
                        <xsl:attribute name="class">
                                <xsl:choose>
@@ -298,7 +374,6 @@
                                        </xsl:otherwise>
                                </xsl:choose>
                        </xsl:attribute>
-
                        <td align="left">
                                <xsl:value-of select="column_name"/>
                        </td>
@@ -306,18 +381,26 @@
                                <xsl:value-of select="name"/>
                        </td>
                        <td align="center">
-                               <xsl:variable name="link_edit"><xsl:value-of 
select="link_edit"/></xsl:variable>
-                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_standardtext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_edit"/></a>
+                               <xsl:variable name="link_edit">
+                                       <xsl:value-of select="link_edit"/>
+                               </xsl:variable>
+                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_standardtext}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_edit"/>
+                               </a>
                        </td>
                </tr>
        </xsl:template>
 
-
+       <!-- New template-->
        <xsl:template match="table_add">
                <tr>
                        <td height="50">
-                               <xsl:variable name="add_action"><xsl:value-of 
select="add_action"/></xsl:variable>
-                               <xsl:variable name="lang_add"><xsl:value-of 
select="lang_add"/></xsl:variable>
+                               <xsl:variable name="add_action">
+                                       <xsl:value-of select="add_action"/>
+                               </xsl:variable>
+                               <xsl:variable name="lang_add">
+                                       <xsl:value-of select="lang_add"/>
+                               </xsl:variable>
                                <form method="post" action="{$add_action}">
                                        <input type="submit" name="add" 
value="{$lang_add}" onMouseout="window.status='';return true;">
                                                <xsl:attribute 
name="onMouseover">
@@ -329,8 +412,12 @@
                                </form>
                        </td>
                        <td height="50">
-                               <xsl:variable name="done_action"><xsl:value-of 
select="done_action"/></xsl:variable>
-                               <xsl:variable name="lang_done"><xsl:value-of 
select="lang_done"/></xsl:variable>
+                               <xsl:variable name="done_action">
+                                       <xsl:value-of select="done_action"/>
+                               </xsl:variable>
+                               <xsl:variable name="lang_done">
+                                       <xsl:value-of select="lang_done"/>
+                               </xsl:variable>
                                <form method="post" action="{$done_action}">
                                        <input type="submit" name="add" 
value="{$lang_done}" onMouseout="window.status='';return true;">
                                                <xsl:attribute 
name="onMouseover">
@@ -344,10 +431,9 @@
                </tr>
        </xsl:template>
 
-<!-- add / edit  -->
+       <!-- add / edit  -->
        <xsl:template xmlns:php="http://php.net/xsl"; match="edit">
                <div align="left">
-
                        <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
                                <xsl:choose>
                                        <xsl:when test="msgbox_data != ''">
@@ -358,7 +444,9 @@
                                                </tr>
                                        </xsl:when>
                                </xsl:choose>
-                               <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
+                               <xsl:variable name="form_action">
+                                       <xsl:value-of select="form_action"/>
+                               </xsl:variable>
                                <form name="form" method="post" 
action="{$form_action}">
                                        <tr>
                                                <td class="th_text" 
align="left">
@@ -376,7 +464,9 @@
                                                                </td>
                                                                <td 
valign="top">
                                                                        <select 
id="parent_id" name="values[parent_id]">
-                                                                               
<option value=""><xsl:value-of select="php:function('lang', 'select 
parent')"/></option>
+                                                                               
<option value="">
+                                                                               
        <xsl:value-of select="php:function('lang', 'select parent')"/>
+                                                                               
</option>
                                                                                
<xsl:apply-templates select="parent_list"/>
                                                                        
</select>
                                                                </td>
@@ -420,7 +510,7 @@
                                                                        
<xsl:value-of select="lang_descr_standardtext"/>
                                                                        
<xsl:text>'; return true;</xsl:text>
                                                                </xsl:attribute>
-                                                               <xsl:value-of 
select="value_descr"/>            
+                                                               <xsl:value-of 
select="value_descr"/>
                                                        </textarea>
                                                </td>
                                        </tr>
@@ -486,7 +576,6 @@
                                                        </tr>
                                                </xsl:when>
                                        </xsl:choose>
-
                                        <xsl:choose>
                                                <xsl:when 
test="value_location_form = 1">
                                                        <tr>
@@ -515,8 +604,6 @@
                                                        </tr>
                                                </xsl:when>
                                        </xsl:choose>
-
-
                                        <xsl:choose>
                                                <xsl:when test="edit_prefix != 
''">
                                                        <tr>
@@ -535,7 +622,6 @@
                                                        </tr>
                                                </xsl:when>
                                        </xsl:choose>
-
                                        <xsl:choose>
                                                <xsl:when test="lookup_tenant 
!= ''">
                                                        <tr>
@@ -700,7 +786,6 @@
                                                                                
                <xsl:text>disabled</xsl:text>
                                                                                
        </xsl:attribute>
                                                                                
</xsl:if>
-
                                                                        </input>
                                                                        
<xsl:choose>
                                                                                
<xsl:when test="value_is_eav = '1'">
@@ -711,7 +796,6 @@
                                                        </tr>
                                                </xsl:when>
                                        </xsl:choose>
-
                                        <xsl:choose>
                                                <xsl:when 
test="lang_location_level != ''">
                                                        <tr>
@@ -719,10 +803,14 @@
                                                                        
<xsl:value-of select="lang_location_level"/>
                                                                </td>
                                                                <td 
valign="top">
-                                                                       
<xsl:variable name="lang_location_level_statustext"><xsl:value-of 
select="lang_location_level_statustext"/></xsl:variable>
+                                                                       
<xsl:variable name="lang_location_level_statustext">
+                                                                               
<xsl:value-of select="lang_location_level_statustext"/>
+                                                                       
</xsl:variable>
                                                                        <select 
name="values[location_level]" class="forms" 
onMouseover="window.status='{$lang_location_level_statustext}'; return true;" 
onMouseout="window.status='';return true;">
-                                                                               
<option value=""><xsl:value-of select="lang_no_location_level"/></option>
-                                                                               
        <xsl:apply-templates select="location_level_list/options"/>
+                                                                               
<option value="">
+                                                                               
        <xsl:value-of select="lang_no_location_level"/>
+                                                                               
</option>
+                                                                               
<xsl:apply-templates select="location_level_list/options"/>
                                                                        
</select>
                                                                </td>
                                                        </tr>
@@ -731,16 +819,19 @@
                                                                        
<xsl:value-of select="lang_location_link_level"/>
                                                                </td>
                                                                <td 
valign="top">
-                                                                       
<xsl:variable name="lang_location_link_level_statustext"><xsl:value-of 
select="lang_location_link_level_statustext"/></xsl:variable>
+                                                                       
<xsl:variable name="lang_location_link_level_statustext">
+                                                                               
<xsl:value-of select="lang_location_link_level_statustext"/>
+                                                                       
</xsl:variable>
                                                                        <select 
name="values[location_link_level]" 
title="{$lang_location_link_level_statustext}">
-                                                                               
<option value=""><xsl:value-of select="lang_no_location_link_level"/></option>
-                                                                               
        <xsl:apply-templates select="location_link_level_list/options"/>
+                                                                               
<option value="">
+                                                                               
        <xsl:value-of select="lang_no_location_link_level"/>
+                                                                               
</option>
+                                                                               
<xsl:apply-templates select="location_link_level_list/options"/>
                                                                        
</select>
                                                                </td>
                                                        </tr>
                                                </xsl:when>
                                        </xsl:choose>
-
                                        <xsl:choose>
                                                <xsl:when test="category_list 
!= '' and value_id = ''">
                                                        <tr>
@@ -749,25 +840,25 @@
                                                                </td>
                                                                <td 
valign="top">
                                                                        <select 
id="category_template" name="values[category_template]" 
onChange="get_template_attributes()">
-                                                                               
<option value=""><xsl:value-of select="php:function('lang', 'select 
template')"/></option>
+                                                                               
<option value="">
+                                                                               
        <xsl:value-of select="php:function('lang', 'select template')"/>
+                                                                               
</option>
                                                                                
<xsl:apply-templates select="category_list"/>
                                                                        
</select>
                                                                </td>
                                                        </tr>
-
                                                        <tr>
                                                                <td width="19%" 
align="left" valign="top">
                                                                        
<xsl:value-of select="php:function('lang', 'attributes')"/>
                                                                </td>
                                                                <td>
-                                                                       <div 
id="paging_0"/><div id="datatable-container_0"/>
+                                                                       <div 
id="paging_0"/>
+                                                                       <div 
id="datatable-container_0"/>
                                                                        <input 
type="hidden" name="template_attrib" value=""/>
                                                                </td>
                                                        </tr>
-
                                                </xsl:when>
                                        </xsl:choose>
-
                                        <tr height="50">
                                                <td>
                                                        <input type="submit" 
name="values[save]" value="{lang_save}" onClick="onActionsClick()">
@@ -780,8 +871,12 @@
                                </form>
                                <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>
+                                               <xsl:variable 
name="done_action">
+                                                       <xsl:value-of 
select="done_action"/>
+                                               </xsl:variable>
+                                               <xsl:variable name="lang_done">
+                                                       <xsl:value-of 
select="lang_done"/>
+                                               </xsl:variable>
                                                <form method="post" 
action="{$done_action}">
                                                        <input type="submit" 
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
                                                                <xsl:attribute 
name="onMouseover">
@@ -795,7 +890,6 @@
                                </tr>
                        </table>
                </div>
-
                <!--  DATATABLE DEFINITIONS-->
                <script type="text/javascript">
                        var property_js = <xsl:value-of select="property_js"/>;
@@ -807,13 +901,13 @@
 
                        <xsl:for-each select="datatable">
                                datatable[<xsl:value-of select="name"/>] = [
-                               {
-                               values                  :       <xsl:value-of 
select="values"/>,
-                               total_records   :       <xsl:value-of 
select="total_records"/>,
-                               is_paginator    :       <xsl:value-of 
select="is_paginator"/>,
-                               <!--            permission              :       
<xsl:value-of select="permission"/>, -->
-                               footer                  :       <xsl:value-of 
select="footer"/>
-                               }
+                                       {
+                                               values:<xsl:value-of 
select="values"/>,
+                                               total_records: <xsl:value-of 
select="total_records"/>,
+                                               is_paginator:  <xsl:value-of 
select="is_paginator"/>,
+                                               <!--permission:<xsl:value-of 
select="permission"/>, -->
+                                               footer:<xsl:value-of 
select="footer"/>
+                                       }
                                ]
                        </xsl:for-each>
                        <xsl:for-each select="myColumnDefs">
@@ -825,10 +919,8 @@
                </script>
        </xsl:template>
 
-<!-- list attribute -->
-
+       <!-- list attribute -->
        <xsl:template match="list_attribute">
-
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <tr>
                                <td align="right">
@@ -861,12 +953,20 @@
                        <xsl:apply-templates select="table_add"/>
                </table>
        </xsl:template>
+
+       <!-- New template-->
        <xsl:template match="table_header_attrib">
-               <xsl:variable name="sort_sorting"><xsl:value-of 
select="sort_sorting"/></xsl:variable>
-               <xsl:variable name="sort_name"><xsl:value-of 
select="sort_name"/></xsl:variable>
+               <xsl:variable name="sort_sorting">
+                       <xsl:value-of select="sort_sorting"/>
+               </xsl:variable>
+               <xsl:variable name="sort_name">
+                       <xsl:value-of select="sort_name"/>
+               </xsl:variable>
                <tr class="th">
                        <td class="th_text" width="10%" align="left">
-                               <a href="{$sort_name}"><xsl:value-of 
select="lang_name"/></a>
+                               <a href="{$sort_name}">
+                                       <xsl:value-of select="lang_name"/>
+                               </a>
                        </td>
                        <td class="th_text" width="20%" align="left">
                                <xsl:value-of select="lang_descr"/>
@@ -878,7 +978,9 @@
                                <xsl:value-of select="lang_attrib_group"/>
                        </td>
                        <td class="th_text" width="5%" align="center">
-                               <a href="{$sort_sorting}"><xsl:value-of 
select="lang_sorting"/></a>
+                               <a href="{$sort_sorting}">
+                                       <xsl:value-of select="lang_sorting"/>
+                               </a>
                        </td>
                        <td class="th_text" width="1%" align="center">
                                <xsl:value-of select="lang_search"/>
@@ -892,11 +994,20 @@
                </tr>
        </xsl:template>
 
-       <xsl:template match="values_attrib"> 
-               <xsl:variable name="lang_up_text"><xsl:value-of 
select="lang_up_text"/></xsl:variable>
-               <xsl:variable name="lang_down_text"><xsl:value-of 
select="lang_down_text"/></xsl:variable>
-               <xsl:variable name="lang_edit_text"><xsl:value-of 
select="lang_edit_text"/></xsl:variable>
-               <xsl:variable name="lang_delete_text"><xsl:value-of 
select="lang_delete_text"/></xsl:variable>
+       <!-- New template-->
+       <xsl:template match="values_attrib">
+               <xsl:variable name="lang_up_text">
+                       <xsl:value-of select="lang_up_text"/>
+               </xsl:variable>
+               <xsl:variable name="lang_down_text">
+                       <xsl:value-of select="lang_down_text"/>
+               </xsl:variable>
+               <xsl:variable name="lang_edit_text">
+                       <xsl:value-of select="lang_edit_text"/>
+               </xsl:variable>
+               <xsl:variable name="lang_delete_text">
+                       <xsl:value-of select="lang_delete_text"/>
+               </xsl:variable>
                <tr>
                        <xsl:attribute name="class">
                                <xsl:choose>
@@ -929,15 +1040,21 @@
                                                <td>
                                                        <xsl:value-of 
select="sorting"/>
                                                </td>
-
                                                <td align="left">
-                                                       <xsl:variable 
name="link_up"><xsl:value-of select="link_up"/></xsl:variable>
-                                                       <a href="{$link_up}" 
onMouseover="window.status='{$lang_up_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of select="text_up"/></a>
+                                                       <xsl:variable 
name="link_up">
+                                                               <xsl:value-of 
select="link_up"/>
+                                                       </xsl:variable>
+                                                       <a href="{$link_up}" 
onMouseover="window.status='{$lang_up_text}';return true;" 
onMouseout="window.status='';return true;">
+                                                               <xsl:value-of 
select="text_up"/>
+                                                       </a>
                                                        <xsl:text> | </xsl:text>
-                                                       <xsl:variable 
name="link_down"><xsl:value-of select="link_down"/></xsl:variable>
-                                                       <a href="{$link_down}" 
onMouseover="window.status='{$lang_down_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_down"/></a>
+                                                       <xsl:variable 
name="link_down">
+                                                               <xsl:value-of 
select="link_down"/>
+                                                       </xsl:variable>
+                                                       <a href="{$link_down}" 
onMouseover="window.status='{$lang_down_text}';return true;" 
onMouseout="window.status='';return true;">
+                                                               <xsl:value-of 
select="text_down"/>
+                                                       </a>
                                                </td>
-
                                        </tr>
                                </table>
                        </td>
@@ -945,21 +1062,27 @@
                                <xsl:value-of select="search"/>
                        </td>
                        <td align="center">
-                               <xsl:variable name="link_edit"><xsl:value-of 
select="link_edit"/></xsl:variable>
-                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_edit"/></a>
+                               <xsl:variable name="link_edit">
+                                       <xsl:value-of select="link_edit"/>
+                               </xsl:variable>
+                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_text}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_edit"/>
+                               </a>
                        </td>
                        <td align="center">
-                               <xsl:variable name="link_delete"><xsl:value-of 
select="link_delete"/></xsl:variable>
-                               <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_delete"/></a>
+                               <xsl:variable name="link_delete">
+                                       <xsl:value-of select="link_delete"/>
+                               </xsl:variable>
+                               <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_text}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_delete"/>
+                               </a>
                        </td>
                </tr>
        </xsl:template>
 
-
-<!-- list attribute_group -->
-
+       <!-- New template-->
+       <!-- list attribute_group -->
        <xsl:template match="list_attribute_group">
-
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <tr>
                                <td align="right">
@@ -993,18 +1116,27 @@
                </table>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template match="table_header_attrib_group">
-               <xsl:variable name="sort_sorting"><xsl:value-of 
select="sort_sorting"/></xsl:variable>
-               <xsl:variable name="sort_name"><xsl:value-of 
select="sort_name"/></xsl:variable>
+               <xsl:variable name="sort_sorting">
+                       <xsl:value-of select="sort_sorting"/>
+               </xsl:variable>
+               <xsl:variable name="sort_name">
+                       <xsl:value-of select="sort_name"/>
+               </xsl:variable>
                <tr class="th">
                        <td class="th_text" width="10%" align="left">
-                               <a href="{$sort_name}"><xsl:value-of 
select="lang_name"/></a>
+                               <a href="{$sort_name}">
+                                       <xsl:value-of select="lang_name"/>
+                               </a>
                        </td>
                        <td class="th_text" width="20%" align="left">
                                <xsl:value-of select="lang_descr"/>
                        </td>
                        <td class="th_text" width="5%" align="center">
-                               <a href="{$sort_sorting}"><xsl:value-of 
select="lang_sorting"/></a>
+                               <a href="{$sort_sorting}">
+                                       <xsl:value-of select="lang_sorting"/>
+                               </a>
                        </td>
                        <td class="th_text" width="5%" align="center">
                                <xsl:value-of select="lang_edit"/>
@@ -1015,11 +1147,20 @@
                </tr>
        </xsl:template>
 
-       <xsl:template match="values_attrib_group"> 
-               <xsl:variable name="lang_up_text"><xsl:value-of 
select="lang_up_text"/></xsl:variable>
-               <xsl:variable name="lang_down_text"><xsl:value-of 
select="lang_down_text"/></xsl:variable>
-               <xsl:variable name="lang_edit_text"><xsl:value-of 
select="lang_edit_text"/></xsl:variable>
-               <xsl:variable name="lang_delete_text"><xsl:value-of 
select="lang_delete_text"/></xsl:variable>
+       <!-- New template-->
+       <xsl:template match="values_attrib_group">
+               <xsl:variable name="lang_up_text">
+                       <xsl:value-of select="lang_up_text"/>
+               </xsl:variable>
+               <xsl:variable name="lang_down_text">
+                       <xsl:value-of select="lang_down_text"/>
+               </xsl:variable>
+               <xsl:variable name="lang_edit_text">
+                       <xsl:value-of select="lang_edit_text"/>
+               </xsl:variable>
+               <xsl:variable name="lang_delete_text">
+                       <xsl:value-of select="lang_delete_text"/>
+               </xsl:variable>
                <tr>
                        <xsl:attribute name="class">
                                <xsl:choose>
@@ -1046,35 +1187,46 @@
                                                <td>
                                                        <xsl:value-of 
select="sorting"/>
                                                </td>
-
                                                <td align="left">
-                                                       <xsl:variable 
name="link_up"><xsl:value-of select="link_up"/></xsl:variable>
-                                                       <a href="{$link_up}" 
onMouseover="window.status='{$lang_up_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of select="text_up"/></a>
+                                                       <xsl:variable 
name="link_up">
+                                                               <xsl:value-of 
select="link_up"/>
+                                                       </xsl:variable>
+                                                       <a href="{$link_up}" 
onMouseover="window.status='{$lang_up_text}';return true;" 
onMouseout="window.status='';return true;">
+                                                               <xsl:value-of 
select="text_up"/>
+                                                       </a>
                                                        <xsl:text> | </xsl:text>
-                                                       <xsl:variable 
name="link_down"><xsl:value-of select="link_down"/></xsl:variable>
-                                                       <a href="{$link_down}" 
onMouseover="window.status='{$lang_down_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_down"/></a>
+                                                       <xsl:variable 
name="link_down">
+                                                               <xsl:value-of 
select="link_down"/>
+                                                       </xsl:variable>
+                                                       <a href="{$link_down}" 
onMouseover="window.status='{$lang_down_text}';return true;" 
onMouseout="window.status='';return true;">
+                                                               <xsl:value-of 
select="text_down"/>
+                                                       </a>
                                                </td>
-
                                        </tr>
                                </table>
                        </td>
                        <td align="center">
-                               <xsl:variable name="link_edit"><xsl:value-of 
select="link_edit"/></xsl:variable>
-                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_edit"/></a>
+                               <xsl:variable name="link_edit">
+                                       <xsl:value-of select="link_edit"/>
+                               </xsl:variable>
+                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_text}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_edit"/>
+                               </a>
                        </td>
                        <td align="center">
-                               <xsl:variable name="link_delete"><xsl:value-of 
select="link_delete"/></xsl:variable>
-                               <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_delete"/></a>
+                               <xsl:variable name="link_delete">
+                                       <xsl:value-of select="link_delete"/>
+                               </xsl:variable>
+                               <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_text}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_delete"/>
+                               </a>
                        </td>
                </tr>
        </xsl:template>
 
-
-<!-- add attribute group / edit attribute group -->
-
+       <!-- add attribute group / edit attribute group -->
        <xsl:template match="edit_attrib_group">
                <div align="left">
-
                        <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
                                <xsl:choose>
                                        <xsl:when test="msgbox_data != ''">
@@ -1085,10 +1237,10 @@
                                                </tr>
                                        </xsl:when>
                                </xsl:choose>
-
-                               <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
+                               <xsl:variable name="form_action">
+                                       <xsl:value-of select="form_action"/>
+                               </xsl:variable>
                                <form method="post" action="{$form_action}">
-
                                        <tr>
                                                <td class="th_text" 
align="left">
                                                        <xsl:value-of 
select="lang_entity"/>
@@ -1156,13 +1308,15 @@
                                                                        
<xsl:value-of select="lang_remark_statustext"/>
                                                                        
<xsl:text>'; return true;</xsl:text>
                                                                </xsl:attribute>
-                                                               <xsl:value-of 
select="value_remark"/>           
+                                                               <xsl:value-of 
select="value_remark"/>
                                                        </textarea>
                                                </td>
                                        </tr>
                                        <tr height="50">
                                                <td>
-                                                       <xsl:variable 
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
+                                                       <xsl:variable 
name="lang_save">
+                                                               <xsl:value-of 
select="lang_save"/>
+                                                       </xsl:variable>
                                                        <input type="submit" 
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return 
true;">
                                                                <xsl:attribute 
name="onMouseover">
                                                                        
<xsl:text>window.status='</xsl:text>
@@ -1172,12 +1326,15 @@
                                                        </input>
                                                </td>
                                        </tr>
-
                                </form>
                                <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>
+                                               <xsl:variable 
name="done_action">
+                                                       <xsl:value-of 
select="done_action"/>
+                                               </xsl:variable>
+                                               <xsl:variable name="lang_done">
+                                                       <xsl:value-of 
select="lang_done"/>
+                                               </xsl:variable>
                                                <form method="post" 
action="{$done_action}">
                                                        <input type="submit" 
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
                                                                <xsl:attribute 
name="onMouseover">
@@ -1192,11 +1349,10 @@
                        </table>
                </div>
        </xsl:template>
-<!-- add attribute / edit attribute -->
 
+       <!-- add attribute / edit attribute -->
        <xsl:template xmlns:php="http://php.net/xsl"; match="edit_attrib">
                <div align="left">
-
                        <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
                                <xsl:choose>
                                        <xsl:when test="msgbox_data != ''">
@@ -1207,10 +1363,10 @@
                                                </tr>
                                        </xsl:when>
                                </xsl:choose>
-
-                               <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
+                               <xsl:variable name="form_action">
+                                       <xsl:value-of select="form_action"/>
+                               </xsl:variable>
                                <form method="post" action="{$form_action}">
-
                                        <tr>
                                                <td class="th_text" 
align="left">
                                                        <xsl:value-of 
select="php:function('lang', 'entity')"/>
@@ -1272,7 +1428,7 @@
                                                                <xsl:attribute 
name="title">
                                                                        
<xsl:value-of select="php:function('lang', 'enter a statustext for the 
inputfield in forms')"/>
                                                                </xsl:attribute>
-                                                               <xsl:value-of 
select="value_statustext"/>               
+                                                               <xsl:value-of 
select="value_statustext"/>
                                                        </textarea>
                                                </td>
                                        </tr>
@@ -1285,7 +1441,6 @@
                                                                <xsl:attribute 
name="title">
                                                                        
<xsl:value-of select="php:function('lang', 'select a group')"/>
                                                                </xsl:attribute>
-
                                                                <option 
value="">
                                                                        
<xsl:value-of select="php:function('lang', 'no group')"/>
                                                                </option>
@@ -1321,7 +1476,6 @@
                                                        </input>
                                                </td>
                                        </tr>
-
                                        <tr>
                                                <td valign="top">
                                                        <xsl:value-of 
select="php:function('lang', 'scale')"/>
@@ -1439,11 +1593,10 @@
                                                                <xsl:attribute 
name="title">
                                                                        
<xsl:value-of select="php:function('lang', 'enables help message for this 
attribute')"/>
                                                                </xsl:attribute>
-                                                               <xsl:value-of 
select="value_helpmsg"/>          
+                                                               <xsl:value-of 
select="value_helpmsg"/>
                                                        </textarea>
                                                </td>
                                        </tr>
-
                                        <xsl:choose>
                                                <xsl:when test="multiple_choice 
= 1">
                                                        <tr>
@@ -1479,7 +1632,7 @@
                                                                                
<xsl:attribute name="title">
                                                                                
        <xsl:text>parameter1 = value1, parameter2 = value2...</xsl:text>
                                                                                
</xsl:attribute>
-                                                                               
<xsl:value-of select="value_get_list_function_input"/>          
+                                                                               
<xsl:value-of select="value_get_list_function_input"/>
                                                                        
</textarea>
                                                                </td>
                                                        </tr>
@@ -1508,16 +1661,17 @@
                                                                                
<xsl:attribute name="title">
                                                                                
        <xsl:text>parameter1 = value1, parameter2 = value2...</xsl:text>
                                                                                
</xsl:attribute>
-                                                                               
<xsl:value-of select="value_get_single_function_input"/>                
+                                                                               
<xsl:value-of select="value_get_single_function_input"/>
                                                                        
</textarea>
                                                                </td>
                                                        </tr>
                                                </xsl:when>
                                        </xsl:choose>
-
                                        <tr height="50">
                                                <td>
-                                                       <xsl:variable 
name="lang_save"><xsl:value-of select="php:function('lang', 
'save')"/></xsl:variable>
+                                                       <xsl:variable 
name="lang_save">
+                                                               <xsl:value-of 
select="php:function('lang', 'save')"/>
+                                                       </xsl:variable>
                                                        <input type="submit" 
name="values[save]" value="{$lang_save}">
                                                                <xsl:attribute 
name="title">
                                                                        
<xsl:value-of select="php:function('lang', 'save the attribute')"/>
@@ -1528,8 +1682,12 @@
                                </form>
                                <tr>
                                        <td>
-                                               <xsl:variable 
name="done_action"><xsl:value-of select="done_action"/></xsl:variable>
-                                               <xsl:variable 
name="lang_done"><xsl:value-of select="php:function('lang', 
'done')"/></xsl:variable>
+                                               <xsl:variable 
name="done_action">
+                                                       <xsl:value-of 
select="done_action"/>
+                                               </xsl:variable>
+                                               <xsl:variable name="lang_done">
+                                                       <xsl:value-of 
select="php:function('lang', 'done')"/>
+                                               </xsl:variable>
                                                <form method="post" 
action="{$done_action}">
                                                        <input type="submit" 
name="done" value="{$lang_done}">
                                                                <xsl:attribute 
name="title">
@@ -1543,12 +1701,8 @@
                </div>
        </xsl:template>
 
-
-
-<!-- list custom_function -->
-
+       <!-- list custom_function -->
        <xsl:template match="list_custom_function">
-
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <tr>
                                <td align="right">
@@ -1585,12 +1739,20 @@
                        <xsl:apply-templates select="table_add"/>
                </table>
        </xsl:template>
+
+       <!-- New template-->
        <xsl:template match="table_header_custom_function">
-               <xsl:variable name="sort_sorting"><xsl:value-of 
select="sort_sorting"/></xsl:variable>
-               <xsl:variable name="sort_name"><xsl:value-of 
select="sort_name"/></xsl:variable>
+               <xsl:variable name="sort_sorting">
+                       <xsl:value-of select="sort_sorting"/>
+               </xsl:variable>
+               <xsl:variable name="sort_name">
+                       <xsl:value-of select="sort_name"/>
+               </xsl:variable>
                <tr class="th">
                        <td class="th_text" width="10%" align="left">
-                               <a href="{$sort_name}"><xsl:value-of 
select="lang_name"/></a>
+                               <a href="{$sort_name}">
+                                       <xsl:value-of select="lang_name"/>
+                               </a>
                        </td>
                        <td class="th_text" width="20%" align="left">
                                <xsl:value-of select="lang_descr"/>
@@ -1599,7 +1761,9 @@
                                <xsl:value-of select="lang_active"/>
                        </td>
                        <td class="th_text" width="10%" align="center">
-                               <a href="{$sort_sorting}"><xsl:value-of 
select="lang_sorting"/></a>
+                               <a href="{$sort_sorting}">
+                                       <xsl:value-of select="lang_sorting"/>
+                               </a>
                        </td>
                        <td class="th_text" width="5%" align="center">
                                <xsl:value-of select="lang_edit"/>
@@ -1610,11 +1774,20 @@
                </tr>
        </xsl:template>
 
-       <xsl:template match="values_custom_function"> 
-               <xsl:variable name="lang_up_text"><xsl:value-of 
select="lang_up_text"/></xsl:variable>
-               <xsl:variable name="lang_down_text"><xsl:value-of 
select="lang_down_text"/></xsl:variable>
-               <xsl:variable name="lang_edit_text"><xsl:value-of 
select="lang_edit_text"/></xsl:variable>
-               <xsl:variable name="lang_delete_text"><xsl:value-of 
select="lang_delete_text"/></xsl:variable>
+       <!-- New template-->
+       <xsl:template match="values_custom_function">
+               <xsl:variable name="lang_up_text">
+                       <xsl:value-of select="lang_up_text"/>
+               </xsl:variable>
+               <xsl:variable name="lang_down_text">
+                       <xsl:value-of select="lang_down_text"/>
+               </xsl:variable>
+               <xsl:variable name="lang_edit_text">
+                       <xsl:value-of select="lang_edit_text"/>
+               </xsl:variable>
+               <xsl:variable name="lang_delete_text">
+                       <xsl:value-of select="lang_delete_text"/>
+               </xsl:variable>
                <tr>
                        <xsl:attribute name="class">
                                <xsl:choose>
@@ -1644,35 +1817,46 @@
                                                <td>
                                                        <xsl:value-of 
select="sorting"/>
                                                </td>
-
                                                <td align="left">
-                                                       <xsl:variable 
name="link_up"><xsl:value-of select="link_up"/></xsl:variable>
-                                                       <a href="{$link_up}" 
onMouseover="window.status='{$lang_up_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of select="text_up"/></a>
+                                                       <xsl:variable 
name="link_up">
+                                                               <xsl:value-of 
select="link_up"/>
+                                                       </xsl:variable>
+                                                       <a href="{$link_up}" 
onMouseover="window.status='{$lang_up_text}';return true;" 
onMouseout="window.status='';return true;">
+                                                               <xsl:value-of 
select="text_up"/>
+                                                       </a>
                                                        <xsl:text> | </xsl:text>
-                                                       <xsl:variable 
name="link_down"><xsl:value-of select="link_down"/></xsl:variable>
-                                                       <a href="{$link_down}" 
onMouseover="window.status='{$lang_down_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_down"/></a>
+                                                       <xsl:variable 
name="link_down">
+                                                               <xsl:value-of 
select="link_down"/>
+                                                       </xsl:variable>
+                                                       <a href="{$link_down}" 
onMouseover="window.status='{$lang_down_text}';return true;" 
onMouseout="window.status='';return true;">
+                                                               <xsl:value-of 
select="text_down"/>
+                                                       </a>
                                                </td>
-
                                        </tr>
                                </table>
                        </td>
                        <td align="center">
-                               <xsl:variable name="link_edit"><xsl:value-of 
select="link_edit"/></xsl:variable>
-                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_edit"/></a>
+                               <xsl:variable name="link_edit">
+                                       <xsl:value-of select="link_edit"/>
+                               </xsl:variable>
+                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_text}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_edit"/>
+                               </a>
                        </td>
                        <td align="center">
-                               <xsl:variable name="link_delete"><xsl:value-of 
select="link_delete"/></xsl:variable>
-                               <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_delete"/></a>
+                               <xsl:variable name="link_delete">
+                                       <xsl:value-of select="link_delete"/>
+                               </xsl:variable>
+                               <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_text}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_delete"/>
+                               </a>
                        </td>
                </tr>
        </xsl:template>
 
-
-<!-- add custom_function / edit custom_function -->
-
+       <!-- add custom_function / edit custom_function -->
        <xsl:template match="edit_custom_function">
                <div align="left">
-
                        <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
                                <xsl:choose>
                                        <xsl:when test="msgbox_data != ''">
@@ -1683,10 +1867,10 @@
                                                </tr>
                                        </xsl:when>
                                </xsl:choose>
-
-                               <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
+                               <xsl:variable name="form_action">
+                                       <xsl:value-of select="form_action"/>
+                               </xsl:variable>
                                <form method="post" action="{$form_action}">
-
                                        <tr>
                                                <td class="th_text" 
align="left">
                                                        <xsl:value-of 
select="lang_entity"/>
@@ -1726,9 +1910,8 @@
                                                                        
<xsl:value-of select="lang_descr_custom_functiontext"/>
                                                                        
<xsl:text>'; return true;</xsl:text>
                                                                </xsl:attribute>
-                                                               <xsl:value-of 
select="value_descr"/>            
+                                                               <xsl:value-of 
select="value_descr"/>
                                                        </textarea>
-
                                                </td>
                                        </tr>
                                        <tr>
@@ -1736,9 +1919,13 @@
                                                        <xsl:value-of 
select="lang_custom_function"/>
                                                </td>
                                                <td valign="top">
-                                                       <xsl:variable 
name="lang_custom_function_statustext"><xsl:value-of 
select="lang_custom_function_statustext"/></xsl:variable>
+                                                       <xsl:variable 
name="lang_custom_function_statustext">
+                                                               <xsl:value-of 
select="lang_custom_function_statustext"/>
+                                                       </xsl:variable>
                                                        <select 
name="values[custom_function_file]" class="forms" 
onMouseover="window.status='{$lang_custom_function_statustext}'; return true;" 
onMouseout="window.status='';return true;">
-                                                               <option 
value=""><xsl:value-of select="lang_no_custom_function"/></option>
+                                                               <option 
value="">
+                                                                       
<xsl:value-of select="lang_no_custom_function"/>
+                                                               </option>
                                                                
<xsl:apply-templates select="custom_function_list"/>
                                                        </select>
                                                </td>
@@ -1772,7 +1959,9 @@
                                        </tr>
                                        <tr height="50">
                                                <td>
-                                                       <xsl:variable 
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
+                                                       <xsl:variable 
name="lang_save">
+                                                               <xsl:value-of 
select="lang_save"/>
+                                                       </xsl:variable>
                                                        <input type="submit" 
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return 
true;">
                                                                <xsl:attribute 
name="onMouseover">
                                                                        
<xsl:text>window.status='</xsl:text>
@@ -1782,12 +1971,15 @@
                                                        </input>
                                                </td>
                                        </tr>
-
                                </form>
                                <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>
+                                               <xsl:variable 
name="done_action">
+                                                       <xsl:value-of 
select="done_action"/>
+                                               </xsl:variable>
+                                               <xsl:variable name="lang_done">
+                                                       <xsl:value-of 
select="lang_done"/>
+                                               </xsl:variable>
                                                <form method="post" 
action="{$done_action}">
                                                        <input type="submit" 
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
                                                                <xsl:attribute 
name="onMouseover">
@@ -1803,78 +1995,106 @@
                </div>
        </xsl:template>
 
-
-<!-- attrib_group_list -->     
-
+       <!-- attrib_group_list -->
        <xsl:template match="attrib_group_list">
-               <xsl:variable name="id"><xsl:value-of 
select="id"/></xsl:variable>
+               <xsl:variable name="id">
+                       <xsl:value-of select="id"/>
+               </xsl:variable>
                <xsl:choose>
                        <xsl:when test="selected">
-                               <option value="{$id}" 
selected="selected"><xsl:value-of disable-output-escaping="yes" 
select="name"/></option>
+                               <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>
+                               <option value="{$id}">
+                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
+                               </option>
                        </xsl:otherwise>
                </xsl:choose>
        </xsl:template>
 
-<!-- datatype_list --> 
-
+       <!-- datatype_list -->
        <xsl:template match="datatype_list">
-               <xsl:variable name="id"><xsl:value-of 
select="id"/></xsl:variable>
+               <xsl:variable name="id">
+                       <xsl:value-of select="id"/>
+               </xsl:variable>
                <xsl:choose>
                        <xsl:when test="selected">
-                               <option value="{$id}" 
selected="selected"><xsl:value-of disable-output-escaping="yes" 
select="name"/></option>
+                               <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>
+                               <option value="{$id}">
+                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
+                               </option>
                        </xsl:otherwise>
                </xsl:choose>
        </xsl:template>
 
-<!-- custom_function_list -->  
-
+       <!-- custom_function_list -->
        <xsl:template match="custom_function_list">
-               <xsl:variable name="id"><xsl:value-of 
select="id"/></xsl:variable>
+               <xsl:variable name="id">
+                       <xsl:value-of select="id"/>
+               </xsl:variable>
                <xsl:choose>
                        <xsl:when test="selected=1">
-                               <option value="{$id}" 
selected="selected"><xsl:value-of disable-output-escaping="yes" 
select="name"/></option>
+                               <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>
+                               <option value="{$id}">
+                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
+                               </option>
                        </xsl:otherwise>
                </xsl:choose>
        </xsl:template>
 
-<!-- nullable_list --> 
-
+       <!-- nullable_list -->
        <xsl:template match="nullable_list">
-               <xsl:variable name="id"><xsl:value-of 
select="id"/></xsl:variable>
+               <xsl:variable name="id">
+                       <xsl:value-of select="id"/>
+               </xsl:variable>
                <xsl:choose>
                        <xsl:when test="selected">
-                               <option value="{$id}" 
selected="selected"><xsl:value-of disable-output-escaping="yes" 
select="name"/></option>
+                               <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>
+                               <option value="{$id}">
+                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
+                               </option>
                        </xsl:otherwise>
                </xsl:choose>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template match="parent_list">
                <xsl:choose>
                        <xsl:when test="selected">
-                               <option value="{id}" 
selected="selected"><xsl:value-of disable-output-escaping="yes" 
select="name"/></option>
+                               <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>
+                               <option value="{id}">
+                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
+                               </option>
                        </xsl:otherwise>
                </xsl:choose>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template match="category_list">
-               <option value="{id}"><xsl:value-of 
disable-output-escaping="yes" select="name"/></option>
+               <option value="{id}">
+                       <xsl:value-of disable-output-escaping="yes" 
select="name"/>
+               </option>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template xmlns:php="http://php.net/xsl"; name="choice">
                <table cellpadding="2" cellspacing="2" width="80%" align="left">
                        <xsl:choose>
@@ -1951,6 +2171,7 @@
                </table>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template name="include_list">
                <table cellpadding="2" cellspacing="2" width="80%" align="left">
                        <tr class="th">
@@ -2006,6 +2227,7 @@
                </table>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template name="include_list_2">
                <table cellpadding="2" cellspacing="2" width="80%" align="left">
                        <tr class="th">
@@ -2060,6 +2282,8 @@
                        </xsl:for-each>
                </table>
        </xsl:template>
+
+       <!-- New template-->
        <xsl:template name="include_list_3">
                <table cellpadding="2" cellspacing="2" width="80%" align="left">
                        <tr class="th">
@@ -2110,6 +2334,7 @@
                </table>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template match="options">
                <option value="{id}">
                        <xsl:if test="selected != 0">

Modified: trunk/property/templates/base/admin_location.xsl
===================================================================
--- trunk/property/templates/base/admin_location.xsl    2011-12-25 20:48:28 UTC 
(rev 8436)
+++ trunk/property/templates/base/admin_location.xsl    2011-12-26 19:11:48 UTC 
(rev 8437)
@@ -1,5 +1,4 @@
-<!-- $Id$ -->
-
+  <!-- $Id$ -->
        <xsl:template name="app_data">
                <xsl:choose>
                        <xsl:when test="edit">
@@ -22,8 +21,10 @@
                        </xsl:otherwise>
                </xsl:choose>
        </xsl:template>
-       <xsl:template match="list">             
-               <xsl:apply-templates select="menu"/> 
+
+       <!-- New template-->
+       <xsl:template match="list">
+               <xsl:apply-templates select="menu"/>
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <xsl:choose>
                                <xsl:when test="msgbox_data != ''">
@@ -42,8 +43,8 @@
                        <tr>
                                <td colspan="3" width="100%">
                                        <xsl:call-template name="nextmatchs"/>
-                                       <!--    <xsl:with-param 
name="nextmatchs_params"/>
-                                       </xsl:call-template> -->
+                                       <!--<xsl:with-param 
name="nextmatchs_params"/>
+</xsl:call-template> -->
                                </td>
                        </tr>
                </table>
@@ -54,9 +55,14 @@
                </table>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template match="table_header">
-               <xsl:variable name="sort_id"><xsl:value-of 
select="sort_id"/></xsl:variable>
-               <xsl:variable name="sort_name"><xsl:value-of 
select="sort_name"/></xsl:variable>
+               <xsl:variable name="sort_id">
+                       <xsl:value-of select="sort_id"/>
+               </xsl:variable>
+               <xsl:variable name="sort_name">
+                       <xsl:value-of select="sort_name"/>
+               </xsl:variable>
                <tr class="th">
                        <td class="th_text" width="10%" align="right">
                                <a href="{$sort_id}"><xsl:value-of 
select="lang_id"/></a>
@@ -70,25 +76,24 @@
                        <td class="th_text" width="5%" align="center">
                                <xsl:value-of select="lang_categories"/>
                        </td>
-                       '                       <td class="th_text" width="5%" 
align="center">
-                               <xsl:value-of select="lang_attribute_group"/>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_attribute"/>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_edit"/>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_delete"/>
-                       </td>
+                       <td class="th_text" width="5%" 
align="center"><xsl:value-of select="lang_attribute_group"/></td>
+                       <td class="th_text" width="5%" 
align="center"><xsl:value-of select="lang_attribute"/></td>
+                       <td class="th_text" width="5%" 
align="center"><xsl:value-of select="lang_edit"/></td>
+                       <td class="th_text" width="5%" 
align="center"><xsl:value-of select="lang_delete"/></td>
                </tr>
        </xsl:template>
 
-       <xsl:template match="values"> 
-               <xsl:variable name="lang_attribute_standardtext"><xsl:value-of 
select="lang_delete_standardtext"/></xsl:variable>
-               <xsl:variable name="lang_edit_standardtext"><xsl:value-of 
select="lang_edit_standardtext"/></xsl:variable>
-               <xsl:variable name="lang_delete_standardtext"><xsl:value-of 
select="lang_delete_standardtext"/></xsl:variable>
+       <!-- New template-->
+       <xsl:template match="values">
+               <xsl:variable name="lang_attribute_standardtext">
+                       <xsl:value-of select="lang_delete_standardtext"/>
+               </xsl:variable>
+               <xsl:variable name="lang_edit_standardtext">
+                       <xsl:value-of select="lang_edit_standardtext"/>
+               </xsl:variable>
+               <xsl:variable name="lang_delete_standardtext">
+                       <xsl:value-of select="lang_delete_standardtext"/>
+               </xsl:variable>
                <tr>
                        <xsl:attribute name="class">
                                <xsl:choose>
@@ -103,7 +108,6 @@
                                        </xsl:otherwise>
                                </xsl:choose>
                        </xsl:attribute>
-
                        <td align="right">
                                <xsl:value-of select="id"/>
                        </td>
@@ -114,31 +118,51 @@
                                <xsl:value-of select="first"/>
                        </td>
                        <td align="center">
-                               <xsl:variable 
name="link_categories"><xsl:value-of select="link_categories"/></xsl:variable>
-                               <a href="{$link_categories}" 
onMouseover="window.status='{lang_category_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_categories"/></a>
+                               <xsl:variable name="link_categories">
+                                       <xsl:value-of select="link_categories"/>
+                               </xsl:variable>
+                               <a href="{$link_categories}" 
onMouseover="window.status='{lang_category_text}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_categories"/>
+                               </a>
                        </td>
                        <td align="center">
-                               <xsl:variable 
name="link_attribute_group"><xsl:value-of 
select="link_attribute_group"/></xsl:variable>
-                               <a href="{$link_attribute_group}" 
onMouseover="window.status='';return true;" onMouseout="window.status='';return 
true;"><xsl:value-of select="text_attribute_group"/></a>
+                               <xsl:variable name="link_attribute_group">
+                                       <xsl:value-of 
select="link_attribute_group"/>
+                               </xsl:variable>
+                               <a href="{$link_attribute_group}" 
onMouseover="window.status='';return true;" onMouseout="window.status='';return 
true;">
+                                       <xsl:value-of 
select="text_attribute_group"/>
+                               </a>
                        </td>
                        <td align="center">
-                               <xsl:variable 
name="link_attribute"><xsl:value-of select="link_attribute"/></xsl:variable>
-                               <a href="{$link_attribute}" 
onMouseover="window.status='{$lang_attribute_standardtext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_attribute"/></a>
+                               <xsl:variable name="link_attribute">
+                                       <xsl:value-of select="link_attribute"/>
+                               </xsl:variable>
+                               <a href="{$link_attribute}" 
onMouseover="window.status='{$lang_attribute_standardtext}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_attribute"/>
+                               </a>
                        </td>
                        <td align="center">
-                               <xsl:variable name="link_edit"><xsl:value-of 
select="link_edit"/></xsl:variable>
-                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_standardtext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_edit"/></a>
+                               <xsl:variable name="link_edit">
+                                       <xsl:value-of select="link_edit"/>
+                               </xsl:variable>
+                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_standardtext}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_edit"/>
+                               </a>
                        </td>
                        <td align="center">
-                               <xsl:variable name="link_delete"><xsl:value-of 
select="link_delete"/></xsl:variable>
-                               <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_standardtext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_delete"/></a>
+                               <xsl:variable name="link_delete">
+                                       <xsl:value-of select="link_delete"/>
+                               </xsl:variable>
+                               <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_standardtext}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_delete"/>
+                               </a>
                        </td>
                </tr>
        </xsl:template>
 
-
-       <xsl:template match="list_config">              
-               <xsl:apply-templates select="menu"/> 
+       <!-- New template-->
+       <xsl:template match="list_config">
+               <xsl:apply-templates select="menu"/>
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <tr>
                                <td align="right">
@@ -157,15 +181,24 @@
                </table>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template match="table_header_list_config">
-               <xsl:variable name="sort_column_name"><xsl:value-of 
select="sort_column_name"/></xsl:variable>
-               <xsl:variable name="sort_name"><xsl:value-of 
select="sort_name"/></xsl:variable>
+               <xsl:variable name="sort_column_name">
+                       <xsl:value-of select="sort_column_name"/>
+               </xsl:variable>
+               <xsl:variable name="sort_name">
+                       <xsl:value-of select="sort_name"/>
+               </xsl:variable>
                <tr class="th">
                        <td class="th_text" width="10%" align="center">
-                               <a href="{$sort_column_name}"><xsl:value-of 
select="lang_column_name"/></a>
+                               <a href="{$sort_column_name}">
+                                       <xsl:value-of 
select="lang_column_name"/>
+                               </a>
                        </td>
                        <td class="th_text" width="10%" align="center">
-                               <a href="{$sort_name}"><xsl:value-of 
select="lang_name"/></a>
+                               <a href="{$sort_name}">
+                                       <xsl:value-of select="lang_name"/>
+                               </a>
                        </td>
                        <td class="th_text" width="5%" align="center">
                                <xsl:value-of select="lang_edit"/>
@@ -173,8 +206,11 @@
                </tr>
        </xsl:template>
 
-       <xsl:template match="values_list_config"> 
-               <xsl:variable name="lang_edit_standardtext"><xsl:value-of 
select="lang_edit_standardtext"/></xsl:variable>
+       <!-- New template-->
+       <xsl:template match="values_list_config">
+               <xsl:variable name="lang_edit_standardtext">
+                       <xsl:value-of select="lang_edit_standardtext"/>
+               </xsl:variable>
                <tr>
                        <xsl:attribute name="class">
                                <xsl:choose>
@@ -189,7 +225,6 @@
                                        </xsl:otherwise>
                                </xsl:choose>
                        </xsl:attribute>
-
                        <td align="left">
                                <xsl:value-of select="column_name"/>
                        </td>
@@ -197,16 +232,19 @@
                                <xsl:value-of select="name"/>
                        </td>
                        <td align="center">
-                               <xsl:variable name="link_edit"><xsl:value-of 
select="link_edit"/></xsl:variable>
-                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_standardtext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_edit"/></a>
+                               <xsl:variable name="link_edit">
+                                       <xsl:value-of select="link_edit"/>
+                               </xsl:variable>
+                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_standardtext}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_edit"/>
+                               </a>
                        </td>
                </tr>
        </xsl:template>
 
-<!-- edit_config  -->
+       <!-- edit_config  -->
        <xsl:template match="edit_config">
                <div align="left">
-
                        <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
                                <xsl:choose>
                                        <xsl:when test="msgbox_data != ''">
@@ -217,9 +255,10 @@
                                                </tr>
                                        </xsl:when>
                                </xsl:choose>
-                               <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
+                               <xsl:variable name="form_action">
+                                       <xsl:value-of select="form_action"/>
+                               </xsl:variable>
                                <form method="post" action="{$form_action}">
-
                                        <xsl:for-each select="location_list">
                                                <tr>
                                                        <td class="th_text" 
align="left">
@@ -228,40 +267,33 @@
                                                                <xsl:value-of 
select="name"/>
                                                        </td>
                                                        <td align="left">
-
                                                                <xsl:choose>
                                                                        
<xsl:when test="selected='selected'">
                                                                                
<input type="radio" name="values[{//column_name}]" value="{id}" 
checked="checked" onMouseout="window.status='';return true;">
-                                                                               
        <xsl:attribute name="onMouseover">
-                                                                               
                <xsl:text>window.status='</xsl:text>
+                                                                               
        <xsl:attribute name="title">
                                                                                
                <xsl:value-of select="//lang_config_statustext"/>
-                                                                               
                <xsl:text>'; return true;</xsl:text>
                                                                                
        </xsl:attribute>
                                                                                
</input>
                                                                        
</xsl:when>
                                                                        
<xsl:otherwise>
                                                                                
<input type="radio" name="values[{//column_name}]" value="{id}" 
onMouseout="window.status='';return true;">
-                                                                               
        <xsl:attribute name="onMouseover">
-                                                                               
                <xsl:text>window.status='</xsl:text>
+                                                                               
        <xsl:attribute name="title">
                                                                                
                <xsl:value-of select="//lang_config_statustext"/>
-                                                                               
                <xsl:text>'; return true;</xsl:text>
                                                                                
        </xsl:attribute>
                                                                                
</input>
                                                                        
</xsl:otherwise>
                                                                </xsl:choose>
-
                                                        </td>
                                                </tr>
                                        </xsl:for-each>
-
                                        <tr height="50">
                                                <td>
-                                                       <xsl:variable 
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
+                                                       <xsl:variable 
name="lang_save">
+                                                               <xsl:value-of 
select="lang_save"/>
+                                                       </xsl:variable>
                                                        <input type="submit" 
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return 
true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
+                                                               <xsl:attribute 
name="title">
                                                                        
<xsl:value-of select="lang_save_standardtext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
                                                                </xsl:attribute>
                                                        </input>
                                                </td>
@@ -269,14 +301,16 @@
                                </form>
                                <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>
+                                               <xsl:variable 
name="done_action">
+                                                       <xsl:value-of 
select="done_action"/>
+                                               </xsl:variable>
+                                               <xsl:variable name="lang_done">
+                                                       <xsl:value-of 
select="lang_done"/>
+                                               </xsl:variable>
                                                <form method="post" 
action="{$done_action}">
                                                        <input type="submit" 
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
+                                                               <xsl:attribute 
name="title">
                                                                        
<xsl:value-of select="lang_done_standardtext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
                                                                </xsl:attribute>
                                                        </input>
                                                </form>
@@ -286,30 +320,35 @@
                </div>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template match="table_add">
                <tr>
                        <td height="50">
-                               <xsl:variable name="add_action"><xsl:value-of 
select="add_action"/></xsl:variable>
-                               <xsl:variable name="lang_add"><xsl:value-of 
select="lang_add"/></xsl:variable>
+                               <xsl:variable name="add_action">
+                                       <xsl:value-of select="add_action"/>
+                               </xsl:variable>
+                               <xsl:variable name="lang_add">
+                                       <xsl:value-of select="lang_add"/>
+                               </xsl:variable>
                                <form method="post" action="{$add_action}">
                                        <input type="submit" name="add" 
value="{$lang_add}" onMouseout="window.status='';return true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
+                                               <xsl:attribute name="title">
                                                        <xsl:value-of 
select="lang_add_standardtext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
                                                </xsl:attribute>
                                        </input>
                                </form>
                        </td>
                        <td height="50">
-                               <xsl:variable name="done_action"><xsl:value-of 
select="done_action"/></xsl:variable>
-                               <xsl:variable name="lang_done"><xsl:value-of 
select="lang_done"/></xsl:variable>
+                               <xsl:variable name="done_action">
+                                       <xsl:value-of select="done_action"/>
+                               </xsl:variable>
+                               <xsl:variable name="lang_done">
+                                       <xsl:value-of select="lang_done"/>
+                               </xsl:variable>
                                <form method="post" action="{$done_action}">
                                        <input type="submit" name="add" 
value="{$lang_done}" onMouseout="window.status='';return true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
+                                               <xsl:attribute name="title">
                                                        <xsl:value-of 
select="lang_add_standardtext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
                                                </xsl:attribute>
                                        </input>
                                </form>
@@ -317,10 +356,9 @@
                </tr>
        </xsl:template>
 
-<!-- add / edit  -->
+       <!-- add / edit  -->
        <xsl:template xmlns:php="http://php.net/xsl"; match="edit">
                <div align="left">
-
                        <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
                                <xsl:choose>
                                        <xsl:when test="msgbox_data != ''">
@@ -331,7 +369,9 @@
                                                </tr>
                                        </xsl:when>
                                </xsl:choose>
-                               <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
+                               <xsl:variable name="form_action">
+                                       <xsl:value-of select="form_action"/>
+                               </xsl:variable>
                                <form method="post" action="{$form_action}">
                                        <tr>
                                                <td valign="top">
@@ -350,7 +390,7 @@
                                                                </xsl:when>
                                                                <xsl:otherwise>
                                                                </xsl:otherwise>
-                                                       </xsl:choose>   
+                                                       </xsl:choose>
                                                </td>
                                        </tr>
                                        <tr>
@@ -378,9 +418,8 @@
                                                                        
<xsl:value-of select="lang_descr_standardtext"/>
                                                                        
<xsl:text>'; return true;</xsl:text>
                                                                </xsl:attribute>
-                                                               <xsl:value-of 
select="value_descr"/>            
+                                                               <xsl:value-of 
select="value_descr"/>
                                                        </textarea>
-
                                                </td>
                                        </tr>
                                        <xsl:choose>
@@ -395,7 +434,7 @@
                                                        </tr>
                                                        <tr>
                                                                <td 
align="left">
-                                                                       
<xsl:value-of select="php:function('lang', 'list address')"/>                   
                                
+                                                                       
<xsl:value-of select="php:function('lang', 'list address')"/>
                                                                </td>
                                                                <td>
                                                                        <input 
type="checkbox" name="values[list_address]" value="1">
@@ -412,7 +451,7 @@
                                                        </tr>
                                                        <tr>
                                                                <td 
align="left">
-                                                                       
<xsl:value-of select="php:function('lang', 'list documents')"/>                 
                                
+                                                                       
<xsl:value-of select="php:function('lang', 'list documents')"/>
                                                                </td>
                                                                <td>
                                                                        <input 
type="checkbox" name="values[list_documents]" value="1">
@@ -428,10 +467,12 @@
                                                                </td>
                                                        </tr>
                                                </xsl:when>
-                                       </xsl:choose>   
+                                       </xsl:choose>
                                        <tr height="50">
                                                <td>
-                                                       <xsl:variable 
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
+                                                       <xsl:variable 
name="lang_save">
+                                                               <xsl:value-of 
select="lang_save"/>
+                                                       </xsl:variable>
                                                        <input type="submit" 
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return 
true;">
                                                                <xsl:attribute 
name="onMouseover">
                                                                        
<xsl:text>window.status='</xsl:text>
@@ -444,8 +485,12 @@
                                </form>
                                <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>
+                                               <xsl:variable 
name="done_action">
+                                                       <xsl:value-of 
select="done_action"/>
+                                               </xsl:variable>
+                                               <xsl:variable name="lang_done">
+                                                       <xsl:value-of 
select="lang_done"/>
+                                               </xsl:variable>
                                                <form method="post" 
action="{$done_action}">
                                                        <input type="submit" 
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
                                                                <xsl:attribute 
name="onMouseover">
@@ -461,10 +506,9 @@
                </div>
        </xsl:template>
 
-<!-- list attribute -->
-
+       <!-- New template-->
+       <!-- list attribute -->
        <xsl:template match="list_attribute">
-
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <tr>
                                <td align="left">
@@ -490,13 +534,23 @@
                        <xsl:apply-templates select="table_add"/>
                </table>
        </xsl:template>
+
+       <!-- New template-->
        <xsl:template match="table_header_attrib">
-               <xsl:variable name="sort_sorting"><xsl:value-of 
select="sort_sorting"/></xsl:variable>
-               <xsl:variable name="sort_id"><xsl:value-of 
select="sort_id"/></xsl:variable>
-               <xsl:variable name="sort_name"><xsl:value-of 
select="sort_name"/></xsl:variable>
+               <xsl:variable name="sort_sorting">
+                       <xsl:value-of select="sort_sorting"/>
+               </xsl:variable>
+               <xsl:variable name="sort_id">
+                       <xsl:value-of select="sort_id"/>
+               </xsl:variable>
+               <xsl:variable name="sort_name">
+                       <xsl:value-of select="sort_name"/>
+               </xsl:variable>
                <tr class="th">
                        <td class="th_text" width="10%" align="left">
-                               <a href="{$sort_name}"><xsl:value-of 
select="lang_name"/></a>
+                               <a href="{$sort_name}">
+                                       <xsl:value-of select="lang_name"/>
+                               </a>
                        </td>
                        <td class="th_text" width="10%" align="left">
                                <xsl:value-of select="lang_descr"/>
@@ -505,7 +559,9 @@
                                <xsl:value-of select="lang_datatype"/>
                        </td>
                        <td class="th_text" width="5%" align="center">
-                               <a href="{$sort_sorting}"><xsl:value-of 
select="lang_sorting"/></a>
+                               <a href="{$sort_sorting}">
+                                       <xsl:value-of select="lang_sorting"/>
+                               </a>
                        </td>
                        <td class="th_text" width="5%" align="center">
                                <xsl:value-of select="lang_edit"/>
@@ -516,12 +572,23 @@
                </tr>
        </xsl:template>
 
-       <xsl:template match="values_attrib"> 
-               <xsl:variable name="lang_up_text"><xsl:value-of 
select="lang_up_text"/></xsl:variable>
-               <xsl:variable name="lang_down_text"><xsl:value-of 
select="lang_down_text"/></xsl:variable>
-               <xsl:variable name="lang_attribute_attribtext"><xsl:value-of 
select="lang_delete_attribtext"/></xsl:variable>
-               <xsl:variable name="lang_edit_attribtext"><xsl:value-of 
select="lang_edit_attribtext"/></xsl:variable>
-               <xsl:variable name="lang_delete_attribtext"><xsl:value-of 
select="lang_delete_attribtext"/></xsl:variable>
+       <!-- New template-->
+       <xsl:template match="values_attrib">
+               <xsl:variable name="lang_up_text">
+                       <xsl:value-of select="lang_up_text"/>
+               </xsl:variable>
+               <xsl:variable name="lang_down_text">
+                       <xsl:value-of select="lang_down_text"/>
+               </xsl:variable>
+               <xsl:variable name="lang_attribute_attribtext">
+                       <xsl:value-of select="lang_delete_attribtext"/>
+               </xsl:variable>
+               <xsl:variable name="lang_edit_attribtext">
+                       <xsl:value-of select="lang_edit_attribtext"/>
+               </xsl:variable>
+               <xsl:variable name="lang_delete_attribtext">
+                       <xsl:value-of select="lang_delete_attribtext"/>
+               </xsl:variable>
                <tr>
                        <xsl:attribute name="class">
                                <xsl:choose>
@@ -551,35 +618,46 @@
                                                <td>
                                                        <xsl:value-of 
select="sorting"/>
                                                </td>
-
                                                <td align="left">
-                                                       <xsl:variable 
name="link_up"><xsl:value-of select="link_up"/></xsl:variable>
-                                                       <a href="{$link_up}" 
onMouseover="window.status='{$lang_up_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of select="text_up"/></a>
+                                                       <xsl:variable 
name="link_up">
+                                                               <xsl:value-of 
select="link_up"/>
+                                                       </xsl:variable>
+                                                       <a href="{$link_up}" 
onMouseover="window.status='{$lang_up_text}';return true;" 
onMouseout="window.status='';return true;">
+                                                               <xsl:value-of 
select="text_up"/>
+                                                       </a>
                                                        <xsl:text> | </xsl:text>
-                                                       <xsl:variable 
name="link_down"><xsl:value-of select="link_down"/></xsl:variable>
-                                                       <a href="{$link_down}" 
onMouseover="window.status='{$lang_down_text}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_down"/></a>
+                                                       <xsl:variable 
name="link_down">
+                                                               <xsl:value-of 
select="link_down"/>
+                                                       </xsl:variable>
+                                                       <a href="{$link_down}" 
onMouseover="window.status='{$lang_down_text}';return true;" 
onMouseout="window.status='';return true;">
+                                                               <xsl:value-of 
select="text_down"/>
+                                                       </a>
                                                </td>
-
                                        </tr>
                                </table>
                        </td>
                        <td align="center">
-                               <xsl:variable name="link_edit"><xsl:value-of 
select="link_edit"/></xsl:variable>
-                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_attribtext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_edit"/></a>
+                               <xsl:variable name="link_edit">
+                                       <xsl:value-of select="link_edit"/>
+                               </xsl:variable>
+                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_attribtext}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_edit"/>
+                               </a>
                        </td>
                        <td align="center">
-                               <xsl:variable name="link_delete"><xsl:value-of 
select="link_delete"/></xsl:variable>
-                               <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_attribtext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_delete"/></a>
+                               <xsl:variable name="link_delete">
+                                       <xsl:value-of select="link_delete"/>
+                               </xsl:variable>
+                               <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_attribtext}';return true;" 
onMouseout="window.status='';return true;">
+                                       <xsl:value-of select="text_delete"/>
+                               </a>
                        </td>
                </tr>
        </xsl:template>
 
-
-<!-- add attribute / edit attribute -->
-
+       <!-- add attribute / edit attribute -->
        <xsl:template xmlns:php="http://php.net/xsl"; match="edit_attrib">
                <div align="left">
-
                        <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
                                <xsl:choose>
                                        <xsl:when test="msgbox_data != ''">
@@ -590,8 +668,9 @@
                                                </tr>
                                        </xsl:when>
                                </xsl:choose>
-
-                               <xsl:variable name="form_action"><xsl:value-of 
select="form_action"/></xsl:variable>
+                               <xsl:variable name="form_action">
+                                       <xsl:value-of select="form_action"/>
+                               </xsl:variable>
                                <form method="post" action="{$form_action}">
                                        <tr>
                                                <td valign="top">
@@ -610,7 +689,7 @@
                                                                </xsl:when>
                                                                <xsl:otherwise>
                                                                </xsl:otherwise>
-                                                       </xsl:choose>   
+                                                       </xsl:choose>
                                                </td>
                                        </tr>
                                        <tr>
@@ -646,21 +725,25 @@
                                                                <xsl:attribute 
name="title">
                                                                        
<xsl:value-of select="lang_statustext_attribtext"/>
                                                                </xsl:attribute>
-                                                               <xsl:value-of 
select="value_statustext"/>               
+                                                               <xsl:value-of 
select="value_statustext"/>
                                                        </textarea>
-
                                                </td>
                                        </tr>
-
                                        <tr>
                                                <td valign="top">
                                                        <xsl:value-of 
select="lang_location_type"/>
                                                </td>
                                                <td valign="top">
-                                                       <xsl:variable 
name="lang_entity_statustext"><xsl:value-of 
select="lang_entity_statustext"/></xsl:variable>
-                                                       <xsl:variable 
name="select_location_type"><xsl:value-of 
select="select_location_type"/></xsl:variable>
+                                                       <xsl:variable 
name="lang_entity_statustext">
+                                                               <xsl:value-of 
select="lang_entity_statustext"/>
+                                                       </xsl:variable>
+                                                       <xsl:variable 
name="select_location_type">
+                                                               <xsl:value-of 
select="select_location_type"/>
+                                                       </xsl:variable>
                                                        <select 
name="{$select_location_type}" class="forms" title="{$lang_entity_statustext}">
-                                                               <option 
value=""><xsl:value-of select="lang_no_location_type"/></option>
+                                                               <option 
value="">
+                                                                       
<xsl:value-of select="lang_no_location_type"/>
+                                                               </option>
                                                                
<xsl:apply-templates select="entity_list"/>
                                                        </select>
                                                </td>
@@ -674,7 +757,6 @@
                                                                <xsl:attribute 
name="title">
                                                                        
<xsl:value-of select="php:function('lang', 'select a group')"/>
                                                                </xsl:attribute>
-
                                                                <option 
value="">
                                                                        
<xsl:value-of select="php:function('lang', 'no group')"/>
                                                                </option>
@@ -682,7 +764,6 @@
                                                        </select>
                                                </td>
                                        </tr>
-
                                        <tr>
                                                <td valign="top">
                                                        <xsl:value-of 
select="php:function('lang', 'datatype')"/>
@@ -768,7 +849,6 @@
                                                        </input>
                                                </td>
                                        </tr>
-
                                        <tr>
                                                <td>
                                                        <xsl:value-of 
select="php:function('lang', 'show in list')"/>
@@ -803,7 +883,6 @@
                                                        </input>
                                                </td>
                                        </tr>
-
                                        <xsl:choose>
                                                <xsl:when test="multiple_choice 
!= ''">
                                                        <tr>
@@ -818,28 +897,29 @@
                                        </xsl:choose>
                                        <tr height="50">
                                                <td>
-                                                       <xsl:variable 
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
+                                                       <xsl:variable 
name="lang_save">
+                                                               <xsl:value-of 
select="lang_save"/>
+                                                       </xsl:variable>
                                                        <input type="submit" 
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return 
true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
+                                                               <xsl:attribute 
name="title">
                                                                        
<xsl:value-of select="lang_save_attribtext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
                                                                </xsl:attribute>
                                                        </input>
                                                </td>
                                        </tr>
-
                                </form>
                                <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>
+                                               <xsl:variable 
name="done_action">
+                                                       <xsl:value-of 
select="done_action"/>
+                                               </xsl:variable>
+                                               <xsl:variable name="lang_done">
+                                                       <xsl:value-of 
select="lang_done"/>
+                                               </xsl:variable>
                                                <form method="post" 
action="{$done_action}">
                                                        <input type="submit" 
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="onMouseover">
-                                                                       
<xsl:text>window.status='</xsl:text>
+                                                               <xsl:attribute 
name="title">
                                                                        
<xsl:value-of select="lang_done_attribtext"/>
-                                                                       
<xsl:text>'; return true;</xsl:text>
                                                                </xsl:attribute>
                                                        </input>
                                                </form>
@@ -849,62 +929,87 @@
                </div>
        </xsl:template>
 
-<!-- entity_list -->   
-
+       <!-- New template-->
+       <!-- entity_list -->
        <xsl:template match="entity_list">
-               <xsl:variable name="id"><xsl:value-of 
select="id"/></xsl:variable>
+               <xsl:variable name="id">
+                       <xsl:value-of select="id"/>
+               </xsl:variable>
                <xsl:choose>
                        <xsl:when test="selected">
-                               <option value="{$id}" 
selected="selected"><xsl:value-of disable-output-escaping="yes" 
select="name"/></option>
+                               <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>
+                               <option value="{$id}">
+                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
+                               </option>
                        </xsl:otherwise>
                </xsl:choose>
        </xsl:template>
 
-<!-- attrib_group_list -->     
-
+       <!-- New template-->
+       <!-- attrib_group_list -->
        <xsl:template match="attrib_group_list">
-               <xsl:variable name="id"><xsl:value-of 
select="id"/></xsl:variable>
+               <xsl:variable name="id">
+                       <xsl:value-of select="id"/>
+               </xsl:variable>
                <xsl:choose>
                        <xsl:when test="selected">
-                               <option value="{$id}" 
selected="selected"><xsl:value-of disable-output-escaping="yes" 
select="name"/></option>
+                               <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>
+                               <option value="{$id}">
+                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
+                               </option>
                        </xsl:otherwise>
                </xsl:choose>
        </xsl:template>
 
-<!-- datatype_list --> 
-
+       <!-- New template-->
+       <!-- datatype_list -->
        <xsl:template match="datatype_list">
-               <xsl:variable name="id"><xsl:value-of 
select="id"/></xsl:variable>
+               <xsl:variable name="id">
+                       <xsl:value-of select="id"/>
+               </xsl:variable>
                <xsl:choose>
                        <xsl:when test="selected">
-                               <option value="{$id}" 
selected="selected"><xsl:value-of disable-output-escaping="yes" 
select="name"/></option>
+                               <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>
+                               <option value="{$id}">
+                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
+                               </option>
                        </xsl:otherwise>
                </xsl:choose>
        </xsl:template>
 
-<!-- nullable_list --> 
-
+       <!-- New template-->
+       <!-- nullable_list -->
        <xsl:template match="nullable_list">
-               <xsl:variable name="id"><xsl:value-of 
select="id"/></xsl:variable>
+               <xsl:variable name="id">
+                       <xsl:value-of select="id"/>
+               </xsl:variable>
                <xsl:choose>
                        <xsl:when test="selected">
-                               <option value="{$id}" 
selected="selected"><xsl:value-of disable-output-escaping="yes" 
select="name"/></option>
+                               <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>
+                               <option value="{$id}">
+                                       <xsl:value-of 
disable-output-escaping="yes" select="name"/>
+                               </option>
                        </xsl:otherwise>
                </xsl:choose>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template xmlns:php="http://php.net/xsl"; name="choice">
                <table cellpadding="2" cellspacing="2" width="80%" align="left">
                        <xsl:choose>
@@ -957,10 +1062,8 @@
                                                        </td>
                                                        <td align="center">
                                                                <input 
type="checkbox" name="values[delete_choice][]" value="{id}" 
onMouseout="window.status='';return true;">
-                                                                       
<xsl:attribute name="onMouseover">
-                                                                               
<xsl:text>window.status='</xsl:text>
+                                                                       
<xsl:attribute name="title">
                                                                                
<xsl:value-of select="//lang_delete_choice_statustext"/>
-                                                                               
<xsl:text>'; return true;</xsl:text>
                                                                        
</xsl:attribute>
                                                                </input>
                                                        </td>
@@ -974,10 +1077,8 @@
                                </td>
                                <td valign="top" colspan="2">
                                        <input type="text" 
name="values[new_choice]" onMouseout="window.status='';return true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
+                                               <xsl:attribute name="title">
                                                        <xsl:value-of 
select="lang_new_value_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
                                                </xsl:attribute>
                                        </input>
                                </td>
@@ -985,6 +1086,7 @@
                </table>
        </xsl:template>
 
+       <!-- New template-->
        <xsl:template name="list_info">
                <table cellpadding="2" cellspacing="2" width="80%" align="left">
                        <tr class="th">
@@ -1018,19 +1120,15 @@
                                                <xsl:choose>
                                                        <xsl:when 
test="selected='selected'">
                                                                <input 
type="checkbox" name="values[list_info][{id}]" value="{id}" checked="checked" 
onMouseout="window.status='';return true;">
-                                                                       
<xsl:attribute name="onMouseover">
-                                                                               
<xsl:text>window.status='</xsl:text>
+                                                                       
<xsl:attribute name="title">
                                                                                
<xsl:value-of select="//lang_list_type_statustext"/>
-                                                                               
<xsl:text>'; return true;</xsl:text>
                                                                        
</xsl:attribute>
                                                                </input>
                                                        </xsl:when>
                                                        <xsl:otherwise>
                                                                <input 
type="checkbox" name="values[list_info][{id}]" value="{id}" 
onMouseout="window.status='';return true;">
-                                                                       
<xsl:attribute name="onMouseover">
-                                                                               
<xsl:text>window.status='</xsl:text>
+                                                                       
<xsl:attribute name="title">
                                                                                
<xsl:value-of select="//lang_list_type_statustext"/>
-                                                                               
<xsl:text>'; return true;</xsl:text>
                                                                        
</xsl:attribute>
                                                                </input>
                                                        </xsl:otherwise>

Modified: trunk/property/templates/base/agreement.xsl
===================================================================
--- trunk/property/templates/base/agreement.xsl 2011-12-25 20:48:28 UTC (rev 
8436)
+++ trunk/property/templates/base/agreement.xsl 2011-12-26 19:11:48 UTC (rev 
8437)
@@ -1,469 +1,499 @@
-<!-- $Id$ -->
-
-
-<xsl:template name="app_data">
-       <xsl:choose>
-               <xsl:when test="edit">
-                       <xsl:apply-templates select="edit"/>
-               </xsl:when>
-               <xsl:when test="edit_item">
-                       <xsl:apply-templates select="edit_item"/>
-               </xsl:when>
-               <xsl:when test="view_item">
-                       <xsl:apply-templates select="view_item"/>
-               </xsl:when>
-               <xsl:when test="view">
-                       <xsl:apply-templates select="view"/>
-               </xsl:when>
-               <xsl:when test="list_attribute">
-                       <xsl:apply-templates select="list_attribute"/>
-               </xsl:when>
-               <xsl:when test="edit_attrib">
-                       <xsl:apply-templates select="edit_attrib"/>
-               </xsl:when>
-               <xsl:when test="add_activity">
-                       <xsl:apply-templates select="add_activity"/>
-               </xsl:when>
-               <xsl:otherwise>
-                       <xsl:apply-templates select="list"/>
-               </xsl:otherwise>
-       </xsl:choose>
-</xsl:template>
-
-<xsl:template match="list">
-       <xsl:apply-templates select="menu"/>
-       <table width="100%" cellpadding="2" cellspacing="2" align="center">
+  <!-- $Id$ -->
+       <xsl:template name="app_data">
                <xsl:choose>
-                       <xsl:when test="msgbox_data != ''">
-                               <tr>
-                                       <td align="left" colspan="3">
-                                               <xsl:call-template 
name="msgbox"/>
-                                       </td>
-                               </tr>
+                       <xsl:when test="edit">
+                               <xsl:apply-templates select="edit"/>
                        </xsl:when>
+                       <xsl:when test="edit_item">
+                               <xsl:apply-templates select="edit_item"/>
+                       </xsl:when>
+                       <xsl:when test="view_item">
+                               <xsl:apply-templates select="view_item"/>
+                       </xsl:when>
+                       <xsl:when test="view">
+                               <xsl:apply-templates select="view"/>
+                       </xsl:when>
+                       <xsl:when test="list_attribute">
+                               <xsl:apply-templates select="list_attribute"/>
+                       </xsl:when>
+                       <xsl:when test="edit_attrib">
+                               <xsl:apply-templates select="edit_attrib"/>
+                       </xsl:when>
+                       <xsl:when test="add_activity">
+                               <xsl:apply-templates select="add_activity"/>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <xsl:apply-templates select="list"/>
+                       </xsl:otherwise>
                </xsl:choose>
-               <tr>
+       </xsl:template>
+
+       <!-- New template-->
+       <xsl:template match="list">
+               <xsl:apply-templates select="menu"/>
+               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <xsl:choose>
-                               <xsl:when test="member_of_list != ''">
-                                       <td align="left">
-                                               <xsl:call-template 
name="filter_member_of"/>
-                                       </td>
+                               <xsl:when test="msgbox_data != ''">
+                                       <tr>
+                                               <td align="left" colspan="3">
+                                                       <xsl:call-template 
name="msgbox"/>
+                                               </td>
+                                       </tr>
                                </xsl:when>
                        </xsl:choose>
-
-                       <td align="left">
-                               <xsl:call-template name="cat_filter"/>
-                       </td>
-                       <td align="left">
-                               <xsl:call-template name="filter_vendor"/>
-                       </td>
-                       <td align="right">
-                               <xsl:call-template name="search_field"/>
-                       </td>
-                       <td valign="top">
-                               <table>
-                                       <tr>
-                                               <td class="small_text" 
valign="top" align="left">
-                                                       <xsl:variable 
name="link_columns"><xsl:value-of select="link_columns"/></xsl:variable>
-                                                       <xsl:variable 
name="lang_columns_help"><xsl:value-of 
select="lang_columns_help"/></xsl:variable>
-                                                       <xsl:variable 
name="lang_columns"><xsl:value-of select="lang_columns"/></xsl:variable>
-                                                       <a href="javascript:var 
w=window.open('{$link_columns}','','left=50,top=100,width=300,height=600')" 
onMouseOver="overlib('{$lang_columns_help}', CAPTION, '{$lang_columns}')" 
onMouseOut="nd()">
-                                                               <xsl:value-of 
select="lang_columns"/></a>
+                       <tr>
+                               <xsl:choose>
+                                       <xsl:when test="member_of_list != ''">
+                                               <td align="left">
+                                                       <xsl:call-template 
name="filter_member_of"/>
                                                </td>
-                                       </tr>
-                               </table>
-                       </td>
-               </tr>
-               <tr>
-                       <td colspan="8" width="100%">
-                               <xsl:call-template name="nextmatchs"/>
-                       </td>
-               </tr>
-       </table>
-       <table width="100%" cellpadding="2" cellspacing="2" align="center">
-               <xsl:call-template name="table_header"/>
-               <xsl:call-template name="values"/>
-               <xsl:choose>
-                       <xsl:when test="table_add!=''">
-                               <xsl:apply-templates select="table_add"/>
-                       </xsl:when>
-               </xsl:choose>
-       </table>
-</xsl:template>
-
-<xsl:template match="add_activity">
-       <table>
-               <tr>
-                       <td align="left">
-                               <xsl:value-of select="lang_id"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="value_agreement_id"/>
-                       </td>
-               </tr>
-
-               <tr>
-                       <td valign="top">
-                               <xsl:value-of select="lang_name"/>
-                       </td>
-                       <td>
-                               <input type="text" disabled="disabled" 
name="values[name]" value="{value_name}" onMouseout="window.status='';return 
true;">
-                                       <xsl:attribute name="onMouseover">
-                                               
<xsl:text>window.status='</xsl:text>
-                                               <xsl:value-of 
select="lang_name_statustext"/>
-                                               <xsl:text>'; return 
true;</xsl:text>
-                                       </xsl:attribute>
-                               </input>
-                       </td>
-               </tr>
-               <tr>
-                       <td valign="top">
-                               <xsl:value-of select="lang_descr"/>
-                       </td>
-                       <td>
-                               <textarea cols="60" disabled="disabled" 
rows="6" name="values[descr]" onMouseout="window.status='';return true;">
-                                       <xsl:attribute name="onMouseover">
-                                               
<xsl:text>window.status='</xsl:text>
-                                               <xsl:value-of 
select="lang_descr_statustext"/>
-                                               <xsl:text>'; return 
true;</xsl:text>
-                                       </xsl:attribute>
-                                       <xsl:value-of select="value_descr"/>    
        
-                               </textarea>
-                       </td>
-               </tr>
-       </table>
-       <xsl:variable name="add_action"><xsl:value-of 
select="add_action"/></xsl:variable>
-       <form name="form2" method="post" action="{$add_action}">
+                                       </xsl:when>
+                               </xsl:choose>
+                               <td align="left">
+                                       <xsl:call-template name="cat_filter"/>
+                               </td>
+                               <td align="left">
+                                       <xsl:call-template 
name="filter_vendor"/>
+                               </td>
+                               <td align="right">
+                                       <xsl:call-template name="search_field"/>
+                               </td>
+                               <td valign="top">
+                                       <table>
+                                               <tr>
+                                                       <td class="small_text" 
valign="top" align="left">
+                                                               <xsl:variable 
name="link_columns">
+                                                                       
<xsl:value-of select="link_columns"/>
+                                                               </xsl:variable>
+                                                               <xsl:variable 
name="lang_columns_help">
+                                                                       
<xsl:value-of select="lang_columns_help"/>
+                                                               </xsl:variable>
+                                                               <xsl:variable 
name="lang_columns">
+                                                                       
<xsl:value-of select="lang_columns"/>
+                                                               </xsl:variable>
+                                                               <a 
href="javascript:var 
w=window.open('{$link_columns}','','left=50,top=100,width=300,height=600')" 
onMouseOver="overlib('{$lang_columns_help}', CAPTION, '{$lang_columns}')" 
onMouseOut="nd()">
+                                                                       
<xsl:value-of select="lang_columns"/>
+                                                               </a>
+                                                       </td>
+                                               </tr>
+                                       </table>
+                               </td>
+                       </tr>
+                       <tr>
+                               <td colspan="8" width="100%">
+                                       <xsl:call-template name="nextmatchs"/>
+                               </td>
+                       </tr>
+               </table>
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <xsl:call-template name="table_header"/>
+                       <xsl:call-template name="values"/>
                        <xsl:choose>
-                               <xsl:when test="values != ''">
-                                       <xsl:call-template name="values4"/>
+                               <xsl:when test="table_add!=''">
+                                       <xsl:apply-templates 
select="table_add"/>
                                </xsl:when>
-                       </xsl:choose>                                   
+                       </xsl:choose>
+               </table>
+       </xsl:template>
+
+       <!-- New template-->
+       <xsl:template match="add_activity">
+               <table>
                        <tr>
-                               <td/>
-                               <td/>
-                               <td/>
-                               <td/>
-                               <td/>
-                               <td/>
-                               <td align="center">
-                                       <input type="hidden" 
name="values[agreement_id]" value="{agreement_id}"/>
-                                       <xsl:variable 
name="img_check"><xsl:value-of select="img_check"/></xsl:variable>
-                                       <a 
href="javascript:check_all_checkbox2('values[select]')"><img src="{$img_check}" 
border="0" height="16" width="21" alt="{lang_select_all}"/></a>
+                               <td align="left">
+                                       <xsl:value-of select="lang_id"/>
                                </td>
+                               <td align="left">
+                                       <xsl:value-of 
select="value_agreement_id"/>
+                               </td>
                        </tr>
-
-                       <tr height="50">
-                               <td valign="bottom">
-                                       <xsl:variable 
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
-                                       <input type="submit" 
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return 
true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                       <xsl:value-of 
select="lang_save_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
+                       <tr>
+                               <td valign="top">
+                                       <xsl:value-of select="lang_name"/>
                                </td>
-                               <td valign="bottom">
-                                       <xsl:variable 
name="lang_apply"><xsl:value-of select="lang_apply"/></xsl:variable>
-                                       <input type="submit" 
name="values[apply]" value="{$lang_apply}" onMouseout="window.status='';return 
true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                       <xsl:value-of 
select="lang_apply_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
+                               <td>
+                                       <input type="text" disabled="disabled" 
name="values[name]" value="{value_name}" onMouseout="window.status='';return 
true;">
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="lang_name_statustext"/>
                                                </xsl:attribute>
                                        </input>
                                </td>
-                               <td align="right" valign="bottom">
-                                       <xsl:variable 
name="lang_cancel"><xsl:value-of select="lang_cancel"/></xsl:variable>
-                                       <input type="submit" 
name="values[cancel]" value="{$lang_cancel}" 
onMouseout="window.status='';return true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                       <xsl:value-of 
select="lang_cancel_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
+                       </tr>
+                       <tr>
+                               <td valign="top">
+                                       <xsl:value-of select="lang_descr"/>
+                               </td>
+                               <td>
+                                       <textarea cols="60" disabled="disabled" 
rows="6" name="values[descr]" onMouseout="window.status='';return true;">
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="lang_descr_statustext"/>
                                                </xsl:attribute>
-                                       </input>
+                                               <xsl:value-of 
select="value_descr"/>
+                                       </textarea>
                                </td>
                        </tr>
                </table>
-       </form>
-</xsl:template>
+               <xsl:variable name="add_action">
+                       <xsl:value-of select="add_action"/>
+               </xsl:variable>
+               <form name="form2" method="post" action="{$add_action}">
+                       <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
+                               <xsl:call-template name="table_header"/>
+                               <xsl:choose>
+                                       <xsl:when test="values != ''">
+                                               <xsl:call-template 
name="values4"/>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <tr>
+                                       <td/>
+                                       <td/>
+                                       <td/>
+                                       <td/>
+                                       <td/>
+                                       <td/>
+                                       <td align="center">
+                                               <input type="hidden" 
name="values[agreement_id]" value="{agreement_id}"/>
+                                               <xsl:variable name="img_check">
+                                                       <xsl:value-of 
select="img_check"/>
+                                               </xsl:variable>
+                                               <a 
href="javascript:check_all_checkbox2('values[select]')">
+                                                       <img src="{$img_check}" 
border="0" height="16" width="21" alt="{lang_select_all}"/>
+                                               </a>
+                                       </td>
+                               </tr>
+                               <tr height="50">
+                                       <td valign="bottom">
+                                               <xsl:variable name="lang_save">
+                                                       <xsl:value-of 
select="lang_save"/>
+                                               </xsl:variable>
+                                               <input type="submit" 
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return 
true;">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_save_statustext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                                       <td valign="bottom">
+                                               <xsl:variable name="lang_apply">
+                                                       <xsl:value-of 
select="lang_apply"/>
+                                               </xsl:variable>
+                                               <input type="submit" 
name="values[apply]" value="{$lang_apply}" onMouseout="window.status='';return 
true;">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_apply_statustext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                                       <td align="right" valign="bottom">
+                                               <xsl:variable 
name="lang_cancel">
+                                                       <xsl:value-of 
select="lang_cancel"/>
+                                               </xsl:variable>
+                                               <input type="submit" 
name="values[cancel]" value="{$lang_cancel}" 
onMouseout="window.status='';return true;">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_cancel_statustext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+                       </table>
+               </form>
+       </xsl:template>
 
+       <!-- New template-->
+       <xsl:template name="table_header">
+               <tr class="th">
+                       <xsl:for-each select="table_header">
+                               <td class="th_text" width="{with}" 
align="{align}">
+                                       <xsl:choose>
+                                               <xsl:when test="sort_link!=''">
+                                                       <a href="{sort}" 
onMouseover="window.status='{header}';return true;" 
onMouseout="window.status='';return true;">
+                                                               <xsl:value-of 
select="header"/>
+                                                       </a>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <xsl:value-of 
select="header"/>
+                                               </xsl:otherwise>
+                                       </xsl:choose>
+                               </td>
+                       </xsl:for-each>
+               </tr>
+       </xsl:template>
 
-<xsl:template name="table_header">
-       <tr class="th">
-               <xsl:for-each select="table_header">
-                       <td class="th_text" width="{with}" align="{align}">
+       <!-- New template-->
+       <xsl:template name="values">
+               <xsl:for-each select="values">
+                       <tr>
+                               <xsl:attribute name="class">
+                                       <xsl:choose>
+                                               <xsl:when test="@class">
+                                                       <xsl:value-of 
select="@class"/>
+                                               </xsl:when>
+                                               <xsl:when test="position() mod 
2 = 0">
+                                                       
<xsl:text>row_off</xsl:text>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       
<xsl:text>row_on</xsl:text>
+                                               </xsl:otherwise>
+                                       </xsl:choose>
+                               </xsl:attribute>
+                               <xsl:for-each select="row">
+                                       <xsl:choose>
+                                               <xsl:when test="link">
+                                                       <td class="small_text" 
align="center">
+                                                               <a 
href="{link}" onMouseover="window.status='{statustext}';return true;" 
onMouseout="window.status='';return true;">
+                                                                       
<xsl:value-of select="text"/>
+                                                               </a>
+                                                       </td>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <td class="small_text" 
align="left">
+                                                               <xsl:value-of 
select="value"/>
+                                                       </td>
+                                               </xsl:otherwise>
+                                       </xsl:choose>
+                               </xsl:for-each>
                                <xsl:choose>
-                                       <xsl:when test="sort_link!=''">
-                                               <a href="{sort}" 
onMouseover="window.status='{header}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of select="header"/></a>
+                                       <xsl:when test="//acl_manage != '' and 
total_cost!=''">
+                                               <td align="center">
+                                                       <input type="hidden" 
name="values[activity_id][{activity_id}]" value="{activity_id}"/>
+                                                       <input type="hidden" 
name="values[id][{activity_id}]" value="{index_count}"/>
+                                                       <input type="checkbox" 
name="values[select][{activity_id}]" value="{cost}" 
onMouseout="window.status='';return true;">
+                                                               <xsl:attribute 
name="onMouseover">
+                                                                       
<xsl:text>window.status='</xsl:text>
+                                                                       
<xsl:value-of select="lang_select_statustext"/>
+                                                                       
<xsl:text>'; return true;</xsl:text>
+                                                               </xsl:attribute>
+                                                       </input>
+                                               </td>
                                        </xsl:when>
-                                       <xsl:otherwise>
-                                               <xsl:value-of select="header"/> 
                                
-                                       </xsl:otherwise>
                                </xsl:choose>
-                       </td>
+                       </tr>
                </xsl:for-each>
-       </tr>
-</xsl:template>
+       </xsl:template>
 
-
-<xsl:template name="values">
-       <xsl:for-each select="values">
-               <tr>
-                       <xsl:attribute name="class">
+       <!-- New template-->
+       <xsl:template name="values2">
+               <xsl:for-each select="values">
+                       <tr>
+                               <xsl:attribute name="class">
+                                       <xsl:choose>
+                                               <xsl:when test="@class">
+                                                       <xsl:value-of 
select="@class"/>
+                                               </xsl:when>
+                                               <xsl:when test="position() mod 
2 = 0">
+                                                       
<xsl:text>row_off</xsl:text>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       
<xsl:text>row_on</xsl:text>
+                                               </xsl:otherwise>
+                                       </xsl:choose>
+                               </xsl:attribute>
+                               <xsl:for-each select="row">
+                                       <xsl:choose>
+                                               <xsl:when test="link">
+                                                       <td class="small_text" 
align="center">
+                                                               <a 
href="{link}" onMouseover="window.status='{statustext}';return true;" 
onMouseout="window.status='';return true;">
+                                                                       
<xsl:value-of select="text"/>
+                                                               </a>
+                                                       </td>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       <td class="small_text" 
align="left">
+                                                               <xsl:value-of 
select="value"/>
+                                                       </td>
+                                               </xsl:otherwise>
+                                       </xsl:choose>
+                               </xsl:for-each>
                                <xsl:choose>
-                                       <xsl:when test="@class">
-                                               <xsl:value-of select="@class"/>
+                                       <xsl:when test="//acl_manage != '' and 
total_cost!=''">
+                                               <input type="hidden" 
name="values[id][{activity_id}]" value="{index_count}"/>
+                                               <input type="hidden" 
name="values[m_cost][{activity_id}]" value="{m_cost}"/>
+                                               <input type="hidden" 
name="values[w_cost][{activity_id}]" value="{w_cost}"/>
+                                               <input type="hidden" 
name="values[total_cost][{activity_id}]" value="{total_cost}"/>
+                                               <input type="hidden" 
name="values[select][0]" value="{activity_id}"/>
                                        </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>
-                       <xsl:for-each select="row">
+                       </tr>
+               </xsl:for-each>
+       </xsl:template>
+
+       <!-- New template-->
+       <xsl:template name="values3">
+               <xsl:for-each select="values">
+                       <tr>
+                               <xsl:attribute name="class">
+                                       <xsl:choose>
+                                               <xsl:when test="@class">
+                                                       <xsl:value-of 
select="@class"/>
+                                               </xsl:when>
+                                               <xsl:when test="position() mod 
2 = 0">
+                                                       
<xsl:text>row_off</xsl:text>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       
<xsl:text>row_on</xsl:text>
+                                               </xsl:otherwise>
+                                       </xsl:choose>
+                               </xsl:attribute>
+                               <td class="small_text" align="left">
+                                       <xsl:value-of select="activity_id"/>
+                               </td>
+                               <td class="small_text" align="left">
+                                       <xsl:value-of select="num"/>
+                               </td>
+                               <td class="small_text" align="left">
+                                       <xsl:value-of select="descr"/>
+                               </td>
+                               <td class="small_text" align="left">
+                                       <xsl:value-of select="unit"/>
+                               </td>
+                               <td class="small_text" align="right">
+                                       <xsl:value-of select="m_cost"/>
+                               </td>
+                               <td class="small_text" align="right">
+                                       <xsl:value-of select="w_cost"/>
+                               </td>
+                               <td class="small_text" align="right">
+                                       <xsl:value-of select="total_cost"/>
+                               </td>
+                               <td class="small_text" align="right">
+                                       <xsl:value-of select="this_index"/>
+                               </td>
+                               <td class="small_text" align="center">
+                                       <xsl:value-of select="index_count"/>
+                               </td>
+                               <td class="small_text" align="center">
+                                       <xsl:value-of select="index_date"/>
+                               </td>
                                <xsl:choose>
-                                       <xsl:when test="link">
-                                               <td class="small_text" 
align="center">
-                                                       <a href="{link}" 
onMouseover="window.status='{statustext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of select="text"/></a>
+                                       <xsl:when test="acl_read != ''">
+                                               <td align="center">
+                                                       <xsl:variable 
name="link_view">
+                                                               <xsl:value-of 
select="link_view"/>
+                                                       </xsl:variable>
+                                                       <xsl:variable 
name="lang_view_statustext">
+                                                               <xsl:value-of 
select="lang_view_statustext"/>
+                                                       </xsl:variable>
+                                                       <a href="{$link_view}" 
onMouseover="window.status='{$lang_view_statustext}';return true;" 
onMouseout="window.status='';return true;">
+                                                               <xsl:value-of 
select="text_view"/>
+                                                       </a>
                                                </td>
                                        </xsl:when>
-                                       <xsl:otherwise>
-                                               <td class="small_text" 
align="left">
-                                                       <xsl:value-of 
select="value"/>                          
-                                               </td>
-                                       </xsl:otherwise>
                                </xsl:choose>
-                       </xsl:for-each>
-                       <xsl:choose>
-                               <xsl:when test="//acl_manage != '' and 
total_cost!=''">
-                                       <td align="center">
-                                               <input type="hidden" 
name="values[activity_id][{activity_id}]" value="{activity_id}"/>
-                                               <input type="hidden" 
name="values[id][{activity_id}]" value="{index_count}"/>
-                                               <input type="checkbox" 
name="values[select][{activity_id}]" value="{cost}" 
onMouseout="window.status='';return true;">
-                                                       <xsl:attribute 
name="onMouseover">
-                                                               
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_select_statustext"/>
-                                                               <xsl:text>'; 
return true;</xsl:text>
-                                                       </xsl:attribute>
-                                               </input>
-                                       </td>
-                               </xsl:when>
-                       </xsl:choose>
-               </tr>
-       </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="values2">
-       <xsl:for-each select="values">
-               <tr>
-                       <xsl:attribute name="class">
                                <xsl:choose>
-                                       <xsl:when test="@class">
-                                               <xsl:value-of select="@class"/>
+                                       <xsl:when test="acl_edit != ''">
+                                               <td align="center">
+                                                       <xsl:variable 
name="link_edit">
+                                                               <xsl:value-of 
select="link_edit"/>
+                                                       </xsl:variable>
+                                                       <xsl:variable 
name="lang_edit_statustext">
+                                                               <xsl:value-of 
select="lang_edit_statustext"/>
+                                                       </xsl:variable>
+                                                       <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_statustext}';return true;" 
onMouseout="window.status='';return true;">
+                                                               <xsl:value-of 
select="text_edit"/>
+                                                       </a>
+                                               </td>
                                        </xsl:when>
-                                       <xsl:when test="position() mod 2 = 0">
-                                               <xsl:text>row_off</xsl:text>
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <xsl:text>row_on</xsl:text>
-                                       </xsl:otherwise>
                                </xsl:choose>
-                       </xsl:attribute>
-                       <xsl:for-each select="row">
                                <xsl:choose>
-                                       <xsl:when test="link">
-                                               <td class="small_text" 
align="center">
-                                                       <a href="{link}" 
onMouseover="window.status='{statustext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of select="text"/></a>
+                                       <xsl:when test="acl_delete != ''">
+                                               <td align="center">
+                                                       <xsl:variable 
name="link_delete">
+                                                               <xsl:value-of 
select="link_delete"/>
+                                                       </xsl:variable>
+                                                       <xsl:variable 
name="lang_delete_statustext">
+                                                               <xsl:value-of 
select="lang_delete_statustext"/>
+                                                       </xsl:variable>
+                                                       <a 
href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_statustext}';return true;" 
onMouseout="window.status='';return true;">
+                                                               <xsl:value-of 
select="text_delete"/>
+                                                       </a>
                                                </td>
                                        </xsl:when>
-                                       <xsl:otherwise>
-                                               <td class="small_text" 
align="left">
-                                                       <xsl:value-of 
select="value"/>                          
-                                               </td>
-                                       </xsl:otherwise>
                                </xsl:choose>
-                       </xsl:for-each>
-                       <xsl:choose>
-                               <xsl:when test="//acl_manage != '' and 
total_cost!=''">
-                                       <input type="hidden" 
name="values[id][{activity_id}]" value="{index_count}"/>
-                                       <input type="hidden" 
name="values[m_cost][{activity_id}]" value="{m_cost}"/>
-                                       <input type="hidden" 
name="values[w_cost][{activity_id}]" value="{w_cost}"/>
-                                       <input type="hidden" 
name="values[total_cost][{activity_id}]" value="{total_cost}"/>
-                                       <input type="hidden" 
name="values[select][0]" value="{activity_id}"/>
-                               </xsl:when>
-                       </xsl:choose>
-               </tr>
-       </xsl:for-each>
-</xsl:template>
-
-<xsl:template name="values3">
-       <xsl:for-each select="values">
-               <tr>
-                       <xsl:attribute name="class">
                                <xsl:choose>
-                                       <xsl:when test="@class">
-                                               <xsl:value-of select="@class"/>
+                                       <xsl:when test="acl_manage != '' and 
total_cost!=''">
+                                               <td align="center">
+                                                       <input type="hidden" 
name="values[id][{activity_id}]" value="{index_count}"/>
+                                                       <input type="hidden" 
name="values[m_cost][{activity_id}]" value="{m_cost}"/>
+                                                       <input type="hidden" 
name="values[w_cost][{activity_id}]" value="{w_cost}"/>
+                                                       <input type="hidden" 
name="values[total_cost][{activity_id}]" value="{total_cost}"/>
+                                                       <input type="checkbox" 
name="values[select][]" value="{activity_id}" 
onMouseout="window.status='';return true;">
+                                                               <xsl:attribute 
name="title">
+                                                                       
<xsl:value-of select="lang_select_statustext"/>
+                                                               </xsl:attribute>
+                                                       </input>
+                                               </td>
                                        </xsl:when>
-                                       <xsl:when test="position() mod 2 = 0">
-                                               <xsl:text>row_off</xsl:text>
-                                       </xsl:when>
-                                       <xsl:otherwise>
-                                               <xsl:text>row_on</xsl:text>
-                                       </xsl:otherwise>
                                </xsl:choose>
-                       </xsl:attribute>
-                       <td class="small_text" align="left">
-                               <xsl:value-of select="activity_id"/>            
                
-                       </td>
-                       <td class="small_text" align="left">
-                               <xsl:value-of select="num"/>                    
        
-                       </td>
-                       <td class="small_text" align="left">
-                               <xsl:value-of select="descr"/>                  
        
-                       </td>
-                       <td class="small_text" align="left">
-                               <xsl:value-of select="unit"/>                   
        
-                       </td>
-                       <td class="small_text" align="right">
-                               <xsl:value-of select="m_cost"/>                 
        
-                       </td>
-                       <td class="small_text" align="right">
-                               <xsl:value-of select="w_cost"/>                 
        
-                       </td>
-                       <td class="small_text" align="right">
-                               <xsl:value-of select="total_cost"/>             
                
-                       </td>
-                       <td class="small_text" align="right">
-                               <xsl:value-of select="this_index"/>             
                
-                       </td>
-                       <td class="small_text" align="center">
-                               <xsl:value-of select="index_count"/>            
                
-                       </td>
-                       <td class="small_text" align="center">
-                               <xsl:value-of select="index_date"/>             
                
-                       </td>
-                       <xsl:choose>
-                               <xsl:when test="acl_read != ''">
-                                       <td align="center">
-                                               <xsl:variable 
name="link_view"><xsl:value-of select="link_view"/></xsl:variable>
-                                               <xsl:variable 
name="lang_view_statustext"><xsl:value-of 
select="lang_view_statustext"/></xsl:variable>
-                                               <a href="{$link_view}" 
onMouseover="window.status='{$lang_view_statustext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_view"/></a>
-                                       </td>
-                               </xsl:when>
-                       </xsl:choose>
-                       <xsl:choose>
-                               <xsl:when test="acl_edit != ''">
-                                       <td align="center">
-                                               <xsl:variable 
name="link_edit"><xsl:value-of select="link_edit"/></xsl:variable>
-                                               <xsl:variable 
name="lang_edit_statustext"><xsl:value-of 
select="lang_edit_statustext"/></xsl:variable>
-                                               <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_statustext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_edit"/></a>
-                                       </td>
-                               </xsl:when>
-                       </xsl:choose>
-                       <xsl:choose>
-                               <xsl:when test="acl_delete != ''">
-                                       <td align="center">
-                                               <xsl:variable 
name="link_delete"><xsl:value-of select="link_delete"/></xsl:variable>
-                                               <xsl:variable 
name="lang_delete_statustext"><xsl:value-of 
select="lang_delete_statustext"/></xsl:variable>
-                                               <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_statustext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_delete"/></a>
-                                       </td>
-                               </xsl:when>
-                       </xsl:choose>
-                       <xsl:choose>
-                               <xsl:when test="acl_manage != '' and 
total_cost!=''">
-                                       <td align="center">
-                                               <input type="hidden" 
name="values[id][{activity_id}]" value="{index_count}"/>
-                                               <input type="hidden" 
name="values[m_cost][{activity_id}]" value="{m_cost}"/>
-                                               <input type="hidden" 
name="values[w_cost][{activity_id}]" value="{w_cost}"/>
-                                               <input type="hidden" 
name="values[total_cost][{activity_id}]" value="{total_cost}"/>
+                       </tr>
+               </xsl:for-each>
+       </xsl:template>
 
-                                               <input type="checkbox" 
name="values[select][]" value="{activity_id}" 
onMouseout="window.status='';return true;">
-                                                       <xsl:attribute 
name="onMouseover">
-                                                               
<xsl:text>window.status='</xsl:text>
-                                                               <xsl:value-of 
select="lang_select_statustext"/>
-                                                               <xsl:text>'; 
return true;</xsl:text>
-                                                       </xsl:attribute>
-                                               </input>
-                                       </td>
-                               </xsl:when>
-                       </xsl:choose>
-               </tr>
-       </xsl:for-each>
-</xsl:template>
+       <!-- New template-->
+       <xsl:template name="values4">
+               <xsl:for-each select="values">
+                       <tr>
+                               <xsl:attribute name="class">
+                                       <xsl:choose>
+                                               <xsl:when test="@class">
+                                                       <xsl:value-of 
select="@class"/>
+                                               </xsl:when>
+                                               <xsl:when test="position() mod 
2 = 0">
+                                                       
<xsl:text>row_off</xsl:text>
+                                               </xsl:when>
+                                               <xsl:otherwise>
+                                                       
<xsl:text>row_on</xsl:text>
+                                               </xsl:otherwise>
+                                       </xsl:choose>
+                               </xsl:attribute>
+                               <td class="small_text" align="left">
+                                       <xsl:value-of select="id"/>
+                               </td>
+                               <td class="small_text" align="left">
+                                       <xsl:value-of select="num"/>
+                               </td>
+                               <td class="small_text" align="right">
+                                       <xsl:value-of select="base_descr"/>
+                               </td>
+                               <td class="small_text" align="right">
+                                       <xsl:value-of select="descr"/>
+                               </td>
+                               <td class="small_text" align="right">
+                                       <xsl:value-of select="unit"/>
+                               </td>
+                               <td class="small_text" align="right">
+                                       <xsl:value-of select="ns3420"/>
+                               </td>
+                               <td align="center">
+                                       <input type="checkbox" 
name="values[select][]" value="{id}" onMouseout="window.status='';return true;">
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="lang_select_statustext"/>
+                                               </xsl:attribute>
+                                       </input>
+                               </td>
+                       </tr>
+               </xsl:for-each>
+       </xsl:template>
 
-<xsl:template name="values4">
-       <xsl:for-each select="values">
+       <!-- New template-->
+       <xsl:template match="table_add">
                <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 class="small_text" align="left">
-                               <xsl:value-of select="id"/>                     
        
+                       <td height="50">
+                               <xsl:variable name="add_action">
+                                       <xsl:value-of select="add_action"/>
+                               </xsl:variable>
+                               <xsl:variable name="lang_add">
+                                       <xsl:value-of select="lang_add"/>
+                               </xsl:variable>
+                               <form method="post" action="{$add_action}">
+                                       <input type="submit" name="add" 
value="{$lang_add}" onMouseout="window.status='';return true;">
+                                               <xsl:attribute name="title">
+                                                       <xsl:value-of 
select="lang_add_statustext"/>
+                                               </xsl:attribute>
+                                       </input>
+                               </form>
                        </td>
-                       <td class="small_text" align="left">
-                               <xsl:value-of select="num"/>                    
        
-                       </td>
-                       <td class="small_text" align="right">
-                               <xsl:value-of select="base_descr"/>             
                
-                       </td>
-                       <td class="small_text" align="right">
-                               <xsl:value-of select="descr"/>                  
        
-                       </td>
-                       <td class="small_text" align="right">
-                               <xsl:value-of select="unit"/>                   
        
-                       </td>
-                       <td class="small_text" align="right">
-                               <xsl:value-of select="ns3420"/>                 
        
-                       </td>
-                       <td align="center">
-                               <input type="checkbox" name="values[select][]" 
value="{id}" onMouseout="window.status='';return true;">
-                                       <xsl:attribute name="onMouseover">
-                                               
<xsl:text>window.status='</xsl:text>
-                                               <xsl:value-of 
select="lang_select_statustext"/>
-                                               <xsl:text>'; return 
true;</xsl:text>
-                                       </xsl:attribute>
-                               </input>
-                       </td>
                </tr>
-       </xsl:for-each>
-</xsl:template>
+       </xsl:template>
 
-<xsl:template match="table_add">
-       <tr>
-               <td height="50">
-                       <xsl:variable name="add_action"><xsl:value-of 
select="add_action"/></xsl:variable>
-                       <xsl:variable name="lang_add"><xsl:value-of 
select="lang_add"/></xsl:variable>
-                       <form method="post" action="{$add_action}">
-                               <input type="submit" name="add" 
value="{$lang_add}" onMouseout="window.status='';return true;">
-                                       <xsl:attribute name="onMouseover">
-                                               
<xsl:text>window.status='</xsl:text>
-                                               <xsl:value-of 
select="lang_add_statustext"/>
-                                               <xsl:text>'; return 
true;</xsl:text>
-                                       </xsl:attribute>
-                               </input>
-                       </form>
-               </td>
-       </tr>
-</xsl:template>
-
-<!-- add / edit -->
-
+       <!-- add / edit -->
        <xsl:template match="edit">
                <script type="text/javascript">
                        self.name="first_Window";
@@ -471,12 +501,14 @@
                </script>
                <div class="yui-navset" id="edit_tabview">
                        <xsl:value-of disable-output-escaping="yes" 
select="tabs"/>
-                       <div class="yui-content">               
-
+                       <div class="yui-content">
                                <div id="general">
-                                       <xsl:variable 
name="edit_url"><xsl:value-of select="edit_url"/></xsl:variable>
+                                       <xsl:variable name="edit_url">
+                                               <xsl:value-of 
select="edit_url"/>
+                                       </xsl:variable>
                                        <table cellpadding="2" cellspacing="2" 
align="center" width="79%">
-                                               <tr><td>
+                                               <tr>
+                                                       <td>
                                                                <form 
ENCTYPE="multipart/form-data" method="post" name="form" action="{$edit_url}">
                                                                        <table 
cellpadding="2" cellspacing="2" width="100%" align="center" border="0">
                                                                                
<xsl:choose>
@@ -500,7 +532,6 @@
                                                                                
                </tr>
                                                                                
        </xsl:when>
                                                                                
</xsl:choose>
-
                                                                                
<tr>
                                                                                
        <td valign="top">
                                                                                
                <xsl:value-of select="lang_name"/>
@@ -534,7 +565,7 @@
                                                                                
                                <xsl:value-of select="lang_descr_statustext"/>
                                                                                
                                <xsl:text>'; return true;</xsl:text>
                                                                                
                        </xsl:attribute>
-                                                                               
                        <xsl:value-of select="value_descr"/>            
+                                                                               
                        <xsl:value-of select="value_descr"/>
                                                                                
                </textarea>
                                                                                
        </td>
                                                                                
</tr>
@@ -552,9 +583,13 @@
                                                                                
                <xsl:value-of select="lang_agreement_group"/>
                                                                                
        </td>
                                                                                
        <td valign="top">
-                                                                               
                <xsl:variable 
name="lang_agreement_group_statustext"><xsl:value-of 
select="lang_agreement_group_statustext"/></xsl:variable>
+                                                                               
                <xsl:variable name="lang_agreement_group_statustext">
+                                                                               
                        <xsl:value-of select="lang_agreement_group_statustext"/>
+                                                                               
                </xsl:variable>
                                                                                
                <select name="values[group_id]" class="forms" 
onMouseover="window.status='{$lang_agreement_group_statustext}'; return true;" 
onMouseout="window.status='';return true;">
-                                                                               
                        <option value=""><xsl:value-of 
select="lang_no_agreement_group"/></option>
+                                                                               
                        <option value="">
+                                                                               
                                <xsl:value-of select="lang_no_agreement_group"/>
+                                                                               
                        </option>
                                                                                
                        <xsl:apply-templates select="agreement_group_list"/>
                                                                                
                </select>
                                                                                
        </td>
@@ -604,7 +639,6 @@
                                                                                
                <img id="values_termination_date-trigger" src="{img_cal}" 
alt="{lang_datetitle}" title="{lang_datetitle}" style="cursor:pointer; 
cursor:hand;"/>
                                                                                
        </td>
                                                                                
</tr>
-
                                                                                
<xsl:choose>
                                                                                
        <xsl:when test="files!=''">
                                                                                
                <!-- <xsl:call-template name="file_list"/> -->
@@ -619,13 +653,11 @@
                                                                                
                </tr>
                                                                                
        </xsl:when>
                                                                                
</xsl:choose>
-
                                                                                
<xsl:choose>
                                                                                
        <xsl:when test="fileupload = 1">
                                                                                
                <xsl:call-template name="file_upload"/>
                                                                                
        </xsl:when>
                                                                                
</xsl:choose>
-
                                                                                
<xsl:choose>
                                                                                
        <xsl:when test="member_of_list != ''">
                                                                                
                <tr>
@@ -633,7 +665,9 @@
                                                                                
                                <xsl:value-of select="lang_member_of"/>
                                                                                
                        </td>
                                                                                
                        <td>
-                                                                               
                                <xsl:variable 
name="lang_member_of_statustext"><xsl:value-of 
select="lang_member_of_statustext"/></xsl:variable>
+                                                                               
                                <xsl:variable name="lang_member_of_statustext">
+                                                                               
                                        <xsl:value-of 
select="lang_member_of_statustext"/>
+                                                                               
                                </xsl:variable>
                                                                                
                                <select name="values[member_of][]" 
disabled="disabled" class="forms" multiple="multiple" 
onMouseover="window.status='{$lang_member_of_statustext}'; return true;" 
onMouseout="window.status='';return true;">
                                                                                
                                        <xsl:apply-templates 
select="member_of_list"/>
                                                                                
                                </select>
@@ -646,10 +680,11 @@
                                                                                
                <xsl:call-template name="attributes_values"/>
                                                                                
        </xsl:when>
                                                                                
</xsl:choose>
-
                                                                                
<tr height="50">
                                                                                
        <td valign="bottom">
-                                                                               
                <xsl:variable name="lang_save"><xsl:value-of 
select="lang_save"/></xsl:variable>
+                                                                               
                <xsl:variable name="lang_save">
+                                                                               
                        <xsl:value-of select="lang_save"/>
+                                                                               
                </xsl:variable>
                                                                                
                <input type="submit" name="values[save]" value="{$lang_save}" 
onMouseout="window.status='';return true;">
                                                                                
                        <xsl:attribute name="onMouseover">
                                                                                
                                <xsl:text>window.status='</xsl:text>
@@ -658,7 +693,9 @@
                                                                                
                        </xsl:attribute>
                                                                                
                </input>
                                                                                
                <!-- </td><td valign="bottom">  -->
-                                                                               
                <xsl:variable name="lang_apply"><xsl:value-of 
select="lang_apply"/></xsl:variable>
+                                                                               
                <xsl:variable name="lang_apply">
+                                                                               
                        <xsl:value-of select="lang_apply"/>
+                                                                               
                </xsl:variable>
                                                                                
                <input type="submit" name="values[apply]" value="{$lang_apply}" 
onMouseout="window.status='';return true;">
                                                                                
                        <xsl:attribute name="onMouseover">
                                                                                
                                <xsl:text>window.status='</xsl:text>
@@ -667,7 +704,9 @@
                                                                                
                        </xsl:attribute>
                                                                                
                </input>
                                                                                
                <!-- </td><td align="right" valign="bottom">-->
-                                                                               
                <xsl:variable name="lang_cancel"><xsl:value-of 
select="lang_cancel"/></xsl:variable>
+                                                                               
                <xsl:variable name="lang_cancel">
+                                                                               
                        <xsl:value-of select="lang_cancel"/>
+                                                                               
                </xsl:variable>
                                                                                
                <input type="submit" name="values[cancel]" 
value="{$lang_cancel}" onMouseout="window.status='';return true;">
                                                                                
                        <xsl:attribute name="onMouseover">
                                                                                
                                <xsl:text>window.status='</xsl:text>
@@ -679,19 +718,50 @@
                                                                                
</tr>
                                                                        </table>
                                                                </form>
-                                               </td></tr>
-                                               <tr><td><br/><br/></td></tr>
-                                               <tr><td align="right" 
valign="bottom">
+                                                       </td>
+                                               </tr>
+                                               <tr>
+                                                       <td>
+                                                               <br/>
+                                                               <br/>
+                                                       </td>
+                                               </tr>
+                                               <tr>
+                                                       <td align="right" 
valign="bottom">
                                                                <form 
method="post" name="alarm" action="{$edit_url}">
                                                                        <input 
type="hidden" name="values[entity_id]" value="{value_agreement_id}"/>
                                                                        <table 
cellpadding="2" cellspacing="2" width="79%" align="center" border="0">
-                                                                               
<tr><td class="center" align="left"><xsl:value-of 
select="lang_alarm"/></td></tr>
-
+                                                                               
<tr>
+                                                                               
        <td class="center" align="left">
+                                                                               
                <xsl:value-of select="lang_alarm"/>
+                                                                               
        </td>
+                                                                               
</tr>
                                                                                
<!-- DataTable 0  EDIT-->
-                                                                               
<tr><td class="center" align="left" colspan="10"><div 
id="datatable-container_0"/></td></tr>
-                                                                               
<tr><td class="center" align="right" colspan="10"><div 
id="datatable-buttons_0"/></td></tr>
-                                                                               
<tr><td class="center" align="left" colspan="10"><xsl:value-of 
select="alarm_data/add_alarm/lang_add_alarm"/><xsl:text> : 
</xsl:text><xsl:value-of 
select="alarm_data/add_alarm/lang_day_statustext"/><xsl:value-of 
select="alarm_data/add_alarm/lang_hour_statustext"/><xsl:value-of 
select="alarm_data/add_alarm/lang_minute_statustext"/><xsl:value-of 
select="alarm_data/add_alarm/lang_user"/></td></tr>
-                                                                               
<tr><td class="center" align="left" colspan="10"><div 
id="datatable-buttons_1"/></td></tr>
+                                                                               
<tr>
+                                                                               
        <td class="center" align="left" colspan="10">
+                                                                               
                <div id="datatable-container_0"/>
+                                                                               
        </td>
+                                                                               
</tr>
+                                                                               
<tr>
+                                                                               
        <td class="center" align="right" colspan="10">
+                                                                               
                <div id="datatable-buttons_0"/>
+                                                                               
        </td>
+                                                                               
</tr>
+                                                                               
<tr>
+                                                                               
        <td class="center" align="left" colspan="10">
+                                                                               
                <xsl:value-of select="alarm_data/add_alarm/lang_add_alarm"/>
+                                                                               
                <xsl:text> : </xsl:text>
+                                                                               
                <xsl:value-of 
select="alarm_data/add_alarm/lang_day_statustext"/>
+                                                                               
                <xsl:value-of 
select="alarm_data/add_alarm/lang_hour_statustext"/>
+                                                                               
                <xsl:value-of 
select="alarm_data/add_alarm/lang_minute_statustext"/>
+                                                                               
                <xsl:value-of select="alarm_data/add_alarm/lang_user"/>
+                                                                               
        </td>
+                                                                               
</tr>
+                                                                               
<tr>
+                                                                               
        <td class="center" align="left" colspan="10">
+                                                                               
                <div id="datatable-buttons_1"/>
+                                                                               
        </td>
+                                                                               
</tr>
                                                                                
<!-- <xsl:call-template name="alarm_form"/>  -->
                                                                        </table>
                                                                </form>
@@ -699,13 +769,12 @@
                                                </tr>
                                        </table>
                                </div>
-
                                <div id="items">
-
                                        <xsl:choose>
                                                <xsl:when 
test="table_update!=''">
-                                                       <xsl:variable 
name="update_action"><xsl:value-of select="update_action"/></xsl:variable>
-
+                                                       <xsl:variable 
name="update_action">
+                                                               <xsl:value-of 
select="update_action"/>
+                                                       </xsl:variable>
                                                        <form method="post" 
name="form2" action="{$update_action}">
                                                                <input 
type="hidden" name="values[agreement_id]" value="{value_agreement_id}"/>
                                                                <table 
width="100%" cellpadding="2" cellspacing="2" align="center" border="0">
@@ -714,81 +783,85 @@
                                                                                
        <td/>
                                                                                
</xsl:for-each>
                                                                                
<td colspan="15" width="100%" class="small_text" valign="bottom" align="right">
-                                                                               
        <xsl:variable name="link_download"><xsl:value-of 
select="link_download"/></xsl:variable>
-                                                                               
        <xsl:variable name="lang_download_help"><xsl:value-of 
select="lang_download_help"/></xsl:variable>
-                                                                               
        <xsl:variable name="lang_download"><xsl:value-of 
select="lang_download"/></xsl:variable>
+                                                                               
        <xsl:variable name="link_download">
+                                                                               
                <xsl:value-of select="link_download"/>
+                                                                               
        </xsl:variable>
+                                                                               
        <xsl:variable name="lang_download_help">
+                                                                               
                <xsl:value-of select="lang_download_help"/>
+                                                                               
        </xsl:variable>
+                                                                               
        <xsl:variable name="lang_download">
+                                                                               
                <xsl:value-of select="lang_download"/>
+                                                                               
        </xsl:variable>
                                                                                
        <a href="javascript:var 
w=window.open('{$link_download}','','left=50,top=100')" 
onMouseOver="overlib('{$lang_download_help}', CAPTION, '{$lang_download}')" 
onMouseOut="nd()">
-                                                                               
                <xsl:value-of select="lang_download"/></a>
+                                                                               
                <xsl:value-of select="lang_download"/>
+                                                                               
        </a>
                                                                                
</td>
                                                                        </tr>
                                                                        <!-- 
DataTable 1 EDIT_ITEMS-->
-                                                                       <tr><td 
colspan="15" width="100%">
+                                                                       <tr>
+                                                                               
<td colspan="15" width="100%">
                                                                                
        <div id="paging_1"> </div>
                                                                                
        <div id="datatable-container_1"/>
                                                                                
        <div id="contextmenu_1"/>
-                                                                       
</td></tr>      
-
+                                                                               
</td>
+                                                                       </tr>
                                                                        <!--
-                                                       <tr><td colspan="15" 
width="100%"><xsl:call-template name="nextmatchs"/></td></tr>
-                                                       <xsl:call-template 
name="table_header"/>
-                                                       <xsl:call-template 
name="values3"/>
-                                                       <tr><xsl:for-each 
select="set_column" ><td></td></xsl:for-each><td align="center"><xsl:variable 
name="img_check"><xsl:value-of select="img_check"/></xsl:variable><a 
href="javascript:check_all_checkbox2('values[select]')"><img src="{$img_check}" 
border="0" height="16" width="21" alt="{lang_select_all}"/></a></td></tr>
-                                                       -->
-                                               </table>
-                                               <br/>
-                                               <table width="70%" 
cellpadding="2" cellspacing="2">
-                                                       <!-- Buttons 2 -->
-                                                       <div 
id="datatable-buttons_2" class="div-buttons">
-
-                                                               <input 
class="mybottonsUpdates calendar-opt" type="text" id="values_date" 
name="values[date]" size="10" value="{date}" readonly="readonly" 
onMouseout="window.status='';return true;">
-                                                                       
<xsl:attribute name="onMouseover">
-                                                                               
<xsl:text>window.status='</xsl:text>
-                                                                               
<xsl:value-of select="lang_date_statustext"/>
-                                                                               
<xsl:text>'; return true;</xsl:text>
-                                                                       
</xsl:attribute>
-                                                               </input>
-                                                               <img 
id="values_date-trigger" class="calendar-opt" src="{img_cal}" 
alt="{lang_datetitle}" title="{lang_datetitle}" style="cursor:pointer; 
cursor:hand;"/>
-                                                               <div 
style="width:25px;height:15px;position:relative;float:left;"/>
-                                                       </div>
-
-                                                       <!-- 
<xsl:apply-templates select="table_update"/>  -->
-                                               </table>
-                                       </form>
-                               </xsl:when>
-                       </xsl:choose>                                           
-                       <xsl:choose>
-                               <xsl:when test="value_agreement_id!=''">
-                                       <table width="100%" cellpadding="2" 
cellspacing="2" align="center">
-                                               <xsl:apply-templates 
select="table_add"/>
-                                       </table>
-                               </xsl:when>
-                       </xsl:choose>   
-
-               </div>  
-       </div>
-</div>
-
-<!--  DATATABLE DEFINITIONS-->
+<tr><td colspan="15" width="100%"><xsl:call-template 
name="nextmatchs"/></td></tr>
+<xsl:call-template name="table_header"/>
+<xsl:call-template name="values3"/>
+<tr><xsl:for-each select="set_column" ><td></td></xsl:for-each><td 
align="center"><xsl:variable name="img_check"><xsl:value-of 
select="img_check"/></xsl:variable><a 
href="javascript:check_all_checkbox2('values[select]')"><img src="{$img_check}" 
border="0" height="16" width="21" alt="{lang_select_all}"/></a></td></tr>
+-->
+                                                               </table>
+                                                               <br/>
+                                                               <table 
width="70%" cellpadding="2" cellspacing="2">
+                                                                       <!-- 
Buttons 2 -->
+                                                                       <div 
id="datatable-buttons_2" class="div-buttons">
+                                                                               
<input class="mybottonsUpdates calendar-opt" type="text" id="values_date" 
name="values[date]" size="10" value="{date}" readonly="readonly" 
onMouseout="window.status='';return true;">
+                                                                               
        <xsl:attribute name="onMouseover">
+                                                                               
                <xsl:text>window.status='</xsl:text>
+                                                                               
                <xsl:value-of select="lang_date_statustext"/>
+                                                                               
                <xsl:text>'; return true;</xsl:text>
+                                                                               
        </xsl:attribute>
+                                                                               
</input>
+                                                                               
<img id="values_date-trigger" class="calendar-opt" src="{img_cal}" 
alt="{lang_datetitle}" title="{lang_datetitle}" style="cursor:pointer; 
cursor:hand;"/>
+                                                                               
<div style="width:25px;height:15px;position:relative;float:left;"/>
+                                                                       </div>
+                                                                       <!-- 
<xsl:apply-templates select="table_update"/>  -->
+                                                               </table>
+                                                       </form>
+                                               </xsl:when>
+                                       </xsl:choose>
+                                       <xsl:choose>
+                                               <xsl:when 
test="value_agreement_id!=''">
+                                                       <table width="100%" 
cellpadding="2" cellspacing="2" align="center">
+                                                               
<xsl:apply-templates select="table_add"/>
+                                                       </table>
+                                               </xsl:when>
+                                       </xsl:choose>
+                               </div>
+                       </div>
+               </div>
+               <!--  DATATABLE DEFINITIONS-->
                <style type="text/css">
                        .calendar-opt
                        {
-                       position:relative;
-                       float:left;
+                               position:relative;
+                               float:left;
                        }
                        .index-opt
                        {
-                       position:relative;
-                       float:left;
-                       margin-top:2px;
+                               position:relative;
+                               float:left;
+                               margin-top:2px;
                        }
                        .div-buttons
                        {
-                       position:relative;
-                       float:left;
-                       width:750px;
-                       height:100px;
+                               position:relative;
+                               float:left;
+                               width:750px;
+                               height:100px;
                        }
-               </style> 
+               </style>
                <script type="text/javascript">
                        var property_js = <xsl:value-of select="property_js"/>;
                        var base_java_url = <xsl:value-of 
select="base_java_url"/>;
@@ -798,13 +871,13 @@
 
                        <xsl:for-each select="datatable">
                                datatable[<xsl:value-of select="name"/>] = [
-                               {
-                               values                  :       <xsl:value-of 
select="values"/>,
-                               total_records   :       <xsl:value-of 
select="total_records"/>,
-                               permission              :       <xsl:value-of 
select="permission"/>,
-                               is_paginator    :       <xsl:value-of 
select="is_paginator"/>,
-                               footer                  :       <xsl:value-of 
select="footer"/>
-                               }
+                                       {
+                                               values:<xsl:value-of 
select="values"/>,
+                                               total_records: <xsl:value-of 
select="total_records"/>,
+                                               permission:<xsl:value-of 
select="permission"/>,
+                                               is_paginator:  <xsl:value-of 
select="is_paginator"/>,
+                                               footer:<xsl:value-of 
select="footer"/>
+                                       }
                                ]
                        </xsl:for-each>
 
@@ -815,11 +888,10 @@
                        <xsl:for-each select="myButtons">
                                myButtons[<xsl:value-of select="name"/>] = 
<xsl:value-of select="values"/>
                        </xsl:for-each>
-               </script>                       
+               </script>
        </xsl:template>
 
-<!-- add item / edit item -->
-
+       <!-- add item / edit item -->
        <xsl:template match="edit_item">
                <script type="text/javascript">
                        self.name="first_Window";
@@ -835,12 +907,12 @@
 
                        <xsl:for-each select="datatable">
                                datatable[<xsl:value-of select="name"/>] = [
-                               {
-                               values                  :       <xsl:value-of 
select="values"/>,
-                               total_records   :       <xsl:value-of 
select="total_records"/>,
-                               is_paginator    :       <xsl:value-of 
select="is_paginator"/>,
-                               footer                  :       <xsl:value-of 
select="footer"/>
-                               }
+                                       {
+                                               values:<xsl:value-of 
select="values"/>,
+                                               total_records: <xsl:value-of 
select="total_records"/>,
+                                               is_paginator:  <xsl:value-of 
select="is_paginator"/>,
+                                               footer:<xsl:value-of 
select="footer"/>
+                                       }
                                ]
                        </xsl:for-each>
 
@@ -851,8 +923,10 @@
                        <xsl:for-each select="myButtons">
                                myButtons[<xsl:value-of select="name"/>] = 
<xsl:value-of select="values"/>
                        </xsl:for-each>
-               </script>               
-               <xsl:variable name="edit_url"><xsl:value-of 
select="edit_url"/></xsl:variable>
+               </script>
+               <xsl:variable name="edit_url">
+                       <xsl:value-of select="edit_url"/>
+               </xsl:variable>
                <div align="left">
                        <form name="form" method="post" action="{$edit_url}">
                                <table cellpadding="2" cellspacing="2" 
width="79%" align="center">
@@ -903,7 +977,6 @@
                                                        </tr>
                                                </xsl:when>
                                        </xsl:choose>
-
                                        <tr>
                                                <td valign="top">
                                                        <xsl:value-of 
select="lang_m_cost"/>
@@ -937,14 +1010,13 @@
                                                        <xsl:value-of 
select="lang_total_cost"/>
                                                </td>
                                                <td>
-                                                       <xsl:value-of 
select="value_total_cost"/>  
+                                                       <xsl:value-of 
select="value_total_cost"/>
                                                </td>
                                        </tr>
-
                                        <xsl:choose>
                                                <xsl:when 
test="attributes_values != ''">
                                                        <tr>
-                                                               <td colspan="2" 
width="50%" align="left">                               
+                                                               <td colspan="2" 
width="50%" align="left">
                                                                        
<xsl:call-template name="attributes_form"/>
                                                                </td>
                                                        </tr>
@@ -953,7 +1025,9 @@
                                        <tr height="50">
                                                <td valign="bottom" colspan="2" 
width="30%">
                                                        <input type="hidden" 
name="values[index_count]" value="{index_count}"/>
-                                                       <xsl:variable 
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
+                                                       <xsl:variable 
name="lang_save">
+                                                               <xsl:value-of 
select="lang_save"/>
+                                                       </xsl:variable>
                                                        <input type="submit" 
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return 
true;">
                                                                <xsl:attribute 
name="onMouseover">
                                                                        
<xsl:text>window.status='</xsl:text>
@@ -962,148 +1036,163 @@
                                                                </xsl:attribute>
                                                        </input>
                                                        <!-- </td>
-                               <td valign="bottom"> -->
-                                       <xsl:variable 
name="lang_apply"><xsl:value-of select="lang_apply"/></xsl:variable>
-                                       <input type="submit" 
name="values[apply]" value="{$lang_apply}" onMouseout="window.status='';return 
true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                       <xsl:value-of 
select="lang_apply_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                                       <!--</td>
-                               <td align="right" valign="bottom"> -->
-                                       <xsl:variable 
name="lang_cancel"><xsl:value-of select="lang_cancel"/></xsl:variable>
-                                       <input type="submit" 
name="values[cancel]" value="{$lang_cancel}" 
onMouseout="window.status='';return true;">
-                                               <xsl:attribute 
name="onMouseover">
-                                                       
<xsl:text>window.status='</xsl:text>
-                                                       <xsl:value-of 
select="lang_cancel_statustext"/>
-                                                       <xsl:text>'; return 
true;</xsl:text>
-                                               </xsl:attribute>
-                                       </input>
-                               </td> 
-                       </tr>
-               </table>
-       </form>
-
-       <xsl:choose>
-               <xsl:when test="values != ''">
-
-                       <xsl:variable name="update_action"><xsl:value-of 
select="update_action"/></xsl:variable>
-
-                       <form method="post" name="form2" 
action="{$update_action}">
-
-                               <input type="hidden" 
name="values[agreement_id]" value="{value_agreement_id}"/>
-                               <style type="text/css">
-                                       .calendar-opt
-                                       {
-                                       position:relative;
-                                       float:left;
-                                       }
-                                       .index-opt
-                                       {
-                                       position:relative;
-                                       float:left;
-                                       margin-top:2px;
-                                       }
-                                       .div-buttons
-                                       {
-                                       position:relative;
-                                       float:left;
-                                       width:750px;
-                                       height:100px;
-                                       }
-                               </style>
-
-                               <table cellpadding="2" cellspacing="2" 
width="79%" align="center" border="0">
-                                       <tr><td><br/></td></tr>
-                                       <!-- DataTable 0 EDIT_ITEM-->
-                                       <tr><td class="center" align="left" 
colspan="10"><div id="datatable-container_0"/></td></tr>
-                                       <tr><td><br/></td></tr>
-                                       <tr><td class="center" align="left" 
colspan="10">
-                                                       <div 
id="datatable-buttons_0" class="div-buttons">
-                                                               <input 
type="text" id="values_date" class="calendar-opt" name="values[date]" size="10" 
value="{date}" readonly="readonly" onMouseout="window.status='';return true;">
-                                                                       
<xsl:attribute name="onMouseover">
-                                                                               
<xsl:text>window.status='</xsl:text>
-                                                                               
<xsl:value-of select="lang_date_statustext"/>
-                                                                               
<xsl:text>'; return true;</xsl:text>
-                                                                       
</xsl:attribute>
-                                                               </input>
-                                                               <img 
id="values_date-trigger" class="calendar-opt" src="{img_cal}" 
alt="{lang_datetitle}" title="{lang_datetitle}" style="cursor:pointer; 
cursor:hand;"/>
-                                                               <div 
style="width:25px;height:15px;position:relative;float:left;"/>
-                                                       </div>  
-                                       </td></tr>
+<td valign="bottom"> -->
+                                                       <xsl:variable 
name="lang_apply">
+                                                               <xsl:value-of 
select="lang_apply"/>
+                                                       </xsl:variable>
+                                                       <input type="submit" 
name="values[apply]" value="{$lang_apply}" onMouseout="window.status='';return 
true;">
+                                                               <xsl:attribute 
name="onMouseover">
+                                                                       
<xsl:text>window.status='</xsl:text>
+                                                                       
<xsl:value-of select="lang_apply_statustext"/>
+                                                                       
<xsl:text>'; return true;</xsl:text>
+                                                               </xsl:attribute>
+                                                       </input>
+                                                       <!--</td>
+<td align="right" valign="bottom"> -->
+                                                       <xsl:variable 
name="lang_cancel">
+                                                               <xsl:value-of 
select="lang_cancel"/>

@@ Diff output truncated at 153600 characters. @@



reply via email to

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