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

Merge pull request #1112 from dod-ccpo/app-settings-styling

Browse Source 
App settings styling (part 1)
This commit is contained in:
leigh-mil
2019-10-14 16:33:59 -04:00
committed by GitHub
parent e8595e592a c7889e13f8
commit a44e86f296
13 changed files with 88 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/applications/base.html
View File

@@ -5,7 +5,7 @@
{% block portfolio_header %}
{% include "portfolios/header.html" %}
{% if application %}
{{ StickyCTA(text=application.name, return_link_url=url_for('applications.portfolio_applications', portfolio_id=application.portfolio_id), return_link_text="BACK TO APPLICATIONS") }}
{{ StickyCTA(text=application.name) }}
{% endif %}
{% endblock %}

12
templates/applications/fragments/member_form_fields.html
View File

@@ -52,20 +52,12 @@
{% endmacro %}
{% macro InfoFields(member_form) %}
<div class='form-row'>
<div class="application-member__user-info">
{{ TextInput(member_form.first_name, validation='requiredField', optional=False) }}
</div>
<div class='form-row'>
{{ TextInput(member_form.last_name, validation='requiredField', optional=False) }}
</div>
<div class='form-row'>
{{ TextInput(member_form.email, validation='email', optional=False) }}
</div>
<div class="form-row">
{{ PhoneInput(member_form.phone_number, member_form.phone_ext)}}
</div>
<div class='form-row'>
{{ TextInput(member_form.dod_id, validation='dodId', optional=False) }}
<a href="#">How do I find the DoD ID?</a>
</div>
<a href="#">How do I find the DoD ID?</a>
{% endmacro %}

66
templates/applications/settings.html
View File

@@ -19,58 +19,40 @@
{% block application_content %}
<div class='subheading'>{{ 'portfolios.applications.settings.name_description' | translate }}</div>
<h3>{{ 'portfolios.applications.settings.name_description' | translate }}</h3>
{% if user_can(permissions.EDIT_APPLICATION) %}
<base-form inline-template>
<form method="POST" action="{{ url_for('applications.update', application_id=application.id) }}">
<div class="panel">
<div class="panel__content">
{{ application_form.csrf_token }}
<div class="form-row">
<div class="form-col form-col--two-thirds">
{{ TextInput(application_form.name, optional=False) }}
{{ TextInput(application_form.description, paragraph=True, optional=True) }}
</div>
</div>
</div>
<div class="panel__footer">
<div class="action-group">
{{ SaveButton('common.save_changes'|translate) }}
</div>
</div>
<form method="POST" action="{{ url_for('applications.update', application_id=application.id) }}" class="col col--half">
{{ application_form.csrf_token }}
{{ TextInput(application_form.name, optional=False) }}
{{ TextInput(application_form.description, paragraph=True, optional=True, showOptional=False) }}
<div class="action-group action-group--tight">
{{ SaveButton('common.save_changes'|translate) }}
</div>
</form>
</base-form>
{% else %}
<div class="panel">
<div class="panel__content">
<p>
{{ "fragments.edit_application_form.explain" | translate }}
</p>
<div class="form-row">
<div class="form-col">
<div class="usa-input usa-input__title__view-only">
{{ application_form.name.label() }}
</div>
<p>
{{ application_form.name.data }}
</p>
</div>
</div>
<div class="form-row">
<div class="form-col">
<div class="usa-input usa-input__title__view-only">
{{ application_form.description.label() }}
</div>
<p>
{{ application_form.description.data }}
</p>
</div>
</div>
<!-- TODO: use new spacing styling to add in bottom margin here -->
<div class="">
<p>
{{ "fragments.edit_application_form.explain" | translate }}
</p>
<div class="usa-input usa-input__title__view-only">
{{ application_form.name.label() }}
</div>
<p>
{{ application_form.name.data }}
</p>
<div class="usa-input usa-input__title__view-only">
{{ application_form.description.label() }}
</div>
<p>
{{ application_form.description.data }}
</p>
</div>
{% endif %}
<hr>
{{ MemberManagementTemplate(
application,