Merge branch 'MDL-56844-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Nov 2016 03:20:48 +0000 (11:20 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 09:07:38 +0000 (09:07 +0000)
mod/scorm/locallib.php
mod/scorm/styles.css
mod/scorm/view.php
theme/boost/scss/moodle/modules.scss
theme/bootstrapbase/less/moodle/modules.less
theme/bootstrapbase/style/moodle.css

index 7b71623..28d1303 100644 (file)
@@ -897,7 +897,7 @@ function scorm_print_launch ($user, $scorm, $action, $cm) {
     $organization = optional_param('organization', '', PARAM_INT);
 
     if ($scorm->displaycoursestructure == 1) {
-        echo $OUTPUT->box_start('generalbox boxaligncenter toc', 'toc');
+        echo $OUTPUT->box_start('generalbox boxaligncenter toc container', 'toc');
         echo html_writer::div(get_string('contents', 'scorm'), 'structurehead');
     }
     if (empty($organization)) {
@@ -946,7 +946,8 @@ function scorm_print_launch ($user, $scorm, $action, $cm) {
             echo html_writer::start_div('scorm-center');
             echo html_writer::start_tag('form', array('id' => 'scormviewform',
                                                         'method' => 'post',
-                                                        'action' => $CFG->wwwroot.'/mod/scorm/player.php'));
+                                                        'action' => $CFG->wwwroot.'/mod/scorm/player.php',
+                                                        'class' => 'container'));
         if ($scorm->hidebrowse == 0) {
             print_string('mode', 'scorm');
             echo ': '.html_writer::empty_tag('input', array('type' => 'radio', 'id' => 'b', 'name' => 'mode',
index c900bda..fc6644b 100644 (file)
@@ -6,10 +6,6 @@
     text-align: left;
 }
 
-.path-mod-scorm .scorm-center {
-    text-align: center;
-}
-
 .path-mod-scorm .scorm-right {
     text-align: right;
 }
     overflow: auto;
 }
 
-.path-mod-scorm.forcejavascript .scorm-center {
-    display: none;
-}
-
 .path-mod-scorm.forcejavascript .toc {
     display: none;
 }
     display: none;
 }
 
-.path-mod-scorm.jsenabled .scorm-center {
-    display: block;
-}
-
 .path-mod-scorm.jsenabled .toc {
     display: block;
 }
index 7fe2216..21d63b8 100644 (file)
@@ -156,20 +156,20 @@ if (empty($launch) && ($scorm->displayattemptstatus == SCORM_DISPLAY_ATTEMPTSTAT
          $scorm->displayattemptstatus == SCORM_DISPLAY_ATTEMPTSTATUS_ENTRY)) {
     $attemptstatus = scorm_get_attempt_status($USER, $scorm, $cm);
 }
-echo $OUTPUT->box(format_module_intro('scorm', $scorm, $cm->id).$attemptstatus, 'generalbox boxaligncenter boxwidthwide', 'intro');
+echo $OUTPUT->box(format_module_intro('scorm', $scorm, $cm->id).$attemptstatus, 'container', 'intro');
 
 // Check if SCORM available.
 list($available, $warnings) = scorm_get_availability_status($scorm);
 if (!$available) {
     $reason = current(array_keys($warnings));
-    echo $OUTPUT->box(get_string($reason, "scorm", $warnings[$reason]), "generalbox boxaligncenter");
+    echo $OUTPUT->box(get_string($reason, "scorm", $warnings[$reason]), "container");
 }
 
 if ($available && empty($launch)) {
     scorm_print_launch($USER, $scorm, 'view.php?id='.$cm->id, $cm);
 }
 if (!empty($forcejs)) {
-    echo $OUTPUT->box(get_string("forcejavascriptmessage", "scorm"), "generalbox boxaligncenter forcejavascriptmessage");
+    echo $OUTPUT->box(get_string("forcejavascriptmessage", "scorm"), "container forcejavascriptmessage");
 }
 
 if (!empty($scorm->popup)) {
index 2b4ea59..e7f3141 100644 (file)
@@ -12,6 +12,7 @@ select {
 .path-mod-feedback .feedback_form .col-form-label {
     display: block !important; /* stylelint-disable-line declaration-no-important */
 }
+
 // Feedback module
 .path-mod-feedback .itemactions {
     float: right;
index b2a01e9..130c9f9 100644 (file)
@@ -911,3 +911,17 @@ div#dock {
         background-color: @grayLight;
     }
 }
+
+// Scorm.
+.path-mod-scorm .scorm-center {
+    text-align: center;
+}
+
+.path-mod-scorm.forcejavascript .scorm-center {
+    display: none;
+}
+
+.path-mod-scorm.jsenabled .scorm-center {
+    display: block;
+}
+
index 47fdf0b..a0497eb 100644 (file)
@@ -15200,6 +15200,15 @@ div#dock {
 .path-mod-quiz #mod_quiz_navblock .qnbutton.requiresgrading .trafficlight {
   background-color: #999;
 }
+.path-mod-scorm .scorm-center {
+  text-align: center;
+}
+.path-mod-scorm.forcejavascript .scorm-center {
+  display: none;
+}
+.path-mod-scorm.jsenabled .scorm-center {
+  display: block;
+}
 .yui-skin-sam .yui-layout.path-mod-chat-gui_ajax {
   background-color: #fff;
 }