diff options
Diffstat (limited to 'core/helpers')
| -rw-r--r-- | core/helpers/core_menu.php | 49 | ||||
| -rw-r--r-- | core/helpers/menus.php | 42 |
2 files changed, 35 insertions, 56 deletions
diff --git a/core/helpers/core_menu.php b/core/helpers/core_menu.php index a20f96a2..3f0c5024 100644 --- a/core/helpers/core_menu.php +++ b/core/helpers/core_menu.php @@ -18,31 +18,52 @@ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. */ class core_menu_Core { - public static function items($menus, $theme) { - $menus->append(new Menu_Link(_("HOME"), url::base())); - $menus->append(new Menu_Link(_("BROWSE"), url::site("albums/1"))); + public static function site_navigation($menu, $theme) { + $menu->append( + Menu::factory("link") + ->id("home") + ->label(_("Home")) + ->url(url::base())); + + $menu->append( + Menu::factory("link") + ->id("browse") + ->label(_("Browse")) + ->url(url::site("albums/1"))); $item = $theme->item(); $user = Session::instance()->get("user", null); if ($user) { - // @todo guard with permissions - $upload_menu = new Menu(_("UPLOAD")); - $upload_menu->append( - new Menu_Dialog(_("Add Photos"), url::site("form/add/photos/$item->id"))); - $menus->append($upload_menu); + // @todo need to do a permission check here + $menu->append( + Menu::factory("submenu") + ->id("upload_menu") + ->label(_("Upload")) + ->append( + Menu::factory("dialog") + ->id("add_photos") + ->label(_("Add Photos")) + ->url(url::site("form/add/photos/$item->id")))); - $admin_menu = new Menu(_("ADMIN")); + $admin_menu = Menu::factory("submenu") + ->id("admin_menu") + ->label(_("Admin")); + $menu->append($admin_menu); // @todo need to do a permission check here $admin_menu->append( - new Menu_Dialog(_("Edit Item"), url::site("form/edit/{$item->type}s/$item->id"))); + Menu::factory("dialog") + ->id("edit") + ->label(_("Edit")) + ->url(url::site("form/edit/{$item->type}s/$item->id"))); if ($user->admin) { - $admin_menu->append(new Menu_Link(_("Site Admin"), url::site("admin"))); + $admin_menu->append( + Menu::factory("link") + ->id("site_admin") + ->label(_("Site Admin")) + ->url(url::site("admin"))); } - - $menus->append($admin_menu); } } - } diff --git a/core/helpers/menus.php b/core/helpers/menus.php deleted file mode 100644 index 9076b3bb..00000000 --- a/core/helpers/menus.php +++ /dev/null @@ -1,42 +0,0 @@ -<?php defined("SYSPATH") or die("No direct script access."); -/** - * Gallery - a web based photo album viewer and editor - * Copyright (C) 2000-2008 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 menus_Core { - public static function get_menu_items($theme) { - $menu = new Menu(); - - // Call core menus first to establish the basic menu - self::_get_module_menu_items("core", $menu, $theme); - foreach (module::installed() as $module) { - if ($module->name == "core") { - continue; - } - self::_get_module_menu_items($module->name, $menu, $theme); - } - - return $menu; - } - - private static function _get_module_menu_items($module_name, $menu, $theme) { - $class = "{$module_name}_menu"; - if (method_exists($class, "items")) { - call_user_func_array(array($class, "items"), array(&$menu, $theme)); - } - } -}
\ No newline at end of file |