From 254d24bef4f9bc84da8496f4014e65763bdcffd9 Mon Sep 17 00:00:00 2001 From: pete Date: Mon, 16 Feb 2009 12:52:01 +0000 Subject: theme updates git-svn-id: https://code.elgg.org/elgg/trunk@2761 36083f99-b078-4883-b0ff-0f9b5a30f544 --- engine/lib/usersettings.php | 28 +++++------ languages/en.php | 5 +- mod/profile/views/default/profile/userdetails.php | 2 +- views/default/friends/collections.php | 4 ++ views/default/friends/forms/edit.php | 60 +++++++++++------------ views/default/friends/tablelist.php | 2 +- 6 files changed, 51 insertions(+), 50 deletions(-) diff --git a/engine/lib/usersettings.php b/engine/lib/usersettings.php index c7c61a908..cde8b6691 100644 --- a/engine/lib/usersettings.php +++ b/engine/lib/usersettings.php @@ -32,20 +32,20 @@ { return extend_view($view, $new_settings_view, $priority); } - - function usersettings_pagesetup() { - - // Get config - global $CONFIG; - - // Menu options + + function usersettings_pagesetup() { + + // Get config + global $CONFIG; + + // Menu options if (get_context() == "settings") { - $user = get_loggedin_user(); - add_submenu_item(elgg_echo('usersettings:user:opt:linktext'),$CONFIG->wwwroot . "pg/settings/user/{$user->username}/"); - add_submenu_item(elgg_echo('profile:editicon'), $CONFIG->wwwroot . 'mod/profile/editicon.php'); - add_submenu_item(elgg_echo('usersettings:plugins:opt:linktext'),$CONFIG->wwwroot . "pg/settings/plugins/{$user->username}/"); - add_submenu_item(elgg_echo('usersettings:statistics:opt:linktext'),$CONFIG->wwwroot . "pg/settings/statistics/{$user->username}/"); - } + $user = get_loggedin_user(); + add_submenu_item(elgg_echo('usersettings:user:opt:linktext'),$CONFIG->wwwroot . "pg/settings/user/{$user->username}/"); + //add_submenu_item(elgg_echo('profile:editicon'), $CONFIG->wwwroot . 'mod/profile/editicon.php'); + add_submenu_item(elgg_echo('usersettings:plugins:opt:linktext'),$CONFIG->wwwroot . "pg/settings/plugins/{$user->username}/"); + add_submenu_item(elgg_echo('usersettings:statistics:opt:linktext'),$CONFIG->wwwroot . "pg/settings/statistics/{$user->username}/"); + } } function usersettings_page_handler($page) @@ -68,7 +68,7 @@ set_input('username', $page[1]); include($path); - } + } /** * Initialise the admin page. diff --git a/languages/en.php b/languages/en.php index 1ddbafb4c..6465ec785 100644 --- a/languages/en.php +++ b/languages/en.php @@ -347,8 +347,6 @@ To remove a widget drag it back to the Widget gallery.", 'friends:collectiondeletefailed' => "We were unable to delete the collection. Either you don't have permission, or some other problem has occurred.", 'friends:collectionadded' => "Your collection was successfuly created", 'friends:nocollectionname' => "You need to give your collection a name before it can be created.", - 'friends:expandall' => 'Expand all', - 'friends:closeall' => 'Close all', 'friends:collections:members' => "Collection members", 'friends:collections:edit' => "Edit collection", @@ -504,8 +502,7 @@ To remove a widget drag it back to the Widget gallery.", 'admin:plugins:label:copyright' => "Copyright", 'admin:plugins:label:licence' => "Licence", 'admin:plugins:label:website' => "URL", - 'admin:plugins:label:moreinfo' => 'more info', - 'admin:plugins:label:version' => 'Version', + "admin:plugins:label:moreinfo" => 'more info', 'admin:plugins:reorder:yes' => "Plugin %s was reordered successfully.", 'admin:plugins:reorder:no' => "Plugin %s could not be reordered.", 'admin:plugins:disable:yes' => "Plugin %s was disabled successfully.", diff --git a/mod/profile/views/default/profile/userdetails.php b/mod/profile/views/default/profile/userdetails.php index 58baa66e3..2ecfc9bd6 100644 --- a/mod/profile/views/default/profile/userdetails.php +++ b/mod/profile/views/default/profile/userdetails.php @@ -63,7 +63,7 @@ ?>

- +

"; + if (is_array($vars['collections']) && sizeof($vars['collections'])) { echo "