From 61fbdb0eec0314f2b131c0d9e993fd7b3fc43d6f Mon Sep 17 00:00:00 2001
From: Dan Marsden <dan@danmarsden.com>
Date: Fri, 15 Feb 2013 23:48:32 +1300
Subject: [PATCH] MDL-37660 SCORM: move time related settings into general
 section and improve lang

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

diff --git a/mod/scorm/lang/en/scorm.php b/mod/scorm/lang/en/scorm.php
index 3e0615e6e68f5..c21301106822f 100644
--- a/mod/scorm/lang/en/scorm.php
+++ b/mod/scorm/lang/en/scorm.php
@@ -273,12 +273,12 @@
 $string['scoes'] = 'Learning objects';
 $string['score'] = 'Score';
 $string['scorm:addinstance'] = 'Add a new SCORM package';
-$string['scormclose'] = 'Until';
+$string['scormclose'] = 'Available to';
 $string['scormcourse'] = 'Learning course';
 $string['scorm:deleteresponses'] = 'Delete SCORM attempts';
 $string['scormloggingoff'] = 'API logging is off';
 $string['scormloggingon'] = 'API logging is on';
-$string['scormopen'] = 'Open';
+$string['scormopen'] = 'Available from';
 $string['scormresponsedeleted'] = 'Deleted user attempts';
 $string['scorm:deleteownresponses'] = 'Delete own attempts';
 $string['scorm:savetrack'] = 'Save tracks';
@@ -314,7 +314,6 @@
 $string['syntax'] = 'Syntax error';
 $string['tag_error'] = 'Unknown tag ({$a->tag}) with this content: {$a->value}';
 $string['time'] = 'Time';
-$string['timerestrict'] = 'Restrict answering to this time period';
 $string['title'] = 'Title';
 $string['toolbar'] = 'Show the toolbar';
 $string['too_many_attributes'] = 'Tag {$a->tag} has too many attributes';
diff --git a/mod/scorm/mod_form.php b/mod/scorm/mod_form.php
index b9a79174ec2d7..03add2257b563 100644
--- a/mod/scorm/mod_form.php
+++ b/mod/scorm/mod_form.php
@@ -85,13 +85,9 @@ function definition() {
         $mform->addHelpButton('packagefile', 'package', 'scorm');
         $mform->disabledIf('packagefile', 'scormtype', 'noteq', SCORM_TYPE_LOCAL);
 
-        //-------------------------------------------------------------------------------
-        // Time restrictions
-        $mform->addElement('header', 'timerestricthdr', get_string('timerestrict', 'scorm'));
-
         $mform->addElement('date_time_selector', 'timeopen', get_string("scormopen", "scorm"), array('optional' => true));
         $mform->addElement('date_time_selector', 'timeclose', get_string("scormclose", "scorm"), array('optional' => true));
-        //-------------------------------------------------------------------------------
+
         // display Settings
         $mform->addElement('header', 'displaysettings', get_string('displaysettings', 'scorm'));
         // Framed / Popup Window