Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x

diff --git a/actions/showstream.php b/actions/showstream.php
index a2320909fcf57e7db664f0611c937a68a9506e91..fe819d30cf8302341ae0f975d709c9a13a6846fd 100644 (file)
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -103,12 +103,6 @@ class ShowstreamAction extends ProfileAction
         $this->showNotices();
     }
 
-    function showObjectNav()
-    {
-        $nav = new SubGroupNav($this, $this->user);
-        $nav->show();
-    }
-
     function showProfileBlock()
     {
         $block = new AccountProfileBlock($this, $this->profile);

diff --git a/actions/subscribers.php b/actions/subscribers.php
index ad522a4bae63372b0632f302ec794a329ba88735..9e1fb4cf73c30b318115bbd8833f0e4fa77f3350 100644 (file)
--- a/actions/subscribers.php
+++ b/actions/subscribers.php
@@ -135,11 +135,6 @@ class SubscribersAction extends GalleryAction
     function showSections()
     {
         parent::showSections();
-        $cloud = new SubscribersPeopleTagCloudSection($this);
-        $cloud->show();
-
-        $cloud2 = new SubscribersPeopleSelfTagCloudSection($this);
-        $cloud2->show();
     }
 }
 

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index cfe2b5683a830673f7bda83c877ef768a2ac78a5..9fc4656ac24f7e6d38268886bf31507ee3d99aae 100644 (file)
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -152,16 +152,6 @@ class SubscriptionsAction extends GalleryAction
         $this->elementEnd('div');
     }
 
-    function showSections()
-    {
-        parent::showSections();
-        $cloud = new SubscriptionsPeopleTagCloudSection($this);
-        $cloud->show();
-
-        $cloud2 = new SubscriptionsPeopleSelfTagCloudSection($this);
-        $cloud2->show();
-    }
-
     /**
      * Link to feeds of subscriptions
      *

diff --git a/actions/tag.php b/actions/tag.php
index 045fac97b52286e1f9839f607ea15ced53840d76..f3514bef55a2152af619f7ee57693d7a33183e08 100644 (file)
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -55,12 +55,6 @@ class TagAction extends Action
         return true;
     }
 
-    function showSections()
-    {
-        $pop = new PopularNoticeSection($this);
-        $pop->show();
-    }
-
     function title()
     {
         if ($this->page == 1) {

diff --git a/actions/usergroups.php b/actions/usergroups.php
index f9063d88672a06969c014c2c35b736b290977ac2..ca95abddf5e69942a04fd791a2767801af8d6a19 100644 (file)
--- a/actions/usergroups.php
+++ b/actions/usergroups.php
@@ -45,7 +45,7 @@ require_once INSTALLDIR.'/lib/grouplist.php';
  * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
  * @link     http://status.net/
  */
-class UsergroupsAction extends OwnerDesignAction
+class UsergroupsAction extends ProfileAction
 {
     var $page = null;
     var $profile = null;
@@ -115,12 +115,6 @@ class UsergroupsAction extends OwnerDesignAction
         $this->showPage();
     }
 
-    function showObjectNav()
-    {
-        $nav = new SubGroupNav($this, $this->user);
-        $nav->show();
-    }
-
     function showContent()
     {
         $this->elementStart('p', array('id' => 'new_group'));

diff --git a/lib/galleryaction.php b/lib/galleryaction.php
index ac2feeeccf11d5bcfc8fc253c4b33dfbf520c91b..bd7da195fa0b66f7d72840e28d70ef3741f1b594 100644 (file)
--- a/lib/galleryaction.php
+++ b/lib/galleryaction.php
@@ -28,7 +28,7 @@ require_once INSTALLDIR.'/lib/profilelist.php';
 define('AVATARS_PER_PAGE', 80);
 
 // @todo FIXME: Class documentation missing.
-class GalleryAction extends OwnerDesignAction
+class GalleryAction extends ProfileAction
 {
     var $profile = null;
     var $page = null;
@@ -97,12 +97,6 @@ class GalleryAction extends OwnerDesignAction
         $this->showPage();
     }
 
-    function showObjectNav()
-    {
-        $nav = new SubGroupNav($this, $this->user);
-        $nav->show();
-    }
-
     function showContent()
     {
         $this->showTagsDropdown();

diff --git a/lib/personaltagcloudsection.php b/lib/personaltagcloudsection.php
index fd10ba14d615bdc9465bf134e388334c1c611589..a86bb23e8d8241234977c922df29eaf1e7611b37 100644 (file)
--- a/lib/personaltagcloudsection.php
+++ b/lib/personaltagcloudsection.php
@@ -53,7 +53,7 @@ class PersonalTagCloudSection extends TagCloudSection
     function title()
     {
         // TRANS: Title for personal tag cloud section. %s is a user nickname.
-        return sprintf(_('Tags in %s\'s notices'), $this->user->nickname);
+        return sprintf(_('Tags'), $this->user->nickname);
     }
 
     function getTags()

diff --git a/lib/profileaction.php b/lib/profileaction.php
index ca008739de500649c44d20442e6e99fbc877146f..59682d5505e76bf84d967f5cdf2a7c1cec88ce28 100644 (file)
--- a/lib/profileaction.php
+++ b/lib/profileaction.php
@@ -126,7 +126,9 @@ class ProfileAction extends OwnerDesignAction
         if (Event::handle('StartShowSubscriptionsMiniList', array($this))) {
             $this->elementStart('h2');
             // TRANS: H2 text for user subscription statistics.
-            $this->statsSectionLink('subscriptions', _('Subscriptions'));
+            $this->statsSectionLink('subscriptions', _('Following'));
+            $this->text(' ');
+            $this->text($this->profile->subscriptionCount());
             $this->elementEnd('h2');
 
             $cnt = 0;
@@ -140,13 +142,6 @@ class ProfileAction extends OwnerDesignAction
                 }
             }
 
-            if ($cnt > PROFILES_PER_MINILIST) {
-                $this->elementStart('p');
-                // TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
-                $this->statsSectionLink('subscriptions', _('All subscriptions'), 'more');
-                $this->elementEnd('p');
-            }
-
             Event::handle('EndShowSubscriptionsMiniList', array($this));
         }
         $this->elementEnd('div');
@@ -163,7 +158,9 @@ class ProfileAction extends OwnerDesignAction
 
             $this->elementStart('h2');
             // TRANS: H2 text for user subscriber statistics.
-            $this->statsSectionLink('subscribers', _('Subscribers'));
+            $this->statsSectionLink('subscribers', _('Followers'));
+            $this->text(' ');
+            $this->text($this->profile->subscriberCount());
             $this->elementEnd('h2');
 
             $cnt = 0;
@@ -177,13 +174,6 @@ class ProfileAction extends OwnerDesignAction
                 }
             }
 
-            if ($cnt > PROFILES_PER_MINILIST) {
-                $this->elementStart('p');
-                // TRANS: Text for user subscription statistics if user has more subscribers than displayed.
-                $this->statsSectionLink('subscribers', _('All subscribers'), 'more');
-                $this->elementEnd('p');
-            }
-
             Event::handle('EndShowSubscribersMiniList', array($this));
         }
 
@@ -243,27 +233,6 @@ class ProfileAction extends OwnerDesignAction
                 'label' => _('Member since'),
                 'value' => date('j M Y', strtotime($profile->created))
             ),
-            array(
-                'id' => 'subscriptions',
-                // TRANS: Label for user statistics.
-                'label' => _('Subscriptions'),
-                'link' => common_local_url('subscriptions', $actionParams),
-                'value' => $profile->subscriptionCount(),
-            ),
-            array(
-                'id' => 'subscribers',
-                // TRANS: Label for user statistics.
-                'label' => _('Subscribers'),
-                'link' => common_local_url('subscribers', $actionParams),
-                'value' => $profile->subscriberCount(),
-            ),
-            array(
-                'id' => 'groups',
-                // TRANS: Label for user statistics.
-                'label' => _('Groups'),
-                'link' => common_local_url('usergroups', $actionParams),
-                'value' => $profile->getGroups()->N,
-            ),
             array(
                 'id' => 'notices',
                 // TRANS: Label for user statistics.
@@ -312,6 +281,8 @@ class ProfileAction extends OwnerDesignAction
             $this->elementStart('h2');
             // TRANS: H2 text for user group membership statistics.
             $this->statsSectionLink('usergroups', _('Groups'));
+            $this->text(' ');
+            $this->text($this->profile->getGroups()->N);
             $this->elementEnd('h2');
 
             if ($groups) {