diff --git a/admin/tool/dataprivacy/templates/component_status.mustache b/admin/tool/dataprivacy/templates/component_status.mustache index 9a1c6adbd19..8d2bf1bf26c 100644 --- a/admin/tool/dataprivacy/templates/component_status.mustache +++ b/admin/tool/dataprivacy/templates/component_status.mustache @@ -75,7 +75,7 @@
-
+
{{#link}} {{name}} {{/link}} @@ -84,13 +84,13 @@ {{/link}}
{{type}}
-
{{summary}}
+
{{summary}}
{{#fields}}
-
{{field_name}}
-
{{field_summary}}
+
{{field_name}}
+
{{field_summary}}
{{/fields}}
@@ -100,7 +100,7 @@
-
+
{{nullprovider}}
diff --git a/calendar/templates/event_details.mustache b/calendar/templates/event_details.mustache index 1a1516fef7d..9f92043ec41 100644 --- a/calendar/templates/event_details.mustache +++ b/calendar/templates/event_details.mustache @@ -56,60 +56,60 @@ } }}
-
{{#pix}} i/calendareventtime, core, {{#str}} when, core_calendar {{/str}} {{/pix}}
-
{{{formattedtime}}}
+
{{#pix}} i/calendareventtime, core, {{#str}} when, core_calendar {{/str}} {{/pix}}
+
{{{formattedtime}}}
{{#normalisedeventtypetext}}
-
{{#pix}} i/calendar, core, {{#str}} eventtype, core_calendar {{/str}} {{/pix}}
-
{{normalisedeventtypetext}}
+
{{#pix}} i/calendar, core, {{#str}} eventtype, core_calendar {{/str}} {{/pix}}
+
{{normalisedeventtypetext}}
{{/normalisedeventtypetext}} {{#description}}
-
{{#pix}} i/calendareventdescription, core, {{#str}} description {{/str}} {{/pix}}
-
{{{.}}}
+
{{#pix}} i/calendareventdescription, core, {{#str}} description {{/str}} {{/pix}}
+
{{{.}}}
{{/description}} {{#location}}
-
{{#pix}} i/location, core, {{#str}} location {{/str}} {{/pix}}
-
{{{.}}}
+
{{#pix}} i/location, core, {{#str}} location {{/str}} {{/pix}}
+
{{{.}}}
{{/location}} {{#isactionevent}}
-
{{#pix}} i/courseevent, core, {{#str}} course {{/str}} {{/pix}}
-
{{{course.fullname}}}
+
{{#pix}} i/courseevent, core, {{#str}} course {{/str}} {{/pix}}
+
{{{course.fullname}}}
{{/isactionevent}} {{#iscategoryevent}}
-
{{#pix}} i/categoryevent, core, {{#str}} category {{/str}} {{/pix}}
-
{{{category.nestedname}}}
+
{{#pix}} i/categoryevent, core, {{#str}} category {{/str}} {{/pix}}
+
{{{category.nestedname}}}
{{/iscategoryevent}} {{#iscourseevent}}
-
{{#pix}} i/courseevent, core, {{#str}} course {{/str}} {{/pix}}
-
{{{course.fullname}}}
+
{{#pix}} i/courseevent, core, {{#str}} course {{/str}} {{/pix}}
+
{{{course.fullname}}}
{{/iscourseevent}} {{#groupname}}
-
{{#pix}} i/courseevent, core, {{#str}} course {{/str}} {{/pix}}
-
{{{course.fullname}}}
+
{{#pix}} i/courseevent, core, {{#str}} course {{/str}} {{/pix}}
+
{{{course.fullname}}}
-
{{#pix}} i/groupevent, core, {{#str}} group {{/str}} {{/pix}}
-
{{{groupname}}}
+
{{#pix}} i/groupevent, core, {{#str}} group {{/str}} {{/pix}}
+
{{{groupname}}}
{{/groupname}} {{#subscription}} {{#displayeventsource}}
-
{{#pix}} i/rss, core, {{#str}} eventsource, core_calendar {{/str}} {{/pix}}
-
+
{{#pix}} i/rss, core, {{#str}} eventsource, core_calendar {{/str}} {{/pix}}
+
{{#subscriptionurl}}

{{#str}}subscriptionsource, core_calendar, {{{subscriptionname}}}{{/str}}

{{/subscriptionurl}} diff --git a/course/templates/activityinstance.mustache b/course/templates/activityinstance.mustache index 906e6dc0421..3b51f670335 100644 --- a/course/templates/activityinstance.mustache +++ b/course/templates/activityinstance.mustache @@ -34,7 +34,7 @@ }} {{#activities}}
-
+
{{#canmanage}} @@ -47,7 +47,7 @@
-
+
{{#completionstatus.icon}} {{{completionstatus.icon}}} diff --git a/course/templates/bulkactivitycompletion.mustache b/course/templates/bulkactivitycompletion.mustache index 39c010b1efa..4a2802617bf 100644 --- a/course/templates/bulkactivitycompletion.mustache +++ b/course/templates/bulkactivitycompletion.mustache @@ -49,11 +49,11 @@
-
+
-
+
{{{helpicon}}}
diff --git a/course/templates/defaultactivitycompletion.mustache b/course/templates/defaultactivitycompletion.mustache index 6831a0b9df7..dd2b39f5194 100644 --- a/course/templates/defaultactivitycompletion.mustache +++ b/course/templates/defaultactivitycompletion.mustache @@ -46,11 +46,11 @@
-
+
-
+
{{{helpicon}}}
@@ -61,13 +61,13 @@ {{#canmanage}}
-
+
{{{formattedname}}}
-
+
{{#completionstatus.icon}} {{{completionstatus.icon}}} diff --git a/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-debug.js b/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-debug.js index 213b2f2890b..3f62f9d4e64 100644 --- a/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-debug.js +++ b/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-debug.js @@ -217,7 +217,7 @@ Y.namespace('M.atto_recordrtc').Button = Y.Base.create('button', Y.M.editor_atto _createContent: function(type) { var isAudio = (type === 'audio'), bsRow = 'row', - bsCol = 'col-xs-', + bsCol = 'col-', bsAlDang = 'alert-danger', bsSsBtn = 'btn btn-lg btn-outline-danger btn-block'; diff --git a/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-min.js b/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-min.js index c5a0167d723..ba20c6a270a 100644 --- a/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-min.js +++ b/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button-min.js @@ -1 +1 @@ -YUI.add("moodle-atto_recordrtc-button",function(e,t){var n="atto_recordrtc",r='
{{insecurealert_title}} {{insecurealert}}
{{#if isAudio}}
{{else}}
{{/if}}
';e.namespace("M.atto_recordrtc").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{_lang:"en",initializer:function(){if(this.get("host").canShowFilepicker("media")){var e=this.get("allowedtypes"),t=!1;if(e==="both"||e==="audio")this._addButton("audio",this._audio),t=!0;if(e==="both"||e==="video")this._addButton("video",this._video),t=!0;if(!t)return;var n=this.getDialogue({width:1e3,focusAfterHide:null});n.after("visibleChange",function(){var e=!n.get("visible"),t=M.atto_recordrtc.commonmodule;e&&(window.clearInterval(t.countdownTicker),t.mediaRecorder&&t.mediaRecorder.state!=="inactive"&&t.mediaRecorder.stop(),t.stream&&t.stream.getTracks().forEach(function(e){e.readyState!=="ended"&&e.stop()}))}),n.on("click",function(){this.centered()}),window.require(["core/adapter"],function(e){window.adapter=e})}},_addButton:function(e,t){this.addButton({buttonName:e,icon:this.get(e+"rtcicon"),iconComponent:n,callback:t,title:e+"rtc",tags:e+"rtc",tagMatchRequiresAll:!1})},_audio:function(){var e=this.getDialogue();e.set("headerContent",M.util.get_string("audiortc","atto_recordrtc")),e.set("bodyContent",this._createContent("audio")),e.show(),M.atto_recordrtc.audiomodule.init(this)},_video:function(){var e=this.getDialogue();e.set("headerContent",M.util.get_string("videortc","atto_recordrtc")),e.set("bodyContent",this._createContent("video")),e.show(),M.atto_recordrtc.videomodule.init(this)},_createContent:function(t){var i=t==="audio",s="row",o="col-xs-",u="alert-danger",a="btn btn-lg btn-outline-danger btn-block",f=e.Handlebars.compile(r)({PLUGINNAME:n,isAudio:i,bs_row:s,bs_col:o,bs_al_dang:u,bs_ss_btn:a,insecurealert_title:M.util.get_string("insecurealert_title","atto_recordrtc"),insecurealert:M.util.get_string("insecurealert","atto_recordrtc"),startrecording:M.util.get_string("startrecording","atto_recordrtc"),attachrecording:M.util.get_string("attachrecording","atto_recordrtc")});return f},closeDialogue:function(e){e.getDialogue().hide(),e.editor.focus()},setLink:function(e,t){e.getDialogue().hide(),e.editor.focus(),e.get("host").insertContentAtFocusPoint(t),e.markUpdated()}},{ATTRS:{contextid:{value:null},sesskey:{value:null},allowedtypes:{value:null},audiobitrate:{value:null},videobitrate:{value:null},timelimit:{value:null},audiortcicon:{value:null},videortcicon:{value:null},maxrecsize:{value:null}}})},"@VERSION@",{requires:["moodle-editor_atto-plugin","moodle-atto_recordrtc-recording"]}); +YUI.add("moodle-atto_recordrtc-button",function(e,t){var n="atto_recordrtc",r='
{{insecurealert_title}} {{insecurealert}}
{{#if isAudio}}
{{else}}
{{/if}}
';e.namespace("M.atto_recordrtc").Button=e.Base.create("button",e.M.editor_atto.EditorPlugin,[],{_lang:"en",initializer:function(){if(this.get("host").canShowFilepicker("media")){var e=this.get("allowedtypes"),t=!1;if(e==="both"||e==="audio")this._addButton("audio",this._audio),t=!0;if(e==="both"||e==="video")this._addButton("video",this._video),t=!0;if(!t)return;var n=this.getDialogue({width:1e3,focusAfterHide:null});n.after("visibleChange",function(){var e=!n.get("visible"),t=M.atto_recordrtc.commonmodule;e&&(window.clearInterval(t.countdownTicker),t.mediaRecorder&&t.mediaRecorder.state!=="inactive"&&t.mediaRecorder.stop(),t.stream&&t.stream.getTracks().forEach(function(e){e.readyState!=="ended"&&e.stop()}))}),n.on("click",function(){this.centered()}),window.require(["core/adapter"],function(e){window.adapter=e})}},_addButton:function(e,t){this.addButton({buttonName:e,icon:this.get(e+"rtcicon"),iconComponent:n,callback:t,title:e+"rtc",tags:e+"rtc",tagMatchRequiresAll:!1})},_audio:function(){var e=this.getDialogue();e.set("headerContent",M.util.get_string("audiortc","atto_recordrtc")),e.set("bodyContent",this._createContent("audio")),e.show(),M.atto_recordrtc.audiomodule.init(this)},_video:function(){var e=this.getDialogue();e.set("headerContent",M.util.get_string("videortc","atto_recordrtc")),e.set("bodyContent",this._createContent("video")),e.show(),M.atto_recordrtc.videomodule.init(this)},_createContent:function(t){var i=t==="audio",s="row",o="col-",u="alert-danger",a="btn btn-lg btn-outline-danger btn-block",f=e.Handlebars.compile(r)({PLUGINNAME:n,isAudio:i,bs_row:s,bs_col:o,bs_al_dang:u,bs_ss_btn:a,insecurealert_title:M.util.get_string("insecurealert_title","atto_recordrtc"),insecurealert:M.util.get_string("insecurealert","atto_recordrtc"),startrecording:M.util.get_string("startrecording","atto_recordrtc"),attachrecording:M.util.get_string("attachrecording","atto_recordrtc")});return f},closeDialogue:function(e){e.getDialogue().hide(),e.editor.focus()},setLink:function(e,t){e.getDialogue().hide(),e.editor.focus(),e.get("host").insertContentAtFocusPoint(t),e.markUpdated()}},{ATTRS:{contextid:{value:null},sesskey:{value:null},allowedtypes:{value:null},audiobitrate:{value:null},videobitrate:{value:null},timelimit:{value:null},audiortcicon:{value:null},videortcicon:{value:null},maxrecsize:{value:null}}})},"@VERSION@",{requires:["moodle-editor_atto-plugin","moodle-atto_recordrtc-recording"]}); diff --git a/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button.js b/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button.js index 213b2f2890b..3f62f9d4e64 100644 --- a/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button.js +++ b/lib/editor/atto/plugins/recordrtc/yui/build/moodle-atto_recordrtc-button/moodle-atto_recordrtc-button.js @@ -217,7 +217,7 @@ Y.namespace('M.atto_recordrtc').Button = Y.Base.create('button', Y.M.editor_atto _createContent: function(type) { var isAudio = (type === 'audio'), bsRow = 'row', - bsCol = 'col-xs-', + bsCol = 'col-', bsAlDang = 'alert-danger', bsSsBtn = 'btn btn-lg btn-outline-danger btn-block'; diff --git a/lib/editor/atto/plugins/recordrtc/yui/src/button/js/button.js b/lib/editor/atto/plugins/recordrtc/yui/src/button/js/button.js index 29ab713b520..3ffa677a2be 100644 --- a/lib/editor/atto/plugins/recordrtc/yui/src/button/js/button.js +++ b/lib/editor/atto/plugins/recordrtc/yui/src/button/js/button.js @@ -215,7 +215,7 @@ Y.namespace('M.atto_recordrtc').Button = Y.Base.create('button', Y.M.editor_atto _createContent: function(type) { var isAudio = (type === 'audio'), bsRow = 'row', - bsCol = 'col-xs-', + bsCol = 'col-', bsAlDang = 'alert-danger', bsSsBtn = 'btn btn-lg btn-outline-danger btn-block'; diff --git a/message/templates/notification_preferences_component.mustache b/message/templates/notification_preferences_component.mustache index 3dfb5d19e8b..2d9381e7451 100644 --- a/message/templates/notification_preferences_component.mustache +++ b/message/templates/notification_preferences_component.mustache @@ -73,11 +73,11 @@
-
+
{{#str}} loggedin, message {{/str}} {{#onlinehelphtml}}{{{.}}}{{/onlinehelphtml}}
-
+
{{#str}} loggedoff, message {{/str}} {{#offlinehelphtml}}{{{.}}}{{/offlinehelphtml}}
diff --git a/message/templates/notification_preferences_component_notification.mustache b/message/templates/notification_preferences_component_notification.mustache index 77bcf27790b..7770700ed68 100644 --- a/message/templates/notification_preferences_component_notification.mustache +++ b/message/templates/notification_preferences_component_notification.mustache @@ -67,7 +67,7 @@
-
+
{{#loggedin}} {{< core/hover_tooltip }} {{$anchor}} @@ -92,7 +92,7 @@ {{/ core/hover_tooltip }} {{/loggedin}}
-
+
{{#loggedoff}} {{< core/hover_tooltip }} {{$anchor}} diff --git a/report/insights/templates/insight.mustache b/report/insights/templates/insight.mustache index 6a96553a240..d0cb969f5c7 100644 --- a/report/insights/templates/insight.mustache +++ b/report/insights/templates/insight.mustache @@ -46,16 +46,16 @@ } }} - + {{{toggleslave}}} - + {{#sampleimage}} {{{sampleimage}}} {{/sampleimage}} {{{sampledescription}}} - + {{#actions}} {{> core/action_menu}} {{/actions}} diff --git a/report/insights/templates/insight_details.mustache b/report/insights/templates/insight_details.mustache index fa75339a04d..ecd91d5d350 100644 --- a/report/insights/templates/insight_details.mustache +++ b/report/insights/templates/insight_details.mustache @@ -108,9 +108,9 @@ {{/showpredictionheading}} - {{{hiddencheckboxtoggleall}}} - {{#str}}description{{/str}} - {{#str}}actions{{/str}} + {{{hiddencheckboxtoggleall}}} + {{#str}}description{{/str}} + {{#str}}actions{{/str}} diff --git a/theme/boost/scss/moodle/bs4alphacompat.scss b/theme/boost/scss/moodle/bs4alphacompat.scss index 90e8c8529e0..1bd88c4c0f9 100644 --- a/theme/boost/scss/moodle/bs4alphacompat.scss +++ b/theme/boost/scss/moodle/bs4alphacompat.scss @@ -215,13 +215,6 @@ $bs4aspacers: map-merge(( } } -// Adding compatibility for col-xs-* classes. -@for $i from 1 through $grid-columns { - .col-xs-#{$i} { - @extend .col-#{$i}; - } -} - input[disabled] { cursor: not-allowed; } diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css index 29457c81549..826add71293 100644 --- a/theme/boost/style/moodle.css +++ b/theme/boost/style/moodle.css @@ -2814,7 +2814,7 @@ pre { padding-right: 0; padding-left: 0; } -.col-1, .col-xs-1, .col-2, .col-xs-2, .col-3, .col-xs-3, .col-4, .col-xs-4, .col-5, .col-xs-5, .col-6, .col-xs-6, .col-7, .col-xs-7, .col-8, .col-xs-8, .col-9, .col-xs-9, .col-10, .col-xs-10, .col-11, .col-xs-11, .col-12, .col-xs-12, .col, +.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col, .col-auto, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm, .col-sm-auto, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md, .col-md-auto, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg, @@ -2835,51 +2835,51 @@ pre { width: auto; max-width: 100%; } -.col-1, .col-xs-1 { +.col-1 { flex: 0 0 8.3333333333%; max-width: 8.3333333333%; } -.col-2, .col-xs-2 { +.col-2 { flex: 0 0 16.6666666667%; max-width: 16.6666666667%; } -.col-3, .col-xs-3 { +.col-3 { flex: 0 0 25%; max-width: 25%; } -.col-4, .col-xs-4 { +.col-4 { flex: 0 0 33.3333333333%; max-width: 33.3333333333%; } -.col-5, .col-xs-5 { +.col-5 { flex: 0 0 41.6666666667%; max-width: 41.6666666667%; } -.col-6, .col-xs-6 { +.col-6 { flex: 0 0 50%; max-width: 50%; } -.col-7, .col-xs-7 { +.col-7 { flex: 0 0 58.3333333333%; max-width: 58.3333333333%; } -.col-8, .col-xs-8 { +.col-8 { flex: 0 0 66.6666666667%; max-width: 66.6666666667%; } -.col-9, .col-xs-9 { +.col-9 { flex: 0 0 75%; max-width: 75%; } -.col-10, .col-xs-10 { +.col-10 { flex: 0 0 83.3333333333%; max-width: 83.3333333333%; } -.col-11, .col-xs-11 { +.col-11 { flex: 0 0 91.6666666667%; max-width: 91.6666666667%; } -.col-12, .col-xs-12 { +.col-12 { flex: 0 0 100%; max-width: 100%; } diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css index f7454f6cde4..b4a3abcfa45 100644 --- a/theme/classic/style/moodle.css +++ b/theme/classic/style/moodle.css @@ -2816,7 +2816,7 @@ pre { padding-right: 0; padding-left: 0; } -.col-1, .col-xs-1, .col-2, .col-xs-2, .col-3, .col-xs-3, .col-4, .col-xs-4, .col-5, .col-xs-5, .col-6, .col-xs-6, .col-7, .col-xs-7, .col-8, .col-xs-8, .col-9, .col-xs-9, .col-10, .col-xs-10, .col-11, .col-xs-11, .col-12, .col-xs-12, .col, +.col-1, .col-2, .col-3, .col-4, .col-5, .col-6, .col-7, .col-8, .col-9, .col-10, .col-11, .col-12, .col, .col-auto, .col-sm-1, .col-sm-2, .col-sm-3, .col-sm-4, .col-sm-5, .col-sm-6, .col-sm-7, .col-sm-8, .col-sm-9, .col-sm-10, .col-sm-11, .col-sm-12, .col-sm, .col-sm-auto, .col-md-1, .col-md-2, .col-md-3, .col-md-4, .col-md-5, .col-md-6, .col-md-7, .col-md-8, .col-md-9, .col-md-10, .col-md-11, .col-md-12, .col-md, .col-md-auto, .col-lg-1, .col-lg-2, .col-lg-3, .col-lg-4, .col-lg-5, .col-lg-6, .col-lg-7, .col-lg-8, .col-lg-9, .col-lg-10, .col-lg-11, .col-lg-12, .col-lg, @@ -2837,51 +2837,51 @@ pre { width: auto; max-width: 100%; } -.col-1, .col-xs-1 { +.col-1 { flex: 0 0 8.3333333333%; max-width: 8.3333333333%; } -.col-2, .col-xs-2 { +.col-2 { flex: 0 0 16.6666666667%; max-width: 16.6666666667%; } -.col-3, .col-xs-3 { +.col-3 { flex: 0 0 25%; max-width: 25%; } -.col-4, .col-xs-4 { +.col-4 { flex: 0 0 33.3333333333%; max-width: 33.3333333333%; } -.col-5, .col-xs-5 { +.col-5 { flex: 0 0 41.6666666667%; max-width: 41.6666666667%; } -.col-6, .col-xs-6 { +.col-6 { flex: 0 0 50%; max-width: 50%; } -.col-7, .col-xs-7 { +.col-7 { flex: 0 0 58.3333333333%; max-width: 58.3333333333%; } -.col-8, .col-xs-8 { +.col-8 { flex: 0 0 66.6666666667%; max-width: 66.6666666667%; } -.col-9, .col-xs-9 { +.col-9 { flex: 0 0 75%; max-width: 75%; } -.col-10, .col-xs-10 { +.col-10 { flex: 0 0 83.3333333333%; max-width: 83.3333333333%; } -.col-11, .col-xs-11 { +.col-11 { flex: 0 0 91.6666666667%; max-width: 91.6666666667%; } -.col-12, .col-xs-12 { +.col-12 { flex: 0 0 100%; max-width: 100%; }