From d5e6b1129640c812d6beabb633a3614344da4508 Mon Sep 17 00:00:00 2001 From: leigh-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 @@
{{ 'portfolios.applications.settings_heading' | translate }}
-
+ {% if user_can(permissions.EDIT_APPLICATION) %} + +
+
+ + {{ application_form.csrf_token }} +

+ {{ "fragments.edit_application_form.explain" | translate }} +

+
+
+ {{ TextInput(application_form.name) }} +
+
+ {% if user_can(permissions.DELETE_APPLICATION) %} +
+ + +
+ {% endif %} +
+
+
+
+ {{ TextInput(application_form.description, paragraph=True) }} +
+
+   +
+
+
+ +
+
+ {% else %}
- - {{ application_form.csrf_token }}

{{ "fragments.edit_application_form.explain" | translate }}

-
- {{ TextInput(application_form.name) }} -
-
- {% if user_can(permissions.DELETE_APPLICATION) %} -
- - +
+
+ {{ application_form.name.label() }} + {{ application_form.name.data }}
- {% endif %}
-
- {{ TextInput(application_form.description, paragraph=True) }} +
+
+ {{ application_form.description.label() }} + {{ application_form.description.data }} +
-
-   -
-
-
-
- + {% endif %}
From 2252f656d52a5acfc61dd9dbb9173d419c6c1a91 Mon Sep 17 00:00:00 2001 From: leigh-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 @@
- {{ application_form.csrf_token }}

{{ "fragments.edit_application_form.explain" | translate }} @@ -25,15 +24,11 @@

{{ TextInput(application_form.name) }} + {{ TextInput(application_form.description, paragraph=True) }}
{% if user_can(permissions.DELETE_APPLICATION) %}
-
-
-
- {{ TextInput(application_form.description, paragraph=True) }} -
-
-   -
-