From 23ec46141b5aec3e6b13c5a78ddc347ba77df1d6 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Mon, 11 Feb 2019 10:34:48 -0500
Subject: [PATCH] Update checkbox macro to accept label

---
 templates/components/checkbox_input.html          | 10 ++++++++--
 templates/portfolios/task_orders/invitations.html | 10 +---------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/templates/components/checkbox_input.html b/templates/components/checkbox_input.html
index 9fe38075..613cf337 100644
--- a/templates/components/checkbox_input.html
+++ b/templates/components/checkbox_input.html
@@ -1,11 +1,17 @@
-{% macro CheckboxInput(field, inline=False, classes="") -%}
+{% macro CheckboxInput(
+  field,
+  label=field.label | striptags,
+  inline=False,
+  classes="") -%}
   <checkboxinput name='{{ field.name }}' inline-template key='{{ field.name }}'>
     <div class='usa-input {{ classes }} {% if field.errors %}usa-input--error{% endif %}'>
 
       <fieldset v-on:change="onInput" class="usa-input__choices {% if inline %}usa-input__choices--inline{% endif %}">
         <legend>
           {{ field() }}
-          {{ field.label }}
+          <label for={{field.name}}>
+            {{ label }}
+          </label>
 
           {% if field.description %}
             <span class='usa-input__help'>{{ field.description | safe }}</span>
diff --git a/templates/portfolios/task_orders/invitations.html b/templates/portfolios/task_orders/invitations.html
index 5b6ae798..b4c32c8d 100644
--- a/templates/portfolios/task_orders/invitations.html
+++ b/templates/portfolios/task_orders/invitations.html
@@ -43,15 +43,7 @@
         <div class="form-col">
           {% if not invited %}
             <div class='form-row'>
-              <div class='usa-input'>
-
-                <fieldset v-on:change="onInput" class="usa-input__choices">
-                  <legend>
-                    {{ form.invite }}
-                    <label for="contracting_officer-invite">{{ ("forms.officers." + officer_type + "_invite") | translate }}</label>
-                  </legend>
-                </fieldset>
-              </div>
+              {{ CheckboxInput(form.invite, label=(("forms.officers." + officer_type + "_invite") | translate)) }}
             </div>
           {% endif %}
           <div class='form-row'>