Refactor the ui component of the user module into the gallery core module.

13 files changed, 4 insertions, 28 deletions

diff --git a/modules/user/controllers/admin_users.php b/modules/gallery/controllers/admin_users.php
index a8a8cd95..a8a8cd95 100644
--- a/modules/user/controllers/admin_users.php
+++ b/modules/gallery/controllers/admin_users.php
diff --git a/modules/user/controllers/login.php b/modules/gallery/controllers/login.php
index 2c4bd557..2c4bd557 100644
--- a/modules/user/controllers/login.php
+++ b/modules/gallery/controllers/login.php
diff --git a/modules/user/controllers/logout.php b/modules/gallery/controllers/logout.php
index 45d397ad..45d397ad 100644
--- a/modules/user/controllers/logout.php
+++ b/modules/gallery/controllers/logout.php
diff --git a/modules/user/controllers/password.php b/modules/gallery/controllers/password.php
index e8b08960..e8b08960 100644
--- a/modules/user/controllers/password.php
+++ b/modules/gallery/controllers/password.php
diff --git a/modules/user/controllers/users.php b/modules/gallery/controllers/users.php
index 07c5a457..07c5a457 100644
--- a/modules/user/controllers/users.php
+++ b/modules/gallery/controllers/users.php
diff --git a/modules/gallery/helpers/gallery_event.php b/modules/gallery/helpers/gallery_event.php
index 106aa202..e0de2152 100644
--- a/modules/gallery/helpers/gallery_event.php
+++ b/modules/gallery/helpers/gallery_event.php
@@ -187,6 +187,10 @@ class gallery_event_Core {
                         ->id("sidebar")
                         ->label(t("Manage Sidebar"))
                         ->url(url::site("admin/sidebar"))))
+      ->append(Menu::factory("link")
+               ->id("users_groups")
+               ->label(t("Users/Groups"))
+               ->url(url::site("admin/users")))
       ->append(Menu::factory("submenu")
                ->id("statistics_menu")
                ->label(t("Statistics")))
diff --git a/modules/user/views/admin_users.html.php b/modules/gallery/views/admin_users.html.php
index a127bc15..a127bc15 100644
--- a/modules/user/views/admin_users.html.php
+++ b/modules/gallery/views/admin_users.html.php
diff --git a/modules/user/views/admin_users_group.html.php b/modules/gallery/views/admin_users_group.html.php
index db3645a0..db3645a0 100644
--- a/modules/user/views/admin_users_group.html.php
+++ b/modules/gallery/views/admin_users_group.html.php
diff --git a/modules/user/views/login.html.php b/modules/gallery/views/login.html.php
index 049ba043..049ba043 100644
--- a/modules/user/views/login.html.php
+++ b/modules/gallery/views/login.html.php
diff --git a/modules/user/views/login_ajax.html.php b/modules/gallery/views/login_ajax.html.php
index d3364b46..d3364b46 100644
--- a/modules/user/views/login_ajax.html.php
+++ b/modules/gallery/views/login_ajax.html.php
diff --git a/modules/user/views/reset_password.html.php b/modules/gallery/views/reset_password.html.php
index 92ca4917..92ca4917 100644
--- a/modules/user/views/reset_password.html.php
+++ b/modules/gallery/views/reset_password.html.php
diff --git a/modules/user/views/user_languages_block.html.php b/modules/gallery/views/user_languages_block.html.php
index 89185967..89185967 100644
--- a/modules/user/views/user_languages_block.html.php
+++ b/modules/gallery/views/user_languages_block.html.php
diff --git a/modules/user/helpers/user_event.php b/modules/user/helpers/user_event.php
deleted file mode 100644
index 93a92589..00000000
--- a/modules/user/helpers/user_event.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php defined("SYSPATH") or die("No direct script access.");
-/**
- * Gallery - a web based photo album viewer and editor
- * Copyright (C) 2000-2009 Bharat Mediratta
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA  02110-1301, USA.
- */
-class user_event_Core {
-  static function admin_menu($menu, $theme) {
-    $menu->add_after("appearance_menu",
-                     Menu::factory("link")
-                     ->id("users_groups")
-                     ->label(t("Users/Groups"))
-                     ->url(url::site("admin/users")));
-  }
-}