[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property templates/base/attributes_form.xsl tem...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property templates/base/attributes_form.xsl tem... |
|
Date: |
Mon, 06 Feb 2006 22:47:38 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Branch:
Changes by: Sigurd Nes <address@hidden> 06/02/06 22:47:38
Modified files:
templates/base : attributes_form.xsl attributes_view.xsl
entity.xsl
templates/default: attributes_form.xsl attributes_view.xsl
entity.xsl
inc : class.boentity.inc.php class.historylog.inc.php
class.soentity.inc.php class.uientity.inc.php
Log message:
no message
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/templates/base/attributes_form.xsl.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/templates/base/attributes_view.xsl.diff?tr1=1.1&tr2=1.2&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/templates/base/entity.xsl.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/templates/default/attributes_form.xsl.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/templates/default/attributes_view.xsl.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/templates/default/entity.xsl.diff?tr1=1.7&tr2=1.8&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.boentity.inc.php.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.historylog.inc.php.diff?tr1=1.9&tr2=1.10&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.soentity.inc.php.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgroupware/property/inc/class.uientity.inc.php.diff?tr1=1.18&tr2=1.19&r1=text&r2=text
Patches:
Index: property/inc/class.boentity.inc.php
diff -u property/inc/class.boentity.inc.php:1.17
property/inc/class.boentity.inc.php:1.18
--- property/inc/class.boentity.inc.php:1.17 Mon Feb 6 10:28:36 2006
+++ property/inc/class.boentity.inc.php Mon Feb 6 22:47:37 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage entity
- * @version $Id: class.boentity.inc.php,v 1.17 2006/02/06 10:28:36
sigurdne Exp $
+ * @version $Id: class.boentity.inc.php,v 1.18 2006/02/06 22:47:37
sigurdne Exp $
*/
/**
@@ -542,29 +542,29 @@
if (is_array($values_attribute))
{
- for ($i=0;$i<count($values_attribute);$i++)
- {
- if($values_attribute[$i]['datatype']=='CH' &&
$values_attribute[$i]['value'])
- {
- $values_attribute[$i]['value'] =
serialize($values_attribute[$i]['value']);
- }
- if($values_attribute[$i]['datatype']=='R' &&
$values_attribute[$i]['value'])
+ for ($i=0;$i<count($values_attribute);$i++)
{
- $values_attribute[$i]['value'] =
$values_attribute[$i]['value'][0];
- }
+
if($values_attribute[$i]['datatype']=='CH' && $values_attribute[$i]['value'])
+ {
+ $values_attribute[$i]['value']
= serialize($values_attribute[$i]['value']);
+ }
+
if($values_attribute[$i]['datatype']=='R' && $values_attribute[$i]['value'])
+ {
+ $values_attribute[$i]['value']
= $values_attribute[$i]['value'][0];
+ }
- if($values_attribute[$i]['datatype']=='N' &&
$values_attribute[$i]['value'])
- {
- $values_attribute[$i]['value'] =
str_replace(",",".",$values_attribute[$i]['value']);
- }
+
if($values_attribute[$i]['datatype']=='N' && $values_attribute[$i]['value'])
+ {
+ $values_attribute[$i]['value']
= str_replace(",",".",$values_attribute[$i]['value']);
+ }
- if($values_attribute[$i]['datatype']=='D' &&
$values_attribute[$i]['value'])
- {
+
if($values_attribute[$i]['datatype']=='D' && $values_attribute[$i]['value'])
+ {
- $values_attribute[$i]['value'] =
date($this->bocommon->dateformat,$this->bocommon->date_to_timestamp($values_attribute[$i]['value']));
+ $values_attribute[$i]['value']
=
date($this->bocommon->dateformat,$this->bocommon->date_to_timestamp($values_attribute[$i]['value']));
+ }
}
}
- }
if ($action=='edit')
{
@@ -633,22 +633,22 @@
return $this->so->generate_id($data);
}
}
-
+
function read_attrib_history($data)
{
// _debug_array($data);
$historylog =
CreateObject($this->currentapp.'.historylog','entity_' . $data['entity_id']
.'_' . $data['cat_id']);
$history_values =
$historylog->return_array(array(),array('SO'),'history_timestamp','ASC',$data['id'],$data['attrib_id']);
- $this->total_records = count($history_values);
+ $this->total_records = count($history_values);
// _debug_array($history_values);
return $history_values;
}
-
+
function delete_history_item($data)
{
$historylog =
CreateObject($this->currentapp.'.historylog','entity_' . $data['entity_id']
.'_' . $data['cat_id']);
$historylog->delete_single_record($data['history_id']);
}
-
+
}
?>
Index: property/inc/class.historylog.inc.php
diff -u property/inc/class.historylog.inc.php:1.9
property/inc/class.historylog.inc.php:1.10
--- property/inc/class.historylog.inc.php:1.9 Sun Feb 5 20:07:35 2006
+++ property/inc/class.historylog.inc.php Mon Feb 6 22:47:38 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage core
- * @version $Id: class.historylog.inc.php,v 1.9 2006/02/05 20:07:35
sigurdne Exp $
+ * @version $Id: class.historylog.inc.php,v 1.10 2006/02/06 22:47:38
sigurdne Exp $
*/
/**
@@ -94,7 +94,7 @@
}
- function add($status,$record_id,$new_value,$old_value
='',$attrib_id='')
+ function add($status,$record_id,$new_value,$old_value
='',$attrib_id='', $date='')
{
if($attrib_id)
{
@@ -102,11 +102,20 @@
$attrib_id_value = ",$attrib_id";
}
+ if($date)
+ {
+ $timestamp = $this->db->to_timestamp($date);
+ }
+ else
+ {
+ $timestamp = $this->db->to_timestamp(time());
+ }
+
$this->db->query("insert into $this->table
(history_record_id,"
.
"history_appname,history_owner,history_status,history_new_value,history_timestamp
$attrib_id_field) "
. "values ('$record_id','" . $this->appname .
"','"
. $GLOBALS['phpgw_info']['user']['account_id']
. "','$status','"
- . $this->db->db_addslashes($new_value) . "','"
. $this->db->to_timestamp(time())
+ . $this->db->db_addslashes($new_value) . "','"
. $timestamp
. "' $attrib_id_value )",__LINE__,__FILE__);
}
Index: property/inc/class.soentity.inc.php
diff -u property/inc/class.soentity.inc.php:1.15
property/inc/class.soentity.inc.php:1.16
--- property/inc/class.soentity.inc.php:1.15 Mon Feb 6 10:28:36 2006
+++ property/inc/class.soentity.inc.php Mon Feb 6 22:47:38 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage entity
- * @version $Id: class.soentity.inc.php,v 1.15 2006/02/06 10:28:36
sigurdne Exp $
+ * @version $Id: class.soentity.inc.php,v 1.16 2006/02/06 22:47:38
sigurdne Exp $
*/
/**
@@ -554,7 +554,7 @@
if($entry['history'] == 1)
{
$history_set[$entry['attrib_id']] = $entry['value'];
- }
+ }
}
}
}
@@ -651,17 +651,18 @@
{
$value_set[$entry['name']]
= $entry['value'];
}
-
+
if($entry['history'] == 1)
- {
+ {
$this->db->query("select " .
$entry['name'] . " from $table WHERE id=" . $values['id'],__LINE__,__FILE__);
$this->db->next_record();
$old_value =
$this->db->f($entry['name']);
if($entry['value'] !=
$old_value)
{
-
$history_set[$entry['attrib_id']] = $entry['value'];
+
$history_set[$entry['attrib_id']] = array('value' => $entry['value'],
+
'date' => $this->bocommon->date_to_timestamp($entry['date']));
}
- }
+ }
}
}
@@ -675,9 +676,9 @@
if (isset($history_set) AND is_array($history_set))
{
$historylog =
CreateObject($this->currentapp.'.historylog','entity_' . $entity_id .'_' .
$cat_id);
- while (list($attrib_id,$new_value) =
each($history_set))
+ while (list($attrib_id,$history) =
each($history_set))
{
-
$historylog->add('SO',$values['id'],$new_value,False, $attrib_id);
+
$historylog->add('SO',$values['id'],$history['value'],False,
$attrib_id,$history['date']);
}
}
Index: property/inc/class.uientity.inc.php
diff -u property/inc/class.uientity.inc.php:1.18
property/inc/class.uientity.inc.php:1.19
--- property/inc/class.uientity.inc.php:1.18 Sun Feb 5 20:07:35 2006
+++ property/inc/class.uientity.inc.php Mon Feb 6 22:47:38 2006
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage entity
- * @version $Id: class.uientity.inc.php,v 1.18 2006/02/05 20:07:35
sigurdne Exp $
+ * @version $Id: class.uientity.inc.php,v 1.19 2006/02/06 22:47:38
sigurdne Exp $
*/
/**
@@ -901,9 +901,10 @@
'entity_id' =>
$this->entity_id,
'cat_id' =>
$this->cat_id,
'attrib_id' =>
$values['attributes'][$i]['attrib_id'],
- 'id' => $id
+ 'id' => $id,
+ 'edit' => True
);
-
+
$values['attributes'][$i]['link_history']=$GLOBALS['phpgw']->link('/index.php',$link_history_data);
}
}
@@ -965,9 +966,11 @@
'error_flag'
=> $error_id,
'lang_done_statustext' =>
lang('Back to the list'),
'lang_save_statustext' =>
lang('Save the entity'),
- 'lang_history' =>
lang('history'),
- 'lang_history_help' =>
lang('history of this attribute'),
- 'overlib_source' =>
'./'.$this->currentapp.'/inc/overlib.js',
+ 'lang_history'
=> lang('history'),
+ 'lang_history_help'
=> lang('history of this attribute'),
+ 'overlib_source'
=> './'.$this->currentapp.'/inc/overlib.js',
+ 'lang_history_date_statustext' => lang('Enter
the date for this reading'),
+ 'lang_date'
=> lang('date'),
);
$appname = $entity['name'];
@@ -1155,6 +1158,24 @@
}
}
+
+ for ($i=0;$i<count($attributes_values);$i++)
+ {
+ if($attributes_values[$i]['history']==1)
+ {
+ $link_history_data = array
+ (
+ 'menuaction' =>
$this->currentapp.'.uientity.attrib_history',
+ 'entity_id' =>
$this->entity_id,
+ 'cat_id' =>
$this->cat_id,
+ 'attrib_id' =>
$values['attributes'][$i]['attrib_id'],
+ 'id' => $id
+ );
+
+
$attributes_values[$i]['link_history']=$GLOBALS['phpgw']->link('/index.php',$link_history_data);
+ }
+ }
+
$data = array
(
'link_view_file'
=> $GLOBALS['phpgw']->link('/index.php',$link_file_data),
@@ -1192,7 +1213,13 @@
'error_flag'
=> $error_id,
'lang_done_statustext'
=> lang('Back to the list'),
'lang_save_statustext'
=> lang('Edit the entity'),
- 'status_list'
=> $this->bo->select_status_list('select',$values['status'])
+ 'status_list'
=> $this->bo->select_status_list('select',$values['status']),
+
+ 'lang_history'
=> lang('history'),
+ 'lang_history_help'
=> lang('history of this attribute'),
+ 'overlib_source'
=> './'.$this->currentapp.'/inc/overlib.js',
+ 'lang_history_date_statustext' => lang('Enter
the date for this reading'),
+
);
@@ -1201,31 +1228,29 @@
// $GLOBALS['phpgw']->xslttpl->pp();
}
- function attrib_history()
- {
-
$GLOBALS['phpgw']->xslttpl->add_file(array('entity','nextmatchs'));
+ function attrib_history()
+ {
$GLOBALS['phpgw']->xslttpl->add_file(array('entity','nextmatchs'));
$GLOBALS['phpgw_info']['flags']['noframework'] = True;
-
$data_lookup= array(
- 'id' =>
get_var('id',array('POST','GET')),
- 'entity_id' =>
get_var('entity_id',array('POST','GET')),
+ 'id' =>
get_var('id',array('POST','GET')),
+ 'entity_id' =>
get_var('entity_id',array('POST','GET')),
'cat_id' =>
get_var('cat_id',array('POST','GET')),
'attrib_id' =>
get_var('attrib_id',array('POST','GET'))
);
-
+
$delete = get_var('delete',array('POST','GET'));
+ $edit = get_var('edit',array('POST','GET'));
if ($delete)
{
$data_lookup['history_id'] =
get_var('history_id',array('POST','GET'));
$this->bo->delete_history_item($data_lookup);
}
-
- $values = $this->bo->read_attrib_history($data_lookup);
+
+ $values = $this->bo->read_attrib_history($data_lookup);
$dateformat =
$GLOBALS['phpgw_info']['user']['preferences']['common']['dateformat'];
while (is_array($values) && list(,$entry) =
each($values))
{
-
$link_delete_history_data = array
(
'menuaction' =>
$this->currentapp.'.uientity.attrib_history',
@@ -1236,28 +1261,34 @@
'history_id' => $entry['id'],
'delete' => true
);
-
-
+ if($edit)
+ {
+ $text_delete = lang('delete');
+ $link_delete =
$GLOBALS['phpgw']->link('/index.php',$link_delete_history_data);
+ }
+
$content[] = array
(
'id' =>
$entry['id'],
'value' =>
$entry['new_value'],
- 'time_created' =>
$GLOBALS['phpgw']->common->show_date($tickets[$i]['entry_date'],$dateformat),
- 'link_delete' =>
$GLOBALS['phpgw']->link('/index.php',$link_delete_history_data),
+ 'user' =>
$entry['owner'],
+ 'time_created' =>
$GLOBALS['phpgw']->common->show_date($entry['datetime'],$dateformat),
+ 'link_delete' =>
$link_delete,
'lang_delete_statustext' =>
lang('delete the item'),
- 'text_delete' =>
lang('delete'),
+ 'text_delete' =>
$text_delete,
);
}
-
-
+
+
$table_header = array
(
'lang_value' => lang('value'),
+ 'lang_user' => lang('user'),
'lang_time_created' => lang('time created'),
'lang_delete' => lang('delete')
);
- $data = array
+ $data = array
(
'allow_allrows' => false,
'start_record' => $this->start,
@@ -1269,16 +1300,11 @@
'values' => $content,
'table_header' =>
$table_header,
-
- );
-
+ );
//_debug_array($data);
-
- $appname =
lang('entity');
- $function_msg =
lang('attribute history');
-
- $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
-
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('attrib_history' => $data));
+ $appname =
lang('entity');
+ $function_msg =
lang('attribute history');
+ $GLOBALS['phpgw_info']['flags']['app_header'] =
lang($this->currentapp) . ' - ' . $appname . ': ' . $function_msg;
$GLOBALS['phpgw']->xslttpl->set_var('phpgw',array('attrib_history' => $data));
}
}
?>
Index: property/templates/base/attributes_form.xsl
diff -u property/templates/base/attributes_form.xsl:1.2
property/templates/base/attributes_form.xsl:1.3
--- property/templates/base/attributes_form.xsl:1.2 Sun Feb 5 20:07:35 2006
+++ property/templates/base/attributes_form.xsl Mon Feb 6 22:47:37 2006
@@ -1,4 +1,4 @@
-<!-- $Id: attributes_form.xsl,v 1.2 2006/02/05 20:07:35 sigurdne Exp $ -->
+<!-- $Id: attributes_form.xsl,v 1.3 2006/02/06 22:47:37 sigurdne Exp $ -->
<xsl:template name="attributes_form">
<xsl:apply-templates select="attributes_values"/>
@@ -128,6 +128,14 @@
</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" onMouseout="window.status='';return true;" >
+
<xsl:attribute name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+
<xsl:value-of select="//lang_history_date_statustext"/>
+
<xsl:text>';return true;</xsl:text>
+
</xsl:attribute>
+ </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>
@@ -136,7 +144,6 @@
onMouseOut="nd()">
<xsl:value-of select="//lang_history"/></a>
- <!--<a
href="{link_history}" target = '_blank'><xsl:value-of
select="//lang_history"/></a>-->
</xsl:when>
</xsl:choose>
</xsl:when>
Index: property/templates/base/attributes_view.xsl
diff -u property/templates/base/attributes_view.xsl:1.1
property/templates/base/attributes_view.xsl:1.2
--- property/templates/base/attributes_view.xsl:1.1 Mon Jan 17 10:03:18 2005
+++ property/templates/base/attributes_view.xsl Mon Feb 6 22:47:37 2006
@@ -1,4 +1,4 @@
-<!-- $Id: attributes_view.xsl,v 1.1 2005/01/17 10:03:18 sigurdne Exp $ -->
+<!-- $Id: attributes_view.xsl,v 1.2 2006/02/06 22:47:37 sigurdne Exp $ -->
<xsl:template match="attributes_view">
<xsl:variable name="lang_attribute_statustext"><xsl:value-of
select="lang_attribute_statustext"/></xsl:variable>
@@ -114,6 +114,19 @@
</input>
</xsl:otherwise>
</xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="history=1">
+
<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}','','width=550,height=400,scrollbars')"
+
onMouseOver="overlib('{$lang_history_help}', CAPTION, '{$lang_history}')"
+
onMouseOut="nd()">
+
<xsl:value-of select="//lang_history"/></a>
+
+ </xsl:when>
+ </xsl:choose>
+
</xsl:when>
</xsl:choose>
</td>
Index: property/templates/base/entity.xsl
diff -u property/templates/base/entity.xsl:1.5
property/templates/base/entity.xsl:1.6
--- property/templates/base/entity.xsl:1.5 Sun Feb 5 20:07:35 2006
+++ property/templates/base/entity.xsl Mon Feb 6 22:47:37 2006
@@ -1,4 +1,4 @@
-<!-- $Id: entity.xsl,v 1.5 2006/02/05 20:07:35 sigurdne Exp $ -->
+<!-- $Id: entity.xsl,v 1.6 2006/02/06 22:47:37 sigurdne Exp $ -->
<xsl:template name="app_data">
<xsl:choose>
@@ -498,9 +498,11 @@
<!-- view -->
<xsl:template match="view">
+ <div id="overDiv" style="position:absolute;
visibility:hide;z-index:1;"></div>
+ <xsl:variable name="overlib_source"><xsl:value-of
select="overlib_source"/></xsl:variable>
+ <SCRIPT LANGUAGE="JavaScript" SRC="{$overlib_source}"></SCRIPT>
- <div align="left">
-
+ <div align="left">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
<xsl:for-each select="value_origin" >
<xsl:variable name="link_origin_type"><xsl:value-of
select="link"/></xsl:variable>
@@ -711,6 +713,9 @@
<a href="{$sort_time_created}"
class="th_text"><xsl:value-of select="lang_time_created"/></a>
</td>
<td width="5%" align="center">
+ <xsl:value-of select="lang_user"/>
+ </td>
+ <td width="5%" align="center">
<xsl:value-of select="lang_delete"/>
</td>
</tr>
@@ -739,6 +744,9 @@
<td align="left">
<xsl:value-of select="time_created"/>
</td>
+ <td align="left">
+ <xsl:value-of select="user"/>
+ </td>
<td align="center">
<xsl:variable
name="link_delete"><xsl:value-of select="link_delete"/></xsl:variable>
<a href="{$link_delete}"
onMouseover="window.status='{$lang_delete_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_delete"/></a>
Index: property/templates/default/attributes_form.xsl
diff -u property/templates/default/attributes_form.xsl:1.5
property/templates/default/attributes_form.xsl:1.6
--- property/templates/default/attributes_form.xsl:1.5 Sun Feb 5 20:07:35 2006
+++ property/templates/default/attributes_form.xsl Mon Feb 6 22:47:37 2006
@@ -1,4 +1,4 @@
-<!-- $Id: attributes_form.xsl,v 1.5 2006/02/05 20:07:35 sigurdne Exp $ -->
+<!-- $Id: attributes_form.xsl,v 1.6 2006/02/06 22:47:37 sigurdne Exp $ -->
<xsl:template name="attributes_form">
<xsl:apply-templates select="attributes_values"/>
@@ -128,6 +128,14 @@
</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" onMouseout="window.status='';return true;" >
+
<xsl:attribute name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+
<xsl:value-of select="//lang_history_date_statustext"/>
+
<xsl:text>';return true;</xsl:text>
+
</xsl:attribute>
+ </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>
@@ -136,7 +144,6 @@
onMouseOut="nd()">
<xsl:value-of select="//lang_history"/></a>
- <!--<a
href="{link_history}" target = '_blank'><xsl:value-of
select="//lang_history"/></a>-->
</xsl:when>
</xsl:choose>
</xsl:when>
Index: property/templates/default/attributes_view.xsl
diff -u property/templates/default/attributes_view.xsl:1.3
property/templates/default/attributes_view.xsl:1.4
--- property/templates/default/attributes_view.xsl:1.3 Thu Jan 13 16:52:48 2005
+++ property/templates/default/attributes_view.xsl Mon Feb 6 22:47:37 2006
@@ -1,4 +1,4 @@
-<!-- $Id: attributes_view.xsl,v 1.3 2005/01/13 16:52:48 ceb Exp $ -->
+<!-- $Id: attributes_view.xsl,v 1.4 2006/02/06 22:47:37 sigurdne Exp $ -->
<xsl:template match="attributes_view">
<xsl:variable name="lang_attribute_statustext"><xsl:value-of
select="lang_attribute_statustext"/></xsl:variable>
@@ -114,6 +114,19 @@
</input>
</xsl:otherwise>
</xsl:choose>
+ <xsl:choose>
+ <xsl:when
test="history=1">
+
<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}','','width=550,height=400,scrollbars')"
+
onMouseOver="overlib('{$lang_history_help}', CAPTION, '{$lang_history}')"
+
onMouseOut="nd()">
+
<xsl:value-of select="//lang_history"/></a>
+
+ </xsl:when>
+ </xsl:choose>
+
</xsl:when>
</xsl:choose>
</td>
Index: property/templates/default/entity.xsl
diff -u property/templates/default/entity.xsl:1.7
property/templates/default/entity.xsl:1.8
--- property/templates/default/entity.xsl:1.7 Sun Feb 5 20:07:35 2006
+++ property/templates/default/entity.xsl Mon Feb 6 22:47:37 2006
@@ -1,4 +1,4 @@
-<!-- $Id: entity.xsl,v 1.7 2006/02/05 20:07:35 sigurdne Exp $ -->
+<!-- $Id: entity.xsl,v 1.8 2006/02/06 22:47:37 sigurdne Exp $ -->
<xsl:template name="app_data">
<xsl:choose>
@@ -498,9 +498,11 @@
<!-- view -->
<xsl:template match="view">
+ <div id="overDiv" style="position:absolute;
visibility:hide;z-index:1;"></div>
+ <xsl:variable name="overlib_source"><xsl:value-of
select="overlib_source"/></xsl:variable>
+ <SCRIPT LANGUAGE="JavaScript" SRC="{$overlib_source}"></SCRIPT>
- <div align="left">
-
+ <div align="left">
<table cellpadding="2" cellspacing="2" width="80%"
align="center">
<xsl:for-each select="value_origin" >
<xsl:variable name="link_origin_type"><xsl:value-of
select="link"/></xsl:variable>
@@ -711,6 +713,9 @@
<a href="{$sort_time_created}"
class="th_text"><xsl:value-of select="lang_time_created"/></a>
</td>
<td width="5%" align="center">
+ <xsl:value-of select="lang_user"/>
+ </td>
+ <td width="5%" align="center">
<xsl:value-of select="lang_delete"/>
</td>
</tr>
@@ -739,6 +744,9 @@
<td align="left">
<xsl:value-of select="time_created"/>
</td>
+ <td align="left">
+ <xsl:value-of select="user"/>
+ </td>
<td align="center">
<xsl:variable
name="link_delete"><xsl:value-of select="link_delete"/></xsl:variable>
<a href="{$link_delete}"
onMouseover="window.status='{$lang_delete_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="text_delete"/></a>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property templates/base/attributes_form.xsl tem...,
Sigurd Nes <=