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

Merge pull request #792 from dod-ccpo/style-updates

Browse Source 
Style updates
This commit is contained in:
dandds
2019-05-01 11:44:24 -04:00
committed by GitHub
parent 77aaf301c2 035d24f55d
commit e709de1d49
16 changed files with 118 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/components/alert.html
View File

@@ -25,9 +25,9 @@
<div class='usa-alert-body'>
{% if vue_template %}
<h2 class='usa-alert-heading' v-html='title'></h2>
<h3 class='usa-alert-heading' v-html='title'></h3>
{% else %}
<h2 class='usa-alert-heading'>{{title}}</h2>
<h3 class='usa-alert-heading'>{{title}}</h3>
{% endif %}
{% if message %}

24
templates/portfolios/applications/index.html
View File

@@ -54,22 +54,22 @@
<a
href="{{ url_for('applications.team', application_id=application.id) }}"
class='icon-link'>
<span>{{ "portfolios.applications.team_text" | translate }}</span>
<span class='counter'>{{ application.num_users }}</span>
<span>{{ "portfolios.applications.team_text" | translate }} ({{ application.num_users }})</span>
</a>
<div class='separator'></div>
{% endif %}
<a class='icon-link triangle-box' v-on:click="toggleSection('{{ section_name }}')">
<span>Environments ({{ application.environments|length }})</span>
<span v-if="selectedSection === '{{ section_name }}'">
{{ Icon('caret_up') }}
</span>
<span v-else>
{{ Icon('caret_down') }}
</span>
<div class="triangle-up" v-if="selectedSection === '{{ section_name }}'"></div>
</a>
</div>
</div>
<div class='col'>
<span class='icon-link toggle-link' v-on:click="toggleSection('{{ section_name }}')">
<span v-if="selectedSection === '{{ section_name }}'">
{{ Icon('minus') }}
</span>
<span v-else>
{{ Icon('plus') }}
</span>
</span>
</div>
</header>
<ul v-show="selectedSection === '{{ section_name }}'">
{% for environment in application.environments %}

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

@@ -20,10 +20,10 @@
{{ "fragments.edit_application_form.explain" | translate }}
</p>
<div class="form-row">
<div class="form-col form-col--half">
<div class="form-col form-col--two-thirds">
{{ TextInput(form.name) }}
</div>
<div class="form-col form-col--half">
<div class="form-col form-col--third">
{% if user_can(permissions.DELETE_APPLICATION) %}
<div class="usa-input">
<label for="delete-application">
@@ -43,31 +43,13 @@
</div>
</div>
<div class="form-row">
<div class="form-col form-col--half">
<div class="form-col form-col--two-thirds">
{{ TextInput(form.description, paragraph=True) }}
</div>
<div class="form-col form-col--third">
&nbsp;
</div>
</div>
<div class="application-list-item">
<header>
<h2 class="block-list__title">{{ 'portfolios.applications.environments_heading' | translate }}</h2>
<p>
{{ 'portfolios.applications.environments_description' | translate }}
</p>
</header>
<ul>
{% for environment in application.environments %}
<li class="application-edit__env-list-item">
<div class="usa-input input--disabled">
<label>Environment Name</label>
<input type="text" disabled value="{{ environment.name }}" readonly />
</div>
</li>
{% endfor %}
</ul>
</div>
</div>
<div class="panel__footer">
<div class="action-group">

45
templates/portfolios/applications/team.html
View File

@@ -46,7 +46,7 @@
<div class="accordion-table__head">
<span>
<span>
{{ "portfolios.applications.team_settings.user" | translate }}
{{ "common.name" | translate }}
</span>
<span>
{{ "portfolios.applications.team_settings.section.table.delete_access" | translate }}
@@ -66,25 +66,28 @@
{% set user_info = environment_users[user.id] %}
{% set user_permissions = user_info["permissions"] %}
{% macro PermissionField(value) %}
<span class="user-permission{% if "Edit" in value %} green{% endif %}">{{ value }}</span>
{% endmacro %}
<toggler inline-template>
<li class="accordion-table__item">
<div class="accordion-table__item-content">
<span>
{{ name }}
<span>{{ user.full_name }}</span>
<span>{{ user_permissions["delete_access"] }}</span>
<span>{{ user_permissions["environment_management"] }}</span>
<span>{{ user_permissions["team_management"] }}</span>
</span>
<span class="icon-link icon-link--large accordion-table__item__toggler">
{% set open_html %}
{{ "common.show" | translate }} {{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }})
{% endset %}
<toggler inline-template>
<li class="accordion-table__item">
<div class="accordion-table__item-content">
<span>
{{ name }}
<span>{{ user.full_name }}</span>
{{ PermissionField(user_permissions["delete_access"]) }}
{{ PermissionField(user_permissions["environment_management"]) }}
{{ PermissionField(user_permissions["team_management"]) }}
</span>
<span class="icon-link icon-link--large accordion-table__item__toggler">
{% set open_html %}
{{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }}) {{ Icon('caret_down') }}
{% endset %}
{% set close_html %}
{{ "common.hide" | translate }} {{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }})
{% endset %}
{% set close_html %}
{{ "portfolios.applications.team_settings.environments" | translate }} ({{ user_info['environments'] | length }}) {{ Icon('caret_up') }}
{% endset %}
{{
ToggleButton(
@@ -98,10 +101,8 @@
{% call ToggleSection(section_name="environments") %}
<ul>
{% for environment in user_info["environments"] %}
<li>
<div class="accordion-table__item-content">
{{ environment.name }}
</div>
<li class="accordion-table__item__expanded">
{{ environment.name }}
</li>
{% endfor %}
</ul>