diff options
| -rw-r--r-- | engine/lib/usersettings.php | 28 | ||||
| -rw-r--r-- | languages/en.php | 5 | ||||
| -rw-r--r-- | mod/profile/views/default/profile/userdetails.php | 2 | ||||
| -rw-r--r-- | views/default/friends/collections.php | 4 | ||||
| -rw-r--r-- | views/default/friends/forms/edit.php | 60 | ||||
| -rw-r--r-- | 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 <b>Widget gallery</b>.", '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 <b>Widget gallery</b>.", '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 @@ ?>
<p class="profile_info_edit_buttons">
- <a href="<?php echo $vars['url']; ?>mod/profile/edit.php?username=<?php echo $vars['entity']->username; ?>"><?php echo elgg_echo("profile:editdetails"); ?></a>
+ <a href="<?php echo $vars['url']; ?>mod/profile/edit.php"><?php echo elgg_echo("profile:edit"); ?></a>
</p>
<?php
diff --git a/views/default/friends/collections.php b/views/default/friends/collections.php index 14995309d..6a77f7773 100644 --- a/views/default/friends/collections.php +++ b/views/default/friends/collections.php @@ -16,6 +16,8 @@ if (!isset($friendspicker)) $friendspicker = 0;
+ echo "<div class=\"contentWrapper\">";
+
if (is_array($vars['collections']) && sizeof($vars['collections'])) {
echo "<ul id=\"friends_collections_accordian\">";
@@ -34,6 +36,8 @@ echo elgg_echo("friends:nocollections");
}
+
+ echo "</div>";
?>
diff --git a/views/default/friends/forms/edit.php b/views/default/friends/forms/edit.php index 80a080f3e..683e0503c 100644 --- a/views/default/friends/forms/edit.php +++ b/views/default/friends/forms/edit.php @@ -1,31 +1,31 @@ -<?php
-
- /**
- * Elgg friend collections add/edit
- *
- * @package Elgg
- * @subpackage Core
- * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2
- * @author Curverider Ltd
- * @copyright Curverider Ltd 2008-2009
- * @link http://elgg.org/
- *
- * @uses $vars['object'] Optionally, the collection edit
- */
-
- // var_export($vars['collection'][0]->id);
-
- // Set title, form destination
- if (isset($vars['collection'])) {
- $action = "friends/editcollection";
- $title = $vars['collection'][0]->name;
- } else {
- $action = "friends/addcollection";
- $title = "";
- }
+<?php + + /** + * Elgg friend collections add/edit + * + * @package Elgg + * @subpackage Core + * @license http://www.gnu.org/licenses/old-licenses/gpl-2.0.html GNU Public License version 2 + * @author Curverider Ltd + * @copyright Curverider Ltd 2008-2009 + * @link http://elgg.org/ + * + * @uses $vars['object'] Optionally, the collection edit + */ + + // var_export($vars['collection'][0]->id); + + // Set title, form destination + if (isset($vars['collection'])) { + $action = "friends/editcollection"; + $title = $vars['collection'][0]->name; + } else { + $action = "friends/addcollection"; + $title = ""; + } - $form_body = "<p><label>" . elgg_echo("friends:collectionname") . "<br />" . + $form_body = "<div class='contentWrapper'><p><label>" . elgg_echo("friends:collectionname") . "<br />" . elgg_view("input/text", array( "internalname" => "collection_name", "value" => $title, @@ -45,15 +45,15 @@ $form_body .= "</p>"; - $form_body .= "<p><label>" . elgg_echo("friends:addfriends") . "<br />". - elgg_view('friends/picker',array('entities' => $vars['friends'], 'internalname' => 'friends_collection')) . "</label></p>"; + $form_body .= "<p><label>" . elgg_echo("friends:addfriends") . "</label>". + elgg_view('friends/picker',array('entities' => $vars['friends'], 'internalname' => 'friends_collection')) . "</p>"; $form_body .= "<p>"; if (isset($vars['collection'])) { $form_body .= elgg_view('input/hidden', array('internalname' => 'collection_id', 'value' => "{$vars['collection'][0]->id}")); } $form_body .= elgg_view('input/submit', array('internalname' => 'submit', 'value' => elgg_echo('save'))); - $form_body .= "</p>"; + $form_body .= "</p></div>"; - echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/$action"));
+ echo elgg_view('input/form', array('body' => $form_body, 'action' => "{$vars['url']}action/$action")); ?>
\ No newline at end of file diff --git a/views/default/friends/tablelist.php b/views/default/friends/tablelist.php index aa01461e0..eca106b69 100644 --- a/views/default/friends/tablelist.php +++ b/views/default/friends/tablelist.php @@ -18,7 +18,7 @@ ?> - <table cellspacing="0" id="collectionMembersTable" style="margin:10px;"> + <table cellspacing="0" id="collectionMembersTable"> <tr> <?php $column = 0; |