Merge branch '0.7.x' into 0.8.x

6 files changed, 85 insertions, 32 deletions

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/tag.php b/actions/tag.php
index d15f64498..c413bf8c3 100644
--- a/actions/tag.php
+++ b/actions/tag.php
@@ -86,4 +86,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()
diff --git a/theme/default/base/css/display.css b/theme/default/base/css/display.css
index ec9e6097f..1440a60b4 100644
--- a/theme/default/base/css/display.css
+++ b/theme/default/base/css/display.css
@@ -607,7 +607,9 @@ border-radius:4px;
 -moz-border-radius:4px;
 -webkit-border-radius:4px;
 }
-
+.entity_actions .accept {
+margin-bottom:18px;
+}
 
 .entity_tags ul {
 list-style-type:none;
@@ -1158,4 +1160,4 @@ display:none;
 }
 .guide {
 clear:both;
-}
\ No newline at end of file
+}
diff --git a/theme/default/skin/default/css/display.css b/theme/default/skin/default/css/display.css
index f38b23635..71b962e96 100644
--- a/theme/default/skin/default/css/display.css
+++ b/theme/default/skin/default/css/display.css
@@ -164,7 +164,8 @@ background-color:#A9BF4F;
 color:#fff;
 }
 .form_user_unsubscribe input.submit,
-.form_group_leave input.submit {
+.form_group_leave input.submit,
+.form_user_authorization input.reject {
 background-color:#97BFD1;
 }
 
diff --git a/theme/default/skin/identica/css/display.css b/theme/default/skin/identica/css/display.css
index 44ff2c9e8..d72368934 100644
--- a/theme/default/skin/identica/css/display.css
+++ b/theme/default/skin/identica/css/display.css
@@ -164,7 +164,8 @@ background-color:#9BB43E;
 color:#fff;
 }
 .form_user_unsubscribe input.submit,
-.form_group_leave input.submit {
+.form_group_leave input.submit,
+.form_user_authorization input.reject {
 background-color:#87B4C8;
 }