fmsystem-commits
[Top][All Lists]
Advanced

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

[Fmsystem-commits] [16859] more on generic documents


From: sigurdne
Subject: [Fmsystem-commits] [16859] more on generic documents
Date: Sun, 11 Jun 2017 08:59:31 -0400 (EDT)

Revision: 16859
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16859
Author:   sigurdne
Date:     2017-06-11 08:59:31 -0400 (Sun, 11 Jun 2017)
Log Message:
-----------
more on generic documents

Modified Paths:
--------------
    trunk/property/inc/class.sogeneric_document.inc.php
    trunk/property/inc/class.uigeneric_document.inc.php
    trunk/property/inc/class.uiimport_components.inc.php
    trunk/property/inc/class.uilocation.inc.php
    trunk/property/inc/import/class.import_component_files.inc.php
    trunk/property/templates/base/generic_document.xsl
    trunk/property/templates/base/import_components.xsl

Modified: trunk/property/inc/class.sogeneric_document.inc.php
===================================================================
--- trunk/property/inc/class.sogeneric_document.inc.php 2017-06-09 20:22:07 UTC 
(rev 16858)
+++ trunk/property/inc/class.sogeneric_document.inc.php 2017-06-11 12:59:31 UTC 
(rev 16859)
@@ -27,18 +27,20 @@
         * @version $Id: class.sogeneric_document.inc.php 14913 2016-04-27 
12:27:37Z sigurdne $
         */
 
-       class property_sogeneric_document 
+       class property_sogeneric_document
        {
+               protected
+                       $perform_update_relation_path = false;
 
                function __construct()
                {
                        $this->vfs = CreateObject('phpgwapi.vfs');
                        $this->vfs->fakebase = '/property';
-                       
+
                        $this->db = & $GLOBALS['phpgw']->db;
                        $this->join = & $this->db->join;
                        $this->left_join = & $this->db->left_join;
-                       $this->like = & $this->db->like;                
+                       $this->like = & $this->db->like;
                        $this->total_records = 0;
                }
 
@@ -80,7 +82,7 @@
                        {
                                $ordermethod = ' ORDER BY a.file_id ASC';
                        }
-                       
+
                        $filtermethod = "WHERE a.mime_type != 'Directory' AND 
a.mime_type != 'journal' AND a.mime_type != 'journal-deleted'";
                        $joinmethod .= " {$this->left_join} phpgw_vfs_filedata 
b ON ( a.file_id = b.file_id )";
 
@@ -87,16 +89,15 @@
                        if ($cat_id)
                        {
                                $filtermethod .= " AND b.metadata->>'cat_id' = 
'{$cat_id}'";
-                       } 
+                       }
 
                        if ($location_id)
                        {
                                $filtermethod .= " AND c.location_id = 
{$location_id}";
-                       } 
+                       }
+
                        $joinmethod .= " {$this->left_join} 
phpgw_vfs_file_relation c ON ( a.file_id = c.file_id )";
-                       $joinmethod .= " {$this->left_join} fm_entity_category 
ON ( c.location_id = fm_entity_category.location_id )";
 
-
                        if($location_item_id)
                        {
                                $filtermethod .= " AND c.location_item_id = 
{$location_item_id}";
@@ -106,7 +107,7 @@
                        {
                                $filtermethod .= " AND a.createdby_id = 
{$user_id}";
                        }
-                       
+
                        if ($mime_type)
                        {
                                $filtermethod .= " AND a.mime_type = 
'{$mime_type}'";
@@ -130,12 +131,11 @@
                        {
                                $query = $this->db->db_addslashes($query);
                                $querymethod = " AND (a.name $this->like 
'%{$query}%'";
-                               $querymethod .= " OR metadata->>'path' ilike 
'%{$query}%'";
-                               $querymethod .= " OR fm_entity_category.name 
ilike '%{$query}%')";
+                               $querymethod .= " OR metadata->>'path' ilike 
'%{$query}%')";
                        }
-                       
+
                        $sql = "SELECT DISTINCT a.file_id, a.*, 
metadata->>'path' as path FROM phpgw_vfs a " ." {$joinmethod} "." 
{$filtermethod} "." {$querymethod} ";
-       
+
                        $this->db->query($sql, __LINE__, __FILE__);
                        $this->total_records = $this->db->num_rows();
 
@@ -176,29 +176,19 @@
                                        );
                                }
 
-                               $locations= array();
-                               if($ids)
+                               if($this->perform_update_relation_path && $ids)
                                {
-                                       $sql = "SELECT file_id, 
fm_entity_category.name as location_name"
-                                               . " FROM fm_entity_category 
{$this->join} phpgw_vfs_file_relation ON fm_entity_category.location_id = 
phpgw_vfs_file_relation.location_id"
-                                               . " WHERE file_id IN (" . 
implode(',', $ids) . ')';
-                                       $this->db->query($sql, __LINE__, 
__FILE__);
-                                       while ($this->db->next_record())
+                                       foreach ($ids as $file_id)
                                        {
-                                               
$locations[$this->db->f('file_id')][] = $this->db->f('location_name');
+                                               
$this->update_relation_path($file_id);
                                        }
-
-                                       foreach ($values as & $entry)
-                                       {
-                                               $entry['location_names'] = 
array_unique((array)$locations[$entry['id']]);
-                                       }
                                }
                        }
 
                        return $values;
                }
-               
-               public function get_file_relations($file_id, $location_id = 
null) 
+
+               public function get_file_relations($file_id, $location_id = 
null)
                {
                        if ($location_id)
                        {
@@ -206,7 +196,7 @@
                        } else {
                                $filtermethod = "WHERE file_id = {$file_id}";
                        }
-                       
+
                        $sql = "SELECT * FROM phpgw_vfs_file_relation " ." 
{$filtermethod} ";
                        $this->db->query($sql, __LINE__, __FILE__);
 
@@ -220,11 +210,11 @@
                                        'location_item_id' => 
$this->db->f('location_item_id')
                                );
                        }
-                       
+
                        return $values;
                }
-               
-               public function get_file_relations_componentes($data) 
+
+               public function get_file_relations_componentes($data)
                {
                        $start = isset($data['start']) && $data['start'] ? 
$data['start'] : 0;
                        $results = isset($data['results']) && $data['results'] 
? $data['results'] : 0;
@@ -232,7 +222,7 @@
                        $location_id = isset($data['location_id']) && 
$data['location_id'] ? (int)$data['location_id'] : 0;
                        $allrows = isset($data['allrows']) ? $data['allrows'] : 
'';
                        $entity_group_id = isset($data['entity_group_id']) ? 
$data['entity_group_id'] : '';
-                       
+
                        if ($location_id)
                        {
                                $filtermethod = "WHERE a.location_id = 
{$location_id} AND a.file_id = {$file_id}";
@@ -239,12 +229,12 @@
                        } else {
                                $filtermethod = "WHERE a.file_id = {$file_id}";
                        }
-                       
+
                        if ($entity_group_id)
                        {
                                $filtermethod .= " AND c.entity_group_id = 
{$entity_group_id}";
                        }
-                       
+
                        $sql = "SELECT a.file_id, b.type, b.id, b.location_id, 
b.location_code, b.json_representation, c.name AS category_name, c.entity_id, 
c.entity_group_id "
                                        . "FROM phpgw_vfs_file_relation a INNER 
JOIN fm_bim_item b ON a.location_id = b.location_id AND a.location_item_id = 
b.id "
                                        . "INNER JOIN fm_entity_category c ON 
b.location_id = c.location_id" ." {$filtermethod} ";
@@ -270,7 +260,7 @@
                                        'location_id' => 
$this->db->f('location_id'),
                                        'category_name' => 
$this->db->f('category_name')
                                );
-                                       
+
                                $jsondata = 
json_decode($this->db->f('json_representation', true), true);
                                foreach ($jsondata as $k => $v)
                                {
@@ -278,33 +268,34 @@
                                }
                                $i++;
                        }
-                                               
+
                        $sql2 = "SELECT count(*) as cnt "
                                        . "FROM phpgw_vfs_file_relation a INNER 
JOIN fm_bim_item b ON a.location_id = b.location_id AND a.location_item_id = 
b.id "
-                                       . "INNER JOIN fm_entity_category c ON 
b.location_id = c.location_id" ." {$filtermethod} ";                      
+                                       . "INNER JOIN fm_entity_category c ON 
b.location_id = c.location_id" ." {$filtermethod} ";
                        $this->db->query($sql2, __LINE__, __FILE__);
 
                        $this->db->next_record();
                        $this->total_records_componentes = $this->db->f('cnt');
-                       
+
                        return $values;
                }
-               
+
                function save_file_relations( $add, $delete, $location_id, 
$file_id )
                {
                        $this->db->transaction_begin();
-                       
+
                        if (count($delete))
                        {
                                foreach($delete as $item)
                                {
                                        $this->db->query("DELETE FROM 
phpgw_vfs_file_relation WHERE location_item_id = {$item} AND file_id = 
{$file_id} AND location_id = {$location_id}", __LINE__, __FILE__);
+                                       $this->update_relation_path($file_id, 
true, $location_id);
                                }
                        }
-                                               
+
                        $date_format = 
phpgwapi_datetime::date_array(date('Y-m-d'));
                        $date = mktime(2, 0, 0, $date_format['month'], 
$date_format['day'], $date_format['year']);
-                               
+
                        if (count($add))
                        {
                                foreach($add as $item)
@@ -319,13 +310,15 @@
                                                'entry_date' => $date,
                                                'start_date' => $date,
                                                'end_date' => $date
-                                       );                              
+                                       );
 
                                        $this->db->query("INSERT INTO 
phpgw_vfs_file_relation (" . implode(',', array_keys($values_insert)) . ') 
VALUES ('
-                                               . 
$this->db->validate_insert(array_values($values_insert)) . ')', __LINE__, 
__FILE__);                          
+                                               . 
$this->db->validate_insert(array_values($values_insert)) . ')', __LINE__, 
__FILE__);
+
+                                       $this->update_relation_path($file_id);
                                }
                        }
-                       
+
                        if ($this->db->transaction_commit())
                        {
                                return true;
@@ -335,8 +328,8 @@
                                return false;
                        }
                }
-               
-               
+
+
                public function add( $data = array(), $file_id )
                {
                        $receipt = array();
@@ -352,13 +345,13 @@
                        if ($result)
                        {
                                $receipt['message'] = lang('filedata has been 
saved');
-                       } 
+                       }
                        else {
                                $receipt['error'] = lang('filedata has not been 
saved');
                        }
                        return $receipt;
                }
-               
+
                public function update( $data = array(), $file_id)
                {
                        $receipt = array();
@@ -377,19 +370,96 @@
 
                                }
                        }
-                       
+
                        $result = $this->db->transaction_commit();
 
                        if ($result)
                        {
                                $receipt['message'] = lang('filedata has been 
edited');
-                       } 
-                       else {
+                       }
+                       else
+                       {
                                $receipt['error'] = lang('filedata has not been 
edited');
                        }
                        return $receipt;
                }
-               
+
+               /**
+                *
+                * @param type $file_id
+                * @param type $delete
+                * @return bool
+                */
+               public function update_relation_path( $file_id, $delete = false 
, $location_id = 0)
+               {
+                       $ok = true; // ok if it don't choke
+
+                       $sql = "SELECT metadata FROM phpgw_vfs_filedata WHERE 
file_id =" . (int)$file_id;
+                       $this->db->query($sql, __LINE__, __FILE__);
+                       $this->db->next_record();
+                       $_metadata = $this->db->f('metadata', true);
+                       $metadata = (array)json_decode($_metadata, true);
+
+                       if($delete && $location_id)
+                       {
+                               $sql = "SELECT fm_entity_category.name as 
location_name"
+                                       . " FROM fm_entity_category WHERE 
location_id =" . (int)$location_id;
+                               $this->db->query($sql, __LINE__, __FILE__);
+                               $this->db->next_record();
+                               $location_name = $this->db->f('location_name');
+
+                               if(in_array($location_name, $metadata['path']))
+                               {
+                                       $key = 
(int)array_search($location_name, $metadata['path']);
+                                       unset($metadata['path'][$key]);
+                               }
+                               unset($location_name);
+                       }
+
+                       $location_names = array();
+
+                       $sql = "SELECT DISTINCT fm_entity_category.name as 
location_name"
+                               . " FROM fm_entity_category {$this->join} 
phpgw_vfs_file_relation ON fm_entity_category.location_id = 
phpgw_vfs_file_relation.location_id"
+                               . " WHERE file_id =" . (int)$file_id
+                               . " ORDER BY fm_entity_category.name DESC";
+                       $this->db->query($sql, __LINE__, __FILE__);
+                       while ($this->db->next_record())
+                       {
+                               $location_names[] = 
$this->db->f('location_name', true);
+                       }
+
+                       if($location_names)
+                       {
+                               foreach ($location_names as $location_name)
+                               {
+                                       if(!empty($metadata['path']) && 
is_array($metadata['path']) && !in_array($location_name, $metadata['path']))
+                                       {
+                                               
array_unshift($metadata['path'], $location_name);
+                                       }
+                               }
+
+                               sort($metadata['path']);
+                       }
+
+                       if($metadata)
+                       {
+                               if(!isset($metadata['path']))
+                               {
+                                       $metadata['path'] = array();
+                               }
+
+                               $value_set = array
+                               (
+                                       'metadata' => json_encode($metadata),
+                               );
+                               $value_set = 
$this->db->validate_update($value_set);
+
+                               //Still ok?
+                               $ok = $this->db->query("UPDATE 
phpgw_vfs_filedata SET {$value_set}  WHERE file_id='{$file_id}'", __LINE__, 
__FILE__);
+                       }
+                       return $ok;
+               }
+
                public function read_single( $id )
                {
                        $id = (int)$id;
@@ -403,9 +473,9 @@
                                $values['metadata'] = $this->db->f('metadata');
                        }
 
-                       return $values['metadata'];                     
+                       return $values['metadata'];
                }
-               
+
                public function delete( $file_id )
                {
                        $file_info = $this->vfs->get_info($file_id);
@@ -414,24 +484,24 @@
                        if ($file)
                        {
                                $this->db->transaction_begin();
-                               
+
                                $this->db->query("DELETE FROM 
phpgw_vfs_file_relation WHERE file_id = {$file_id}", __LINE__, __FILE__);
                                $this->db->query("DELETE FROM 
phpgw_vfs_filedata WHERE file_id = {$file_id}", __LINE__, __FILE__);
-                                                               
+
                                $result = $this->delete_file($file);
-                               
+
                                if ($result)
                                {
                                        $this->db->transaction_commit();
                                        $receipt = lang('file deleted') . ' : ' 
. $file_info['name'];
-                               } else {                                        
+                               } else {
                                        $receipt = lang('failed to delete 
file') . ' : ' . $file_info['name'];
                                }
                        }
-                       
+
                        return $receipt;
                }
-               
+
                function delete_file( $file )
                {
                        $result = false;
@@ -454,8 +524,8 @@
 
                                $this->vfs->override_acl = 0;
                        }
-                       
+
                        return $result;
                }
-               
+
        }
\ No newline at end of file

Modified: trunk/property/inc/class.uigeneric_document.inc.php
===================================================================
--- trunk/property/inc/class.uigeneric_document.inc.php 2017-06-09 20:22:07 UTC 
(rev 16858)
+++ trunk/property/inc/class.uigeneric_document.inc.php 2017-06-11 12:59:31 UTC 
(rev 16859)
@@ -408,11 +408,12 @@
                                {
                                        $values = (array) 
$this->bo->read_single($id);
                                        $paths = array();
-                                       foreach ($values['path'] as $path){
-                                               $paths[] = array('value' => 
$path);
+                                       foreach ($values['path'] as $path)
+                                       {
+                                               $paths[] = $path;
                                        }
                                        $values['report_date'] = 
($values['report_date']) ? date($this->dateFormat, $values['report_date']) : '';
-                                       $values['paths'] = $paths;
+                                       $values['paths'] = 
implode('<br/>',$paths);
                                }
                                $values['id'] = $id;
                        }
@@ -431,7 +432,7 @@
                                $related_def = array
                                        (
                                        array('key' => 'id', 'label' => 
lang('id'), 'sortable' => false, 'resizeable' => true),
-                                       array('key' => 'name', 'label' => 
lang('Benevnelse'), 'sortable' => false, 'resizeable' => true),
+                                       array('key' => 'name', 'label' => 
lang('name'), 'sortable' => false, 'resizeable' => true),
                                        array('key' => 'category', 'label' => 
lang('Category'), 'sortable' => false, 'resizeable' => true),
                                        array('key' => 'relate', 'label' => 
lang('related'), 'sortable' => false, 'resizeable' => true),
                                );
@@ -700,7 +701,8 @@
                        $only_related = phpgw::get_var('only_related', 
'boolean');
                        $all_types = phpgw::get_var('all_types', 'boolean');
                        $entity_group_id = phpgw::get_var('entity_group_id');
-                                               
+
+                       $name_field = 'tfm_nr';
                        $entity_list = 
$this->soadmin_entity->read(array('allrows' => true));
                        $e_list = array();
                        foreach($entity_list as $entity)
@@ -723,7 +725,7 @@
                                {
                                        $values[] = array(
                                                'id' => '<a 
href="'.self::link(array('menuaction' => 'property.uientity.view', 
'location_id' => $item['location_id'], 'id' => 
$item['id'])).'">'.$item['id'].'</a>',
-                                               'name' => $item['benevnelse'],
+                                               'name' => $item[$name_field],
                                                'category' => 
$e_list[$item['entity_id']].'::'.$item['category_name'],
                                                'relate' => '<input 
value="'.$item['id'].'_'.$item['location_id'].'" class="components mychecks" 
type="checkbox" checked="checked"><input type="hidden" 
class="components_related" value="'.$item['id'].'_'.$item['location_id'].'">',
                                        );
@@ -774,7 +776,7 @@
 
                                $values[] = array(
                                        'id' => '<a 
href="'.self::link(array('menuaction' => 'property.uientity.view', 
'location_id' => $location_id, 'id' => $item['id'])).'">'.$item['id'].'</a>',
-                                       'name' => $item['benevnelse'],
+                                       'name' => $item[$name_field],
                                        'category' => 
$e_list[$item['entity_id']].'::'.$category['name'],
                                        'relate' => '<input 
value="'.$item['id'].'" class="components mychecks" type="checkbox" 
'.$checked.'>'.$hidden,
                                );

Modified: trunk/property/inc/class.uiimport_components.inc.php
===================================================================
--- trunk/property/inc/class.uiimport_components.inc.php        2017-06-09 
20:22:07 UTC (rev 16858)
+++ trunk/property/inc/class.uiimport_components.inc.php        2017-06-11 
12:59:31 UTC (rev 16859)
@@ -122,6 +122,7 @@
                        //$attrib_name_componentID = 
phpgw::get_var('attribute_name_component_id');
                        $preview = phpgw::get_var('preview');
                        $with_components = 
phpgw::get_var('with_components_check');
+                       $doc_cat_id =  phpgw::get_var('doc_cat_id');
 
                        /* if ($_FILES['file']['tmp_name'])
                          {
@@ -137,6 +138,11 @@
                                $receipt['error'][] = array('msg' => 
lang('Choose Location'));
                                return $receipt;
                        }
+                       if (!$doc_cat_id)
+                       {
+                               $receipt['error'][] = array('msg' => 
lang('category'));
+                               return $receipt;
+                       }
 
                        $import_component_files = new import_component_files();
 
@@ -867,6 +873,7 @@
                                'category_filter' => array('options' => 
$category_filter),
                                'district_filter' => array('options' => 
$district_filter),
                                'part_of_town_filter' => array('options' => 
$part_of_town_filter),
+                               'document_category'     => array('options' => 
$this->_get_document_categories() ),
                                'template_list' => array('options' => 
$category_list),
                                'profile_list' => array('options' => 
$profile_list),
                                'multi_upload_action' => $multi_upload_action,
@@ -1009,4 +1016,22 @@
 
                        return $values;
                }
+
+               private function _get_document_categories( $selected = 0 )
+               {
+                       $cats = CreateObject('phpgwapi.categories', -1, 
'property', '.document');
+                       $cats->supress_info = true;
+                       $categories = $cats->formatted_xslt_list(array('format' 
=> 'filter', 'selected' => $selected,
+                               'globals' => true, 'use_acl' => 
$this->_category_acl));
+                       $default_value = array('cat_id' => '', 'name' => 
lang('no category'));
+                       array_unshift($categories['cat_list'], $default_value);
+
+                       foreach ($categories['cat_list'] as & $_category)
+                       {
+                               $_category['id'] = $_category['cat_id'];
+                       }
+
+                       return $categories['cat_list'];
+               }
+
        }
\ No newline at end of file

Modified: trunk/property/inc/class.uilocation.inc.php
===================================================================
--- trunk/property/inc/class.uilocation.inc.php 2017-06-09 20:22:07 UTC (rev 
16858)
+++ trunk/property/inc/class.uilocation.inc.php 2017-06-11 12:59:31 UTC (rev 
16859)
@@ -1724,8 +1724,8 @@
                                $title = '';
                                if($item['path'])
                                {
-                                       $temp = json_decode($item['path']);
-                                       $title = implode('<br/>', 
array_merge($item['location_names'],$temp));
+                                       $temp = 
(array)json_decode($item['path']);
+                                       $title = implode('<br/>', $temp);
                                }
 
                                $document_name = '<a 
href="'.self::link(array('menuaction'=>'property.uigeneric_document.view_file', 
'file_id'=>$item['id'])).'" target="_blank">'.$item['name'].'</a>';

Modified: trunk/property/inc/import/class.import_component_files.inc.php
===================================================================
--- trunk/property/inc/import/class.import_component_files.inc.php      
2017-06-09 20:22:07 UTC (rev 16858)
+++ trunk/property/inc/import/class.import_component_files.inc.php      
2017-06-11 12:59:31 UTC (rev 16859)
@@ -4,12 +4,28 @@
        {
 
                private $receipt = array();
+               protected
+                       $alc,
+                       $db,
+                       $sogeneric_document,
+                       $fakebase,
+                       $path_upload_dir,
+                       $location_code,
+                       $location_item_id,
+                       $attrib_name_componentID,
+                       $doc_cat_id,
+                       $last_files_added,
+                       $list_component_id,
+                       $paths_from_file,
+                       $paths_empty;
 
                public function __construct()
                {
                        $this->acl = & $GLOBALS['phpgw']->acl;
                        $this->db = & $GLOBALS['phpgw']->db;
+                       $this->sogeneric_document = 
CreateObject('property.sogeneric_document');
 
+
                        $this->fakebase = '/temp_files_components';
                        $this->path_upload_dir = 
$GLOBALS['phpgw_info']['server']['files_dir'] . $this->fakebase . '/';
 //                     $this->path_upload_dir = 
'/data/portico/temp_files_components/';
@@ -17,6 +33,7 @@
                        $this->location_code = phpgw::get_var('location_code');
                        $this->location_item_id = 
phpgw::get_var('location_item_id');
                        $this->attrib_name_componentID = 
phpgw::get_var('attribute_name_component_id');
+                       $this->doc_cat_id =  phpgw::get_var('doc_cat_id');
 
                        $this->last_files_added = array();
                        $this->list_component_id = array();
@@ -938,6 +955,7 @@
                        $metadata['report_date'] = 
phpgwapi_datetime::date_to_timestamp(date('Y-m-d'));
                        $metadata['title'] = $file_data['name'];
                        $metadata['descr'] = $file_data['desription'];
+                       $metadata['cat_id'] = $this->doc_cat_id;
                        $metadata['path'] = $paths;
 
                        $values_insert = array
@@ -968,8 +986,13 @@
                                'end_date' => $date
                        );
 
-                       return $this->db->query("INSERT INTO 
phpgw_vfs_file_relation (" . implode(',', array_keys($values_insert)) . ') 
VALUES ('
+                       $ok = $this->db->query("INSERT INTO 
phpgw_vfs_file_relation (" . implode(',', array_keys($values_insert)) . ') 
VALUES ('
                                        . 
$this->db->validate_insert(array_values($values_insert)) . ')', __LINE__, 
__FILE__);
+
+                       if($ok)
+                       {
+                               return 
$this->sogeneric_document->update_relation_path($file_id);
+                       }
                }
 
                protected function _getexceldata( $path, $get_identificator = 
false )

Modified: trunk/property/templates/base/generic_document.xsl
===================================================================
--- trunk/property/templates/base/generic_document.xsl  2017-06-09 20:22:07 UTC 
(rev 16858)
+++ trunk/property/templates/base/generic_document.xsl  2017-06-11 12:59:31 UTC 
(rev 16859)
@@ -208,11 +208,9 @@
                                                        <label>
                                                                <xsl:value-of 
select="php:function('lang', 'Path')"/>
                                                        </label>
-                                                       <xsl:for-each 
select="document/paths">
                                                                <div 
class='pure-custom'>
-                                                                       
<div><xsl:value-of select="value"/></div>
+                                                                       
<xsl:value-of disable-output-escaping="yes" select="document/paths"/>
                                                                </div>          
                                                
-                                                       </xsl:for-each>
                                                </div>
                                                <xsl:choose>
                                                        <xsl:when 
test="editable = 1">

Modified: trunk/property/templates/base/import_components.xsl
===================================================================
--- trunk/property/templates/base/import_components.xsl 2017-06-09 20:22:07 UTC 
(rev 16858)
+++ trunk/property/templates/base/import_components.xsl 2017-06-11 12:59:31 UTC 
(rev 16859)
@@ -7,339 +7,399 @@
 
                <xsl:value-of select="validator"/>
                
-                       <div id="tab-content">                                  
-                               <xsl:value-of disable-output-escaping="yes" 
select="tabs"/>
+               <div id="tab-content">
+                       <xsl:value-of disable-output-escaping="yes" 
select="tabs"/>
                                                
-                               <div id="locations">
-                                       <form name="form" class="pure-form 
pure-form-aligned" id="form" action="" method="post">        
-                                               <div class="pure-control-group">
-                                                       <label for="vendor">
-                                                               <xsl:value-of 
select="php:function('lang', 'type')" />
-                                                       </label>
-                                                       <select id="type_id" 
name="type_id">
-                                                               
<xsl:apply-templates select="type_filter/options"/>
-                                                       </select>
-                                               </div>
-                                               <div class="pure-control-group">
-                                                       <label for="vendor">
-                                                               <xsl:value-of 
select="php:function('lang', 'category')" />
-                                                       </label>
-                                                       <select 
id="cat_location_id" name="cat_location_id">
-                                                               
<xsl:apply-templates select="category_filter/options"/>
-                                                       </select>
-                                               </div>
-                                               <div class="pure-control-group">
-                                                       <label for="vendor">
-                                                               <xsl:value-of 
select="php:function('lang', 'district')" />
-                                                       </label>
-                                                       <select 
id="district_id" name="district_id">
-                                                               
<xsl:apply-templates select="district_filter/options"/>
-                                                       </select>
-                                               </div>                          
-                                               <div class="pure-control-group">
-                                                       <label for="vendor">
-                                                               <xsl:value-of 
select="php:function('lang', 'part of town')" />
-                                                       </label>
-                                                       <select 
id="part_of_town_id" name="part_of_town_id">
-                                                               
<xsl:apply-templates select="part_of_town_filter/options"/>
-                                                       </select>
-                                               </div>                          
                                
+                       <div id="locations">
+                               <form name="form" class="pure-form 
pure-form-aligned" id="form" action="" method="post">
+                                       <div class="pure-control-group">
+                                               <label for="vendor">
+                                                       <xsl:value-of 
select="php:function('lang', 'type')" />
+                                               </label>
+                                               <select id="type_id" 
name="type_id">
+                                                       <xsl:apply-templates 
select="type_filter/options"/>
+                                               </select>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label for="vendor">
+                                                       <xsl:value-of 
select="php:function('lang', 'category')" />
+                                               </label>
+                                               <select id="cat_location_id" 
name="cat_location_id">
+                                                       <xsl:apply-templates 
select="category_filter/options"/>
+                                               </select>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label for="vendor">
+                                                       <xsl:value-of 
select="php:function('lang', 'district')" />
+                                               </label>
+                                               <select id="district_id" 
name="district_id">
+                                                       <xsl:apply-templates 
select="district_filter/options"/>
+                                               </select>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label for="vendor">
+                                                       <xsl:value-of 
select="php:function('lang', 'part of town')" />
+                                               </label>
+                                               <select id="part_of_town_id" 
name="part_of_town_id">
+                                                       <xsl:apply-templates 
select="part_of_town_filter/options"/>
+                                               </select>
+                                       </div>
 
-                                               <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="tabletools" select ='tabletools' />
-                                                                       
<xsl:with-param name="config" select ='config' />
-                                                               
</xsl:call-template>
-                                                       </xsl:if>
-                                               </xsl:for-each>         
-                                       </form>
-                               </div>
+                                       <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="tabletools" select ='tabletools' />
+                                                               <xsl:with-param 
name="config" select ='config' />
+                                                       </xsl:call-template>
+                                               </xsl:if>
+                                       </xsl:for-each>
+                               </form>
+                       </div>
                                
-                               <div id="files">
-                                       <label>
-                                               <xsl:value-of 
select="access_error_upload_dir" />
-                                       </label>
-                                       <xsl:call-template 
name="multi_upload_file"/>
-                                       <!--<xsl:value-of 
disable-output-escaping="yes" select="form_file_upload"/>-->
-                               </div>
+                       <div id="files">
+                               <label>
+                                       <xsl:value-of 
select="access_error_upload_dir" />
+                               </label>
+                               <xsl:call-template name="multi_upload_file"/>
+                               <!--<xsl:value-of disable-output-escaping="yes" 
select="form_file_upload"/>-->
+                       </div>
                                
-                               <div id="components">
-                                       <form id="form_components" 
name="form_components" class="pure-form pure-form-aligned" action="" 
method="POST" enctype="multipart/form-data">    
-                                               <div class="pure-control-group">
-                                                       <label>
-                                                               <xsl:value-of 
select="php:function('lang', 'location')"/>
-                                                       </label>
-                                                       <div class='pure-custom 
location_name'></div>
+                       <div id="components">
+                               <form id="form_components" 
name="form_components" class="pure-form pure-form-aligned" action="" 
method="POST" enctype="multipart/form-data">
+                                       <div class="pure-control-group">
+                                               <label>
+                                                       <xsl:value-of 
select="php:function('lang', 'location')"/>
+                                               </label>
+                                               <div class='pure-custom 
location_name'></div>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label for="vendor">
+                                                       <xsl:value-of 
select="php:function('lang', 'Profile')" />
+                                               </label>
+                                               <select id="profile_list" 
name="profile_list">
+                                                       <xsl:apply-templates 
select="profile_list/options"/>
+                                               </select>
+                                               <img src="{image_loader}" 
class="get-profile" align="absmiddle"></img>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label for="vendor">
+                                                       <xsl:value-of 
select="php:function('lang', 'Template')" />
+                                               </label>
+                                               <select id="template_list" 
name="template_list">
+                                                       <xsl:apply-templates 
select="template_list/options"/>
+                                               </select>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label for="vendor">
+                                                       <xsl:value-of 
select="php:function('lang', 'Attributes template')" />
+                                               </label>
+                                               <select 
id="attribute_name_component_id" name="attribute_name_component_id">
+                                               </select>
+                                               <div 
style='display:inline-block; margin-left:10px;'>
+                                                       <xsl:value-of 
select="php:function('lang', 'choose attribute name for Component ID')" />
                                                </div>
-                                               <div class="pure-control-group">
-                                                       <label for="vendor">
-                                                               <xsl:value-of 
select="php:function('lang', 'Profile')" />
-                                                       </label>
-                                                       <select 
id="profile_list" name="profile_list">
-                                                               
<xsl:apply-templates select="profile_list/options"/>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label>
+                                                       <xsl:value-of 
select="php:function('lang', 'upload file')"/>
+                                               </label>
+                                               <input type="file" 
id="excel_components" name="excel_components" size="40"></input>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label></label>
+                                               <input type="button" 
id="import_components" name="import_components" size="40">
+                                                       <xsl:attribute 
name="value">
+                                                               <xsl:value-of 
select="php:function('lang', 'Start import')"/>
+                                                       </xsl:attribute>
+                                               </input>
+                                               <img src="{image_loader}" 
class="processing-import" align="absmiddle"></img>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <div id="message1" 
class="message"></div>
+                                       </div>
+                                       <div id="responsiveTabsDemo">
+                                               <ul>
+                                                       <li>
+                                                               <a 
href="#tab-1">
+                                                                       
<xsl:value-of select="php:function('lang', 'Choose Sheet')"/>
+                                                               </a>
+                                                       </li>
+                                                       <li>
+                                                               <a 
href="#tab-2">
+                                                                       
<xsl:value-of select="php:function('lang', 'Choose start line')"/>
+                                                               </a>
+                                                       </li>
+                                                       <li>
+                                                               <a 
href="#tab-3">
+                                                                       
<xsl:value-of select="php:function('lang', 'Choose columns')"/>
+                                                               </a>
+                                                       </li>
+                                                       <li>
+                                                               <a 
href="#tab-4">
+                                                                       
<xsl:value-of select="php:function('lang', 'Preview')"/>
+                                                               </a>
+                                                       </li>
+                                               </ul>
+                                               <div id="tab-1">
+                                                       <select id="sheet_id" 
name="sheet_id">
+                                                               <option 
value=''>
+                                                                       
<xsl:value-of select="php:function('lang', 'Select Sheet')"/>
+                                                               </option>
                                                        </select>
-                                                       <img 
src="{image_loader}" class="get-profile" align="absmiddle"></img>
+                                                       <input type="button" 
id="step2" name="step2" size="40">
+                                                               <xsl:attribute 
name="value">
+                                                                       
<xsl:value-of select="php:function('lang', 'Continue')"/>
+                                                               </xsl:attribute>
+                                                       </input>
+                                                       <img 
src="{image_loader}" class="processing-sheet" align="absmiddle"></img>
                                                </div>
-                                               <div class="pure-control-group">
-                                                       <label for="vendor">
-                                                               <xsl:value-of 
select="php:function('lang', 'Template')" />
-                                                       </label>
-                                                       <select 
id="template_list" name="template_list">
-                                                               
<xsl:apply-templates select="template_list/options"/>
-                                                       </select>
+                                               <div id="tab-2" 
style="overflow: scroll">
+                                                       <input type="button" 
id="step3" name="step3" size="40">
+                                                               <xsl:attribute 
name="value">
+                                                                       
<xsl:value-of select="php:function('lang', 'Continue')"/>
+                                                               </xsl:attribute>
+                                                       </input>
+                                                       <img 
src="{image_loader}" class="processing-start-line" align="absmiddle"></img>
+                                                       <div id="content_lines" 
class="pure-custom"></div>
                                                </div>
-                                               <div class="pure-control-group">
-                                                       <label for="vendor">
-                                                               <xsl:value-of 
select="php:function('lang', 'Attributes template')" />
-                                                       </label>
-                                                       <select 
id="attribute_name_component_id" name="attribute_name_component_id">
-                                                       </select>
-                                                       <div 
style='display:inline-block; margin-left:10px;'><xsl:value-of 
select="php:function('lang', 'choose attribute name for Component ID')" /></div>
-                                               </div>
-                                               <div class="pure-control-group">
-                                                       <label>
-                                                               <xsl:value-of 
select="php:function('lang', 'upload file')"/>
-                                                       </label>
-                                                       <input type="file" 
id="excel_components" name="excel_components" size="40"></input>
-                                               </div>
-                                               <div class="pure-control-group">
-                                                       <label></label>
-                                                       <input type="button" 
id="import_components" name="import_components" size="40">
+                                               <div id="tab-3">
+                                                       <input type="button" 
id="step4" name="step4" size="40">
                                                                <xsl:attribute 
name="value">
-                                                                       
<xsl:value-of select="php:function('lang', 'Start import')"/>
+                                                                       
<xsl:value-of select="php:function('lang', 'Continue')"/>
                                                                </xsl:attribute>
                                                        </input>
-                                                       <img 
src="{image_loader}" class="processing-import" align="absmiddle"></img>
+                                                       <img 
src="{image_loader}" class="processing-columns" align="absmiddle"></img>
+                                                       <div 
id="content_columns" class="pure-custom"></div>
                                                </div>
-                                               <div class="pure-control-group">
-                                                       <div id="message1" 
class="message"></div>
-                                               </div>
-                                               <div id="responsiveTabsDemo">
-                                                       <ul>
-                                                               <li><a 
href="#tab-1"><xsl:value-of select="php:function('lang', 'Choose 
Sheet')"/></a></li>
-                                                               <li><a 
href="#tab-2"><xsl:value-of select="php:function('lang', 'Choose start 
line')"/></a></li>
-                                                               <li><a 
href="#tab-3"><xsl:value-of select="php:function('lang', 'Choose 
columns')"/></a></li>
-                                                               <li><a 
href="#tab-4"><xsl:value-of select="php:function('lang', 'Preview')"/></a></li>
-                                                       </ul>
-                                                       <div id="tab-1">
-                                                               <select 
id="sheet_id" name="sheet_id">
-                                                                       <option 
value=''><xsl:value-of select="php:function('lang', 'Select Sheet')"/></option>
-                                                               </select>
-                                                               <input 
type="button" id="step2" name="step2" size="40">
+                                               <div id="tab-4">
+                                                       <div 
class="pure-control-group">
+                                                               <label 
for="vendor">
+                                                                       
<xsl:value-of select="php:function('lang', 'Profile')" />
+                                                               </label>
+                                                               <div 
class="pure-custom">
+                                                                       <div 
class="pure-control-group">
+                                                                               
<label>
+                                                                               
        <xsl:value-of select="php:function('lang', 'Category template')" />
+                                                                               
</label>
+                                                                               
<div id="template_name" class="pure-custom"></div>
+                                                                       </div>
+                                                                       <div 
class="pure-control-group">
+                                                                               
<label>
+                                                                               
        <xsl:value-of select="php:function('lang', 'Attribute name for 
Component ID')" />
+                                                                               
</label>
+                                                                               
<div id="component_id_text" class="pure-custom"></div>
+                                                                       </div>
+                                                                       <div 
class="pure-control-group">
+                                                                               
<label>
+                                                                               
        <xsl:value-of select="php:function('lang', 'Columns and attributes')" />
+                                                                               
</label>
+                                                                               
<div id="columns_name" class="pure-custom"></div>
+                                                                       </div>
+                                                                       <div 
class="pure-control-group">
+                                                                               
<label>
+                                                                               
        <xsl:value-of select="php:function('lang', 'Save Profile')" />
+                                                                               
</label>
+                                                                               
<input type="checkbox" value="1" id="save_profile" name="save_profile" 
checked="true"/>
+                                                                       </div>
+                                                                       <div 
class="pure-control-group">
+                                                                               
<label>
+                                                                               
        <xsl:value-of select="php:function('lang', 'add')" />
+                                                                               
</label>
+                                                                               
<input type="radio" value="1" id="profile_option_save_1" 
name="profile_option_save" checked="true"/>
+                                                                               
<input type="text" value="" id="name_profile" name="name_profile" />
+                                                                       </div>
+                                                                       <div 
class="pure-control-group">
+                                                                               
<label>
+                                                                               
        <xsl:value-of select="php:function('lang', 'update')" />
+                                                                               
</label>
+                                                                               
<input type="radio" value="2" id="profile_option_save_2" 
name="profile_option_save" disabled="true"/>
+                                                                               
<div id="profile_selected" style="display:inline-block; 
margin-right:10px;"></div>
+                                                                               
<input type="hidden" id="cod_profile_selected" name="cod_profile_selected" 
value=""></input>
+                                                                       </div>
+                                                               </div>
+                                                       </div>
+                                                       <div 
class="pure-control-group">
+                                                               <label 
for="vendor">
+                                                                       
<xsl:value-of select="php:function('lang', 'New Categories')" />
+                                                               </label>
+                                                               <div 
id="new_entity_categories" class="pure-custom"></div>
+                                                       </div>
+                                                       <div 
class="pure-control-group">
+                                                               <label 
for="vendor">
+                                                                       
<xsl:value-of select="php:function('lang', 'New Attributes')" />
+                                                               </label>
+                                                               <div 
id="new_attributes" class="pure-custom"></div>
+                                                       </div>
+                                                       <div 
class="pure-control-group">
+                                                               <label 
for="vendor">
+                                                                       
<xsl:value-of select="php:function('lang', 'Download preview components')" />
+                                                               </label>
+                                                               <input 
type="button" id="donwload_preview_components" 
name="donwload_preview_components" size="40">
                                                                        
<xsl:attribute name="value">
-                                                                               
<xsl:value-of select="php:function('lang', 'Continue')"/>
+                                                                               
<xsl:value-of select="php:function('lang', 'Download')"/>
                                                                        
</xsl:attribute>
                                                                </input>
-                                                               <img 
src="{image_loader}" class="processing-sheet" align="absmiddle"></img>
                                                        </div>
-                                                       <div id="tab-2" 
style="overflow: scroll">
-                                                               <input 
type="button" id="step3" name="step3" size="40">
+                                                       <div 
class="pure-control-group">
+                                                               <label 
for="vendor"></label>
+                                                               <input 
type="button" id="step5" name="step5" size="40">
                                                                        
<xsl:attribute name="value">
-                                                                               
<xsl:value-of select="php:function('lang', 'Continue')"/>
+                                                                               
<xsl:value-of select="php:function('lang', 'Save')"/>
                                                                        
</xsl:attribute>
                                                                </input>
-                                                               <img 
src="{image_loader}" class="processing-start-line" align="absmiddle"></img>
-                                                               <div 
id="content_lines" class="pure-custom"></div>
-                                                       </div>
-                                                       <div id="tab-3">
-                                                               <input 
type="button" id="step4" name="step4" size="40">
+                                                               <input 
type="button" id="cancel_steps" name="cancel_steps" size="40">
                                                                        
<xsl:attribute name="value">
-                                                                               
<xsl:value-of select="php:function('lang', 'Continue')"/>
+                                                                               
<xsl:value-of select="php:function('lang', 'Cancel')"/>
                                                                        
</xsl:attribute>
                                                                </input>
-                                                               <img 
src="{image_loader}" class="processing-columns" align="absmiddle"></img>
-                                                               <div 
id="content_columns" class="pure-custom"></div>
+                                                               <img 
src="{image_loader}" class="processing-save" align="absmiddle"></img>
                                                        </div>
-                                                       <div id="tab-4">
-                                                               <div 
class="pure-control-group">
-                                                                       <label 
for="vendor">
-                                                                               
<xsl:value-of select="php:function('lang', 'Profile')" />
-                                                                       </label>
-                                                                       <div 
class="pure-custom">
-                                                                               
<div class="pure-control-group">
-                                                                               
        <label><xsl:value-of select="php:function('lang', 'Category template')" 
/></label>
-                                                                               
        <div id="template_name" class="pure-custom"></div>
-                                                                               
</div>
-                                                                               
<div class="pure-control-group">
-                                                                               
        <label><xsl:value-of select="php:function('lang', 'Attribute name for 
Component ID')" /></label>
-                                                                               
        <div id="component_id_text" class="pure-custom"></div>
-                                                                               
</div>
-                                                                               
<div class="pure-control-group">
-                                                                               
        <label><xsl:value-of select="php:function('lang', 'Columns and 
attributes')" /></label>
-                                                                               
        <div id="columns_name" class="pure-custom"></div>
-                                                                               
</div>
-                                                                               
<div class="pure-control-group">
-                                                                               
        <label><xsl:value-of select="php:function('lang', 'Save Profile')" 
/></label>
-                                                                               
        <input type="checkbox" value="1" id="save_profile" name="save_profile" 
checked="true"/>                                                                
                                                                                
 
-                                                                               
</div>
-                                                                               
<div class="pure-control-group">
-                                                                               
        <label><xsl:value-of select="php:function('lang', 'add')" /></label>
-                                                                               
        <input type="radio" value="1" id="profile_option_save_1" 
name="profile_option_save" checked="true"/>
-                                                                               
        <input type="text" value="" id="name_profile" name="name_profile" />
-                                                                               
</div>
-                                                                               
<div class="pure-control-group">
-                                                                               
        <label><xsl:value-of select="php:function('lang', 'update')" /></label>
-                                                                               
        <input type="radio" value="2" id="profile_option_save_2" 
name="profile_option_save" disabled="true"/>
-                                                                               
        <div id="profile_selected" style="display:inline-block; 
margin-right:10px;"></div>
-                                                                               
        <input type="hidden" id="cod_profile_selected" 
name="cod_profile_selected" value=""></input>
-                                                                               
</div>
-                                                                       </div>  
                        
-                                                               </div>
-                                                               <div 
class="pure-control-group">
-                                                                       <label 
for="vendor">
-                                                                               
<xsl:value-of select="php:function('lang', 'New Categories')" />
-                                                                       </label>
-                                                                       <div 
id="new_entity_categories" class="pure-custom"></div>
-                                                               </div>
-                                                               <div 
class="pure-control-group">
-                                                                       <label 
for="vendor">
-                                                                               
<xsl:value-of select="php:function('lang', 'New Attributes')" />
-                                                                       </label>
-                                                                       <div 
id="new_attributes" class="pure-custom"></div>
-                                                               </div>
-                                                               <div 
class="pure-control-group">
-                                                                       <label 
for="vendor">
-                                                                               
<xsl:value-of select="php:function('lang', 'Download preview components')" />
-                                                                       </label>
-                                                                       <input 
type="button" id="donwload_preview_components" 
name="donwload_preview_components" size="40">
-                                                                               
<xsl:attribute name="value">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Download')"/>
-                                                                               
</xsl:attribute>
-                                                                       </input>
-                                                               </div>
-                                                               <div 
class="pure-control-group">
-                                                                       <label 
for="vendor"></label>
-                                                                       <input 
type="button" id="step5" name="step5" size="40">
-                                                                               
<xsl:attribute name="value">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Save')"/>
-                                                                               
</xsl:attribute>
-                                                                       
</input>                                                                
-                                                                       <input 
type="button" id="cancel_steps" name="cancel_steps" size="40">
-                                                                               
<xsl:attribute name="value">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Cancel')"/>
-                                                                               
</xsl:attribute>
-                                                                       </input>
-                                                                       <img 
src="{image_loader}" class="processing-save" align="absmiddle"></img>      
-                                                               </div>
-                                                               <div 
class="pure-control-group">
-                                                                       <div 
id="message3" class="message"></div>
-                                                               </div>          
                                
+                                                       <div 
class="pure-control-group">
+                                                               <div 
id="message3" class="message"></div>
                                                        </div>
                                                </div>
-                                       </form>
-                               </div>
+                                       </div>
+                               </form>
+                       </div>
                                
-                               <div id="relations">
-                                       <form id="form_files" name="form_files" 
class="pure-form pure-form-aligned" action="" method="POST" 
enctype="multipart/form-data">
-                                               <div class="pure-control-group">
-                                                       <label>
-                                                               <xsl:value-of 
select="php:function('lang', 'location')"/>
-                                                       </label>
-                                                       <div class='pure-custom 
location_name'></div>
-                                                       <input type="hidden" 
id="location_code" name="location_code" value=""></input>
-                                                       <input type="hidden" 
id="location_item_id" name="location_item_id" value=""></input>
-                                               </div>
+                       <div id="relations">
+                               <form id="form_files" name="form_files" 
class="pure-form pure-form-aligned" action="" method="POST" 
enctype="multipart/form-data">
+                                       <div class="pure-control-group">
+                                               <label>
+                                                       <xsl:value-of 
select="php:function('lang', 'category')"/>
+                                               </label>
+                                               <select id="doc_cat_id" 
name="doc_cat_id">
+                                                       <xsl:apply-templates 
select="document_category/options"/>
+                                               </select>
+                                       </div>
+                                       <div class="pure-control-group">
+                                               <label>
+                                                       <xsl:value-of 
select="php:function('lang', 'location')"/>
+                                               </label>
+                                               <div class='pure-custom 
location_name'></div>
+                                               <input type="hidden" 
id="location_code" name="location_code" value=""></input>
+                                               <input type="hidden" 
id="location_item_id" name="location_item_id" value=""></input>
+                                       </div>
                                                
-                                               <div 
id="responsiveTabsRelations">
-                                                       <ul>
-                                                               <li><a 
href="#tab-components"><xsl:value-of select="php:function('lang', 
'Components')"/></a></li>
-                                                               <li><a 
href="#tab-files"><xsl:value-of select="php:function('lang', 
'Files')"/></a></li>
-                                                               <li><a 
href="#tab-preview"><xsl:value-of select="php:function('lang', 
'Preview')"/></a></li>
-                                                       </ul>
-                                                       <div 
id="tab-components">
-                                                               <div 
class="pure-control-group">
-                                                                       <div 
class="pure-custom">
-                                                                               
<div class="pure-control-group">
-                                                                               
        <label><xsl:value-of select="php:function('lang', 'without 
components')" /></label>
-                                                                               
        <input type="radio" value="0" name="with_components_check" 
checked="true" />
-                                                                               
</div>
-                                                                               
<div class="pure-control-group">
-                                                                               
        <label><xsl:value-of select="php:function('lang', 'with components')" 
/></label>
-                                                                               
        <input type="radio" value="1" name="with_components_check" />
-                                                                               
        <input type="file" id="excel_files" name="excel_files" 
size="40"></input>
-                                                                               
</div>
+                                       <div id="responsiveTabsRelations">
+                                               <ul>
+                                                       <li>
+                                                               <a 
href="#tab-components">
+                                                                       
<xsl:value-of select="php:function('lang', 'Components')"/>
+                                                               </a>
+                                                       </li>
+                                                       <li>
+                                                               <a 
href="#tab-files">
+                                                                       
<xsl:value-of select="php:function('lang', 'Files')"/>
+                                                               </a>
+                                                       </li>
+                                                       <li>
+                                                               <a 
href="#tab-preview">
+                                                                       
<xsl:value-of select="php:function('lang', 'Preview')"/>
+                                                               </a>
+                                                       </li>
+                                               </ul>
+                                               <div id="tab-components">
+                                                       <div 
class="pure-control-group">
+                                                               <div 
class="pure-custom">
+                                                                       <div 
class="pure-control-group">
+                                                                               
<label>
+                                                                               
        <xsl:value-of select="php:function('lang', 'without components')" />
+                                                                               
</label>
+                                                                               
<input type="radio" value="0" name="with_components_check" checked="true" />
                                                                        </div>
+                                                                       <div 
class="pure-control-group">
+                                                                               
<label>
+                                                                               
        <xsl:value-of select="php:function('lang', 'with components')" />
+                                                                               
</label>
+                                                                               
<input type="radio" value="1" name="with_components_check" />
+                                                                               
<input type="file" id="excel_files" name="excel_files" size="40"></input>
+                                                                       </div>
                                                                </div>
-                                                               <div 
class="pure-control-group">
-                                                                       
<label></label>
-                                                                       <input 
type="button" id="relations_step_1" name="relations_step_1" size="40">
-                                                                               
<xsl:attribute name="value">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Continue')"/>
-                                                                               
</xsl:attribute>
-                                                                       </input>
-                                                                       <img 
src="{image_loader}" class="processing-relations" align="absmiddle"></img> 
-                                                               </div>          
                                                                        
                                                        </div>
-                                                       <div id="tab-files">
-                                                               <div 
class="pure-control-group">
-                                                                       <div 
class="pure-custom">
-                                                                               
<div class="pure-control-group">
-                                                                               
        <label><xsl:value-of select="php:function('lang', 'Uncompressed')" 
/></label>
-                                                                               
        <input type="radio" value="0" name="compressed_file_check" 
checked="true" />
-                                                                               
</div>
-                                                                               
<div class="pure-control-group">
-                                                                               
        <label><xsl:value-of select="php:function('lang', 'Compressed')" 
/></label>
-                                                                               
        <input type="radio" value="1" name="compressed_file_check" />
-                                                                               
        <input type="text" value="" id="compressed_file_name" 
name="compressed_file_name" >
-                                                                               
                <xsl:attribute name="placeholder">
-                                                                               
                        <xsl:value-of select="php:function('lang', 'File 
name')"/>
-                                                                               
                </xsl:attribute>
-                                                                               
        </input> (zip, rar)
-                                                                               
</div>
+                                                       <div 
class="pure-control-group">
+                                                               <label></label>
+                                                               <input 
type="button" id="relations_step_1" name="relations_step_1" size="40">
+                                                                       
<xsl:attribute name="value">
+                                                                               
<xsl:value-of select="php:function('lang', 'Continue')"/>
+                                                                       
</xsl:attribute>
+                                                               </input>
+                                                               <img 
src="{image_loader}" class="processing-relations" align="absmiddle"></img>
+                                                       </div>
+                                               </div>
+                                               <div id="tab-files">
+                                                       <div 
class="pure-control-group">
+                                                               <div 
class="pure-custom">
+                                                                       <div 
class="pure-control-group">
+                                                                               
<label>
+                                                                               
        <xsl:value-of select="php:function('lang', 'Uncompressed')" />
+                                                                               
</label>
+                                                                               
<input type="radio" value="0" name="compressed_file_check" checked="true" />
                                                                        </div>
+                                                                       <div 
class="pure-control-group">
+                                                                               
<label>
+                                                                               
        <xsl:value-of select="php:function('lang', 'Compressed')" />
+                                                                               
</label>
+                                                                               
<input type="radio" value="1" name="compressed_file_check" />
+                                                                               
<input type="text" value="" id="compressed_file_name" 
name="compressed_file_name" >
+                                                                               
        <xsl:attribute name="placeholder">
+                                                                               
                <xsl:value-of select="php:function('lang', 'File name')"/>
+                                                                               
        </xsl:attribute>
+                                                                               
</input> (zip, rar)
+                                                                       </div>
                                                                </div>
-                                                               <div 
class="pure-control-group">
-                                                                       
<label></label>
-                                                                       <input 
type="button" id="relations_step_2" name="relations_step_2" size="40">
-                                                                               
<xsl:attribute name="value">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Continue')"/>
-                                                                               
</xsl:attribute>
-                                                                       </input>
-                                                                       <img 
src="{image_loader}" class="processing-relations" align="absmiddle"></img>
-                                                               </div>          
                                
                                                        </div>
-                                                       <div id="tab-preview">
-                                                               <div 
class="pure-control-group">
-                                                                       <label 
for="vendor">
-                                                                               
<xsl:value-of select="php:function('lang', 'Messages')" />
-                                                                       </label>
-                                                                       <div 
class="pure-custom">
-                                                                               
<div id="message5" class="message"></div>
-                                                                       </div>
+                                                       <div 
class="pure-control-group">
+                                                               <label></label>
+                                                               <input 
type="button" id="relations_step_2" name="relations_step_2" size="40">
+                                                                       
<xsl:attribute name="value">
+                                                                               
<xsl:value-of select="php:function('lang', 'Continue')"/>
+                                                                       
</xsl:attribute>
+                                                               </input>
+                                                               <img 
src="{image_loader}" class="processing-relations" align="absmiddle"></img>
+                                                       </div>
+                                               </div>
+                                               <div id="tab-preview">
+                                                       <div 
class="pure-control-group">
+                                                               <label 
for="vendor">
+                                                                       
<xsl:value-of select="php:function('lang', 'Messages')" />
+                                                               </label>
+                                                               <div 
class="pure-custom">
+                                                                       <div 
id="message5" class="message"></div>
                                                                </div>
-                                                               <div 
class="pure-control-group">
-                                                                       
<label></label>
-                                                                       <input 
type="button" id="save_relations" name="save_relations" size="40">
-                                                                               
<xsl:attribute name="value">
-                                                                               
        <xsl:value-of select="php:function('lang', 'Save')"/>
-                                                                               
</xsl:attribute>
-                                                                       
</input>                                                                
-                                                                       <img 
src="{image_loader}" class="processing-relations" align="absmiddle"></img> 
-                                                               </div>
-                                                               <div 
class="pure-control-group">
-                                                                       
<label></label>
-                                                                       <div 
id="message4" class="message"></div>
-                                                               </div>          
                        
                                                        </div>
-                                               </div>                          
        
-                                       </form>         
-                               </div>
+                                                       <div 
class="pure-control-group">
+                                                               <label></label>
+                                                               <input 
type="button" id="save_relations" name="save_relations" size="40">
+                                                                       
<xsl:attribute name="value">
+                                                                               
<xsl:value-of select="php:function('lang', 'Save')"/>
+                                                                       
</xsl:attribute>
+                                                               </input>
+                                                               <img 
src="{image_loader}" class="processing-relations" align="absmiddle"></img>
+                                                       </div>
+                                                       <div 
class="pure-control-group">
+                                                               <label></label>
+                                                               <div 
id="message4" class="message"></div>
+                                                       </div>
+                                               </div>
+                                       </div>
+                               </form>
+                       </div>
                
-                       </div>
+               </div>
        </div>
        <script>
                $('#responsiveTabsDemo').responsiveTabs({
-                       startCollapsed: 'accordion',
-                       disabled: [1,2,3]
+               startCollapsed: 'accordion',
+               disabled: [1,2,3]
                });
                
                $('#responsiveTabsRelations').responsiveTabs({
-                       startCollapsed: 'accordion',
-                       disabled: [2]
+               startCollapsed: 'accordion',
+               disabled: [2]
                });
        </script>
 </xsl:template>




reply via email to

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