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

* 'testing' of gitorious.org:statusnet/mainline:
  Using position relative only for the remote subscription in section
  Added group subscription button to groups mini list
  Added event hooks at the start and end of groups mini list

EVENTS.txt

@@ -790,6 +790,12 @@ StartShowSubscriptionsMiniList: at the start of subscriptions mini list
 EndShowSubscriptionsMiniList: at the end of subscriptions mini list
 - $action: the current action
 
+StartShowGroupsMiniList: at the start of groups mini list
+- $action: the current action
+
+EndShowGroupsMiniList: at the end of groups mini list
+- $action: the current action
+
 StartDeleteUserForm: starting the data in the form for deleting a user
 - $action: action being shown
 - $user: user being deleted

lib/profileaction.php

@@ -105,7 +105,6 @@ class ProfileAction extends OwnerDesignAction
 
         $this->elementStart('div', array('id' => 'entity_subscriptions',
                                          'class' => 'section'));
-
         if (Event::handle('StartShowSubscriptionsMiniList', array($this))) {
             $this->element('h2', null, _('Subscriptions'));
 
@@ -229,27 +228,29 @@ class ProfileAction extends OwnerDesignAction
 
         $this->elementStart('div', array('id' => 'entity_groups',
                                          'class' => 'section'));
+        if (Event::handle('StartShowGroupsMiniList', array($this))) {
+            $this->element('h2', null, _('Groups'));
 
-        $this->element('h2', null, _('Groups'));
+            if ($groups) {
-
+                $gml = new GroupMiniList($groups, $this->user, $this);
-        if ($groups) {
+                $cnt = $gml->show();
-            $gml = new GroupMiniList($groups, $this->user, $this);
+                if ($cnt == 0) {
-            $cnt = $gml->show();
+                    $this->element('p', null, _('(None)'));
-            if ($cnt == 0) {
+                }
-                $this->element('p', null, _('(None)'));
             }
-        }
 
-        if ($cnt > GROUPS_PER_MINILIST) {
+            if ($cnt > GROUPS_PER_MINILIST) {
-            $this->elementStart('p');
+                $this->elementStart('p');
-            $this->element('a', array('href' => common_local_url('usergroups',
+                $this->element('a', array('href' => common_local_url('usergroups',
-                                                                 array('nickname' => $this->profile->nickname)),
+                                                                     array('nickname' => $this->profile->nickname)),
-                                      'class' => 'more'),
+                                          'class' => 'more'),
-                           _('All groups'));
+                               _('All groups'));
-            $this->elementEnd('p');
+                $this->elementEnd('p');
-        }
+            }
 
-        $this->elementEnd('div');
+            Event::handle('EndShowGroupsMiniList', array($this));
+        }
+            $this->elementEnd('div');
     }
 }
 

plugins/OStatus/OStatusPlugin.php

@@ -738,6 +738,13 @@ class OStatusPlugin extends Plugin
         return true;
     }
 
+    function onEndShowGroupsMiniList($action)
+    {
+        $this->showEntityRemoteSubscribe($action);
+
+        return true;
+    }
+
     function showEntityRemoteSubscribe($action)
     {
         $user = common_current_user();

plugins/OStatus/theme/base/css/ostatus.css

@@ -41,6 +41,9 @@ min-width:96px;
 #entity_remote_subscribe {
 padding:0;
 float:right;
+}
+
+.section #entity_remote_subscribe {
 position:relative;
 }