forked from GNUsocial/gnu-social
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.
This commit is contained in:
parent
bc9fcaf2eb
commit
3048f9100d
@ -149,6 +149,16 @@ class EmailsettingsAction extends AccountSettingsAction
|
|||||||
$this->elementStart('fieldset', array('id' => 'settings_email_incoming'));
|
$this->elementStart('fieldset', array('id' => 'settings_email_incoming'));
|
||||||
// TRANS: Form legend for incoming e-mail settings form.
|
// TRANS: Form legend for incoming e-mail settings form.
|
||||||
$this->element('legend', null, _('Incoming email'));
|
$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) {
|
if ($user->incomingemail) {
|
||||||
$this->elementStart('p');
|
$this->elementStart('p');
|
||||||
$this->element('span', 'address', $user->incomingemail);
|
$this->element('span', 'address', $user->incomingemail);
|
||||||
@ -211,14 +221,6 @@ class EmailsettingsAction extends AccountSettingsAction
|
|||||||
_('Allow friends to nudge me and send me an email.'),
|
_('Allow friends to nudge me and send me an email.'),
|
||||||
$user->emailnotifynudge);
|
$user->emailnotifynudge);
|
||||||
$this->elementEnd('li');
|
$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->elementStart('li');
|
||||||
$this->checkbox('emailmicroid',
|
$this->checkbox('emailmicroid',
|
||||||
// TRANS: Checkbox label in e-mail preferences form.
|
// TRANS: Checkbox label in e-mail preferences form.
|
||||||
|
Loading…
Reference in New Issue
Block a user