Highlighting current tab in content header.

Includes updates to language strings.

git-svn-id: http://code.elgg.org/elgg/trunk@5650 36083f99-b078-4883-b0ff-0f9b5a30f544

diff --git a/mod/blog/blog_lib.php b/mod/blog/blog_lib.php
index 83afab87200399cea88d9a86916a1367e902a060..0ecd48b860af3d55df924fe9db5348c3b037644c 100644 (file)
--- a/mod/blog/blog_lib.php
+++ b/mod/blog/blog_lib.php
@@ -30,7 +30,7 @@ function blog_get_page_content_read($owner_guid = NULL, $guid = NULL) {
                }
        } else {
                $content = elgg_view('page_elements/content_header', array(
-                       'context' => $context,
+                       'context' => $owner_guid ? 'mine' : 'everyone',
                        'type' => 'blog',
                        'all_link' => "{$CONFIG->site->url}pg/blog"
                ));
@@ -61,7 +61,12 @@ function blog_get_page_content_read($owner_guid = NULL, $guid = NULL) {
                        );
                }
 
-               $content .= elgg_list_entities_from_metadata($options);
+               $list = elgg_list_entities_from_metadata($options);
+               if (!$list) {
+                       $content .= elgg_echo('blog:none');
+               } else {
+                       $content .= $list;
+               }
        }
 
        return array('content' => $content);
@@ -121,11 +126,8 @@ function blog_get_page_content_archive($owner_guid, $lower=0, $upper=0) {
        
        $now = time();
 
-       $content = elgg_view('page_elements/content_header', array(
-               'context' => $context,
-               'type' => 'blog',
-               'all_link' => "{$CONFIG->site->url}pg/blog"
-       ));
+       elgg_push_breadcrumb(elgg_echo('blog:archives'));
+       $content = elgg_view('page_elements/content_header_member', array('type' => 'blog'));
 
        if ($lower) {
                $lower = (int)$lower;
@@ -174,7 +176,12 @@ function blog_get_page_content_archive($owner_guid, $lower=0, $upper=0) {
                );
        }
 
-       $content .= elgg_list_entities_from_metadata($options);
+       $list = elgg_list_entities_from_metadata($options);
+       if (!$list) {
+               $content .= elgg_echo('blog:none');
+       } else {
+               $content .= $list;
+       }
 
        return array(
                'content' => $content
@@ -190,16 +197,16 @@ function blog_get_page_content_archive($owner_guid, $lower=0, $upper=0) {
 function blog_get_page_content_friends($user_guid) {
        global $CONFIG;
        
-       elgg_push_breadcrumb(elgg_echo('blog:friends'));
+       elgg_push_breadcrumb(elgg_echo('friends'));
        
        $content = elgg_view('page_elements/content_header', array(
-               'context' => $context,
+               'context' => 'friends',
                'type' => 'blog',
                'all_link' => "{$CONFIG->site->url}pg/blog"
        ));
        
        if (!$friends = get_user_friends($user_guid, ELGG_ENTITIES_ANY_VALUE, 0)) {
-               $content .= elgg_echo('blog:no_friends');
+               $content .= elgg_echo('friends:none:you');
        } else {
                $options = array(
                        'type' => 'object',
@@ -224,7 +231,12 @@ function blog_get_page_content_friends($user_guid) {
                        );
                }
                
-               $content .= elgg_list_entities_from_metadata($options);
+               $list = elgg_list_entities_from_metadata($options);
+               if (!$list) {
+                       $content .= elgg_echo('blog:none');
+               } else {
+                       $content .= $list;
+               }
        }
        
        return array('content' => $content);

diff --git a/mod/blog/languages/en.php b/mod/blog/languages/en.php
index f005dbf4cd04bca6d7877489384bb38acc7fd8c9..b210ba8d197a5c22bc97f28e14cb3675226c03dd 100644 (file)
--- a/mod/blog/languages/en.php
+++ b/mod/blog/languages/en.php
@@ -10,12 +10,11 @@ $english = array(
        'blog:owned_blogs' => '%s',
        'blog:revisions' => 'Revisions',
        'blog:archives' => 'Archives',
-
        'blog:blog' => 'Blog',
-       'blog:friends' => 'Friends\' blogs',
        
        'blog:title:user_blogs' => '%s\'s Blogs',
        'blog:title:all_blogs' => 'All Site Blogs',
+       'blog:title:friends' => 'All Friends\' Blogs',
 
        // Editing
        'blog:new' => 'New blog post',
@@ -41,6 +40,7 @@ $english = array(
        'blog:error:post_not_found' => 'This post has been removed or is invalid.',
        'blog:messages:warning:draft' => 'There is an unsaved draft of this post!',
        'blog:edit_revision_notice' => '(Old version)',
+       'blog:none' => 'No blogs found',
 
        // river
        'blog:river:create' => '%s wrote a new blog post',

diff --git a/mod/blog/start.php b/mod/blog/start.php
index a04d5d0bbb84593167e2a2b49f550db82e807405..f36c542a2ee574491b577f3e1541800158a022a8 100644 (file)
--- a/mod/blog/start.php
+++ b/mod/blog/start.php
@@ -133,7 +133,7 @@ function blog_page_handler($page) {
                                break;
 
                        case 'friends':
-                               $title = elgg_echo('blog:friends');
+                               $title = elgg_echo('blog:title:friends');
                                $content_info = blog_get_page_content_friends($user->getGUID());
                                break;