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

Refactor HTML and styles of new app provisioning

Browse Source 
- remove "panel__content" div wrapper
- add margin helper to p tags in steps 2 and 3 for flashed message
This commit is contained in:
graham-dds 2019-10-09 15:20:22 -04:00
parent 9faf55f2d6
commit e49257ca35
4 changed files with 97 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
styles/components/_portfolio_layout.scss
View File

@ -219,6 +219,8 @@
} }
.application-content { .application-content {
margin-top: $gap * 4;
.subheading { .subheading {
@include subheading; @include subheading;
position: relative; position: relative;

29
templates/applications/new/step_1.html
View File

@ -23,23 +23,20 @@
<application-name-and-description inline-template v-bind:initial-data='{{ form.data|tojson }}'> <application-name-and-description inline-template v-bind:initial-data='{{ form.data|tojson }}'>
<form method="POST" action="{{ action }}" v-on:submit="handleSubmit"> <form method="POST" action="{{ action }}" v-on:submit="handleSubmit">
<div class="panel__content"> {{ form.csrf_token }}
{{ form.csrf_token }} <div class="form-row">
<div class="form-row"> <div class="form-col">
<div class="form-col form-col--two-thirds"> {{ TextInput(form.name, optional=False) }}
{{ TextInput(form.name, optional=False) }} {{ ('portfolios.applications.new.step_1_form_help_text.name' | translate | safe) }}
{{ ('portfolios.applications.new.step_1_form_help_text.name' | translate | safe) }}
</div>
</div>
<hr>
<div class="form-row">
<div class="form-col form-col--two-thirds">
{{ TextInput(form.description, paragraph=True, optional=True) }}
{{ ('portfolios.applications.new.step_1_form_help_text.description' | translate | safe) }}
</div>
</div>
</div> </div>
</div>
<hr class="panel__break">
<div class="form-row">
<div class="form-col form-col--two-thirds">
{{ TextInput(form.description, paragraph=True, optional=True) }}
{{ ('portfolios.applications.new.step_1_form_help_text.description' | translate | safe) }}
</div>
</div>
<span class="action-group"> <span class="action-group">
{% block next_button %} {% block next_button %}

110
templates/applications/new/step_2.html
View File

@ -16,66 +16,64 @@
{% set modalName = "newApplicationConfirmation" %} {% set modalName = "newApplicationConfirmation" %}
{% include "fragments/flash.html" %} {% include "fragments/flash.html" %}
<div class="panel__content"> <p>
<p> {{ 'portfolios.applications.new.step_2_description' | translate }}
{{ 'portfolios.applications.new.step_2_description' | translate }} </p>
</p> <hr class="panel__break">
<hr> <application-environments inline-template v-bind:initial-data='{{ form.data|tojson }}'>
<application-environments inline-template v-bind:initial-data='{{ form.data|tojson }}'> <form method="POST" action="{{ url_for('applications.update_new_application_step_2', portfolio_id=portfolio.id, application_id=application.id) }}" v-on:submit="handleSubmit">
<form method="POST" action="{{ url_for('applications.update_new_application_step_2', portfolio_id=portfolio.id, application_id=application.id) }}" v-on:submit="handleSubmit"> <div class="subheading">{{ 'portfolios.applications.environments_heading' | translate }}</div>
<div class="subheading">{{ 'portfolios.applications.environments_heading' | translate }}</div> <div class="panel">
<div class="panel"> <div class="panel__content">
<div class="panel__content"> {{ form.csrf_token }}
{{ form.csrf_token }} <div> {# this extra div prevents this bug: https://www.pivotaltracker.com/story/show/160768940 #}
<div> {# this extra div prevents this bug: https://www.pivotaltracker.com/story/show/160768940 #} <div v-cloak v-for="title in errors" :key="title">
<div v-cloak v-for="title in errors" :key="title"> {{ Alert(message=None, level="error", vue_template=True) }}
{{ Alert(message=None, level="error", vue_template=True) }}
</div>
</div> </div>
<div class="application-list-item">
<ul>
<li v-for="(environment, i) in environments" class="application-edit__env-list-item">
<div class="usa-input">
<label :for="'environment_names-' + i">Environment Name</label>
<input type="text" :id="'environment_names-' + i" v-model="environment.name" @input="onInput" placeholder="e.g. Development, Staging, Production"/> <input type="hidden" :name="'environment_names-' + i" v-model="environment.name"/>
</div>
<div class="application-edit__env-list-item-block">
<button v-on:click="removeEnvironment(i)" v-if="environments.length > 1" type="button" class="application-edit__env-list-item__remover">
{{ Icon('trash') }}
<span>Remove</span>
</button>
</div>
</li>
</ul>
<div class="block-list__footer">
<button
v-on:click="addEnvironment"
class="icon-link"
tabindex="0"
type="button">
{{ 'portfolios.applications.add_another_environment' | translate }}
{{ Icon("plus") }}
</button>
</div>
</div> </div>
<div class="application-list-item">
<ul>
<li v-for="(environment, i) in environments" class="application-edit__env-list-item">
<div class="usa-input">
<label :for="'environment_names-' + i">Environment Name</label>
<input type="text" :id="'environment_names-' + i" v-model="environment.name" @input="onInput" placeholder="e.g. Development, Staging, Production"/> <input type="hidden" :name="'environment_names-' + i" v-model="environment.name"/>
</div>
<div class="application-edit__env-list-item-block">
<button v-on:click="removeEnvironment(i)" v-if="environments.length > 1" type="button" class="application-edit__env-list-item__remover">
{{ Icon('trash') }}
<span>Remove</span>
</button>
</div>
</li>
</ul>
<div class="block-list__footer">
<button
v-on:click="addEnvironment"
class="icon-link"
tabindex="0"
type="button">
{{ 'portfolios.applications.add_another_environment' | translate }}
{{ Icon("plus") }}
</button>
</div>
</div> </div>
</div> </div>
</div>
<span class="action-group"> <span class="action-group">
{% block next_button %} {% block next_button %}
{{ SaveButton(text=('portfolios.applications.new.step_2_button_text' | translate)) }} {{ SaveButton(text=('portfolios.applications.new.step_2_button_text' | translate)) }}
{% endblock %} {% endblock %}
<a class="usa-button usa-button-secondary" href="{{ url_for('applications.view_new_application_step_1', application_id=application.id) }}"> <a class="usa-button usa-button-secondary" href="{{ url_for('applications.view_new_application_step_1', application_id=application.id) }}">
Previous Previous
</a> </a>
<a href="{{ url_for('applications.portfolio_applications', portfolio_id=portfolio.id) }}"> <a href="{{ url_for('applications.portfolio_applications', portfolio_id=portfolio.id) }}">
Cancel Cancel
</a> </a>
</span> </span>
</form> </form>
</application-environments> </application-environments>
</div>
{% endblock %} {% endblock %}

45
templates/applications/new/step_3.html
View File

@ -11,31 +11,30 @@
{% block application_content %} {% block application_content %}
{% include "fragments/flash.html" %} {% include "fragments/flash.html" %}
<div class="panel__content"> <p>
<p> {{ ('portfolios.applications.new.step_3_description' | translate) }}
{{ ('portfolios.applications.new.step_3_description' | translate) }} </p>
</p> <hr class="panel__break">
<hr>
{{ MemberManagementTemplate( {{ MemberManagementTemplate(
application, application,
members, members,
new_member_form, new_member_form,
"applications.update_new_application_step_3", "applications.update_new_application_step_3",
user_can(permissions.CREATE_APPLICATION_MEMBER)) }} user_can(permissions.CREATE_APPLICATION_MEMBER)) }}
<span class="action-group"> <span class="action-group">
<a class="usa-button" href="{{ url_for('applications.settings', application_id=application_id) }}"> <a class="usa-button" href="{{ url_for('applications.settings', application_id=application_id) }}">
Return to Application Settings Return to Application Settings
</a> </a>
<a class="usa-button usa-button-secondary" href="{{ url_for('applications.view_new_application_step_2', application_id=application.id) }}"> <a class="usa-button usa-button-secondary" href="{{ url_for('applications.view_new_application_step_2', application_id=application.id) }}">
Previous Previous
</a> </a>
<a href="{{ url_for('applications.portfolio_applications', portfolio_id=portfolio.id) }}"> <a href="{{ url_for('applications.portfolio_applications', portfolio_id=portfolio.id) }}">
Cancel Cancel
</a> </a>
</span> </span>
</div>
{% endblock %} {% endblock %}