From f03acadc0979d261d6427f653cf492f6c1306ccc Mon Sep 17 00:00:00 2001
From: Mathew May <mathewm@hotmail.co.nz>
Date: Fri, 22 Feb 2019 15:26:09 +0800
Subject: [PATCH] MDL-58428 theme: Move templates from admin/tool/lp

---
 admin/tool/lp/templates/progress_bar.mustache  | 18 ++++--------------
 .../templates/tool_lp/progress_bar.mustache    | 18 ++++++++++++++----
 2 files changed, 18 insertions(+), 18 deletions(-)
 rename theme/{boost => bootstrapbase}/templates/tool_lp/progress_bar.mustache (69%)

diff --git a/admin/tool/lp/templates/progress_bar.mustache b/admin/tool/lp/templates/progress_bar.mustache
index 118f76188e5..b7029db6512 100644
--- a/admin/tool/lp/templates/progress_bar.mustache
+++ b/admin/tool/lp/templates/progress_bar.mustache
@@ -20,7 +20,6 @@
     Moodle progress bar template for tool_lp.
 
     The purpose of this template is to render a progress bar with a brief description.
-    Inherits core/columns-1to2.
 
     Classes required for JS:
     * none
@@ -41,17 +40,8 @@
     }
 
 }}
-<div class="row-fluid rtl-compatible">
-    <div class="span4">
-        <div class="progresstext">
-            {{$progresstext}}{{progresstextvalue}}{{/progresstext}}
-        </div>
-    </div>
-    <div class="span8">
-        <div class="progress">
-            <div class="bar" style="width: {{$percentage}}{{percentagevalue}}{{/percentage}}%;" role="progressbar" aria-valuenow="{{$percentage}}{{percentagevalue}}{{/percentage}}" aria-valuemin="0" aria-valuemax="100">
-                {{$percentlabel}}{{percentlabelvalue}}{{/percentlabel}}
-            </div>
-        </div>
-    </div>
+<div id="progress-{{uniqid}}">
+    {{$progresstext}}{{progresstextvalue}}{{/progresstext}}
 </div>
+<progress class="progress" aria-describedby="progress-{{uniqid}}"
+    value="{{$percentage}}{{percentagevalue}}{{/percentage}}" max="100"></progress>
diff --git a/theme/boost/templates/tool_lp/progress_bar.mustache b/theme/bootstrapbase/templates/tool_lp/progress_bar.mustache
similarity index 69%
rename from theme/boost/templates/tool_lp/progress_bar.mustache
rename to theme/bootstrapbase/templates/tool_lp/progress_bar.mustache
index b7029db6512..118f76188e5 100644
--- a/theme/boost/templates/tool_lp/progress_bar.mustache
+++ b/theme/bootstrapbase/templates/tool_lp/progress_bar.mustache
@@ -20,6 +20,7 @@
     Moodle progress bar template for tool_lp.
 
     The purpose of this template is to render a progress bar with a brief description.
+    Inherits core/columns-1to2.
 
     Classes required for JS:
     * none
@@ -40,8 +41,17 @@
     }
 
 }}
-<div id="progress-{{uniqid}}">
-    {{$progresstext}}{{progresstextvalue}}{{/progresstext}}
+<div class="row-fluid rtl-compatible">
+    <div class="span4">
+        <div class="progresstext">
+            {{$progresstext}}{{progresstextvalue}}{{/progresstext}}
+        </div>
+    </div>
+    <div class="span8">
+        <div class="progress">
+            <div class="bar" style="width: {{$percentage}}{{percentagevalue}}{{/percentage}}%;" role="progressbar" aria-valuenow="{{$percentage}}{{percentagevalue}}{{/percentage}}" aria-valuemin="0" aria-valuemax="100">
+                {{$percentlabel}}{{percentlabelvalue}}{{/percentlabel}}
+            </div>
+        </div>
+    </div>
 </div>
-<progress class="progress" aria-describedby="progress-{{uniqid}}"
-    value="{{$percentage}}{{percentagevalue}}{{/percentage}}" max="100"></progress>