form_password markup and style

diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index f96da13bda254c785694002128226e8e9b626b72..17b2de4e8601bacc17b8e69edacefa4f134d19b6 100644 (file)
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -81,21 +81,35 @@ class PasswordsettingsAction extends AccountSettingsAction
     {
         $user = common_current_user();
         $this->elementStart('form', array('method' => 'POST',
-                                          'id' => 'password',
+                                          'id' => 'form_password',
+                                          'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('profilesettings')));
-
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Password change'));
         $this->hidden('token', common_session_token());
 
+
+        $this->elementStart('ul', 'form_data');
         // Users who logged in with OpenID won't have a pwd
         if ($user->password) {
+            $this->elementStart('li');
             $this->password('oldpassword', _('Old password'));
+            $this->elementEnd('li');
         }
+        $this->elementStart('li');
         $this->password('newpassword', _('New password'),
                         _('6 or more characters'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->password('confirm', _('Confirm'),
                         _('same as password above'));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+
         $this->submit('changepass', _('Change'));
+
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
@@ -158,4 +172,4 @@ class PasswordsettingsAction extends AccountSettingsAction
 
         $this->showForm(_('Password saved.'), true);
     }
-}
\ No newline at end of file
+}

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index c16fa4ab073ec89b2b706ccd685889d3c15c3522..18205fcebee6aba00435ad59e1ef9a3f62b8aa77 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -147,7 +147,8 @@ font-weight:bold;
 
 #form_settings_profile legend,
 #form_login legend,
-#form_register legend {
+#form_register legend,
+#form_password legend {
 display:none;
 }