From d5e6b1129640c812d6beabb633a3614344da4508 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Thu, 25 Jul 2019 11:33:25 -0400
Subject: [PATCH 1/2] Update template to check if user has app settings perms
 for showing the form

---
 .../portfolios/applications/settings.html     | 92 ++++++++++++-------
 1 file changed, 59 insertions(+), 33 deletions(-)

diff --git a/templates/portfolios/applications/settings.html b/templates/portfolios/applications/settings.html
index e43a9c34..5ead4ad9 100644
--- a/templates/portfolios/applications/settings.html
+++ b/templates/portfolios/applications/settings.html
@@ -13,53 +13,79 @@
 
   <div class='subheading'>{{ 'portfolios.applications.settings_heading' | translate }}</div>
 
-  <form method="POST" action="{{ url_for('applications.update', application_id=application.id) }}">
+  {% if user_can(permissions.EDIT_APPLICATION) %}
+    <form method="POST" action="{{ url_for('applications.update', application_id=application.id) }}">
+      <div class="panel">
+        <div class="panel__content">
+
+          {{ application_form.csrf_token }}
+          <p>
+            {{ "fragments.edit_application_form.explain" | translate }}
+          </p>
+          <div class="form-row">
+            <div class="form-col form-col--two-thirds">
+              {{ TextInput(application_form.name) }}
+            </div>
+            <div class="form-col form-col--third">
+              {% if user_can(permissions.DELETE_APPLICATION) %}
+                <div class="usa-input">
+                  <label for="delete-application">
+                    <div class="usa-input__title">
+                      &nbsp;
+                    </div>
+                  </label>
+                  <input
+                    id="delete-application"
+                    type="button"
+                    v-on:click="openModal('delete-application')"
+                    class='usa-button button-danger-outline'
+                    value="{{ 'portfolios.applications.delete.button' | translate }}"
+                    >
+                </div>
+              {% endif %}
+            </div>
+          </div>
+          <div class="form-row">
+            <div class="form-col form-col--two-thirds">
+              {{ TextInput(application_form.description, paragraph=True) }}
+            </div>
+            <div class="form-col form-col--third">
+              &nbsp;
+            </div>
+          </div>
+        </div>
+        <div class="panel__footer">
+          <div class="action-group">
+            <button class="usa-button usa-button-primary" tabindex="0" type="submit">{{ 'portfolios.applications.update_button_text' | translate }}</button>
+          </div>
+        </div>
+      </div>
+    </form>
+  {% else %}
     <div class="panel">
       <div class="panel__content">
-
-        {{ application_form.csrf_token }}
         <p>
           {{ "fragments.edit_application_form.explain" | translate }}
         </p>
         <div class="form-row">
-          <div class="form-col form-col--two-thirds">
-            {{ TextInput(application_form.name) }}
-          </div>
-          <div class="form-col form-col--third">
-            {% if user_can(permissions.DELETE_APPLICATION) %}
-            <div class="usa-input">
-              <label for="delete-application">
-                <div class="usa-input__title">
-                  &nbsp;
-                </div>
-              </label>
-              <input
-                id="delete-application"
-                type="button"
-                v-on:click="openModal('delete-application')"
-                class='usa-button button-danger-outline'
-                value="{{ "portfolios.applications.delete.button" | translate }}"
-              >
+          <div class="form-col">
+            <div class="usa-input usa-input__title">
+              {{ application_form.name.label() }}
+              {{ application_form.name.data }}
             </div>
-            {% endif %}
           </div>
         </div>
         <div class="form-row">
-          <div class="form-col form-col--two-thirds">
-            {{ TextInput(application_form.description, paragraph=True) }}
+          <div class="form-col">
+            <div class="usa-input usa-input__title">
+              {{ application_form.description.label() }}
+              {{ application_form.description.data }}
+            </div>
           </div>
-          <div class="form-col form-col--third">
-            &nbsp;
-          </div>
-        </div>
-      </div>
-      <div class="panel__footer">
-        <div class="action-group">
-          <button class="usa-button usa-button-primary" tabindex="0" type="submit">{{ 'portfolios.applications.update_button_text' | translate }}</button>
         </div>
       </div>
     </div>
-  </form>
+  {% endif %}
 
   <div id="application-environments">
     <div class="accordion-table responsive-table-wrapper panel">

From 2252f656d52a5acfc61dd9dbb9173d419c6c1a91 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Fri, 26 Jul 2019 10:23:42 -0400
Subject: [PATCH 2/2] Remove non breaking spaces

---
 styles/components/_portfolio_layout.scss        |  4 ++++
 templates/portfolios/applications/settings.html | 15 +--------------
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss
index 347e77fc..6e8b6c3b 100644
--- a/styles/components/_portfolio_layout.scss
+++ b/styles/components/_portfolio_layout.scss
@@ -314,6 +314,10 @@
       padding-bottom: 0;
       padding-top: 0;
     }
+
+    input#delete-application {
+      margin-top: $gap * 3;
+    }
   }
 
   .activity-log {
diff --git a/templates/portfolios/applications/settings.html b/templates/portfolios/applications/settings.html
index 5ead4ad9..711eff33 100644
--- a/templates/portfolios/applications/settings.html
+++ b/templates/portfolios/applications/settings.html
@@ -17,7 +17,6 @@
     <form method="POST" action="{{ url_for('applications.update', application_id=application.id) }}">
       <div class="panel">
         <div class="panel__content">
-
           {{ application_form.csrf_token }}
           <p>
             {{ "fragments.edit_application_form.explain" | translate }}
@@ -25,15 +24,11 @@
           <div class="form-row">
             <div class="form-col form-col--two-thirds">
               {{ TextInput(application_form.name) }}
+              {{ TextInput(application_form.description, paragraph=True) }}
             </div>
             <div class="form-col form-col--third">
               {% if user_can(permissions.DELETE_APPLICATION) %}
                 <div class="usa-input">
-                  <label for="delete-application">
-                    <div class="usa-input__title">
-                      &nbsp;
-                    </div>
-                  </label>
                   <input
                     id="delete-application"
                     type="button"
@@ -45,14 +40,6 @@
               {% endif %}
             </div>
           </div>
-          <div class="form-row">
-            <div class="form-col form-col--two-thirds">
-              {{ TextInput(application_form.description, paragraph=True) }}
-            </div>
-            <div class="form-col form-col--third">
-              &nbsp;
-            </div>
-          </div>
         </div>
         <div class="panel__footer">
           <div class="action-group">