diff options
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/classes/ElggMenuBuilder.php | 5 | ||||
| -rw-r--r-- | engine/classes/ElggMenuItem.php | 16 | ||||
| -rw-r--r-- | engine/lib/admin.php | 17 | ||||
| -rw-r--r-- | engine/lib/elgglib.php | 4 | ||||
| -rw-r--r-- | engine/lib/users.php | 8 |
5 files changed, 29 insertions, 21 deletions
diff --git a/engine/classes/ElggMenuBuilder.php b/engine/classes/ElggMenuBuilder.php index 9112c9535..bafed2cea 100644 --- a/engine/classes/ElggMenuBuilder.php +++ b/engine/classes/ElggMenuBuilder.php @@ -66,6 +66,7 @@ class ElggMenuBuilder { // get menu items for this context $selected_menu = array(); foreach ($this->menu as $menu_item) { + //var_dump($menu_item); if ($menu_item->inContext()) { $selected_menu[] = $menu_item; } @@ -182,7 +183,7 @@ class ElggMenuBuilder { case 'name': $sort_callback = array('ElggMenuBuilder', 'compareByName'); break; - case 'weight': + case 'priority': $sort_callback = array('ElggMenuBuilder', 'compareByWeight'); break; case 'order': @@ -249,7 +250,7 @@ class ElggMenuBuilder { } /** - * Compare two menu items by their weight + * Compare two menu items by their priority * * @param ElggMenuItem $a * @param ElggMenuItem $b diff --git a/engine/classes/ElggMenuItem.php b/engine/classes/ElggMenuItem.php index 1e1981ab9..0204a85c7 100644 --- a/engine/classes/ElggMenuItem.php +++ b/engine/classes/ElggMenuItem.php @@ -49,9 +49,9 @@ class ElggMenuItem { protected $title = ''; /** - * @var int Menu weight - smaller weights float to the top + * @var int Menu priority - smaller prioritys float to the top */ - protected $weight = 100; + protected $priority = 100; /** * @var bool Is this the currently selected menu item @@ -297,23 +297,23 @@ class ElggMenuItem { } /** - * Set the weight of the menu item + * Set the priority of the menu item * - * @param int $weight The lower weight items float to the top of the menu + * @param int $priority The smaller numbers mean higher priority (1 before 100) * * @return void */ - public function setWeight($weight) { - $this->weight = $weight; + public function setWeight($priority) { + $this->priority = $priority; } /** - * Get the weight of the menu item + * Get the priority of the menu item * * @return int */ public function getWeight() { - return $this->weight; + return $this->priority; } /** diff --git a/engine/lib/admin.php b/engine/lib/admin.php index e14dc7826..176ef21e5 100644 --- a/engine/lib/admin.php +++ b/engine/lib/admin.php @@ -119,12 +119,12 @@ function elgg_admin_notice_exists($id) { * * @param string $menu_id The Unique ID of section * @param string $parent_id If a child section, the parent section id. - * @param int $weight The menu item weight + * @param int $priority The menu item priority * * @return bool * @since 1.8.0 */ -function elgg_register_admin_menu_item($menu_id, $parent_id = NULL, $weight = 100) { +function elgg_register_admin_menu_item($menu_id, $parent_id = NULL, $priority = 100) { // make sure parent is registered if ($parent_id && !elgg_is_menu_item_registered('page', $parent_id)) { @@ -149,7 +149,7 @@ function elgg_register_admin_menu_item($menu_id, $parent_id = NULL, $weight = 10 'text' => elgg_echo("admin:$name"), 'context' => 'admin', 'parent_name' => $parent_id, - 'weight' => $weight, + 'priority' => $priority, )); } @@ -212,14 +212,14 @@ function admin_init() { 'href' => 'pg/admin/dashboard', 'text' => elgg_echo('admin:dashboard'), 'context' => 'admin', - 'weight' => 10, + 'priority' => 10, )); elgg_register_menu_item('topbar', array( 'name' => 'administration', 'href' => 'pg/admin', 'text' => elgg_view_icon('settings') . elgg_echo('admin'), - 'weight' => 100, + 'priority' => 100, 'section' => 'alt', )); @@ -280,6 +280,13 @@ function admin_pagesetup() { $url = elgg_get_simplecache_url('css', 'admin'); elgg_register_css($url, 'admin'); elgg_unregister_css('elgg'); + + // setup footer menu + elgg_register_menu_item('admin_footer', array( + 'name' => 'faq', + 'text' => elgg_echo('admin:faq'), + 'href' => 'http://docs.elgg.org/wiki/Category:Administration_FAQ', + )); } } diff --git a/engine/lib/elgglib.php b/engine/lib/elgglib.php index b27a71b08..24227e0e8 100644 --- a/engine/lib/elgglib.php +++ b/engine/lib/elgglib.php @@ -1818,7 +1818,7 @@ function elgg_init() { 'name' => 'elgg_logo', 'href' => 'http://www.elgg.org/', 'text' => "<img src=\"$logo_url\" alt=\"Elgg logo\" />", - 'weight' => 1, + 'priority' => 1, )); $powered_url = elgg_get_site_url() . "_graphics/powered_by_elgg_badge_drk_bckgnd.gif"; @@ -1828,7 +1828,7 @@ function elgg_init() { 'href' => 'http://elgg.org', 'text' => "<img src=\"$powered_url\" alt=\"Powered by Elgg\" width=\"106\" height=\"15\" />", 'section' => 'alt', - 'weight' => 1000, + 'priority' => 1000, )); // Sets a blacklist of words in the current language. diff --git a/engine/lib/users.php b/engine/lib/users.php index 99466bf73..0b620e578 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -1506,7 +1506,7 @@ function users_pagesetup() { 'name' => 'profile', 'href' => $user->getURL(), 'text' => "<img src=\"{$user->getIconURL('topbar')}\" alt=\"$user->name\" />", - 'weight' => 100, + 'priority' => 100, )); elgg_register_menu_item('topbar', array( @@ -1514,14 +1514,14 @@ function users_pagesetup() { 'href' => "pg/friends/{$user->username}", 'text' => elgg_view_icon('friends'), 'title' => elgg_echo('friends'), - 'weight' => 300, + 'priority' => 300, )); elgg_register_menu_item('topbar', array( 'name' => 'usersettings', 'href' => "pg/settings/user/{$user->username}", 'text' => elgg_view_icon('settings') . elgg_echo('settings'), - 'weight' => 500, + 'priority' => 500, 'section' => 'alt', )); @@ -1530,7 +1530,7 @@ function users_pagesetup() { 'href' => "action/logout", 'text' => elgg_echo('logout'), 'is_action' => TRUE, - 'weight' => 1000, + 'priority' => 1000, 'section' => 'alt', )); |