Nicknames in subscriptions list

diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index 733823d21b423058ef20d4f8d7f8a0e99e78e075..231a697230601822f3eaf3c4ff2f28fad80de05e 100644 (file)
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -169,23 +169,6 @@ class SubscriptionsList extends SubscriptionList
 
 class SubscriptionsListItem extends SubscriptionListItem
 {
-    function showProfile()
-    {
-        $this->startProfile();
-        $this->showAvatar($this->profile);
-        $this->showFullName();
-        $this->showLocation();
-        $this->showHomepage();
-        $this->showBio();
-        $this->showTags();
-        // Relevant portion!
-        $cur = common_current_user();
-        if (!empty($cur) && $cur->id == $this->owner->id) {
-            $this->showOwnerControls();
-        }
-        $this->endProfile();
-    }
-
     function showOwnerControls()
     {
         $sub = Subscription::pkeyGet(array('subscriber' => $this->owner->id,
@@ -239,6 +222,5 @@ class SubscriptionsListItem extends SubscriptionListItem
         // TRANS: Save button for settings for a profile in a subscriptions list.
         $this->out->submit('save', _m('BUTTON','Save'));
         $this->out->elementEnd('form');
-        return;
     }
 }

diff --git a/lib/profilelist.php b/lib/profilelist.php
index d44efe164f0582c1c560440981ab8da2760f0972..767e12bc25a7dbc2360bd65d1bddd270fd919989 100644 (file)
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -74,7 +74,7 @@ class ProfileList extends Widget
 
     function startList()
     {
-        $this->out->elementStart('ul', 'profiles xoxo');
+        $this->out->elementStart('ul', 'profile_list xoxo');
     }
 
     function endList()
@@ -142,7 +142,7 @@ class ProfileListItem extends Widget
 
     function startItem()
     {
-        $this->out->elementStart('li', array('class' => 'profile h-entry',
+        $this->out->elementStart('li', array('class' => 'profile',
                                              'id' => 'profile-' . $this->profile->id));
     }
 
@@ -208,7 +208,7 @@ class ProfileListItem extends Widget
     function showLocation()
     {
         if (!empty($this->profile->location)) {
-            $this->out->element('span', 'label p-location', $this->profile->location);
+            $this->out->element('span', 'label p-locality', $this->profile->location);
         }
     }
 

diff --git a/lib/subscriptionlist.php b/lib/subscriptionlist.php
index a038d0698008095cebc3539083e54943d69877d0..29c12744076b301527ed8837ced2226ef2e6268e 100644 (file)
--- a/lib/subscriptionlist.php
+++ b/lib/subscriptionlist.php
@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/profilelist.php';
-
 /**
  * Widget to show a list of subscriptions
  *
@@ -84,9 +82,17 @@ class SubscriptionListItem extends ProfileListItem
         $this->showBio();
         // Relevant portion!
         $this->showTags();
+        if ($this->isOwn()) {
+            $this->showOwnerControls();
+        }
         $this->endProfile();
     }
 
+    function showOwnerControls()
+    {
+        // pass
+    }
+
     function isOwn()
     {
         $user = common_current_user();

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index fa346bf279dab5a65bd781f8d1ff5d7e5ae49481..40c4c56ad7c7e35981feae10e172a5e4c2c372ab 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1593,10 +1593,18 @@ height:16px;
     top: -3px;
 }
 
-table.profile_list .h-card .u-photo {
+ul.profile_list {
+    list-style-type:none;
+}
+
+ul.profile_list li {
+    margin-bottom: 20px;
+}
+
+.profile_list .h-card .u-photo {
     margin-right: 4px;
 }
-table.profile_list .h-card .p-nickname {
+.profile_list .h-card .p-nickname {
     display: block;
 }
 
@@ -1872,14 +1880,6 @@ min-height:60px;
 display:none;
 }
 
-.profiles {
-    list-style-type:none;
-}
-
-.profiles li {
-    margin-bottom: 20px;
-}
-
 .profile .entity_profile .p-name,
 .profile .entity_profile .u-url[rel~=contact] {
 margin-left:0;