X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=lib%2Faction.php;h=7c57cbc432a9e8ba7f911bca38652ddbf3b39e6b;hb=c6b1b3e5e3ad1c47c7bd25b5bcfb0a8cb1cb2bb5;hp=65ef84cdf1601b2a221d43c3d87a40e1b7f7028e;hpb=2e77cbfa8672b2d93ea5058930179fd1bbabd2ab;p=quix0rs-gnu-social.git
diff --git a/lib/action.php b/lib/action.php
index 65ef84cdf1..7c57cbc432 100644
--- a/lib/action.php
+++ b/lib/action.php
@@ -235,10 +235,14 @@ class Action extends HTMLOutputter // lawsuit
$this->startHTML('text/xml;charset=utf-8');
$this->elementStart('head');
// TRANS: Title for conversation page.
- $this->element('title', null, _m('TITLE','Notice'));
+ $this->element('title', null, $this->title());
$this->elementEnd('head');
$this->elementStart('body');
- $this->showContent();
+ if ($this->getError()) {
+ $this->element('p', array('id'=>'error'), $this->getError());
+ } else {
+ $this->showContent();
+ }
$this->elementEnd('body');
$this->endHTML();
}
@@ -722,6 +726,8 @@ class Action extends HTMLOutputter // lawsuit
$this->elementStart('div', 'input_forms');
+ $this->element('label', array('for'=>'input_form_nav'), _m('TAB', 'Share your:'));
+
if (Event::handle('StartShowEntryForms', array(&$tabs))) {
$this->elementStart('ul', array('class' => 'nav',
'id' => 'input_form_nav'));
@@ -732,9 +738,6 @@ class Action extends HTMLOutputter // lawsuit
'class' => 'input_form_nav_tab');
if ($tag == 'status') {
- // We're actually showing the placeholder form,
- // but we special-case the 'Status' tab as if
- // it were a small version of it.
$attrs['class'] .= ' current';
}
$this->elementStart('li', $attrs);
@@ -748,16 +751,12 @@ class Action extends HTMLOutputter // lawsuit
$this->elementEnd('ul');
- $attrs = array('class' => 'input_form current',
- 'id' => 'input_form_placeholder');
- $this->elementStart('div', $attrs);
- $form = new NoticePlaceholderForm($this);
- $form->show();
- $this->elementEnd('div');
-
foreach ($tabs as $tag => $data) {
$attrs = array('class' => 'input_form',
'id' => 'input_form_'.$tag);
+ if ($tag == 'status') {
+ $attrs['class'] .= ' current';
+ }
$this->elementStart('div', $attrs);
@@ -1168,12 +1167,10 @@ class Action extends HTMLOutputter // lawsuit
// TRANS: license message in footer.
// TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
$notice = _('All %1$s content and data are available under the %2$s license.');
- $link = "" .
- htmlspecialchars(common_config('license', 'title')) .
- "";
- $this->raw(sprintf(htmlspecialchars($notice),
+ $link = sprintf('%2$s',
+ htmlspecialchars(common_config('license', 'url')),
+ htmlspecialchars(common_config('license', 'title')));
+ $this->raw(@sprintf(htmlspecialchars($notice),
htmlspecialchars(common_config('site', 'name')),
$link));
$this->elementEnd('p');