X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fdeletenotice.php;h=e733f9650ad12eb2e75960f3bdec0df9054a5019;hb=db4ffca5350a11835c2c990f8d77d7cabb365a43;hp=fc4a74eac97e52f49bd3717977c7a03f8bbc7e95;hpb=ab82978b2d67545a9cd7bfc80837798212cff31b;p=quix0rs-gnu-social.git diff --git a/actions/deletenotice.php b/actions/deletenotice.php index fc4a74eac9..e733f9650a 100644 --- a/actions/deletenotice.php +++ b/actions/deletenotice.php @@ -103,17 +103,18 @@ class DeletenoticeAction extends DeleteAction function showContent() { - $this->elementStart('form', array('id' => 'notice_delete_form', + $this->elementStart('form', array('id' => 'form_notice_delete', + 'class' => 'form_settings', 'method' => 'post', 'action' => common_local_url('deletenotice'))); + $this->elementStart('fieldset'); + $this->element('legend', null, _('Delete notice')); $this->hidden('token', common_session_token()); $this->hidden('notice', $this->trimmed('notice')); - $this->elementStart('p'); - $this->element('span', array('id' => 'confirmation_text'), - _('Are you sure you want to delete this notice?')); - $this->submit('yes', _('Yes')); - $this->submit('no', _('No')); - $this->elementEnd('p'); + $this->element('p', null, _('Are you sure you want to delete this notice?')); + $this->submit('form_action-no', _('No'), 'submit form_action-primary', 'no', _("Do not delete this notice")); + $this->submit('form_action-yes', _('Yes'), 'submit form_action-secondary', 'yes', _('Delete this notice')); + $this->elementEnd('fieldset'); $this->elementEnd('form'); } @@ -134,16 +135,12 @@ class DeletenoticeAction extends DeleteAction $url = common_get_returnto(); - - $urlval = ($url) ? $url : 'null'; - common_debug("deleteNotice() - returnto url = $urlval"); - if ($url) { common_set_returnto(null); } else { $url = common_local_url('public'); } - common_redirect($url); + common_redirect($url, 303); } }