From 6c1967af5451cb479bf6d52986898aa21b1a87ab Mon Sep 17 00:00:00 2001
From: Mathew May <mathewm@hotmail.co.nz>
Date: Mon, 18 Feb 2019 11:51:39 +0800
Subject: [PATCH] MDL-58428 theme: Move templates from blocks/search_forums

---
 .../templates/search_form.mustache            | 27 ++++++++++---------
 .../block_search_forums/search_form.mustache  | 18 -------------
 .../block_search_forums/search_form.mustache  | 15 +++++++++++
 3 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 theme/boost/templates/block_search_forums/search_form.mustache
 create mode 100644 theme/bootstrapbase/templates/block_search_forums/search_form.mustache

diff --git a/blocks/search_forums/templates/search_form.mustache b/blocks/search_forums/templates/search_form.mustache
index 9f0411f51b8..0dc8b87a96d 100644
--- a/blocks/search_forums/templates/search_form.mustache
+++ b/blocks/search_forums/templates/search_form.mustache
@@ -1,15 +1,18 @@
 <div class="searchform">
-    <form action="{{actionurl}}" style="display: inline;">
-        <fieldset class="invisiblefieldset">
-            <legend class="accesshide">{{#str}}search{{/str}}</legend>
-            <input type="hidden" name="id" value="{{courseid}}">
-            <label class="accesshide" for="searchform_search">{{#str}}search{{/str}}</label>
-            <input id="searchform_search" name="search" type="text" size="16">
-            <button id="searchform_button" type="submit" title={{#quote}}{{#str}}search{{/str}}{{/quote}}>{{#str}}go{{/str}}</button><br>
-            <a href="{{advancedsearchurl}}">{{#str}}advancedsearch, block_search_forums{{/str}}</a>
-            {{#helpicon}}
-                {{>core/help_icon}}
-            {{/helpicon}}
-        </fieldset>
+    <form action="{{actionurl}}" class="form-inline">
+        <input type="hidden" name="id" value="{{courseid}}">
+        <div class="input-group w-100">
+            <label class="sr-only" for="searchform_search">{{#str}}search{{/str}}</label>
+            <input id="searchform_search" name="search" type="text" class="form-control" size="10">
+            <div class="input-group-append">
+                <button class="btn btn-secondary" id="searchform_button" type="submit">{{#str}}go{{/str}}</button>
+            </div>
+        </div>
     </form>
+    <div class="mt-3">
+        <a href="{{advancedsearchurl}}">{{#str}}advancedsearch, block_search_forums{{/str}}</a>
+        {{#helpicon}}
+            {{>core/help_icon}}
+        {{/helpicon}}
+    </div>
 </div>
diff --git a/theme/boost/templates/block_search_forums/search_form.mustache b/theme/boost/templates/block_search_forums/search_form.mustache
deleted file mode 100644
index 0dc8b87a96d..00000000000
--- a/theme/boost/templates/block_search_forums/search_form.mustache
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="searchform">
-    <form action="{{actionurl}}" class="form-inline">
-        <input type="hidden" name="id" value="{{courseid}}">
-        <div class="input-group w-100">
-            <label class="sr-only" for="searchform_search">{{#str}}search{{/str}}</label>
-            <input id="searchform_search" name="search" type="text" class="form-control" size="10">
-            <div class="input-group-append">
-                <button class="btn btn-secondary" id="searchform_button" type="submit">{{#str}}go{{/str}}</button>
-            </div>
-        </div>
-    </form>
-    <div class="mt-3">
-        <a href="{{advancedsearchurl}}">{{#str}}advancedsearch, block_search_forums{{/str}}</a>
-        {{#helpicon}}
-            {{>core/help_icon}}
-        {{/helpicon}}
-    </div>
-</div>
diff --git a/theme/bootstrapbase/templates/block_search_forums/search_form.mustache b/theme/bootstrapbase/templates/block_search_forums/search_form.mustache
new file mode 100644
index 00000000000..9f0411f51b8
--- /dev/null
+++ b/theme/bootstrapbase/templates/block_search_forums/search_form.mustache
@@ -0,0 +1,15 @@
+<div class="searchform">
+    <form action="{{actionurl}}" style="display: inline;">
+        <fieldset class="invisiblefieldset">
+            <legend class="accesshide">{{#str}}search{{/str}}</legend>
+            <input type="hidden" name="id" value="{{courseid}}">
+            <label class="accesshide" for="searchform_search">{{#str}}search{{/str}}</label>
+            <input id="searchform_search" name="search" type="text" size="16">
+            <button id="searchform_button" type="submit" title={{#quote}}{{#str}}search{{/str}}{{/quote}}>{{#str}}go{{/str}}</button><br>
+            <a href="{{advancedsearchurl}}">{{#str}}advancedsearch, block_search_forums{{/str}}</a>
+            {{#helpicon}}
+                {{>core/help_icon}}
+            {{/helpicon}}
+        </fieldset>
+    </form>
+</div>
-- 
2.17.1