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

2 files changed, 10 insertions, 0 deletions

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 95414e517..9d5613b20 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/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();
diff --git a/plugins/OStatus/theme/base/css/ostatus.css b/plugins/OStatus/theme/base/css/ostatus.css
index 40cdfcef1..d1c60cc0d 100644
--- a/plugins/OStatus/theme/base/css/ostatus.css
+++ b/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;
 }