Extract image management code to a helper function

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

diff --git a/lib/profilelist.php b/lib/profilelist.php
index fdc71ab8df78f349340a3673ad967a05be5bded0..f7ed5d19c6d138b3dc6c9c81be618c126a14f50e 100644 (file)
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -68,7 +68,7 @@ class ProfileList extends Widget
     function show()
     {
 
-        $this->out->elementStart('ul', array('id' => 'profiles', 'class' => 'profile_list'));
+        $this->out->elementStart('ul', 'profiles');
 
         $cnt = 0;
 
@@ -87,62 +87,67 @@ class ProfileList extends Widget
 
     function showProfile()
     {
-        $this->out->elementStart('li', array('class' => 'profile_single',
-                                         'id' => 'profile-' . $this->profile->id));
+        $this->out->elementStart('li', array('class' => 'profile',
+                                             'id' => 'profile-' . $this->profile->id));
 
         $user = common_current_user();
 
-        if ($user && $user->id != $this->profile->id) {
-            # XXX: special-case for user looking at own
-            # subscriptions page
-            if ($user->isSubscribed($this->profile)) {
-                $usf = new UnsubscribeForm($this->out, $this->profile);
-                $usf->show();
-            } else {
-                $sf = new SubscribeForm($this->out, $this->profile);
-                $sf->show();
-            }
-        }
+
+        $this->out->elementStart('div', array('id' => 'user_profile',
+                                              'class' => 'vcard'));
 
         $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
-        $this->out->elementStart('a', array('href' => $this->profile->profileurl));
+        $this->out->elementStart('a', array('href' => $this->profile->profileurl,
+                                            'class' => 'url'));
         $this->out->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
-                                    'class' => 'avatar stream',
+                                    'class' => 'photo avatar',
                                     'width' => AVATAR_STREAM_SIZE,
                                     'height' => AVATAR_STREAM_SIZE,
                                     'alt' =>
                                     ($this->profile->fullname) ? $this->profile->fullname :
                                     $this->profile->nickname));
-        $this->out->elementEnd('a');
-        $this->out->elementStart('p');
-        $this->out->elementStart('a', array('href' => $this->profile->profileurl,
-                                        'class' => 'nickname'));
+        $hasFN = ($this->profile->fullname) ? 'nickname' : 'fn nickname';
+        $this->out->elementStart('span', $hasFN);
         $this->out->raw($this->highlight($this->profile->nickname));
+        $this->out->elementEnd('span');
         $this->out->elementEnd('a');
+        
         if ($this->profile->fullname) {
-            $this->out->text(' | ');
-            $this->out->elementStart('span', 'fullname');
+            $this->out->elementStart('dl', 'user_fn');
+            $this->out->element('dt', null, 'Full name');
+            $this->out->elementStart('dd');
+            $this->out->elementStart('span', 'fn');
             $this->out->raw($this->highlight($this->profile->fullname));
             $this->out->elementEnd('span');
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
         }
         if ($this->profile->location) {
-            $this->out->text(' | ');
-            $this->out->elementStart('span', 'location');
+            $this->out->elementStart('dl', 'user_location');
+            $this->out->element('dt', null, _('Location'));
+            $this->out->elementStart('dd', 'location');
             $this->out->raw($this->highlight($this->profile->location));
-            $this->out->elementEnd('span');
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
         }
-        $this->out->elementEnd('p');
         if ($this->profile->homepage) {
-            $this->out->elementStart('p', 'website');
-            $this->out->elementStart('a', array('href' => $this->profile->homepage));
+            $this->out->elementStart('dl', 'user_url');
+            $this->out->element('dt', null, _('URL'));
+            $this->out->elementStart('dd');
+            $this->out->elementStart('a', array('href' => $this->profile->homepage,
+                                                'class' => 'url'));
             $this->out->raw($this->highlight($this->profile->homepage));
             $this->out->elementEnd('a');
-            $this->out->elementEnd('p');
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
         }
         if ($this->profile->bio) {
-            $this->out->elementStart('p', 'bio');
+            $this->out->elementStart('dl', 'user_note');
+            $this->out->element('dt', null, _('Note'));
+            $this->out->elementStart('dd', 'note');
             $this->out->raw($this->highlight($this->profile->bio));
-            $this->out->elementEnd('p');
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
         }
 
         # If we're on a list with an owner (subscriptions or subscribers)...
@@ -151,8 +156,7 @@ class ProfileList extends Widget
             # Get tags
             $tags = Profile_tag::getTags($this->owner->id, $this->profile->id);
 
-            $this->out->elementStart('div', 'tags_user');
-            $this->out->elementStart('dl');
+            $this->out->elementStart('dl', 'user_tags');
             $this->out->elementStart('dt');
             if ($user->id == $this->owner->id) {
                 $this->out->element('a', array('href' => common_local_url('tagother',
@@ -161,13 +165,13 @@ class ProfileList extends Widget
             } else {
                 $this->out->text(_('Tags'));
             }
-            $this->out->text(":");
             $this->out->elementEnd('dt');
             $this->out->elementStart('dd');
             if ($tags) {
                 $this->out->elementStart('ul', 'tags xoxo');
                 foreach ($tags as $tag) {
                     $this->out->elementStart('li');
+                    $this->element('span', 'mark_hash', '#');
                     $this->out->element('a', array('rel' => 'tag',
                                               'href' => common_local_url($this->action,
                                                                          array('nickname' => $this->owner->nickname,
@@ -181,13 +185,26 @@ class ProfileList extends Widget
             }
             $this->out->elementEnd('dd');
             $this->out->elementEnd('dl');
-            $this->out->elementEnd('div');
         }
 
         if ($user && $user->id == $this->owner->id) {
             $this->showOwnerControls($this->profile);
         }
 
+        $this->out->elementEnd('div');
+
+        if ($user && $user->id != $this->profile->id) {
+            # XXX: special-case for user looking at own
+            # subscriptions page
+            if ($user->isSubscribed($this->profile)) {
+                $usf = new UnsubscribeForm($this->out, $this->profile);
+                $usf->show();
+            } else {
+                $sf = new SubscribeForm($this->out, $this->profile);
+                $sf->show();
+            }
+        }
+
         $this->out->elementEnd('li');
     }
 
@@ -202,4 +219,4 @@ class ProfileList extends Widget
     {
         return htmlspecialchars($text);
     }
-}
\ No newline at end of file
+}