From 52ee200368f3b2fb99384bc79a79c1e8246551cc Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Thu, 1 Dec 2016 09:48:06 +0800
Subject: [PATCH 1/2] MDL-57220 boost: minimal fix for radio button template

It still does not match
http://v4-alpha.getbootstrap.com/components/forms/#radios
but I don't want to make radical changes before 3.2 release.
---
 theme/boost/templates/core_form/element-radio-inline.mustache | 2 +-
 theme/boost/templates/core_form/element-radio.mustache        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/theme/boost/templates/core_form/element-radio-inline.mustache b/theme/boost/templates/core_form/element-radio-inline.mustache
index e0f5b3aca86..07b51291480 100644
--- a/theme/boost/templates/core_form/element-radio-inline.mustache
+++ b/theme/boost/templates/core_form/element-radio-inline.mustache
@@ -10,7 +10,7 @@
    }
 
 }}
-<label class="form-check-inline {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
+<label class="form-check-inline form-check-label {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
 {{^element.hardfrozen}}{{#element.frozen}}{{#element.checked}}
     <input type="hidden" name="{{element.name}}" value="{{element.value}}">
 {{/element.checked}}{{/element.frozen}}{{/element.hardfrozen}}
diff --git a/theme/boost/templates/core_form/element-radio.mustache b/theme/boost/templates/core_form/element-radio.mustache
index 2de3ff0782c..e5910b21c87 100644
--- a/theme/boost/templates/core_form/element-radio.mustache
+++ b/theme/boost/templates/core_form/element-radio.mustache
@@ -19,7 +19,7 @@
         {{/text}}
     </div>
     <div class="col-md-9 checkbox">
-        <label>
+        <label class="form-check-label">
         {{^element.hardfrozen}}{{#element.frozen}}{{#element.checked}}
             <input type="hidden" name="{{element.name}}" value="{{element.value}}">
         {{/element.checked}}{{/element.frozen}}{{/element.hardfrozen}}

From ef06bc18b075c08ff9ed5b2daa979df53c9657b9 Mon Sep 17 00:00:00 2001
From: Damyon Wiese <damyon@moodle.com>
Date: Thu, 1 Dec 2016 09:48:59 +0800
Subject: [PATCH 2/2] MDL-57220 boost: Fix for date selector inline template

It was putting the label on a separate line.
---
 .../core_form/element-date_selector-inline.mustache    | 10 ++++++++++
 .../templates/core_form/element-date_selector.mustache |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)
 create mode 100644 theme/boost/templates/core_form/element-date_selector-inline.mustache

diff --git a/theme/boost/templates/core_form/element-date_selector-inline.mustache b/theme/boost/templates/core_form/element-date_selector-inline.mustache
new file mode 100644
index 00000000000..8a06ef7c173
--- /dev/null
+++ b/theme/boost/templates/core_form/element-date_selector-inline.mustache
@@ -0,0 +1,10 @@
+{{< core_form/element-template-inline }}
+    {{$element}}
+        <span class="fdate_selector">
+        {{#element.elements}}
+            {{{separator}}}
+            {{{html}}}
+        {{/element.elements}}
+        </span>
+    {{/element}}
+{{/ core_form/element-template-inline }}
diff --git a/theme/boost/templates/core_form/element-date_selector.mustache b/theme/boost/templates/core_form/element-date_selector.mustache
index 8fccbc98d3d..470fa812f77 100644
--- a/theme/boost/templates/core_form/element-date_selector.mustache
+++ b/theme/boost/templates/core_form/element-date_selector.mustache
@@ -1,10 +1,10 @@
 {{< core_form/element-template }}
     {{$element}}
-        <div class="fdate_selector">
+        <span class="fdate_selector">
         {{#element.elements}}
             {{{separator}}}
             {{{html}}}
         {{/element.elements}}
-        </div>
+        </span>
     {{/element}}
 {{/ core_form/element-template }}