From f3ea704c1bf17f6d099a6da80f2f581c44abe50f Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Thu, 4 Apr 2019 13:29:15 -0400
Subject: [PATCH] Update SaveButton to be either an input or a button element,
 and restore inputs that were previously switched to buttons

---
 templates/components/save_button.html                  | 10 ++++++----
 templates/portfolios/task_orders/invitations.html      |  2 +-
 templates/portfolios/task_orders/review.html           |  2 +-
 templates/portfolios/task_orders/so_review.html        |  2 +-
 templates/task_orders/signing/signature_requested.html |  2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/templates/components/save_button.html b/templates/components/save_button.html
index 0735cd8c..fbd6f56f 100644
--- a/templates/components/save_button.html
+++ b/templates/components/save_button.html
@@ -1,6 +1,8 @@
-{% macro SaveButton(text, additional_classes="") -%}
+{% macro SaveButton(text, element="button", additional_classes="", other_attrs="") -%}
   {% set class = "usa-button usa-button-primary" + additional_classes %}
-  <button type="submit" class="{{ class }}" tabindex="0" v-bind:disabled="!changed">
-    {{ text }}
-  </button>
+  <{{ element }} type="submit" class="{{ class }}" tabindex="0" v-bind:disabled="!changed" value="{{ text }}" {{ other_attrs }}>
+    {% if element == 'button'%}
+      {{ text }}
+    {% endif %}
+  </{{ element }}>
 {%- endmacro %}
diff --git a/templates/portfolios/task_orders/invitations.html b/templates/portfolios/task_orders/invitations.html
index a45a83fa..e7b0b75a 100644
--- a/templates/portfolios/task_orders/invitations.html
+++ b/templates/portfolios/task_orders/invitations.html
@@ -60,7 +60,7 @@
             {{ Icon("x") }}
             <span>Cancel</span>
           </a>
-          {{ SaveButton(text='Save Changes') }}
+          {{ SaveButton(text='Save Changes', element="input") }}
         </div>
       </div>
     </template>
diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html
index 8e86a66a..3256baf2 100644
--- a/templates/portfolios/task_orders/review.html
+++ b/templates/portfolios/task_orders/review.html
@@ -103,7 +103,7 @@
       {% endblock %}
 
       <div class='action-group'>
-        {{ SaveButton(text="Continue") }}
+        {{ SaveButton(text="Continue", element="input") }}
       </div>
 
     </form>
diff --git a/templates/portfolios/task_orders/so_review.html b/templates/portfolios/task_orders/so_review.html
index d62f1aa2..7659656f 100644
--- a/templates/portfolios/task_orders/so_review.html
+++ b/templates/portfolios/task_orders/so_review.html
@@ -32,7 +32,7 @@
           {{ MultiCheckboxInput(form.required_distribution) }}
 
           <div class="action-group">
-            {{ SaveButton(text='Continue') }}
+            {{ SaveButton(text='Continue', additional_classes="usa-button-big") }}
           </div>
         </form>
       </div>
diff --git a/templates/task_orders/signing/signature_requested.html b/templates/task_orders/signing/signature_requested.html
index 1047de40..fa22b52b 100644
--- a/templates/task_orders/signing/signature_requested.html
+++ b/templates/task_orders/signing/signature_requested.html
@@ -39,7 +39,7 @@
           </div>
         </div>
         <div class="action-group">
-          {{ SaveButton(text=('common.sign' | translate)) }}
+          {{ SaveButton(text=('common.sign' | translate), additional_classes="usa-button-big") }}
           <a
             href="{{ url_for("portfolios.ko_review", portfolio_id=portfolio_id, task_order_id=task_order_id) }}"
             class="action-group__action icon-link">