Ticket #2912: move 'I want to post notices by email" checkbox up from the email *output* prefs up into the box for the address to post to, so they're next to each other.

1 files changed, 10 insertions, 8 deletions

diff --git a/actions/emailsettings.php b/actions/emailsettings.php
index 5a816e5c0..02b6892e0 100644
--- a/actions/emailsettings.php
+++ b/actions/emailsettings.php
@@ -149,6 +149,16 @@ class EmailsettingsAction extends AccountSettingsAction
             $this->elementStart('fieldset', array('id' => 'settings_email_incoming'));
             // TRANS: Form legend for incoming e-mail settings form.
             $this->element('legend', null, _('Incoming email'));
+
+            $this->elementStart('ul', 'form_data');
+            $this->elementStart('li');
+            $this->checkbox('emailpost',
+                    // TRANS: Checkbox label in e-mail preferences form.
+                    _('I want to post notices by email.'),
+                    $user->emailpost);
+            $this->elementEnd('li');
+            $this->elementEnd('ul');
+
             if ($user->incomingemail) {
                 $this->elementStart('p');
                 $this->element('span', 'address', $user->incomingemail);
@@ -211,14 +221,6 @@ class EmailsettingsAction extends AccountSettingsAction
 			    _('Allow friends to nudge me and send me an email.'),
 			    $user->emailnotifynudge);
 	    $this->elementEnd('li');
-	    if (common_config('emailpost', 'enabled')) {
-		$this->elementStart('li');
-		$this->checkbox('emailpost',
-				// TRANS: Checkbox label in e-mail preferences form.
-				_('I want to post notices by email.'),
-				$user->emailpost);
-		$this->elementEnd('li');
-	    }
 	    $this->elementStart('li');
 	    $this->checkbox('emailmicroid',
 			    // TRANS: Checkbox label in e-mail preferences form.