|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [7408] frontend: more on entity |
| Date: | Tue, 21 Jun 2011 13:46:27 +0000 |
Revision: 7408
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7408
Author: sigurdne
Date: 2011-06-21 13:46:26 +0000 (Tue, 21 Jun 2011)
Log Message:
-----------
frontend: more on entity
Modified Paths:
--------------
trunk/frontend/inc/class.uientity.inc.php
trunk/frontend/inc/class.uifrontend.inc.php
trunk/frontend/js/yahoo/entity.list.js
trunk/frontend/templates/base/entity.xsl
trunk/frontend/templates/base/entityview.xsl
trunk/property/inc/class.soentity.inc.php
trunk/property/setup/phpgw_no.lang
Added Paths:
-----------
trunk/frontend/templates/base/attributes_view.xsl
Modified: trunk/frontend/inc/class.uientity.inc.php
===================================================================
--- trunk/frontend/inc/class.uientity.inc.php 2011-06-21 13:11:02 UTC (rev
7407)
+++ trunk/frontend/inc/class.uientity.inc.php 2011-06-21 13:46:26 UTC (rev
7408)
@@ -89,11 +89,12 @@
$this->status =
$this->bo->status;
// $this->location_code =
$this->bo->location_code;
$this->p_num =
$this->bo->p_num;
- $this->category_dir =
$this->bo->category_dir;
$GLOBALS['phpgw']->session->appsession('entity_id','property',$this->entity_id);
$this->start_date =
$this->bo->start_date;
$this->end_date =
$this->bo->end_date;
$this->allrows =
$this->bo->allrows;
+ $this->category_dir =
"{$this->type}_{$this->entity_id}_{$this->cat_id}";
+ $this->bo->category_dir =
$this->category_dir;
phpgwapi_cache::session_set('frontend','tab',$this->location_id);
@@ -219,7 +220,7 @@
(
'field' => array
(
- array
+ /* array
(
//boton search criteria
'id' => 'btn_criteria_id',
'name' => 'criteria_id',
@@ -227,7 +228,7 @@
'type' => 'button',
'style' => 'filter',
'tab_index' => 4
- ),
+ ),*/
array
(//for
link "columns", next to Export button
'type'=> 'link',
@@ -292,8 +293,8 @@
'id' => 'start_date',
'name' => 'start_date',
'value' => $start_date
- ),
- array
+ )),
+ /* array
(//for
link "Date search",
'type'=> 'link',
'id' => 'btn_data_search',
@@ -303,27 +304,27 @@
'menuaction' =>
'property.uiproject.date_search'))."','link','width=350,height=250')",
'value' => lang('Date search'),
'tab_index' => 6
-
)),
- 'hidden_value'
=> array
+
)),*/
+ /* 'hidden_value'
=> array
(
array
(
'id' => 'values_combo_box_0',
'value'=> $this->bocommon->select2String($values_combo_box[0])
)
- )
+ )*/
)));
$custom =
createObject('phpgwapi.custom_fields');
$attrib_data =
$custom->find($this->type_app[$this->type],".{$this->type}.{$this->entity_id}.{$this->cat_id}",
0, '','','',true, true);
-
+/*
$button_def[] = "oMenuButton_0";
$code_inner[] = "{order:0,
var_URL:'criteria_id',name:'btn_criteria_id',style:'genericbutton',dependiente:[]}";
+*/
-
if($attrib_data)
{
- $i = 1;
+ $i = 0;
foreach ( $attrib_data as $attrib )
{
if($attrib['datatype'] == 'LB'
|| $attrib['datatype'] == 'CH' || $attrib['datatype'] == 'R')
@@ -399,12 +400,74 @@
$uicols = $this->bo->uicols;
- $content = array();
+ $uicols['name'][] = 'img_id';
+ $uicols['descr'][] = 'dummy';
+ $uicols['sortable'][] = false;
+ $uicols['sort_field'][] = '';
+ $uicols['format'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['input_type'][] = 'hidden';
+
+ $uicols['name'][] = 'directory';
+ $uicols['descr'][] = 'directory';
+ $uicols['sortable'][] = false;
+ $uicols['sort_field'][] = '';
+ $uicols['format'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['input_type'][] = 'hidden';
+
+ $uicols['name'][] = 'file_name';
+ $uicols['descr'][] = lang('name');
+ $uicols['sortable'][] = false;
+ $uicols['sort_field'][] = '';
+ $uicols['format'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['input_type'][] = 'hidden';
+
+ $uicols['name'][] = 'picture';
+ $uicols['descr'][] = '';
+ $uicols['sortable'][] = false;
+ $uicols['sort_field'][] = '';
+ $uicols['format'][] = '';
+ $uicols['formatter'][] = 'show_picture';
+ $uicols['input_type'][] = '';
+
+ $vfs = CreateObject('phpgwapi.vfs');
+ $vfs->override_acl = 1;
+
+ $vfs->override_acl = 0;
+
+ $j = count($ticket['files']);
+ for ($i=0;$i<$j;$i++)
+ {
+
$ticket['files'][$i]['file_name']=urlencode($ticket['files'][$i]['name']);
+ }
+
+ $img_types = array
+ (
+ 'image/jpeg',
+ 'image/png',
+ 'image/gif'
+ );
+
$j=0;
if (isset($entity_list) && is_array($entity_list))
{
- foreach($entity_list as $entity_entry)
+ foreach($entity_list as &$entity_entry)
{
+ $_loc1 = isset($entity_entry['loc1'])
&& $entity_entry['loc1'] ? $entity_entry['loc1'] : 'dummy';
+
+ $_files = $vfs->ls(array(
+ 'string' =>
"/property/{$this->category_dir}/{$_loc1}/{$entity_entry['id']}",
+ 'relatives' =>
array(RELATIVE_NONE)));
+
+ if(isset($_files[0]) && $_files[0] &&
in_array($_files[0]['mime_type'], $img_types))
+ {
+ $entity_entry['file_name']
= urlencode($_files[0]['name']);
+ $entity_entry['directory']
= urlencode($_files[0]['directory']);
+ $entity_entry['img_id']
= $_files[0]['file_id'];
+ }
+
for
($i=0;$i<count($uicols['name']);$i++)
{
if($uicols['input_type'][$i]!='hidden')
@@ -788,108 +851,76 @@
}
-
- private function cmp($a, $b)
+ public function view()
{
- $timea = explode('/', $a['date']);
- $timeb = explode('/', $b['date']);
- $year_and_maybe_time_a = explode(' - ', $timea[2]);
- $year_and_maybe_time_b = explode(' - ', $timeb[2]);
- $time_of_day_a = explode(':',
$year_and_maybe_time_a[1]);
- $time_of_day_b = explode(':',
$year_and_maybe_time_b[1]);
+ $GLOBALS['phpgw']->translation->add_app('property');
+ $bo = & $this->bo;
+ $id = phpgw::get_var('id');
+ $values = $bo->read_single(array('id' => $id,
'entity_id' => $this->entity_id, 'cat_id' => $this->cat_id, 'view' => true));
- $timestamp_a = mktime($time_of_day_a[0],
$time_of_day_a[1], 0, $timea[1], $timea[0], $year_and_maybe_time_a[0]);
- $timestamp_b = mktime($time_of_day_b[0],
$time_of_day_b[1], 0, $timeb[1], $timeb[0], $year_and_maybe_time_b[0]);
+//_debug_array($values);
- if($timestamp_a < $timestamp_b)
+ $entity =
$this->soadmin_entity->read_single($this->entity_id);
+ $category =
$this->soadmin_entity->read_single_category($this->entity_id,$this->cat_id);
+ $location_data = array();
+
+ if($entity['location_form'] &&
$category['location_level'] > 0)
{
- return 1;
+ $bolocation =
CreateObject('property.bolocation');
+
$location_data=$bolocation->initiate_ui_location(array
+ (
+ 'values' =>
$values['location_data'],
+ 'type_id' =>
(int)$category['location_level'],
+ 'no_link' => $_no_link,
// disable lookup links for location type less than type_id
+ 'lookup_type' => $lookup_type,
+ 'tenant' =>
$lookup_tenant,
+ 'lookup_entity' =>
$lookup_entity,
+ 'entity_data' =>
isset($values['p'])?$values['p']:''
+ ));
}
- return -1;
- }
+
+ $link_file_data = array
+ (
+ 'menuaction' =>
'property.uientity.view_file',
+ 'loc1' =>
$values['location_data']['loc1'],
+ 'id' => $id,
+ 'cat_id' =>
$this->cat_id,
+ 'entity_id' =>
$this->entity_id,
+ 'type' => $this->type
+ );
-
- public function view()
- {
- $GLOBALS['phpgw']->translation->add_app('property');
- $bo = CreateObject('property.botts');
- $entityid = phpgw::get_var('id');
- $entity = $bo->read_single($entityid);
-
- $assignedto = $entity['assignedto'];
- if(isset($assignedto) && $assignedto != '')
+ $content_files = array();
+ for($z=0; $z<count($values['files']); $z++)
{
- $assignedto_account =
$GLOBALS['phpgw']->accounts->get($assignedto);
- //var_dump($assignedto_account);
- if($assignedto_account)
+ $content_files[$z]['file_name'] = '<a
href="'.$GLOBALS['phpgw']->link('/index.php',$link_file_data).'&file_name='.$values['files'][$z]['name'].'"
target="_blank" title="'.lang('click to view
file').'">'.$values['files'][$z]['name'].'</a>';
+ if($mode == 'edit')
{
- $entity['assigned_to_name'] =
$assignedto_account->__toString();
+ $content_files[$z]['delete_file'] =
'<input type="checkbox" name="values[file_action][]"
value="'.$values['files'][$z]['name'].'" title="'.lang('Check to delete
file').'">';
}
- }
-
- $contact_id = $entity['contact_id'];
- if(isset($contact_id) && $contact_id != '')
- {
- $contacts
= CreateObject('phpgwapi.contacts');
- $contact_data
= $contacts->read_single_entry($contact_id,
array('fn','tel_work','email'));
- $entity['value_contact_name'] =
$contact_data[0]['fn'];
- $entity['value_contact_email'] =
$contact_data[0]['email'];
- $entity['value_contact_tel'] =
$contact_data[0]['tel_work'];
- }
-
- $vendor_id = $entity['vendor_id'];
- if(isset($vendor_id) && $vendor_id != '')
- {
- $contacts =
CreateObject('property.sogeneric');
- $contacts->get_location_info('vendor',false);
-
- $custom =
createObject('property.custom_fields');
- $vendor_data['attributes'] =
$custom->find('property','.vendor', 0, '', 'ASC', 'attrib_sort', true, true);
-
- $vendor_data =
$contacts->read_single(array('id' => $vendor_id),$vendor_data);
-
- if(is_array($vendor_data))
+ else
{
- foreach($vendor_data['attributes'] as
$attribute)
- {
-
if($attribute['name']=='org_name')
- {
-
$entity['value_vendor_name']=$attribute['value'];
- break;
- }
- }
+ $content_files[$z]['delete_file'] = '';
}
- }
+ }
- $notes = $bo->read_additional_notes($entityid);
- //$history = $bo->read_record_history($entityid);
+ $datavalues[0] = array
+ (
+ 'name'
=> "0",
+ 'values'
=> json_encode($content_files),
+ 'total_records' =>
count($content_files),
+ 'edit_action' => "''",
+ 'is_paginator' => 0,
+ 'footer'
=> 0
+ );
- $entityhistory = array();
+ $myColumnDefs[0] = array
+ (
+ 'name' => "0",
+ 'values' =>
json_encode(array( array('key' =>
'file_name','label'=>lang('Filename'),'sortable'=>false,'resizeable'=>true),
+ array('key' =>
'delete_file','label'=>lang('Delete
file'),'sortable'=>false,'resizeable'=>true,'formatter'=>'FormatterCenter')))
+ );
- foreach($notes as $note)
- {
- if($note['value_publish'])
- {
- $entityhistory[] = array(
- 'date' => $note['value_date'],
- 'user' => $note['value_user'],
- 'note' => $note['value_note']
- );
- }
- }
-
-
- usort($entityhistory, array($this, "cmp"));
-
-
- $i=0;
- foreach($entityhistory as $foo)
- {
- $entityhistory2['record'.$i] = $foo;
- $i++;
- }
-
$msglog =
phpgwapi_cache::session_get('frontend','msgbox');
phpgwapi_cache::session_clear('frontend','msgbox');
@@ -897,175 +928,29 @@
'header' => $this->header_state,
'msgbox_data' => isset($msglog) ?
$GLOBALS['phpgw']->common->msgbox($GLOBALS['phpgw']->common->msgbox_data($msglog))
: array(),
'tabs' => $this->tabs,
- 'entityinfo' => array(
- 'entitylist' =>
$GLOBALS['phpgw']->link('/index.php',
+ 'entityinfo' => array
+ (
+ 'entitylist' =>
$GLOBALS['phpgw']->link('/index.php',
array
(
'menuaction' => 'frontend.uientity.index',
'location_id' => $this->location_id
)),
- 'entity' => $entity,
- 'entityhistory' => $entityhistory2)
+ 'entity' => $entity,
+ 'entityhistory' =>
$entityhistory2,
+ 'custom_attributes' =>
array('attributes' => $values['attributes']),
+ 'location_data' =>
$location_data,
+ 'files'
=> isset($values['files'])?$values['files']:'',
+ 'property_js' =>
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
+ 'datatable'
=> $datavalues,
+ 'myColumnDefs' =>
$myColumnDefs,
+ )
);
- $GLOBALS['phpgw']->xslttpl->add_file(array('frontend',
'entityview'));
+
+ $GLOBALS['phpgw']->xslttpl->add_file(array('frontend',
'entityview','attributes_view'));
+
$GLOBALS['phpgw']->xslttpl->add_file(array('location_view', 'files'),
PHPGW_SERVER_ROOT . '/property/templates/base');
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('app_data' => $data));
}
-
-
- public function add_ticket()
- {
- $bo = CreateObject('property.botts',true);
- $boloc = CreateObject('property.bolocation',true);
-
- $location_details =
$boloc->read_single($this->location_code, array('noattrib' => true));
-
- $values = phpgw::get_var('values');
- $missingfields = false;
- $msglog = array();
-
- // Read default assign-to-group from config
- $config = CreateObject('phpgwapi.config', 'frontend');
- $config->read();
- $default_cat = $config->config_data['tts_default_cat']
? $config->config_data['tts_default_cat'] : 0;
-
- if(!$default_cat)
- {
- throw new Exception('Default category is not
set in config');
- $GLOBALS['phpgw']->common->phpgw_exit();
- }
-
- if(isset($values['save']))
- {
- foreach($values as $key => $value)
- {
- if(empty($value) && $key !== 'file')
- {
- $missingfields = true;
- }
- }
-
- if(!$missingfields && !phpgw::get_var('added'))
- {
- $location = array
- (
- 'loc1' =>
$location_details['loc1'],
- 'loc2' =>
$location_details['loc2']
- );
-
- $assignedto =
execMethod('property.boresponsible.get_responsible', array('location' =>
$location, 'cat_id' => $default_cat));
-
- if(!$assignedto)
- {
- $default_group =
$config->config_data['tts_default_group'];
- }
- else
- {
- $default_group = 0;
- }
-
- $ticket = array(
- 'origin' => null,
- 'origin_id' => null,
- 'cat_id' =>
$values['cat_id'],
- 'group_id' => ($default_group
? $default_group : null),
- 'assignedto'=> $assignedto,
- 'priority' => 3,
- 'status' => 'O', // O = Open
- 'subject' => $values['title'],
- 'details' =>
$values['locationdesc'].":\n\n".$values['description'],
- 'apply' => lang('Apply'),
- 'contact_id'=> 0,
- 'location' => $location,
- 'street_name' =>
$location_details['street_name'],
- 'street_number' =>
$location_details['street_number'],
- 'location_name' =>
$location_details['loc1_name'],
- //'locationdesc' =>
$values['locationdesc']
- );
-
- $result = $bo->add($ticket);
- if($result['message'][0]['msg'] != null
&& $result['id'] > 0)
- {
- $msglog['message'][] =
array('msg' => lang('Ticket added'));
- $noform = true;
-
-
- // Files
- $values['file_name'] =
@str_replace(' ','_',$_FILES['file']['name']);
- if($values['file_name'] &&
$msglog['id'])
- {
- $bofiles =
CreateObject('property.bofiles');
- $to_file =
$bofiles->fakebase . '/fmticket/' . $msglog['id'] . '/' . $values['file_name'];
-
-
if($bofiles->vfs->file_exists(array(
- 'string' =>
$to_file,
- 'relatives' =>
array(RELATIVE_NONE)
- )))
- {
-
$msglog['error'][] = array('msg'=>lang('This file already exists !'));
- }
- else
- {
-
$bofiles->create_document_dir("fmticket/{$result['id']}");
-
$bofiles->vfs->override_acl = 1;
-
-
if(!$bofiles->vfs->cp(array (
- 'from' =>
$_FILES['file']['tmp_name'],
- 'to' =>
$to_file,
- 'relatives'
=> array (RELATIVE_NONE|VFS_REAL, RELATIVE_ALL))))
- {
-
$msglog['error'][] = array('msg' => lang('Failed to upload file!'));
- }
-
$bofiles->vfs->override_acl = 0;
- }
- }
-
- $redirect = true;
-
phpgwapi_cache::session_set('frontend', 'msgbox', $msglog);
- // /Files
- }
- }
- else
- {
- $msglog['error'][] =
array('msg'=>lang('Missing field(s)'));
- }
- }
-
-
- $tts_frontend_cat_selected =
$config->config_data['tts_frontend_cat'] ?
$config->config_data['tts_frontend_cat'] : array();
-
- $cats = CreateObject('phpgwapi.categories', -1,
'property', '.ticket');
- $cats->supress_info = true;
- $categories = $cats->return_sorted_array(0, false, '',
'', '', true, '', false);
-
- $category_list = array();
- foreach ( $categories as $category)
- {
- if ( in_array($category['id'],
$tts_frontend_cat_selected))
- {
- $category_list[] = array
- (
- 'id' =>
$category['id'],
- 'name' =>
$category['name'],
- 'selected' =>
$category['id'] == $default_cat ? 1 : 0
- );
- }
- }
-
- $data = array(
- 'redirect' =>
isset($redirect) ? $GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'frontend.uientity.index')) : null,
- 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($GLOBALS['phpgw']->common->msgbox_data($msglog)),
- 'form_action' =>
$GLOBALS['phpgw']->link('/index.php',array('menuaction' =>
'frontend.uientity.add_ticket', 'noframework' => '1')),
- 'title' => $values['title'],
- 'locationdesc' =>
$values['locationdesc'],
- 'description' =>
$values['description'],
- 'noform' => $noform,
- 'category_list' => $category_list
- );
-
-
$GLOBALS['phpgw']->xslttpl->add_file(array('frontend','helpdesk'));
- $GLOBALS['phpgw']->xslttpl->set_var('phpgw',
array('add_ticket' => $data));
- }
-
}
Modified: trunk/frontend/inc/class.uifrontend.inc.php
===================================================================
--- trunk/frontend/inc/class.uifrontend.inc.php 2011-06-21 13:11:02 UTC (rev
7407)
+++ trunk/frontend/inc/class.uifrontend.inc.php 2011-06-21 13:46:26 UTC (rev
7408)
@@ -65,9 +65,9 @@
/* Get the tabs and check to see whether the user has
specified a tab or has a selected tab on session */
$tabs = $this->get_tabs();
- $type = phpgw::get_var('type', 'int', 'REQUEST');
- $tab = isset($type) ? $type :
phpgwapi_cache::session_get('frontend','tab');
- $selected = isset($tab) ? $tab :
array_shift(array_keys($tabs));
+ $location_id = phpgw::get_var('location_id', 'int',
'REQUEST');
+ $tab = isset($location_id) ? $location_id :
phpgwapi_cache::session_get('frontend','tab');
+ $selected = isset($tab) && $tab ? $tab :
array_shift(array_keys($tabs));
$this->tabs =
$GLOBALS['phpgw']->common->create_tabs($tabs, $selected);
phpgwapi_cache::session_set('frontend','tab',$selected);
@@ -278,7 +278,7 @@
$location_id =
$GLOBALS['phpgw']->locations->get_id('frontend', $location);
$tabs[$location_id] = array(
'label' => lang($name),
- 'link' =>
$GLOBALS['phpgw']->link('/',array('menuaction' => "frontend.ui{$name}.index",
'type'=>$location_id, 'noframework' => $noframework))
+ 'link' =>
$GLOBALS['phpgw']->link('/',array('menuaction' => "frontend.ui{$name}.index",
'location_id'=>$location_id, 'noframework' => $noframework))
);
}
unset($location);
@@ -461,7 +461,7 @@
{
//Forward to helpdesk
$location_id =
$GLOBALS['phpgw']->locations->get_id('frontend', '.ticket');
- $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'frontend.uihelpdesk.index', 'type' => $location_id));
+ $GLOBALS['phpgw']->redirect_link('/index.php',
array('menuaction' => 'frontend.uihelpdesk.index', 'location_id' =>
$location_id));
}
Modified: trunk/frontend/js/yahoo/entity.list.js
===================================================================
--- trunk/frontend/js/yahoo/entity.list.js 2011-06-21 13:11:02 UTC (rev
7407)
+++ trunk/frontend/js/yahoo/entity.list.js 2011-06-21 13:46:26 UTC (rev
7408)
@@ -117,9 +117,9 @@
{
if(oRecord.getData('img_id'))
{
- var oArgs = {menuaction:'property.uigallery.view_file',
file:oRecord.getData('directory') + '/' + oRecord.getData('name')};
+ var oArgs = {menuaction:'property.uigallery.view_file',
file:oRecord.getData('directory') + '/' + oRecord.getData('file_name')};
var sUrl = phpGWLink('index.php', oArgs);
- elCell.innerHTML = "<a href=\""+sUrl+"\"
title=\""+oRecord.getData('name')+"\" id=\""+oRecord.getData('img_id')+"\"
rel=\"colorbox\" target=\"_blank\"><img src=\""+sUrl+"&thumb=1\"
alt=\""+oRecord.getData('name')+"\" /></a>";
+ elCell.innerHTML = "<a href=\""+sUrl+"\"
title=\""+oRecord.getData('file_name')+"\" id=\""+oRecord.getData('img_id')+"\"
rel=\"colorbox\" target=\"_blank\"><img src=\""+sUrl+"&thumb=1\"
alt=\""+oRecord.getData('file_name')+"\" /></a>";
}
}
Added: trunk/frontend/templates/base/attributes_view.xsl
===================================================================
--- trunk/frontend/templates/base/attributes_view.xsl
(rev 0)
+++ trunk/frontend/templates/base/attributes_view.xsl 2011-06-21 13:46:26 UTC
(rev 7408)
@@ -0,0 +1,426 @@
+<!-- $Id: attributes_form.xsl 7396 2011-06-17 13:19:00Z sigurdne $ -->
+ <xsl:template name="attributes_view">
+ <xsl:apply-templates select="attributes_values"/>
+ </xsl:template>
+
+
+ <xsl:template name="attributes_values" xmlns:php="http://php.net/xsl";>
+ <xsl:for-each select="attributes_group" >
+ <div id="{link}">
+ <table cellpadding="2" cellspacing="2"
width="100%" align="center" border="0">
+ <xsl:apply-templates
select="attributes"/>
+ </table>
+ </div>
+ </xsl:for-each>
+ </xsl:template>
+
+ <xsl:template match="attributes">
+ <xsl:variable name="statustext"><xsl:value-of
select="statustext"/></xsl:variable>
+ <ul>
+ <li align="left" width="19%" valign="top"
title="{$statustext}">
+ <xsl:choose>
+ <xsl:when test="helpmsg=1">
+ <xsl:variable
name="help_url"><xsl:value-of select="help_url"/></xsl:variable>
+ <a href="javascript:var
w=window.open('{$help_url}','','left=50,top=100,width=550,height=400,scrollbars')">
+
<xsl:text>[</xsl:text><xsl:value-of select="input_text"/><xsl:text>]</xsl:text>
+ </a>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="input_text"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when test="datatype='pwd'">
+ <br/>
+ <xsl:text>[ </xsl:text>
+ <xsl:choose>
+ <xsl:when
test="value!=''">
+
<xsl:value-of select="//lang_edit"/>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:value-of select="//lang_add"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:text> ]</xsl:text>
+ </xsl:when>
+ </xsl:choose>
+ </li>
+ <li>
+ <xsl:choose>
+ <xsl:when test="name!=''">
+ <input type="hidden"
name="values_attribute[{counter}][name]" value="{name}"></input>
+ <input type="hidden"
name="values_attribute[{counter}][datatype]" value="{datatype}"></input>
+ <input type="hidden"
name="values_attribute[{counter}][history]" value="{history}"></input>
+ <input type="hidden"
name="values_attribute[{counter}][attrib_id]" value="{id}"></input>
+ <input type="hidden"
name="values_attribute[{counter}][nullable]" value="{nullable}"></input>
+ <input type="hidden"
name="values_attribute[{counter}][input_text]" value="{input_text}"></input>
+ <xsl:choose>
+ <xsl:when
test="datatype='R'">
+
<xsl:call-template name="choice"/>
+ </xsl:when>
+ <xsl:when
test="datatype='CH'">
+
<xsl:call-template name="choice"/>
+ </xsl:when>
+ <xsl:when
test="datatype='LB'">
+ <select
name="values_attribute[{counter}][value]" class="forms">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
+
<option value=""><xsl:value-of select="//lang_none"/></option>
+
<xsl:for-each select="choice">
+
<xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
+
<xsl:choose>
+
<xsl:when test="checked='checked'">
+
<option value="{$id}" selected="selected"><xsl:value-of
disable-output-escaping="yes" select="value"/></option>
+
</xsl:when>
+
<xsl:otherwise>
+
<option value="{$id}"><xsl:value-of
disable-output-escaping="yes" select="value"/></option>
+
</xsl:otherwise>
+
</xsl:choose>
+
</xsl:for-each>
+
</select>
+ </xsl:when>
+ <xsl:when
test="datatype='AB'">
+ <table>
+
<ul>
+
<li>
+
<xsl:variable name="contact_name"><xsl:value-of
select="name"/><xsl:text>_name</xsl:text></xsl:variable>
+
<xsl:variable
name="lookup_function"><xsl:text>lookup_</xsl:text><xsl:value-of
select="name"/><xsl:text>();</xsl:text></xsl:variable>
+
<xsl:variable
name="clear_function"><xsl:text>clear_</xsl:text><xsl:value-of
select="name"/><xsl:text>();</xsl:text></xsl:variable>
+
<input type="hidden" name="{name}" value="{value}"
onClick="{$lookup_function}" readonly="readonly" size="5">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
+
</input>
+
<input size="30" type="text" name="{$contact_name}"
value="{contact_name}" onClick="{$lookup_function}" readonly="readonly">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
+
</input>
+
<input type="checkbox" name="clear_{name}_box"
onClick="{$clear_function}" >
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang',
'delete')" />
+
</xsl:attribute>
+
<xsl:attribute name="readonly">
+
<xsl:text>readonly</xsl:text>
+
</xsl:attribute>
+
</input>
+
</li>
+
</ul>
+
<xsl:choose>
+
<xsl:when test="contact_tel!=''">
+
<ul>
+
<li>
+
<xsl:value-of select="contact_tel"/>
+
</li>
+
</ul>
+
</xsl:when>
+
</xsl:choose>
+
<xsl:choose>
+
<xsl:when test="contact_email!=''">
+
<ul>
+
<li>
+
<a href="mailto:{contact_email}";><xsl:value-of
select="contact_email"/></a>
+
</li>
+
</ul>
+
</xsl:when>
+
</xsl:choose>
+ </table>
+ </xsl:when>
+ <xsl:when
test="datatype='ABO'">
+ <table>
+
<ul>
+
<li>
+
<xsl:variable name="org_name"><xsl:value-of
select="name"/><xsl:text>_name</xsl:text></xsl:variable>
+
<xsl:variable
name="lookup_function"><xsl:text>lookup_</xsl:text><xsl:value-of
select="name"/><xsl:text>();</xsl:text></xsl:variable>
+
<input type="hidden" name="{name}" value="{value}"
onClick="{$lookup_function}" readonly="readonly" size="5">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
+
</input>
+
<input size="30" type="text" name="{$org_name}"
value="{org_name}" onClick="{$lookup_function}" readonly="readonly">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
+
</input>
+
</li>
+
</ul>
+
<xsl:choose>
+
<xsl:when test="org_tel!=''">
+
<ul>
+
<li>
+
<xsl:value-of select="org_tel"/>
+
</li>
+
</ul>
+
</xsl:when>
+
</xsl:choose>
+
<xsl:choose>
+
<xsl:when test="org_email!=''">
+
<ul>
+
<li>
+
<a href="mailto:{org_email}";><xsl:value-of
select="org_email"/></a>
+
</li>
+
</ul>
+
</xsl:when>
+
</xsl:choose>
+ </table>
+ </xsl:when>
+ <xsl:when
test="datatype='VENDOR'">
+
<xsl:variable name="vendor_name"><xsl:value-of
select="name"/><xsl:text>_org_name</xsl:text></xsl:variable>
+
<xsl:variable name="lookup_function"><xsl:text>lookup_</xsl:text><xsl:value-of
select="name"/><xsl:text>();</xsl:text></xsl:variable>
+ <input
type="text" name="{name}" value="{value}" onClick="{$lookup_function}"
readonly="readonly" size="6">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
+ </input>
+ <input
size="30" type="text" name="{$vendor_name}" value="{vendor_name}"
onClick="{$lookup_function}" readonly="readonly">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
+ </input>
+ </xsl:when>
+ <xsl:when
test="datatype='user'">
+
<xsl:variable name="user_name"><xsl:value-of
select="name"/><xsl:text>_user_name</xsl:text></xsl:variable>
+
<xsl:variable name="lookup_function"><xsl:text>lookup_</xsl:text><xsl:value-of
select="name"/><xsl:text>();</xsl:text></xsl:variable>
+ <input
type="text" name="{name}" value="{value}" onClick="{$lookup_function}"
readonly="readonly" size="6">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
+ </input>
+ <input
size="30" type="text" name="{$user_name}" value="{user_name}"
onClick="{$lookup_function}" readonly="readonly">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
+ </input>
+ </xsl:when>
+ <xsl:when
test="datatype='D'">
+ <input
type="text" id="values_attribute_{counter}"
name="values_attribute[{counter}][value]" value="{value}" size="12"
maxlength="12" >
+
<xsl:attribute name="readonly">
+
<xsl:text> readonly</xsl:text>
+
</xsl:attribute>
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
+ </input>
+ <img
id="values_attribute_{counter}-trigger" src="{img_cal}" alt="{lang_datetitle}"
title="{lang_datetitle}" style="cursor:pointer; cursor:hand;" />
+ </xsl:when>
+ <xsl:when
test="datatype='T'">
+
<textarea cols="{//textareacols}" rows="{//textarearows}"
name="values_attribute[{counter}][value]" >
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
+
<xsl:value-of select="value"/>
+
</textarea>
+ </xsl:when>
+ <xsl:when
test="datatype='pwd'">
+ <table>
+
<ul>
+
<li>
+
<input type="password"
name="values_attribute[{counter}][value]" size="30">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
+
</input>
+
</li>
+
</ul>
+
<ul>
+
<li>
+
<input type="password"
name="values_attribute[{counter}][value2]" size="30">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
+
</input>
+
</li>
+
</ul>
+ </table>
+ </xsl:when>
+ <xsl:when
test="datatype='bolean'">
+ <input
type="checkbox" name="values_attribute[{counter}][value]" value="1">
+
<xsl:choose>
+
<xsl:when test="value!=''">
+
<xsl:attribute name="checked">
+
<xsl:text>checked</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
+ </input>
+ </xsl:when>
+ <xsl:when
test="datatype='link'">
+ <input
type="text" name="values_attribute[{counter}][value]" value="{value}" size="30">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
+ </input>
+
<xsl:choose>
+
<xsl:when test="value!=''">
+
<br/><a href="{value}" target="_blank"><xsl:value-of
select="value"/></a>
+
</xsl:when>
+
</xsl:choose>
+ </xsl:when>
+ <xsl:when
test="datatype='event'">
+
<xsl:choose>
+
<xsl:when test="warning!=''">
+
<xsl:value-of select="warning"/>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:variable name="event_descr"><xsl:value-of
select="name"/><xsl:text>_descr</xsl:text></xsl:variable>
+
<xsl:variable
name="lookup_function"><xsl:text>lookup_</xsl:text><xsl:value-of
select="name"/><xsl:text>();</xsl:text></xsl:variable>
+
<table>
+
<ul>
+
<li>
+
<input type="text" name="{name}"
value="{value}" onClick="{$lookup_function}" readonly="readonly"
size="6"></input>
+
<input size="30" type="text"
name="{$event_descr}" value="{descr}" onClick="{$lookup_function}"
readonly="readonly">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute
name="disabled">
+
<xsl:text>
disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
+
</input>
+
</li>
+
</ul>
+
<xsl:choose>
+
<xsl:when test="next!=''">
+
<ul>
+
<li>
+
<xsl:value-of
select="lang_next_run"/>
+
<xsl:text>: </xsl:text>
+
<xsl:value-of select="next"/>
+
</li>
+
</ul>
+
<ul>
+
<li>
+
<xsl:value-of
select="lang_enabled"/>
+
<xsl:text>: </xsl:text>
+
<xsl:value-of select="enabled"/>
+
</li>
+
</ul>
+
</xsl:when>
+
</xsl:choose>
+
</table>
+
</xsl:otherwise>
+
</xsl:choose>
+ </xsl:when>
+ <xsl:otherwise>
+ <input
type="text" name="values_attribute[{counter}][value]" value="{value}" size="30">
+
<xsl:choose>
+
<xsl:when test="disabled!=''">
+
<xsl:attribute name="disabled">
+
<xsl:text> disabled</xsl:text>
+
</xsl:attribute>
+
</xsl:when>
+
</xsl:choose>
+ </input>
+ </xsl:otherwise>
+ </xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="history=1">
+ <input
type="text" name="values_attribute[{counter}][date]" value=""
onFocus="{//dateformat_validate}" onKeyUp="{//onKeyUp}" onBlur="{//onBlur}"
size="12" maxlength="10" >
+ </input>
+
<xsl:variable name="link_history"><xsl:value-of
select="link_history"/></xsl:variable>
+
<xsl:variable name="lang_history_help"><xsl:value-of
select="//lang_history_help"/></xsl:variable>
+
<xsl:variable name="lang_history"><xsl:value-of
select="//lang_history"/></xsl:variable>
+ <a
href="javascript:var
w=window.open('{$link_history}','','left=50,top=100,width=550,height=400,scrollbars')"
+
title="{$lang_history_help}">
+
<xsl:value-of select="//lang_history"/></a>
+ </xsl:when>
+ </xsl:choose>
+ </xsl:when>
+ </xsl:choose>
+ </li>
+ </ul>
+ </xsl:template>
+
+ <xsl:template name="choice">
+ <xsl:variable name="counter"><xsl:value-of
select="counter"/></xsl:variable>
+ <table cellpadding="2" cellspacing="2" width="50%" align="left">
+ <xsl:for-each select="choice" >
+ <ul>
+ <xsl:attribute name="class">
+ <xsl:choose>
+ <xsl:when test="@class">
+ <xsl:value-of
select="@class"/>
+ </xsl:when>
+ <xsl:when
test="position() mod 2 = 0">
+
<xsl:text>row_off</xsl:text>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:text>row_on</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ <li align="left">
+ <xsl:value-of select="value"/>
+ <xsl:text> </xsl:text>
+ </li>
+ <li align="left">
+ <xsl:choose>
+ <xsl:when
test="checked='checked'">
+ <input
type="{input_type}" name="values_attribute[{$counter}][value][]" value="{id}"
checked="checked"></input>
+ </xsl:when>
+ <xsl:otherwise>
+ <input
type="{input_type}" name="values_attribute[{$counter}][value][]"
value="{id}"></input>
+ </xsl:otherwise>
+ </xsl:choose>
+ </li>
+ </ul>
+ </xsl:for-each>
+ </table>
+ </xsl:template>
Modified: trunk/frontend/templates/base/entity.xsl
===================================================================
--- trunk/frontend/templates/base/entity.xsl 2011-06-21 13:11:02 UTC (rev
7407)
+++ trunk/frontend/templates/base/entity.xsl 2011-06-21 13:46:26 UTC (rev
7408)
@@ -1,7 +1,7 @@
<!-- $Id: helpdesk.xsl 6663 2010-12-09 10:45:28Z sigurdne $ -->
<xsl:template match="entity" xmlns:php="http://php.net/xsl";>
<xsl:variable name="form_action"><xsl:value-of
select="form_action"/></xsl:variable>
- <div class="yui-navset" id="ticket_tabview">
+ <div class="yui-navset" id="entity_tabview">
<xsl:value-of disable-output-escaping="yes" select="tabs" />
<div class="yui-content">
<xsl:choose>
@@ -11,7 +11,7 @@
<xsl:apply-templates
select="datatable/actions" />
</div>
</div>
- <div class="tickets">
+ <div class="entity">
<table cellpadding="2" cellspacing="2"
width="95%" align="center">
<xsl:choose>
<xsl:when test="msgbox_data
!= ''">
@@ -27,117 +27,11 @@
</div>
</xsl:when>
<xsl:otherwise>
- <div class="tickets">
+ <div class="entity">
<xsl:value-of select="php:function('lang',
'no_buildings')"/>
</div>
</xsl:otherwise>
</xsl:choose>
-
</div>
</div>
-
</xsl:template>
-
-<xsl:template match="lightbox_name" xmlns:php="http://php.net/xsl";>
-</xsl:template>
-
-<xsl:template match="add_ticket" xmlns:php="http://php.net/xsl";>
- <xsl:choose>
- <xsl:when test="normalize-space(redirect) != ''">
- <script>
- window.parent.location = '<xsl:value-of select="redirect"/>';
- window.close();
- </script>
- </xsl:when>
- </xsl:choose>
- <h2>Ny skademelding</h2>
- <form ENCTYPE="multipart/form-data" name="form" method="post"
action="{form_action}">
- <table cellpadding="0" cellspacing="0" width="100%">
- <xsl:choose>
- <xsl:when test="msgbox_data != ''">
- <tr>
- <td align="left" colspan="2">
- <xsl:call-template name="msgbox"/>
- </td>
- </tr>
- </xsl:when>
- </xsl:choose>
-
-
- <xsl:if test="noform != 1">
- <tr>
- <td class="th_text" valign="top">
- <xsl:value-of select="php:function('lang',
'category')" />
- </td>
- <td class="th_text" valign="top">
- <select name="values[cat_id]" >
- <xsl:attribute
name="title">
- <xsl:value-of
select="php:function('lang', 'category')" />
- </xsl:attribute>
- <xsl:apply-templates
select="category_list"/>
- </select>
- </td>
- </tr>
- <tr>
- <td class="th_text" valign="top">
- <xsl:value-of select="php:function('lang', 'subject')"
/>
- </td>
- <td class="th_text" valign="top">
- <input type="text" name="values[title]"
value="{title}"/>
- </td>
- </tr>
-
- <tr>
- <td class="th_text" valign="top">
- <xsl:value-of select="php:function('lang',
'locationdesc')" />
- </td>
- <td class="th_text" valign="top">
- <input type="text" name="values[locationdesc]"
value="{locationdesc}"/>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <xsl:value-of select="php:function('lang',
'description')" />
- </td>
- <td>
- <textarea cols="60" rows="10"
name="values[description]" wrap="virtual" onMouseout="window.status='';return
true;">
- <xsl:value-of select="description"/>
- </textarea>
- </td>
- </tr>
-
- <tr>
- <td valign="top">
- <xsl:value-of select="php:function('lang', 'file')" />
- </td>
- <td>
- <input type="file" name="file" size="50">
- <xsl:attribute name="title">
- <xsl:value-of select="php:function('lang',
'file')" />
- </xsl:attribute>
- </input>
- </td>
- </tr>
-
- <tr height="50">
- <td>
- <xsl:variable name="lang_send"><xsl:value-of
select="php:function('lang', 'send')" /></xsl:variable>
- <input type="submit" name="values[save]"
value="{$lang_send}" title='{$lang_send}'/>
- </td>
- </tr>
- </xsl:if>
- </table>
- </form>
-</xsl:template>
-
-<xsl:template match="category_list">
- <option value="{id}">
- <xsl:if test="selected != 0">
- <xsl:attribute name="selected" value="selected" />
- </xsl:if>
- <xsl:value-of disable-output-escaping="yes" select="name"/>
- </option>
-</xsl:template>
-
-
Modified: trunk/frontend/templates/base/entityview.xsl
===================================================================
--- trunk/frontend/templates/base/entityview.xsl 2011-06-21 13:11:02 UTC
(rev 7407)
+++ trunk/frontend/templates/base/entityview.xsl 2011-06-21 13:46:26 UTC
(rev 7408)
@@ -17,64 +17,40 @@
<div id="entityinfo">
<ul style="margin: 2em;">
<li style="margin-bottom: 1em;">
- <a href="{entitylist}"> <<
<xsl:value-of select="php:function('lang', 'show_all_entities')"/></a>
+ <a href="{entitylist}"> <<
<xsl:value-of select="php:function('lang', 'show all entities')"/></a>
</li>
<li>
- <ul>
- <li style="margin-bottom: 5px;">
- <img
src="frontend/templates/base/images/16x16/comment.png" class="list_image"/>
<strong><xsl:value-of select="entity/subject"/></strong>
- </li>
- <li class="entity_detail">
- <img
src="frontend/templates/base/images/16x16/clock_edit.png" class="list_image"/>
<xsl:value-of select="php:function('lang', 'entry_date')"/> <xsl:value-of
select="entity/entry_date"/><xsl:value-of select="php:function('lang',
'of')"/><xsl:value-of select="entity/user_name"/>
- </li>
- <li class="entity_detail">
- <img
src="frontend/templates/base/images/16x16/timeline_marker.png"
class="list_image"/> <xsl:value-of select="php:function('lang', 'status')"/>:
<xsl:value-of select="entity/status_name"/>
- </li>
- <xsl:choose>
- <xsl:when
test="entity/value_vendor_name">
- <li
class="entity_detail">
- <img
src="frontend/templates/base/images/16x16/user_suit.png" class="list_image"/>
<xsl:value-of select="php:function('lang', 'vendor')"/>: <xsl:value-of
select="entity/value_vendor_name"/>
- </li>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when
test="entity/assigned_to_name">
- <li
class="entity_detail">
- <img
src="frontend/templates/base/images/16x16/user_red.png" class="list_image"/>
<xsl:value-of select="php:function('lang', 'assigned_to')"/>: <xsl:value-of
select="entity/assigned_to_name"/>
- </li>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when
test="entity/value_contact_name">
- <li
class="entity_detail">
- <img
src="frontend/templates/base/images/16x16/user_green.png" class="list_image"/>
<xsl:value-of select="php:function('lang', 'contact')"/>: <xsl:value-of
select="entity/value_contact_name"/>
-
Telefon: <xsl:value-of select="entity/value_contact_tel"/>
- E-post:
<xsl:value-of select="entity/value_contact_email"/>
- </li>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when
test="entity/publish_note = 1">
- <li
class="entity_detail">
- <img
src="frontend/templates/base/images/16x16/page_white_edit.png"
class="list_image"/><xsl:value-of select="php:function('lang', 'message')"/>:
<xsl:value-of select="entity/details"/>
- </li>
- </xsl:when>
- </xsl:choose>
- <li class="entity_detail">
- <img
src="frontend/templates/base/images/16x16/comments.png" class="list_image"/>
<xsl:value-of select="php:function('lang', 'comments')"/>:<br/>
- <hr/>
- <ul>
- <xsl:for-each
select="entityhistory/*[starts-with(name(), 'record')]">
- <li
class="entity_detail">
- <img
src="frontend/templates/base/images/16x16/page_white_edit.png"
class="list_image"/> <xsl:value-of select="date"/> -
- <img
src="frontend/templates/base/images/16x16/user_gray.png" class="list_image"/>
<xsl:value-of select="user"/><br/>
- <p
style="padding: 10px;"><xsl:value-of select="note"/></p>
- </li>
- </xsl:for-each>
- </ul>
- </li>
- </ul>
+ <xsl:choose>
+ <xsl:when
test="location_data!=''">
+ <div
id="location">
+ <table>
+
<xsl:call-template name="location_view"/>
+ </table>
+ </div>
+ </xsl:when>
+ </xsl:choose>
+ </li>
+ <li>
+ <xsl:apply-templates
select="custom_attributes/attributes"/>
+ <hr/>
</li>
+ <xsl:choose>
+ <xsl:when test="files!=''">
+ <li>
+ <table
cellpadding="2" cellspacing="2" width="80%" align="center">
+ <!--
<xsl:call-template name="file_list"/> -->
+ <tr>
+
<td align="left" valign="top">
+
<xsl:value-of select="php:function('lang', 'files')"/>
+
</td>
+
<td>
+
<div id="datatable-container_0"></div>
+
</td>
+ </tr>
+ </table>
+ </li>
+ </xsl:when>
+ </xsl:choose>
</ul>
</div>
</div>
Modified: trunk/property/inc/class.soentity.inc.php
===================================================================
--- trunk/property/inc/class.soentity.inc.php 2011-06-21 13:11:02 UTC (rev
7407)
+++ trunk/property/inc/class.soentity.inc.php 2011-06-21 13:46:26 UTC (rev
7408)
@@ -276,6 +276,10 @@
$uicols['statustext'][] =
$this->db->f('statustext');
$uicols['datatype'][$i] =
$this->db->f('datatype');
$uicols['sortable'][$i] = true;
+ $uicols['exchange'][$i] = false;
+ $uicols['formatter'][$i] = '';
+ $uicols['classname'][$i] = '';
+
$uicols['cols_return_extra'][$i] = array
(
'name' =>
$this->db->f('column_name'),
@@ -299,6 +303,10 @@
$uicols['statustext'][] = lang('entry
date' );
$uicols['datatype'][] = 'timestamp';
$uicols['sortable'][] = true;
+ $uicols['exchange'][] = false;
+ $uicols['formatter'][] = '';
+ $uicols['classname'][] = '';
+
$uicols['cols_return_extra'][$i] = array
(
'name' => 'entry_date',
Modified: trunk/property/setup/phpgw_no.lang
===================================================================
--- trunk/property/setup/phpgw_no.lang 2011-06-21 13:11:02 UTC (rev 7407)
+++ trunk/property/setup/phpgw_no.lang 2011-06-21 13:46:26 UTC (rev 7408)
@@ -289,7 +289,7 @@
choose a category property no Velg en kategori
choose an id property no Velg en ID
choose charge tenant if the tenant i to pay for this project property
no Kryss av for å belaste leietaker dersom leietakeren skal betale for
arbeidene
-choose columns property no Velg kolonner
+choose columns common no Velg kolonner
choose copy hour to copy this hour to a new hour property no
Kryss av for å kopiere denne posten til en ny post
choose copy project to copy this project to a new project property
no Kryss av for å kopiere dette prosjektet til et nytt prosjekt
choose copy request to copy this request to a new request property
no Kryss av for å kopiere denne anmodningen til en ny anmodning
@@ -333,7 +333,7 @@
column description property no Beskrivelse av kolonne
column name property no Kolonnenavn
column name not entered! property no Manglende kolonnenavn
-columns property no kolonner
+columns common no kolonner
columns is updated property no Kolonner er oppdatert
common costs property no Fellsekostnader
communication descriptions manager property no Kommunikasjons
beskrivelse
@@ -527,8 +527,8 @@
do not add this invoice property no Ikke legg til denne
fakturaen
do not import this invoice property no Ikke importer dette
bilaget
down property no Ned
-download property no Last ned
-download table to your browser property no Last ned tabell til din
nettleser
+download common no Last ned
+download table to your browser common no Last ned tabell til din
nettleser
do you really want to change the status to %1 property no Vil du
virkelig endre status til %1
do you really want to delete this entry property no Vil du
virkelig slette denne posten
do you really want to update the categories property no vil du
virkelig oppdatere kategoriene
@@ -735,8 +735,8 @@
entrance has been edited property no inngang er rettet
entrance has been saved property no inngang er lagret
entrance id property no inngang ID
-entry date property no Registrert dato
-entry_date property no Registrert dato
+entry date common no Registrert dato
+entry_date common no Registrert dato
equipment property no Utstyr
equipment %1 has been edited property no utstyr %1 er rettet
equipment %1 has been saved property no utstyr %1 er lagret
@@ -1563,6 +1563,7 @@
shared use property no Delt bruk
shift down property no Skift ned
shift up property no Skift opp
+show all entities common no Vis alle poster
show calculated cost property no Vis sum
show calculated cost on the printview property no Vis sum på
utskrift
show details property no Vis detaljer
| [Prev in Thread] | Current Thread | [Next in Thread] |