From 2c212753fedc557f05d6430cc399ade92ee61f8a Mon Sep 17 00:00:00 2001
From: Dan Poltawski <dan@moodle.com>
Date: Wed, 9 Nov 2016 16:11:41 +0000
Subject: [PATCH] MDL-56585 tool_lpimportcsv: adjust help popups

---
 admin/tool/lpimportcsv/classes/form/import.php      | 3 +--
 admin/tool/lpimportcsv/lang/en/tool_lpimportcsv.php | 4 ++--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/admin/tool/lpimportcsv/classes/form/import.php b/admin/tool/lpimportcsv/classes/form/import.php
index d2c8071d42f..d0d8d11c73a 100644
--- a/admin/tool/lpimportcsv/classes/form/import.php
+++ b/admin/tool/lpimportcsv/classes/form/import.php
@@ -52,6 +52,7 @@ class import extends moodleform {
         $mform = $this->_form;
         $element = $mform->createElement('filepicker', 'importfile', get_string('importfile', 'tool_lpimportcsv'));
         $mform->addElement($element);
+        $mform->addHelpButton('importfile', 'importfile', 'tool_lpimportcsv');
         $mform->addRule('importfile', null, 'required');
         $mform->addElement('hidden', 'confirm', 0);
         $mform->setType('confirm', PARAM_BOOL);
@@ -65,12 +66,10 @@ class import extends moodleform {
         } else {
             $mform->setDefault('delimiter_name', 'comma');
         }
-        $mform->addHelpButton('delimiter_name', 'csvdelimiter', 'tool_lpimportcsv');
 
         $choices = core_text::get_encodings();
         $mform->addElement('select', 'encoding', get_string('encoding', 'tool_lpimportcsv'), $choices);
         $mform->setDefault('encoding', 'UTF-8');
-        $mform->addHelpButton('encoding', 'encoding', 'tool_lpimportcsv');
 
         $this->add_action_buttons(false, get_string('import', 'tool_lpimportcsv'));
     }
diff --git a/admin/tool/lpimportcsv/lang/en/tool_lpimportcsv.php b/admin/tool/lpimportcsv/lang/en/tool_lpimportcsv.php
index 9064eb295cb..8c10b045a72 100644
--- a/admin/tool/lpimportcsv/lang/en/tool_lpimportcsv.php
+++ b/admin/tool/lpimportcsv/lang/en/tool_lpimportcsv.php
@@ -27,16 +27,16 @@ $string['competencyscaledescription'] = 'Competency scale created by import';
 $string['confirmcolumnmappings'] = 'Confirm the column mappings';
 $string['confirm'] = 'Confirm';
 $string['csvdelimiter'] = 'CSV delimiter';
-$string['csvdelimiter_help'] = 'The CSV delimiter is normally a comma.';
 $string['description'] = 'Description';
 $string['descriptionformat'] = 'Description format';
 $string['encoding'] = 'Encoding';
-$string['encoding_help'] = 'The CSV file encoding is usually UTF-8.';
 $string['export'] = 'Export';
 $string['exportid'] = 'Exported ID (optional)';
 $string['exportnavlink'] = 'Export competency framework';
 $string['idnumber'] = 'ID number';
 $string['importfile'] = 'CSV framework description file';
+$string['importfile_help'] = 'A competency framework may be imported via text file. The format of the file can be determined by creating a new competency framework on the site and then exporting it.';
+$string['importfile_link'] = 'admin/tool/lpimportcsv';
 $string['import'] = 'Import';
 $string['invalidimportfile'] = 'File format is invalid.';
 $string['isframework'] = 'Is framework';