X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fnewnotice.php;h=0aafcd41c6f2dc623497d59cbc212d0ee1a04132;hb=26a92b28014685ba477888a27a49195b8e077b75;hp=97282e215d16d2630a136cc8e0a75f1189116ea8;hpb=84a2fb44b9f6f2b60124b651bb1d72496e81b5f0;p=quix0rs-gnu-social.git diff --git a/actions/newnotice.php b/actions/newnotice.php index 97282e215d..0aafcd41c6 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -64,7 +64,7 @@ class NewnoticeAction extends Action function title() { // TRANS: Page title for sending a new notice. - return _('New notice'); + return _m('TITLE','New notice'); } /** @@ -83,7 +83,7 @@ class NewnoticeAction extends Action function handle($args) { if (!common_logged_in()) { - // TRANS: Client error displayed trying to send a notice while not logged in. + // TRANS: Error message displayed when trying to perform an action that requires a logged in user. $this->clientError(_('Not logged in.')); } else if ($_SERVER['REQUEST_METHOD'] == 'POST') { // check for this before token since all POST and FILES data @@ -289,7 +289,8 @@ class NewnoticeAction extends Action { $this->startHTML('text/xml;charset=utf-8', true); $this->elementStart('head'); - $this->element('title', null, _('New notice')); + // TRANS: Title for form to send a new notice. + $this->element('title', null, _m('TITLE','New notice')); $this->elementEnd('head'); $this->elementStart('body'); @@ -330,6 +331,8 @@ class NewnoticeAction extends Action } /** + * // XXX: Should we be showing the notice form with microapps here? + * * Overload for replies or bad results * * We show content in the notice form if there were replies or results. @@ -351,10 +354,27 @@ class NewnoticeAction extends Action $inreplyto = null; } - $notice_form = new NoticeForm($this, array('content' => $content, - 'inreplyto' => $inreplyto)); + $this->elementStart('div', 'input_forms'); + $this->elementStart( + 'div', + array( + 'id' => 'input_form_status', + 'class' => 'input_form current nonav' + ) + ); + + $notice_form = new NoticeForm( + $this, + array( + 'content' => $content, + 'inreplyto' => $inreplyto + ) + ); $notice_form->show(); + + $this->elementEnd('div'); + $this->elementEnd('div'); } /**