Make radio select work w/ new checkboxes/radios

The visual appearance of radio and checkbox form inputs changed in
GOV.UK Elements here:

https://github.com/alphagov/govuk_elements/pull/296

This was subsequently reimplemented with different markup and no
Javascript here:
https://github.com/alphagov/govuk_elements/pull/406

This has meant making the following changes to our app:
- changing the markup in our radio/checkbox macros to match the example
  markup given by GOV.UK Elements
- removing the previous Javascript file because it’s no longer needed to
  make the radios appear visual selected
- making the buttons on the scheduled job picker look like links,
  because the grey button style looked weird with the new radio buttons

app/templates/components/checkbox.html

@@ -1,29 +1,22 @@
 {% macro checkbox(
   field,
   hint=False,
-  help_link=None,
-  help_link_text=None,
-  width='2-3',
-  suffix=None,
-  block=False
+  width='2-3'
 ) %}
-    <label class="{% if block %}block-label{% endif %}" for="{{ field.name }}">
-        {{ field()}}
-        {{ field.label.text }}
-        {% if hint %}
-            <span class="form-hint">
-                {{ hint }}
-            </span>
-        {% endif %}
-        {% if field.errors %}
-            <span class="error-message">
-                {{ field.errors[0] }}
-            </span>
-        {% endif %}
-        {% if help_link and help_link_text %}
-            <p class="textbox-help-link">
-                <a href='{{ help_link }}'>{{ help_link_text }}</a>
-            </p>
-        {% endif %}
+  <div class="multiple-choice">
+    <input
+      id="{{ field.id }}" name="{{ field.name }}" type="checkbox" value="{{ field.data }}"
+      {% if field.checked %}
+        checked
+      {% endif %}
+    >
+    <label for="{{ field.id }}">
+      {{ field.label.text }}
+      {% if hint %}
+        <div class="hint">
+          {{ hint }}
+        </div>
+      {% endif %}
     </label>
+  </div>
 {% endmacro %}

app/templates/components/radios.html

@@ -15,7 +15,7 @@
         {% endif %}
       </legend>
       {% for option in field %}
-        <label class="block-label" for="{{ option.id }}">
+        <div class="multiple-choice">
           <input
             id="{{ option.id }}" name="{{ option.name }}" type="radio" value="{{ option.data }}"
             {% if option.data in disable %}
@@ -25,13 +25,15 @@
               checked
             {% endif %}
           >
-          {{ option.label.text }}
-          {% if option_hints[option.data] %}
-            <div class="block-label-hint">
-              {{ option_hints[option.data] }}
-            </div>
-          {% endif %}
-        </label>
+          <label class="block-label" for="{{ option.id }}">
+            {{ option.label.text }}
+            {% if option_hints[option.data] %}
+              <div class="block-label-hint">
+                {{ option_hints[option.data] }}
+              </div>
+            {% endif %}
+          </label>
+        </div>
       {% endfor %}
     </fieldset>
   </div>
@@ -56,10 +58,12 @@
      <div class="radio-select" data-module="radio-select" data-categories="{{ field.categories|join(',') }}">
        <div class="radio-select-column">
        {% for option in field %}
-         <label class="block-label" for="{{ option.id }}">
+         <div class="multiple-choice">
            {{ option }}
-           {{ option.label.text }}
-         </label>
+           <label for="{{ option.id }}">
+             {{ option.label.text }}
+           </label>
+         </div>
          {% if loop.first %}
        </div>
        <div class="radio-select-column">
@@ -88,7 +92,7 @@
         {% endif %}
       </legend>
       {% for value, option, checked in field.iter_choices() %}
-        <label class="block-label" for="{{ field.name }}-{{ loop.index }}">
+        <div class="multiple-choice">
           <input
             type="radio"
             name="{{ field.name }}"
@@ -96,17 +100,19 @@
             value="{{ value }}"
             {% if checked %}checked="checked"{% endif %}
           />
-          {% if branding_dict.get(value, {}).get('colour') %}
-            <span style="background: {{ branding_dict[value].colour }}; display: inline-block; width: 3px; height: 27px"></span>
-          {% endif %}
-          {% if branding_dict.get(value, {}).get('logo') %}
-            <img
-              src="{{ branding_dict[value].logo }}"
-              height="27"
-            />
-          {% endif %}
-          {{option}}
-        </label>
+          <label class="block-label" for="{{ field.name }}-{{ loop.index }}">
+            {% if branding_dict.get(value, {}).get('colour') %}
+              <span style="background: {{ branding_dict[value].colour }}; display: inline-block; width: 3px; height: 27px"></span>
+            {% endif %}
+            {% if branding_dict.get(value, {}).get('logo') %}
+              <img
+                src="{{ branding_dict[value].logo }}"
+                height="27"
+              />
+            {% endif %}
+            {{option}}
+          </label>
+        </div>
       {% endfor %}
     </fieldset>
   </div>