Merge branch 'master' into groups

Conflicts:

	.gitignore

1 files changed, 118 insertions, 71 deletions

diff --git a/lib/profilelist.php b/lib/profilelist.php
index bda05daf3..f7ed5d19c 100644
--- a/lib/profilelist.php
+++ b/lib/profilelist.php
@@ -1,10 +1,13 @@
 <?php
 
-/*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+/**
+ * Laconica, the distributed open-source microblogging tool
  *
- * This program is free software: you can redistribute it and/or modify
+ * Widget to show a list of profiles
+ *
+ * PHP version 5
+ *
+ * LICENCE: 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.
@@ -16,30 +19,56 @@
  *
  * 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  Public
+ * @package   Laconica
+ * @author    Evan Prodromou <evan@controlyourself.ca>
+ * @copyright 2008-2009 Control Yourself, Inc.
+ * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link      http://laconi.ca/
  */
 
-if (!defined('LACONICA')) { exit(1); }
+if (!defined('LACONICA')) {
+    exit(1);
+}
+
+require_once INSTALLDIR.'/lib/widget.php';
 
 define('PROFILES_PER_PAGE', 20);
 
-class ProfileList
-{
+/**
+ * Widget to show a list of profiles
+ *
+ * @category Public
+ * @package  Laconica
+ * @author   Zach Copley <zach@controlyourself.ca>
+ * @author   Evan Prodromou <evan@controlyourself.ca>
+ * @license  http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
+ * @link     http://laconi.ca/
+ */
 
+class ProfileList extends Widget
+{
+    /** Current profile, profile query. */
     var $profile = null;
+    /** Owner of this list */
     var $owner = null;
+    /** Action object using us. */
     var $action = null;
 
     function __construct($profile, $owner=null, $action=null)
     {
+        parent::__construct($action);
+
         $this->profile = $profile;
         $this->owner = $owner;
         $this->action = $action;
     }
 
-    function show_list()
+    function show()
     {
 
-        common_element_start('ul', array('id' => 'profiles', 'class' => 'profile_list'));
+        $this->out->elementStart('ul', 'profiles');
 
         $cnt = 0;
 
@@ -48,71 +77,77 @@ class ProfileList
             if($cnt > PROFILES_PER_PAGE) {
                 break;
             }
-            $this->show();
+            $this->showProfile();
         }
 
-        common_element_end('ul');
+        $this->out->elementEnd('ul');
 
         return $cnt;
     }
 
-    function show()
+    function showProfile()
     {
-
-        common_element_start('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)) {
-                common_unsubscribe_form($this->profile);
-            } else {
-                common_subscribe_form($this->profile);
-            }
-        }
+
+        $this->out->elementStart('div', array('id' => 'user_profile',
+                                              'class' => 'vcard'));
 
         $avatar = $this->profile->getAvatar(AVATAR_STREAM_SIZE);
-        common_element_start('a', array('href' => $this->profile->profileurl));
-        common_element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_STREAM_SIZE),
-                                    'class' => 'avatar stream',
+        $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' => 'photo avatar',
                                     'width' => AVATAR_STREAM_SIZE,
                                     'height' => AVATAR_STREAM_SIZE,
                                     'alt' =>
                                     ($this->profile->fullname) ? $this->profile->fullname :
                                     $this->profile->nickname));
-        common_element_end('a');
-        common_element_start('p');
-        common_element_start('a', array('href' => $this->profile->profileurl,
-                                        'class' => 'nickname'));
-        common_raw($this->highlight($this->profile->nickname));
-        common_element_end('a');
+        $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) {
-            common_text(' | ');
-            common_element_start('span', 'fullname');
-            common_raw($this->highlight($this->profile->fullname));
-            common_element_end('span');
+            $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) {
-            common_text(' | ');
-            common_element_start('span', 'location');
-            common_raw($this->highlight($this->profile->location));
-            common_element_end('span');
+            $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('dd');
+            $this->out->elementEnd('dl');
         }
-        common_element_end('p');
         if ($this->profile->homepage) {
-            common_element_start('p', 'website');
-            common_element_start('a', array('href' => $this->profile->homepage));
-            common_raw($this->highlight($this->profile->homepage));
-            common_element_end('a');
-            common_element_end('p');
+            $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('dd');
+            $this->out->elementEnd('dl');
         }
         if ($this->profile->bio) {
-            common_element_start('p', 'bio');
-            common_raw($this->highlight($this->profile->bio));
-            common_element_end('p');
+            $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('dd');
+            $this->out->elementEnd('dl');
         }
 
         # If we're on a list with an owner (subscriptions or subscribers)...
@@ -121,49 +156,61 @@ class ProfileList
             # Get tags
             $tags = Profile_tag::getTags($this->owner->id, $this->profile->id);
 
-            common_element_start('div', 'tags_user');
-            common_element_start('dl');
-            common_element_start('dt');
+            $this->out->elementStart('dl', 'user_tags');
+            $this->out->elementStart('dt');
             if ($user->id == $this->owner->id) {
-                common_element('a', array('href' => common_local_url('tagother',
+                $this->out->element('a', array('href' => common_local_url('tagother',
                                                                      array('id' => $this->profile->id))),
                                _('Tags'));
             } else {
-                common_text(_('Tags'));
+                $this->out->text(_('Tags'));
             }
-            common_text(":");
-            common_element_end('dt');
-            common_element_start('dd');
+            $this->out->elementEnd('dt');
+            $this->out->elementStart('dd');
             if ($tags) {
-                common_element_start('ul', 'tags xoxo');
+                $this->out->elementStart('ul', 'tags xoxo');
                 foreach ($tags as $tag) {
-                    common_element_start('li');
-                    common_element('a', array('rel' => '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,
                                                                                'tag' => $tag))),
                                    $tag);
-                    common_element_end('li');
+                    $this->out->elementEnd('li');
                 }
-                common_element_end('ul');
+                $this->out->elementEnd('ul');
             } else {
-                common_text(_('(none)'));
+                $this->out->text(_('(none)'));
             }
-            common_element_end('dd');
-            common_element_end('dl');
-            common_element_end('div');
+            $this->out->elementEnd('dd');
+            $this->out->elementEnd('dl');
         }
 
         if ($user && $user->id == $this->owner->id) {
-            $this->show_owner_controls($this->profile);
+            $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();
+            }
         }
 
-        common_element_end('li');
+        $this->out->elementEnd('li');
     }
 
     /* Override this in subclasses. */
 
-    function show_owner_controls($profile)
+    function showOwnerControls($profile)
     {
         return;
     }
@@ -172,4 +219,4 @@ class ProfileList
     {
         return htmlspecialchars($text);
     }
-}
\ No newline at end of file
+}