From edd837038ad1bdb7cde51fc708034db94811a856 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Mudr=C3=A1k?= <david@moodle.com>
Date: Thu, 24 Nov 2016 22:32:49 +0100
Subject: [PATCH 1/2] MDL-56800 theme_boost: Display frozen form's radios as
 disabled

For frozen (read-only) forms, the radio widget was not displayed at all
and only the legend text was displayed. So it was not possible to see
which one of the radios in a group was selected.

This patch mimics the original quick form rendering and displays the
radio as disabled.
---
 theme/boost/templates/core_form/element-radio-inline.mustache | 3 +--
 theme/boost/templates/core_form/element-radio.mustache        | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/theme/boost/templates/core_form/element-radio-inline.mustache b/theme/boost/templates/core_form/element-radio-inline.mustache
index 509c6d76e92..5e12788a580 100644
--- a/theme/boost/templates/core_form/element-radio-inline.mustache
+++ b/theme/boost/templates/core_form/element-radio-inline.mustache
@@ -12,15 +12,14 @@
 
 }}
 <label class="form-check-inline {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
-{{^element.frozen}}
 <input type="radio" name="{{element.name}}"
     id="{{element.id}}" value="{{element.value}}" size="{{element.size}}"
     {{#element.checked}}checked{{/element.checked}}
+    {{#element.frozen}}disabled{{/element.frozen}}
     {{#error}}
         autofocus aria-describedby="id_error_{{element.name}}"
     {{/error}}
     {{{element.attributes}}} >
-{{/element.frozen}}
     {{{label}}}
 </label> {{{helpbutton}}}
 <span class="form-control-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}>
diff --git a/theme/boost/templates/core_form/element-radio.mustache b/theme/boost/templates/core_form/element-radio.mustache
index 7a64ad5f8ad..2ac8577554e 100644
--- a/theme/boost/templates/core_form/element-radio.mustache
+++ b/theme/boost/templates/core_form/element-radio.mustache
@@ -14,14 +14,13 @@
 <div class="form-group row {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
     <div class="col-md-9 push-md-3 checkbox">
         <label>
-        {{^element.frozen}}
         <input type="radio" name="{{element.name}}"
             id="{{element.id}}" value="{{element.value}}" size="{{element.size}}"
             {{#element.checked}}checked{{/element.checked}}
+            {{#element.frozen}}disabled{{/element.frozen}}
             {{#error}}
                 autofocus aria-describedby="id_error_{{element.name}}"
             {{/error}} {{{element.attributes}}} >
-        {{/element.frozen}}
             {{{label}}}
         </label> {{{helpbutton}}}
         <div class="form-control-feedback" id="id_error_{{element.name}}" {{^error}} style="display: none;"{{/error}}>

From c03f1de198d724cd1676c427bfae6838274c4edd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Mudr=C3=A1k?= <david@moodle.com>
Date: Thu, 24 Nov 2016 23:50:21 +0100
Subject: [PATCH 2/2] MDL-56800 theme_boost: Clean up rendering of the radio
 buttons

The <input type="radio"> element does not support the size attribute so
there is no point of rendering it. Also fixed the example data as the
field name must not contain any whitespace.
---
 .../templates/core_form/element-radio-inline.mustache      | 7 +++----
 theme/boost/templates/core_form/element-radio.mustache     | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/theme/boost/templates/core_form/element-radio-inline.mustache b/theme/boost/templates/core_form/element-radio-inline.mustache
index 5e12788a580..4fd526084ce 100644
--- a/theme/boost/templates/core_form/element-radio-inline.mustache
+++ b/theme/boost/templates/core_form/element-radio-inline.mustache
@@ -4,16 +4,15 @@
    Example context (json):
    {
     "element": {
-        "id": "test-radio",
-        "name": "Test radio button",
-        "size": "10"
+        "id": "id_test_radio0",
+        "name": "test_radio_button"
       }
    }
 
 }}
 <label class="form-check-inline {{#error}}has-danger{{/error}} fitem {{#advanced}}advanced{{/advanced}} {{{element.extraclasses}}}">
 <input type="radio" name="{{element.name}}"
-    id="{{element.id}}" value="{{element.value}}" size="{{element.size}}"
+    id="{{element.id}}" value="{{element.value}}"
     {{#element.checked}}checked{{/element.checked}}
     {{#element.frozen}}disabled{{/element.frozen}}
     {{#error}}
diff --git a/theme/boost/templates/core_form/element-radio.mustache b/theme/boost/templates/core_form/element-radio.mustache
index 2ac8577554e..1e5e3a3cf7f 100644
--- a/theme/boost/templates/core_form/element-radio.mustache
+++ b/theme/boost/templates/core_form/element-radio.mustache
@@ -4,9 +4,8 @@
     Example context (json):
     {
         "element": {
-            "id": "test-radio",
-            "name": "Test radio button",
-            "size": "10"
+            "id": "id_test_radio0",
+            "name": "test_radio_button"
         }
     }
 
@@ -15,7 +14,7 @@
     <div class="col-md-9 push-md-3 checkbox">
         <label>
         <input type="radio" name="{{element.name}}"
-            id="{{element.id}}" value="{{element.value}}" size="{{element.size}}"
+            id="{{element.id}}" value="{{element.value}}"
             {{#element.checked}}checked{{/element.checked}}
             {{#element.frozen}}disabled{{/element.frozen}}
             {{#error}}