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

[quix0rs-gnu-social.git] / actions / openidsettings.php

diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index f24c817954468d8412acbd5d4da221d29336540c..92469d20f89a1af6046a09b6ff27e6a2eed02902 100644 (file)
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -31,7 +31,7 @@ if (!defined('LACONICA')) {
     exit(1);
 }
 
-require_once INSTALLDIR.'/lib/settingsaction.php';
+require_once INSTALLDIR.'/lib/accountsettingsaction.php';
 require_once INSTALLDIR.'/lib/openid.php';
 
 /**
@@ -46,7 +46,7 @@ require_once INSTALLDIR.'/lib/openid.php';
  * @link     http://laconi.ca/
  */
 
-class OpenidsettingsAction extends SettingsAction
+class OpenidsettingsAction extends AccountSettingsAction
 {
     /**
      * Title of the page
@@ -85,17 +85,17 @@ class OpenidsettingsAction extends SettingsAction
         $user = common_current_user();
 
         $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'form_openid_add',
+                                          'id' => 'form_settings_openid_add',
                                           'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('openidsettings')));
-        $this->elementStart('fieldset');
+        $this->elementStart('fieldset', array('id' => 'settings_openid_add'));
         $this->element('legend', null, _('Add OpenID'));
         $this->hidden('token', common_session_token());
         $this->element('p', 'form_guide',
                        _('If you want to add an OpenID to your account, ' .
                          'enter it in the box below and click "Add".'));
-        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('ul', 'form_data');
         $this->elementStart('li');
         $this->element('label', array('for' => 'openid_url'),
                        _('OpenID URL'));
@@ -105,7 +105,7 @@ class OpenidsettingsAction extends SettingsAction
         $this->elementEnd('li');
         $this->elementEnd('ul');
         $this->element('input', array('type' => 'submit',
-                                      'id' => 'add',
+                                      'id' => 'settings_openid_add_action-submit',
                                       'name' => 'add',
                                       'class' => 'submit',
                                       'value' => _('Add')));
@@ -124,7 +124,7 @@ class OpenidsettingsAction extends SettingsAction
 
             if ($cnt == 1 && !$user->password) {
 
-                $this->element('p', null,
+                $this->element('p', 'form_guide',
                                _('Removing your only OpenID '.
                                  'would make it impossible to log in! ' .
                                  'If you need to remove it, '.
@@ -139,7 +139,7 @@ class OpenidsettingsAction extends SettingsAction
 
             } else {
 
-                $this->element('p', null,
+                $this->element('p', 'form_guide',
                                _('You can remove an OpenID from your account '.
                                  'by clicking the button marked "Remove".'));
                 $idx = 0;
@@ -147,10 +147,11 @@ class OpenidsettingsAction extends SettingsAction
                 while ($oid->fetch()) {
                     $this->elementStart('form',
                                         array('method' => 'POST',
-                                              'id' => 'openiddelete' . $idx,
+                                              'id' => 'form_settings_openid_delete' . $idx,
+                                              'class' => 'form_settings',
                                               'action' =>
                                               common_local_url('openidsettings')));
-                    $this->elementStart('p');
+                    $this->elementStart('fieldset');
                     $this->hidden('token', common_session_token());
                     $this->element('a', array('href' => $oid->canonical),
                                    $oid->display);
@@ -161,9 +162,9 @@ class OpenidsettingsAction extends SettingsAction
                     $this->element('input', array('type' => 'submit',
                                                   'id' => 'remove'.$idx,
                                                   'name' => 'remove',
-                                                  'class' => 'submit',
+                                                  'class' => 'submit remove',
                                                   'value' => _('Remove')));
-                    $this->elementEnd('p');
+                    $this->elementEnd('fieldset');
                     $this->elementEnd('form');
                     $idx++;
                 }