hide buttons for repeat, delete system activities

diff --git a/plugins/Activity/ActivityPlugin.php b/plugins/Activity/ActivityPlugin.php
index e3ee39dc9ad24b563371205ee5f0bfa4e6fafb5e..0423a791e4216c514d1fec62675b5a4c887472f2 100644 (file)
--- a/plugins/Activity/ActivityPlugin.php
+++ b/plugins/Activity/ActivityPlugin.php
@@ -67,6 +67,7 @@ class ActivityPlugin extends Plugin
         case 'LeaveListItem':
         case 'FollowListItem':
         case 'UnfollowListItem':
+        case 'SystemListItem':
             include_once $dir . '/'.strtolower($cls).'.php';
             return false;
         default:

diff --git a/plugins/Activity/followlistitem.php b/plugins/Activity/followlistitem.php
index 5a3721013a113f36546d008157030e4ee11d07a1..ddbbc45cc021446071240fb469dc930b663a6be8 100644 (file)
--- a/plugins/Activity/followlistitem.php
+++ b/plugins/Activity/followlistitem.php
@@ -45,34 +45,7 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class FollowListItem extends NoticeListItemAdapter
+class FollowListItem extends SystemListItem
 {
-    /**
-     * Show the join activity
-     *
-     * @return void
-     */
-    
-    function showNotice()
-    {
-        $out = $this->nli->out;
-        $out->elementStart('div', 'entry-title');
-        $this->showContent();
-        $out->elementEnd('div');
-    }
-
-    function showContent()
-    {
-        $notice = $this->nli->notice;
-        $out    = $this->nli->out;
-               
-               // FIXME: get the actual data on the leave
-               
-        $out->elementStart('div', 'follow-activity');
-
-        $out->raw($notice->rendered);
-        
-        $out->elementEnd('div');
-    } 
 }
 

diff --git a/plugins/Activity/joinlistitem.php b/plugins/Activity/joinlistitem.php
index 29774917acd135b297614054a562f5092ce087a1..19795240014b946767af1ce741fdcdd6ffe42fc2 100644 (file)
--- a/plugins/Activity/joinlistitem.php
+++ b/plugins/Activity/joinlistitem.php
@@ -3,7 +3,7 @@
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2011, StatusNet, Inc.
  *
- * Title of module
+ * List item for when you join a group
  * 
  * PHP version 5
  *
@@ -45,22 +45,8 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class JoinListItem extends NoticeListItemAdapter
+class JoinListItem extends SystemListItem
 {
-    /**
-     * Show the join activity
-     *
-     * @return void
-     */
-    
-    function showNotice()
-    {
-        $out = $this->nli->out;
-        $out->elementStart('div', 'entry-title');
-        $this->showContent();
-        $out->elementEnd('div');
-    }
-
     function showContent()
     {
         $notice = $this->nli->notice;
@@ -68,9 +54,8 @@ class JoinListItem extends NoticeListItemAdapter
 
                $mem = Group_member::staticGet('uri', $notice->uri);
                
-        $out->elementStart('div', 'join-activity');
-
         if (!empty($mem)) {
+            $out->elementStart('div', 'join-activity');
                $profile = $mem->getMember();
                $group = $mem->getGroup();
                $out->raw(sprintf(_m('<em><a href="%s">%s</a> joined the group <a href="%s">%s</a></em>.'),
@@ -78,11 +63,11 @@ class JoinListItem extends NoticeListItemAdapter
                                                $profile->getBestName(),
                                $group->homeUrl(),
                                $group->getBestName()));
+        
+            $out->elementEnd('div');
         } else {
-            $out->raw($entry->summary);
+            parent::showContent();
         }
-        
-        $out->elementEnd('div');
     } 
 }
 

diff --git a/plugins/Activity/leavelistitem.php b/plugins/Activity/leavelistitem.php
index 2c8565e986fce7231ea97edfff643528ddc6f25f..64845f90188d001b37a374b393a2ba16f5cd9797 100644 (file)
--- a/plugins/Activity/leavelistitem.php
+++ b/plugins/Activity/leavelistitem.php
@@ -3,7 +3,7 @@
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2011, StatusNet, Inc.
  *
- * Title of module
+ * List item for when you leave a group
  * 
  * PHP version 5
  *
@@ -35,7 +35,7 @@ if (!defined('STATUSNET')) {
 }
 
 /**
- * NoticeListItemAdapter for join activities
+ * NoticeListItemAdapter for leave activities
  *
  * @category  General
  * @package   StatusNet
@@ -45,34 +45,7 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class LeaveListItem extends NoticeListItemAdapter
+class LeaveListItem extends SystemListItem
 {
-    /**
-     * Show the join activity
-     *
-     * @return void
-     */
-    
-    function showNotice()
-    {
-        $out = $this->nli->out;
-        $out->elementStart('div', 'entry-title');
-        $this->showContent();
-        $out->elementEnd('div');
-    }
-
-    function showContent()
-    {
-        $notice = $this->nli->notice;
-        $out    = $this->nli->out;
-               
-               // FIXME: get the actual data on the leave
-               
-        $out->elementStart('div', 'leave-activity');
-
-        $out->raw($notice->rendered);
-        
-        $out->elementEnd('div');
-    } 
 }
 

diff --git a/plugins/Activity/systemlistitem.php b/plugins/Activity/systemlistitem.php
new file mode 100644 (file)
index 0000000..257f580
--- /dev/null
+++ b/plugins/Activity/systemlistitem.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * StatusNet - the distributed open-source microblogging tool
+ * Copyright (C) 2011, StatusNet, Inc.
+ *
+ * Superclass for system event items
+ * 
+ * PHP version 5
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @category  Activity
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+if (!defined('STATUSNET')) {
+    // This check helps protect against security problems;
+    // your code file can't be executed directly from the web.
+    exit(1);
+}
+
+/**
+ * NoticeListItemAdapter for system activities
+ *
+ * @category  General
+ * @package   StatusNet
+ * @author    Evan Prodromou <evan@status.net>
+ * @copyright 2011 StatusNet, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html AGPL 3.0
+ * @link      http://status.net/
+ */
+
+abstract class SystemListItem extends NoticeListItemAdapter
+{
+    /**
+     * Show the activity
+     *
+     * @return void
+     */
+    
+    function showNotice()
+    {
+        $out = $this->nli->out;
+        $out->elementStart('div', 'entry-title');
+        $this->showContent();
+        $out->elementEnd('div');
+    }
+
+    function showContent()
+    {
+        $notice = $this->nli->notice;
+        $out    = $this->nli->out;
+               
+               // FIXME: get the actual data on the leave
+               
+        $out->elementStart('div', 'system-activity');
+
+        $out->raw($notice->rendered);
+        
+        $out->elementEnd('div');
+    } 
+
+    function showNoticeOptions()
+    {
+        if (Event::handle('StartShowNoticeOptions', array($this))) {
+            $user = common_current_user();
+            if (!empty($user)) {
+                $this->nli->out->elementStart('div', 'notice-options');
+                $this->showFaveForm();
+                $this->showReplyLink();
+                $this->nli->out->elementEnd('div');
+            }
+            Event::handle('EndShowNoticeOptions', array($this));
+        }
+    }
+}

diff --git a/plugins/Activity/unfollowlistitem.php b/plugins/Activity/unfollowlistitem.php
index 8bc464ed239110ac185a1d43f8b5f02ada07c7d3..b8c0d670fa7ebc197be7a190c5d34badb93e5a68 100644 (file)
--- a/plugins/Activity/unfollowlistitem.php
+++ b/plugins/Activity/unfollowlistitem.php
@@ -3,7 +3,7 @@
  * StatusNet - the distributed open-source microblogging tool
  * Copyright (C) 2011, StatusNet, Inc.
  *
- * Title of module
+ * Unfollow list item
  * 
  * PHP version 5
  *
@@ -20,7 +20,7 @@
  * You should have received a copy of the GNU Affero General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
- * @category  Cache
+ * @category  Activity
  * @package   StatusNet
  * @author    Evan Prodromou <evan@status.net>
  * @copyright 2011 StatusNet, Inc.
@@ -45,7 +45,7 @@ if (!defined('STATUSNET')) {
  * @link      http://status.net/
  */
 
-class UnfollowListItem extends NoticeListItemAdapter
+class UnfollowListItem extends SystemListItem
 {
     /**
      * Show the join activity