diff --git a/lang/en/help/data/comments.html b/lang/en/help/data/comments.html deleted file mode 100644 index 06b808ce5ad..00000000000 --- a/lang/en/help/data/comments.html +++ /dev/null @@ -1,4 +0,0 @@ -

Allow Comments

- -

You can allow users to make comments on each entry.

- diff --git a/lang/en/help/data/exportzip.html b/lang/en/help/data/exportzip.html deleted file mode 100644 index e85f31efc64..00000000000 --- a/lang/en/help/data/exportzip.html +++ /dev/null @@ -1,4 +0,0 @@ -

Exporting as Zip

-

This allows you to download the templates to your own computer, -which can be uploaded later into a different database with the Import -from Zip feature.

diff --git a/lang/en/help/data/fieldmappings.html b/lang/en/help/data/fieldmappings.html deleted file mode 100644 index b7d489d37f5..00000000000 --- a/lang/en/help/data/fieldmappings.html +++ /dev/null @@ -1,11 +0,0 @@ -

Field Mappings

-

This menu allows you to keep the data from the existing -database. To preserve the data in a field, you must map it to a new -field, where the data will appear. Any field can also be left blank, -with no infomation copied into it. Any old field not mapped to a new -one will be lost and all it's data removed.

-

-You can only map fields of the same type, so each dropdown will have -different fields in it. Also, you must be careful not to try and map -one old field to more than one new field. -

diff --git a/lang/en/help/data/fields.html b/lang/en/help/data/fields.html deleted file mode 100644 index 4d7b8e88019..00000000000 --- a/lang/en/help/data/fields.html +++ /dev/null @@ -1,6 +0,0 @@ -

Fields

- -

On this screen you can create the fields that will be a part of your database.

- -

Each field allows different types of data, with different interfaces.

- diff --git a/lang/en/help/data/importcsv.html b/lang/en/help/data/importcsv.html deleted file mode 100644 index 9436e190dd9..00000000000 --- a/lang/en/help/data/importcsv.html +++ /dev/null @@ -1,25 +0,0 @@ -

Import from a CSV file

- -

CSV means Comma-Separated-Values and is a common format for text interchange.

- -

The expected file format is a plain text file with a list of field names - as the first record. The data then follows, one record per line.

- -

The field delimiter defaults to a comma character and the field enclosure - is not set by default (field enclosures are characters that surround each - field in each record).

- -

Records should be delimited by new lines (usually generated by pressing RETURN - or ENTER in your text editor). Tabs can be specified using \t and newlines by \n.

- -

Sample file:

- -
-  name,height,weight
-  Kai,180cm,80kg
-  Kim,170cm,60kg
-  Koo,190cm,20kg
-
- - -

Warning: all field types may not be supported.

diff --git a/lang/en/help/data/importfromfile.html b/lang/en/help/data/importfromfile.html deleted file mode 100644 index 2b7575005aa..00000000000 --- a/lang/en/help/data/importfromfile.html +++ /dev/null @@ -1,3 +0,0 @@ -

Importing Presets from Zip

-

Use this to upload presets that have been saved to your computer -with the export feature.

diff --git a/lang/en/help/data/maxentries.html b/lang/en/help/data/maxentries.html deleted file mode 100644 index 48152e3f82e..00000000000 --- a/lang/en/help/data/maxentries.html +++ /dev/null @@ -1,4 +0,0 @@ -

Maximum Entries

- -

The maximum number of entries a participant can submit for this activity.

- diff --git a/lang/en/help/data/mods.html b/lang/en/help/data/mods.html deleted file mode 100755 index 605fb071b3f..00000000000 --- a/lang/en/help/data/mods.html +++ /dev/null @@ -1,4 +0,0 @@ -

 Database Activity

-
-The Database module allows the teacher and/or students to build, display and search a bank of record entries about any conceivable topic. The format and structure of these entries can be almost unlimited, including images, files, URLs, numbers and text amongst other things. You may be familiar with similar technology from building Microsoft Access or Filemaker databases. -
diff --git a/lang/en/help/data/requireapproval.html b/lang/en/help/data/requireapproval.html deleted file mode 100644 index 2919aa09e9d..00000000000 --- a/lang/en/help/data/requireapproval.html +++ /dev/null @@ -1,5 +0,0 @@ -

Require Approval

- -

Should entries be approved by a teacher before they are viewable to students? This is useful - for moderating content that may be potentially offensive or inappropriate.

- diff --git a/lang/en/help/data/requiredentries.html b/lang/en/help/data/requiredentries.html deleted file mode 100644 index 32c57839a30..00000000000 --- a/lang/en/help/data/requiredentries.html +++ /dev/null @@ -1,7 +0,0 @@ -

Required Entries

- -

The number of entries a participant is required to submit. - Users will see a reminder message displayed while viewing if they have not submitted the required number of entries.

- -

The activity will not be considered complete until the user has submitted the required number of entries.

- diff --git a/lang/en/help/data/requiredentriestoview.html b/lang/en/help/data/requiredentriestoview.html deleted file mode 100644 index bd8f33549c3..00000000000 --- a/lang/en/help/data/requiredentriestoview.html +++ /dev/null @@ -1,6 +0,0 @@ -

Required Entries Before Viewing

- -

The number of entries a participant is required to submit before they are allowed to view - any entries in this database activity.

-

Note: This feature cannot be used together with the database auto-linking filter, since it's not possible for the database auto-linking filter to determine whether a user has submitted the required number of entries.

- diff --git a/lang/en/help/data/savepreset.html b/lang/en/help/data/savepreset.html deleted file mode 100644 index 6717dc37e4a..00000000000 --- a/lang/en/help/data/savepreset.html +++ /dev/null @@ -1,4 +0,0 @@ -

Save as Preset

-

This publishes the current templates as a preset which anyone on -the site can view and use. It will appear in the preset list. You will -be able to remove it at any time.

diff --git a/lang/en/help/data/tags.html b/lang/en/help/data/tags.html deleted file mode 100644 index 149e1358e35..00000000000 --- a/lang/en/help/data/tags.html +++ /dev/null @@ -1,4 +0,0 @@ -

Available Tags

-

Tags are place holders in the template, which will be replaced by fields or other items, such as an edit icon, when entries are edited or viewed.

-

Fields have the format [[fieldname]]. All other tags have the format ##sometag##.

-

Only the tags that are in the "Available tags" list may be used for the current template.

diff --git a/lang/en/help/data/usepreset.html b/lang/en/help/data/usepreset.html deleted file mode 100644 index abf12f8ae97..00000000000 --- a/lang/en/help/data/usepreset.html +++ /dev/null @@ -1,4 +0,0 @@ -

Use Preset

-

Uses a template available to the whole site.

-

Also, if you've added the preset to the library using the 'Save as -Preset' feature then you can delete it.

diff --git a/mod/data/edit.php b/mod/data/edit.php index 08bbd1b6bf3..0d189988d20 100755 --- a/mod/data/edit.php +++ b/mod/data/edit.php @@ -341,7 +341,7 @@ if (has_capability('mod/data:manageentries',$context)) { echo ''; echo ''.get_string('csvfile', 'data').':'; echo ''; - echo $OUTPUT->old_help_icon('importcsv', get_string('csvimport', 'data'), 'data'); + echo $OUTPUT->help_icon('csvimport', 'data'); echo ''; echo ''.get_string('fielddelimiter', 'data').':'; echo ''; diff --git a/mod/data/field.php b/mod/data/field.php index 472aa57e894..17d10197328 100755 --- a/mod/data/field.php +++ b/mod/data/field.php @@ -305,8 +305,8 @@ if (($mode == 'new') && (!empty($newtype)) && confirm_sesskey()) { /// echo '
'; echo ''; $popupurl = $CFG->wwwroot.'/mod/data/field.php?d='.$data->id.'&mode=new&sesskey='. sesskey(); - echo $OUTPUT->single_select(new moodle_url($popupurl), 'newtype', $menufield, null, array(''=>'choosedots'), "fieldform"); - echo $OUTPUT->old_help_icon('fields', get_string('addafield','data'), 'data'); + echo $OUTPUT->single_select(new moodle_url($popupurl), 'newtype', $menufield, null, array(''=>'choosedots'), 'fieldform'); + echo $OUTPUT->help_icon('newfield', 'data'); echo '
'; echo '
'; diff --git a/mod/data/lang/en/data.php b/mod/data/lang/en/data.php index c1fe655e143..27002cc5334 100755 --- a/mod/data/lang/en/data.php +++ b/mod/data/lang/en/data.php @@ -25,7 +25,6 @@ $string['action'] = 'Action'; $string['add'] = 'Add entry'; -$string['addafield'] = 'Add a field'; $string['addcomment'] = 'Add comment'; $string['addentries'] = 'Add entries'; $string['addtemplate'] = 'Add template'; @@ -140,6 +139,8 @@ $string['fieldheightlistview'] = 'Height in list view'; $string['fieldheightsingleview'] = 'Height in single view'; $string['fieldids'] = 'Field ids'; $string['fieldmappings'] = 'Field Mappings'; +$string['fieldmappings_help'] = 'This menu allows you to keep the data from the existing database. To preserve the data in a field, you must map it to a new field, where the data will appear. Any field can also be left blank, with no infomation copied into it. Any old field not mapped to a new one will be lost and all it\'s data removed. +You can only map fields of the same type, so each dropdown will have different fields in it. Also, you must be careful not to try and map one old field to more than one new field.'; $string['fieldname'] = 'Field name'; $string['fieldnotmatched'] = 'The following fields in your file are not known in this database: {$a}'; $string['fieldoptions'] = 'Options (one per line)'; diff --git a/mod/data/lib.php b/mod/data/lib.php index e8b4cc23f68..10dec08e179 100755 --- a/mod/data/lib.php +++ b/mod/data/lib.php @@ -2125,7 +2125,7 @@ class PresetImporter { if (!empty($currentfields) && !empty($newfields)) { echo "

$strfieldmappings "; - echo $OUTPUT->old_help_icon('fieldmappings', $strfieldmappings, 'data'); + echo $OUTPUT->help_icon('fieldmappings', 'data'); echo '

'; foreach ($newfields as $nid => $newfield) { @@ -2855,4 +2855,4 @@ function data_extend_settings_navigation(settings_navigation $settings, navigati $datanode->add(get_string('fields', 'data'), new moodle_url('/mod/data/field.php', array('d'=>$data->id))); $datanode->add(get_string('presets', 'data'), new moodle_url('/mod/data/preset.php', array('d'=>$data->id))); } -} \ No newline at end of file +} diff --git a/mod/data/mod_form.php b/mod/data/mod_form.php index 325722c0501..ded85b726b5 100644 --- a/mod/data/mod_form.php +++ b/mod/data/mod_form.php @@ -34,20 +34,20 @@ class mod_data_mod_form extends moodleform_mod { (array_combine(range(1, DATA_MAX_ENTRIES),//keys range(1, DATA_MAX_ENTRIES)));//values $mform->addElement('select', 'requiredentries', get_string('requiredentries', 'data'), $countoptions); - $mform->setHelpButton('requiredentries', array('requiredentries', get_string('requiredentries', 'data'), 'data')); + $mform->addHelpButton('requiredentries', 'requiredentries', 'data'); $mform->addElement('select', 'requiredentriestoview', get_string('requiredentriestoview', 'data'), $countoptions); - $mform->setHelpButton('requiredentriestoview', array('requiredentriestoview', get_string('requiredentriestoview', 'data'), 'data')); + $mform->addHelpButton('requiredentriestoview', 'requiredentriestoview', 'data'); $mform->addElement('select', 'maxentries', get_string('maxentries', 'data'), $countoptions); - $mform->setHelpButton('maxentries', array('maxentries', get_string('maxentries', 'data'), 'data')); + $mform->addHelpButton('maxentries', 'maxentries', 'data'); $ynoptions = array(0 => get_string('no'), 1 => get_string('yes')); $mform->addElement('select', 'comments', get_string('comments', 'data'), $ynoptions); $mform->setHelpButton('comments', array('comments', get_string('allowcomments', 'data'), 'data')); $mform->addElement('select', 'approval', get_string('requireapproval', 'data'), $ynoptions); - $mform->setHelpButton('approval', array('requireapproval', get_string('requireapproval', 'data'), 'data')); + $mform->addHelpButton('approval', 'requireapproval', 'data'); if($CFG->enablerssfeeds && $CFG->data_enablerssfeeds){ $mform->addElement('select', 'rssarticles', get_string('numberrssarticles', 'data') , $countoptions); diff --git a/mod/data/preset.php b/mod/data/preset.php index 5a84cc08812..cf28e7f9d24 100644 --- a/mod/data/preset.php +++ b/mod/data/preset.php @@ -333,7 +333,7 @@ echo '
'; echo ''; echo ''; echo ''; echo ''; echo ''; echo '

'.$strexport.'

'; -echo $OUTPUT->old_help_icon('exportzip', get_string('help'), 'data', false); +echo $OUTPUT->help_icon('exportaszip', 'data'); echo ''; $options = array(); $options['sesskey'] = sesskey(); @@ -343,7 +343,7 @@ echo $OUTPUT->single_button(new moodle_url('preset.php', $options), $strexport); echo '
'; -echo $OUTPUT->old_help_icon('savepreset', get_string('help'), 'data', false); +echo $OUTPUT->help_icon('saveaspreset', 'data'); echo ''; $options = array(); $options['sesskey'] = sesskey(); @@ -353,7 +353,7 @@ echo $OUTPUT->single_button(new moodle_url('preset.php', $options), $strsave); echo '

'.$strimport.'

'; -echo $OUTPUT->old_help_icon('importfromfile', get_string('help'), 'data', true); +echo $OUTPUT->help_icon('fromfile', 'data'); echo ''; echo '
'; echo '
'; @@ -366,7 +366,7 @@ echo '
'; echo '
'; -echo $OUTPUT->old_help_icon('usepreset', get_string('help'), 'data', true); +echo $OUTPUT->help_icon('usestandard', 'data'); echo ''; echo '
'; diff --git a/mod/data/templates.php b/mod/data/templates.php index 667d57a7fc8..d8539214e8d 100755 --- a/mod/data/templates.php +++ b/mod/data/templates.php @@ -203,7 +203,7 @@ echo '
'; if ($mode != 'csstemplate' and $mode != 'jstemplate') { // Add all the available fields for this data. echo ''; - echo $OUTPUT->old_help_icon('tags', get_string('tags'), 'data'); + echo $OUTPUT->help_icon('availabletags', 'data'); echo '
';