From 1a4652b1ade6ea4de842835a7d2a011845a1cd62 Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 3 Mar 2010 10:32:54 -0500
Subject: Changed label text for remote subscription to something similar.
 Given that this button will be used within context of subscriptions, 'New'
 works along with the '+' icon.

---
 plugins/OStatus/OStatusPlugin.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/OStatus/OStatusPlugin.php')

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index 7b6d22acf..b5e6867c8 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -727,7 +727,7 @@ class OStatusPlugin extends Plugin
                                              'class' => 'entity_subscribe'));
             $action->element('a', array('href' => common_local_url('ostatussub'),
                                         'class' => 'entity_remote_subscribe')
-                                , _m('Subscribe to remote user'));
+                                , _m('New'));
             $action->elementEnd('p');
             $action->elementEnd('div');
         }
-- 
cgit v1.2.3-54-g00ecf


From ea10805e3f68f5781321e7c93144242478081a1f Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 3 Mar 2010 11:22:21 -0500
Subject: Moved the remote subscription button to subscription mini list

---
 plugins/OStatus/OStatusPlugin.php          |  2 +-
 plugins/OStatus/theme/base/css/ostatus.css | 18 ++++++++++++++++--
 2 files changed, 17 insertions(+), 3 deletions(-)

(limited to 'plugins/OStatus/OStatusPlugin.php')

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index b5e6867c8..eb777c6b2 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -711,7 +711,7 @@ class OStatusPlugin extends Plugin
         return true;
     }
 
-    function onStartShowAllContent($action)
+    function onEndShowSubscriptionsMiniList($action)
     {
         $this->showEntityRemoteSubscribe($action);
 
diff --git a/plugins/OStatus/theme/base/css/ostatus.css b/plugins/OStatus/theme/base/css/ostatus.css
index 13e30ef5d..40cdfcef1 100644
--- a/plugins/OStatus/theme/base/css/ostatus.css
+++ b/plugins/OStatus/theme/base/css/ostatus.css
@@ -41,8 +41,22 @@ min-width:96px;
 #entity_remote_subscribe {
 padding:0;
 float:right;
+position:relative;
 }
 
-#all #entity_remote_subscribe {
-margin-top:-52px;
+.section .entity_actions {
+margin-bottom:0;
+}
+
+.section #entity_remote_subscribe .entity_remote_subscribe {
+border-color:#AAAAAA;
+}
+
+.section #entity_remote_subscribe .dialogbox {
+width:405px;
+}
+
+
+.aside #entity_subscriptions .more {
+float:left;
 }
-- 
cgit v1.2.3-54-g00ecf


From 11750e832f994013b2fbce860bd24d24f49a14db Mon Sep 17 00:00:00 2001
From: Sarven Capadisli <csarven@status.net>
Date: Wed, 3 Mar 2010 12:02:10 -0500
Subject: Added remote join action for group profile

---
 plugins/OStatus/OStatusPlugin.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

(limited to 'plugins/OStatus/OStatusPlugin.php')

diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index eb777c6b2..014fb0b38 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -210,6 +210,26 @@ class OStatusPlugin extends Plugin
         return false;
     }
 
+    function onStartGroupSubscribe($output, $group)
+    {
+        $cur = common_current_user();
+
+        if (empty($cur)) {
+            // Add an OStatus subscribe
+            $output->elementStart('li', 'entity_subscribe');
+            $url = common_local_url('ostatusinit',
+                                    array('nickname' => $group->nickname));
+            $output->element('a', array('href' => $url,
+                                        'class' => 'entity_remote_subscribe'),
+                                _m('Join'));
+
+            $output->elementEnd('li');
+        }
+
+        return false;
+    }
+
+
     /**
      * Check if we've got remote replies to send via Salmon.
      *
-- 
cgit v1.2.3-54-g00ecf