GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Make NoticeForm return the proper placeholder text

Browse Source 
Also fixes some comments and uncertainties in the beginning of the
class definition.
This commit is contained in:
Mikael Nordfeldth 2015-03-06 20:04:09 +01:00
parent 62596d462b
commit 13c331fa81
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/noticeform.php
View File

@ -99,14 +99,12 @@ class NoticeForm extends Form
*/ */
function __construct($action, $options=null) function __construct($action, $options=null)
{ {
// XXX: ??? Is this to keep notice forms distinct?
// Do we have to worry about sub-second race conditions?
// XXX: Needs to be above the parent::__construct() call...?
$this->id_suffix = rand();
parent::__construct($action); parent::__construct($action);
// When creating a notice form we don't want to collide with
// possibly existing HTML elements, as naming conventions are similar.
$this->id_suffix = rand();
if (is_null($options)) { if (is_null($options)) {
$options = array(); $options = array();
} }
@ -190,6 +188,15 @@ class NoticeForm extends Form
$this->out->element('legend', null, _('Send a notice')); $this->out->element('legend', null, _('Send a notice'));
} }
protected function placeholderText()
{
if ($this->inreplyto) {
return _('Write a reply...');
}
return _('Share your status...');
}
/** /**
* Data elements * Data elements
* *
@ -205,7 +212,7 @@ class NoticeForm extends Form
// XXX: vary by defined max size // XXX: vary by defined max size
$this->out->element('textarea', array('class' => 'notice_data-text', $this->out->element('textarea', array('class' => 'notice_data-text',
'required' => 'required', 'required' => 'required',
'placeholder' => _('Share your status...'), 'placeholder' => $this->placeholderText(),
'cols' => 35, 'cols' => 35,
'rows' => 4, 'rows' => 4,
'name' => 'status_textarea'), 'name' => 'status_textarea'),