From f46fd284e4395a113cdcc6e019d6f1b4b9ef8ff6 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Fri, 16 Jan 2009 23:41:46 +0000
Subject: Update to forms and email settings

---
 actions/emailsettings.php | 50 ++++++++++++++++++++++++++++++++++-------------
 1 file changed, 36 insertions(+), 14 deletions(-)

(limited to 'actions')

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 4cd63a9d3..d03d5ff84 100644
--- 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');
     }
 
-- 
cgit v1.2.3-54-g00ecf


From 0a5125675b4165be4c8278edf8d30f33483081fa Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 00:01:53 +0000
Subject: Updates to form styling

---
 actions/emailsettings.php  | 28 ++++++++++++----------------
 lib/htmloutputter.php      |  2 +-
 theme/base/css/display.css | 13 ++++++++++++-
 3 files changed, 25 insertions(+), 18 deletions(-)

(limited to 'actions')

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index d03d5ff84..090df30dd 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -89,12 +89,10 @@ class EmailsettingsAction extends SettingsAction
                                           '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'));
+        $this->elementStart('fieldset',array('id' => 'settings_email_address'));
+        $this->element('legend', null, _('Address'));
+        $this->hidden('token', common_session_token());
 
         if ($user->email) {
             $this->element('p', array('id' => 'email_confirmed', $user->email));
@@ -122,12 +120,11 @@ class EmailsettingsAction extends SettingsAction
                 $this->submit('add', _('Add'));
             }
         }
-        $this->elementEnd('div');
-
-        $this->elementStart('div', array('id' => 'settings_email_incoming'));
-        if ($user->email) {
-            $this->element('h2', null, _('Incoming email'));
+        $this->elementEnd('fieldset');
 
+       if ($user->email) {
+            $this->elementStart('fieldset',array('id' => 'settings_email_incoming'));
+            $this->element('legend',_('Incoming email'));
             if ($user->incomingemail) {
                 $this->elementStart('p');
                 $this->element('span', 'address', $user->incomingemail);
@@ -143,11 +140,12 @@ class EmailsettingsAction extends SettingsAction
                              'cancels the old one.'));
             $this->elementEnd('p');
             $this->submit('newincoming', _('New'));
+            $this->elementEnd('fieldset');
         }
-        $this->elementEnd('div');
 
-        $this->elementStart('div', array('id' => 'settings_email_preferences'));
-        $this->element('h2', null, _('Preferences'));
+
+        $this->elementStart('fieldset', array('id' => 'settings_email_preferences'));
+        $this->element('legend', null, _('Preferences'));
 
         $this->elementStart('ul', 'form_datas');
         $this->elementStart('li');
@@ -182,11 +180,9 @@ class EmailsettingsAction extends SettingsAction
                         $user->emailmicroid);
         $this->elementEnd('li');
         $this->elementEnd('ul');
-        $this->elementEnd('div');
+        $this->elementEnd('fieldset');
 
         $this->submit('save', _('Save'));
-
-        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
diff --git a/lib/htmloutputter.php b/lib/htmloutputter.php
index 37853f345..71f17604b 100644
--- a/lib/htmloutputter.php
+++ b/lib/htmloutputter.php
@@ -204,7 +204,7 @@ class HTMLOutputter extends XMLOutputter
         }
         $this->element('input', $attrs);
         $this->text(' ');
-        $this->element('label', array('class' => 'checkbox_label',
+        $this->element('label', array('class' => 'checkbox',
                                       'for' => $id),
                        $label);
         $this->text(' ');
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 027cb1666..294119c55 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -64,6 +64,13 @@ font-weight:bold;
 }
 form ul li input {
 }
+
+form input.checkbox {
+position:relative;
+top:2px;
+left:0;
+}
+
 form .error {
 margin-right:11px;
 }
@@ -97,7 +104,8 @@ padding:0;
 border:0;
 }
 .form_settings legend {
-display:none;
+font-size:1.6em;
+text-transform:uppercase;
 }
 .form_settings .form_datas label {
 
@@ -124,6 +132,9 @@ margin-bottom:18px;
 margin-bottom:29px;
 }
 
+#settings_email_preferences label {
+font-weight:normal;
+}
 
 /* FORM SETTINGS */
 
-- 
cgit v1.2.3-54-g00ecf


From 2561199e59ce6c4f4390443bda6d17d709ce1e36 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 00:06:31 +0000
Subject: OpenID form settings markup

---
 actions/openidsettings.php | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'actions')

diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index a21a9869e..f24c81795 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -85,26 +85,31 @@ class OpenidsettingsAction extends SettingsAction
         $user = common_current_user();
 
         $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'openidadd',
+                                          'id' => 'form_openid_add',
+                                          'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('openidsettings')));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Add OpenID'));
         $this->hidden('token', common_session_token());
-        $this->element('h2', null, _('Add OpenID'));
-        $this->element('p', null,
+        $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('p');
+        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('li');
         $this->element('label', array('for' => 'openid_url'),
                        _('OpenID URL'));
         $this->element('input', array('name' => 'openid_url',
                                       'type' => 'text',
                                       'id' => 'openid_url'));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
         $this->element('input', array('type' => 'submit',
                                       'id' => 'add',
                                       'name' => 'add',
                                       'class' => 'submit',
                                       'value' => _('Add')));
-        $this->elementEnd('p');
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
 
         $oid = new User_openid();
-- 
cgit v1.2.3-54-g00ecf


From b9fb70ee70ecd465f5843241b308f2b8680120f6 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 00:46:33 +0000
Subject: Markup clean up and styles

---
 actions/emailsettings.php  |  7 +++----
 actions/openidsettings.php | 15 ++++++++-------
 lib/action.php             |  3 +--
 theme/base/css/display.css |  4 ++++
 4 files changed, 16 insertions(+), 13 deletions(-)

(limited to 'actions')

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 090df30dd..355470815 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -90,7 +90,7 @@ class EmailsettingsAction extends SettingsAction
                                           'action' =>
                                           common_local_url('emailsettings')));
 
-        $this->elementStart('fieldset',array('id' => 'settings_email_address'));
+        $this->elementStart('fieldset', array('id' => 'settings_email_address'));
         $this->element('legend', null, _('Address'));
         $this->hidden('token', common_session_token());
 
@@ -123,7 +123,7 @@ class EmailsettingsAction extends SettingsAction
         $this->elementEnd('fieldset');
 
        if ($user->email) {
-            $this->elementStart('fieldset',array('id' => 'settings_email_incoming'));
+            $this->elementStart('fieldset', array('id' => 'settings_email_incoming'));
             $this->element('legend',_('Incoming email'));
             if ($user->incomingemail) {
                 $this->elementStart('p');
@@ -180,9 +180,8 @@ class EmailsettingsAction extends SettingsAction
                         $user->emailmicroid);
         $this->elementEnd('li');
         $this->elementEnd('ul');
-        $this->elementEnd('fieldset');
-
         $this->submit('save', _('Save'));
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
diff --git a/actions/openidsettings.php b/actions/openidsettings.php
index f24c81795..6f17f154c 100644
--- a/actions/openidsettings.php
+++ b/actions/openidsettings.php
@@ -85,11 +85,11 @@ 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',
@@ -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')));
@@ -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);
@@ -163,7 +164,7 @@ class OpenidsettingsAction extends SettingsAction
                                                   'name' => 'remove',
                                                   'class' => 'submit',
                                                   'value' => _('Remove')));
-                    $this->elementEnd('p');
+                    $this->elementEnd('fieldset');
                     $this->elementEnd('form');
                     $idx++;
                 }
diff --git a/lib/action.php b/lib/action.php
index 1622047c0..35f6f2e3e 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -565,8 +565,7 @@ class Action extends HTMLOutputter // lawsuit
         if ($is_selected) {
             $lattrs['class'] = 'current';
         }
-        (is_null($id)) ? $lattrs : $lattrs['id'] = $id;
-        $this->elementStart('li', $lattrs);
+        $this->elementStart('li', (is_null($id)) ? $lattrs : $lattr['id'] = $id);
         $attrs['href'] = $url;
         if ($title) {
             $attrs['title'] = $title;
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 294119c55..3aee52088 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -99,6 +99,10 @@ form input.submit {
 
 
 /* FORM SETTINGS */
+.form_settings {
+margin-bottom:29px;
+}
+
 .form_settings fieldset {
 padding:0;
 border:0;
-- 
cgit v1.2.3-54-g00ecf


From 0b947a33bc401faaddcae3bb5b39b9cbe2d5277c Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 00:49:48 +0000
Subject: Minor

---
 actions/smssettings.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'actions')

diff --git a/actions/smssettings.php b/actions/smssettings.php
index f214997ec..d7c621b13 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -83,12 +83,14 @@ class SmssettingsAction extends SettingsAction
         $user = common_current_user();
 
         $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'smssettings',
+                                          'id' => 'form_settings_sms',
+                                          'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('smssettings')));
 
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Address'));
         $this->hidden('token', common_session_token());
-        $this->element('h2', null, _('Address'));
 
         if ($user->sms) {
             $this->elementStart('p');
@@ -126,6 +128,7 @@ class SmssettingsAction extends SettingsAction
                 $this->submit('add', _('Add'));
             }
         }
+        $this->elementEnd('fieldset');
 
         if ($user->sms) {
             $this->element('h2', null, _('Incoming email'));
@@ -147,8 +150,8 @@ class SmssettingsAction extends SettingsAction
             $this->submit('newincoming', _('New'));
         }
 
-        $this->element('h2', null, _('Preferences'));
-
+        $this->elementStart('fieldset', array('id' => 'sms_preferences'));
+        $this->element('legend', null, _('Preferences'));
         $this->checkbox('smsnotify',
                         _('Send me notices through SMS; '.
                           'I understand I may incur '.
@@ -157,6 +160,7 @@ class SmssettingsAction extends SettingsAction
 
         $this->submit('save', _('Save'));
 
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
     }
 
-- 
cgit v1.2.3-54-g00ecf


From b2f16c523466f40589712a173a35c1b0bf54ea99 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 01:08:55 +0000
Subject: SMS form settings

---
 actions/smssettings.php    | 24 +++++++++++++++---------
 theme/base/css/display.css |  7 ++-----
 2 files changed, 17 insertions(+), 14 deletions(-)

(limited to 'actions')

diff --git a/actions/smssettings.php b/actions/smssettings.php
index d7c621b13..6d3c54942 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -88,7 +88,7 @@ class SmssettingsAction extends SettingsAction
                                           'action' =>
                                           common_local_url('smssettings')));
 
-        $this->elementStart('fieldset');
+        $this->elementStart('fieldset', array('id' => 'settings_sms_address'));
         $this->element('legend', null, _('Address'));
         $this->hidden('token', common_session_token());
 
@@ -142,21 +142,25 @@ class SmssettingsAction extends SettingsAction
                 $this->submit('removeincoming', _('Remove'));
             }
 
-            $this->elementStart('p');
-            $this->element('span', 'input_instructions',
+            $this->element('p', 'form_guide',
                            _('Make a new email address for posting to; '.
                              'cancels the old one.'));
-            $this->elementEnd('p');
             $this->submit('newincoming', _('New'));
         }
 
-        $this->elementStart('fieldset', array('id' => 'sms_preferences'));
+        $this->elementStart('fieldset', array('id' => 'settings_sms_preferences'));
         $this->element('legend', null, _('Preferences'));
+
+
+        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('li');
         $this->checkbox('smsnotify',
                         _('Send me notices through SMS; '.
                           'I understand I may incur '.
                           'exorbitant charges from my carrier.'),
                         $user->smsnotify);
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
 
         $this->submit('save', _('Save'));
 
@@ -440,8 +444,9 @@ class SmssettingsAction extends SettingsAction
 
         $cnt = $carrier->find();
 
-        $this->elementStart('p');
-        $this->element('label', array('for' => 'carrier'));
+        $this->elementStart('ul');
+        $this->elementStart('li');
+        $this->element('label', array('for' => 'carrier'), _('Mobile carrier'));
         $this->elementStart('select', array('name' => 'carrier',
                                             'id' => 'carrier'));
         $this->element('option', array('value' => 0),
@@ -451,13 +456,14 @@ class SmssettingsAction extends SettingsAction
                            $carrier->name);
         }
         $this->elementEnd('select');
-        $this->elementEnd('p');
-        $this->element('span', 'input_instructions',
+        $this->element('p', 'form_guide',
                        sprintf(_('Mobile carrier for your phone. '.
                                  'If you know a carrier that accepts ' .
                                  'SMS over email but isn\'t listed here, ' .
                                  'send email to let us know at %s.'),
                                common_config('site', 'email')));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
     }
 
     /**
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 3aee52088..fce4c7b86 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -99,13 +99,10 @@ form input.submit {
 
 
 /* FORM SETTINGS */
-.form_settings {
-margin-bottom:29px;
-}
-
 .form_settings fieldset {
 padding:0;
 border:0;
+margin-bottom:29px;
 }
 .form_settings legend {
 font-size:1.6em;
@@ -136,7 +133,7 @@ margin-bottom:18px;
 margin-bottom:29px;
 }
 
-#settings_email_preferences label {
+.form_settings label.checkbox {
 font-weight:normal;
 }
 
-- 
cgit v1.2.3-54-g00ecf


From 3e40a564bd7f727d2c967b6f70acc14d4b801d97 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 01:50:21 +0000
Subject: twitter settings markup

---
 actions/twittersettings.php | 39 ++++++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 13 deletions(-)

(limited to 'actions')

diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 5492dd995..cd070cb45 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -97,58 +97,71 @@ class TwittersettingsAction extends SettingsAction
         }
 
         $this->elementStart('form', array('method' => 'post',
-                                          'id' => 'twittersettings',
+                                          'id' => 'form_settings_twitter',
+                                          'class' => 'form_settings',
                                           'action' =>
                                           common_local_url('twittersettings')));
+        $this->elementStart('fieldset', array('id' => 'settings_twitter_account'));
+        $this->element('legend', null, _('Twitter Account'));
         $this->hidden('token', common_session_token());
-
-        $this->element('h2', null, _('Twitter Account'));
-
+        $this->elementStart('ul', 'form_datas');
         if ($fuser) {
-            $this->elementStart('p');
-
+            $this->elementStart('li');
             $this->element('span', 'twitter_user', $fuser->nickname);
             $this->element('a', array('href' => $fuser->uri), $fuser->uri);
-            $this->element('span', 'input_instructions',
+            $this->element('p', 'form_guide',
                            _('Current verified Twitter account.'));
             $this->hidden('flink_foreign_id', $flink->foreign_id);
-            $this->elementEnd('p');
             $this->submit('remove', _('Remove'));
+            $this->elementEnd('li');
         } else {
+            $this->elementStart('li');
             $this->input('twitter_username', _('Twitter user name'),
                          ($this->arg('twitter_username')) ?
                          $this->arg('twitter_username') :
                          $profile->nickname,
                          _('No spaces, please.')); // hey, it's what Twitter says
-
+            $this->elementEnd('li');
+            $this->elementStart('li');
             $this->password('twitter_password', _('Twitter password'));
+            $this->elementend('li');
         }
+        $this->elementEnd('ul');
+        $this->elementEnd('fieldset');
 
-        $this->element('h2', null, _('Preferences'));
+        $this->elementStart('fieldset', array('id' => 'settings_twitter_preferences'));
+        $this->element('legend', null, _('Preferences'));
 
+        $this->elementStart('ul');
+        $this->elementStart('li');
         $this->checkbox('noticesync',
                         _('Automatically send my notices to Twitter.'),
                         ($flink) ?
                         ($flink->noticesync & FOREIGN_NOTICE_SEND) :
                         true);
-
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('replysync',
                         _('Send local "@" replies to Twitter.'),
                         ($flink) ?
                         ($flink->noticesync & FOREIGN_NOTICE_SEND_REPLY) :
                         true);
-
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('friendsync',
                         _('Subscribe to my Twitter friends here.'),
                         ($flink) ?
                         ($flink->friendsync & FOREIGN_FRIEND_RECV) :
                         false);
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
 
         if ($flink) {
             $this->submit('save', _('Save'));
         } else {
             $this->submit('add', _('Add'));
         }
+        $this->elementEnd('fieldset');
 
         $this->showTwitterSubscriptions();
 
@@ -481,4 +494,4 @@ class TwittersettingsAction extends SettingsAction
         return false;
     }
 
-}
\ No newline at end of file
+}
-- 
cgit v1.2.3-54-g00ecf


From 05b00cc7df22d2e998d642e91fee6cea317a9b83 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sat, 17 Jan 2009 16:22:36 +0000
Subject: Login styles

---
 actions/login.php          | 14 +++++++++-
 theme/base/css/display.css | 68 +++++++++++++++++++++-------------------------
 2 files changed, 44 insertions(+), 38 deletions(-)

(limited to 'actions')

diff --git a/actions/login.php b/actions/login.php
index 23ab16676..224b30f6f 100644
--- a/actions/login.php
+++ b/actions/login.php
@@ -130,15 +130,27 @@ class LoginAction extends Action
     function showContent()
     {      
         $this->elementStart('form', array('method' => 'post',
-                                           'id' => 'login',
+                                           'id' => 'form_login',
+                                           'class' => 'form_login',
                                            'action' => common_local_url('login')));
+        $this->elementStart('fieldset');
+        $this->element('legend', null, _('Login to site'));
+        $this->elementStart('ul', 'form_datas');
+        $this->elementStart('li');
         $this->input('nickname', _('Nickname'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->password('password', _('Password'));
+        $this->elementEnd('li');
+        $this->elementStart('li');
         $this->checkbox('rememberme', _('Remember me'), false,
                         _('Automatically login in the future; ' .
                            'not for shared computers!'));
+        $this->elementEnd('li');
+        $this->elementEnd('ul');
         $this->submit('submit', _('Login'));
         $this->hidden('token', common_session_token());
+        $this->elementEnd('fieldset');
         $this->elementEnd('form');
         $this->elementStart('p');
         $this->element('a', array('href' => common_local_url('recoverpassword')),
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index ce7f69b35..afddefd27 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -30,30 +30,38 @@ h1,h2,h3,h4,h5,h6 {
 	text-transform:uppercase;
 	margin-bottom:7px;
 }
-legend { font-weight:bold; }
+caption {
+font-weight:bold;
+}
+.opened { display: block !important;}
+.closed { display: none !important;}
+
+
+legend {
+font-weight:bold; 
+font-size:1.6em;
+text-transform:uppercase;
+}
 input, textarea, select, option {
 padding:4px;
 font-family:sans-serif;
 font-size:1em;
 -moz-border-radius:4px;
 }
-select, option {
-padding-bottom:0;
-}
-fieldset {
-padding:11px;
-}
 input:focus, textarea:focus, select:focus {
 border-width:2px;
 border-style: solid;
--moz-border-radius:4px;
 }
-caption {
-font-weight:bold;
+
+select, option {
+padding-bottom:0;
 }
-.opened { display: block !important;}
-.closed { display: none !important;}
-span.required { font-weight:bold; }
+fieldset {
+padding:0;
+border:0;
+margin-bottom:29px;
+}
+
 form ul li {
 list-style-type:none;
 margin:0 0 18px 0;
@@ -71,8 +79,10 @@ top:2px;
 left:0;
 }
 
-form .error {
-margin-right:11px;
+#page_notice .error {
+background-color:#F7E8E8;
+padding:4px 7px;
+-moz-border-radius:4px;
 }
 form label.submit {
 display:none;
@@ -83,15 +93,7 @@ display:block;
 .form_response {
 margin-bottom:18px;
 }
-.form_response dt {
-}
-.form_response dd {
-}
 
-form input.remove,
-form input.submit {
--moz-border-radius:4px;
-}
 form input.submit {
 }
 
@@ -99,24 +101,16 @@ form input.submit {
 
 
 /* FORM SETTINGS */
-.form_settings fieldset {
-padding:0;
-border:0;
-margin-bottom:29px;
-}
-.form_settings legend {
-font-size:1.6em;
-text-transform:uppercase;
-}
-.form_settings .form_datas label {
-
-}
-
 .form_guide {
 font-style:italic;
 }
 
-.form_settings .form_actions label {
+.form_login label,
+.form_settings label {
+margin-right:11px;
+}
+
+.form_actions label {
 display:none;
 }
 
-- 
cgit v1.2.3-54-g00ecf