From c3dcfd136bea8ec4b627a7d38f618ac97c9ea4a0 Mon Sep 17 00:00:00 2001
From: Tim Almdal <tnalmdal@shaw.ca>
Date: Sat, 31 Oct 2009 14:41:55 -0700
Subject: Move the identity provider menu item under the settings menu and make
 the User/Groups administration a first level menu item.  As discussed via
 -devel mailing list.

---
 modules/gallery/helpers/gallery_event.php | 13 +++++--------
 modules/user/helpers/user_event.php       |  9 ++++-----
 2 files changed, 9 insertions(+), 13 deletions(-)

(limited to 'modules')

diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index f3ad1630..582e3267 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -179,7 +179,11 @@ class gallery_event_Core {
                ->append(Menu::factory("link")
                         ->id("advanced")
                         ->label(t("Advanced"))
-                        ->url(url::site("admin/advanced_settings"))))
+                        ->url(url::site("admin/advanced_settings")))
+               ->append(Menu::factory("link")
+                        ->id("identity_drivers")
+                        ->label(t("Identity drivers"))
+                        ->url(url::site("admin/identity"))))
       ->append(Menu::factory("link")
                ->id("modules")
                ->label(t("Modules"))
@@ -202,13 +206,6 @@ class gallery_event_Core {
                         ->id("sidebar")
                         ->label(t("Manage sidebar"))
                         ->url(url::site("admin/sidebar"))))
-      ->append(Menu::factory("submenu")
-               ->id("identity_menu")
-               ->label(t("Identity management"))
-               ->append(Menu::factory("link")
-                        ->id("identity_drivers")
-                        ->label(t("Identity drivers"))
-                        ->url(url::site("admin/identity"))))
       ->append(Menu::factory("submenu")
                ->id("statistics_menu")
                ->label(t("Statistics")))
diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php
index e3dbacb7..11b9c56c 100644
--- a/modules/user/helpers/user_event.php
+++ b/modules/user/helpers/user_event.php
@@ -20,11 +20,10 @@
 
 class user_event_Core {
   static function admin_menu($menu, $theme) {
-    $menu->get("identity_menu")
-      ->append(Menu::factory("link")
-      ->id("users_groups")
-      ->label(t("Users/Groups"))
-      ->url(url::site("admin/users")));
+    $menu->add_after("appearance_menu", Menu::factory("link")
+                     ->id("users_groups")
+                     ->label(t("Users/Groups"))
+                     ->url(url::site("admin/users")));
 
     return $menu;
   }
-- 
cgit v1.2.3