Merge branch '1.0.x' into testing

[quix0rs-gnu-social.git] / actions / all.php

diff --git a/actions/all.php b/actions/all.php
index a77d6014f4d116bc9aab8aae3ef3b6e1b219508a..2e53691636d3361c3af73507c6769237243b847d 100644 (file)
--- a/actions/all.php
+++ b/actions/all.php
@@ -56,12 +56,10 @@ class AllAction extends ProfileAction
     {
         parent::prepare($args);
 
-        $stream = new InboxNoticeStream($this->user);
+        $stream = new ThreadingInboxNoticeStream($this->user, Profile::current());
 
         $this->notice = $stream->getNotices(($this->page-1)*NOTICES_PER_PAGE,
-                                            NOTICES_PER_PAGE + 1,
-                                            null,
-                                            null);
+                                            NOTICES_PER_PAGE + 1);
 
         if ($this->page > 1 && $this->notice->N == 0) {
             // TRANS: Server error when page not found (404).
@@ -86,12 +84,15 @@ class AllAction extends ProfileAction
 
     function title()
     {
-        if ($this->page > 1) {
-            // TRANS: Page title. %1$s is user nickname, %2$d is page number
-            return sprintf(_('%1$s and friends, page %2$d'), $this->user->nickname, $this->page);
+        $user = common_current_user();
+        if ($user->id == $this->user->id) {
+            // TRANS: Title of a user's own start page.
+            return _('Home timeline');
         } else {
-            // TRANS: Page title. %s is user nickname
-            return sprintf(_("%s and friends"), $this->user->nickname);
+            $profile = $this->user->getProfile();
+            // TRANS: Title of another user's start page.
+            // TRANS: %s is the other user's name.
+            return sprintf(_("%s's home timeline"), $profile->getBestName());
         }
     }
 
@@ -185,23 +186,19 @@ class AllAction extends ProfileAction
 
     function showSections()
     {
-        $this->showSubscriptions();
         $ibs = new InviteButtonSection($this);
         $ibs->show();
-        $this->showSubscribers();
-        $this->showGroups();
-        $this->showLists();
+        $pop = new PopularNoticeSection($this);
+        $pop->show();
+        //        $pop = new InboxTagCloudSection($this, $this->user);
+        //        $pop->show();
     }
+}
 
-    function showPageTitle()
+class ThreadingInboxNoticeStream extends ThreadingNoticeStream
+{
+    function __construct($user, $profile)
     {
-        $user = common_current_user();
-        if ($user && ($user->id == $this->user->id)) {
-            // TRANS: H1 text for page when viewing a list for self.
-            $this->element('h1', null, _("You and friends"));
-        } else {
-            // TRANS: H1 text for page. %s is a user nickname.
-            $this->element('h1', null, sprintf(_('%s and friends'), $this->user->nickname));
-        }
+        parent::__construct(new InboxNoticeStream($user, $profile));
     }
 }