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

input elements outside of label elements

Browse Source 
HTML lets us put the input element inside the label and then they
are automatically paired, but this is more explicit and clear imho.
This commit is contained in:
Mikael Nordfeldth 2015-03-07 20:11:13 +01:00
parent aefaef3ead
commit 98b65763b0
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lib/noticeform.php
View File

@ -228,15 +228,17 @@ class NoticeForm extends Form
if (common_config('attachments', 'uploads')) { if (common_config('attachments', 'uploads')) {
$this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota')); $this->out->hidden('MAX_FILE_SIZE', common_config('attachments', 'file_quota'));
$this->out->elementStart('label', array('class' => 'notice_data-attach')); $this->out->element('label', array('class' => 'notice_data-attach',
// TRANS: Input label in notice form for adding an attachment. 'for' => $this->id().'-notice_data-attach'),
$this->out->text(_('Attach')); // TRANS: Input label in notice form for adding an attachment.
_('Attach'));
// The actual input element tends to be hidden with CSS.
$this->out->element('input', array('class' => 'notice_data-attach', $this->out->element('input', array('class' => 'notice_data-attach',
'type' => 'file', 'type' => 'file',
'name' => 'attach', 'name' => 'attach',
'id' => $this->id().'-notice_data-attach',
// TRANS: Title for input field to attach a file to a notice. // TRANS: Title for input field to attach a file to a notice.
'title' => _('Attach a file.'))); 'title' => _('Attach a file.')));
$this->out->elementEnd('label');
} }
if (!empty($this->actionName)) { if (!empty($this->actionName)) {
$this->out->hidden('notice_return-to', $this->actionName, 'returnto'); $this->out->hidden('notice_return-to', $this->actionName, 'returnto');
@ -261,9 +263,7 @@ class NoticeForm extends Form
'data-api' => common_local_url('geocode'))); 'data-api' => common_local_url('geocode')));
// @fixme checkbox method allows no way to change the id without changing the name // @fixme checkbox method allows no way to change the id without changing the name
//// TRANS: Checkbox label to allow sharing geo location in notices.
//$this->out->checkbox('notice_data-geo', _('Share my location'), true); //$this->out->checkbox('notice_data-geo', _('Share my location'), true);
$this->out->elementStart('label', 'notice_data-geo');
$this->out->element('input', array( $this->out->element('input', array(
'name' => 'notice_data-geo', 'name' => 'notice_data-geo',
'type' => 'checkbox', 'type' => 'checkbox',
@ -271,10 +271,10 @@ class NoticeForm extends Form
'id' => $this->id() . '-notice_data-geo', 'id' => $this->id() . '-notice_data-geo',
'checked' => true, // ? 'checked' => true, // ?
)); ));
$this->out->text(' '); $this->out->element('label', array('class' => 'notice_data-geo',
// TRANS: Field label to add location to a notice. 'for' => $this->id().'-notice_data-geo'),
$this->out->text(_('Share my location')); // TRANS: Checkbox label to allow sharing geo location in notices.
$this->out->elementEnd('label'); _('Share my location'));
$this->out->elementEnd('div'); $this->out->elementEnd('div');
// TRANS: Text to not share location for a notice in notice form. // TRANS: Text to not share location for a notice in notice form.