fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [14581] clean up from yui


From: Sigurd Nes
Subject: [Fmsystem-commits] [14581] clean up from yui
Date: Fri, 11 Dec 2015 15:59:19 +0000

Revision: 14581
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14581
Author:   sigurdne
Date:     2015-12-11 15:59:18 +0000 (Fri, 11 Dec 2015)
Log Message:
-----------
clean up from yui

Modified Paths:
--------------
    branches/dev-syncromind/property/inc/class.uiagreement.inc.php
    branches/dev-syncromind/property/inc/class.uijasper.inc.php
    branches/dev-syncromind/property/inc/class.uipricebook.inc.php
    branches/dev-syncromind/property/inc/class.uiresponsible.inc.php
    branches/dev-syncromind/property/inc/class.uis_agreement.inc.php
    branches/dev-syncromind/property/inc/class.uitenant_claim.inc.php
    branches/dev-syncromind/property/inc/class.uitts.inc.php
    branches/dev-syncromind/property/templates/base/condition_survey_import.xsl
    branches/dev-syncromind/property/templates/base/dimb_role_user.xsl
    branches/dev-syncromind/property/templates/base/event_schedule.xsl
    branches/dev-syncromind/property/templates/base/event_schedule_week.xsl
    branches/dev-syncromind/property/templates/base/invoice2.xsl
    branches/dev-syncromind/property/templates/base/responsible.xsl

Removed Paths:
-------------
    branches/dev-syncromind/property/templates/base/uipricebook.index.xsl
    branches/dev-syncromind/property/templates/base/yui_property_i18n.xsl

Modified: branches/dev-syncromind/property/inc/class.uiagreement.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiagreement.inc.php      
2015-12-11 15:04:27 UTC (rev 14580)
+++ branches/dev-syncromind/property/inc/class.uiagreement.inc.php      
2015-12-11 15:59:18 UTC (rev 14581)
@@ -30,9 +30,7 @@
         * Description
         * @package property
         */
-       //phpgw::import_class('phpgwapi.yui');
        phpgw::import_class('phpgwapi.uicommon_jquery');
-       phpgw::import_class('phpgwapi.jquery');
 
        class property_uiagreement extends phpgwapi_uicommon_jquery
        {
@@ -1487,12 +1485,8 @@
                        $data = array
                                (
                                'datatable_def'  => $datatable_def,
-                               'property_js'    => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] . 
"/property/js/yahoo/property2.js"),
                                'base_java_url'  => 
json_encode(array(menuaction => "property.uiagreement.edit",
                                        id => $id)),
-//                                     'datatable'                             
                                => $datavalues,
-//                                     'myColumnDefs'                          
                        => $myColumnDefs,
-//                                     'myButtons'                             
                                => $myButtons,
                                'allow_allrows'  => true,
                                'allrows'                => $this->allrows,
                                'start_record'   => $this->start,
@@ -1575,7 +1569,6 @@
                                'lang_no_status' => lang('Select status'),
                                'textareacols'   => 
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'])
 && $GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'] ? 
$GLOBALS['phpgw_info']['user']['preferences']['property']['textareacols'] : 40,
                                'textarearows'   => 
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'])
 && $GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] ? 
$GLOBALS['phpgw_info']['user']['preferences']['property']['textarearows'] : 6,
-                               //'tabs'                                        
                                => phpgwapi_yui::tabview_generate($tabs, 
$active_tab)
                                'tabs'                   => 
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
                                'validator'              => 
phpgwapi_jquery::formvalidator_generate(array('location', 'date',
                                        'security', 'file'))
@@ -1854,12 +1847,8 @@
                        $data = array
                                (
                                'datatable_def'  => $datatable_def,
-                               'property_js'    => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] . 
"/property/js/yahoo/property2.js"),
                                'base_java_url'  => 
json_encode(array(menuaction => "property.uiagreement.edit_item",
                                        agreement_id => $agreement_id, id => 
$id, role => $this->role)),
-                               'datatable'              => $datavalues,
-                               'myColumnDefs'   => $myColumnDefs,
-                               'myButtons'              => $myButtons,
                                'activity_descr'                 => 
$activity_descr,
                                'lang_descr'                     => 
lang('Descr'),
                                'msgbox_data'                    => 
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
@@ -2009,7 +1998,6 @@
                        $data = array
                                (
                                'datatable_def'  => $datatable_def,
-                               'property_js'    => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] . 
"/property/js/yahoo/property2.js"),
                                'base_java_url'  => 
json_encode(array(menuaction => "property.uiagreement.view_item")),
                                'datatable'              => $datavalues,
                                'myColumnDefs'   => $myColumnDefs,
@@ -2306,10 +2294,7 @@
                        $data = array
                                (
                                'datatable_def'  => $datatable_def,
-                               'property_js'    => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] . 
"/property/js/yahoo/property2.js"),
                                'base_java_url'  => 
json_encode(array(menuaction => "property.uiagreement.view")),
-//                                     'datatable'                             
        => $datavalues,
-//                                     'myColumnDefs'                          
=> $myColumnDefs,
                                'allow_allrows'          => true,
                                'allrows'                        => 
$this->allrows,
                                'start_record'           => $this->start,

Modified: branches/dev-syncromind/property/inc/class.uijasper.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uijasper.inc.php 2015-12-11 
15:04:27 UTC (rev 14580)
+++ branches/dev-syncromind/property/inc/class.uijasper.inc.php 2015-12-11 
15:59:18 UTC (rev 14581)
@@ -757,7 +757,6 @@
                                'location_list'          => $location_list,
                                'td_count'                       => '""',
                                'base_java_url'          => 
"{menuaction:'property.uijasper.edit'}",
-                               'property_js'            => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] . 
"/property/js/yahoo/property2.js"),
                                'datatable'                      => $datavalues,
                                'tabs'                           => 
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
                                'validator'                      => 
phpgwapi_jquery::formvalidator_generate(array('location', 'date',

Modified: branches/dev-syncromind/property/inc/class.uipricebook.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uipricebook.inc.php      
2015-12-11 15:04:27 UTC (rev 14580)
+++ branches/dev-syncromind/property/inc/class.uipricebook.inc.php      
2015-12-11 15:59:18 UTC (rev 14581)
@@ -434,7 +434,7 @@
                        phpgwapi_jquery::load_widget('numberformat');
 
                        self::add_javascript('property', 'portico', 
'pricebook.index.js');
-                       self::render_template_xsl('uipricebook.index', $data);
+                       self::render_template_xsl('datatable_jquery', $data);
                }
 
                private function query_group_filter()

Modified: branches/dev-syncromind/property/inc/class.uiresponsible.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uiresponsible.inc.php    
2015-12-11 15:04:27 UTC (rev 14580)
+++ branches/dev-syncromind/property/inc/class.uiresponsible.inc.php    
2015-12-11 15:59:18 UTC (rev 14581)
@@ -628,16 +628,6 @@
                                );
                        }
 
-                       $module_def = array
-                               (
-                               array('key' => 'appname', 'label' => 
lang('appname'), 'sortable' => true, 'resizeable' => true),
-                               array('key' => 'location', 'label' => 
lang('location'), 'sortable' => true, 'resizeable' => true),
-                               array('key' => 'category', 'label' => 
lang('category'), 'sortable' => true, 'resizeable' => true),
-                               array('key' => 'active', 'label' => 
lang('active'), 'sortable' => true, 'resizeable' => true),
-                               array('key' => 'delete_module', 'label' => 
lang('delete'), 'sortable' => false,
-                                       'resizeable' => true, 'formatter' => 
'FormatterCenter')
-                       );
-
                        $responsibility_module = isset($values['module']) && 
$values['module'] ? $values['module'] : array();
 
                        foreach($responsibility_module as &$module)
@@ -656,26 +646,32 @@
                                }
                        }
 
-                       //---datatable settings--------------------------
-                       $datavalues[0]   = array
+
+                       $datatable_def[] = array
                                (
-                               'name'                   => "0",
-                               'values'                 => 
json_encode($responsibility_module),
-                               'total_records'  => 
count($responsibility_module),
-                               'is_paginator'   => 0,
-                               'footer'                 => 0
+                               'container'      => 'datatable-container_0',
+                               'requestUrl' => "''",
+                               'ColumnDefs' => array(
+                                               array('key' => 'appname', 
'label' => lang('appname'), 'sortable' => true, 'resizeable' => true),
+                                               array('key' => 'location', 
'label' => lang('location'), 'sortable' => true, 'resizeable' => true),
+                                               array('key' => 'category', 
'label' => lang('category'), 'sortable' => true, 'resizeable' => true),
+                                               array('key' => 'active', 
'label' => lang('active'), 'sortable' => true, 'resizeable' => true),
+                                               array('key' => 'delete_module', 
'label' => lang('delete'), 'sortable' => false, 'resizeable' => true, 
'formatter' => 'JqueryPortico.FormatterCenter')),
+                               'data'           => 
json_encode($responsibility_module),
+                               'config'         => array(
+                                       array('disableFilter' => true),
+                                       array('disablePagination' => true)
+                               )
                        );
-                       $myColumnDefs[0] = array
-                               (
-                               'name'   => "0",
-                               'values' => json_encode($module_def)
-                       );
-                       //-----------------------------------------------
 
+
+//-----------------------------------------------
+
                        $msgbox_data = 
$GLOBALS['phpgw']->common->msgbox_data($receipt);
 
                        $data = array
                                (
+                               'datatable_def'  => $datatable_def,
                                'msgbox_data'    => 
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
                                'form_action'    => 
$GLOBALS['phpgw']->link('/index.php', $link_data),
                                'value_appname'  => $this->appname,
@@ -687,10 +683,6 @@
                                'apps_list'              => array('options' => 
execMethod('property.bojasper.get_apps', $this->appname)),
                                'location_list'  => array('options' => 
$location_list),
                                'td_count'               => '""',
-                               'base_java_url'  => 
"{menuaction:'property.uiresponsible.edit'}",
-                               'property_js'    => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] . 
"/property/js/yahoo/property2.js"),
-                               'datatable'              => $datavalues,
-                               'myColumnDefs'   => $myColumnDefs,
                                'lang_category'  => lang('category'),
                                'lang_no_cat'    => lang('no category'),
                                'cat_select'     => 
$this->cats->formatted_xslt_list(array
@@ -703,20 +695,10 @@
                                        'security', 'file'))
                        );
 
-                       //---datatable settings--------------------
-                       phpgwapi_yui::load_widget('dragdrop');
-                       phpgwapi_yui::load_widget('datatable');
-                       phpgwapi_yui::load_widget('loader');
-
-                       $GLOBALS['phpgw']->css->validate_file('property');
-                       
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/datatable/assets/skins/sam/datatable.css');
-                       $GLOBALS['phpgw']->js->validate_file('yahoo', 
'responsible.edit', 'property');
-                       //-----------------------datatable settings---
-
                        $appname = 'Responsible';
 
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('property') . "::{$appname}::$function_msg::" . lang($this->appname);
-                       
$GLOBALS['phpgw']->xslttpl->add_file(array('responsible'));
+                       
$GLOBALS['phpgw']->xslttpl->add_file(array('responsible','datatable_inline'));
                        $GLOBALS['phpgw']->xslttpl->set_var('phpgw', 
array('edit' => $data));
                }
 
@@ -822,6 +804,8 @@
                        //-----------------------------------------------
 
                        $msgbox_data = 
$GLOBALS['phpgw']->common->msgbox_data($receipt);
+                       $tabs                    = array();
+                       $tabs['general'] = array('label' => lang('general'), 
'link' => '#general');
 
                        $data = array
                                (
@@ -836,23 +820,9 @@
                                'responsibility_list'    => array('options' => 
execMethod('property.boresponsible.get_responsibilities', array(
                                                'appname' => $this->appname, 
'selected' => $values['responsibility_id']))),
                                'level_list'                     => 
array('checkbox' => $level_list),
-                               'td_count'                               => 
'""',
-                               'base_java_url'                  => 
"{menuaction:'property.uiresponsible.edit'}",
-                               'property_js'                    => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] . 
"/property/js/yahoo/property2.js"),
-                               'datatable'                              => 
$datavalues,
-                               'myColumnDefs'                   => 
$myColumnDefs,
+                               'tabs'                                  => 
phpgwapi_jquery::tabview_generate($tabs, $active_tab),
                        );
 
-                       //---datatable settings--------------------
-                       phpgwapi_yui::load_widget('dragdrop');
-                       phpgwapi_yui::load_widget('datatable');
-                       phpgwapi_yui::load_widget('loader');
-
-                       $GLOBALS['phpgw']->css->validate_file('property');
-                       
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/yahoo/datatable/assets/skins/sam/datatable.css');
-                       $GLOBALS['phpgw']->js->validate_file('yahoo', 
'responsible.edit', 'property');
-                       //-----------------------datatable settings---
-
                        $appname = 'Responsible';
 
                        $GLOBALS['phpgw_info']['flags']['app_header'] = 
lang('property') . "::{$appname}::$function_msg::" . lang($this->appname);

Modified: branches/dev-syncromind/property/inc/class.uis_agreement.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uis_agreement.inc.php    
2015-12-11 15:04:27 UTC (rev 14580)
+++ branches/dev-syncromind/property/inc/class.uis_agreement.inc.php    
2015-12-11 15:59:18 UTC (rev 14581)
@@ -1153,7 +1153,6 @@
                        if(isset($values['attributes']) && 
is_array($values['attributes']))
                        {
 
-//                             phpgwapi_yui::tabview_setup('edit_tabview');
 //                             $tabs['general']        = array('label' => 
lang('general'), 'link' => '#general');
 
                                $location                        = 
$this->acl_location;
@@ -1609,7 +1608,6 @@
                                (
                                'datatable_def'  => $datatable_def,
                                'td_count'               => $td_count,
-                               'property_js'    => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] . 
"/property/js/yahoo/property2.js"),
                                'base_java_url'  => 
json_encode(array('menuaction' => "property.uis_agreement.edit",
                                        'id' => $id)),
                                'link_import'            => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'property.uis_agreement.import',
@@ -2008,7 +2006,6 @@
                        $GLOBALS['phpgw']->js->validate_file('overlib', 
'overlib', 'property');
                        $GLOBALS['phpgw']->js->validate_file('core', 'check', 
'property');
 
-                       //$tabs = array();
 
                        if(isset($values['attributes']) && 
is_array($values['attributes']))
                        {
@@ -2031,8 +2028,6 @@
                                        }
                                }
 
-                               //phpgwapi_yui::tabview_setup('edit_tabview');
-                               //$tabs['general']      = array('label' => 
lang('general'), 'link' => '#general');
 
                                $location                        = 
$this->acl_location . '.detail';
                                $attributes_groups       = 
$this->bo->get_attribute_groups($location, $values['attributes']);
@@ -2048,10 +2043,6 @@
                                unset($attributes_groups);
                                unset($s_agreement['attributes']);
 
-                               /* if($content)
-                                 {
-                                 $tabs['history']      = array('label' => 
lang('history'), 'link' => '#history');
-                                 } */
                        }
 
                        $content_values = array();
@@ -2147,40 +2138,9 @@
                                )
                        );
 
-//                     $datavalues[0] = array
-//                             (
-//                                     'name'                                  
=> "0",
-//                                     'values'                                
=> json_encode($content_values),
-//                                     'total_records'                 => 
count($content_values),
-//                                     'is_paginator'                  => 0,
-//                                     'permission'                    => 
json_encode($permissions['rowactions']),
-//                                     'footer'                                
=> 0
-//                             );
-//
-//                     $myColumnDefs[0] = array
-//                             (
-//                                     'name'          => "0",
-//                                     'values'        =>      
json_encode(array(      array('key' => 
'item_id','label'=>lang('ID'),'sortable'=>true,'resizeable'=>true),
-//                                                                             
                                array('key' => 
'cost','label'=>lang('Cost'),'sortable'=>true,'resizeable'=>true),
-//                                                                             
                                array('key' => 
'this_index','label'=>lang('index'),'sortable'=>true,'resizeable'=>true),
-//                                                                             
                                array('key' => 
'index_count','label'=>lang('index_count'),'sortable'=>true,'resizeable'=>true),
-//                                                                             
                                array('key' => 
'index_date','label'=>lang('Date'),'sortable'=>true,'resizeable'=>true)))
-//                             );
-//
-//                     $myButtons[0] = array
-//                     (
-//                                     'name'          => "0",
-//                                     'values'        =>      
json_encode(array(      array('type'=>'text', 'label'=>'New index', 
'classname'=> 'index-opt'),
-//                                                                             
                                array('id' =>'values[new_index]', 
'type'=>'inputText', size=>12, 'classname'=> 'index-opt'),
-//                                                                             
                                array('id' 
=>'values[update]','type'=>'buttons',        'value'=>'Update',      
'label'=>'Update',      'funct'=> 'onAddClick' , 'classname'=> ''),
-//                                                                             
                                array('id' =>'delete','type'=>'buttons',        
'value'=>'Delete',      'label'=>lang('delete last index'),     'funct'=> 
'onDeleteClick' , 'classname'=> '')
-//                             ))
-//                     );
-
                        $data = array
                                (
                                'datatable_def'  => $datatable_def,
-                               'property_js'    => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] . 
"/property/js/yahoo/property2.js"),
                                'base_java_url'  => 
json_encode(array('menuaction' => "property.uis_agreement.edit_item",
                                        'id' => $id, 's_agreement_id' => 
$s_agreement_id)),
                                'datatable'              => $datavalues,
@@ -2418,7 +2378,6 @@
                        $data = array
                                (
                                'datatable_def'  => $datatable_def,
-                               'property_js'    => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] . 
"/property/js/yahoo/property2.js"),
                                'base_java_url'  => 
json_encode(array('menuaction' => "property.uis_agreement.view_item")),
                                'datatable'              => $datavalues,
                                'myColumnDefs'   => $myColumnDefs,
@@ -2778,7 +2737,6 @@
                                (
                                'datatable_def'  => $datatable_def,
                                'lang_budget'    => lang('budget'),
-                               'property_js'    => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] . 
"/property/js/yahoo/property2.js"),
                                'base_java_url'  => 
json_encode(array('menuaction' => "property.uis_agreement.view")),
                                'datatable'              => $datavalues,
                                'myColumnDefs'   => $myColumnDefs,

Modified: branches/dev-syncromind/property/inc/class.uitenant_claim.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uitenant_claim.inc.php   
2015-12-11 15:04:27 UTC (rev 14580)
+++ branches/dev-syncromind/property/inc/class.uitenant_claim.inc.php   
2015-12-11 15:59:18 UTC (rev 14581)
@@ -829,7 +829,6 @@
                                'lang_start_date'                => 
lang('Project start date'),
                                'value_start_date'               => 
$project_values['start_date'],
                                'value_entry_date'               => 
$values['entry_date'] ? 
$GLOBALS['phpgw']->common->show_date($values['entry_date'], 
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat']) : '',
-                               'property_js'    => 
json_encode($GLOBALS['phpgw_info']['server']['webserver_url'] . 
"/property/js/yahoo/property2.js"),
                                'base_java_url'  => 
json_encode(array(menuaction => "property.uitenant_claim.edit",
                                        claim_id => $claim_id)),
                                'lang_end_date'  => lang('Project end date'),

Modified: branches/dev-syncromind/property/inc/class.uitts.inc.php
===================================================================
--- branches/dev-syncromind/property/inc/class.uitts.inc.php    2015-12-11 
15:04:27 UTC (rev 14580)
+++ branches/dev-syncromind/property/inc/class.uitts.inc.php    2015-12-11 
15:59:18 UTC (rev 14581)
@@ -31,7 +31,6 @@
         * @package property
         */
        phpgw::import_class('phpgwapi.uicommon_jquery');
-       phpgw::import_class('phpgwapi.jquery');
 
        class property_uitts extends phpgwapi_uicommon_jquery
        {

Modified: 
branches/dev-syncromind/property/templates/base/condition_survey_import.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/condition_survey_import.xsl 
2015-12-11 15:04:27 UTC (rev 14580)
+++ branches/dev-syncromind/property/templates/base/condition_survey_import.xsl 
2015-12-11 15:59:18 UTC (rev 14581)
@@ -2,7 +2,6 @@
 
        <!-- import -->
 <xsl:template match="data" xmlns:formvalidator="http://www.w3.org/TR/html4/"; 
xmlns:php="http://php.net/xsl";>
-               <xsl:call-template name="yui_phpgw_i18n"/>
 
                <div class="yui-navset yui-navset-top" id="survey_edit_tabview">
        

Modified: branches/dev-syncromind/property/templates/base/dimb_role_user.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/dimb_role_user.xsl  
2015-12-11 15:04:27 UTC (rev 14580)
+++ branches/dev-syncromind/property/templates/base/dimb_role_user.xsl  
2015-12-11 15:59:18 UTC (rev 14581)
@@ -44,7 +44,6 @@
                        </xsl:choose>
                                <div class="body">
                                        <div id="voucher_details">
-                                               <!--<xsl:call-template 
name="yui_phpgw_i18n"/>-->
                                                <table align = "center" 
width="95%">
                                                        <xsl:apply-templates 
select="filter_form" />
                                                </table>

Modified: branches/dev-syncromind/property/templates/base/event_schedule.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/event_schedule.xsl  
2015-12-11 15:04:27 UTC (rev 14580)
+++ branches/dev-syncromind/property/templates/base/event_schedule.xsl  
2015-12-11 15:59:18 UTC (rev 14581)
@@ -2,7 +2,6 @@
        <xsl:template match="data">
                <div id="content">
                        <xsl:call-template name="msgbox"/>
-                       <xsl:call-template name="yui_property_i18n"/>
                        <h4>
                                <xsl:value-of select="lang/resource_schedule"/>
                        </h4>

Modified: 
branches/dev-syncromind/property/templates/base/event_schedule_week.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/event_schedule_week.xsl     
2015-12-11 15:04:27 UTC (rev 14580)
+++ branches/dev-syncromind/property/templates/base/event_schedule_week.xsl     
2015-12-11 15:59:18 UTC (rev 14581)
@@ -31,7 +31,6 @@
                                </li>
                        </ul>
                        <xsl:call-template name="msgbox"/>
-                       <xsl:call-template name="yui_property_i18n"/>
                        <h4>
                                <xsl:value-of select="lang/resource_schedule"/>
                        </h4>

Modified: branches/dev-syncromind/property/templates/base/invoice2.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/invoice2.xsl        
2015-12-11 15:04:27 UTC (rev 14580)
+++ branches/dev-syncromind/property/templates/base/invoice2.xsl        
2015-12-11 15:59:18 UTC (rev 14581)
@@ -53,7 +53,6 @@
                                </xsl:when>
                        </xsl:choose>
                                        <div id="voucher_details">
-                                               <!--<xsl:call-template 
name="yui_phpgw_i18n"/>-->
                                                <table align = "center" 
width="95%" border="0">
                                                        <xsl:apply-templates 
select="filter_form" />
                                                        <xsl:apply-templates 
select="filter_invoice" />

Modified: branches/dev-syncromind/property/templates/base/responsible.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/responsible.xsl     
2015-12-11 15:04:27 UTC (rev 14580)
+++ branches/dev-syncromind/property/templates/base/responsible.xsl     
2015-12-11 15:59:18 UTC (rev 14581)
@@ -1,704 +1,689 @@
-  <!-- $Id$ -->
-       <xsl:template name="app_data">
-               <xsl:choose>
-                       <xsl:when test="edit">
-                               <xsl:apply-templates select="edit"/>
-                       </xsl:when>
-                       <xsl:when test="edit_contact">
-                               <xsl:apply-templates select="edit_contact"/>
-                       </xsl:when>
-                       <xsl:when test="list_contact">
-                               <xsl:apply-templates select="list_contact"/>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <xsl:apply-templates select="list_type"/>
-                       </xsl:otherwise>
-               </xsl:choose>
-       </xsl:template>
 
-       <!-- add / edit responsibility type-->
+<!-- $Id$ -->
+<xsl:template name="app_data">
+       <xsl:choose>
+               <xsl:when test="edit">
+                       <xsl:apply-templates select="edit"/>
+               </xsl:when>
+               <xsl:when test="edit_contact">
+                       <xsl:apply-templates select="edit_contact"/>
+               </xsl:when>
+               <xsl:when test="list_contact">
+                       <xsl:apply-templates select="list_contact"/>
+               </xsl:when>
+               <xsl:otherwise>
+                       <xsl:apply-templates select="list_type"/>
+               </xsl:otherwise>
+       </xsl:choose>
+</xsl:template>
 
-       <xsl:template xmlns:php="http://php.net/xsl"; match="edit">
-            <script type="text/javascript">
-                       self.name="first_Window";
-                       <xsl:value-of select="lookup_functions"/>
-            </script>
-            <div id="tab-content">
-                <xsl:value-of disable-output-escaping="yes" select="tabs"/>
-                    <div id="general">
-                        <xsl:variable name="form_action">
-                                <xsl:value-of select="form_action"/>
-                        </xsl:variable>
-                                <div class="pure-control-group">
-                                                    <dl>
-                                                        <xsl:choose>
-                                                                <xsl:when 
test="msgbox_data != ''">
-                                                                               
 <dt>
-                                                                               
         <xsl:call-template name="msgbox"/>
-                                                                               
 </dt>
-                                                                </xsl:when>
-                                                        </xsl:choose>
-                                                    </dl>
+<!-- add / edit responsibility type-->
+
+<xsl:template xmlns:php="http://php.net/xsl"; match="edit">
+       <script type="text/javascript">
+               self.name="first_Window";
+               <xsl:value-of select="lookup_functions"/>
+       </script>
+       <div id="tab-content">
+               <xsl:value-of disable-output-escaping="yes" select="tabs"/>
+               <div id="general">
+                       <xsl:variable name="form_action">
+                               <xsl:value-of select="form_action"/>
+                       </xsl:variable>
+                       <div class="pure-control-group">
+                               <dl>
+                                       <xsl:choose>
+                                               <xsl:when test="msgbox_data != 
''">
+                                                       <dt>
+                                                               
<xsl:call-template name="msgbox"/>
+                                                       </dt>
+                                               </xsl:when>
+                                       </xsl:choose>
+                               </dl>
                                                        
-                                                        <form name="form_app" 
class="pure-form pure-form-aligned" method="post" action="{$form_action}">
-                                                                <xsl:choose>
-                                                                    <xsl:when 
test="value_id != ''">
-                                                                            
<div class="pure-control-group">
-                                                                               
     <label>
-                                                                               
             <xsl:value-of select="php:function('lang', 'id')"/>
-                                                                               
     </label>
-                                                                               
             <xsl:value-of select="value_id"/>
-                                                                            
</div>
-                                                                    </xsl:when>
-                                                                </xsl:choose>
-                                                                <div 
class="pure-control-group">
-                                                                        <label>
-                                                                               
 <xsl:value-of select="php:function('lang', 'application')"/>
-                                                                        
</label>
-                                                                               
 <select name="appname" onChange="this.form.submit();">
-                                                                               
         <xsl:attribute name="title">
-                                                                               
                 <xsl:value-of select="php:function('lang', 'application')"/>
-                                                                               
         </xsl:attribute>
-                                                                               
         <xsl:apply-templates select="apps_list/options"/>
-                                                                               
 </select>
-                                                                </div>
-                                                        </form>
-                                                        <form 
name="form_location" class="pure-form pure-form-aligned" method="post" 
action="{$form_action}">
-                                                                <div 
class="pure-control-group">
-                                                                        <label>
-                                                                               
 <input type="hidden" name="appname" value="{value_appname}"/>
-                                                                               
 <xsl:value-of select="php:function('lang', 'location')"/>
-                                                                        
</label>
-                                                                               
 <select name="location" onChange="this.form.submit();">
-                                                                               
         <xsl:attribute name="title">
-                                                                               
                 <xsl:value-of select="php:function('lang', 'Select 
submodule')"/>
-                                                                               
         </xsl:attribute>
-                                                                               
         <option value="">
-                                                                               
                 <xsl:value-of select="php:function('lang', 'No location')"/>
-                                                                               
         </option>
-                                                                               
         <xsl:apply-templates select="location_list/options"/>
-                                                                               
 </select>
-                                                                </div>
-                                                        </form>
-                                                <div 
class="pure-control-group">
-                                                                <form 
name="form" class="pure-form pure-form-aligned" method="post" 
action="{$form_action}">
-                                                                               
 <div class="pure-control-group">
-                                                                               
         <label>
-                                                                               
                 <input type="hidden" name="values[appname]" 
value="{value_appname}"/>
-                                                                               
                 <input type="hidden" name="values[location]" 
value="{value_location}"/>
-                                                                               
                 <xsl:value-of select="php:function('lang', 'category')"/>
-                                                                               
         </label>
-                                                                               
                 <xsl:call-template name="categories"/>
-                                                                               
 </div>
-                                                                               
 <div class="pure-control-group">
-                                                                               
         <label>
-                                                                               
                 <xsl:value-of select="php:function('lang', 'name')"/>
-                                                                               
         </label>
-                                                                               
                 <input type="text" name="values[name]" value="{value_name}" 
size="60">
-                                                                               
                         <xsl:attribute name="title">
-                                                                               
                                 <xsl:value-of select="php:function('lang', 
'name')"/>
-                                                                               
                         </xsl:attribute>
-                                                                               
                 </input>
-                                                                               
 </div>
-                                                                               
 <div class="pure-control-group">
-                                                                               
         <label>
-                                                                               
                 <xsl:value-of select="php:function('lang', 'descr')"/>
-                                                                               
         </label>
-                                                                               
                 <textarea cols="60" rows="10" name="values[descr]">
-                                                                               
                         <xsl:attribute name="title">
-                                                                               
                                 <xsl:value-of select="php:function('lang', 
'descr')"/>
-                                                                               
                         </xsl:attribute>
-                                                                               
                         <xsl:value-of select="value_descr"/>
-                                                                               
                 </textarea>
-                                                                               
 </div>
-                                                                               
 <div class="pure-control-group">
-                                                                               
         <label>
-                                                                               
                 <xsl:value-of select="php:function('lang', 'details')"/>
-                                                                               
         </label>
-                                                                               
         <div style="display: inline-block; vertical-align: top;">
-                                                                               
                 <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                                                                               
                         <td>
-                                                                               
                                 <div id="paging_0"/>
-                                                                               
                                 <div id="datatable-container_0"/>
-                                                                               
                         </td>
-                                                                               
                 </table>
-                                                                               
         </div>
-                                                                               
 </div>
-                                                                               
 <div class="pure-control-group">
-                                                                               
                         <xsl:variable name="lang_save">
-                                                                               
                                 <xsl:value-of select="php:function('lang', 
'save')"/>
-                                                                               
                         </xsl:variable>
-                                                                               
                         <xsl:variable name="lang_apply">
-                                                                               
                                 <xsl:value-of select="php:function('lang', 
'apply')"/>
-                                                                               
                         </xsl:variable>
-                                                                               
                         <xsl:variable name="lang_cancel">
-                                                                               
                                 <xsl:value-of select="php:function('lang', 
'cancel')"/>
-                                                                               
                         </xsl:variable>
-                                                                               
                         <div class="pure-control-group">
-                                                                               
                                         <input type="submit" 
class="pure-button pure-button-primary" name="values[save]" 
value="{$lang_save}">
-                                                                               
                                                 <xsl:attribute name="title">
-                                                                               
                                                         <xsl:value-of 
select="php:function('lang', 'save')"/>
-                                                                               
                                                 </xsl:attribute>
-                                                                               
                                         </input>
-                                                                               
                                         <input type="submit" 
class="pure-button pure-button-primary" name="values[apply]" 
value="{$lang_apply}">
-                                                                               
                                                 <xsl:attribute name="title">
-                                                                               
                                                         <xsl:value-of 
select="php:function('lang', 'apply')"/>
-                                                                               
                                                 </xsl:attribute>
-                                                                               
                                         </input>
-                                                                               
                                         <input type="submit" 
class="pure-button pure-button-primary" name="values[cancel]" 
value="{$lang_cancel}">
-                                                                               
                                                 <xsl:attribute name="title">
-                                                                               
                                                         <xsl:value-of 
select="php:function('lang', 'cancel')"/>
-                                                                               
                                                 </xsl:attribute>
-                                                                               
                                         </input>
-                                                                               
                         </div>
-                                                                               
 </div>
-                                                                </form>
-                                                </div>
-                                </div>
-                        <!--  DATATABLE DEFINITIONS-->
-                        <script type="text/javascript">
-                                var property_js = <xsl:value-of 
select="property_js"/>;
-                                var base_java_url = <xsl:value-of 
select="base_java_url"/>;
-                                var datatable = new Array();
-                                var myColumnDefs = new Array();
-                                var myButtons = new Array();
-                                var td_count = <xsl:value-of 
select="td_count"/>;
+                               <form name="form_app" class="pure-form 
pure-form-aligned" method="post" action="{$form_action}">
+                                       <xsl:choose>
+                                               <xsl:when test="value_id != ''">
+                                                       <div 
class="pure-control-group">
+                                                               <label>
+                                                                       
<xsl:value-of select="php:function('lang', 'id')"/>
+                                                               </label>
+                                                               <xsl:value-of 
select="value_id"/>
+                                                       </div>
+                                               </xsl:when>
+                                       </xsl:choose>
+                                       <div class="pure-control-group">
+                                               <label>
+                                                       <xsl:value-of 
select="php:function('lang', 'application')"/>
+                                               </label>
+                                               <select name="appname" 
onChange="this.form.submit();">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="php:function('lang', 'application')"/>
+                                                       </xsl:attribute>
+                                                       <xsl:apply-templates 
select="apps_list/options"/>
+                                               </select>
+                                       </div>
+                               </form>
+                               <form name="form_location" class="pure-form 
pure-form-aligned" method="post" action="{$form_action}">
+                                       <div class="pure-control-group">
+                                               <label>
+                                                       <input type="hidden" 
name="appname" value="{value_appname}"/>
+                                                       <xsl:value-of 
select="php:function('lang', 'location')"/>
+                                               </label>
+                                               <select name="location" 
onChange="this.form.submit();">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="php:function('lang', 'Select submodule')"/>
+                                                       </xsl:attribute>
+                                                       <option value="">
+                                                               <xsl:value-of 
select="php:function('lang', 'No location')"/>
+                                                       </option>
+                                                       <xsl:apply-templates 
select="location_list/options"/>
+                                               </select>
+                                       </div>
+                               </form>
+                               <div class="pure-control-group">
+                                       <form name="form" class="pure-form 
pure-form-aligned" method="post" action="{$form_action}">
+                                               <div class="pure-control-group">
+                                                       <label>
+                                                               <input 
type="hidden" name="values[appname]" value="{value_appname}"/>
+                                                               <input 
type="hidden" name="values[location]" value="{value_location}"/>
+                                                               <xsl:value-of 
select="php:function('lang', 'category')"/>
+                                                       </label>
+                                                       <xsl:call-template 
name="categories"/>
+                                               </div>
+                                               <div class="pure-control-group">
+                                                       <label>
+                                                               <xsl:value-of 
select="php:function('lang', 'name')"/>
+                                                       </label>
+                                                       <input type="text" 
name="values[name]" value="{value_name}" size="60">
+                                                               <xsl:attribute 
name="title">
+                                                                       
<xsl:value-of select="php:function('lang', 'name')"/>
+                                                               </xsl:attribute>
+                                                       </input>
+                                               </div>
+                                               <div class="pure-control-group">
+                                                       <label>
+                                                               <xsl:value-of 
select="php:function('lang', 'descr')"/>
+                                                       </label>
+                                                       <textarea cols="60" 
rows="10" name="values[descr]">
+                                                               <xsl:attribute 
name="title">
+                                                                       
<xsl:value-of select="php:function('lang', 'descr')"/>
+                                                               </xsl:attribute>
+                                                               <xsl:value-of 
select="value_descr"/>
+                                                       </textarea>
+                                               </div>
+                                               <div class="pure-control-group">
+                                                       <label>
+                                                               <xsl:value-of 
select="php:function('lang', 'details')"/>
+                                                       </label>
+                                                       <div class = 
'pure-u-md-1-2'>
+                                                               <xsl:for-each 
select="datatable_def">
+                                                                       <xsl:if 
test="container = 'datatable-container_0'">
+                                                                               
<xsl:call-template name="table_setup">
+                                                                               
        <xsl:with-param name="container" select ='container'/>
+                                                                               
        <xsl:with-param name="requestUrl" select ='requestUrl'/>
+                                                                               
        <xsl:with-param name="ColumnDefs" select ='ColumnDefs'/>
+                                                                               
        <xsl:with-param name="data" select ='data'/>
+                                                                               
        <xsl:with-param name="config" select ='config'/>
+                                                                               
</xsl:call-template>
+                                                                       
</xsl:if>
+                                                               </xsl:for-each>
+                                                       </div>
+                                               </div>
+                                               <div class="pure-control-group">
+                                                       <xsl:variable 
name="lang_save">
+                                                               <xsl:value-of 
select="php:function('lang', 'save')"/>
+                                                       </xsl:variable>
+                                                       <xsl:variable 
name="lang_apply">
+                                                               <xsl:value-of 
select="php:function('lang', 'apply')"/>
+                                                       </xsl:variable>
+                                                       <xsl:variable 
name="lang_cancel">
+                                                               <xsl:value-of 
select="php:function('lang', 'cancel')"/>
+                                                       </xsl:variable>
+                                                       <div 
class="pure-control-group">
+                                                               <input 
type="submit" class="pure-button pure-button-primary" name="values[save]" 
value="{$lang_save}">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="php:function('lang', 'save')"/>
+                                                                       
</xsl:attribute>
+                                                               </input>
+                                                               <input 
type="submit" class="pure-button pure-button-primary" name="values[apply]" 
value="{$lang_apply}">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="php:function('lang', 'apply')"/>
+                                                                       
</xsl:attribute>
+                                                               </input>
+                                                               <input 
type="submit" class="pure-button pure-button-primary" name="values[cancel]" 
value="{$lang_cancel}">
+                                                                       
<xsl:attribute name="title">
+                                                                               
<xsl:value-of select="php:function('lang', 'cancel')"/>
+                                                                       
</xsl:attribute>
+                                                               </input>
+                                                       </div>
+                                               </div>
+                                       </form>
+                               </div>
+                       </div>
+                       <!--  DATATABLE DEFINITIONS-->
+               </div>
+       </div>
+</xsl:template>
 
-                                <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"/>
-                                                }
-                                        ]
-                                </xsl:for-each>
-                                <xsl:for-each select="myColumnDefs">
-                                        myColumnDefs[<xsl:value-of 
select="name"/>] = <xsl:value-of select="values"/>
-                                </xsl:for-each>
-                                <xsl:for-each select="myButtons">
-                                        myButtons[<xsl:value-of 
select="name"/>] = <xsl:value-of select="values"/>
-                                </xsl:for-each>
-                        </script>
-                    </div>
-            </div>
-       </xsl:template>
-
-       <!-- add / edit  -->
-       <xsl:template xmlns:php="http://php.net/xsl"; match="edit_role">
-               <xsl:variable name="form_action">
-                       <xsl:value-of select="form_action"/>
-               </xsl:variable>
-               <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
-                       <tr>
-                               <td>
-                                       <table cellpadding="2" cellspacing="2" 
align="left">
-                                               <xsl:choose>
-                                                       <xsl:when 
test="msgbox_data != ''">
-                                                               <tr>
-                                                                       <td 
align="left" colspan="3">
-                                                                               
<xsl:call-template name="msgbox"/>
-                                                                       </td>
-                                                               </tr>
-                                                       </xsl:when>
-                                               </xsl:choose>
-                                       </table>
-                                       <tr>
-                                               <td>
-                                                       <form name="form" 
method="post" action="{$form_action}">
-                                                               <table 
cellpadding="2" cellspacing="2" align="left">
-                                                                       
<xsl:choose>
-                                                                               
<xsl:when test="value_id != ''">
-                                                                               
        <tr>
-                                                                               
                <td valign="top">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'id')"/>
-                                                                               
                </td>
-                                                                               
                <td>
-                                                                               
                        <xsl:value-of select="value_id"/>
-                                                                               
                </td>
-                                                                               
        </tr>
-                                                                               
</xsl:when>
-                                                                       
</xsl:choose>
+<!-- add / edit  -->
+<xsl:template xmlns:php="http://php.net/xsl"; match="edit_role">
+       <xsl:variable name="form_action">
+               <xsl:value-of select="form_action"/>
+       </xsl:variable>
+       <div id="tab-content">
+               <xsl:value-of disable-output-escaping="yes" select="tabs"/>
+               <div id="general">
+                       <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
+                               <tr>
+                                       <td>
+                                               <table cellpadding="2" 
cellspacing="2" align="left">
+                                                       <xsl:choose>
+                                                               <xsl:when 
test="msgbox_data != ''">
                                                                        <tr>
-                                                                               
<td>
-                                                                               
        <xsl:value-of select="php:function('lang', 'name')"/>
+                                                                               
<td align="left" colspan="3">
+                                                                               
        <xsl:call-template name="msgbox"/>
                                                                                
</td>
-                                                                               
<td>
-                                                                               
        <input type="text" name="values[name]" value="{value_name}" size="60">
-                                                                               
                <xsl:attribute name="title">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'name')"/>
-                                                                               
                </xsl:attribute>
-                                                                               
        </input>
-                                                                               
</td>
                                                                        </tr>
-                                                                       <tr>
-                                                                               
<td valign="top">
-                                                                               
        <xsl:value-of select="php:function('lang', 'descr')"/>
-                                                                               
</td>
-                                                                               
<td>
-                                                                               
        <textarea cols="60" rows="10" name="values[remark]">
-                                                                               
                <xsl:attribute name="title">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'descr')"/>
-                                                                               
                </xsl:attribute>
-                                                                               
                <xsl:value-of select="value_remark"/>
-                                                                               
        </textarea>
-                                                                               
</td>
-                                                                       </tr>
-                                                                       <tr>
-                                                                               
<td>
-                                                                               
        <xsl:value-of select="php:function('lang', 'responsibility')"/>
-                                                                               
</td>
-                                                                               
<td align="left">
-                                                                               
        <select name="values[responsibility_id]">
-                                                                               
                <xsl:attribute name="title">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'Select 
submodule')"/>
-                                                                               
                </xsl:attribute>
-                                                                               
                <option value="">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'select')"/>
-                                                                               
                </option>
-                                                                               
                <xsl:apply-templates select="responsibility_list/options"/>
-                                                                               
        </select>
-                                                                               
</td>
-                                                                       </tr>
-
-                                                                       <tr>
-                                                                               
<td valign = 'top'>
-                                                                               
        <xsl:value-of select="php:function('lang', 'location level')"/>
-                                                                               
</td>
-                                                                               
<td align="left">
-                                                                               
        <table>
-                                                                               
                <xsl:apply-templates select="level_list/checkbox"/>
-                                                                               
        </table>
-                                                                               
</td>
-                                                                       </tr>
-
-                                                                       <tr>
-                                                                               
<td colspan="2">
-                                                                               
        <table cellpadding="2" cellspacing="2" width="50%" align="center">
-                                                                               
                <xsl:variable name="lang_save">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'save')"/>
-                                                                               
                </xsl:variable>
-                                                                               
                <xsl:variable name="lang_apply">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'apply')"/>
-                                                                               
                </xsl:variable>
-                                                                               
                <xsl:variable name="lang_cancel">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'cancel')"/>
-                                                                               
                </xsl:variable>
-                                                                               
                <tr height="50">
-                                                                               
                        <td>
-                                                                               
                                <input type="submit" name="values[save]" 
value="{$lang_save}">
-                                                                               
                                        <xsl:attribute name="title">
-                                                                               
                                                <xsl:value-of 
select="php:function('lang', 'save')"/>
-                                                                               
                                        </xsl:attribute>
-                                                                               
                                </input>
+                                                               </xsl:when>
+                                                       </xsl:choose>
+                                               </table>
+                                               <tr>
+                                                       <td>
+                                                               <form 
name="form" method="post" action="{$form_action}">
+                                                                       <table 
cellpadding="2" cellspacing="2" align="left">
+                                                                               
<xsl:choose>
+                                                                               
        <xsl:when test="value_id != ''">
+                                                                               
                <tr>
+                                                                               
                        <td valign="top">
+                                                                               
                                <xsl:value-of select="php:function('lang', 
'id')"/>
                                                                                
                        </td>
                                                                                
                        <td>
-                                                                               
                                <input type="submit" name="values[apply]" 
value="{$lang_apply}">
-                                                                               
                                        <xsl:attribute name="title">
-                                                                               
                                                <xsl:value-of 
select="php:function('lang', 'apply')"/>
-                                                                               
                                        </xsl:attribute>
-                                                                               
                                </input>
+                                                                               
                                <xsl:value-of select="value_id"/>
                                                                                
                        </td>
-                                                                               
                        <td>
-                                                                               
                                <input type="submit" name="values[cancel]" 
value="{$lang_cancel}">
-                                                                               
                                        <xsl:attribute name="title">
-                                                                               
                                                <xsl:value-of 
select="php:function('lang', 'cancel')"/>
-                                                                               
                                        </xsl:attribute>
-                                                                               
                                </input>
-                                                                               
                        </td>
                                                                                
                </tr>
-                                                                               
        </table>
-                                                                               
</td>
-                                                                       </tr>
-                                                               </table>
-                                                       </form>
-                                               </td>
-                                       </tr>
-                               </td>
-                       </tr>
-               </table>
-       </xsl:template>
+                                                                               
        </xsl:when>
+                                                                               
</xsl:choose>
+                                                                               
<tr>
+                                                                               
        <td>
+                                                                               
                <xsl:value-of select="php:function('lang', 'name')"/>
+                                                                               
        </td>
+                                                                               
        <td>
+                                                                               
                <input type="text" name="values[name]" value="{value_name}" 
size="60">
+                                                                               
                        <xsl:attribute name="title">
+                                                                               
                                <xsl:value-of select="php:function('lang', 
'name')"/>
+                                                                               
                        </xsl:attribute>
+                                                                               
                </input>
+                                                                               
        </td>
+                                                                               
</tr>
+                                                                               
<tr>
+                                                                               
        <td valign="top">
+                                                                               
                <xsl:value-of select="php:function('lang', 'descr')"/>
+                                                                               
        </td>
+                                                                               
        <td>
+                                                                               
                <textarea cols="60" rows="10" name="values[remark]">
+                                                                               
                        <xsl:attribute name="title">
+                                                                               
                                <xsl:value-of select="php:function('lang', 
'descr')"/>
+                                                                               
                        </xsl:attribute>
+                                                                               
                        <xsl:value-of select="value_remark"/>
+                                                                               
                </textarea>
+                                                                               
        </td>
+                                                                               
</tr>
+                                                                               
<tr>
+                                                                               
        <td>
+                                                                               
                <xsl:value-of select="php:function('lang', 'responsibility')"/>
+                                                                               
        </td>
+                                                                               
        <td align="left">
+                                                                               
                <select name="values[responsibility_id]">
+                                                                               
                        <xsl:attribute name="title">
+                                                                               
                                <xsl:value-of select="php:function('lang', 
'Select submodule')"/>
+                                                                               
                        </xsl:attribute>
+                                                                               
                        <option value="">
+                                                                               
                                <xsl:value-of select="php:function('lang', 
'select')"/>
+                                                                               
                        </option>
+                                                                               
                        <xsl:apply-templates 
select="responsibility_list/options"/>
+                                                                               
                </select>
+                                                                               
        </td>
+                                                                               
</tr>
 
-       <!-- New template-->
-       <xsl:template match="list_contact">
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                       <xsl:choose>
-                               <xsl:when test="msgbox_data != ''">
-                                       <tr>
-                                               <td align="left" colspan="3">
-                                                       <xsl:call-template 
name="msgbox"/>
-                                               </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
-                       <tr>
-                               <td class="th_text" align="left">
-                                       <xsl:value-of select="location_name"/>
-                                       <xsl:choose>
-                                               <xsl:when test="category_name 
!= ''">
-                                                       <xsl:text>::</xsl:text>
-                                                       <xsl:value-of 
select="category_name"/>
-                                               </xsl:when>
-                                       </xsl:choose>
-                                       <xsl:text>::</xsl:text>
-                                       <xsl:value-of select="type_name"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td align="right">
-                                       <xsl:call-template name="search_field"/>
-                               </td>
-                       </tr>
-                       <tr>
-                               <td colspan="3" width="100%">
-                                       <xsl:call-template name="nextmatchs"/>
-                               </td>
-                       </tr>
-               </table>
-               <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
-                       <xsl:apply-templates select="table_header_contact"/>
-                       <xsl:choose>
-                               <xsl:when test="values_contact != ''">
-                                       <xsl:apply-templates 
select="values_contact"/>
-                               </xsl:when>
-                       </xsl:choose>
-                       <xsl:apply-templates select="table_add"/>
-               </table>
-       </xsl:template>
+                                                                               
<tr>
+                                                                               
        <td valign = 'top'>
+                                                                               
                <xsl:value-of select="php:function('lang', 'location level')"/>
+                                                                               
        </td>
+                                                                               
        <td align="left">
+                                                                               
                <table>
+                                                                               
                        <xsl:apply-templates select="level_list/checkbox"/>
+                                                                               
                </table>
+                                                                               
        </td>
+                                                                               
</tr>
 
-       <!-- New template-->
-       <xsl:template match="table_header_contact">
-               <xsl:variable name="sort_location">
-                       <xsl:value-of select="sort_location"/>
-               </xsl:variable>
-               <xsl:variable name="sort_active_from">
-                       <xsl:value-of select="sort_active_from"/>
-               </xsl:variable>
-               <xsl:variable name="sort_active_to">
-                       <xsl:value-of select="sort_active_to"/>
-               </xsl:variable>
-               <tr class="th">
-                       <td class="th_text" width="20%" align="center">
-                               <xsl:value-of select="lang_contact"/>
-                       </td>
-                       <td class="th_text" width="10%" align="left">
-                               <a href="{$sort_location}">
-                                       <xsl:value-of select="lang_location"/>
-                               </a>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_item"/>
-                       </td>
-                       <td class="th_text" width="5%" align="left">
-                               <a href="{$sort_active_from}">
-                                       <xsl:value-of 
select="lang_active_from"/>
-                               </a>
-                       </td>
-                       <td class="th_text" width="5%" align="left">
-                               <a href="{$sort_active_to}">
-                                       <xsl:value-of select="lang_active_to"/>
-                               </a>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_created_on"/>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_created_by"/>
-                       </td>
-                       <td class="th_text" width="40%" align="left">
-                               <xsl:value-of select="lang_remark"/>
-                       </td>
-                       <td class="th_text" width="5%" align="center">
-                               <xsl:value-of select="lang_edit"/>
-                       </td>
-                       <!--
-<td class="th_text" width="5%" align="center">
-<xsl:value-of select="lang_delete"/>
-</td>
--->
-               </tr>
-       </xsl:template>
+                                                                               
<tr>
+                                                                               
        <td colspan="2">
+                                                                               
                <table cellpadding="2" cellspacing="2" width="50%" 
align="center">
+                                                                               
                        <xsl:variable name="lang_save">
+                                                                               
                                <xsl:value-of select="php:function('lang', 
'save')"/>
+                                                                               
                        </xsl:variable>
+                                                                               
                        <xsl:variable name="lang_apply">
+                                                                               
                                <xsl:value-of select="php:function('lang', 
'apply')"/>
+                                                                               
                        </xsl:variable>
+                                                                               
                        <xsl:variable name="lang_cancel">
+                                                                               
                                <xsl:value-of select="php:function('lang', 
'cancel')"/>
+                                                                               
                        </xsl:variable>
+                                                                               
                        <tr height="50">
+                                                                               
                                <td>
+                                                                               
                                        <input type="submit" 
name="values[save]" value="{$lang_save}">
+                                                                               
                                                <xsl:attribute name="title">
+                                                                               
                                                        <xsl:value-of 
select="php:function('lang', 'save')"/>
+                                                                               
                                                </xsl:attribute>
+                                                                               
                                        </input>
+                                                                               
                                </td>
+                                                                               
                                <td>
+                                                                               
                                        <input type="submit" 
name="values[apply]" value="{$lang_apply}">
+                                                                               
                                                <xsl:attribute name="title">
+                                                                               
                                                        <xsl:value-of 
select="php:function('lang', 'apply')"/>
+                                                                               
                                                </xsl:attribute>
+                                                                               
                                        </input>
+                                                                               
                                </td>
+                                                                               
                                <td>
+                                                                               
                                        <input type="submit" 
name="values[cancel]" value="{$lang_cancel}">
+                                                                               
                                                <xsl:attribute name="title">
+                                                                               
                                                        <xsl:value-of 
select="php:function('lang', 'cancel')"/>
+                                                                               
                                                </xsl:attribute>
+                                                                               
                                        </input>
+                                                                               
                                </td>
+                                                                               
                        </tr>
+                                                                               
                </table>
+                                                                               
        </td>
+                                                                               
</tr>
+                                                                       </table>
+                                                               </form>
+                                                       </td>
+                                               </tr>
+                                       </td>
+                               </tr>
+                       </table>
+               </div>
+       </div>
+</xsl:template>
 
-       <!-- New template-->
-       <xsl:template match="values_contact">
+<!-- New template-->
+<xsl:template match="list_contact">
+       <table width="100%" cellpadding="2" cellspacing="2" align="center">
+               <xsl:choose>
+                       <xsl:when test="msgbox_data != ''">
+                               <tr>
+                                       <td align="left" colspan="3">
+                                               <xsl:call-template 
name="msgbox"/>
+                                       </td>
+                               </tr>
+                       </xsl:when>
+               </xsl:choose>
                <tr>
-                       <xsl:attribute name="class">
+                       <td class="th_text" align="left">
+                               <xsl:value-of select="location_name"/>
                                <xsl:choose>
-                                       <xsl:when test="position() mod 2 = 0">
-                                               <xsl:text>row_off</xsl:text>
+                                       <xsl:when test="category_name != ''">
+                                               <xsl:text>::</xsl:text>
+                                               <xsl:value-of 
select="category_name"/>
                                        </xsl:when>
-                                       <xsl:otherwise>
-                                               <xsl:text>row_on</xsl:text>
-                                       </xsl:otherwise>
                                </xsl:choose>
-                       </xsl:attribute>
-                       <td align="left">
-                               <xsl:value-of select="contact_name"/>
+                               <xsl:text>::</xsl:text>
+                               <xsl:value-of select="type_name"/>
                        </td>
-                       <td align="left">
-                               <xsl:value-of select="location_code"/>
+               </tr>
+               <tr>
+                       <td align="right">
+                               <xsl:call-template name="search_field"/>
                        </td>
-                       <td align="left">
-                               <xsl:value-of select="item"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="active_from"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="active_to"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="created_on"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="created_by"/>
-                       </td>
-                       <td align="left">
-                               <xsl:value-of select="remark"/>
-                       </td>
-                       <xsl:choose>
-                               <xsl:when test="link_edit != ''">
-                                       <td align="center" 
title="{lang_edit_text}">
-                                               <xsl:variable name="link_edit">
-                                                       <xsl:value-of 
select="link_edit"/>
-                                               </xsl:variable>
-                                               <a href="{link_edit}">
-                                                       <xsl:value-of 
select="text_edit"/>
-                                               </a>
-                                       </td>
-                               </xsl:when>
-                       </xsl:choose>
-                       <xsl:choose>
-                               <xsl:when test="link_delete != ''">
-                                       <td align="center" 
title="{lang_delete_text}">
-                                               <xsl:variable 
name="link_delete">
-                                                       <xsl:value-of 
select="link_delete"/>
-                                               </xsl:variable>
-                                               <a href="{link_delete}">
-                                                       <xsl:value-of 
select="text_delete"/>
-                                               </a>
-                                       </td>
-                               </xsl:when>
-                       </xsl:choose>
                </tr>
-       </xsl:template>
-
-       <!-- New template-->
-       <xsl:template match="table_add">
-               <xsl:variable name="add_action">
-                       <xsl:value-of select="add_action"/>
-               </xsl:variable>
-               <xsl:variable name="lang_add">
-                       <xsl:value-of select="lang_add"/>
-               </xsl:variable>
                <tr>
-                       <td height="50">
-                               <form method="post" action="{$add_action}">
-                                       <input type="submit" name="add" 
value="{$lang_add}">
-                                               <xsl:attribute name="title">
-                                                       <xsl:value-of 
select="lang_add_statustext"/>
-                                               </xsl:attribute>
-                                       </input>
-                               </form>
+                       <td colspan="3" width="100%">
+                               <xsl:call-template name="nextmatchs"/>
                        </td>
+               </tr>
+       </table>
+       <table width="100%" cellpadding="2" cellspacing="2" align="center">
+               <xsl:apply-templates select="table_header_contact"/>
+               <xsl:choose>
+                       <xsl:when test="values_contact != ''">
+                               <xsl:apply-templates select="values_contact"/>
+                       </xsl:when>
+               </xsl:choose>
+               <xsl:apply-templates select="table_add"/>
+       </table>
+</xsl:template>
+
+<!-- New template-->
+<xsl:template match="table_header_contact">
+       <xsl:variable name="sort_location">
+               <xsl:value-of select="sort_location"/>
+       </xsl:variable>
+       <xsl:variable name="sort_active_from">
+               <xsl:value-of select="sort_active_from"/>
+       </xsl:variable>
+       <xsl:variable name="sort_active_to">
+               <xsl:value-of select="sort_active_to"/>
+       </xsl:variable>
+       <tr class="th">
+               <td class="th_text" width="20%" align="center">
+                       <xsl:value-of select="lang_contact"/>
+               </td>
+               <td class="th_text" width="10%" align="left">
+                       <a href="{$sort_location}">
+                               <xsl:value-of select="lang_location"/>
+                       </a>
+               </td>
+               <td class="th_text" width="5%" align="center">
+                       <xsl:value-of select="lang_item"/>
+               </td>
+               <td class="th_text" width="5%" align="left">
+                       <a href="{$sort_active_from}">
+                               <xsl:value-of select="lang_active_from"/>
+                       </a>
+               </td>
+               <td class="th_text" width="5%" align="left">
+                       <a href="{$sort_active_to}">
+                               <xsl:value-of select="lang_active_to"/>
+                       </a>
+               </td>
+               <td class="th_text" width="5%" align="center">
+                       <xsl:value-of select="lang_created_on"/>
+               </td>
+               <td class="th_text" width="5%" align="center">
+                       <xsl:value-of select="lang_created_by"/>
+               </td>
+               <td class="th_text" width="40%" align="left">
+                       <xsl:value-of select="lang_remark"/>
+               </td>
+               <td class="th_text" width="5%" align="center">
+                       <xsl:value-of select="lang_edit"/>
+               </td>
+               <!--
+               <td class="th_text" width="5%" align="center">
+               <xsl:value-of select="lang_delete"/>
+               </td>
+               -->
+       </tr>
+</xsl:template>
+
+<!-- New template-->
+<xsl:template match="values_contact">
+       <tr>
+               <xsl:attribute name="class">
                        <xsl:choose>
-                               <xsl:when test="cancel_action != ''">
-                                       <td height="50">
-                                               <form method="post" 
action="{cancel_action}">
-                                                       <input type="submit" 
name="add" value="{lang_cancel}">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_cancel_statustext"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </form>
-                                       </td>
+                               <xsl:when 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>
-               </tr>
-       </xsl:template>
+               </xsl:attribute>
+               <td align="left">
+                       <xsl:value-of select="contact_name"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="location_code"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="item"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="active_from"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="active_to"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="created_on"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="created_by"/>
+               </td>
+               <td align="left">
+                       <xsl:value-of select="remark"/>
+               </td>
+               <xsl:choose>
+                       <xsl:when test="link_edit != ''">
+                               <td align="center" title="{lang_edit_text}">
+                                       <xsl:variable name="link_edit">
+                                               <xsl:value-of 
select="link_edit"/>
+                                       </xsl:variable>
+                                       <a href="{link_edit}">
+                                               <xsl:value-of 
select="text_edit"/>
+                                       </a>
+                               </td>
+                       </xsl:when>
+               </xsl:choose>
+               <xsl:choose>
+                       <xsl:when test="link_delete != ''">
+                               <td align="center" title="{lang_delete_text}">
+                                       <xsl:variable name="link_delete">
+                                               <xsl:value-of 
select="link_delete"/>
+                                       </xsl:variable>
+                                       <a href="{link_delete}">
+                                               <xsl:value-of 
select="text_delete"/>
+                                       </a>
+                               </td>
+                       </xsl:when>
+               </xsl:choose>
+       </tr>
+</xsl:template>
 
-       <!-- add / edit contact-->
-       <xsl:template match="edit_contact">
-               <div align="left">
-                       <xsl:variable name="form_action">
-                               <xsl:value-of select="form_action"/>
-                       </xsl:variable>
-                       <form method="post" action="{$form_action}" name="form">
-                               <table cellpadding="2" cellspacing="2" 
width="80%" align="center">
-                                       <xsl:choose>
-                                               <xsl:when test="msgbox_data != 
''">
+<!-- New template-->
+<xsl:template match="table_add">
+       <xsl:variable name="add_action">
+               <xsl:value-of select="add_action"/>
+       </xsl:variable>
+       <xsl:variable name="lang_add">
+               <xsl:value-of select="lang_add"/>
+       </xsl:variable>
+       <tr>
+               <td height="50">
+                       <form method="post" action="{$add_action}">
+                               <input type="submit" name="add" 
value="{$lang_add}">
+                                       <xsl:attribute name="title">
+                                               <xsl:value-of 
select="lang_add_statustext"/>
+                                       </xsl:attribute>
+                               </input>
+                       </form>
+               </td>
+               <xsl:choose>
+                       <xsl:when test="cancel_action != ''">
+                               <td height="50">
+                                       <form method="post" 
action="{cancel_action}">
+                                               <input type="submit" name="add" 
value="{lang_cancel}">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_cancel_statustext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </form>
+                               </td>
+                       </xsl:when>
+               </xsl:choose>
+       </tr>
+</xsl:template>
+
+<!-- add / edit contact-->
+<xsl:template match="edit_contact">
+       <div align="left">
+               <xsl:variable name="form_action">
+                       <xsl:value-of select="form_action"/>
+               </xsl:variable>
+               <form method="post" action="{$form_action}" name="form">
+                       <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
+                               <xsl:choose>
+                                       <xsl:when test="msgbox_data != ''">
+                                               <tr>
+                                                       <td align="left" 
colspan="3">
+                                                               
<xsl:call-template name="msgbox"/>
+                                                       </td>
+                                               </tr>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <tr>
+                                       <td>
+                                               <xsl:value-of 
select="lang_location"/>
+                                       </td>
+                                       <td>
+                                               <xsl:value-of 
select="value_location_name"/>
+                                       </td>
+                               </tr>
+                               <xsl:choose>
+                                       <xsl:when test="value_id != ''">
+                                               <tr>
+                                                       <td valign="top" 
width="30%">
+                                                               <xsl:value-of 
select="lang_id"/>
+                                                       </td>
+                                                       <td align="left">
+                                                               <xsl:value-of 
select="value_id"/>
+                                                       </td>
+                                               </tr>
+                                               <tr>
+                                                       <td valign="top">
+                                                               <xsl:value-of 
select="lang_entry_date"/>
+                                                       </td>
+                                                       <td>
+                                                               <xsl:value-of 
select="value_entry_date"/>
+                                                       </td>
+                                               </tr>
+                                       </xsl:when>
+                               </xsl:choose>
+                               <tr>
+                                       <td>
+                                               <xsl:value-of 
select="lang_responsibility"/>
+                                       </td>
+                                       <td>
+                                               <input type="text" 
name="responsibility_id" value="{value_responsibility_id}" readonly="readonly" 
size="5" onMouseout="window.status='';return true;">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_responsibility_status_text"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                               <input size="30" type="text" 
name="responsibility_name" value="{value_responsibility_name}" 
readonly="readonly">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_responsibility_status_text"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>
+                                               <xsl:value-of 
select="lang_contact"/>
+                                       </td>
+                                       <td>
+                                               <input type="text" 
name="contact" value="{value_contact_id}" onClick="lookup_contact()" 
readonly="readonly" size="5" onMouseout="window.status='';return true;">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_contact_status_text"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                               <input size="30" type="text" 
name="contact_name" value="{value_contact_name}" onClick="lookup_contact()" 
readonly="readonly">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_contact_status_text"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+                               <xsl:call-template name="location_form"/>
+                               <tr>
+                                       <td>
+                                               <xsl:value-of 
select="lang_active_from"/>
+                                       </td>
+                                       <td>
+                                               <input type="text" 
id="values_active_from" name="values[active_from]" size="10" 
value="{value_active_from}" readonly="readonly" 
onMouseout="window.status='';return true;">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_active_from_statustext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td>
+                                               <xsl:value-of 
select="lang_active_to"/>
+                                       </td>
+                                       <td>
+                                               <input type="text" 
id="values_active_to" name="values[active_to]" size="10" 
value="{value_active_to}" readonly="readonly" 
onMouseout="window.status='';return true;">
+                                                       <xsl:attribute 
name="title">
+                                                               <xsl:value-of 
select="lang_active_to_statustext"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                               </tr>
+                               <tr>
+                                       <td valign="top" 
title="{lang_remark_status_text}">
+                                               <xsl:value-of 
select="lang_remark"/>
+                                       </td>
+                                       <td>
+                                               <textarea cols="60" rows="10" 
name="values[remark]" onMouseout="window.status='';return true;">
+                                                       <xsl:value-of 
select="value_remark"/>
+                                               </textarea>
+                                       </td>
+                               </tr>
+                               <tr height="50">
+                                       <td colspan="2" align="center">
+                                               <table>
                                                        <tr>
-                                                               <td 
align="left" colspan="3">
-                                                                       
<xsl:call-template name="msgbox"/>
+                                                               <td 
valign="bottom">
+                                                                       
<xsl:variable name="lang_save">
+                                                                               
<xsl:value-of select="lang_save"/>
+                                                                       
</xsl:variable>
+                                                                       <input 
type="submit" name="values[save]" value="{$lang_save}" 
onMouseout="window.status='';return true;">
+                                                                               
<xsl:attribute name="title">
+                                                                               
        <xsl:value-of select="lang_save_status_text"/>
+                                                                               
</xsl:attribute>
+                                                                       </input>
                                                                </td>
-                                                       </tr>
-                                               </xsl:when>
-                                       </xsl:choose>
-                                       <tr>
-                                               <td>
-                                                       <xsl:value-of 
select="lang_location"/>
-                                               </td>
-                                               <td>
-                                                       <xsl:value-of 
select="value_location_name"/>
-                                               </td>
-                                       </tr>
-                                       <xsl:choose>
-                                               <xsl:when test="value_id != ''">
-                                                       <tr>
-                                                               <td 
valign="top" width="30%">
-                                                                       
<xsl:value-of select="lang_id"/>
+                                                               <td 
valign="bottom">
+                                                                       
<xsl:variable name="lang_apply">
+                                                                               
<xsl:value-of select="lang_apply"/>
+                                                                       
</xsl:variable>
+                                                                       <input 
type="submit" name="values[apply]" value="{$lang_apply}" 
onMouseout="window.status='';return true;">
+                                                                               
<xsl:attribute name="title">
+                                                                               
        <xsl:value-of select="lang_apply_status_text"/>
+                                                                               
</xsl:attribute>
+                                                                       </input>
                                                                </td>
-                                                               <td 
align="left">
-                                                                       
<xsl:value-of select="value_id"/>
+                                                               <td 
align="left" valign="bottom">
+                                                                       
<xsl:variable name="lang_cancel">
+                                                                               
<xsl:value-of select="lang_cancel"/>
+                                                                       
</xsl:variable>
+                                                                       <input 
type="submit" name="values[cancel]" value="{$lang_cancel}" 
onMouseout="window.status='';return true;">
+                                                                               
<xsl:attribute name="title">
+                                                                               
        <xsl:value-of select="lang_cancel_status_text"/>
+                                                                               
</xsl:attribute>
+                                                                       </input>
                                                                </td>
                                                        </tr>
-                                                       <tr>
-                                                               <td 
valign="top">
-                                                                       
<xsl:value-of select="lang_entry_date"/>
-                                                               </td>
-                                                               <td>
-                                                                       
<xsl:value-of select="value_entry_date"/>
-                                                               </td>
-                                                       </tr>
-                                               </xsl:when>
-                                       </xsl:choose>
-                                       <tr>
-                                               <td>
-                                                       <xsl:value-of 
select="lang_responsibility"/>
-                                               </td>
-                                               <td>
-                                                       <input type="text" 
name="responsibility_id" value="{value_responsibility_id}" readonly="readonly" 
size="5" onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_responsibility_status_text"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                                       <input size="30" 
type="text" name="responsibility_name" value="{value_responsibility_name}" 
readonly="readonly">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_responsibility_status_text"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>
-                                                       <xsl:value-of 
select="lang_contact"/>
-                                               </td>
-                                               <td>
-                                                       <input type="text" 
name="contact" value="{value_contact_id}" onClick="lookup_contact()" 
readonly="readonly" size="5" onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_contact_status_text"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                                       <input size="30" 
type="text" name="contact_name" value="{value_contact_name}" 
onClick="lookup_contact()" readonly="readonly">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_contact_status_text"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </td>
-                                       </tr>
-                                       <xsl:call-template 
name="location_form"/>
-                                       <tr>
-                                               <td>
-                                                       <xsl:value-of 
select="lang_active_from"/>
-                                               </td>
-                                               <td>
-                                                       <input type="text" 
id="values_active_from" name="values[active_from]" size="10" 
value="{value_active_from}" readonly="readonly" 
onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_active_from_statustext"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td>
-                                                       <xsl:value-of 
select="lang_active_to"/>
-                                               </td>
-                                               <td>
-                                                       <input type="text" 
id="values_active_to" name="values[active_to]" size="10" 
value="{value_active_to}" readonly="readonly" 
onMouseout="window.status='';return true;">
-                                                               <xsl:attribute 
name="title">
-                                                                       
<xsl:value-of select="lang_active_to_statustext"/>
-                                                               </xsl:attribute>
-                                                       </input>
-                                               </td>
-                                       </tr>
-                                       <tr>
-                                               <td valign="top" 
title="{lang_remark_status_text}">
-                                                       <xsl:value-of 
select="lang_remark"/>
-                                               </td>
-                                               <td>
-                                                       <textarea cols="60" 
rows="10" name="values[remark]" onMouseout="window.status='';return true;">
-                                                               <xsl:value-of 
select="value_remark"/>
-                                                       </textarea>
-                                               </td>
-                                       </tr>
-                                       <tr height="50">
-                                               <td colspan="2" align="center">
-                                                       <table>
-                                                               <tr>
-                                                                       <td 
valign="bottom">
-                                                                               
<xsl:variable name="lang_save">
-                                                                               
        <xsl:value-of select="lang_save"/>
-                                                                               
</xsl:variable>
-                                                                               
<input type="submit" name="values[save]" value="{$lang_save}" 
onMouseout="window.status='';return true;">
-                                                                               
        <xsl:attribute name="title">
-                                                                               
                <xsl:value-of select="lang_save_status_text"/>
-                                                                               
        </xsl:attribute>
-                                                                               
</input>
-                                                                       </td>
-                                                                       <td 
valign="bottom">
-                                                                               
<xsl:variable name="lang_apply">
-                                                                               
        <xsl:value-of select="lang_apply"/>
-                                                                               
</xsl:variable>
-                                                                               
<input type="submit" name="values[apply]" value="{$lang_apply}" 
onMouseout="window.status='';return true;">
-                                                                               
        <xsl:attribute name="title">
-                                                                               
                <xsl:value-of select="lang_apply_status_text"/>
-                                                                               
        </xsl:attribute>
-                                                                               
</input>
-                                                                       </td>
-                                                                       <td 
align="left" valign="bottom">
-                                                                               
<xsl:variable name="lang_cancel">
-                                                                               
        <xsl:value-of select="lang_cancel"/>
-                                                                               
</xsl:variable>
-                                                                               
<input type="submit" name="values[cancel]" value="{$lang_cancel}" 
onMouseout="window.status='';return true;">
-                                                                               
        <xsl:attribute name="title">
-                                                                               
                <xsl:value-of select="lang_cancel_status_text"/>
-                                                                               
        </xsl:attribute>
-                                                                               
</input>
-                                                                       </td>
-                                                               </tr>
-                                                       </table>
-                                               </td>
-                                       </tr>
-                               </table>
-                       </form>
-               </div>
-       </xsl:template>
+                                               </table>
+                                       </td>
+                               </tr>
+                       </table>
+               </form>
+       </div>
+</xsl:template>
 
-       <!-- New template-->
-       <xsl:template match="options">
-               <option value="{id}">
-                       <xsl:if test="selected != 0">
-                               <xsl:attribute name="selected" 
value="selected"/>
-                       </xsl:if>
-                       <xsl:value-of disable-output-escaping="yes" 
select="name"/>
-               </option>
-       </xsl:template>
+<!-- New template-->
+<xsl:template match="options">
+       <option value="{id}">
+               <xsl:if test="selected != 0">
+                       <xsl:attribute name="selected" value="selected"/>
+               </xsl:if>
+               <xsl:value-of disable-output-escaping="yes" select="name"/>
+       </option>
+</xsl:template>
 
-       <!-- New template-->
-       <xsl:template match="checkbox">
-               <tr>
-                       <td value="{id}">
-                               <input type="checkbox" 
name="values[location_level][]" value="{id}">
-                                       <xsl:attribute name="title">
-                                               <xsl:value-of select="name"/>
-                                       </xsl:attribute>
-                                       <xsl:if test="selected != 0">
-                                               <xsl:attribute name="checked" 
value="checked"/>
-                                       </xsl:if>
-                               </input>
-                               <xsl:value-of select="name"/>
-                       </td>
-               </tr>
-       </xsl:template>
+<!-- New template-->
+<xsl:template match="checkbox">
+       <tr>
+               <td value="{id}">
+                       <input type="checkbox" name="values[location_level][]" 
value="{id}">
+                               <xsl:attribute name="title">
+                                       <xsl:value-of select="name"/>
+                               </xsl:attribute>
+                               <xsl:if test="selected != 0">
+                                       <xsl:attribute name="checked" 
value="checked"/>
+                               </xsl:if>
+                       </input>
+                       <xsl:value-of select="name"/>
+               </td>
+       </tr>
+</xsl:template>

Deleted: branches/dev-syncromind/property/templates/base/uipricebook.index.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/uipricebook.index.xsl       
2015-12-11 15:04:27 UTC (rev 14580)
+++ branches/dev-syncromind/property/templates/base/uipricebook.index.xsl       
2015-12-11 15:59:18 UTC (rev 14581)
@@ -1,972 +0,0 @@
-<func:function name="phpgw:conditional">
-       <xsl:param name="test"/>
-       <xsl:param name="true"/>
-       <xsl:param name="false"/>
-
-       <func:result>
-               <xsl:choose>
-                       <xsl:when test="$test">
-                       <xsl:value-of select="$true"/>
-                       </xsl:when>
-                       <xsl:otherwise>
-                               <xsl:value-of select="$false"/>
-                       </xsl:otherwise>
-               </xsl:choose>
-       </func:result>
-</func:function>
-
-<xsl:template match="data">
-       <xsl:choose>
-               <xsl:when test="datatable_name">
-                       <h3>
-                               <xsl:value-of select="datatable_name"/>
-                       </h3>
-               </xsl:when>
-       </xsl:choose>
-       <xsl:call-template name="datatable" />
-</xsl:template>
-
-
-<xsl:template name="datatable">
-       <xsl:call-template name="jquery_phpgw_i18n"/>
-        <xsl:apply-templates select="form" />
-       <div id="list_flash">
-               <xsl:call-template name="msgbox"/>
-       </div>
-       <div id="message" class='message'/>
-       <xsl:apply-templates select="datatable"/>
-        <xsl:apply-templates select="form/list_actions"/>
-</xsl:template>
-
-<xsl:template match="toolbar">
-       <style id='toggle-box-css' type='text/css' scoped='scoped'>
-.toggle-box {
-  display: none;
-}
-
-.toggle-box + label {
-  cursor: pointer;
-  display: block;
-  font-weight: bold;
-  line-height: 21px;
-  margin-bottom: 5px;
-}
-
-.toggle-box + label + div {
-  display: none;
-  margin-bottom: 10px;
-}
-
-.toggle-box:checked + label + div {
-  display: block;
-}
-
-.toggle-box + label:before {
-  background-color: #4F5150;
-  -webkit-border-radius: 10px;
-  -moz-border-radius: 10px;
-  border-radius: 10px;
-  color: #FFFFFF;
-  content: "+";
-  display: block;
-  float: left;
-  font-weight: bold;
-  height: 20px;
-  line-height: 20px;
-  margin-right: 5px;
-  text-align: center;
-  width: 20px;
-}
-
-.toggle-box:checked + label:before {
-  content: "\2212";
-} 
-               
-       </style>
-
-       <input class="toggle-box" id="header1" type="checkbox" />
-       <label for="header1">
-               <xsl:value-of select="php:function('lang', 'toolbar')"/>
-       </label>
-
-       <div id="toolbar">
-        <!--xsl:if test="item/text and normalize-space(item/text)"-->
-       <xsl:if test="item">
-         <table id="toolbar_table" class="pure-table">
-                               <thead>
-                                       <tr>
-                                               <th>
-                                                       <xsl:value-of 
select="php:function('lang', 'name')"/>
-                                               </th>
-                                               <th>
-                                                       <xsl:value-of 
select="php:function('lang', 'item')"/>
-                                               </th>
-                                       </tr>
-                               </thead>
-                       <tbody>
-
-                       <xsl:for-each select="item">
-                       <tr>
-                       <xsl:variable name="filter_key" 
select="concat('filter_', name)"/>
-                       <xsl:variable name="filter_key_name" 
select="concat(concat('filter_', name), '_name')"/>
-                       <xsl:variable name="filter_key_id" 
select="concat(concat('filter_', name), '_id')"/>
-                       <td>
-                               <xsl:if test="name">
-                                       <label>
-                                               <xsl:attribute 
name="for"><xsl:value-of select="phpgw:conditional(not(name), '', 
name)"/></xsl:attribute>
-                                               <xsl:value-of 
select="phpgw:conditional(not(text), '', text)"/>
-                                       </label>
-                               </xsl:if>
-                       </td>
-               
-                       <xsl:choose>
-                               <xsl:when test="type = 'date-picker'">
-                                       <td valign="top">
-                                       <div>
-                                               <input id="filter_{name}" 
name="filter_{name}" type="text"></input>
-                                       </div>
-                                       </td>
-                               </xsl:when>
-                               <xsl:when test="type = 'autocomplete'">
-                                       <td class="auto">
-                                               <div class="auto">
-                                                       <input 
id="filter_{name}_name" name="filter_{name}_name" type="text">
-                                                               <xsl:attribute 
name="value"><xsl:value-of select="../../../filters/*[local-name() = 
$filter_key_name]"/></xsl:attribute>
-                                                       </input>
-                                                       <input 
id="filter_{name}_id" name="filter_{name}_id" type="hidden">
-                                                               <xsl:attribute 
name="value"><xsl:value-of select="../../../filters/*[local-name() = 
$filter_key_id]"/></xsl:attribute>
-                                                       </input>
-                                                       <div 
id="filter_{name}_container"/>
-                                               </div>
-                                               <script type="text/javascript"> 
-                                               
YAHOO.util.Event.onDOMReady(function() {
-                                                  var app = "<xsl:value-of 
select="app"/>";
-                                                  var name = "<xsl:value-of 
select="name"/>";
-                                                       var ui = "<xsl:value-of 
select="ui"/>";
-
-                                                       var itemSelectCallback 
= false;
-                                                       <xsl:if 
test="onItemSelect">
-                                                               
itemSelectCallback = <xsl:value-of select="onItemSelect"/>;
-                                                       </xsl:if>
-
-                                                       var 
onClearSelectionCallback = false;
-                                                       <xsl:if 
test="onClearSelection">
-                                                               
onClearSelectionCallback = <xsl:value-of select="onClearSelection"/>;
-                                                       </xsl:if>
-
-                                                       var requestGenerator = 
false;
-                                                       <xsl:if 
test="requestGenerator">
-                                                               
requestGenerator = <xsl:value-of select="requestGenerator"/>;
-                                                       </xsl:if>
-
-                                                       <![CDATA[
-//                                                     var oAC = 
YAHOO.portico.autocompleteHelper('index.php?menuaction=booking.ui'+ui+'.index&phpgw_return_as=json&',
 
-//                                                                             
                                         'filter_'+name+'_name', 
'filter_'+name+'_id', 'filter_'+name+'_container');
-
-                                                       var oArgs = 
{menuaction: app + '.ui'+ui+'.index'};
-                                                       var requestUrl = 
phpGWLink('index.php', oArgs, true);
-                                                       requestUrl += 
'filter_'+name+'_name', 'filter_'+name+'_id', 'filter_'+name+'_container';
-                                               //      alert('FIXME: 
autocompleteHelper::requestUrl ' + requestUrl );
-
-
-                                                       if (requestGenerator) {
-                                                               
oAC.generateRequest = requestGenerator;
-                                                       }
-
-                                                       if (itemSelectCallback) 
{
-                                                               
oAC.itemSelectEvent.subscribe(itemSelectCallback);
-                                                       }
-
-                                                       
YAHOO.util.Event.addBlurListener('filter_'+name+'_name', function()
-                                                       {
-                                                               if 
(YAHOO.util.Dom.get('filter_'+name+'_name').value == "")
-                                                               {
-                                                                       
YAHOO.util.Dom.get('filter_'+name+'_id').value = "";
-                                                                       if 
(onClearSelectionCallback) {
-                                                                               
onClearSelectionCallback();
-                                                                       }
-                                                               }
-                                                       });
-
-                                                       
YAHOO.portico.addPreSerializeQueryFormListener(function(form)
-                                                       {
-                                                               if 
(YAHOO.util.Dom.get('filter_'+name+'_name').value == "")
-                                                               {
-                                                                       
YAHOO.util.Dom.get('filter_'+name+'_id').value = "";
-                                                               } 
-                                                       });
-                                                       ]]>
-                                               });
-                                               </script>
-                                       </td>
-                               </xsl:when>
-                               <xsl:when test="type = 'filter'">
-                                       <td valign="top">
-                                       <xsl:variable name="name"><xsl:value-of 
select="name"/></xsl:variable>
-
-                                       <select id="{$name}" name="{$name}">
-                                               <xsl:for-each select="list">
-                                                       <xsl:variable 
name="id"><xsl:value-of select="id"/></xsl:variable>
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="id = 'NEW'">
-                                                                       <option 
value="{$id}" selected="selected">
-                                                                               
<xsl:value-of select="name"/>
-                                                                       
</option>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:choose>
-                                                                               
<xsl:when test="selected = 'selected'">
-                                                                               
        <option value="{$id}" selected="selected">
-                                                                               
                <xsl:value-of select="name"/>
-                                                                               
        </option>
-                                                                               
</xsl:when>
-                                                                               
<xsl:otherwise>
-                                                                               
        <option value="{$id}">
-                                                                               
                <xsl:value-of select="name"/>
-                                                                               
        </option>                                                               
                
-                                                                               
</xsl:otherwise>
-                                                                       
</xsl:choose>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </xsl:for-each>
-                                       </select>
-                                       </td>
-                               </xsl:when>
-                               <xsl:when test="type = 'link'">
-                                       <td valign="top">
-                                               <input type="button" 
class="pure-button pure-button-primary">
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="onclick">
-                                                                       
<xsl:attribute name="onclick"><xsl:value-of select="onclick"/></xsl:attribute>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       
<xsl:attribute name="onclick">javascript:window.open('<xsl:value-of 
select="href"/>', "_self");</xsl:attribute>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                                       <xsl:attribute 
name="value"><xsl:value-of select="value"/></xsl:attribute>
-                                               </input>
-                                               <!--a href="{href}">
-                                                       <xsl:if test="onclick">
-                                                               <xsl:attribute 
name="onclick">
-                                                                       
<xsl:value-of select="onclick"/>
-                                                               
</xsl:attribute> 
-                                                       </xsl:if>
-                                                       <xsl:value-of 
select="value"/>
-                                               </a-->
-                                       </td>
-                               </xsl:when>
-                               <xsl:when test="type = 'hidden'">
-                                       <td valign="top">
-                                               <input>
-                                                       <xsl:attribute 
name="type"><xsl:value-of select="phpgw:conditional(not(type), '', 
type)"/></xsl:attribute>
-                                                       <xsl:attribute 
name="id"><xsl:value-of select="phpgw:conditional(not(id), '', 
id)"/></xsl:attribute>
-                                                       <xsl:attribute 
name="name"><xsl:value-of select="phpgw:conditional(not(name), '', 
name)"/></xsl:attribute>
-                                                       <xsl:attribute 
name="value"><xsl:value-of select="phpgw:conditional(not(value), '', 
value)"/></xsl:attribute>
-                                               </input>
-                                       </td>
-                               </xsl:when>
-                               <xsl:when test="type = 'label'">
-                                       <td valign="top">
-                                               <label><xsl:attribute 
name="id"><xsl:value-of select="phpgw:conditional(not(id), '', 
id)"/></xsl:attribute></label>
-                                       </td>
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       <td valign="top">
-                                       <input id="innertoolbar">
-                                               <xsl:attribute 
name="type"><xsl:value-of select="phpgw:conditional(not(type), '', 
type)"/></xsl:attribute>
-                                               <xsl:attribute 
name="name"><xsl:value-of select="phpgw:conditional(not(name), '', 
name)"/></xsl:attribute>
-                                               <xsl:attribute 
name="onclick"><xsl:value-of select="phpgw:conditional(not(onClick), '', 
onClick)"/></xsl:attribute>
-                                               <xsl:attribute 
name="value"><xsl:value-of select="phpgw:conditional(not(value), '', 
value)"/></xsl:attribute>
-                                               <xsl:attribute 
name="href"><xsl:value-of select="phpgw:conditional(not(href), '', 
href)"/></xsl:attribute>
-                                               <xsl:attribute 
name="class"><xsl:value-of select="phpgw:conditional(not(class), '', 
class)"/></xsl:attribute>
-                                       </input>
-                                       </td>
-                               </xsl:otherwise>
-                       </xsl:choose>
-                 </tr>
-                       </xsl:for-each>
-                 </tbody>
-               </table>
-               </xsl:if>
-       </div>
-</xsl:template>
-
-<xsl:template match="form/list_actions">
-       <form id="list_actions_form" method="POST">
-               <!-- Form action is set by javascript listener -->
-               <div id="list_actions" class='yui-skin-sam'>
-                       <table cellpadding="0" cellspacing="0">
-                               <tr>
-                                       <xsl:for-each select="item">
-                                               <td valign="top">
-                                                       <input 
id="innertoolbar">
-                                                               <xsl:attribute 
name="type"><xsl:value-of select="phpgw:conditional(not(type), '', 
type)"/></xsl:attribute>
-                                                               <xsl:attribute 
name="name"><xsl:value-of select="phpgw:conditional(not(name), '', 
name)"/></xsl:attribute>
-                                                               <xsl:attribute 
name="onclick"><xsl:value-of select="phpgw:conditional(not(onClick), '', 
onClick)"/></xsl:attribute>
-                                                               <xsl:attribute 
name="value"><xsl:value-of select="phpgw:conditional(not(value), '', 
value)"/></xsl:attribute>
-                                                               <xsl:attribute 
name="href"><xsl:value-of select="phpgw:conditional(not(href), '', 
href)"/></xsl:attribute>
-                                                       </input>
-                                               </td>
-                                       </xsl:for-each>
-                               </tr>
-                       </table>
-               </div>
-       </form>
-</xsl:template>
-
-<xsl:template match="form">
-       <div id="queryForm">
-               <!--xsl:attribute name="method">
-                       <xsl:value-of select="phpgw:conditional(not(method), 
'GET', method)"/>
-               </xsl:attribute>
-
-               <xsl:attribute name="action">
-                       <xsl:value-of select="phpgw:conditional(not(action), 
'', action)"/>
-               </xsl:attribute-->
-               <xsl:apply-templates select="toolbar"/>
-       </div>
-
-       <!--form id="update_table_dummy" method='POST' action='' >
-       </form-->
-
-</xsl:template>
-
-<xsl:template match="datatable">
-       <xsl:call-template name="datasource-definition" />
-       <xsl:call-template name="down-toolbar" />
-</xsl:template>
-
-<xsl:template name="down-toolbar">
-       <div class="toolbar-container">
-               <div class="toolbar">
-                       <form class="pure-form pure-form-stacked">
-                               <div class="pure-g">
-                                       <div class="pure-u-1">
-                                               <xsl:for-each 
select="//down-toolbar/fields/field">
-                                                       <xsl:choose>
-                                                                <xsl:when 
test="type = 'date-picker'">
-                                                                        <td 
valign="top">
-                                                                        <div>
-                                                                               
 <input id="filter_{name}" name="filter_{name}" type="text"></input>
-                                                                        </div>
-                                                                        </td>
-                                                                </xsl:when>
-                                                               <xsl:when 
test="type='button'">
-                                                                       <button 
id="{id}" type="{type}" class="pure-button pure-button-primary" 
onclick="{action}"><xsl:value-of select="value"/></button>
-                                                               </xsl:when>
-                                                               <xsl:when 
test="type='label'">
-                                                                       
<xsl:value-of select="value"/>
-                                                               </xsl:when>
-                                                               <xsl:otherwise>
-                                                                       <input 
id="{id}" type="{type}" name="{name}" value="{value}">
-                                                                               
<xsl:if test="type = 'checkbox' and checked = '1'">
-                                                                               
        <xsl:attribute name="checked">checked</xsl:attribute>
-                                                                               
</xsl:if>
-                                                                       </input>
-                                                               </xsl:otherwise>
-                                                       </xsl:choose>
-                                               </xsl:for-each>
-                                       </div>
-                               </div>
-                       </form>
-               </div>
-       </div>
-</xsl:template>
-
-<xsl:template name="datasource-definition">
-
-
-       <table id="datatable-container" class="display cell-border compact 
responsive no-wrap" width="100%">
-               <thead>
-                               <xsl:for-each select="//datatable/field">
-                                       <xsl:choose>
-                                               <xsl:when test="hidden">
-                                                       <xsl:if test="hidden 
=0">
-                                                               <th>
-                                                                       
<xsl:value-of select="label"/>
-                                                               </th>
-                                                               </xsl:if>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <th>
-                                                               <xsl:value-of 
select="label"/>
-                                                       </th>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:for-each>
-               </thead>
-               <tfoot>
-                       <tr>
-                               <xsl:for-each select="//datatable/field">
-                                       <xsl:choose>
-                                               <xsl:when test="hidden">
-                                                       <xsl:if test="hidden 
=0">
-                                                               <th>
-                                                                       
<xsl:value-of select="value_footer"/>
-                                                               </th>
-                                                       </xsl:if>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                       <th>
-                                                               <xsl:value-of 
select="value_footer"/>
-                                                       </th>
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                               </xsl:for-each>
-                       </tr>
-               </tfoot>
-       </table>
-       <form id="custom_values_form" name="custom_values_form"></form>
-       <script>
-
-               var columns = [
-                       <xsl:for-each select="//datatable/field">
-                               {
-                                       data:                   "<xsl:value-of 
select="key"/>",
-                                       <xsl:if test="className">
-                                               <xsl:choose>
-                                                       <xsl:when 
test="className='right' or className='center'">
-                                                               <xsl:if 
test="className ='right'">
-                                                                       class:  
'dt-right',
-                                                               </xsl:if>
-                                                               <xsl:if 
test="className ='center'">
-                                                                       class:  
'dt-center',
-                                                               </xsl:if>
-                                                       </xsl:when>
-                                                       <xsl:otherwise>
-                                                                       class:  
"<xsl:value-of select="className"/>",
-                                                       </xsl:otherwise>
-                                               </xsl:choose>
-                                       </xsl:if>
-                                       orderable:              <xsl:value-of 
select="phpgw:conditional(not(sortable = 0), 'true', 'false')"/>,
-                                       <xsl:choose>
-                                               <xsl:when test="hidden">
-                                                       <xsl:if test="hidden 
=0">
-                                                               visible         
        :true,
-                                                       </xsl:if>
-                                                       <xsl:if test="hidden 
=1">
-                                                               class:          
        'none', //FIXME - virker ikke...'responsive' plukker den fram igjen
-                                                               visible         
        :false,
-                                                       </xsl:if>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                               visible         
        :true,
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       <xsl:if test="formatter">
-                                        render: function (dummy1, dummy2, 
oData) {
-                                                       try {
-                                                               var ret = 
<xsl:value-of select="formatter"/>("<xsl:value-of select="key"/>", oData);
-                                                       }
-                                                       catch(err) {
-                                                               return 
err.message;
-                                                       }
-                                                       return ret;
-                         },
-
-                                       </xsl:if>
-                                       <xsl:choose>
-                                               <xsl:when test="editor">
-                                                       <xsl:if test="editor 
=0">
-                                                               editor: false,
-                                                       </xsl:if>
-                                                       <xsl:if test="editor 
=1">
-                                                               editor: true,
-                                                       </xsl:if>
-                                               </xsl:when>
-                                               <xsl:otherwise>
-                                                               editor: false,
-                                               </xsl:otherwise>
-                                       </xsl:choose>
-                                       defaultContent: "<xsl:value-of 
select="defaultContent"/>"
-                               }<xsl:value-of 
select="phpgw:conditional(not(position() = last()), ',', '')"/>
-                       </xsl:for-each>
-               ];
-<![CDATA[
-               JqueryPortico.columns = [];
-
-               for(i=0;i < columns.length;i++)
-               {
-                       if ( columns[i]['visible'] == true )
-                       {
-                               JqueryPortico.columns.push(columns[i]);
-                       }
-               }
-//             console.log(JqueryPortico.columns);
-]]>
-       </script>
-
-       <script type="text/javascript" class="init">
-               
-               var oTable = null;
-               $(document).ready(function() {
-
-                       var ajax_url = '<xsl:value-of select="source"/>';
-                       var download_url = '<xsl:value-of select="download"/>';
-                       var exclude_colvis = [];
-                       var editor_cols = [];
-                       var editor_action = '<xsl:value-of 
select="editor_action"/>';
-                       var disablePagination = '<xsl:value-of 
select="disablePagination"/>';
-                       
-<![CDATA[
-                       TableTools.BUTTONS.download = {
-                               "sAction": "text",
-                               "sTag": "default",
-                               "sFieldBoundary": "",
-                               "sFieldSeperator": "\t",
-                               "sNewLine": "<br>",
-                               "sToolTip": "",
-                               "sButtonClass": "DTTT_button_text",
-                               "sButtonClassHover": "DTTT_button_text_hover",
-                               "sButtonText": "Download",
-                               "mColumns": "all",
-                               "bHeader": true,
-                               "bFooter": true,
-                               "sDiv": "",
-                               "fnMouseover": null,
-                               "fnMouseout": null,
-                               "fnClick": function( nButton, oConfig ) {
-                                       var oParams = 
this.s.dt.oApi._fnAjaxParameters( this.s.dt );
-                                       oParams.length = -1;
-                                       oParams.columns = null;
-                                       oParams.start = null;
-                                       oParams.draw = null;
-                                       var iframe = 
document.createElement('iframe');
-                                       iframe.style.height = "0px";
-                                       iframe.style.width = "0px";
-                                       iframe.src = 
oConfig.sUrl+"?"+$.param(oParams) + "&export=1";
-                                       if(confirm("This will take some 
time..."))
-                                       {
-                                               document.body.appendChild( 
iframe );
-                                       }
-                               },
-                               "fnSelect": null,
-                               "fnComplete": null,
-                               "fnInit": null
-                       };
-       ]]>
-               <xsl:choose>
-                               <xsl:when test="//datatable/actions">
-                                               JqueryPortico.TableTools =      
{
-                                                               "sSwfPath": 
"phpgwapi/js/DataTables/extensions/TableTools/swf/copy_csv_xls_pdf.swf",
-                                                               "sRowSelect": 
"multi",
-                                                               "aButtons":
-                                                                       [
-                                                                               
        {
-                                                                           
"sExtends":    "collection",
-                                                                               
                "sButtonText": "Operation",
-                                                                               
                "aButtons": [
-                                                                               
                        'copy',
-                                                                               
                                {
-                                                                               
                                        sExtends: 'select_all',
-                                                                               
                                        //sButtonText: 'Select All',
-                                                                               
                                        fnClick: function (nButton, oConfig, 
oFlash) {
-                                                                               
                                                
TableTools.fnGetInstance('datatable-container').fnSelectAll();
-                                                                               
                                                //In case there are checkboxes
-                                                                               
                                                $(".mychecks").each(function()
-                                                                               
                                                {
-                                                                               
                                                         
$(this).prop("checked", true);
-                                                                               
                                                });
-
-                                                                               
                                        }
-                                                                               
                                },
-                                                                               
                            {
-                                                                               
                                        sExtends: 'select_none',
-                                                                               
                                        //sButtonText: 'Select None',
-                                                                               
                                        fnClick: function (nButton, oConfig, 
oFlash) {
-                                                                               
                                                
TableTools.fnGetInstance('datatable-container').fnSelectNone();
-                                                                               
                                                //In case there are checkboxes
-                                                                               
                                                $(".mychecks").each(function()
-                                                                               
                                                {
-                                                                               
                                                         
$(this).prop("checked", false);
-                                                                               
                                                });
-
-                                                                               
                                        }
-                                                                               
                                }
-                                                                               
                <xsl:choose>
-                                                                               
                        <xsl:when test="download">
-                                                                               
                        ,{
-                                                                               
                                "sExtends": "download",
-                                                                               
                                "sButtonText": "Download",
-                                                                               
                                "sUrl": '<xsl:value-of select="download"/>'
-                                                                               
                        }
-                                                                               
                        </xsl:when>
-                                                                               
                </xsl:choose>
-                                                                               
                <xsl:choose>
-                                                                               
                        <xsl:when test="//datatable/actions != ''">
-                                                                               
                        ,
-                                                                               
                        {
-                                                                               
                                sExtends: "div",
-                                                                               
                                sButtonText: "Knapper nedenfor gjelder pr valgt 
element "
-                                                                               
                        },
-                                                                               
                        <xsl:for-each select="//datatable/actions">
-                                                                               
                                <xsl:choose>
-                                                                               
                                        <xsl:when test="type = 'custom'">
-                                                                               
                                                {
-                                                                               
                                                        sExtends:               
"select",
-                                                                               
                                                        sButtonText:    
"<xsl:value-of select="text"/>",
-                                                                               
                                                        fnClick:                
function (nButton, oConfig, oFlash) {
-
-                                                                               
                                                                                
                <xsl:if test="confirm_msg">
-                                                                               
                                                                                
                        var confirm_msg = "<xsl:value-of 
select="confirm_msg"/>";
-                                                                               
                                                                                
                        var r = confirm(confirm_msg);
-                                                                               
                                                                                
                        if (r != true) {
-                                                                               
                                                                                
                                return false;
-                                                                               
                                                                                
                        }
-                                                                               
                                                                                
                </xsl:if>
-
-                                                                               
                                                                                
                <xsl:value-of select="custom_code"/>    
-                                                                               
                                                                        }
-
-                                                                               
                                                }<xsl:value-of 
select="phpgw:conditional(not(position() = last()), ',', '')"/>
-                                                                               
                                        </xsl:when>
-                                                                               
                                        <xsl:otherwise>
-                                                                               
                                                {
-                                                                               
                                                        sExtends:               
"select",
-                                                                               
                                                        sButtonText:    
"<xsl:value-of select="text"/>",
-                                                                               
                                                        fnClick:                
function (nButton, oConfig, oFlash) {
-                                                                               
                                                                                
        var receiptmsg = [];
-                                                                               
                                                                                
        var selected = fnGetSelected();
-                                                                               
                                                                                
        var numSelected =       selected.length;
-
-                                                                               
                                                                                
        if (numSelected ==0){
-                                                                               
                                                                                
                alert('None selected');
-                                                                               
                                                                                
                return false;
-                                                                               
                                                                                
        }
-
-                                                                               
                                                                                
        <xsl:if test="confirm_msg">
-                                                                               
                                                                                
                var confirm_msg = "<xsl:value-of select="confirm_msg"/>";
-                                                                               
                                                                                
                var r = confirm(confirm_msg);
-                                                                               
                                                                                
                if (r != true) {
-                                                                               
                                                                                
                        return false;
-                                                                               
                                                                                
                }
-                                                                               
                                                                                
        </xsl:if>
-
-                                                                               
                                                                                
        var target = "<xsl:value-of select="target"/>";
-                                                                               
                                                                                
        if(!target)
-                                                                               
                                                                                
        {
-                                                                               
                                                                                
                target = '_self';
-                                                                               
                                                                                
        }
-
-                                                                               
                                                                                
        if (numSelected &gt; 1){
-                                                                               
                                                                                
                target = '_blank';
-                                                                               
                                                                                
        }
-
-                                                                               
                                                                                
        var n = 0;
-                                                                               
                                                                                
        for (; n &lt; numSelected; ) {
-
-                                                                               
                                                                //              
                console.log(selected[n]);
-                                                                               
                                                                                
                var aData = oTable.fnGetData( selected[n] ); //complete dataset 
from json returned from server
-                                                                               
                                                                //              
                console.log(aData);
-
-                                                                               
                                                                                
                //delete stuff comes here
-                                                                               
                                                                                
                var action = "<xsl:value-of select="action"/>";
-
-                                                                               
                                                                                
                <xsl:if test="parameters">
-                                                                               
                                                                                
                        var parameters = <xsl:value-of select="parameters"/>;
-                                                                               
                                                                //              
                                console.log(parameters.parameter);
-                                                                               
                                                                                
                        var i = 0;
-                                                                               
                                                                                
                        len = parameters.parameter.length;
-                                                                               
                                                                                
                        for (; i &lt; len; ) {
-                                                                               
                                                                                
                                action += '&amp;' + 
parameters.parameter[i]['name'] + '=' + 
aData[parameters.parameter[i]['source']];
-                                                                               
                                                                                
                                i++;
-                                                                               
                                                                                
                        }
-                                                                               
                                                                                
                </xsl:if>
-
-                                                                               
                                                                                
                // look for the word "DELETE" in URL
-                                                                               
                                                                                
                if(substr_count(action,'delete')>0)
-                                                                               
                                                                                
                {               
-                                                                               
                                                                                
                                action += 
"&amp;confirm=yes&amp;phpgw_return_as=json";
-                                                                               
                                                                                
                                execute_ajax(action, function(result){
-                                                                               
                                                                                
                                        
document.getElementById("message").innerHTML += '<br/>' + result;
-                                                                               
                                                                                
                                });
-                                                                               
                                                                                
                                oTable.fnDraw();
-                                                                               
                                                                                
                }
-                                                                               
                                                                                
                else if (target == 'ajax')
-                                                                               
                                                                                
                {
-                                                                               
                                                                                
                                action += "&amp;phpgw_return_as=json";
-                                                                               
                                                                                
                                execute_ajax(action, function(result){
-                                                                               
                                                                                
                                        
document.getElementById("message").innerHTML += '<br/>' + result;
-                                                                               
                                                                                
                                });
-                                                                               
                                                                                
                                oTable.fnDraw();
-                                                                               
                                                                                
                }
-                                                                               
                                                                                
                else
-                                                                               
                                                                                
                {
-                                                                               
                                                                                
                        window.open(action,target);
-                                                                               
                                                                                
                }
-
-                                                                               
                                                                                
                n++;
-                                                                               
                                                                                
        }
-                                                                               
                                                                        }
-
-                                                                               
                                                }<xsl:value-of 
select="phpgw:conditional(not(position() = last()), ',', '')"/>
-                                                                               
                                        </xsl:otherwise>
-                                                                               
                                </xsl:choose>
-                                                                               
                        </xsl:for-each>
-                                                                               
                        </xsl:when>
-                                                                               
                </xsl:choose>
-                                                                               
                ]
-                                                                               
        }
-                                        ]
-                                                               };
-
-
-
-                               </xsl:when>
-                               <xsl:otherwise>
-                                       JqueryPortico.TableTools = false;
-                               </xsl:otherwise>
-                       </xsl:choose>
-<![CDATA[
-
-                       for(i=0;i < JqueryPortico.columns.length;i++)
-                       {
-                               if (JqueryPortico.columns[i]['visible'] != 
'undefined' && JqueryPortico.columns[i]['visible'] == false)
-                               {
-                                       exclude_colvis.push(i);
-                               }
-                       }
-
-                       for(i=0;i < JqueryPortico.columns.length;i++)
-                       {
-                               if (JqueryPortico.columns[i]['editor'] === true)
-                               {
-                                       
editor_cols.push({sUpdateURL:editor_action + '&field_name=' + 
JqueryPortico.columns[i]['data']});
-                               } else {
-                                       editor_cols.push(null);
-                               }
-                       }
-
-                       if(JqueryPortico.TableTools)
-                       {
-                               var sDom_def = 
'lCT<"clear">f<"top"ip>rt<"bottom"><"clear">';
-                       }
-                       else
-                       {
-                               var sDom_def = '<"clear">lfrtip';
-                       }
-       
-               $(document).ready(function() {
-                       
-                       oTable = $('#datatable-container').dataTable( {
-                               paginate:               disablePagination ? 
false : true,
-                                filter:                        true,
-                               processing:             true,
-                               serverSide:             true,
-                               responsive:             true,
-                               deferRender:    true,
-                               ajax:                   {
-                                       url: ajax_url,
-                                       data: {},
-                                       type: 'GET'
-                               },
-                               fnRowCallback: function(nRow, aData, 
iDisplayIndex, iDisplayIndexFull) {
-                                                               
if(typeof(aData['priority'])!= undefined && aData['priority'] > 0)
-                                                               {
-                                                                       
//nRow.addClass(''),
-                                                                       
console.log(nRow),
-                                                                       $('td', 
nRow).addClass('priority' + aData['priority']);
-                                                               }
-                },
-                               fnDrawCallback: function () {
-                                       oTable.makeEditable({
-                                                       sUpdateURL: 
editor_action,
-                                                       fnOnEditing: 
function(input){  
-                                                               cell = 
input.parents("td");
-                                                               id = 
input.parents("tr")
-                                                                               
   .children("td:first")
-                                                                               
   .text();
-                                                               return true;
-                                                       },
-                                                       fnOnEdited: 
function(status, sOldValue, sNewCellDisplayValue, aPos0, aPos1, aPos2)
-                                                       {       
-                                                               
document.getElementById("message").innerHTML += '<br/>' + status;
-                                                       },
-                                                       oUpdateParameters: { 
-                                                               "id": 
function(){ return id; }
-                                                       },
-                                                       aoColumns: editor_cols, 
        
-                                                   sSuccessResponse: "IGNORE",
-                                                       fnShowError: 
function(){ return; }              
-                                       });
-                                       if(typeof(addFooterDatatable) == 
'function')
-                                       {
-                                               addFooterDatatable(oTable);
-                                       }
-                               },
-                               fnFooterCallback: function ( nRow, aaData, 
iStart, iEnd, aiDisplay ) {
-                                       if(typeof(addFooterDatatable2) == 
'function')
-                                       {
-                                               addFooterDatatable2(nRow, 
aaData, iStart, iEnd, aiDisplay,oTable);
-                                       }
-                               },//alternative
-                               fnInitComplete: function (oSettings, json)
-                               {
-                                       if(typeof(initCompleteDatatable) == 
'function')
-                                       {
-                                               
initCompleteDatatable(oSettings, json, oTable);
-                                       }
-                               },
-                               lengthMenu:             
JqueryPortico.i18n.lengthmenu(),
-                               language:               
JqueryPortico.i18n.datatable(),
-                               columns:                JqueryPortico.columns,
-                               colVis: {
-                                                               exclude: 
exclude_colvis
-                               },
-                               dom:                    sDom_def,
-                               stateSave:              true,
-                               stateDuration: -1, //sessionstorage
-                               tabIndex:               1,
-                               oTableTools: JqueryPortico.TableTools
-                       } );
-
-});
-
-       ]]>
-
-                       /**
-                       * Add left click action..
-                       */
-                       <xsl:if test="//left_click_action != ''">
-                               $("#datatable-container").on("click", "tbody 
tr", function() {
-                                       var iPos = oTable.fnGetPosition( this );
-                                       var aData = oTable.fnGetData( iPos ); 
//complete dataset from json returned from server
-                                       try {
-                                               <xsl:value-of 
select="//left_click_action"/>
-                                       }
-                                       catch(err) {
-                                           
document.getElementById("message").innerHTML = err.message;
-                                       }
-                               });
-                       </xsl:if>
-
-                       /**
-                       * Add dbl click action..
-                       */
-                       <xsl:if test="dbl_click_action != ''">
-                               $("#datatable-container").on("dblclick", "tr", 
function() {
-                                       var iPos = oTable.fnGetPosition( this );
-                                       var aData = oTable.fnGetData( iPos ); 
//complete dataset from json returned from server
-                                       try {
-                                               <xsl:value-of 
select="dbl_click_action"/>(aData);
-                                       }
-                                       catch(err) {
-                                           
document.getElementById("message").innerHTML = err.message;
-                                       }
-                               });
-                       </xsl:if>
-
-                       <xsl:for-each select="//form/toolbar/item">
-                               <xsl:if test="type = 'filter'">
-                                       $('select#<xsl:value-of 
select="name"/>').change( function() 
-                                       {
-                                               <xsl:value-of select="extra"/>
-                                               filterData('<xsl:value-of 
select="name"/>', $(this).val());
-                                       });
-                               </xsl:if>
-                               <xsl:if test="type = 'date-picker'">
-                                       var previous_<xsl:value-of 
select="id"/>;
-                                       $("#filter_<xsl:value-of 
select="id"/>").on('keyup change', function ()
-                                       {
-                                               if ( $.trim($(this).val()) != 
$.trim(previous_<xsl:value-of select="id"/>) ) 
-                                               {
-                                                       
filterData('<xsl:value-of select="id"/>', $(this).val());
-                                                       previous_<xsl:value-of 
select="id"/> = $(this).val();
-                                               }
-                                       });
-                               </xsl:if>
-                       </xsl:for-each>
-
-<![CDATA[
-
-                       function fnGetSelected( )
-                       {
-                               var aReturn = new Array();
-                                var aTrs = oTable.fnGetNodes();
-                                for ( var i=0 ; i < aTrs.length ; i++ )
-                                {
-                                        if ( $(aTrs[i]).hasClass('selected') )
-                                        {
-                                                aReturn.push( i );
-                                        }
-                                }
-                                return aReturn;
-                       }
-
-                       function execute_ajax(requestUrl, callback, data,type, 
dataType)
-                       {                                       
-                               type = typeof type !== 'undefined' ? type : 
'POST';
-                               dataType = typeof dataType !== 'undefined' ? 
dataType : 'html';
-                               data = typeof data !== 'undefined' ? data : {};
-                                
-                               $.ajax({
-                                       type: type,
-                                       dataType: dataType,
-                                       data: data,
-                                       url: requestUrl,
-                                       success: function(result) {
-                                               callback(result);
-                                       }
-                               });
-                       }
-
-                       function substr_count( haystack, needle, offset, length 
)
-                       {
-                               var pos = 0, cnt = 0;
-
-                               haystack += '';
-                               needle += '';
-                               if(isNaN(offset)) offset = 0;
-                               if(isNaN(length)) length = 0;
-                               offset--;
-
-                               while( (offset = haystack.indexOf(needle, 
offset+1)) != -1 )
-                               {
-                                       if(length > 0 && (offset+needle.length) 
> length)
-                                       {
-                                               return false;
-                                       } else
-                                       {
-                                               cnt++;
-                                       }
-                               }
-                               return cnt;
-                       }
-
-
-               } );
-
-               function searchData(query)
-               {
-                       var api = oTable.api();
-                       api.search( query ).draw();
-               }
-
-               function filterData(param, value)
-               {
-                       oTable.dataTableSettings[0]['ajax']['data'][param] = 
value;
-                       oTable.fnDraw();
-               }
-               
-               function clearFilterParam(param)
-               {
-                       oTable.dataTableSettings[0]['ajax']['data'][param] = '';
-               }
-               
-               function reloadData()
-               {
-                       var api = oTable.api();
-                       api.ajax.reload();
-               }
-]]>
-       </script>
-
-       <script>
-               <xsl:choose>
-                       <xsl:when test="//js_lang != ''">
-                               var lang = <xsl:value-of select="//js_lang"/>;
-                       </xsl:when>
-               </xsl:choose>
-       </script>
-
-</xsl:template>

Deleted: branches/dev-syncromind/property/templates/base/yui_property_i18n.xsl
===================================================================
--- branches/dev-syncromind/property/templates/base/yui_property_i18n.xsl       
2015-12-11 15:04:27 UTC (rev 14580)
+++ branches/dev-syncromind/property/templates/base/yui_property_i18n.xsl       
2015-12-11 15:59:18 UTC (rev 14581)
@@ -1,17 +0,0 @@
-  <!-- $Id$ -->
-       <xsl:template xmlns:php="http://php.net/xsl"; name="yui_property_i18n">
-               <xsl:if test="yui_property_i18n">
-                       <script type="text/javascript">
-                               YAHOO.booking.i18n = {};
-                               <xsl:for-each select="yui_property_i18n/*">
-                                       YAHOO.booking.i18n.<xsl:value-of 
select="local-name()"/> = function(cfg)
-                                       {
-                                               cfg = cfg || {};
-                                               <xsl:for-each select="./*">
-                                                       cfg["<xsl:value-of 
select="local-name()"/>"] = <xsl:value-of disable-output-escaping="yes" 
select="."/>;
-                                               </xsl:for-each>
-                                       };
-                               </xsl:for-each>
-                       </script>
-               </xsl:if>
-       </xsl:template>




reply via email to

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