From a6e7dfda133e56370d018609f9fc07a972586e1f Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Tue, 4 Feb 2020 13:51:28 -0500
Subject: [PATCH] Apply .action-group-footer updates to the New application
 builder

---
 templates/applications/new/step_1.html | 20 ++++++++++--------
 templates/applications/new/step_2.html | 28 +++++++++++++++-----------
 templates/applications/new/step_3.html | 26 ++++++++++++++----------
 3 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/templates/applications/new/step_1.html b/templates/applications/new/step_1.html
index d06ddee0..3841bf96 100644
--- a/templates/applications/new/step_1.html
+++ b/templates/applications/new/step_1.html
@@ -39,14 +39,18 @@
       </div>
 
 
-      <span class="action-group-footer">
-        {% block next_button %}
-          {{ SaveButton(text=('portfolios.applications.new.step_1_button_text' | translate)) }}
-        {% endblock %}
-        <a href="{{ url_for('applications.portfolio_applications', portfolio_id=portfolio.id) }}">
-          Cancel
-        </a>
-      </span>
+      <div
+        class="action-group-footer"
+        v-bind:class="{'action-group-footer--expand-offset': this.$root.sidenavExpanded, 'action-group-footer--collapse-offset': !this.$root.sidenavExpanded}">
+        <div class="action-group-footer--container">
+          {% block next_button %}
+            {{ SaveButton(text=('portfolios.applications.new.step_1_button_text' | translate)) }}
+          {% endblock %}
+          <a href="{{ url_for('applications.portfolio_applications', portfolio_id=portfolio.id) }}">
+            Cancel
+          </a>
+        </div>
+      </div>
     </form>
   </base-form>
 
diff --git a/templates/applications/new/step_2.html b/templates/applications/new/step_2.html
index 462c0f46..2cd5cf98 100644
--- a/templates/applications/new/step_2.html
+++ b/templates/applications/new/step_2.html
@@ -58,20 +58,24 @@
                 {{ Icon("plus") }}
               </button>
             </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="action-group-footer"
+        v-bind:class="{'action-group-footer--expand-offset': this.$root.sidenavExpanded, 'action-group-footer--collapse-offset': !this.$root.sidenavExpanded}">
+        <div class="action-group-footer--container">
+          {% block next_button %}
+            {{ SaveButton(text=('portfolios.applications.new.step_2_button_text' | translate)) }}
+          {% endblock %}
+          <a class="usa-button usa-button-secondary" href="{{ url_for('applications.view_new_application_step_1', application_id=application.id) }}">
+            Previous
+          </a>
+          <a href="{{ url_for('applications.portfolio_applications', portfolio_id=portfolio.id) }}">
+            Cancel
+          </a>
         </div>
       </div>
-    </div>
-      <span class="action-group-footer">
-        {% block next_button %}
-          {{ SaveButton(text=('portfolios.applications.new.step_2_button_text' | translate)) }}
-        {% endblock %}
-        <a class="usa-button usa-button-secondary" href="{{ url_for('applications.view_new_application_step_1', application_id=application.id) }}">
-          Previous
-        </a>
-        <a href="{{ url_for('applications.portfolio_applications', portfolio_id=portfolio.id) }}">
-          Cancel
-        </a>
-      </span>
     </form>
   </application-environments>
 
diff --git a/templates/applications/new/step_3.html b/templates/applications/new/step_3.html
index d88a704c..35af10fa 100644
--- a/templates/applications/new/step_3.html
+++ b/templates/applications/new/step_3.html
@@ -25,16 +25,20 @@
     action_update="applications.update_new_application_step_3") }}
 
 
-  <span class="action-group-footer">
-    <a class="usa-button" href="{{ url_for('applications.settings', application_id=application_id) }}">
-      {{ "portfolios.applications.new.step_3_button_text" | translate }}
-    </a>
-    <a class="usa-button usa-button-secondary" href="{{ url_for('applications.view_new_application_step_2', application_id=application.id) }}">
-      {{ "common.previous" | translate }}
-    </a>
-    <a href="{{ url_for('applications.portfolio_applications', portfolio_id=portfolio.id) }}">
-      {{ "common.cancel" | translate }}
-    </a>
-  </span>
+  <div
+    class="action-group-footer"
+    v-bind:class="{'action-group-footer--expand-offset': this.$root.sidenavExpanded, 'action-group-footer--collapse-offset': !this.$root.sidenavExpanded}">
+    <div class="action-group-footer--container">
+      <a class="usa-button" href="{{ url_for('applications.settings', application_id=application_id) }}">
+        {{ "portfolios.applications.new.step_3_button_text" | translate }}
+      </a>
+      <a class="usa-button usa-button-secondary" href="{{ url_for('applications.view_new_application_step_2', application_id=application.id) }}">
+        {{ "common.previous" | translate }}
+      </a>
+      <a href="{{ url_for('applications.portfolio_applications', portfolio_id=portfolio.id) }}">
+        {{ "common.cancel" | translate }}
+      </a>
+    </div>
+  </div>
 
 {% endblock %}