[Fmsystem-commits] [15291] tweak menus in controller and rental

[sigurdne]

Revision: 15291
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15291
Author:   sigurdne
Date:     2016-06-16 07:32:06 +0000 (Thu, 16 Jun 2016)
Log Message:
-----------
tweak menus in controller and rental

Modified Paths:
--------------
    trunk/controller/inc/class.menu.inc.php
    trunk/rental/inc/class.menu.inc.php

Modified: trunk/controller/inc/class.menu.inc.php
===================================================================
--- trunk/controller/inc/class.menu.inc.php     2016-06-15 01:24:39 UTC (rev 
15290)
+++ trunk/controller/inc/class.menu.inc.php     2016-06-16 07:32:06 UTC (rev 
15291)
@@ -36,14 +36,24 @@
                        $incoming_app = 
$GLOBALS['phpgw_info']['flags']['currentapp'];
                        $GLOBALS['phpgw_info']['flags']['currentapp'] = 
'controller';
                        $menus = array();
+                       $config = CreateObject('phpgwapi.config', 'controller');
+                       $config->read();
+                       if (isset($config->config_data['home_alternative']) && 
$config->config_data['home_alternative'])
+                       {
+                               $main = 'controller.uicomponent.index';
+                       }
+                       else
+                       {
+                               $main = 'controller.uicontrol.control_list';
 
+                       }
+
                        $menus['navbar'] = array
                                (
                                'controller' => array
                                        (
                                        'text' => lang('Controller'),
-                       //              'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicontrol.control_list')),
-                                       'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicomponent.index')),
+                                       'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => $main)),
                                        'image' => array('property', 
'location'),
                                        'order' => 10,
                                        'group' => 'office'
@@ -56,13 +66,10 @@
                                $menus['navigation']['control'] =  array(
                                                'text' => lang('Control types'),
                                                'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicontrol.control_list')),
-                                               'image' => array('property', 
'location_1'));
+                                               'image' => array('property', 
'location_1')
+                                       );
 
-                               
-                               $config = CreateObject('phpgwapi.config', 
'controller');
-                               $config->read();
 
-
                                if 
(!isset($config->config_data['home_alternative']) || 
!$config->config_data['home_alternative'])
                                {
                                                                

Modified: trunk/rental/inc/class.menu.inc.php
===================================================================
--- trunk/rental/inc/class.menu.inc.php 2016-06-15 01:24:39 UTC (rev 15290)
+++ trunk/rental/inc/class.menu.inc.php 2016-06-16 07:32:06 UTC (rev 15291)
@@ -118,11 +118,6 @@
 
                        $menus['navigation'] = array
                                (
-                               'application' => array(
-                                       'text' => lang('application'),
-                                       'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'rental.uiapplication.index')),
-                                       'image' => array('rental', 
'text-x-generic'),
-                               ),
                                'contracts' => array
                                        (
                                        'text' => lang('contracts'),
@@ -144,6 +139,18 @@
                                )
                        );
 
+                       //temporary check
+                       if(!$use_fellesdata)
+                       {
+                               $menus['navigation'] = 
array_reverse($menus['navigation'], true);
+                               $menus['navigation']['application'] = array(
+                                       'text' => lang('application'),
+                                       'url' => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'rental.uiapplication.index')),
+                                       'image' => array('rental', 
'text-x-generic'),
+                               );
+                               $menus['navigation'] = 
array_reverse($menus['navigation'], true);
+                       }
+
                        if ($use_fellesdata)
                        {
                                $menus['navigation']['parties']['children'] = 
$sub_parties;