From bff9fd896a4f35aabe7ac31b0166d629409038d8 Mon Sep 17 00:00:00 2001 From: Damyon Wiese Date: Thu, 27 Oct 2016 10:22:36 +0800 Subject: [PATCH] MDL-56597 theme_boost: Maintenance warning styles --- lib/outputrenderers.php | 4 ++-- .../moodle-core-maintenancemodetimer-debug.js | 10 ++++++---- .../moodle-core-maintenancemodetimer-min.js | 2 +- .../moodle-core-maintenancemodetimer.js | 10 ++++++---- .../maintenancemodetimer/js/maintenancemodetimer.js | 10 ++++++---- theme/boost/scss/moodle/admin.scss | 2 -- 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php index c5d29ca21f96c..74628730d6058 100644 --- 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->min = (int)($timeleft/60); $a->sec = (int)($timeleft % 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 index 2305097ef8d21..ecc7f67d3875e 100644 --- a/lib/yui/build/moodle-core-maintenancemodetimer/moodle-core-maintenancemodetimer-debug.js +++ b/lib/yui/build/moodle-core-maintenancemodetimer/moodle-core-maintenancemodetimer-debug.js @@ -44,11 +44,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 index 086e091f5ce7a..6a47910b27823 100644 --- a/lib/yui/build/moodle-core-maintenancemodetimer/moodle-core-maintenancemodetimer-min.js +++ b/lib/yui/build/moodle-core-maintenancemodetimer/moodle-core-maintenancemodetimer-min.js @@ -1 +1 @@ -YUI.add("moodle-core-maintenancemodetimer",function(e,t){var n=function(){n.superclass.constructor.apply(this,arguments)};e.extend(n,e.Base,{timeleftinsec:0,maintenancenode:e.one(".box.maintenancewarning"),initializer:function(t){this.maintenancenode&&(this.timeleftinsec=t.timeleftinsec,this.maintenancenode.setAttribute("aria-live","polite"),e.later(1e3,this,"updatetimer",null,!0))},updatetimer:function(){this.timeleftinsec-=1;if(this.timeleftinsec<=0)this.maintenancenode.set("text",M.util.get_string("sitemaintenance","admin"));else{var e={};e.sec=this.timeleftinsec%60,e.min=Math.floor(this.timeleftinsec/60),this.maintenancenode.set("text",M.util.get_string("maintenancemodeisscheduled","admin",e))}this.timeleftinsec<30?this.maintenancenode.addClass("error").removeClass("warning"):this.maintenancenode.addClass("warning").removeClass("error")}}),M.core=M.core||{},M.core.maintenancemodetimer=M.core.maintenancemodetimer||function(e){return new n(e)}},"@VERSION@",{requires:["base","node"]}); +YUI.add("moodle-core-maintenancemodetimer",function(e,t){var n=function(){n.superclass.constructor.apply(this,arguments)};e.extend(n,e.Base,{timeleftinsec:0,maintenancenode:e.one(".box.maintenancewarning"),initializer:function(t){this.maintenancenode&&(this.timeleftinsec=t.timeleftinsec,this.maintenancenode.setAttribute("aria-live","polite"),e.later(1e3,this,"updatetimer",null,!0))},updatetimer:function(){this.timeleftinsec-=1;if(this.timeleftinsec<=0)this.maintenancenode.set("text",M.util.get_string("sitemaintenance","admin"));else{var e={};e.sec=this.timeleftinsec%60,e.min=Math.floor(this.timeleftinsec/60),this.maintenancenode.set("text",M.util.get_string("maintenancemodeisscheduled","admin",e))}this.timeleftinsec<30?this.maintenancenode.addClass("alert-error").addClass("alert-danger").removeClass("alert-warning"):this.maintenancenode.addClass("alert-warning").removeClass("alert-error").removeClass("alert-danger")}}),M.core=M.core||{},M.core.maintenancemodetimer=M.core.maintenancemodetimer||function(e){return new n(e)}},"@VERSION@",{requires:["base","node"]}); diff --git a/lib/yui/build/moodle-core-maintenancemodetimer/moodle-core-maintenancemodetimer.js b/lib/yui/build/moodle-core-maintenancemodetimer/moodle-core-maintenancemodetimer.js index 2305097ef8d21..ecc7f67d3875e 100644 --- a/lib/yui/build/moodle-core-maintenancemodetimer/moodle-core-maintenancemodetimer.js +++ b/lib/yui/build/moodle-core-maintenancemodetimer/moodle-core-maintenancemodetimer.js @@ -44,11 +44,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 index ddd352a643375..f976abc75e9c0 100644 --- a/lib/yui/src/maintenancemodetimer/js/maintenancemodetimer.js +++ b/lib/yui/src/maintenancemodetimer/js/maintenancemodetimer.js @@ -42,11 +42,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 index 977acd52df585..ae43bf4dc6f36 100644 --- 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;