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

Use SaveButton macro and base-form vue component on app settings page

Browse Source 
Use common translations for save button
This commit is contained in:
leigh-mil 2019-08-16 08:34:41 -04:00
parent 068405607c
commit 2fd148eda8
4 changed files with 35 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/fragments/applications/edit_environment_team_form.html
View File

@ -81,7 +81,7 @@
<div class='action-group'> <div class='action-group'>
{{ {{
SaveButton( SaveButton(
text=("portfolios.applications.update_button_text" | translate) text=("common.save" | translate)
) )
}} }}
</div> </div>

2
templates/fragments/applications/edit_environments.html
View File

@ -90,7 +90,7 @@
{{ TextInput(edit_form.name, validation='requiredField') }} {{ TextInput(edit_form.name, validation='requiredField') }}
{{ {{
SaveButton( SaveButton(
text=("portfolios.applications.update_button_text" | translate) text=("common.save" | translate)
) )
}} }}
</form> </form>

63
templates/portfolios/applications/settings.html
View File

@ -5,6 +5,7 @@
{% from "components/icon.html" import Icon %} {% from "components/icon.html" import Icon %}
{% from "components/modal.html" import Modal %} {% from "components/modal.html" import Modal %}
{% from "components/pagination.html" import Pagination %} {% from "components/pagination.html" import Pagination %}
{% from "components/save_button.html" import SaveButton %}
{% from "components/text_input.html" import TextInput %} {% from "components/text_input.html" import TextInput %}
{% set secondary_breadcrumb = 'portfolios.applications.existing_application_title' | translate({ "application_name": application.name }) %} {% set secondary_breadcrumb = 'portfolios.applications.existing_application_title' | translate({ "application_name": application.name }) %}
@ -14,40 +15,42 @@
<div class='subheading'>{{ 'portfolios.applications.settings_heading' | translate }}</div> <div class='subheading'>{{ 'portfolios.applications.settings_heading' | translate }}</div>
{% if user_can(permissions.EDIT_APPLICATION) %} {% if user_can(permissions.EDIT_APPLICATION) %}
<form method="POST" action="{{ url_for('applications.update', application_id=application.id) }}"> <base-form inline-template>
<div class="panel"> <form method="POST" action="{{ url_for('applications.update', application_id=application.id) }}">
<div class="panel__content"> <div class="panel">
{{ application_form.csrf_token }} <div class="panel__content">
<p> {{ application_form.csrf_token }}
{{ "fragments.edit_application_form.explain" | translate }} <p>
</p> {{ "fragments.edit_application_form.explain" | translate }}
<div class="form-row"> </p>
<div class="form-col form-col--two-thirds"> <div class="form-row">
{{ TextInput(application_form.name) }} <div class="form-col form-col--two-thirds">
{{ TextInput(application_form.description, paragraph=True) }} {{ 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">
<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>
<div class="form-col form-col--third"> </div>
{% if user_can(permissions.DELETE_APPLICATION) %} <div class="panel__footer">
<div class="usa-input"> <div class="action-group">
<input {{ SaveButton('common.save'|translate) }}
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> </div>
</div> </div>
<div class="panel__footer"> </form>
<div class="action-group"> </base-form>
<button class="usa-button usa-button-primary" tabindex="0" type="submit">{{ 'portfolios.applications.update_button_text' | translate }}</button>
</div>
</div>
</div>
</form>
{% else %} {% else %}
<div class="panel"> <div class="panel">
<div class="panel__content"> <div class="panel__content">

1
translations.yaml
View File

@ -325,7 +325,6 @@ portfolios:
title: '{application_name} Team Settings' title: '{application_name} Team Settings'
add_to_environment: Add to existing environment add_to_environment: Add to existing environment
team_text: Team team_text: Team
update_button_text: Save
members: members:
new: new:
assign_roles: Assign Member Environments and Roles assign_roles: Assign Member Environments and Roles