Move table-based profile section layout from topposter to base class

2 files changed, 8 insertions, 33 deletions

diff --git a/lib/profilesection.php b/lib/profilesection.php
index 91a3dfa34..3642ae164 100644
--- a/lib/profilesection.php
+++ b/lib/profilesection.php
@@ -76,7 +76,9 @@ class ProfileSection extends Section
 
     function showProfile($profile)
     {
-        $this->out->elementStart('li', 'vcard');
+        $this->out->elementStart('tr');
+        $this->out->elementStart('td');
+        $this->out->elementStart('span', 'vcard');
         $this->out->elementStart('a', array('title' => ($profile->fullname) ?
                                        $profile->fullname :
                                        $profile->nickname,
@@ -92,10 +94,13 @@ class ProfileSection extends Section
                                     $profile->fullname :
                                     $profile->nickname));
         $this->out->element('span', 'fn nickname', $profile->nickname);
+        $this->out->elementEnd('span');
         $this->out->elementEnd('a');
+        $this->out->elementEnd('td');
         if ($profile->value) {
-            $this->out->element('span', 'value', $profile->value);
+            $this->out->element('td', 'value', $profile->value);
         }
-        $this->out->elementEnd('li');
+
+        $this->out->elementEnd('tr');
     }
 }
diff --git a/lib/topposterssection.php b/lib/topposterssection.php
index 786973093..4bd59ac79 100644
--- a/lib/topposterssection.php
+++ b/lib/topposterssection.php
@@ -69,36 +69,6 @@ class TopPostersSection extends ProfileSection
         return $profile;
     }
 
-    function showProfile($profile)
-    {
-        $this->out->elementStart('tr');
-        $this->out->elementStart('td');
-        $this->out->elementStart('span', 'vcard');
-        $this->out->elementStart('a', array('title' => ($profile->fullname) ?
-                                       $profile->fullname :
-                                       $profile->nickname,
-                                       'href' => $profile->profileurl,
-                                       'rel' => 'contact member',
-                                       'class' => 'url'));
-        $avatar = $profile->getAvatar(AVATAR_MINI_SIZE);
-        $this->out->element('img', array('src' => (($avatar) ? common_avatar_display_url($avatar) :  common_default_avatar(AVATAR_MINI_SIZE)),
-                                    'width' => AVATAR_MINI_SIZE,
-                                    'height' => AVATAR_MINI_SIZE,
-                                    'class' => 'avatar photo',
-                                    'alt' =>  ($profile->fullname) ?
-                                    $profile->fullname :
-                                    $profile->nickname));
-        $this->out->element('span', 'fn nickname', $profile->nickname);
-        $this->out->elementEnd('span');
-        $this->out->elementEnd('a');
-        $this->out->elementEnd('td');
-        if ($profile->value) {
-            $this->out->element('td', 'value', $profile->value);
-        }
-
-        $this->out->elementEnd('tr');
-    }
-
     function title()
     {
         return _('Top posters');