Merge branch 'MDL-56597-master' of git://github.com/damyon/moodle

NoelDeMartin · Oct 31, 2016 · 5ad34c4 · 5ad34c4
2 parents 0e86392 + bff9fd8
commit 5ad34c4
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 17 deletions.
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
@@ -656,8 +656,8 @@ public function maintenance_warning() {
         if (isset($CFG->maintenance_later) and $CFG->maintenance_later > time()) {
             $timeleft = $CFG->maintenance_later - time();
             // If timeleft less than 30 sec, set the class on block to error to highlight.
-            $errorclass = ($timeleft < 30) ? 'error' : 'warning';
-            $output .= $this->box_start($errorclass . ' moodle-has-zindex maintenancewarning');
+            $errorclass = ($timeleft < 30) ? 'alert-error alert-danger' : 'alert-warning';
+            $output .= $this->box_start($errorclass . ' moodle-has-zindex maintenancewarning m-a-1 alert');
             $a = new stdClass();
             $a->hour = (int)($timeleft / 3600);
             $a->min = (int)(($timeleft / 60) % 60);

diff --git a/lib/yui/build/moodle-core-maintenancemodetimer/moodle-core-maintenancemodetimer-debug.js b/lib/yui/build/moodle-core-maintenancemodetimer/moodle-core-maintenancemodetimer-debug.js
@@ -49,11 +49,13 @@ Y.extend(MAINTENANCEMODETIMER, Y.Base, {
         }
         // Set error class to highlight the importance.
         if (this.timeleftinsec < 30) {
-            this.maintenancenode.addClass('error')
-                    .removeClass('warning');
+            this.maintenancenode.addClass('alert-error')
+                    .addClass('alert-danger')
+                    .removeClass('alert-warning');
         } else {
-            this.maintenancenode.addClass('warning')
-                    .removeClass('error');
+            this.maintenancenode.addClass('alert-warning')
+                    .removeClass('alert-error')
+                    .removeClass('alert-danger');
         }
     }
 });

diff --git a/lib/yui/build/moodle-core-maintenancemodetimer/moodle-core-maintenancemodetimer-min.js b/lib/yui/build/moodle-core-maintenancemodetimer/moodle-core-maintenancemodetimer-min.js
diff --git a/lib/yui/build/moodle-core-maintenancemodetimer/moodle-core-maintenancemodetimer.js b/lib/yui/build/moodle-core-maintenancemodetimer/moodle-core-maintenancemodetimer.js
@@ -49,11 +49,13 @@ Y.extend(MAINTENANCEMODETIMER, Y.Base, {
         }
         // Set error class to highlight the importance.
         if (this.timeleftinsec < 30) {
-            this.maintenancenode.addClass('error')
-                    .removeClass('warning');
+            this.maintenancenode.addClass('alert-error')
+                    .addClass('alert-danger')
+                    .removeClass('alert-warning');
         } else {
-            this.maintenancenode.addClass('warning')
-                    .removeClass('error');
+            this.maintenancenode.addClass('alert-warning')
+                    .removeClass('alert-error')
+                    .removeClass('alert-danger');
         }
     }
 });

diff --git a/lib/yui/src/maintenancemodetimer/js/maintenancemodetimer.js b/lib/yui/src/maintenancemodetimer/js/maintenancemodetimer.js
@@ -47,11 +47,13 @@ Y.extend(MAINTENANCEMODETIMER, Y.Base, {
         }
         // Set error class to highlight the importance.
         if (this.timeleftinsec < 30) {
-            this.maintenancenode.addClass('error')
-                    .removeClass('warning');
+            this.maintenancenode.addClass('alert-error')
+                    .addClass('alert-danger')
+                    .removeClass('alert-warning');
         } else {
-            this.maintenancenode.addClass('warning')
-                    .removeClass('error');
+            this.maintenancenode.addClass('alert-warning')
+                    .removeClass('alert-error')
+                    .removeClass('alert-danger');
         }
     }
 });

diff --git a/theme/boost/scss/moodle/admin.scss b/theme/boost/scss/moodle/admin.scss
@@ -785,8 +785,6 @@
 }
 
 .maintenancewarning {
-    padding: 3px 1em;
-    text-align: center;
     position: fixed;
     bottom: 0;
     right: 0;