From 427bcd4d986adc4e7cf84aa49627eeabe678ab2b Mon Sep 17 00:00:00 2001
From: Dan Marsden <Dan@digitalclay.co.nz>
Date: Thu, 24 Jun 2010 09:06:07 +0000
Subject: [PATCH] SCORM MDL-16726 tidy up help strings

---
 mod/scorm/lang/en/scorm.php | 11 ++++++++++-
 mod/scorm/mod_form.php      |  6 ++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/mod/scorm/lang/en/scorm.php b/mod/scorm/lang/en/scorm.php
index 096a4981bb7e2..32b2a9d058b3b 100644
--- a/mod/scorm/lang/en/scorm.php
+++ b/mod/scorm/lang/en/scorm.php
@@ -186,6 +186,8 @@
 $string['package_help'] = 'The package file is a zip (or pif) file containing SCORM/AICC course definition files.';
 $string['packagedir'] = 'Filesystem Error: Can\'t create package directory';
 $string['packagefile'] = 'No package file specified';
+$string['packageurl'] = 'URL';
+$string['packageurl_help'] = 'The URL allows you to provide a direct link to a SCORM object not contained within the Moodle file area.';
 $string['passed'] = 'Passed';
 $string['php5'] = 'PHP 5 (DOMXML native library)';
 $string['popup'] = 'New window';
@@ -220,6 +222,14 @@
 $string['scorm:savetrack'] = 'Save tracks';
 $string['scorm:skipview'] = 'Skip overview';
 $string['scormtype'] = 'Type';
+$string['scormtype_help'] = 'The SCORM Type is the method of accessing the SCORM object. 
+
+There are up to 4 different types:
+
+* Uploaded Package - this is the standard method of selecting a SCORM using the Moodle file picker.
+* External SCORM Manifest - this allows a direct url to an imsmanifest.xml file to be selected. WARNING: If this link uses a different domain name than your Moodle site then Grades cannot be saved.
+* Downloaded Package - This is a direct url to a SCORM zip package, this is a safe way to link to a file on a different domain than your Moodle site.
+* Local IMS content repository - If an IMS repository has been created, you can select a SCORM object within the repository using this option.';
 $string['scorm:viewreport'] = 'View reports';
 $string['scorm:viewscores'] = 'View scores';
 $string['scrollbars'] = 'Allow the window to be scrolled';
@@ -257,7 +267,6 @@
 $string['updatefreq'] = 'Auto-update frequency';
 $string['updatefreqdesc'] = 'This preference sets the default auto-update frequency of an activity';
 $string['updatetime'] = 'Synchronisation time';
-$string['url'] = 'URL';
 $string['validateascorm'] = 'Validate a package';
 $string['validation'] = 'Validation result';
 $string['validationtype'] = 'This preference set the DOMXML library used for validating SCORM Manifest. If you don\'t know leave the selected choice.';
diff --git a/mod/scorm/mod_form.php b/mod/scorm/mod_form.php
index 41b0887070dea..d2277b7727756 100644
--- a/mod/scorm/mod_form.php
+++ b/mod/scorm/mod_form.php
@@ -54,9 +54,10 @@ function definition() {
 // Reference
         if (count($options) > 1) {
             $mform->addElement('select', 'scormtype', get_string('scormtype', 'scorm'), $options);
-            $mform->addElement('text', 'packageurl', get_string('url', 'scorm'), array('size'=>60));
+            $mform->addHelpButton('scormtype', 'scormtype', 'scorm');
+            $mform->addElement('text', 'packageurl', get_string('packageurl', 'scorm'), array('size'=>60));
             $mform->setType('packageurl', PARAM_RAW);
-            $mform->addHelpButton('packageurl', 'package', 'scorm');
+            $mform->addHelpButton('packageurl', 'packageurl', 'scorm');
             $mform->disabledIf('packageurl', 'scormtype', 'eq', SCORM_TYPE_LOCAL);
         } else {
             $mform->addElement('hidden', 'scormtype', SCORM_TYPE_LOCAL);
@@ -66,6 +67,7 @@ function definition() {
         $maxbytes = get_max_upload_file_size($CFG->maxbytes, $COURSE->maxbytes);
         $mform->setMaxFileSize($maxbytes);
         $mform->addElement('filepicker', 'packagefile', get_string('package','scorm'));
+        $mform->addHelpButton('packagefile', 'package', 'scorm');
         $mform->disabledIf('packagefile', 'scormtype', 'noteq', SCORM_TYPE_LOCAL);
 
 //-------------------------------------------------------------------------------