From 6ecc445939f3db2be7a4043e58f450b4121b3944 Mon Sep 17 00:00:00 2001
From: Mathew May <mathewm@hotmail.co.nz>
Date: Thu, 7 Mar 2019 09:40:47 +0800
Subject: [PATCH] MDL-64506 templates: Remove BS2 spans from elements.

---
 .../dataprivacy/templates/component_status.mustache    | 10 +++++-----
 admin/tool/dataprivacy/templates/contact_dpo.mustache  |  6 +++---
 .../tool/dataprivacy/templates/data_registry.mustache  |  4 ++--
 .../dataprivacy/templates/defaults_display.mustache    |  2 +-
 admin/tool/langimport/templates/langimport.mustache    |  2 +-
 .../lp/templates/manage_competencies_page.mustache     |  4 ++--
 blocks/myoverview/templates/placeholders.mustache      |  8 ++++----
 blocks/myoverview/templates/view-list.mustache         |  4 ++--
 course/classes/management_renderer.php                 |  4 ++--
 course/templates/activityinstance.mustache             |  4 ++--
 course/templates/defaultactivitycompletion.mustache    |  4 ++--
 group/templates/index.mustache                         |  4 ++--
 lib/outputrenderers.php                                |  2 +-
 .../notification_preferences_component.mustache        |  4 ++--
 ...ication_preferences_component_notification.mustache |  4 ++--
 15 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/admin/tool/dataprivacy/templates/component_status.mustache b/admin/tool/dataprivacy/templates/component_status.mustache
index e55a30b4085..9a1c6adbd19 100644
--- a/admin/tool/dataprivacy/templates/component_status.mustache
+++ b/admin/tool/dataprivacy/templates/component_status.mustache
@@ -75,7 +75,7 @@
                 <hr />
                 <div class="p-l-3">
                     <dl class="row">
-                        <dt class="span3 col-xs-3">
+                        <dt class="col-xs-3">
                             {{#link}}
                                 <a href="#{{name}}"><strong style="word-wrap:break-word">{{name}}</strong></a>
                             {{/link}}
@@ -84,13 +84,13 @@
                             {{/link}}
                             <div class="small text-muted" style="word-wrap:break-word">{{type}}</div>
                         </dt>
-                        <dd class="span9 col-xs-9">{{summary}}</dd>
+                        <dd class="col-xs-9">{{summary}}</dd>
                     </dl>
                     <dl>
                         {{#fields}}
                         <div class="row">
-                            <dt class="span3 col-xs-3 font-weight-normal" style="word-wrap:break-word">{{field_name}}</dt>
-                            <dd class="span9 col-xs-9">{{field_summary}}</dd>
+                            <dt class="col-xs-3 font-weight-normal" style="word-wrap:break-word">{{field_name}}</dt>
+                            <dd class="col-xs-9">{{field_summary}}</dd>
                         </div>
                         {{/fields}}
                     </dl>
@@ -100,7 +100,7 @@
                 <hr />
                 <div class="p-l-3">
                     <div class="row">
-                        <div class="span12 col-xs-12">
+                        <div class="col-xs-12">
                             {{nullprovider}}
                         </div>
                     </div>
diff --git a/admin/tool/dataprivacy/templates/contact_dpo.mustache b/admin/tool/dataprivacy/templates/contact_dpo.mustache
index fa84f1494ef..f0738ea0024 100644
--- a/admin/tool/dataprivacy/templates/contact_dpo.mustache
+++ b/admin/tool/dataprivacy/templates/contact_dpo.mustache
@@ -37,11 +37,11 @@
 }}
 <div class="container">
     <div class="row m-b-2">
-        <label class="col-md-3 span3 col-form-label">{{#str}}replyto, tool_dataprivacy{{/str}}</label>
-        <div class="col-md-9 span9 col-form-label">{{replytoemail}}</div>
+        <label class="col-md-3 col-form-label">{{#str}}replyto, tool_dataprivacy{{/str}}</label>
+        <div class="col-md-9 col-form-label">{{replytoemail}}</div>
     </div>
     <div class="row" data-region="messageinput">
-        <label for="message" class="col-md-3 span3 col-form-label">
+        <label for="message" class="col-md-3 col-form-label">
             {{#str}}message, tool_dataprivacy{{/str}}
             <span class="pull-xs-right text-nowrap">
             <abbr class="initialism text-danger" title="{{#str}}required{{/str}}">{{#pix}}req, core, {{#str}}required{{/str}}{{/pix}}</abbr>
diff --git a/admin/tool/dataprivacy/templates/data_registry.mustache b/admin/tool/dataprivacy/templates/data_registry.mustache
index fb86ae90167..077792ac9df 100644
--- a/admin/tool/dataprivacy/templates/data_registry.mustache
+++ b/admin/tool/dataprivacy/templates/data_registry.mustache
@@ -54,12 +54,12 @@
 
     <div class="container-fluid m-t-2">
         <div class="row">
-            <div class="span3 col-md-4 p-l-0 nav-pills context-tree">
+            <div class="col-md-4 p-l-0 nav-pills context-tree">
                 {{#tree}}
                     {{> tool_dataprivacy/context_tree_node}}
                 {{/tree}}
             </div>
-            <div class="span9 col-md-8" id="context-form-container">
+            <div class="col-md-8" id="context-form-container">
             </div>
         </div>
     </div>
diff --git a/admin/tool/dataprivacy/templates/defaults_display.mustache b/admin/tool/dataprivacy/templates/defaults_display.mustache
index 39a29aa96b8..8a006d581da 100644
--- a/admin/tool/dataprivacy/templates/defaults_display.mustache
+++ b/admin/tool/dataprivacy/templates/defaults_display.mustache
@@ -60,7 +60,7 @@
             </div>
         </div>
     </div>
-    <div class="col-md-3 span3 align-self-center">
+    <div class="col-md-3 align-self-center">
     {{#canedit}}
         <button class="btn btn-default" {{!
             }}data-action="edit-level-defaults" {{!
diff --git a/admin/tool/langimport/templates/langimport.mustache b/admin/tool/langimport/templates/langimport.mustache
index 25dc7002370..4f316dab736 100644
--- a/admin/tool/langimport/templates/langimport.mustache
+++ b/admin/tool/langimport/templates/langimport.mustache
@@ -94,7 +94,7 @@
             {{/updateurl}}
         </div>
         {{#caninstall}}
-            <div class="col-md-6 span6 m-b-1">
+            <div class="col-md-6 m-b-1">
                 <form id="installform" action="{{installurl}}" method="post">
                     <fieldset>
                         <div class="form-group">
diff --git a/admin/tool/lp/templates/manage_competencies_page.mustache b/admin/tool/lp/templates/manage_competencies_page.mustache
index 24b0218c92e..c546b81b165 100644
--- a/admin/tool/lp/templates/manage_competencies_page.mustache
+++ b/admin/tool/lp/templates/manage_competencies_page.mustache
@@ -47,7 +47,7 @@
 <div>{{{framework.description}}}</div>
     <h3>{{#str}}competencies, core_competency{{/str}}</h3>
     <div class="row-fluid row">
-        <div class="span6 col-lg-6">
+        <div class="col-lg-6">
             <p>
                 <form data-region="filtercompetencies" data-frameworkid="{{framework.id}}" class="form-inline">
                     <div class="form-group">
@@ -62,7 +62,7 @@
             </ul>
         </div>
 
-        <div class="span6 card col-lg-6">
+        <div class="card col-lg-6">
             <div class="card-block card-body">
                 <div class="card-title">
                     <h4 data-region="selected-competency">{{#str}}selectedcompetency, tool_lp{{/str}}</h4>
diff --git a/blocks/myoverview/templates/placeholders.mustache b/blocks/myoverview/templates/placeholders.mustache
index 5bbe7efffd3..8410211db79 100644
--- a/blocks/myoverview/templates/placeholders.mustache
+++ b/blocks/myoverview/templates/placeholders.mustache
@@ -34,25 +34,25 @@
     {{#list}}
     <ul class="list-group">
         <li class="list-group-item course-listitem">
-            <div class="col-md-6 span6 p-0 d-flex align-items-center">
+            <div class="col-md-6 p-0 d-flex align-items-center">
                 <div class="bg-pulse-grey rounded-circle mr-2" style="height: 1rem; width: 1rem;"></div>
                 <div class="bg-pulse-grey w-50" style="height: 1rem; margin: 0.5rem 0"></div>
             </div>
         </li>
         <li class="list-group-item course-listitem">
-            <div class="col-md-6 span6 p-0 d-flex align-items-center">
+            <div class="col-md-6 p-0 d-flex align-items-center">
                 <div class="bg-pulse-grey rounded-circle mr-2" style="height: 1rem; width: 1rem;"></div>
                 <div class="bg-pulse-grey w-50" style="height: 1rem; margin: 0.5rem 0"></div>
             </div>
         </li>
         <li class="list-group-item course-listitem">
-            <div class="col-md-6 span6 p-0 d-flex align-items-center">
+            <div class="col-md-6 p-0 d-flex align-items-center">
                 <div class="bg-pulse-grey rounded-circle mr-2" style="height: 1rem; width: 1rem;"></div>
                 <div class="bg-pulse-grey w-50" style="height: 1rem; margin: 0.5rem 0"></div>
             </div>
         </li>
         <li class="list-group-item course-listitem">
-            <div class="col-md-6 span6 p-0 d-flex align-items-center">
+            <div class="col-md-6 p-0 d-flex align-items-center">
                 <div class="bg-pulse-grey rounded-circle mr-2" style="height: 1rem; width: 1rem;"></div>
                 <div class="bg-pulse-grey w-50" style="height: 1rem; margin: 0.5rem 0"></div>
             </div>
diff --git a/blocks/myoverview/templates/view-list.mustache b/blocks/myoverview/templates/view-list.mustache
index a39a9bbbad8..5e588a3909d 100644
--- a/blocks/myoverview/templates/view-list.mustache
+++ b/blocks/myoverview/templates/view-list.mustache
@@ -64,11 +64,11 @@
                 </a>
             </div>
             {{#hasprogress}}
-            <div class="col-md-5 span5 pt-1">
+            <div class="col-md-5 pt-1">
                 {{> block_myoverview/progress-bar}}
             </div>
             {{/hasprogress}}
-            <div class="col-md-1 span1 p-0 d-flex">
+            <div class="col-md-1 p-0 d-flex">
                 {{> block_myoverview/course-action-menu }}
             </div>
         </div>
diff --git a/course/classes/management_renderer.php b/course/classes/management_renderer.php
index d2e709250ec..c0f25d0d098 100644
--- a/course/classes/management_renderer.php
+++ b/course/classes/management_renderer.php
@@ -453,8 +453,8 @@ class core_course_management_renderer extends plugin_renderer_base {
             $form .= html_writer::end_div();
 
             $html .= html_writer::start_div('detail-pair row yui3-g m-y-1');
-            $html .= html_writer::div(html_writer::span(get_string('sorting')), 'pair-key span3 col-md-3 yui3-u-1-4');
-            $html .= html_writer::div($form, 'pair-value span9 col-md-9 yui3-u-3-4');
+            $html .= html_writer::div(html_writer::span(get_string('sorting')), 'pair-key col-md-3 yui3-u-1-4');
+            $html .= html_writer::div($form, 'pair-value col-md-9 yui3-u-3-4');
             $html .= html_writer::end_div();
         }
         if (core_course_category::can_change_parent_any()) {
diff --git a/course/templates/activityinstance.mustache b/course/templates/activityinstance.mustache
index 1ed95a8b7fe..84169aed5fe 100644
--- a/course/templates/activityinstance.mustache
+++ b/course/templates/activityinstance.mustache
@@ -48,7 +48,7 @@
         </div>
     </div>
     <div class="activity-completionstatus col-xs-6 span6" id="completionstatus_{{cmid}}">
-        <div class="col-sm-1 span1  p-l-0">
+        <div class="col-sm-1  p-l-0">
             {{#completionstatus.icon}}
                 {{{completionstatus.icon}}}
             {{/completionstatus.icon}}
@@ -56,7 +56,7 @@
                 <span class="m-r-3"></span>
             {{/completionstatus.icon}}
         </div>
-        <div class="col-sm-11 span11  p-l-0">
+        <div class="col-sm-11  p-l-0">
             <span class="text-muted muted">{{{completionstatus.string}}}</span>
         </div>
     </div>
diff --git a/course/templates/defaultactivitycompletion.mustache b/course/templates/defaultactivitycompletion.mustache
index 066370f49c5..4cccedb68b8 100644
--- a/course/templates/defaultactivitycompletion.mustache
+++ b/course/templates/defaultactivitycompletion.mustache
@@ -68,7 +68,7 @@
                         <span>{{{formattedname}}}</span>
                     </div>
                     <div class="activity-completionstatus col-xs-6 span6">
-                        <div class="col-sm-1 span1 p-l-0">
+                        <div class="col-sm-1 p-l-0">
                             {{#completionstatus.icon}}
                                 {{{completionstatus.icon}}}
                             {{/completionstatus.icon}}
@@ -76,7 +76,7 @@
                                 <span class="m-r-3"></span>
                             {{/completionstatus.icon}}
                         </div>
-                        <div class="col-sm-11 span11 p-l-0">
+                        <div class="col-sm-11 p-l-0">
                             <span class="text-muted muted">{{{completionstatus.string}}}</span>
                         </div>
                     </div>
diff --git a/group/templates/index.mustache b/group/templates/index.mustache
index e68bdaf2da4..a86b15a52e5 100644
--- a/group/templates/index.mustache
+++ b/group/templates/index.mustache
@@ -78,7 +78,7 @@
 <form id="groupeditform" action="index.php" method="post">
     <div class="container-fluid groupmanagementtable">
         <div class="row row-fluid rtl-compatible">
-            <div class="col-md-6 span6 m-b-1">
+            <div class="col-md-6 m-b-1">
                 <input type="hidden" name="id" value="{{courseid}}">
                 <div class="form-group">
                     <label for="groups">
@@ -110,7 +110,7 @@
                     <input type="submit" name="act_showimportgroups" id="showimportgroups" value="{{#str}}importgroups, group{{/str}}" class="btn btn-default" />
                 </div>
             </div>
-            <div class="col-md-6 span6 m-b-1">
+            <div class="col-md-6 m-b-1">
                 <div class="form-group">
                     <label for="members">
                         <span id="memberslabel">{{#str}}membersofselectedgroup, group{{/str}}</span>
diff --git a/lib/outputrenderers.php b/lib/outputrenderers.php
index ba27a7f9c45..b70ba01c0b5 100644
--- a/lib/outputrenderers.php
+++ b/lib/outputrenderers.php
@@ -4027,7 +4027,7 @@ EOD;
      */
     public function render_preferences_group(preferences_group $renderable) {
         $html = '';
-        $html .= html_writer::start_tag('div', array('class' => 'span4 preferences-group'));
+        $html .= html_writer::start_tag('div', array('class' => 'col-sm-4 preferences-group'));
         $html .= $this->heading($renderable->title, 3);
         $html .= html_writer::start_tag('ul');
         foreach ($renderable->nodes as $node) {
diff --git a/message/templates/notification_preferences_component.mustache b/message/templates/notification_preferences_component.mustache
index 59f529592c1..3dfb5d19e8b 100644
--- a/message/templates/notification_preferences_component.mustache
+++ b/message/templates/notification_preferences_component.mustache
@@ -73,11 +73,11 @@
         <td class="align-bottom">
             <div class="container-fluid">
                 <div class="row-fluid">
-                    <div class="span6 col-xs-6">
+                    <div class="col-xs-6">
                         {{#str}} loggedin, message {{/str}}
                         {{#onlinehelphtml}}{{{.}}}{{/onlinehelphtml}}
                     </div>
-                    <div class="span6 col-xs-6">
+                    <div class="col-xs-6">
                         {{#str}} loggedoff, message {{/str}}
                         {{#offlinehelphtml}}{{{.}}}{{/offlinehelphtml}}
                     </div>
diff --git a/message/templates/notification_preferences_component_notification.mustache b/message/templates/notification_preferences_component_notification.mustache
index 0f107674273..77bcf27790b 100644
--- a/message/templates/notification_preferences_component_notification.mustache
+++ b/message/templates/notification_preferences_component_notification.mustache
@@ -67,7 +67,7 @@
                 <form>
                     <div class="container-fluid">
                         <div class="row-fluid">
-                            <div class="span6 col-xs-6">
+                            <div class="col-xs-6">
                                 {{#loggedin}}
                                     {{< core/hover_tooltip }}
                                         {{$anchor}}
@@ -92,7 +92,7 @@
                                     {{/ core/hover_tooltip }}
                                 {{/loggedin}}
                             </div>
-                            <div class="span6 col-xs-6">
+                            <div class="col-xs-6">
                                 {{#loggedoff}}
                                     {{< core/hover_tooltip }}
                                         {{$anchor}}
-- 
2.17.1