Merge branch '0.7.x' of git@gitorious.org:laconica/dev into 0.7.x

8 files changed, 100 insertions, 56 deletions

diff --git a/actions/favorited.php b/actions/favorited.php
index 27da25435..09ab1216a 100644
--- a/actions/favorited.php
+++ b/actions/favorited.php
@@ -104,9 +104,9 @@ class FavoritedAction extends Action
     {
         parent::prepare($args);
         $this->page = ($this->arg('page')) ? ($this->arg('page')+0) : 1;
-        
+
         common_set_returnto($this->selfUrl());
-        
+
         return true;
     }
 
@@ -143,13 +143,10 @@ class FavoritedAction extends Action
         $this->elementStart('div', 'instructions');
         $this->raw($output);
         $this->elementEnd('div');
+    }
 
-        $favorite = new Fave;
-
-        if ($favorite->count()) {
-            return;
-        }
-
+    function showEmptyList()
+    {
         $message = _('Favorite notices appear on this page but no one has favorited one yet.') . ' ';
 
         if (common_logged_in()) {
@@ -217,6 +214,10 @@ class FavoritedAction extends Action
 
         $cnt = $nl->show();
 
+        if ($cnt == 0) {
+            $this->showEmptyList();
+        }
+
         $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
                           $this->page, 'favorited');
     }
diff --git a/actions/featured.php b/actions/featured.php
index f3bade6a5..86fd3f374 100644
--- a/actions/featured.php
+++ b/actions/featured.php
@@ -107,6 +107,7 @@ class FeaturedAction extends Action
 
         $featured_nicks = common_config('nickname', 'featured');
 
+
         if (count($featured_nicks) > 0) {
 
             $quoted = array();
@@ -118,7 +119,7 @@ class FeaturedAction extends Action
             $user = new User;
             $user->whereAdd(sprintf('nickname IN (%s)', implode(',', $quoted)));
             $user->limit(($this->page - 1) * PROFILES_PER_PAGE, PROFILES_PER_PAGE + 1);
-            $user->orderBy('user.nickname ASC');
+            $user->orderBy(common_database_tablename('user') .'.nickname ASC');
 
             $user->find();
 
@@ -145,4 +146,4 @@ class FeaturedAction extends Action
                               $this->page, 'featured');
         }
     }
-}
\ No newline at end of file
+}
diff --git a/actions/public.php b/actions/public.php
index b7b7fc6b7..5a380de9a 100644
--- a/actions/public.php
+++ b/actions/public.php
@@ -166,19 +166,8 @@ class PublicAction extends Action
         $nav->show();
     }
 
-    function showPageNotice()
+    function showEmptyList()
     {
-        $notice = new Notice;
-
-        if (!$notice) {
-            $this->serverError(_('Could not retrieve public stream.'));
-            return;
-        }
-
-        if ($notice->count()) {
-            return;
-        }
-
         $message = _('This is the public timeline for %%site.name%% but no one has posted anything yet.') . ' ';
 
         if (common_logged_in()) {
@@ -216,6 +205,10 @@ class PublicAction extends Action
 
         $cnt = $nl->show();
 
+        if ($cnt == 0) {
+            $this->showEmptyList();
+        }
+
         $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
                           $this->page, 'public');
     }
diff --git a/actions/publictagcloud.php b/actions/publictagcloud.php
index 0cd8940d4..855cfed9b 100644
--- a/actions/publictagcloud.php
+++ b/actions/publictagcloud.php
@@ -62,12 +62,10 @@ class PublictagcloudAction extends Action
         $this->element('p', 'instructions',
                        sprintf(_('These are most popular recent tags on %s '),
                                common_config('site', 'name')));
+    }
 
-        $tags = new Notice_tag;
-        if ($tags->count()) {
-            return;
-        }
-
+    function showEmptyList()
+    {
         $message = _('No one has posted a notice with a [hashtag](%%doc.tags%%) yet.') . ' ';
 
         if (common_logged_in()) {
@@ -144,6 +142,8 @@ class PublictagcloudAction extends Action
             $this->elementEnd('dd');
             $this->elementEnd('dl');
             $this->elementEnd('div');
+        } else {
+            $this->showEmptyList();
         }
     }
 
diff --git a/actions/publicxrds.php b/actions/publicxrds.php
index aad59d779..2c52f1246 100644
--- a/actions/publicxrds.php
+++ b/actions/publicxrds.php
@@ -51,7 +51,7 @@ class PublicxrdsAction extends Action
 {
     /**
      * Is read only?
-     * 
+     *
      * @return boolean true
      */
     function isReadOnly()
@@ -61,7 +61,7 @@ class PublicxrdsAction extends Action
 
     /**
      * Class handler.
-     * 
+     *
      * @param array $args array of arguments
      *
      * @return nothing
@@ -70,24 +70,24 @@ class PublicxrdsAction extends Action
     {
         parent::handle($args);
         header('Content-Type: application/xrds+xml');
-        common_start_xml();
+        $this->startXML();
         $this->elementStart('XRDS', array('xmlns' => 'xri://$xrds'));
         $this->elementStart('XRD', array('xmlns' => 'xri://$xrd*($v*2.0)',
                                           'xmlns:simple' => 'http://xrds-simple.net/core/1.0',
                                           'version' => '2.0'));
         $this->element('Type', null, 'xri://$xrds*simple');
-        foreach (array('finishopenidlogin', 'finishaddopenid', 'finishimmediate') as $finish) {
+        foreach (array('finishopenidlogin', 'finishaddopenid') as $finish) {
             $this->showService(Auth_OpenID_RP_RETURN_TO_URL_TYPE,
                                 common_local_url($finish));
         }
         $this->elementEnd('XRD');
         $this->elementEnd('XRDS');
-        common_end_xml();
+        $this->endXML();
     }
 
     /**
      * Show service.
-     * 
+     *
      * @param string $type    XRDS type
      * @param string $uri     URI
      * @param array  $params  type parameters, null by default
diff --git a/actions/subscriptions.php b/actions/subscriptions.php
index b0c0a9b8d..e6f3c54db 100644
--- a/actions/subscriptions.php
+++ b/actions/subscriptions.php
@@ -139,7 +139,7 @@ class SubscriptionsList extends ProfileList
 
         $this->out->elementStart('form', array('id' => 'subedit-' . $profile->id,
                                           'method' => 'post',
-                                          'class' => 'form_subcription_edit',
+                                          'class' => 'form_subscription_edit',
                                           'action' => common_local_url('subedit')));
         $this->out->hidden('token', common_session_token());
         $this->out->hidden('profile', $profile->id);
diff --git a/actions/tag.php b/actions/tag.php
index cb6572b96..583879f9c 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -93,4 +93,9 @@ class TagAction extends Action
         $this->pagination($this->page > 1, $cnt > NOTICES_PER_PAGE,
                           $this->page, 'tag', array('tag' => $this->tag));
     }
+
+    function isReadOnly()
+    {
+        return true;
+    }
 }
diff --git a/actions/userauthorization.php b/actions/userauthorization.php
index 8723848c7..168019149 100644
--- a/actions/userauthorization.php
+++ b/actions/userauthorization.php
@@ -97,47 +97,91 @@ class UserauthorizationAction extends Action
         $location = $params['omb_listenee_location'];
         $avatar = $params['omb_listenee_avatar'];
 
-        $this->elementStart('div', 'profile');
+        $this->elementStart('div', array('class' => 'profile'));
+        $this->elementStart('div', 'entity_profile vcard');
+        $this->elementStart('a', array('href' => $profile,
+                                            'class' => 'url'));
         if ($avatar) {
             $this->element('img', array('src' => $avatar,
-                                        'class' => 'avatar',
+                                        'class' => 'photo avatar',
                                         'width' => AVATAR_PROFILE_SIZE,
                                         'height' => AVATAR_PROFILE_SIZE,
                                         'alt' => $nickname));
         }
-        $this->element('a', array('href' => $profile,
-                                  'class' => 'external profile nickname'),
-                       $nickname);
+        $hasFN = ($fullname !== '') ? 'nickname' : 'fn nickname';
+        $this->elementStart('span', $hasFN);
+        $this->raw($nickname);
+        $this->elementEnd('span');
+        $this->elementEnd('a');
+
         if (!is_null($fullname)) {
-            $this->elementStart('div', 'fullname');
-            if (!is_null($homepage)) {
-                $this->element('a', array('href' => $homepage),
-                               $fullname);
-            } else {
-                $this->text($fullname);
-            }
-            $this->elementEnd('div');
+            $this->elementStart('dl', 'entity_fn');
+            $this->elementStart('dd');
+            $this->elementStart('span', 'fn');
+            $this->raw($fullname);
+            $this->elementEnd('span');
+            $this->elementEnd('dd');
+            $this->elementEnd('dl');
         }
         if (!is_null($location)) {
-            $this->element('div', 'location', $location);
+            $this->elementStart('dl', 'entity_location');
+            $this->element('dt', null, _('Location'));
+            $this->elementStart('dd', 'label');
+            $this->raw($location);
+            $this->elementEnd('dd');
+            $this->elementEnd('dl');
+        }
+
+        if (!is_null($homepage)) {
+            $this->elementStart('dl', 'entity_url');
+            $this->element('dt', null, _('URL'));
+            $this->elementStart('dd');
+            $this->elementStart('a', array('href' => $homepage,
+                                                'class' => 'url'));
+            $this->raw($homepage);
+            $this->elementEnd('a');
+            $this->elementEnd('dd');
+            $this->elementEnd('dl');
         }
+
         if (!is_null($bio)) {
-            $this->element('div', 'bio', $bio);
+            $this->elementStart('dl', 'entity_note');
+            $this->element('dt', null, _('Note'));
+            $this->elementStart('dd', 'note');
+            $this->raw($bio);
+            $this->elementEnd('dd');
+            $this->elementEnd('dl');
+        }
+
+        if (!is_null($license)) {
+            $this->elementStart('dl', 'entity_license');
+            $this->element('dt', null, _('License'));
+            $this->elementStart('dd', 'license');
+            $this->element('a', array('href' => $license,
+                                      'class' => 'license'),
+                           $license);
+            $this->elementEnd('dd');
+            $this->elementEnd('dl');
         }
-        $this->elementStart('div', 'license');
-        $this->element('a', array('href' => $license,
-                                  'class' => 'license'),
-                       $license);
-        $this->elementEnd('div');
         $this->elementEnd('div');
+
+        $this->elementStart('div', 'entity_actions');
+        $this->elementStart('ul');
+        $this->elementStart('li', 'entity_subscribe');
         $this->elementStart('form', array('method' => 'post',
                                           'id' => 'userauthorization',
+                                          'class' => 'form_user_authorization',
                                           'name' => 'userauthorization',
                                           'action' => common_local_url('userauthorization')));
         $this->hidden('token', common_session_token());
-        $this->submit('accept', _('Accept'));
-        $this->submit('reject', _('Reject'));
+
+        $this->submit('accept', _('Accept'), 'submit accept', null, _('Subscribe to this user'));
+        $this->submit('reject', _('Reject'), 'submit reject', null, _('Reject this subscription'));
         $this->elementEnd('form');
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+        $this->elementEnd('div');
+        $this->elementEnd('div');
     }
 
     function sendAuthorization()