[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] property inc/class.menu.inc.php templates/base/...
|
From: |
Sigurd Nes |
|
Subject: |
[Phpgroupware-cvs] property inc/class.menu.inc.php templates/base/... |
|
Date: |
Sat, 14 Oct 2006 13:49:31 +0000 |
CVSROOT: /sources/phpgroupware
Module name: property
Changes by: Sigurd Nes <sigurdne> 06/10/14 13:49:31
Modified files:
inc : class.menu.inc.php
templates/base : menu.xsl
setup : setup.inc.php
Added files:
inc : hook_sidebox_menu.inc.php
Log message:
enable sidebox
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/property/inc/class.menu.inc.php?cvsroot=phpgroupware&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/property/inc/hook_sidebox_menu.inc.php?cvsroot=phpgroupware&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/property/templates/base/menu.xsl?cvsroot=phpgroupware&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/property/setup/setup.inc.php?cvsroot=phpgroupware&r1=1.46&r2=1.47
Patches:
Index: inc/class.menu.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/inc/class.menu.inc.php,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- inc/class.menu.inc.php 5 Oct 2006 11:33:53 -0000 1.28
+++ inc/class.menu.inc.php 14 Oct 2006 13:49:30 -0000 1.29
@@ -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.menu.inc.php,v 1.28 2006/10/05 11:33:53 sigurdne
Exp $
+ * @version $Id: class.menu.inc.php,v 1.29 2006/10/14 13:49:30 sigurdne
Exp $
*/
/**
@@ -46,33 +46,33 @@
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uilocation.index', 'type_id'=>1));
- $menu['module'][$i]['name'] =
lang('Property');
- $menu['module'][$i]['statustext'] =
lang('Property');
+ $menu['module'][$i]['url'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uilocation.index', 'type_id'=>1));
+ $menu['module'][$i]['text'] =
lang('Location');
+ $menu['module'][$i]['statustext'] =
lang('Location');
$i++;
if($sub=='ticket')
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uitts.index'));
- $menu['module'][$i]['name']
= lang('Helpdesk');
+ $menu['module'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uitts.index'));
+ $menu['module'][$i]['text']
= lang('Helpdesk');
$menu['module'][$i]['statustext'] =
lang('Helpdesk');
$i++;
if($sub=='project')
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiproject.index'));
- $menu['module'][$i]['name']
= lang('Project');
+ $menu['module'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiproject.index'));
+ $menu['module'][$i]['text']
= lang('Project');
$menu['module'][$i]['statustext'] =
lang('Project');
$i++;
if($sub=='invoice')
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiinvoice.index'));
- $menu['module'][$i]['name']
= lang('Invoice');
+ $menu['module'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiinvoice.index'));
+ $menu['module'][$i]['text']
= lang('Invoice');
$menu['module'][$i]['statustext'] =
lang('Invoice');
$i++;
@@ -80,8 +80,8 @@
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uibudget.index'));
- $menu['module'][$i]['name']
= lang('budget');
+ $menu['module'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uibudget.index'));
+ $menu['module'][$i]['text']
= lang('budget');
$menu['module'][$i]['statustext'] =
lang('budget');
//--------------------
$i++;
@@ -89,8 +89,8 @@
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiagreement.index'));
- $menu['module'][$i]['name']
= lang('Agreement');
+ $menu['module'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiagreement.index'));
+ $menu['module'][$i]['text']
= lang('Agreement');
$menu['module'][$i]['statustext'] =
lang('Agreement');
//----------------------
$i++;
@@ -98,16 +98,16 @@
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uidocument.index'));
- $menu['module'][$i]['name']
= lang('Documentation');
+ $menu['module'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uidocument.index'));
+ $menu['module'][$i]['text']
= lang('Documentation');
$menu['module'][$i]['statustext'] =
lang('Documentation');
$i++;
if($sub=='custom')
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uicustom.index'));
- $menu['module'][$i]['name']
= lang('Custom');
+ $menu['module'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uicustom.index'));
+ $menu['module'][$i]['text']
= lang('Custom');
$menu['module'][$i]['statustext'] =
lang('Custom queries');
$entity =
CreateObject($this->currentapp.'.soadmin_entity');
@@ -122,8 +122,8 @@
{
$menu['module'][$i]['this']=True;
}
- $menu['module'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uientity.index', 'entity_id'=> $entry['id']));
- $menu['module'][$i]['name']
= $entry['name'];
+ $menu['module'][$i]['url']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uientity.index', 'entity_id'=> $entry['id']));
+ $menu['module'][$i]['text']
= $entry['name'];
$menu['module'][$i]['statustext'] = $entry['descr'];
}
}
@@ -133,6 +133,8 @@
$i = 0;
if ($sub == 'location')
{
+ $menu['menu_title_2']=lang('Location');
+
$soadmin_location =
CreateObject($this->currentapp.'.soadmin_location');
$location =
$soadmin_location->select_location_type();
$location_count=count($location);
@@ -142,8 +144,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uilocation.index', 'type_id'=> $location[$j]['id']));
- $menu['sub_menu'][$i]['name'] =
$location[$j]['name'];
+ $menu['sub_menu'][$i]['url'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uilocation.index', 'type_id'=> $location[$j]['id']));
+ $menu['sub_menu'][$i]['text'] =
$location[$j]['name'];
$menu['sub_menu'][$i]['statustext'] = $location[$j]['descr'];
$i++;
}
@@ -154,8 +156,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uilocation.index', 'lookup_tenant'=>1, 'type_id'=>
$config_tenant));
- $menu['sub_menu'][$i]['name']
= lang('Tenant');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uilocation.index', 'lookup_tenant'=>1, 'type_id'=>
$config_tenant));
+ $menu['sub_menu'][$i]['text']
= lang('Tenant');
$menu['sub_menu'][$i]['statustext']
= lang('Tenant');
$i++;
@@ -163,8 +165,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uigab.index'));
- $menu['sub_menu'][$i]['name']
= lang('gabnr');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uigab.index'));
+ $menu['sub_menu'][$i]['text']
= lang('gabnr');
$menu['sub_menu'][$i]['statustext']
= lang('gabnr');
$i++;
@@ -172,20 +174,22 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uilocation.summary'));
- $menu['sub_menu'][$i]['name']
= lang('Summary');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uilocation.summary'));
+ $menu['sub_menu'][$i]['text']
= lang('Summary');
$menu['sub_menu'][$i]['statustext']
= lang('Summary');
$i++;
}
if ($sub == 'invoice')
{
+ $menu['menu_title_2']=lang('Invoice');
+
if($page=='invoice_')
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiinvoice.index'));
- $menu['sub_menu'][$i]['name']
= lang('Invoice');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiinvoice.index'));
+ $menu['sub_menu'][$i]['text']
= lang('Invoice');
$menu['sub_menu'][$i]['statustext']
= lang('Invoice');
$i++;
@@ -193,8 +197,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiinvoice.index', 'paid'=>true));
- $menu['sub_menu'][$i]['name']
= lang('Paid');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiinvoice.index', 'paid'=>true));
+ $menu['sub_menu'][$i]['text']
= lang('Paid');
$menu['sub_menu'][$i]['statustext']
= lang('Paid');
$i++;
@@ -202,8 +206,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiinvoice.consume'));
- $menu['sub_menu'][$i]['name']
= lang('consume');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiinvoice.consume'));
+ $menu['sub_menu'][$i]['text']
= lang('consume');
$menu['sub_menu'][$i]['statustext']
= lang('consume');
$i++;
@@ -211,8 +215,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uib_account.index'));
- $menu['sub_menu'][$i]['name']
= lang('budget account');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uib_account.index'));
+ $menu['sub_menu'][$i]['text']
= lang('budget account');
$menu['sub_menu'][$i]['statustext']
= lang('budget account');
$i++;
@@ -220,8 +224,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiactor.index', 'role'=> 'vendor'));
- $menu['sub_menu'][$i]['name']
= lang('Vendor');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiactor.index', 'role'=> 'vendor'));
+ $menu['sub_menu'][$i]['text']
= lang('Vendor');
$menu['sub_menu'][$i]['statustext']
= lang('Vendor');
$i++;
@@ -229,8 +233,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiactor.index', 'role'=> 'tenant'));
- $menu['sub_menu'][$i]['name']
= lang('Tenant');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiactor.index', 'role'=> 'tenant'));
+ $menu['sub_menu'][$i]['text']
= lang('Tenant');
$menu['sub_menu'][$i]['statustext']
= lang('Tenant');
$i++;
@@ -240,8 +244,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiinvestment.index'));
- $menu['sub_menu'][$i]['name']
= lang('Investment value');
+ $menu['sub_menu'][$i]['url']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiinvestment.index'));
+ $menu['sub_menu'][$i]['text']
= lang('Investment value');
$menu['sub_menu'][$i]['statustext'] = lang('Investment
value');
$i++;
@@ -249,8 +253,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiXport.import'));
- $menu['sub_menu'][$i]['name']
= lang('Import invoice');
+ $menu['sub_menu'][$i]['url']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiXport.import'));
+ $menu['sub_menu'][$i]['text']
= lang('Import invoice');
$menu['sub_menu'][$i]['statustext'] = lang('Import invoice');
$i++;
@@ -258,8 +262,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiXport.export'));
- $menu['sub_menu'][$i]['name']
= lang('Export invoice');
+ $menu['sub_menu'][$i]['url']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiXport.export'));
+ $menu['sub_menu'][$i]['text']
= lang('Export invoice');
$menu['sub_menu'][$i]['statustext'] = lang('Export invoice');
$i++;
}
@@ -270,8 +274,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiinvoice.add'));
- $menu['sub_menu'][$i]['name']
= lang('Add');
+ $menu['sub_menu'][$i]['url']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiinvoice.add'));
+ $menu['sub_menu'][$i]['text']
= lang('Add');
$menu['sub_menu'][$i]['statustext'] = lang('Add invoice');
$i++;
}
@@ -279,12 +283,14 @@
if ($sub == 'pricebook' &&
$this->acl->check('.pricebook',16))
{
+ $menu['menu_title_2']=lang('pricebook');
+
if($page=='agreement_group')
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uipricebook.agreement_group'));
- $menu['sub_menu'][$i]['name']
= lang('Agreement group');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uipricebook.agreement_group'));
+ $menu['sub_menu'][$i]['text']
= lang('Agreement group');
$menu['sub_menu'][$i]['statustext']
= lang('Agreement group');
$i++;
@@ -292,8 +298,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uipricebook.activity'));
- $menu['sub_menu'][$i]['name']
= lang('Activities');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uipricebook.activity'));
+ $menu['sub_menu'][$i]['text']
= lang('Activities');
$menu['sub_menu'][$i]['statustext']
= lang('Activities');
$i++;
@@ -301,62 +307,62 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiagreement.index'));
- $menu['sub_menu'][$i]['name']
= lang('Agreement');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiagreement.index'));
+ $menu['sub_menu'][$i]['text']
= lang('Agreement');
$menu['sub_menu'][$i]['statustext']
= lang('Agreement');
$i++;
}
//--------------
if ($sub == 'agreement')
{
+ $menu['menu_title_2']=lang('Agreement');
if($page=='agreement')
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiagreement.index'));
- $menu['sub_menu'][$i]['name']
= lang('Pricebook');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiagreement.index'));
+ $menu['sub_menu'][$i]['text']
= lang('Pricebook');
$menu['sub_menu'][$i]['statustext']
= lang('Pricebook');
$i++;
if($page=='s_agreement')
{
$menu['sub_menu'][$i]['this']=True;
-
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uis_agreement.index'));
- $menu['sub_menu'][$i]['name']
= lang('Service');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uis_agreement.index'));
+ $menu['sub_menu'][$i]['text']
= lang('Service');
$menu['sub_menu'][$i]['statustext']
= lang('service agreement');
$i++;
if($page=='r_agreement')
{
$menu['sub_menu'][$i]['this']=True;
-
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uir_agreement.index'));
- $menu['sub_menu'][$i]['name']
= lang('Rental');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uir_agreement.index'));
+ $menu['sub_menu'][$i]['text']
= lang('Rental');
$menu['sub_menu'][$i]['statustext']
= lang('Rental agreement');
$i++;
if($page=='alarm')
{
$menu['sub_menu'][$i]['this']=True;
-
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uialarm.list_alarm'));
- $menu['sub_menu'][$i]['name']
= lang('alarm');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uialarm.list_alarm'));
+ $menu['sub_menu'][$i]['text']
= lang('alarm');
$menu['sub_menu'][$i]['statustext']
= lang('alarm');
$i++;
if($this->acl->check('.pricebook',16)
&& $page=='agreement')
{
+
$menu['menu_title_3']=lang('pricebook');
+
$j=0;
if($page_2=='agreement_group')
{
$menu['sub_menu_2'][$j]['this']=True;
}
- $menu['sub_menu_2'][$j]['link']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uipricebook.agreement_group'));
- $menu['sub_menu_2'][$j]['name']
= lang('Agreement group');
+ $menu['sub_menu_2'][$j]['url']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uipricebook.agreement_group'));
+ $menu['sub_menu_2'][$j]['text']
= lang('Agreement group');
$menu['sub_menu_2'][$j]['statustext'] = lang('Agreement group');
$j++;
@@ -364,8 +370,8 @@
{
$menu['sub_menu_2'][$j]['this']=True;
}
- $menu['sub_menu_2'][$j]['link']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uipricebook.activity'));
- $menu['sub_menu_2'][$j]['name']
= lang('Activities');
+ $menu['sub_menu_2'][$j]['url']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uipricebook.activity'));
+ $menu['sub_menu_2'][$j]['text']
= lang('Activities');
$menu['sub_menu_2'][$j]['statustext'] = lang('Activities');
$j++;
@@ -373,8 +379,8 @@
{
$menu['sub_menu_2'][$j]['this']=True;
}
- $menu['sub_menu_2'][$j]['link']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiagreement.index'));
- $menu['sub_menu_2'][$j]['name']
= lang('Agreement');
+ $menu['sub_menu_2'][$j]['url']
=
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiagreement.index'));
+ $menu['sub_menu_2'][$j]['text']
= lang('Agreement');
$menu['sub_menu_2'][$j]['statustext'] = lang('Agreement');
$j++;
}
@@ -384,12 +390,14 @@
//---------------
if ($sub == 'project')
{
+ $menu['menu_title_2']=lang('Project');
+
if($page=='project')
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiproject.index'));
- $menu['sub_menu'][$i]['name']
= lang('Project');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiproject.index'));
+ $menu['sub_menu'][$i]['text']
= lang('Project');
$menu['sub_menu'][$i]['statustext']
= lang('Project');
$i++;
@@ -397,8 +405,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiworkorder.index'));
- $menu['sub_menu'][$i]['name']
= lang('Workorder');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiworkorder.index'));
+ $menu['sub_menu'][$i]['text']
= lang('Workorder');
$menu['sub_menu'][$i]['statustext']
= lang('Workorder');
$i++;
@@ -406,9 +414,10 @@
if($page=='s_agreement')
{
$menu['sub_menu'][$i]['this']=True;
+
$menu['menu_title_2'][]=lang('Service');
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uis_agreement.index'));
- $menu['sub_menu'][$i]['name']
= lang('Service');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uis_agreement.index'));
+ $menu['sub_menu'][$i]['text']
= lang('Service');
$menu['sub_menu'][$i]['statustext']
= lang('service agreement');
$i++;
*/
@@ -416,8 +425,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uirequest.index'));
- $menu['sub_menu'][$i]['name']
= lang('Request');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uirequest.index'));
+ $menu['sub_menu'][$i]['text']
= lang('Request');
$menu['sub_menu'][$i]['statustext']
= lang('Request');
$i++;
@@ -425,8 +434,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uitemplate.index'));
- $menu['sub_menu'][$i]['name']
= lang('template');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uitemplate.index'));
+ $menu['sub_menu'][$i]['text']
= lang('template');
$menu['sub_menu'][$i]['statustext']
= lang('Workorder template');
$i++;
@@ -434,20 +443,21 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uitenant_claim.index'));
- $menu['sub_menu'][$i]['name']
= lang('Tenant claim');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uitenant_claim.index'));
+ $menu['sub_menu'][$i]['text']
= lang('Tenant claim');
$menu['sub_menu'][$i]['statustext']
= lang('Tenant claim');
$i++;
}
if ($sub == 'adm_loc' &&
$this->acl->check('.location',16))
{
+ $menu['menu_title_2']=lang('Admin
location');
if($page=='loc_type')
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiadmin_location.index'));
- $menu['sub_menu'][$i]['name']
= lang('Location type');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiadmin_location.index'));
+ $menu['sub_menu'][$i]['text']
= lang('Location type');
$menu['sub_menu'][$i]['statustext']
= lang('Location type');
$i++;
@@ -455,20 +465,21 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiadmin_location.config'));
- $menu['sub_menu'][$i]['name']
= lang('Config');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uiadmin_location.config'));
+ $menu['sub_menu'][$i]['text']
= lang('Config');
$menu['sub_menu'][$i]['statustext']
= lang('Location Config');
$i++;
}
if ($sub == 'document')
{
+
$menu['menu_title_2']=lang('documentation');
if($page=='document_')
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uidocument.index'));
- $menu['sub_menu'][$i]['name']
= lang('location');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uidocument.index'));
+ $menu['sub_menu'][$i]['text']
= lang('location');
$menu['sub_menu'][$i]['statustext']
= lang('Documentation for locations');
$i++;
@@ -482,8 +493,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
-
$menu['sub_menu'][$i]['link'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uidocument.index', 'entity_id' => $entry['id']));
-
$menu['sub_menu'][$i]['name'] = $entry['name'];
+
$menu['sub_menu'][$i]['url'] =
$GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uidocument.index', 'entity_id' => $entry['id']));
+
$menu['sub_menu'][$i]['text'] = $entry['name'];
$menu['sub_menu'][$i]['statustext'] = $entry['descr'];
$i++;
}
@@ -494,12 +505,14 @@
if ($sub == 'budget')
{
+ $menu['menu_title_2']=lang('budget');
+
if($page=='budget.basis')
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uibudget.basis'));
- $menu['sub_menu'][$i]['name']
= lang('basis');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uibudget.basis'));
+ $menu['sub_menu'][$i]['text']
= lang('basis');
$menu['sub_menu'][$i]['statustext']
= lang('budget per group');
$i++;
@@ -507,8 +520,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uibudget.index'));
- $menu['sub_menu'][$i]['name']
= lang('budget');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uibudget.index'));
+ $menu['sub_menu'][$i]['text']
= lang('budget');
$menu['sub_menu'][$i]['statustext']
= lang('budget');
$i++;
@@ -516,8 +529,8 @@
{
$menu['sub_menu'][$i]['this']=True;
}
- $menu['sub_menu'][$i]['link']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uibudget.obligations'));
- $menu['sub_menu'][$i]['name']
= lang('obligations');
+ $menu['sub_menu'][$i]['url']
= $GLOBALS['phpgw']->link('/index.php',array('menuaction'=>
$currentapp.'.uibudget.obligations'));
+ $menu['sub_menu'][$i]['text']
= lang('obligations');
$menu['sub_menu'][$i]['statustext']
= lang('contractual obligations');
$i++;
}
@@ -525,6 +538,7 @@
$GLOBALS['phpgw']->session->appsession('menu',substr(md5($currentapp.$sub . '_'
. $page . '_' . $page_2),-20),$menu);
}
+
$GLOBALS['phpgw']->session->appsession('menu_property','sidebox',$menu);
return $menu;
}
}
Index: templates/base/menu.xsl
===================================================================
RCS file: /sources/phpgroupware/property/templates/base/menu.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- templates/base/menu.xsl 16 Mar 2005 12:11:00 -0000 1.2
+++ templates/base/menu.xsl 14 Oct 2006 13:49:30 -0000 1.3
@@ -12,10 +12,10 @@
<xsl:text> </xsl:text>
<xsl:choose>
<xsl:when test="this=1">
- <a
href="{link}" onMouseover="window.status='{statustext}';return true;"
onMouseout="window.status='';return
true;"><b><xsl:text>[</xsl:text><xsl:value-of
select="name"/><xsl:text>]</xsl:text></b></a>
+ <a href="{url}"
onMouseover="window.status='{statustext}';return true;"
onMouseout="window.status='';return
true;"><b><xsl:text>[</xsl:text><xsl:value-of
select="text"/><xsl:text>]</xsl:text></b></a>
</xsl:when>
<xsl:otherwise>
- <a
href="{link}" onMouseover="window.status='{statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of select="name"/></a>
+ <a href="{url}"
onMouseover="window.status='{statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of select="text"/></a>
</xsl:otherwise>
</xsl:choose>
@@ -31,10 +31,10 @@
<xsl:text> </xsl:text>
<xsl:choose>
<xsl:when test="this=1">
- <a
href="{link}" onMouseover="window.status='{statustext}';return true;"
onMouseout="window.status='';return
true;"><b><xsl:text>[</xsl:text><xsl:value-of
select="name"/><xsl:text>]</xsl:text></b></a>
+ <a href="{url}"
onMouseover="window.status='{statustext}';return true;"
onMouseout="window.status='';return
true;"><b><xsl:text>[</xsl:text><xsl:value-of
select="text"/><xsl:text>]</xsl:text></b></a>
</xsl:when>
<xsl:otherwise>
- <a
href="{link}" onMouseover="window.status='{statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of select="name"/></a>
+ <a href="{url}"
onMouseover="window.status='{statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of select="text"/></a>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
@@ -52,10 +52,10 @@
<xsl:text>
</xsl:text>
<xsl:choose>
<xsl:when test="this=1">
-
<a href="{link}" onMouseover="window.status='{statustext}';return true;"
onMouseout="window.status='';return
true;"><b><xsl:text>[</xsl:text><xsl:value-of
select="name"/><xsl:text>]</xsl:text></b></a>
+
<a href="{url}" onMouseover="window.status='{statustext}';return true;"
onMouseout="window.status='';return
true;"><b><xsl:text>[</xsl:text><xsl:value-of
select="text"/><xsl:text>]</xsl:text></b></a>
</xsl:when>
<xsl:otherwise>
-
<a href="{link}" onMouseover="window.status='{statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of select="name"/></a>
+
<a href="{url}" onMouseover="window.status='{statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of select="text"/></a>
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
Index: setup/setup.inc.php
===================================================================
RCS file: /sources/phpgroupware/property/setup/setup.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- setup/setup.inc.php 12 Oct 2006 10:51:11 -0000 1.46
+++ setup/setup.inc.php 14 Oct 2006 13:49:30 -0000 1.47
@@ -8,7 +8,7 @@
* @internal Development of this application was funded by
http://www.bergen.kommune.no/bbb_/ekstern/
* @package property
* @subpackage setup
- * @version $Id: setup.inc.php,v 1.46 2006/10/12 10:51:11 sigurdne Exp $
+ * @version $Id: setup.inc.php,v 1.47 2006/10/14 13:49:30 sigurdne Exp $
*/
$setup_info['property']['name'] = 'property';
@@ -212,7 +212,8 @@
'settings',
'preferences',
'admin',
- 'help'
+ 'help',
+ 'sidebox_menu'
);
/* Dependencies for this app to work */
Index: inc/hook_sidebox_menu.inc.php
===================================================================
RCS file: inc/hook_sidebox_menu.inc.php
diff -N inc/hook_sidebox_menu.inc.php
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ inc/hook_sidebox_menu.inc.php 14 Oct 2006 13:49:30 -0000 1.1
@@ -0,0 +1,13 @@
+<?php
+ $menu_title = $GLOBALS['phpgw_info']['apps'][$appname]['title'] . ' '.
lang('Menu');
+ $menu =
$GLOBALS['phpgw']->session->appsession('menu_property','sidebox');
+ display_sidebox($appname,$menu_title,$menu['module']);
+ if(isset($menu['menu_title_2']) && $menu['menu_title_2'])
+ {
+ display_sidebox($appname,$menu['menu_title_2'] . ' ' . lang
('sub menu'),$menu['sub_menu']);
+ }
+ if(isset($menu['menu_title_3']) && $menu['menu_title_3'])
+ {
+ display_sidebox($appname,$menu['menu_title_3'] . ' ' . lang
('sub menu'),$menu['sub_menu_2']);
+ }
+?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] property inc/class.menu.inc.php templates/base/...,
Sigurd Nes <=