2 files changed, 56 insertions, 7 deletions

diff --git a/actions/profilesettings.php b/actions/profilesettings.php
index c31f76227..12251b83b 100644
--- a/actions/profilesettings.php
+++ b/actions/profilesettings.php
@@ -84,52 +84,72 @@ class ProfilesettingsAction extends AccountSettingsAction
         $profile = $user->getProfile();
 
         $this->elementStart('form', array('method' => 'POST',
-                                           'id' => 'profilesettings',
+                                           'id' => 'form_settings_profile',
+                                           'class' => 'form_settings',
                                            'action' => common_local_url('profilesettings')));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Profile information'));
         $this->hidden('token', common_session_token());
 
         # too much common patterns here... abstractable?
 
+        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('li');
         $this->input('nickname', _('Nickname'),
                      ($this->arg('nickname')) ? $this->arg('nickname') : $profile->nickname,
                      _('1-64 lowercase letters or numbers, no punctuation or spaces'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->input('fullname', _('Full name'),
                      ($this->arg('fullname')) ? $this->arg('fullname') : $profile->fullname);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->input('homepage', _('Homepage'),
                      ($this->arg('homepage')) ? $this->arg('homepage') : $profile->homepage,
                      _('URL of your homepage, blog, or profile on another site'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->textarea('bio', _('Bio'),
                         ($this->arg('bio')) ? $this->arg('bio') : $profile->bio,
                         _('Describe yourself and your interests in 140 chars'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->input('location', _('Location'),
                      ($this->arg('location')) ? $this->arg('location') : $profile->location,
                      _('Where you are, like "City, State (or Region), Country"'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->input('tags', _('Tags'),
                      ($this->arg('tags')) ? $this->arg('tags') : implode(' ', $user->getSelfTags()),
                      _('Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated'));
-
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $language = common_language();
         $this->dropdown('language', _('Language'),
                         get_nice_language_list(), _('Preferred language'),
                         true, $language);
-
+        $this->elementEnd('li');
         $timezone = common_timezone();
         $timezones = array();
         foreach(DateTimeZone::listIdentifiers() as $k => $v) {
             $timezones[$v] = $v;
         }
+        $this->elementStart('li');
         $this->dropdown('timezone', _('Timezone'),
                         $timezones, _('What timezone are you normally in?'),
                         true, $timezone);
-
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('autosubscribe',
                         _('Automatically subscribe to whoever '.
                           'subscribes to me (best for non-humans)'),
                         ($this->arg('autosubscribe')) ?
                         $this->boolean('autosubscribe') : $user->autosubscribe);
-
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
         $this->submit('save', _('Save'));
 
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
 
     }
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 15377a7b5..396d12ef0 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -109,9 +109,23 @@ margin-bottom:29px;
 font-style:italic;
 }
 
+
+.form_settings .form_datas li {
+width:100%;
+float:left;
+}
+
 .form_login label,
-.form_settings label {
+.form_settings .form_datas label,
+.form_login input,
+.form_settings .form_datas input {
 margin-right:11px;
+float:left;
+}
+
+.form_settings label {
+margin-top:7px;
+width:123px;
 }
 
 .form_actions label {
@@ -123,16 +137,31 @@ display:inline;
 font-weight:bold;
 }
 
+#form_settings_profile legend {
+display:none;
+}
+
+.form_settings .form_datas p.form_guide {
+clear:both;
+margin-left:134px;
+margin-bottom:0;
+}
+
 .form_settings p {
-margin-bottom:18px;
+margin-bottom:11px;
 }
 
 #settings_email_address {
 margin-bottom:29px;
 }
 
+.form_settings input.checkbox {
+margin-top:3px;
+}
 .form_settings label.checkbox {
 font-weight:normal;
+width:auto;
+margin-top:0;
 }
 
 /* FORM SETTINGS */