pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1117 from dod-ccpo/app-settings-styling_part-3

Browse Source 
App settings styling - delete app panel
This commit is contained in:
leigh-mil 2019-10-17 12:59:31 -04:00 committed by GitHub
commit 09f718b1d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
styles/components/_portfolio_layout.scss
View File

@ -272,10 +272,6 @@
padding-top: 0; padding-top: 0;
} }
input#delete-application {
margin-top: $gap * 3;
}
li.accordion-table__item__expanded { li.accordion-table__item__expanded {
height: auto; height: auto;
} }

6
styles/elements/_buttons.scss
View File

@ -22,12 +22,12 @@ button,
.button-danger-outline, .button-danger-outline,
input[type="button"].button-danger-outline { input[type="button"].button-danger-outline {
color: $color-red; color: $color-red;
background-color: $color-red-lightest; background-color: $color-white;
box-shadow: inset 0 0 0 1px $color-red; box-shadow: inset 0 0 0 2px $color-red;
&:hover { &:hover {
color: white; color: white;
background-color: $color-red-darkest; 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;
} }
} }

39
templates/applications/settings.html
View File

@ -65,8 +65,6 @@
user_can_create_environment=user_can(permissions.CREATE_ENVIRONMENT) user_can_create_environment=user_can(permissions.CREATE_ENVIRONMENT)
) }} ) }}
<hr>
{% if user_can(permissions.DELETE_APPLICATION) %} {% if user_can(permissions.DELETE_APPLICATION) %}
{% set env_count = application.environments | length %} {% set env_count = application.environments | length %}
{% if env_count == 1 %} {% if env_count == 1 %}
@ -75,27 +73,22 @@
{% set pluralized_env = "environments" %} {% set pluralized_env = "environments" %}
{% endif %} {% endif %}
<div class='subheading'> <h3>
{{ "portfolios.applications.delete.subheading" | translate }} {{ "portfolios.applications.delete.subheading" | translate }}
</div> </h3>
<div class="form-row">
<div class="panel"> <div class="form-col form-col--two-thirds">
<div class="panel__content"> {{ "portfolios.applications.delete.text" | translate({"application_name": application.name}) | safe }}
<div class="form-row"> </div>
<div class="form-col form-col--two-thirds"> <div class="form-col form-col--third">
{{ "portfolios.applications.delete.panel_text" | translate({"name": application.name, "env_count": env_count , "pluralized_env": pluralized_env}) | safe }} <div class="usa-input">
</div> <input
<div class="form-col form-col--third"> id="delete-application"
<div class="usa-input"> type="button"
<input v-on:click="openModal('delete-application')"
id="delete-application" class='usa-button--outline button-danger-outline'
type="button" value="{{ 'portfolios.applications.delete.button' | translate }}"
v-on:click="openModal('delete-application')" >
class='usa-button button-danger-outline'
value="{{ 'portfolios.applications.delete.button' | translate }}"
>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@ -122,6 +115,8 @@
{% endcall %} {% endcall %}
{% endif %} {% endif %}
<hr>
{% if user_can(permissions.VIEW_APPLICATION_ACTIVITY_LOG) %} {% if user_can(permissions.VIEW_APPLICATION_ACTIVITY_LOG) %}
{% include "fragments/audit_events_log.html" %} {% include "fragments/audit_events_log.html" %}
{{ Pagination(audit_events, url=url_for('applications.settings', application_id=application.id)) }} {{ Pagination(audit_events, url=url_for('applications.settings', application_id=application.id)) }}

2
translations.yaml
View File

@ -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. 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 button: Delete application
header: Are you sure you want to delete this 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}. <strong>This cannot be undone.</strong>' text: "If you delete {application_name}, all environments will be gone forever.<br>This action can not be undone."
subheading: Delete Application subheading: Delete Application
enter_env_name: "Enter environment name:" enter_env_name: "Enter environment name:"
environments: environments: