[Fmsystem-commits] [7686]

[Torstein]

Revision: 7686
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7686
Author:   vator
Date:     2011-09-20 11:29:46 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------


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

Modified: trunk/controller/inc/class.menu.inc.php
===================================================================
--- trunk/controller/inc/class.menu.inc.php     2011-09-20 11:19:04 UTC (rev 
7685)
+++ trunk/controller/inc/class.menu.inc.php     2011-09-20 11:29:46 UTC (rev 
7686)
@@ -25,31 +25,20 @@
                                (
                                        'text'  => lang('Control'),
                                        'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'controller.uicontrol.index') ),
-                           'image'     => array('property', 'location_1'),
+                           'image'     => array('property', 'location_1')
                                ),
                                'control_item' => array
                                (
                                        'text'  => lang('Control_item'),
                                        'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'controller.uicontrol_item.index') ),
-                           'image'     => array('property', 'location_1'),
-                                       'children'      => array(
-                                                               
'control_item_list2' => array
-
-                                                               (
-                                                                       'text'  
=> lang('control_item_list'),
-                                                                       'url'   
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicontrol_item.display_control_items', 'appname' => 'controller') ),
-                                                                       'image' 
=> array('rental', 'x-office-spreadsheet')
-                                                               ),
-                                                               'separate_tabs' 
=> array
-
-                                                               (
-                                                                       'text'  
=> 'example::separate_tabs',
-                                                                       'url'   
=> $GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'controller.uicontrol_item2.separate_tabs') ),
-                                                                       'image' 
=> array('rental', 'x-office-spreadsheet')
-                                                               ),
-                                                               
-                                                       )
+                           'image'     => array('property', 'location_1')
                        ),
+                       'procedure' => array
+                               (
+                                       'text'  => lang('Procedure'),
+                                       'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'controller.uiprocedure.index') ),
+                           'image'     => array('property', 'location_1'),
+                               ),    
                                'example' => array
                                (
                                        'text'  => 'example',
@@ -79,13 +68,7 @@
                                                                ),
                                                                
                                                        )
-                       ),
-                               'procedure' => array
-                               (
-                                       'text'  => lang('Procedure'),
-                                       'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'controller.uiprocedure.index') ),
-                           'image'     => array('property', 'location_1'),
-                               )     
+                       ), 
                        );
                        
                        $menus['folders'] = 
phpgwapi_menu::get_categories('bergen');