Merge branch 'master' of /var/www/trunk

diff --git a/actions/subedit.php b/actions/subedit.php
index e22384869b2da242cfa1dae725ba435545563c33..89081ffc76984eb7da9a8f51d941ccbc9bfd1b43 100644 (file)
--- a/actions/subedit.php
+++ b/actions/subedit.php
@@ -21,12 +21,10 @@ if (!defined('LACONICA')) { exit(1); }
 
 class SubeditAction extends Action
 {
-
     var $profile = null;
 
     function prepare($args)
     {
-
         parent::prepare($args);
 
         if (!common_logged_in()) {
@@ -37,8 +35,9 @@ class SubeditAction extends Action
         $token = $this->trimmed('token');
 
         if (!$token || $token != common_session_token()) {
-            $this->clientError(_('There was a problem with your session token. Try again, please.'));
-            return;
+            $this->clientError(_('There was a problem with your session token. '.
+                                 'Try again, please.'));
+            return false;
         }
 
         $id = $this->trimmed('profile');

diff --git a/actions/tagother.php b/actions/tagother.php
index 5daf612fb530f7a5881532a22b40940ce0956b20..9a63fc438221bf62b97f7a5874f54c1ea796040a 100644 (file)
--- a/actions/tagother.php
+++ b/actions/tagother.php
@@ -73,48 +73,84 @@ class TagotherAction extends Action
 
     function showContent()
     {
-        $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
+        $this->elementStart('div', 'entity_profile vcard author');
+        $this->element('h2', null, _('User profile'));
 
+        $avatar = $this->profile->getAvatar(AVATAR_PROFILE_SIZE);
+        $this->elementStart('dl', 'entity_depiction');
+        $this->element('dt', null, _('Photo'));
+        $this->elementStart('dd');
         $this->element('img', array('src' => ($avatar) ? common_avatar_display_url($avatar) : common_default_avatar(AVATAR_PROFILE_SIZE),
-                                    'class' => 'avatar stream',
+                                    'class' => 'photo avatar',
                                     'width' => AVATAR_PROFILE_SIZE,
                                     'height' => AVATAR_PROFILE_SIZE,
                                     'alt' =>
                                     ($this->profile->fullname) ? $this->profile->fullname :
                                     $this->profile->nickname));
+        $this->elementEnd('dd');
+        $this->elementEnd('dl');
 
+
+        $this->elementStart('dl', 'entity_nickname');
+        $this->element('dt', null, _('Nickname'));
+        $this->elementStart('dd');
         $this->element('a', array('href' => $this->profile->profileurl,
-                                  'class' => 'external profile nickname'),
+                                  'class' => 'nickname'),
                        $this->profile->nickname);
+        $this->elementEnd('dd');
+        $this->elementEnd('dl');
 
         if ($this->profile->fullname) {
-            $this->elementStart('div', 'fullname');
-            if ($this->profile->homepage) {
-                $this->element('a', array('href' => $this->profile->homepage),
-                               $this->profile->fullname);
-            } else {
-                $this->text($this->profile->fullname);
-            }
-            $this->elementEnd('div');
+            $this->elementStart('dl', 'entity_fn');
+            $this->element('dt', null, _('Full name'));
+            $this->elementStart('dd');
+            $this->element('span', 'fn', $this->profile->fullname);
+            $this->elementEnd('dd');
+            $this->elementEnd('dl');
         }
         if ($this->profile->location) {
-            $this->element('div', 'location', $this->profile->location);
+            $this->elementStart('dl', 'entity_location');
+            $this->element('dt', null, _('Location'));
+            $this->element('dd', 'location', $this->profile->location);
+            $this->elementEnd('dl');
+        }
+        if ($this->profile->homepage) {
+            $this->elementStart('dl', 'entity_url');
+            $this->element('dt', null, _('URL'));
+            $this->elementStart('dd');
+            $this->element('a', array('href' => $this->profile->homepage,
+                                      'rel' => 'me', 'class' => 'url'),
+                           $this->profile->homepage);
+            $this->elementEnd('dd');
+            $this->elementEnd('dl');
         }
         if ($this->profile->bio) {
-            $this->element('div', 'bio', $this->profile->bio);
+            $this->elementStart('dl', 'entity_note');
+            $this->element('dt', null, _('Note'));
+            $this->element('dd', 'note', $this->profile->bio);
+            $this->elementEnd('dl');
         }
+        $this->elementEnd('div');
 
         $this->elementStart('form', array('method' => 'post',
-                                           'id' => 'tag_user',
+                                           'id' => 'form_tag_user',
+                                           'class' => 'form_settings',
                                            'name' => 'tagother',
                                            'action' => $this->selfUrl()));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Tag user'));
         $this->hidden('token', common_session_token());
         $this->hidden('id', $this->profile->id);
+
+        $this->elementStart('ul', 'form_data');
+        $this->elementStart('li');
         $this->input('tags', _('Tags'),
                      ($this->arg('tags')) ? $this->arg('tags') : implode(' ', Profile_tag::getTags($user->id, $this->profile->id)),
                      _('Tags for this user (letters, numbers, -, ., and _), comma- or space- separated'));
-
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
         $this->submit('save', _('Save'));
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
@@ -166,7 +202,7 @@ class TagotherAction extends Action
         $action = $user->isSubscribed($this->profile) ? 'subscriptions' : 'subscribers';
 
         if ($this->boolean('ajax')) {
-            common_start_html('text/xml');
+            $this->startHTML('text/xml');
             $this->elementStart('head');
             $this->element('title', null, _('Tags'));
             $this->elementEnd('head');

diff --git a/lib/openid.php b/lib/openid.php
index 1e7f318fb5dc833c3b7096eb5831dd86c65576d9..8605737026340cebfbc00e2d87ea615398af83e2 100644 (file)
--- a/lib/openid.php
+++ b/lib/openid.php
@@ -184,15 +184,13 @@ function oid_authenticate($openid_url, $returnto, $immediate=false)
         // Display an error if the form markup couldn't be generated;
         // otherwise, render the HTML.
         if (Auth_OpenID::isFailure($form_html)) {
-            $this->show_form(sprintf(_('Could not create OpenID form: %s'), $form_html->message));
+            common_server_error(sprintf(_('Could not create OpenID form: %s'), $form_html->message));
         } else {
-            common_show_header(_('OpenID Auto-Submit'), null, null, '_oid_print_instructions');
-            common_raw($form_html);
-            common_element('script', null,
-                           '$(document).ready(function() { ' .
-                           '    $("#'. $form_id .'").submit(); '.
-                           '});');
-            common_show_footer();
+            $action = new AutosubmitAction(); // see below
+            $action->form_html = $form_html;
+            $action->form_id = $form_id;
+            $action->prepare(array('action' => 'autosubmit'));
+            $action->handle(array('action' => 'autosubmit'));
         }
     }
 }
@@ -251,3 +249,29 @@ function oid_update_user(&$user, &$sreg)
 
     return true;
 }
+
+class AutosubmitAction extends Action
+{
+    var $form_html = null;
+    var $form_id = null;
+
+    function handle($args)
+    {
+        parent::handle($args);
+        $this->showPage();
+    }
+
+    function title()
+    {
+        return _('OpenID Auto-Submit');
+    }
+
+    function showContent()
+    {
+        $this->raw($this->form_html);
+        $this->element('script', null,
+                       '$(document).ready(function() { ' .
+                       '    $(\'#'. $this->form_id .'\').submit(); '.
+                       '});');
+    }
+}

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 54a5b883325b7e2f3c8ac73ea6c03325128d99c7..d829b71e47c807457bbfd15620cef7d3c66ecd8f 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -41,6 +41,7 @@ font-size:1.3em;
 text-transform:uppercase;
 }
 form {
+clear:both;
 }
 input, textarea, select, option {
 padding:4px;
@@ -143,7 +144,8 @@ font-weight:bold;
 #form_password legend,
 #form_settings_avatar legend,
 #newgroup legend,
-#editgroup legend {
+#editgroup legend,
+#form_tag_user legend {
 display:none;
 }
 
@@ -347,6 +349,7 @@ margin-bottom:1em;
 
 #content {
 width:644px;
+width:46em;
 padding:18px;
 float:left;
 border-radius:7px;
@@ -364,6 +367,7 @@ float;left;
 
 #aside_primary {
 width:300px;
+width:21.429em;
 float:left;
 margin-left:2px;
 padding:18px 4px 18px 18px;
@@ -705,6 +709,7 @@ margin-right:11px;
 
 
 
+
 /* NOTICE */
 .notice,
 .profile {
@@ -713,8 +718,6 @@ padding-top:11px;
 padding-bottom:11px;
 clear:both;
 float:left;
-width:644px;
-width:96.699%;
 width:100%;
 border-top-width:1px;
 border-top-style:dashed;
@@ -734,6 +737,7 @@ border-radius:4px;
 #notices_primary {
 float:left;
 width:644px;
+width:46em;
 border-radius:7px;
 -moz-border-radius:7px;
 -webkit-border-radius:7px;