[Fmsystem-commits] [7193] moved activitycalendar to separate menu

[Erik Holm-Larsen]

Revision: 7193
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7193
Author:   erikhl
Date:     2011-04-07 08:46:54 +0000 (Thu, 07 Apr 2011)
Log Message:
-----------
moved activitycalendar to separate menu

Modified Paths:
--------------
    trunk/activitycalendar/inc/class.menu.inc.php
    trunk/activitycalendar/inc/class.uiactivities.inc.php
    trunk/activitycalendar/inc/class.uiarena.inc.php
    trunk/activitycalendar/inc/class.uiorganization.inc.php
    trunk/activitycalendar/setup/setup.inc.php

Modified: trunk/activitycalendar/inc/class.menu.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.menu.inc.php       2011-04-07 06:23:49 UTC 
(rev 7192)
+++ trunk/activitycalendar/inc/class.menu.inc.php       2011-04-07 08:46:54 UTC 
(rev 7193)
@@ -26,21 +26,18 @@
                                        'text'  => lang('Activities'),
                                        'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'activitycalendar.uiactivities.index') ),
                     'image'    => array('property', 'location_tenant'),
-                                       'children' => array
-                                       (
-                                               'arena' => array
-                                               (
-                                                       'text'  => 
lang('Arena'),
-                                                       'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'activitycalendar.uiarena.index') ),
-                                   'image'     => array('property', 
'location_1'),
-                                               ),
-                                               'organizationList' => array
-                                               (
-                                                       'text'  => 
lang('OrganizationList'),
-                                                       'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'activitycalendar.uiorganization.index') ),
-                                   'image'     => array('property', 
'location_tenant'),
-                                               )
-                                       )
+                               ),
+                               'arena' => array
+                               (
+                                       'text'  => lang('Arena'),
+                                       'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'activitycalendar.uiarena.index') ),
+                                 'image'       => array('property', 
'location_1'),
+                               ),
+                               'organizationList' => array
+                               (
+                                       'text'  => lang('OrganizationList'),
+                                       'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction'=> 
'activitycalendar.uiorganization.index') ),
+                           'image'     => array('property', 'location_tenant'),
                                )      
                        );
                        

Modified: trunk/activitycalendar/inc/class.uiactivities.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiactivities.inc.php       2011-04-07 
06:23:49 UTC (rev 7192)
+++ trunk/activitycalendar/inc/class.uiactivities.inc.php       2011-04-07 
08:46:54 UTC (rev 7193)
@@ -22,7 +22,7 @@
        public function __construct()
        {
                parent::__construct();
-               self::set_active_menu('booking::activities');
+               self::set_active_menu('activitycalendar::activities');
                $config = CreateObject('phpgwapi.config','activitycalendar');
                $config->read();
        }

Modified: trunk/activitycalendar/inc/class.uiarena.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiarena.inc.php    2011-04-07 06:23:49 UTC 
(rev 7192)
+++ trunk/activitycalendar/inc/class.uiarena.inc.php    2011-04-07 08:46:54 UTC 
(rev 7193)
@@ -18,7 +18,7 @@
        public function __construct()
        {
                parent::__construct();
-               self::set_active_menu('booking::activities::arena');
+               self::set_active_menu('activitycalendar::arena');
                $config = CreateObject('phpgwapi.config','activitycalendar');
                $config->read();
        }

Modified: trunk/activitycalendar/inc/class.uiorganization.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uiorganization.inc.php     2011-04-07 
06:23:49 UTC (rev 7192)
+++ trunk/activitycalendar/inc/class.uiorganization.inc.php     2011-04-07 
08:46:54 UTC (rev 7193)
@@ -15,7 +15,7 @@
        public function __construct()
        {
                parent::__construct();
-               self::set_active_menu('booking::activities::organizationList');
+               self::set_active_menu('activitycalendar::organizationList');
                $config = CreateObject('phpgwapi.config','activitycalendar');
                $config->read();
        }

Modified: trunk/activitycalendar/setup/setup.inc.php
===================================================================
--- trunk/activitycalendar/setup/setup.inc.php  2011-04-07 06:23:49 UTC (rev 
7192)
+++ trunk/activitycalendar/setup/setup.inc.php  2011-04-07 08:46:54 UTC (rev 
7193)
@@ -44,5 +44,5 @@
        /* The hooks this app includes, needed for hooks registration */
        $setup_info['activitycalendar']['hooks'] = array
        (
-               'menu'  => 'activitycalendar.menu.get_menu'     
+               'menu'  => 'activitycalendar.menu.get_menu'
        );