forked from GNUsocial/gnu-social
Changed No/Yes and Reset/Save locations. They are now a little more
usable by first offering the option to undo and than do.
This commit is contained in:
parent
7ae2ed7cfc
commit
56a8a255ff
@ -112,8 +112,8 @@ class DeletenoticeAction extends DeleteAction
|
|||||||
$this->hidden('token', common_session_token());
|
$this->hidden('token', common_session_token());
|
||||||
$this->hidden('notice', $this->trimmed('notice'));
|
$this->hidden('notice', $this->trimmed('notice'));
|
||||||
$this->element('p', null, _('Are you sure you want to delete this notice?'));
|
$this->element('p', null, _('Are you sure you want to delete this notice?'));
|
||||||
$this->submit('form_action-yes', _('Yes'), 'submit form_action-primary', 'yes');
|
$this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not delete this notice"));
|
||||||
$this->submit('form_action-no', _('No'), 'submit form_action-secondary', 'no');
|
$this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Delete this notice'));
|
||||||
$this->elementEnd('fieldset');
|
$this->elementEnd('fieldset');
|
||||||
$this->elementEnd('form');
|
$this->elementEnd('form');
|
||||||
}
|
}
|
||||||
|
@ -140,11 +140,12 @@ class DesignsettingsAction extends AccountSettingsAction
|
|||||||
$this->elementEnd('ul');
|
$this->elementEnd('ul');
|
||||||
$this->elementEnd('fieldset');
|
$this->elementEnd('fieldset');
|
||||||
|
|
||||||
$this->submit('save', _('Save'));
|
|
||||||
$this->element('input', array('id' => 'settings_design_reset',
|
$this->element('input', array('id' => 'settings_design_reset',
|
||||||
'type' => 'reset',
|
'type' => 'reset',
|
||||||
'value' => 'Reset',
|
'value' => 'Reset',
|
||||||
'class' => 'form_action-secondary'));
|
'class' => 'submit form_action-primary',
|
||||||
|
'title' => _('Reset back to default')));
|
||||||
|
$this->submit('save', _('Save'), 'submit form_action-secondary', 'save', _('Save design'));
|
||||||
|
|
||||||
/*TODO: Check submitted form values:
|
/*TODO: Check submitted form values:
|
||||||
json_encode(form values)
|
json_encode(form values)
|
||||||
|
@ -198,9 +198,11 @@ padding:0 7px;
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
.form_settings input.form_action-primary {
|
||||||
|
padding:0;
|
||||||
|
}
|
||||||
.form_settings input.form_action-secondary {
|
.form_settings input.form_action-secondary {
|
||||||
margin-left:29px;
|
margin-left:29px;
|
||||||
padding:0;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#form_search .submit {
|
#form_search .submit {
|
||||||
|
@ -33,7 +33,7 @@ border-color:#aaa;
|
|||||||
border-color:#C3D6DF;
|
border-color:#C3D6DF;
|
||||||
}
|
}
|
||||||
|
|
||||||
.form_settings input.form_action-secondary {
|
.form_settings input.form_action-primary {
|
||||||
background:none;
|
background:none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -60,7 +60,7 @@ div.notice-options input,
|
|||||||
.entity_send-a-message a,
|
.entity_send-a-message a,
|
||||||
.form_user_nudge input.submit,
|
.form_user_nudge input.submit,
|
||||||
.entity_nudge p,
|
.entity_nudge p,
|
||||||
.form_settings input.form_action-secondary {
|
.form_settings input.form_action-primary {
|
||||||
color:#002E6E;
|
color:#002E6E;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -33,7 +33,7 @@ border-color:#aaa;
|
|||||||
border-color:#ddd;
|
border-color:#ddd;
|
||||||
}
|
}
|
||||||
|
|
||||||
.form_settings input.form_action-secondary {
|
.form_settings input.form_action-primary {
|
||||||
background:none;
|
background:none;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -60,7 +60,7 @@ div.notice-options input,
|
|||||||
.entity_send-a-message a,
|
.entity_send-a-message a,
|
||||||
.form_user_nudge input.submit,
|
.form_user_nudge input.submit,
|
||||||
.entity_nudge p,
|
.entity_nudge p,
|
||||||
.form_settings input.form_action-secondary {
|
.form_settings input.form_action-primary {
|
||||||
color:#002E6E;
|
color:#002E6E;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user