From 061de33e576ac542459fd48ab61877eece05ea39 Mon Sep 17 00:00:00 2001
From: sarven <csarven@plantard.controlezvous.ca>
Date: Sun, 18 Jan 2009 21:14:47 +0000
Subject: [PATCH] SMS settings markup and styles. Minor check with twitter
 settings form_datas

---
 actions/smssettings.php     | 33 +++++++++++++++++++--------------
 actions/twittersettings.php |  2 +-
 theme/base/css/display.css  | 18 +++++++++++++-----
 3 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/actions/smssettings.php b/actions/smssettings.php
index 845266d18b..489fd1f587 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -93,37 +93,42 @@ class SmssettingsAction extends ConnectSettingsAction
         $this->hidden('token', common_session_token());
 
         if ($user->sms) {
-            $this->elementStart('p');
             $carrier = $user->getCarrier();
-            $this->element('span', 'address confirmed',
+            $this->element('p', 'form_confirmed',
                            $user->sms . ' (' . $carrier->name . ')');
-            $this->element('span', 'input_instructions',
+            $this->element('p', 'form_guide',
                            _('Current confirmed SMS-enabled phone number.'));
             $this->hidden('sms', $user->sms);
             $this->hidden('carrier', $user->carrier);
-            $this->elementEnd('p');
             $this->submit('remove', _('Remove'));
         } else {
             $confirm = $this->getConfirmation();
             if ($confirm) {
                 $carrier = Sms_carrier::staticGet($confirm->address_extra);
-                $this->elementStart('p');
-                $this->element('span', 'address unconfirmed',
+                $this->element('p', 'form_unconfirmed',
                                $confirm->address . ' (' . $carrier->name . ')');
-                $this->element('span', 'input_instructions',
+                $this->element('p', 'form_guide',
                                _('Awaiting confirmation on this phone number.'));
                 $this->hidden('sms', $confirm->address);
                 $this->hidden('carrier', $confirm->address_extra);
-                $this->elementEnd('p');
                 $this->submit('cancel', _('Cancel'));
+
+                $this->elementStart('ul', 'form_datas');
+                $this->elementStart('li');
                 $this->input('code', _('Confirmation code'), null,
                              _('Enter the code you received on your phone.'));
+                $this->elementEnd('li');
+                $this->elementEnd('ul');
                 $this->submit('confirm', _('Confirm'));
             } else {
+                $this->elementStart('ul', 'form_datas');
+                $this->elementStart('li');
                 $this->input('sms', _('SMS Phone number'),
                              ($this->arg('sms')) ? $this->arg('sms') : null,
                              _('Phone number, no punctuation or spaces, '.
                                'with area code'));
+                $this->elementEnd('li');
+                $this->elementEnd('ul');
                 $this->carrierSelect();
                 $this->submit('add', _('Add'));
             }
@@ -131,14 +136,13 @@ class SmssettingsAction extends ConnectSettingsAction
         $this->elementEnd('fieldset');
 
         if ($user->sms) {
-            $this->element('h2', null, _('Incoming email'));
+        $this->elementStart('fieldset', array('id' => 'settings_sms_incoming_email'));
+            $this->element('legend', null, _('Incoming email'));
 
             if ($user->incomingemail) {
-                $this->elementStart('p');
-                $this->element('span', 'address', $user->incomingemail);
-                $this->element('span', 'input_instructions',
+                $this->element('p', 'form_unconfirmed', $user->incomingemail);
+                $this->element('p', 'form_note',
                                _('Send email to this address to post new notices.'));
-                $this->elementEnd('p');
                 $this->submit('removeincoming', _('Remove'));
             }
 
@@ -146,6 +150,7 @@ class SmssettingsAction extends ConnectSettingsAction
                            _('Make a new email address for posting to; '.
                              'cancels the old one.'));
             $this->submit('newincoming', _('New'));
+            $this->elementEnd('fieldset');
         }
 
         $this->elementStart('fieldset', array('id' => 'settings_sms_preferences'));
@@ -443,7 +448,7 @@ class SmssettingsAction extends ConnectSettingsAction
 
         $cnt = $carrier->find();
 
-        $this->elementStart('ul');
+        $this->elementStart('ul', 'form_datas');
         $this->elementStart('li');
         $this->element('label', array('for' => 'carrier'), _('Mobile carrier'));
         $this->elementStart('select', array('name' => 'carrier',
diff --git a/actions/twittersettings.php b/actions/twittersettings.php
index 597623c801..0790991232 100644
--- a/actions/twittersettings.php
+++ b/actions/twittersettings.php
@@ -133,7 +133,7 @@ class TwittersettingsAction extends ConnectSettingsAction
                             array('id' => 'settings_twitter_preferences'));
         $this->element('legend', null, _('Preferences'));
 
-        $this->elementStart('ul');
+        $this->elementStart('ul', 'form_datas');
         $this->elementStart('li');
         $this->checkbox('noticesync',
                         _('Automatically send my notices to Twitter.'),
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 2857070f81..08805c1e0f 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -116,15 +116,19 @@ width:100%;
 float:left;
 }
 
-.form_settings .form_datas label,
+.form_settings .form_datas label {
+float:left;
+}
+.form_settings .form_datas textarea,
+.form_settings .form_datas select,
 .form_settings .form_datas input {
-margin-right:11px;
+margin-left:11px;
 float:left;
 }
 
 .form_settings label {
 margin-top:7px;
-width:123px;
+width:152px;
 }
 
 .form_actions label {
@@ -144,7 +148,7 @@ display:none;
 
 .form_settings .form_datas p.form_guide {
 clear:both;
-margin-left:134px;
+margin-left:163px;
 margin-bottom:0;
 }
 
@@ -154,11 +158,15 @@ margin-bottom:11px;
 
 .form_settings input.checkbox {
 margin-top:3px;
+margin-left:0;
 }
 .form_settings label.checkbox {
 font-weight:normal;
-width:auto;
 margin-top:0;
+margin-right:0;
+margin-left:11px;
+float:left;
+width:90%;
 }
 
 #form_login p.form_guide,