MDL-64506 templates: replace spans where and col-x appears

diff --git a/admin/tool/customlang/templates/translator.mustache b/admin/tool/customlang/templates/translator.mustache
index 381c9db..5092f68 100644 (file)
--- a/admin/tool/customlang/templates/translator.mustache
+++ b/admin/tool/customlang/templates/translator.mustache
@@ -71,16 +71,16 @@
     <div class="list-group">
         <div class="container-fluid d-none d-md-block list-group-item border-bottom-0">
             <div class="row-fluid">
-                <div class="col-sm-4 col-md-2 span2">
+                <div class="col-sm-4 col-md-2">
                     <strong>{{#str}}headingcomponent, tool_customlang{{/str}}</strong>
                 </div>
-                <div class="col-sm-4 col-md-2 span2">
+                <div class="col-sm-4 col-md-2">
                     <strong>{{#str}}headingstringid, tool_customlang{{/str}}</strong>
                 </div>
-                <div class="col-sm-4 col-md-2 span2">
+                <div class="col-sm-4 col-md-2">
                     <strong>{{#str}}headingstandard, tool_customlang{{/str}}</strong>
                 </div>
-                <div class="col-sm-12 col-md-6 span6">
+                <div class="col-sm-12 col-md-6">
                     <span class="p-l-1 pl-3">
                         <strong>{{#str}}headinglocal, tool_customlang{{/str}}</strong>
                     </span>
@@ -97,19 +97,19 @@
                 {{#modified}}list-group-item-info{{/modified}}"
             >
             <div class="row-fluid ">
-                <div class="col-sm-4 col-md-2 span2">
+                <div class="col-sm-4 col-md-2">
                     <div class="d-md-none">
                         <strong>{{#str}}headingcomponent, tool_customlang{{/str}}</strong>
                     </div>
                     {{{ component }}}
                 </div>
-                <div class="col-sm-4 col-md-2 span2 text-break">
+                <div class="col-sm-4 col-md-2 text-break">
                     <div class="d-md-none">
                         <strong>{{#str}}headingstringid, tool_customlang{{/str}}</strong>
                     </div>
                     {{{ stringid }}}
                 </div>
-                <div class="col-sm-4 col-md-2 span2">
+                <div class="col-sm-4 col-md-2">
                     <div class="d-md-none">
                         <strong>{{#str}}headingstandard, tool_customlang{{/str}}</strong>
                     </div>
@@ -124,7 +124,7 @@
                     </div>
                     {{/showoriginalvsmaster}}
                 </div>
-                <div class="col-sm-12 col-md-6 mt-sm-3 mt-md-0 span6">
+                <div class="col-sm-12 col-md-6 mt-sm-3 mt-md-0">
                     <div class="d-md-none">
                         <strong>{{#str}}headinglocal, tool_customlang{{/str}}</strong>
                     </div>

diff --git a/admin/tool/dataprivacy/templates/contact_dpo.mustache b/admin/tool/dataprivacy/templates/contact_dpo.mustache
index 7dae8e9..6cdd3ac 100644 (file)
--- a/admin/tool/dataprivacy/templates/contact_dpo.mustache
+++ b/admin/tool/dataprivacy/templates/contact_dpo.mustache
@@ -47,7 +47,7 @@
             <abbr class="initialism text-danger" title="{{#str}}required{{/str}}">{{#pix}}req, core, {{#str}}required{{/str}}{{/pix}}</abbr>
         </span>
         </label>
-        <div class="col-md-9 span9">
+        <div class="col-md-9">
             <textarea class="form-control" id="message" cols="60" rows="8"></textarea>
             <div class="form-control-feedback" id="id_error_message" hidden="hidden">
                 {{#str}}required, moodle{{/str}}

diff --git a/admin/tool/dataprivacy/templates/defaults_display.mustache b/admin/tool/dataprivacy/templates/defaults_display.mustache
index 43909e9..dc1eb72 100644 (file)
--- a/admin/tool/dataprivacy/templates/defaults_display.mustache
+++ b/admin/tool/dataprivacy/templates/defaults_display.mustache
@@ -42,20 +42,20 @@
     }
 }}
 <div class="row-fluid rtl-compatible mt-1 mb-1">
-    <div class="col-md-9 span9">
+    <div class="col-md-9">
         <div class="row-fluid rtl-compatible mt-1 mb-1">
-            <div class="col-md-3 span3">
+            <div class="col-md-3">
                 <strong>{{#str}}category, tool_dataprivacy{{/str}}</strong>
             </div>
-            <div class="col-md-9 span9">
+            <div class="col-md-9">
                 {{category}}
             </div>
         </div>
         <div class="row-fluid rtl-compatible mt-1 mb-1">
-            <div class="col-md-3 span3">
+            <div class="col-md-3">
                 <strong>{{#str}}purpose, tool_dataprivacy{{/str}}</strong>
             </div>
-            <div class="col-md-9 span9">
+            <div class="col-md-9">
                 {{purpose}}
             </div>
         </div>

diff --git a/blocks/myoverview/templates/view-list.mustache b/blocks/myoverview/templates/view-list.mustache
index 5e588a3..b4aa8f9 100644 (file)
--- a/blocks/myoverview/templates/view-list.mustache
+++ b/blocks/myoverview/templates/view-list.mustache
@@ -41,7 +41,7 @@
         data-region="course-content"
         data-course-id="{{{id}}}">
         <div class="row-fluid">
-            <div class="{{#hasprogress}}col-md-6 span6{{/hasprogress}}{{^hasprogress}}col-md-11 span11{{/hasprogress}} d-flex align-items-center">
+            <div class="{{#hasprogress}}col-md-6{{/hasprogress}}{{^hasprogress}}col-md-11 col-md-11{{/hasprogress}} d-flex align-items-center">
                 <a href="{{viewurl}}" class="coursename">
                     <div class="text-muted muted d-flex" style="flex-flow:wrap;">
                         <span class="sr-only">

diff --git a/course/templates/activityinstance.mustache b/course/templates/activityinstance.mustache
index 88da302..906e6dc 100644 (file)
--- a/course/templates/activityinstance.mustache
+++ b/course/templates/activityinstance.mustache
@@ -34,7 +34,7 @@
 }}
 {{#activities}}
 <div class="row mb-1 row-fluid">
-    <div class="activityinstance col-xs-6 span6">
+    <div class="activityinstance col-xs-6">
         <div class="mod-indent-outer"></div>
         <div>
             {{#canmanage}}
@@ -47,7 +47,7 @@
             </a>
         </div>
     </div>
-    <div class="activity-completionstatus col-xs-6 span6" id="completionstatus_{{cmid}}">
+    <div class="activity-completionstatus col-xs-6" id="completionstatus_{{cmid}}">
         <div class="col-sm-1  p-l-0">
             {{#completionstatus.icon}}
                 {{{completionstatus.icon}}}

diff --git a/course/templates/bulkactivitycompletion.mustache b/course/templates/bulkactivitycompletion.mustache
index 723d657..39c010b 100644 (file)
--- a/course/templates/bulkactivitycompletion.mustache
+++ b/course/templates/bulkactivitycompletion.mustache
@@ -49,11 +49,11 @@
         </div>
     </div>
     <div class="row mb-1">
-        <div class="col-xs-6 span6">
+        <div class="col-xs-6">
             <input type="checkbox" class="mastercheck mr-1" aria-label="{{#str}}checkall, completion{{/str}}">
             <label class="font-weight-bold">{{#str}}activitieslabel, core_completion{{/str}}</label>
         </div>
-        <div class="col-xs-6 span6">
+        <div class="col-xs-6">
             <label class="font-weight-bold">{{#str}}completion, core_completion{{/str}}</label>
             <span>{{{helpicon}}}</span>
         </div>

diff --git a/course/templates/defaultactivitycompletion.mustache b/course/templates/defaultactivitycompletion.mustache
index 14834ac..6831a0b 100644 (file)
--- a/course/templates/defaultactivitycompletion.mustache
+++ b/course/templates/defaultactivitycompletion.mustache
@@ -46,11 +46,11 @@
         </div>
     </div>
     <div class="row mb-1">
-        <div class="col-xs-6 span6">
+        <div class="col-xs-6">
             <input type="checkbox" class="mastercheck mr-1" aria-label="{{#str}}checkall, completion{{/str}}">
             <label class="font-weight-bold">{{#str}}activitieslabel, core_completion{{/str}}</label>
         </div>
-        <div class="col-xs-6 span6">
+        <div class="col-xs-6">
             <label class="font-weight-bold">{{#str}}completion, core_completion{{/str}}</label>
             <span>{{{helpicon}}}</span>
         </div>
@@ -61,13 +61,13 @@
             {{#canmanage}}
              <div class="mb-1">
                 <div class="row mb-1 row-fluid">
-                    <div class="col-xs-6 span6">
+                    <div class="col-xs-6">
                         <label class="accesshide" for="modtype_{{id}}">{{#str}}select, core_completion{{/str}} {{formattedname}}</label>
                         <input id="modtype_{{id}}" type="checkbox" class="mr-1" name="modids[]" value="{{id}}" aria-label="{{#str}}checkactivity, completion, {{{formattedname}}}{{/str}}">
                         <img class="iconlarge activityicon" src="{{icon}}" alt=" " role="presentation" />
                         <span>{{{formattedname}}}</span>
                     </div>
-                    <div class="activity-completionstatus col-xs-6 span6">
+                    <div class="activity-completionstatus col-xs-6">
                         <div class="col-sm-1 p-l-0">
                             {{#completionstatus.icon}}
                                 {{{completionstatus.icon}}}

diff --git a/lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-min.js b/lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-min.js
index ca8bb58..4583f0f 100644 (file)
Binary files a/lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-min.js and b/lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-min.js differ

diff --git a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
index f9c0921..94511b8 100644 (file)
Binary files a/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js and b/lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js differ

diff --git a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js
index 3b1a95d..34418c6 100644 (file)
Binary files a/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js and b/lib/editor/atto/plugins/media/yui/build/moodle-atto_media-button/moodle-atto_media-button-min.js differ

diff --git a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
index 399e93a..e4465fd 100644 (file)
Binary files a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js and b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js differ

diff --git a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
index 6cd5b36..aa2e09d 100644 (file)
Binary files a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js and b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js differ

diff --git a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
index 399e93a..e4465fd 100644 (file)
Binary files a/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js and b/lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js differ

diff --git a/lib/editor/atto/plugins/table/yui/src/button/js/button.js b/lib/editor/atto/plugins/table/yui/src/button/js/button.js
index 79ca755..884e6bc 100644 (file)
--- a/lib/editor/atto/plugins/table/yui/src/button/js/button.js
+++ b/lib/editor/atto/plugins/table/yui/src/button/js/button.js
@@ -42,17 +42,17 @@ var COMPONENT = 'atto_table',
     TEMPLATE = '' +
         '<form class="{{CSS.FORM}}">' +
             '<div class="mb-1 form-group row-fluid">' +
-            '<div class="col-sm-4 span4">' +
+            '<div class="col-sm-4">' +
             '<label for="{{elementid}}_atto_table_caption">{{get_string "caption" component}}</label>' +
-            '</div><div class="col-sm-8 span8">' +
+            '</div><div class="col-sm-8">' +
             '<input type="text" class="form-control {{CSS.CAPTION}}" id="{{elementid}}_atto_table_caption" required />' +
             '</div>' +
             '</div>' +
             '<div class="mb-1 form-group row-fluid">' +
-            '<div class="col-sm-4 span4">' +
+            '<div class="col-sm-4">' +
             '<label for="{{elementid}}_atto_table_captionposition">' +
             '{{get_string "captionposition" component}}</label>' +
-            '</div><div class="col-sm-8 span8">' +
+            '</div><div class="col-sm-8">' +
             '<select class="custom-select {{CSS.CAPTIONPOSITION}}" id="{{elementid}}_atto_table_captionposition">' +
                 '<option value=""></option>' +
                 '<option value="top">{{get_string "top" "editor"}}</option>' +
@@ -61,9 +61,9 @@ var COMPONENT = 'atto_table',
             '</div>' +
             '</div>' +
             '<div class="mb-1 form-group row-fluid">' +
-            '<div class="col-sm-4 span4">' +
+            '<div class="col-sm-4">' +
             '<label for="{{elementid}}_atto_table_headers">{{get_string "headers" component}}</label>' +
-            '</div><div class="col-sm-8 span8">' +
+            '</div><div class="col-sm-8">' +
             '<select class="custom-select {{CSS.HEADERS}}" id="{{elementid}}_atto_table_headers">' +
                 '<option value="columns">{{get_string "columns" component}}' + '</option>' +
                 '<option value="rows">{{get_string "rows" component}}' + '</option>' +
@@ -73,18 +73,18 @@ var COMPONENT = 'atto_table',
             '</div>' +
             '{{#if nonedit}}' +
                 '<div class="mb-1 form-group row-fluid">' +
-                '<div class="col-sm-4 span4">' +
+                '<div class="col-sm-4">' +
                 '<label for="{{elementid}}_atto_table_rows">{{get_string "numberofrows" component}}</label>' +
-                '</div><div class="col-sm-8 span8">' +
+                '</div><div class="col-sm-8">' +
                 '<input class="form-control w-auto {{CSS.ROWS}}" type="number" value="3" ' +
                 'id="{{elementid}}_atto_table_rows" size="8" min="1" max="50"/>' +
                 '</div>' +
                 '</div>' +
                 '<div class="mb-1 form-group row-fluid">' +
-                '<div class="col-sm-4 span4">' +
+                '<div class="col-sm-4">' +
                 '<label for="{{elementid}}_atto_table_columns" ' +
                 '>{{get_string "numberofcolumns" component}}</label>' +
-                '</div><div class="col-sm-8 span8">' +
+                '</div><div class="col-sm-8">' +
                 '<input class="form-control w-auto {{CSS.COLUMNS}}" type="number" value="3" ' +
                     'id="{{elementid}}_atto_table_columns"' +
                 'size="8" min="1" max="20"/>' +
@@ -96,9 +96,9 @@ var COMPONENT = 'atto_table',
                 '<legend class="mdl-align">{{get_string "appearance" component}}</legend>' +
                 '{{#if allowBorders}}' +
                     '<div class="mb-1 form-group row-fluid">' +
-                    '<div class="col-sm-4 span4">' +
+                    '<div class="col-sm-4">' +
                     '<label for="{{elementid}}_atto_table_borders">{{get_string "borders" component}}</label>' +
-                    '</div><div class="col-sm-8 span8">' +
+                    '</div><div class="col-sm-8">' +
                     '<select name="borders" class="custom-select {{CSS.BORDERS}}" id="{{elementid}}_atto_table_borders">' +
                         '<option value="default">{{get_string "themedefault" component}}' + '</option>' +
                         '<option value="outer">{{get_string "outer" component}}' + '</option>' +
@@ -107,10 +107,10 @@ var COMPONENT = 'atto_table',
                     '</div>' +
                     '</div>' +
                     '<div class="mb-1 form-group row-fluid">' +
-                    '<div class="col-sm-4 span4">' +
+                    '<div class="col-sm-4">' +
                     '<label for="{{elementid}}_atto_table_borderstyle">' +
                     '{{get_string "borderstyles" component}}</label>' +
-                    '</div><div class="col-sm-8 span8">' +
+                    '</div><div class="col-sm-8">' +
                     '<select name="borderstyles" class="custom-select {{CSS.BORDERSTYLE}}" ' +
                         'id="{{elementid}}_atto_table_borderstyle">' +
                         '{{#each borderStyles}}' +
@@ -120,10 +120,10 @@ var COMPONENT = 'atto_table',
                     '</div>' +
                     '</div>' +
                     '<div class="mb-1 form-group row-fluid">' +
-                    '<div class="col-sm-4 span4">' +
+                    '<div class="col-sm-4">' +
                     '<label for="{{elementid}}_atto_table_bordersize">' +
                     '{{get_string "bordersize" component}}</label>' +
-                    '</div><div class="col-sm-8 span8">' +
+                    '</div><div class="col-sm-8">' +
                     '<div class="form-inline">' +
                     '<input name="bordersize" id="{{elementid}}_atto_table_bordersize" ' +
                     'class="form-control w-auto mr-1 {{CSS.BORDERSIZE}}"' +
@@ -133,10 +133,10 @@ var COMPONENT = 'atto_table',
                     '</div>' +
                     '</div>' +
                     '<div class="mb-1 form-group row-fluid">' +
-                    '<div class="col-sm-4 span4">' +
+                    '<div class="col-sm-4">' +
                     '<label for="{{elementid}}_atto_table_bordercolour">' +
                     '{{get_string "bordercolour" component}}</label>' +
-                    '</div><div class="col-sm-8 span8">' +
+                    '</div><div class="col-sm-8">' +
                     '<div id="{{elementid}}_atto_table_bordercolour"' +
                     'class="form-inline {{CSS.BORDERCOLOUR}} {{CSS.AVAILABLECOLORS}}" size="1">' +
                         '<div class="tablebordercolor" style="background-color:transparent;color:transparent">' +
@@ -160,10 +160,10 @@ var COMPONENT = 'atto_table',
                 '{{/if}}' +
                 '{{#if allowBackgroundColour}}' +
                     '<div class="mb-1 form-group row-fluid">' +
-                    '<div class="col-sm-4 span4">' +
+                    '<div class="col-sm-4">' +
                     '<label for="{{elementid}}_atto_table_backgroundcolour">' +
                     '{{get_string "backgroundcolour" component}}</label>' +
-                    '</div><div class="col-sm-8 span8">' +
+                    '</div><div class="col-sm-8">' +
                     '<div id="{{elementid}}_atto_table_backgroundcolour"' +
                     'class="form-inline {{CSS.BACKGROUNDCOLOUR}} {{CSS.AVAILABLECOLORS}}" size="1">' +
                         '<div class="tablebackgroundcolor" style="background-color:transparent;color:transparent">' +
@@ -188,10 +188,10 @@ var COMPONENT = 'atto_table',
                 '{{/if}}' +
                 '{{#if allowWidth}}' +
                     '<div class="mb-1 form-group row-fluid">' +
-                    '<div class="col-sm-4 span4">' +
+                    '<div class="col-sm-4">' +
                     '<label for="{{elementid}}_atto_table_width">' +
                     '{{get_string "width" component}}</label>' +
-                    '</div><div class="col-sm-8 span8">' +
+                    '</div><div class="col-sm-8">' +
                     '<div class="form-inline">' +
                     '<input name="width" id="{{elementid}}_atto_table_width" ' +
                         'class="form-control w-auto mr-1 {{CSS.WIDTH}}" size="8" ' +

diff --git a/mod/wiki/pagelib.php b/mod/wiki/pagelib.php
index b5caacb..5ddbf76 100644 (file)
--- a/mod/wiki/pagelib.php
+++ b/mod/wiki/pagelib.php
@@ -1557,7 +1557,7 @@ class page_wiki_map extends page_wiki {
             $table->data[] = array(html_writer::link($link->out(false), format_string($lpage->title)));
         }
 
-        $table_left = $OUTPUT->container(html_writer::table($table), 'col-md-6 span6');
+        $table_left = $OUTPUT->container(html_writer::table($table), 'col-md-6');
 
         $table = new html_table();
         $table->attributes['class'] = 'wiki_navigation_to table';
@@ -1574,7 +1574,7 @@ class page_wiki_map extends page_wiki {
                 $table->data[] = array(html_writer::link($viewlink->out(false), format_string($lpage->title)));
             }
         }
-        $table_right = $OUTPUT->container(html_writer::table($table), 'col-md-6 span6');
+        $table_right = $OUTPUT->container(html_writer::table($table), 'col-md-6');
         echo $OUTPUT->container($table_left . $table_right, 'wiki_navigation_container row');
     }
 

diff --git a/report/competency/templates/report.mustache b/report/competency/templates/report.mustache
index b4b914a..09b44dc 100644 (file)
--- a/report/competency/templates/report.mustache
+++ b/report/competency/templates/report.mustache
@@ -12,7 +12,7 @@
 {{/pushratingstouserplans}}
 </div>
 <div class="row-fluid">
-<span class="span6">
+<span class="col-md-6">
     <table class="table table-bordered">
         <summary class="accesshide">
             <p>{{#str}}coursecompetencybreakdownsummary, report_competency{{/str}}</p>

diff --git a/theme/boost/scss/moodle/message.scss b/theme/boost/scss/moodle/message.scss
index 99a4780..164121a 100644 (file)
--- a/theme/boost/scss/moodle/message.scss
+++ b/theme/boost/scss/moodle/message.scss
@@ -22,7 +22,7 @@
     .container-fluid {
         padding: 0;
 
-        .span6 {
+        .col-md-6 {
             min-height: 20px;
         }
     }

diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 8c41b79..d18668f 100644 (file)
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -13388,7 +13388,7 @@ a.ygtvspacer:hover {
 
 .preferences-container .container-fluid {
   padding: 0; }
-  .preferences-container .container-fluid .span6 {
+  .preferences-container .container-fluid .col-md-6 {
     min-height: 20px; }
 
 .preferences-container .align-bottom {

diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 8d5b6db..e682d12 100644 (file)
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -13635,7 +13635,7 @@ a.ygtvspacer:hover {
 
 .preferences-container .container-fluid {
   padding: 0; }
-  .preferences-container .container-fluid .span6 {
+  .preferences-container .container-fluid .col-md-6 {
     min-height: 20px; }
 
 .preferences-container .align-bottom {