[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.uiactor.inc.php inc/class.ui...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property inc/class.uiactor.inc.php inc/class.ui... |
|
Date: |
Wed, 14 Feb 2007 14:22:22 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 07/02/14 14:22:22
Modified files:
inc : class.uiactor.inc.php class.uientity.inc.php
templates/base : entity.xsl
Log message:
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uiactor.inc.php?cvsroot=phpgroupware&r1=1.30&r2=1.31
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.uientity.inc.php?cvsroot=phpgroupware&r1=1.40&r2=1.41
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/entity.xsl?cvsroot=phpgroupware&r1=1.13&r2=1.14
Patches:
Index: inc/class.uiactor.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uiactor.inc.php,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- inc/class.uiactor.inc.php 26 Jan 2007 14:53:47 -0000 1.30
+++ inc/class.uiactor.inc.php 14 Feb 2007 14:22:21 -0000 1.31
@@ -24,7 +24,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage admin
- * @version $Id: class.uiactor.inc.php,v 1.30 2007/01/26 14:53:47
sigurdne Exp $
+ * @version $Id: class.uiactor.inc.php,v 1.31 2007/02/14 14:22:21
sigurdne Exp $
*/
/**
@@ -193,8 +193,8 @@
$links = $this->menu->links($this->role);
- $receipt =
$GLOBALS['phpgw']->session->appsession('session_data',$this->role . '_receipt');
-
$GLOBALS['phpgw']->session->appsession('session_data',$this->role .
'_receipt','');
+ $receipt =
$GLOBALS['phpgw']->session->appsession('session_data','actor_receipt_' .
$this->role);
+
$GLOBALS['phpgw']->session->appsession('session_data','actor_receipt_' .
$this->role,'');
$list = $this->bo->read();
@@ -434,7 +434,7 @@
if ($values['save'])
{
-
$GLOBALS['phpgw']->session->appsession('session_data','actor_receipt',$receipt);
+
$GLOBALS['phpgw']->session->appsession('session_data','actor_receipt_' .
$this->role,$receipt);
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uiactor.index', 'role'=> $this->role));
}
}
Index: inc/class.uientity.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.uientity.inc.php,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- inc/class.uientity.inc.php 26 Jan 2007 14:53:47 -0000 1.40
+++ inc/class.uientity.inc.php 14 Feb 2007 14:22:22 -0000 1.41
@@ -24,7 +24,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.40 2007/01/26 14:53:47
sigurdne Exp $
+ * @version $Id: class.uientity.inc.php,v 1.41 2007/02/14 14:22:22
sigurdne Exp $
*/
/**
@@ -284,6 +284,9 @@
$links = $this->menu->links();
+ $receipt =
$GLOBALS['phpgw']->session->appsession('session_data','entity_receipt_' .
$this->entity_id . '_' . $this->cat_id);
+
$GLOBALS['phpgw']->session->appsession('session_data','entity_receipt_' .
$this->entity_id . '_' . $this->cat_id,'');
+
$start_date = urldecode($this->start_date);
$end_date = urldecode($this->end_date);
@@ -488,12 +491,15 @@
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
+ $msgbox_data = $this->bocommon->msgbox_data($receipt);
+
$data = array
(
'group_filters' =>
$GLOBALS['phpgw_info']['user']['preferences'][$this->currentapp]['group_filters'],
'lang_excel' =>
'excel',
'link_excel' =>
$GLOBALS['phpgw']->link('/index.php',$link_excel),
'lang_excel_help' =>
lang('Download table to MS Excel'),
+ 'msgbox_data' =>
$GLOBALS['phpgw']->common->msgbox($msgbox_data),
'lang_columns' =>
lang('columns'),
'link_columns' =>
$GLOBALS['phpgw']->link('/index.php',$link_columns),
@@ -684,8 +690,12 @@
$cat_list =
$this->bo->select_category_list('select',$this->cat_id);
}
+ if ($values['cancel'])
+ {
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uientity.index', 'entity_id'=> $this->entity_id, 'cat_id'=>
$this->cat_id));
+ }
- if ($values['save'])
+ if ($values['save'] || $values['apply'])
{
if(!$values['location'] &&
isset($category['location_level']) && $category['location_level'])
{
@@ -753,6 +763,11 @@
}
$this->bo->vfs->override_acl =
0;
}
+ if ($values['save'])
+ {
+
$GLOBALS['phpgw']->session->appsession('session_data','entity_receipt_' .
$this->entity_id . '_' . $this->cat_id,$receipt);
+
$GLOBALS['phpgw']->redirect_link('/index.php',array('menuaction'=>
$this->currentapp.'.uientity.index', 'entity_id'=> $this->entity_id, 'cat_id'=>
$this->cat_id));
+ }
}
else
{
@@ -980,6 +995,13 @@
$GLOBALS['phpgw']->js->validate_file('overlib','overlib',$this->currentapp);
$GLOBALS['phpgw']->js->validate_file('dateformat','dateformat',$this->currentapp);
+ $table_apply[] = array
+ (
+ 'lang_save'
=> lang('save'),
+ 'lang_cancel'
=> lang('cancel'),
+ 'lang_apply'
=> lang('apply'),
+ );
+
$data = array
(
'start_project'
=> $category['start_project'],
@@ -1028,8 +1050,6 @@
'lookup_type'
=> $lookup_type,
'form_action'
=> $GLOBALS['phpgw']->link('/index.php',$link_data),
'done_action'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uientity.index', 'entity_id'=> $this->entity_id, 'cat_id'=>
$this->cat_id)),
- 'lang_save'
=> lang('save'),
- 'lang_done'
=> lang('done'),
'lang_id'
=> lang('ID'),
'value_id'
=> $values['id'],
'value_num'
=> $values['num'],
@@ -1043,6 +1063,7 @@
'lang_date'
=> lang('date'),
'help_url'
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction'=>
$this->currentapp.'.uientity.attrib_help', 'entity_id'=> $this->entity_id,
'cat_id'=> $this->cat_id)),
'lang_help'
=> lang('help'),
+ 'table_apply'
=> $table_apply,
);
$appname = $entity['name'];
Index: templates/base/entity.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/entity.xsl,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- templates/base/entity.xsl 22 Dec 2006 15:02:12 -0000 1.13
+++ templates/base/entity.xsl 14 Feb 2007 14:22:22 -0000 1.14
@@ -1,4 +1,4 @@
-<!-- $Id: entity.xsl,v 1.13 2006/12/22 15:02:12 sigurdne Exp $ -->
+<!-- $Id: entity.xsl,v 1.14 2007/02/14 14:22:22 sigurdne Exp $ -->
<xsl:template name="app_data">
<xsl:choose>
@@ -25,6 +25,17 @@
<xsl:template match="list">
<xsl:call-template name="menu"/>
+ <xsl:choose>
+ <xsl:when test="msgbox_data != ''">
+ <table align = "center">
+ <tr>
+ <td align="center" colspan="3">
+ <xsl:call-template
name="msgbox"/>
+ </td>
+ </tr>
+ </table>
+ </xsl:when>
+ </xsl:choose>
<table width="100%" cellpadding="2" cellspacing="2"
align="center">
<tr>
<xsl:choose>
@@ -215,6 +226,14 @@
</tr>
</xsl:when>
</xsl:choose>
+ <xsl:variable name="form_action"><xsl:value-of
select="form_action"/></xsl:variable>
+ <form ENCTYPE="multipart/form-data" method="post"
name="form" action="{$form_action}">
+ <tr>
+ <td colspan = "2" align = "center">
+ <xsl:apply-templates
select="table_apply"/>
+ </td>
+ </tr>
+
<xsl:for-each select="origin_list" >
<xsl:variable name="link"><xsl:value-of
select="link"/>&id=<xsl:value-of select="id"/></xsl:variable>
<tr>
@@ -253,8 +272,6 @@
<xsl:value-of select="entity_name"/>
</td>
</tr>
- <xsl:variable name="form_action"><xsl:value-of
select="form_action"/></xsl:variable>
- <form ENCTYPE="multipart/form-data" method="post"
name="form" action="{$form_action}">
<tr>
<td class="th_text">
<xsl:value-of select="lang_category"/>
@@ -442,36 +459,11 @@
</td>
</tr>
<tr height="50">
- <td>
- <xsl:variable
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
- <input type="submit"
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return
true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
- <xsl:value-of
select="lang_save_statustext"/>
- <xsl:text>'; return
true;</xsl:text>
- </xsl:attribute>
- </input>
+ <td colspan="2" align = "center">
+ <xsl:apply-templates
select="table_apply"/>
</td>
</tr>
-
-
</form>
- <tr>
- <td>
- <xsl:variable
name="done_action"><xsl:value-of select="done_action"/></xsl:variable>
- <xsl:variable
name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
- <form method="post"
action="{$done_action}">
- <input type="submit"
name="done" value="{$lang_done}" onMouseout="window.status='';return true;">
- <xsl:attribute
name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of select="lang_done_statustext"/>
- <xsl:text>';
return true;</xsl:text>
- </xsl:attribute>
- </input>
- </form>
- </td>
- </tr>
-
<xsl:choose>
<xsl:when test="start_project!=''">
<tr>
@@ -496,6 +488,46 @@
</xsl:template>
+
+ <xsl:template match="table_apply">
+ <table>
+ <tr>
+ <td valign="bottom">
+ <xsl:variable
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
+ <input type="submit"
name="values[save]" value="{$lang_save}" onMouseout="window.status='';return
true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_save_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ </td>
+ <td valign="bottom">
+ <xsl:variable
name="lang_apply"><xsl:value-of select="lang_apply"/></xsl:variable>
+ <input type="submit"
name="values[apply]" value="{$lang_apply}" onMouseout="window.status='';return
true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_apply_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ </td>
+ <td align="right" valign="bottom">
+ <xsl:variable
name="lang_cancel"><xsl:value-of select="lang_cancel"/></xsl:variable>
+ <input type="submit"
name="values[cancel]" value="{$lang_cancel}"
onMouseout="window.status='';return true;">
+ <xsl:attribute
name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+ <xsl:value-of
select="lang_cancel_statustext"/>
+ <xsl:text>'; return
true;</xsl:text>
+ </xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ </table>
+ </xsl:template>
+
+
+
<!-- view -->
<xsl:template match="view">
<div align="left">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property inc/class.uiactor.inc.php inc/class.ui...,
Sigurd Nes <=