Merge branch 'MDL-72965-master' of https://github.com/peterRd/moodle

mod/data/classes/output/action_bar.php

@@ -61,7 +61,7 @@ class action_bar {
         $presetslink = new moodle_url('/mod/data/field.php', ['d' => $this->id, 'mode' => 'usepreset']);
 
         $menu = [
-            $createfieldlink->out(false) => get_string('newfield', 'mod_data'),
+            $createfieldlink->out(false) => get_string('managefields', 'mod_data'),
             $importlink->out(false) => get_string('importpreset', 'mod_data'),
             $presetslink->out(false) => get_string('usestandard', 'mod_data'),
         ];
@@ -89,7 +89,7 @@ class action_bar {
             asort($menufield);
 
             $fieldselecturl = new moodle_url('/mod/data/field.php', ['d' => $this->id, 'mode' => 'new']);
-            $fieldselect = new \single_select($fieldselecturl, 'newtype', $menufield, null, ['' => 'choosedots'],
+            $fieldselect = new \single_select($fieldselecturl, 'newtype', $menufield, null, get_string('newfield', 'data'),
                 'fieldform');
         }
 

mod/data/field.php

@@ -349,6 +349,7 @@ if (($mode == 'new') && (!empty($newtype))) { // Adding a new field.
 } else {                                              /// Display the main listing of all fields
     $fieldactionbar = $actionbar->get_fields_action_bar(true, true, true);
     data_print_header($course, $cm, $data, 'fields', $fieldactionbar);
+    echo $OUTPUT->heading(get_string('managefields', 'data'), 2);
 
     if (!$DB->record_exists('data_fields', array('dataid'=>$data->id))) {
         echo $OUTPUT->notification(get_string('nofieldindatabase','data'));  // nothing in database

mod/data/lang/en/data.php

@@ -244,6 +244,7 @@ $string['listview'] = 'List view';
 $string['listtemplate'] = 'List template';
 $string['longitude'] = 'Longitude';
 $string['manageapproved'] = 'Allow editing of approved entries';
+$string['managefields'] = 'Manage fields';
 $string['manageapproved_help'] = 'If disabled, approved entries are no longer editable or deletable by the user who added them. This setting has no effect unless \'Approval required\' is enabled.';
 $string['mapexistingfield'] = 'Map to {$a}';
 $string['mapnewfield'] = 'Create a new field';