diff options
| -rw-r--r-- | engine/lib/users.php | 11 | ||||
| -rw-r--r-- | languages/en.php | 3 | ||||
| -rw-r--r-- | pages/friends/collections.php | 11 | ||||
| -rw-r--r-- | views/default/css/elements/misc.php | 28 |
4 files changed, 42 insertions, 11 deletions
diff --git a/engine/lib/users.php b/engine/lib/users.php index 8a5289a03..1ac87e7d1 100644 --- a/engine/lib/users.php +++ b/engine/lib/users.php @@ -1087,16 +1087,18 @@ function collections_submenu_items() { $user = elgg_get_logged_in_user_entity(); elgg_register_menu_item('page', array( - 'name' => 'friends:collections:view', + 'name' => 'friends:view:collections', 'text' => elgg_echo('friends:collections'), 'href' => "pg/collections/$user->username", )); - +/* elgg_register_menu_item('page', array( 'name' => 'friends:collections:add', 'text' => elgg_echo('friends:collections:add'), 'href' => "pg/collections/add", )); + * + */ } /** @@ -1111,7 +1113,6 @@ function friends_page_handler($page_elements) { set_page_owner($user->getGUID()); } if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) { - // disabled for now as we no longer use friends collections (replaced by shared access) collections_submenu_items(); } require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/index.php"); @@ -1130,7 +1131,6 @@ function friends_of_page_handler($page_elements) { set_page_owner($user->getGUID()); } if (elgg_get_logged_in_user_guid() == elgg_get_page_owner_guid()) { - // disabled for now as we no longer use friends collections (replaced by shared access) collections_submenu_items(); } require_once(dirname(dirname(dirname(__FILE__))) . "/pages/friends/of.php"); @@ -1144,6 +1144,7 @@ function friends_of_page_handler($page_elements) { * @return void */ function collections_page_handler($page_elements) { + elgg_set_context('friends'); if (isset($page_elements[0])) { if ($page_elements[0] == "add") { set_page_owner(elgg_get_logged_in_user_guid()); @@ -1474,7 +1475,7 @@ function users_pagesetup() { elgg_register_menu_item('page', $params); $params = array( - 'name' => 'friendsof', + 'name' => 'friends:of', 'text' => elgg_echo('friends:of'), 'href' => 'pg/friendsof/' . elgg_get_page_owner_entity()->username, 'contexts' => array('friends') diff --git a/languages/en.php b/languages/en.php index 60eea1a65..26599414b 100644 --- a/languages/en.php +++ b/languages/en.php @@ -324,7 +324,8 @@ $english = array( 'friends:of:owned' => "People who have made %s a friend", 'friends:of' => "Friends of", - 'friends:collections' => "Collections of friends", + 'friends:collections' => "Friend collections", + 'collections:add' => "New collection", 'friends:collections:add' => "New friends collection", 'friends:addfriends' => "Add friends", 'friends:collectionname' => "Collection name", diff --git a/pages/friends/collections.php b/pages/friends/collections.php index 5a32b7f90..fa7527f4d 100644 --- a/pages/friends/collections.php +++ b/pages/friends/collections.php @@ -11,10 +11,13 @@ gatekeeper(); $title = elgg_echo('friends:collections'); -$content = elgg_view_title($title); +$content = elgg_view_access_collections(elgg_get_logged_in_user_guid()); -$content .= elgg_view_access_collections(elgg_get_logged_in_user_guid()); - -$body = elgg_view_layout('one_sidebar', array('content' => $content)); +$body = elgg_view_layout('content', array( + 'filter' => false, + 'content' => $content, + 'title' => $title, + 'context' => 'collections', +)); echo elgg_view_page($title, $body); diff --git a/views/default/css/elements/misc.php b/views/default/css/elements/misc.php index 14551c273..d0c97169d 100644 --- a/views/default/css/elements/misc.php +++ b/views/default/css/elements/misc.php @@ -31,4 +31,30 @@ overflow: hidden; width: 100px; height: 100px; -}
\ No newline at end of file +} + +/* *************************************** + FRIENDS COLLECTIONS +*************************************** */ + +#friends_collections_accordian li { + color: #666666; +} +#friends_collections_accordian li h2 { + -moz-border-radius: 8px 8px 8px 8px; + background: none repeat scroll 0 0 #4690D6; + color: white; + cursor: pointer; + font-size: 1.2em; + margin: 10px 0; + padding: 4px 2px 4px 6px; +} +#friends_collections_accordian .friends_collections_controls { + float: right; + font-size: 70%; +} +#friends_collections_accordian .friends-picker { + background: none repeat scroll 0 0 white; + display: none; + padding: 0; +} |