made breadcrumbs consistent in content plugins

diff --git a/mod/blog/languages/en.php b/mod/blog/languages/en.php
index 460c407d98d8beb626129c0803c52b07721396c8..47dc57ddad5b88fe0609c1c9649c9b3f1322c1e9 100644 (file)
--- a/mod/blog/languages/en.php
+++ b/mod/blog/languages/en.php
@@ -12,9 +12,9 @@ $english = array(
        'blog:blog' => 'Blog',
        'item:object:blog' => 'Blogs',
 
-       'blog:title:user_blogs' => '%s\'s Blogs',
-       'blog:title:all_blogs' => 'All Site Blogs',
-       'blog:title:friends' => 'Friends\' Blogs',
+       'blog:title:user_blogs' => '%s\'s blogs',
+       'blog:title:all_blogs' => 'All site blogs',
+       'blog:title:friends' => 'Friends\' blogs',
 
        'blog:group' => 'Group blog',
        'blog:enableblog' => 'Enable group blog',

diff --git a/mod/blog/lib/blog.php b/mod/blog/lib/blog.php
index 6bdbc8b1fd347307920195539772d61179278216..4d1edd50ebf610128c63a088f546663c169d69e6 100644 (file)
--- a/mod/blog/lib/blog.php
+++ b/mod/blog/lib/blog.php
@@ -88,6 +88,8 @@ function blog_get_page_content_list($container_guid = NULL) {
        } else {
                $return['filter_context'] = 'all';
                $return['title'] = elgg_echo('blog:title:all_blogs');
+               elgg_pop_breadcrumb();
+               elgg_push_breadcrumb(elgg_echo('blog:blogs'));
        }
 
        // show all posts for admin or users looking at their own blogs

diff --git a/mod/bookmarks/pages/bookmarks/all.php b/mod/bookmarks/pages/bookmarks/all.php
index 0978fd7fd617185081c27282b4c3ce8d2f558da8..ec0f85e2b11e69b02a468acaae4354813fe160d9 100644 (file)
--- a/mod/bookmarks/pages/bookmarks/all.php
+++ b/mod/bookmarks/pages/bookmarks/all.php
@@ -5,6 +5,9 @@
  * @package ElggBookmarks
  */
 
+elgg_pop_breadcrumb();
+elgg_push_breadcrumb(elgg_echo('bookmarks'));
+
 $offset = (int)get_input('offset', 0);
 $content = elgg_list_entities(array(
        'type' => 'object',

diff --git a/mod/bookmarks/start.php b/mod/bookmarks/start.php
index 1fb79deb6a300fb41887a83079a1e75b5d7b653a..2a7b44e97a55b831f7fb6c45542d0ba21c916b21 100644 (file)
--- a/mod/bookmarks/start.php
+++ b/mod/bookmarks/start.php
@@ -88,7 +88,6 @@ function bookmarks_page_handler($page) {
        elgg_load_library('elgg:bookmarks');
 
        elgg_push_breadcrumb(elgg_echo('bookmarks'), 'bookmarks/all');
-       elgg_push_context('bookmarks');
 
        // old group usernames
        if (substr_count($page[0], 'group:')) {

diff --git a/mod/file/languages/en.php b/mod/file/languages/en.php
index 1db32afcb80f44c8a31ee4d49cbf1e111966eea0..72b198d54d1c48349fbddc0dd607b901ae17f91d 100644 (file)
--- a/mod/file/languages/en.php
+++ b/mod/file/languages/en.php
@@ -11,11 +11,8 @@ $english = array(
         * Menu items and titles
         */
        'file' => "Files",
-       'files' => "My Files",
-       'file:yours' => "Your files",
-       'file:yours:friends' => "Your friends' files",
        'file:user' => "%s's files",
-       'file:friends' => "%s's friends' files",
+       'file:friends' => "Friends' files",
        'file:all' => "All site files",
        'file:edit' => "Edit file",
        'file:more' => "More files",

diff --git a/mod/file/pages/file/friends.php b/mod/file/pages/file/friends.php
index 65fc66f62337a7cb4bb84f8d2273d2c765935992..fc23e1d1ed88e26b244348ce9b03218ba24b9500 100644 (file)
--- a/mod/file/pages/file/friends.php
+++ b/mod/file/pages/file/friends.php
@@ -12,7 +12,7 @@ elgg_push_breadcrumb($owner->name, "file/owner/$owner->username");
 elgg_push_breadcrumb(elgg_echo('friends'));
 
 
-$title = elgg_echo("file:friends", array($owner->name));
+$title = elgg_echo("file:friends");
 
 // offset is grabbed in list_user_friends_objects
 $content = list_user_friends_objects($owner->guid, 'file', 10, false);

diff --git a/mod/file/pages/file/owner.php b/mod/file/pages/file/owner.php
index 69ec30425e409bd24e1fee239fc7db322af79920..a01e9cd225caf1c919361a9b2a8f0bb74b92cb14 100644 (file)
--- a/mod/file/pages/file/owner.php
+++ b/mod/file/pages/file/owner.php
@@ -17,20 +17,19 @@ $params = array();
 
 if ($owner->guid == elgg_get_logged_in_user_guid()) {
        // user looking at own files
-       $title = elgg_echo('file:yours');
        $params['filter_context'] = 'mine';
 } else if (elgg_instanceof($owner, 'user')) {
        // someone else's files
-       $title = elgg_echo("file:user", array($owner->name));
        // do not show button or select a tab when viewing someone else's posts
        $params['filter_context'] = 'none';
        $params['buttons'] = '';
 } else {
        // group files
-       $title = elgg_echo("file:user", array($owner->name));
        $params['filter'] = '';
 }
 
+$title = elgg_echo("file:user", array($owner->name));
+
 // List files
 $content = elgg_list_entities(array(
        'types' => 'object',