Merge branch 'master' into social-master

[quix0rs-gnu-social.git] / lib / profileminilist.php

diff --git a/lib/profileminilist.php b/lib/profileminilist.php
index 36bfad770cf02a01cf081131abc0851a79872908..9c10d62b183ab7028060deaa82db62f488071e67 100644 (file)
--- a/lib/profileminilist.php
+++ b/lib/profileminilist.php
@@ -47,53 +47,44 @@ define('PROFILES_PER_MINILIST', 8);
 
 class ProfileMiniList extends ProfileList
 {
+    const MAX_PROFILES = PROFILES_PER_MINILIST; // put it in the class
 
     function startList()
     {
         $this->out->elementStart('ul', 'entities users xoxo');
     }
 
-    function newListItem($profile)
+    function newListItem(Profile $profile)
     {
         return new ProfileMiniListItem($profile, $this->action);
     }
 
-    function showProfiles()
+    function maxProfiles()
     {
-        $cnt = 0;
-
-        while ($this->profile->fetch()) {
-            $cnt++;
-            if ($cnt > PROFILES_PER_MINILIST) {
-                break;
-            }
-            $pli = $this->newListItem($this->profile);
-            $pli->show();
-        }
-
-        return $cnt;
+        return PROFILES_PER_MINILIST;
     }
 
+    function avatarSize()
+    {
+        return AVATAR_MINI_SIZE;
+    }
 }
 
 class ProfileMiniListItem extends ProfileListItem
 {
     function show()
     {
-        $this->out->elementStart('li', 'vcard');
+        $this->out->elementStart('li', 'h-card');
         if (Event::handle('StartProfileListItemProfileElements', array($this))) {
             if (Event::handle('StartProfileListItemAvatar', array($this))) {
                 $aAttrs = $this->linkAttributes();
                 $this->out->elementStart('a', $aAttrs);
-                $avatar = $this->profile->getAvatar(AVATAR_MINI_SIZE);
-                $this->out->element('img', array('src' => (($avatar) ? $avatar->displayUrl() :  Avatar::defaultImage(AVATAR_MINI_SIZE)),
+                $avatarUrl = $this->profile->avatarUrl(AVATAR_MINI_SIZE);
+                $this->out->element('img', array('src' => $avatarUrl,
                                                  'width' => AVATAR_MINI_SIZE,
                                                  'height' => AVATAR_MINI_SIZE,
-                                                 'class' => 'avatar photo',
-                                                 'alt' =>  ($this->profile->fullname) ?
-                                                 $this->profile->fullname :
-                                                 $this->profile->nickname));
-                $this->out->element('span', 'fn nickname', $this->profile->nickname);
+                                                 'class' => 'avatar u-photo',
+                                                 'alt' =>  $this->profile->getBestName()));
                 $this->out->elementEnd('a');
                 Event::handle('EndProfileListItemAvatar', array($this));
             }
@@ -109,7 +100,7 @@ class ProfileMiniListItem extends ProfileListItem
 
         $aAttrs['title'] = $this->profile->getBestName();
         $aAttrs['rel']   = 'contact member'; // @todo: member? always?
-        $aAttrs['class'] = 'url';
+        $aAttrs['class'] = 'u-url p-name';
 
         return $aAttrs;
     }