moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-09 19:06:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'wip-mdl-52230' of https://github.com/rajeshtaneja/moodle

Browse source
This commit is contained in:
Andrew Nicols 2016-08-10 09:53:24 +08:00
commit c3efb495fd
4 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mod/data/field/menu/field.class.php
View file

@ -97,7 +97,8 @@ class data_field_menu extends data_field_base {
return '';
}
$return = html_writer::label(get_string('namemenu', 'data'), 'menuf_'. $this->field->id, false, array('class' => 'accesshide'));
$return = html_writer::label(get_string('fieldtypelabel', "datafield_" . $this->type),
'menuf_' . $this->field->id, false, array('class' => 'accesshide'));
$return .= html_writer::select($options, 'f_'.$this->field->id, $content);
return $return;
}

2
mod/data/field/number/lang/en/datafield_number.php
View file

@ -25,4 +25,4 @@
*/
$string['pluginname'] = 'Number';
$string['namenumber'] = 'Number field';
$string['fieldtypelabel'] = 'Number field';

3
mod/data/field/radiobutton/field.class.php
View file

@ -96,7 +96,8 @@ class data_field_radiobutton extends data_field_base {
$options[$rec->content] = $rec->content; //Build following indicies from the sql.
}
}
$return = html_writer::label(get_string('nameradiobutton', 'data'), 'menuf_'. $this->field->id, false, array('class' => 'accesshide'));
$return = html_writer::label(get_string('fieldtypelabel', "datafield_" . $this->type),
'menuf_' . $this->field->id, false, array('class' => 'accesshide'));
$return .= html_writer::select($options, 'f_'.$this->field->id, $value);
return $return;
}

2
mod/data/field/radiobutton/lang/en/datafield_radiobutton.php
View file

@ -25,4 +25,4 @@
*/
$string['pluginname'] = 'Radio button';
$string['nameradiobutton'] = 'Radio button field';
$string['fieldtypelabel'] = 'Radio button field';