[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [6969] Merge 6960:6968 from trunk
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [6969] Merge 6960:6968 from trunk |
|
Date: |
Fri, 11 Feb 2011 07:33:23 +0000 |
Revision: 6969
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=6969
Author: sigurdne
Date: 2011-02-11 07:33:23 +0000 (Fri, 11 Feb 2011)
Log Message:
-----------
Merge 6960:6968 from trunk
Modified Paths:
--------------
branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
branches/Version-1_0-branch/property/inc/class.botts.inc.php
branches/Version-1_0-branch/property/inc/class.fileuploader.inc.php
branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
branches/Version-1_0-branch/property/inc/class.uitts.inc.php
branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
branches/Version-1_0-branch/property/js/yahoo/entity.edit.js
branches/Version-1_0-branch/property/js/yahoo/tts.view.js
branches/Version-1_0-branch/property/setup/phpgw_no.lang
branches/Version-1_0-branch/property/templates/base/tts.xsl
branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
Added Paths:
-----------
branches/Version-1_0-branch/property/templates/portico/images/TestImageNoText_65x29.png
Property Changed:
----------------
branches/Version-1_0-branch/
Property changes on: branches/Version-1_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959
+
/trunk:6439-6441,6443,6445-6447,6449-6464,6466-6468,6470-6474,6476-6477,6479-6480,6483-6488,6490-6491,6493-6494,6496-6501,6503-6504,6506,6508,6510-6511,6513,6515-6516,6518,6520-6524,6526-6528,6533-6534,6536-6541,6543-6565,6567,6569,6571-6576,6578,6580-6586,6588-6596,6598-6600,6602-6604,6606-6607,6609-6611,6613-6625,6629-6639,6641-6643,6645-6646,6648,6650-6654,6656-6659,6661-6663,6665-6666,6668-6669,6672-6673,6675,6677-6678,6680,6682-6686,6688-6717,6719,6721-6722,6724-6728,6730,6732-6734,6736-6739,6741,6743,6745-6746,6748-6756,6758-6762,6764,6766-6788,6790,6792-6798,6800-6814,6816-6819,6821-6822,6824-6826,6828-6837,6839,6841,6843-6849,6851,6853-6869,6871-6874,6876-6877,6879,6881,6883,6885-6886,6888-6893,6895-6897,6899-6901,6903,6905-6907,6909,6911-6929,6931-6936,6938-6947,6949,6951,6953,6955-6956,6958-6959,6961-6968
Modified: branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
2011-02-10 20:15:42 UTC (rev 6968)
+++ branches/Version-1_0-branch/property/inc/class.bolocation.inc.php
2011-02-11 07:33:23 UTC (rev 6969)
@@ -675,38 +675,6 @@
$location['responsible_contact_id'] =
$responsible_item['contact_id'];
}
- $this->uicols['name'][] =
'responsible_contact';
- $this->uicols['descr'][] =
lang('responsible');
- $this->uicols['sortable'][] = false;
- $this->uicols['sort_field'][] = '';
- $this->uicols['format'][] = '';
- $this->uicols['formatter'][] = '';
- $this->uicols['input_type'][] = '';
-
- $this->uicols['name'][] =
'responsible_contact_id';
- $this->uicols['descr'][] = 'dummy';
- $this->uicols['sortable'][] = false;
- $this->uicols['sort_field'][] = '';
- $this->uicols['format'][] = '';
- $this->uicols['formatter'][] = '';
- $this->uicols['input_type'][] = 'hidden';
-
- $this->uicols['name'][] =
'responsible_item';
- $this->uicols['descr'][] = 'dummy';
- $this->uicols['sortable'][] = false;
- $this->uicols['sort_field'][] = '';
- $this->uicols['format'][] = '';
- $this->uicols['formatter'][] = '';
- $this->uicols['input_type'][] = 'hidden';
-
- $this->uicols['name'][] = 'select';
- $this->uicols['descr'][] =
lang('select');
- $this->uicols['sortable'][] = false;
- $this->uicols['sort_field'][] = '';
- $this->uicols['format'][] = '';
- $this->uicols['formatter'][] = 'myFormatterCheck';
- $this->uicols['input_type'][] = '';
-
//_debug_array($locations);
return $locations;
Modified: branches/Version-1_0-branch/property/inc/class.botts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.botts.inc.php
2011-02-10 20:15:42 UTC (rev 6968)
+++ branches/Version-1_0-branch/property/inc/class.botts.inc.php
2011-02-11 07:33:23 UTC (rev 6969)
@@ -54,11 +54,12 @@
public $sum_actual_cost = 0;
var $public_functions = array
- (
- 'read' => true,
- 'read_single' => true,
- 'save' => true,
- );
+ (
+ 'read' => true,
+ 'read_single' => true,
+ 'save' => true,
+ 'addfiles' => true,
+ );
function property_botts($session=false)
{
@@ -1131,4 +1132,41 @@
array_unshift($values,$default_value);
return $values;
}
+
+ public function addfiles()
+ {
+ $GLOBALS['phpgw_info']['flags']['xslt_app'] = false;
+ $GLOBALS['phpgw_info']['flags']['noframework'] = true;
+ $GLOBALS['phpgw_info']['flags']['nofooter'] = true;
+
+ $acl = & $GLOBALS['phpgw']->acl;
+ $acl_add = $acl->check('.ticket',
PHPGW_ACL_ADD, 'property');
+ $acl_edit = $acl->check('.ticket',
PHPGW_ACL_EDIT, 'property');
+ $id = phpgw::get_var('id',
'int');
+ $fileuploader = CreateObject('property.fileuploader');
+
+ if(!$acl_add && !$acl_edit)
+ {
+ $GLOBALS['phpgw']->common->phpgw_exit();
+ }
+
+ if(!$id)
+ {
+ $GLOBALS['phpgw']->common->phpgw_exit();
+ }
+
+ $test = false;//true;
+ if ($test)
+ {
+ foreach ($_FILES as $fieldName => $file)
+ {
+ move_uploaded_file($file['tmp_name'],
"{$GLOBALS['phpgw_info']['server']['temp_dir']}/" .
strip_tags(basename($file['name'])));
+ }
+ $GLOBALS['phpgw']->common->phpgw_exit();
+ }
+
+ $bofiles = CreateObject('property.bofiles');
+
+ $fileuploader->upload($bofiles,
"{$bofiles->fakebase}/fmticket/{$id}");
+ }
}
Modified: branches/Version-1_0-branch/property/inc/class.fileuploader.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.fileuploader.inc.php
2011-02-10 20:15:42 UTC (rev 6968)
+++ branches/Version-1_0-branch/property/inc/class.fileuploader.inc.php
2011-02-11 07:33:23 UTC (rev 6969)
@@ -72,6 +72,7 @@
$js_code = self::get_js($oArgs);
$title = lang('fileuploader');
+ $lang_cancel = lang('cancel');
$html = <<<HTML
<!DOCTYPE html>
<html>
@@ -97,7 +98,7 @@
<div id="divStatus">0 Files
Uploaded</div>
<div>
<span
id="spanButtonPlaceHolder"></span>
- <input
id="btnCancel" type="button" value="Cancel All Uploads"
onclick="swfu.cancelQueue();" disabled="disabled" style="margin-left: 2px;
font-size: 8pt; height: 29px;" />
+ <input
id="btnCancel" type="button" value="{$lang_cancel}"
onclick="swfu.cancelQueue();" disabled="disabled" style="margin-left: 2px;
font-size: 8pt; height: 29px;" />
</div>
</form>
</div>
@@ -110,13 +111,14 @@
static function get_js($oArgs = '')
{
- $button_text = lang('Select Files');
+ $button_text = lang('Select');
$str_base_url = 'http';
$str_base_url .= phpgw::get_var('HTTPS', 'bool',
'SERVER') ? 's' : '' ;
$str_base_url .= '://';
$str_base_url .= phpgw::get_var('HTTP_HOST', 'string',
'SERVER');
$str_base_url .= $GLOBALS['phpgw']->link('/', array(),
true);
+ $image_url =
$GLOBALS['phpgw']->common->image('property', 'TestImageNoText_65x29');
$js_code = <<<JS
<script type="text/javascript">
var swfu;
@@ -142,7 +144,7 @@
debug: false,
// Button settings
- button_image_url:
"images/TestImageNoText_65x29.png",
+ button_image_url: "{$image_url}",
button_width: "65",
button_height: "29",
button_placeholder_id: "spanButtonPlaceHolder",
Modified: branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
2011-02-10 20:15:42 UTC (rev 6968)
+++ branches/Version-1_0-branch/property/inc/class.uilocation.inc.php
2011-02-11 07:33:23 UTC (rev 6969)
@@ -1347,6 +1347,39 @@
$uicols = $this->bo->uicols;
+ $uicols['name'][] =
'responsible_contact';
+ $uicols['descr'][] = lang('responsible');
+ $uicols['sortable'][] = false;
+ $uicols['sort_field'][] = '';
+ $uicols['format'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['input_type'][] = '';
+
+ $uicols['name'][] =
'responsible_contact_id';
+ $uicols['descr'][] = 'dummy';
+ $uicols['sortable'][] = false;
+ $uicols['sort_field'][] = '';
+ $uicols['format'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['input_type'][] = 'hidden';
+
+ $uicols['name'][] =
'responsible_item';
+ $uicols['descr'][] = 'dummy';
+ $uicols['sortable'][] = false;
+ $uicols['sort_field'][] = '';
+ $uicols['format'][] = '';
+ $uicols['formatter'][] = '';
+ $uicols['input_type'][] = 'hidden';
+
+ $uicols['name'][] = 'select';
+ $uicols['descr'][] = lang('select');
+ $uicols['sortable'][] = false;
+ $uicols['sort_field'][] = '';
+ $uicols['format'][] = '';
+ $uicols['formatter'][] = $this->acl_edit ?
'myFormatterCheck' : '';
+ $uicols['input_type'][] = '';
+
+
$content = array();
$j=0;
if (isset($location_list) && is_array($location_list))
Modified: branches/Version-1_0-branch/property/inc/class.uitts.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2011-02-10 20:15:42 UTC (rev 6968)
+++ branches/Version-1_0-branch/property/inc/class.uitts.inc.php
2011-02-11 07:33:23 UTC (rev 6969)
@@ -37,22 +37,22 @@
class property_uitts
{
var $public_functions = array
- (
- 'index' => true,
- 'index2' => true,
- 'view' => true,
- 'view2' => true,
- 'add' => true,
- 'add2' => true,
- 'delete' => true,
- 'download' => true,
- 'download2' => true,
- 'view_file' => true,
- 'edit_status' => true,
- 'get_vendor_email' => true,
- '_print' => true,
- 'columns' => true
- );
+ (
+ 'index' => true,
+ 'index2' => true,
+ 'view' => true,
+ 'view2' => true,
+ 'add' => true,
+ 'add2' => true,
+ 'delete' => true,
+ 'download' => true,
+ 'download2' => true,
+ 'view_file' => true,
+ 'edit_status' => true,
+ 'update_data' => true,
+ '_print' => true,
+ 'columns' => true
+ );
/**
* @var boolean $_simple use simplified interface
@@ -88,7 +88,6 @@
$this->acl_edit =
$this->acl->check($this->acl_location, PHPGW_ACL_EDIT, 'property');
$this->acl_delete =
$this->acl->check($this->acl_location, PHPGW_ACL_DELETE, 'property');
$this->acl_manage =
$this->acl->check($this->acl_location, PHPGW_ACL_PRIVATE, 'property'); // manage
- $this->bo->acl_location = $this->acl_location;
$this->start =
$this->bo->start;
$this->query =
$this->bo->query;
@@ -1422,6 +1421,7 @@
'start_date'
=>$start_date,
'end_date'
=>$end_date
)
+
)),
'lang_priority' =>
lang('Priority'),
@@ -2123,6 +2123,70 @@
// $GLOBALS['phpgw']->xslttpl->pp();
}
+
+ function update_data()
+ {
+ $action = phpgw::get_var('action', 'string', 'GET');
+ switch($action)
+ {
+ case 'get_vendor':
+ return $this->get_vendor_email();
+ break;
+ case 'get_files':
+ return $this->get_files();
+ break;
+ default:
+ }
+ }
+
+ function get_files()
+ {
+ $id = phpgw::get_var('id', 'int');
+
+ if( !$this->acl_read)
+ {
+ return;
+ }
+
+ $link_file_data = array
+ (
+ 'menuaction' => 'property.uitts.view_file',
+ 'id' => $id
+ );
+
+ $link_to_files =
isset($this->bo->config->config_data['files_url']) ?
$this->bo->config->config_data['files_url']:'';
+
+ $link_view_file =
$GLOBALS['phpgw']->link('/index.php',$link_file_data);
+ $values = $this->bo->read_single($id);
+
+ $content_files = array();
+
+ foreach($values['files'] as $_entry )
+ {
+ $content_files[] = array
+ (
+ 'file_name' => '<a
href="'.$link_view_file.'&file_name='.$_entry['name'].'" target="_blank"
title="'.lang('click to view file').'">'.$_entry['name'].'</a>',
+ 'delete_file' => '<input
type="checkbox" name="values[file_action][]" value="'.$_entry['name'].'"
title="'.lang('Check to delete file').'">',
+ 'attach_file' => '<input
type="checkbox" name="values[file_attach][]" value="'.$_entry['name'].'"
title="'.lang('Check to attach file').'">'
+ );
+ }
+
+ if( phpgw::get_var('phpgw_return_as') == 'json' )
+ {
+
+ if(count($content_files))
+ {
+ return json_encode($content_files);
+ }
+ else
+ {
+ return "";
+ }
+ }
+ return $content_files;
+ }
+
+
function get_vendor_email($vendor_id = 0)
{
if(!$vendor_id)
@@ -2560,7 +2624,7 @@
if($vendor_email)
{
- $subject = lang(workorder).":
{$ticket['order_id']}";
+ $subject = lang('workorder').":
{$ticket['order_id']}";
$organisation = '';
$contact_name = '';
@@ -2941,7 +3005,7 @@
'show_finnish_date'
=> $this->_show_finnish_date,
'tabs'
=> self::_generate_tabs(true),
'td_count'
=> '""',
- 'base_java_url'
=> "{menuaction:'property.uitts.get_vendor_email'}",
+ 'base_java_url'
=> "{menuaction:'property.uitts.update_data',id:{$id}}",
'property_js'
=>
json_encode($GLOBALS['phpgw_info']['server']['webserver_url']."/property/js/yahoo/property2.js"),
'datatable'
=> $datavalues,
'myColumnDefs'
=> $myColumnDefs,
@@ -3008,6 +3072,10 @@
'contact_phone'
=> $ticket['contact_phone'],
'pref_send_mail'
=>
isset($GLOBALS['phpgw_info']['user']['preferences']['property']['tts_user_mailnotification'])?$GLOBALS['phpgw_info']['user']['preferences']['property']['tts_user_mailnotification']:'',
'fileupload'
=>
isset($this->bo->config->config_data['fmttsfileupload'])?$this->bo->config->config_data['fmttsfileupload']:'',
+ 'multiple_uploader'
=> true,
+ 'fileuploader_action'
=> "{menuaction:'property.fileuploader.add',"
+
."upload_target:'property.botts.addfiles',"
+
."id:'{$id}'}",
'link_view_file'
=> $GLOBALS['phpgw']->link('/index.php',$link_file_data),
'link_to_files'
=>
isset($this->bo->config->config_data['files_url'])?$this->bo->config->config_data['files_url']:'',
'files'
=> isset($ticket['files'])?$ticket['files']:'',
Modified: branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
===================================================================
--- branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
2011-02-10 20:15:42 UTC (rev 6968)
+++ branches/Version-1_0-branch/property/inc/class.uiwo_hour.inc.php
2011-02-11 07:33:23 UTC (rev 6969)
@@ -1338,8 +1338,39 @@
'type' => 'view'));
+ $location_code =
isset($common_data['workorder']['location_code']) &&
$common_data['workorder']['location_code'] ?
$common_data['workorder']['location_code'] : $project['location_code'];
+ $location_code = explode('-',$location_code);
+
+
+ $gab_insert_level =
isset($this->config->config_data['gab_insert_level']) &&
$this->config->config_data['gab_insert_level'] ?
$this->config->config_data['gab_insert_level'] : 3;
+ $i = 1;
+ foreach($location_code as $_loc)
+ {
+ $loc[] = $_loc;
+ if($i == $gab_insert_level)
+ {
+ break;
+ }
+ $i++;
+ }
+ $location_code = implode('-', $loc);
+
+ $gabinfos = execMethod('property.sogab.read',
array('location_code' => $location_code, 'allrows' => true));
+ if($gabinfos != null && is_array($gabinfos) &&
count($gabinfos) == 1)
+ {
+ $gabinfo = array_shift($gabinfos);
+ $gab_id = $gabinfo['gab_id'];
+ }
+
+ $formatted_gab_id = '';
+ if(isset($gab_id))
+ {
+ $formatted_gab_id = substr($gab_id,4,5).' /
'.substr($gab_id,9,4).' / '.substr($gab_id,13,4).' / '.substr($gab_id,17,3);
+ }
+
$email_data = array
(
+ 'formatted_gab_id'
=> $formatted_gab_id,
'org_name'
=> isset($this->config->config_data['org_name']) ?
"{$this->config->config_data['org_name']}::" : '',
'location_data'
=> $location_data,
'lang_workorder'
=> lang('Workorder ID'),
Modified: branches/Version-1_0-branch/property/js/yahoo/entity.edit.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/entity.edit.js
2011-02-10 20:15:42 UTC (rev 6968)
+++ branches/Version-1_0-branch/property/js/yahoo/entity.edit.js
2011-02-11 07:33:23 UTC (rev 6969)
@@ -31,7 +31,7 @@
this.refresh_files = function()
{
- execute_async(myDataTable_0);
+ execute_async(myDataTable_2);
}
Modified: branches/Version-1_0-branch/property/js/yahoo/tts.view.js
===================================================================
--- branches/Version-1_0-branch/property/js/yahoo/tts.view.js 2011-02-10
20:15:42 UTC (rev 6968)
+++ branches/Version-1_0-branch/property/js/yahoo/tts.view.js 2011-02-11
07:33:23 UTC (rev 6969)
@@ -96,18 +96,19 @@
this.fetch_vendor_email=function()
{
-// formObject = document.body.getElementsByTagName('form');
-// YAHOO.util.Connect.setForm(formObject[0]);//First form
- if(document.getElementById('vendor_id').value)
- {
- base_java_url['vendor_id'] =
document.getElementById('vendor_id').value;
- }
-
- if(document.getElementById('vendor_id').value !=
vendor_id)
- {
- execute_async(myDataTable_3);
- vendor_id =
document.getElementById('vendor_id').value;
- }
+// formObject = document.body.getElementsByTagName('form');
+// YAHOO.util.Connect.setForm(formObject[0]);//First form
+ if(document.getElementById('vendor_id').value)
+ {
+ base_java_url['vendor_id'] =
document.getElementById('vendor_id').value;
+ }
+
+ if(document.getElementById('vendor_id').value != vendor_id)
+ {
+ base_java_url['action'] = 'get_vendor';
+ execute_async(myDataTable_3);
+ vendor_id = document.getElementById('vendor_id').value;
+ }
}
@@ -121,10 +122,47 @@
}
}
+ this.fileuploader = function()
+ {
+ var sUrl = phpGWLink('index.php', fileuploader_action);
+ var onDialogShow = function(e, args, o)
+ {
+ var frame = document.createElement('iframe');
+ frame.src = sUrl;
+ frame.width = "100%";
+ frame.height = "400";
+ o.setBody(frame);
+ };
+ lightbox.showEvent.subscribe(onDialogShow, lightbox);
+ lightbox.show();
+ }
+ this.refresh_files = function()
+ {
+ base_java_url['action'] = 'get_files';
+ execute_async(myDataTable_2);
+ }
YAHOO.util.Event.addListener(window, "load", function()
{
+ lightbox = new YAHOO.widget.Dialog("lightbox-placeholder",
+ {
+ width : "600px",
+ fixedcenter : true,
+ visible : false,
+ modal : false
+ //draggable: true,
+ //constraintoviewport : true
+ });
+
+ lightbox.render();
+
+ YAHOO.util.Dom.setStyle('lightbox-placeholder', 'display',
'block');
+});
+
+
+YAHOO.util.Event.addListener(window, "load", function()
+{
loader = new YAHOO.util.YUILoader();
loader.addModule({
name: "anyone",
Modified: branches/Version-1_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-02-10
20:15:42 UTC (rev 6968)
+++ branches/Version-1_0-branch/property/setup/phpgw_no.lang 2011-02-11
07:33:23 UTC (rev 6969)
@@ -1393,6 +1393,7 @@
select email property no velg e-post
select file to roll back property no velg fil for
tilbakerulling
select file to upload property no Velg fil for opplasting
+select files property no Velg filer
select grouping property no velg gruppering
select invoice type property no Velg Art
select key responsible property no velg nøkkelansvarlig
@@ -1718,6 +1719,7 @@
update the not active category for locations property no
Oppdater kategori til utgått for lokaliseringer
upload file property no Last opp fil
upload multiple files property no Last opp flere filer
+upload files property no Last opp filer
url property no URL
user property no Bruker
user contact info property no Bruker kontaktinfo
Modified: branches/Version-1_0-branch/property/templates/base/tts.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/tts.xsl 2011-02-10
20:15:42 UTC (rev 6968)
+++ branches/Version-1_0-branch/property/templates/base/tts.xsl 2011-02-11
07:33:23 UTC (rev 6969)
@@ -1082,6 +1082,9 @@
<xsl:choose>
<xsl:when test="fileupload = 1">
+ <script type="text/javascript">
+ var fileuploader_action =
<xsl:value-of select="fileuploader_action" />;
+ </script>
<xsl:call-template name="file_upload"/>
</xsl:when>
</xsl:choose>
@@ -1470,6 +1473,12 @@
<hr noshade="noshade" width="100%" align="center"
size="1"/>
+ <div id="lightbox-placeholder"
style="background-color:#000000;color:#FFFFFF;display:none">
+ <div class="hd"
style="background-color:#000000;color:#000000; border:0; text-align:center">
<xsl:value-of select="php:function('lang', 'fileuploader')" /> </div>
+ <div class="bd" style="text-align:center;"> </div>
+
+ </div>
+
<!-- DATATABLE DEFINITIONS-->
<script type="text/javascript">
var property_js = <xsl:value-of
select="property_js" />;
Modified: branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
===================================================================
--- branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
2011-02-10 20:15:42 UTC (rev 6968)
+++ branches/Version-1_0-branch/property/templates/base/wo_hour.xsl
2011-02-11 07:33:23 UTC (rev 6969)
@@ -693,8 +693,20 @@
</xsl:when>
</xsl:choose>
<xsl:call-template
name="location_view"/>
-
+
<xsl:choose>
+ <xsl:when
test="formatted_gab_id !=''">
+ <tr>
+
<td class="th_text" align="left">
+
Gnr/Bnr/Feste/Seksjon
+
</td>
+
<td align="left" colspan="2">
+
<xsl:value-of select="formatted_gab_id"/>
+
</td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+ <xsl:choose>
<xsl:when
test="contact_phone !=''">
<tr>
<td class="th_text" align="left">
Copied:
branches/Version-1_0-branch/property/templates/portico/images/TestImageNoText_65x29.png
(from rev 6968,
trunk/property/templates/portico/images/TestImageNoText_65x29.png)
===================================================================
(Binary files differ)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [6969] Merge 6960:6968 from trunk,
Sigurd Nes <=