Update to forms and email settings

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 4cd63a9d3bc0e482034289a25838f58d86029054..d03d5ff84264d9822739dcbc3d14c8f328b7877f 100644 (file)
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -85,42 +85,46 @@ class EmailsettingsAction extends SettingsAction
         $user = common_current_user();
 
         $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'emailsettings',
+                                          'id' => 'form_settings_email',
+                                          'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('emailsettings')));
-
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Email settings'));
         $this->hidden('token', common_session_token());
 
+        $this->elementStart('div', array('id' => 'settings_email_address'));
         $this->element('h2', null, _('Address'));
 
         if ($user->email) {
-            $this->elementStart('p');
-            $this->element('span', 'address confirmed', $user->email);
-            $this->element('span', 'input_instructions',
-                           _('Current confirmed email address.'));
+            $this->element('p', array('id' => 'email_confirmed', $user->email));
+            $this->element('p', array('class' => 'form_note'), _('Current confirmed email address.'));
             $this->hidden('email', $user->email);
-            $this->elementEnd('p');
             $this->submit('remove', _('Remove'));
         } else {
             $confirm = $this->getConfirmation();
             if ($confirm) {
-                $this->elementStart('p');
-                $this->element('span', 'address unconfirmed', $confirm->address);
-                $this->element('span', 'input_instructions',
-                               _('Awaiting confirmation on this address. '.
-                                 'Check your inbox (and spam box!) for a message '.
-                                 'with further instructions.'));
+                $this->element('p', array('id' => 'email_unconfirmed'), $confirm->address);
+                $this->element('p', array('class' => 'form_note'), 
+                                        _('Awaiting confirmation on this address. '.
+                                        'Check your inbox (and spam box!) for a message '.
+                                        'with further instructions.'));
                 $this->hidden('email', $confirm->address);
-                $this->elementEnd('p');
                 $this->submit('cancel', _('Cancel'));
             } else {
+                $this->elementStart('ul', 'form_datas');
+                $this->elementStart('li');
                 $this->input('email', _('Email Address'),
                              ($this->arg('email')) ? $this->arg('email') : null,
                              _('Email address, like "UserName@example.org"'));
+                $this->elementEnd('li');
+                $this->elementEnd('ul');
                 $this->submit('add', _('Add'));
             }
         }
+        $this->elementEnd('div');
 
+        $this->elementStart('div', array('id' => 'settings_email_incoming'));
         if ($user->email) {
             $this->element('h2', null, _('Incoming email'));
 
@@ -140,31 +144,49 @@ class EmailsettingsAction extends SettingsAction
             $this->elementEnd('p');
             $this->submit('newincoming', _('New'));
         }
+        $this->elementEnd('div');
 
+        $this->elementStart('div', array('id' => 'settings_email_preferences'));
         $this->element('h2', null, _('Preferences'));
 
+        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('li');
         $this->checkbox('emailnotifysub',
                         _('Send me notices of new subscriptions through email.'),
                         $user->emailnotifysub);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('emailnotifyfav',
                         _('Send me email when someone '.
                           'adds my notice as a favorite.'),
                         $user->emailnotifyfav);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('emailnotifymsg',
                         _('Send me email when someone sends me a private message.'),
                         $user->emailnotifymsg);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('emailnotifynudge',
                         _('Allow friends to nudge me and send me an email.'),
                         $user->emailnotifynudge);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('emailpost',
                         _('I want to post notices by email.'),
                         $user->emailpost);
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('emailmicroid',
                         _('Publish a MicroID for my email address.'),
                         $user->emailmicroid);
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
+        $this->elementEnd('div');
 
         $this->submit('save', _('Save'));
 
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 

diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index eb8a612e4ff0f6d20b91fe56a1bcf8633a795deb..37853f345fa64b3e24ff1b52934ecd253496cd40 100644 (file)
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -155,20 +155,17 @@ class HTMLOutputter extends XMLOutputter
 
     function input($id, $label, $value=null, $instructions=null)
     {
-        $this->elementStart('p');
         $this->element('label', array('for' => $id), $label);
         $attrs = array('name' => $id,
                        'type' => 'text',
-                       'class' => 'input_text',
                        'id' => $id);
         if ($value) {
             $attrs['value'] = htmlspecialchars($value);
         }
         $this->element('input', $attrs);
         if ($instructions) {
-            $this->element('span', 'input_instructions', $instructions);
+            $this->element('p', 'form_guide', $instructions);
         }
-        $this->elementEnd('p');
     }
 
     /**
@@ -192,7 +189,6 @@ class HTMLOutputter extends XMLOutputter
     function checkbox($id, $label, $checked=false, $instructions=null,
                       $value='true', $disabled=false)
     {
-        $this->elementStart('p');
         $attrs = array('name' => $id,
                        'type' => 'checkbox',
                        'class' => 'checkbox',
@@ -213,9 +209,8 @@ class HTMLOutputter extends XMLOutputter
                        $label);
         $this->text(' ');
         if ($instructions) {
-            $this->element('span', 'input_instructions', $instructions);
+            $this->element('p', 'form_guide', $instructions);
         }
-        $this->elementEnd('p');
     }
 
     /**
@@ -240,7 +235,6 @@ class HTMLOutputter extends XMLOutputter
     function dropdown($id, $label, $content, $instructions=null,
                       $blank_select=false, $selected=null)
     {
-        $this->elementStart('p');
         $this->element('label', array('for' => $id), $label);
         $this->elementStart('select', array('id' => $id, 'name' => $id));
         if ($blank_select) {
@@ -257,9 +251,8 @@ class HTMLOutputter extends XMLOutputter
         }
         $this->elementEnd('select');
         if ($instructions) {
-            $this->element('span', 'input_instructions', $instructions);
+            $this->element('p', 'form_guide', $instructions);
         }
-        $this->elementEnd('p');
     }
 
     /**
@@ -296,7 +289,6 @@ class HTMLOutputter extends XMLOutputter
 
     function password($id, $label, $instructions=null)
     {
-        $this->elementStart('p');
         $this->element('label', array('for' => $id), $label);
         $attrs = array('name' => $id,
                        'type' => 'password',
@@ -304,9 +296,8 @@ class HTMLOutputter extends XMLOutputter
                        'id' => $id);
         $this->element('input', $attrs);
         if ($instructions) {
-            $this->element('span', 'input_instructions', $instructions);
+            $this->element('p', 'form_guide', $instructions);
         }
-        $this->elementEnd('p');
     }
 
     /**
@@ -348,7 +339,6 @@ class HTMLOutputter extends XMLOutputter
 
     function textarea($id, $label, $content=null, $instructions=null)
     {
-        $this->elementStart('p');
         $this->element('label', array('for' => $id), $label);
         $this->element('textarea', array('rows' => 3,
                                          'cols' => 40,
@@ -356,8 +346,7 @@ class HTMLOutputter extends XMLOutputter
                                          'id' => $id),
                        ($content) ? $content : '');
         if ($instructions) {
-            $this->element('span', 'input_instructions', $instructions);
+            $this->element('p', 'form_guide', $instructions);
         }
-        $this->elementEnd('p');
     }
 }

diff --git a/lib/settingsgroupnav.php b/lib/settingsgroupnav.php
index 044c74552af9c7a4725ed424d6dbff40c98d0775..bd66c65a659fcaecd35a42c5797fd0a9716b4676 100644 (file)
--- a/lib/settingsgroupnav.php
+++ b/lib/settingsgroupnav.php
@@ -94,7 +94,7 @@ class SettingsGroupNav extends Widget
                       _('Other options')));
         
         $action_name = $this->action->trimmed('action');
-        $this->action->elementStart('ul', array('id' => 'nav_views'));
+        $this->action->elementStart('ul', array('class' => 'nav'));
        
         foreach ($menu as $menuaction => $menudesc) {
             if ($menuaction == 'imsettings' &&
@@ -104,7 +104,7 @@ class SettingsGroupNav extends Widget
             $this->action->menuItem(common_local_url($menuaction),
                                    $menudesc[0],
                                    $menudesc[1],
-                                   $action_name == $menuaction);
+                                   $action_name === $menuaction);
         }
        
         $this->action->elementEnd('ul');

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index b8b260266c1c31c811223cb72070e85dc28785bf..027cb16662a20f2acd05b42d66987568bff9c5e7 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -100,7 +100,7 @@ border:0;
 display:none;
 }
 .form_settings .form_datas label {
-display:block;
+
 }
 
 .form_guide {
@@ -116,6 +116,13 @@ display:inline;
 font-weight:bold;
 }
 
+.form_settings p {
+margin-bottom:18px;
+}
+
+#settings_email_address {
+margin-bottom:29px;
+}
 
 
 /* FORM SETTINGS */