diff --git a/styles/components/_portfolio_layout.scss b/styles/components/_portfolio_layout.scss index 826795b4..fea6cf20 100644 --- a/styles/components/_portfolio_layout.scss +++ b/styles/components/_portfolio_layout.scss @@ -272,10 +272,6 @@ padding-top: 0; } - input#delete-application { - margin-top: $gap * 3; - } - li.accordion-table__item__expanded { height: auto; } diff --git a/styles/elements/_buttons.scss b/styles/elements/_buttons.scss index b629a35a..c1d90cde 100644 --- a/styles/elements/_buttons.scss +++ b/styles/elements/_buttons.scss @@ -22,12 +22,12 @@ button, .button-danger-outline, input[type="button"].button-danger-outline { color: $color-red; - background-color: $color-red-lightest; - box-shadow: inset 0 0 0 1px $color-red; + background-color: $color-white; + box-shadow: inset 0 0 0 2px $color-red; &:hover { color: white; background-color: $color-red-darkest; - box-shadow: inset 0 0 0 1px $color-red-darkest; + box-shadow: inset 0 0 0 2px $color-red-darkest; } } diff --git a/templates/applications/settings.html b/templates/applications/settings.html index 121179a1..55d0a769 100644 --- a/templates/applications/settings.html +++ b/templates/applications/settings.html @@ -65,8 +65,6 @@ user_can_create_environment=user_can(permissions.CREATE_ENVIRONMENT) ) }} -
- {% if user_can(permissions.DELETE_APPLICATION) %} {% set env_count = application.environments | length %} {% if env_count == 1 %} @@ -75,27 +73,22 @@ {% set pluralized_env = "environments" %} {% endif %} -
+

{{ "portfolios.applications.delete.subheading" | translate }} -

- -
-
-
-
- {{ "portfolios.applications.delete.panel_text" | translate({"name": application.name, "env_count": env_count , "pluralized_env": pluralized_env}) | safe }} -
-
-
- -
-
+ +
+
+ {{ "portfolios.applications.delete.text" | translate({"application_name": application.name}) | safe }} +
+
+
+
@@ -122,6 +115,8 @@ {% endcall %} {% endif %} +
+ {% if user_can(permissions.VIEW_APPLICATION_ACTIVITY_LOG) %} {% include "fragments/audit_events_log.html" %} {{ Pagination(audit_events, url=url_for('applications.settings', application_id=application.id)) }} diff --git a/translations.yaml b/translations.yaml index 0724f926..7ff39092 100644 --- a/translations.yaml +++ b/translations.yaml @@ -361,7 +361,7 @@ portfolios: message: You will lose access to this application and all environments will be removed from the CSP. Your reporting and activity will still be accessible. button: Delete application header: Are you sure you want to delete this application? - panel_text: 'Deleting {name} will delete this application along with all {env_count} {pluralized_env}. This cannot be undone.' + text: "If you delete {application_name}, all environments will be gone forever.
This action can not be undone." subheading: Delete Application enter_env_name: "Enter environment name:" environments: