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

Use .panel__content on task order view page

Browse Source
This commit is contained in:
Patrick Smith 2019-01-11 10:49:30 -05:00
parent 2b61621402
commit f7a87308c7
2 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
styles/sections/_task_order.scss
View File

@ -6,7 +6,6 @@
} }
.panel { .panel {
padding: 0 $gap * 2;
width: 100%; width: 100%;
@include ie-only { @include ie-only {
@ -20,7 +19,6 @@
.task-order-heading__name { .task-order-heading__name {
align-items: center; align-items: center;
padding: $gap;
label { label {
padding: $gap; padding: $gap;
@ -71,8 +69,7 @@
} }
.task-order-sidebar { .task-order-sidebar {
flex-basis: 25%; min-width: 35rem;
min-width: 30rem;
hr { hr {
margin: 2rem 0; margin: 2rem 0;

70
templates/workspaces/task_orders/show.html
View File

@ -5,7 +5,7 @@
{% block workspace_content %} {% block workspace_content %}
{% macro Step(title="", description="", link_text=None, link_url=None, complete=True) %} {% macro Step(title="", description="", link_text=None, link_url=None, complete=True) %}
<div class="task-order-next-steps__step row"> <div class="task-order-next-steps__step panel__content row">
<div class="task-order-next-steps__icon col"> <div class="task-order-next-steps__icon col">
<span>{{ Icon("ok", classes="complete" if complete else "incomplete") }}</span> <span>{{ Icon("ok", classes="complete" if complete else "incomplete") }}</span>
</div> </div>
@ -65,7 +65,7 @@
<div class="task-order-summary"> <div class="task-order-summary">
<div class="panel task-order-heading row"> <div class="panel task-order-heading row">
<div class="task-order-heading__name row"> <div class="panel__content task-order-heading__name row">
<h2>New Task Order</h2> <h2>New Task Order</h2>
<span class="label label--{{ 'warning' if task_order.is_pending }}">{{ task_order.status.value }}</span> <span class="label label--{{ 'warning' if task_order.is_pending }}">{{ task_order.status.value }}</span>
</div> </div>
@ -89,7 +89,7 @@
<div class="task-order-details row"> <div class="task-order-details row">
<div class="task-order-next-steps"> <div class="task-order-next-steps">
<div class="panel"> <div class="panel">
<h3>What's next?</h3> <h3 class="panel__content">What's next?</h3>
{{ Step( {{ Step(
title="Submit draft Task Order", title="Submit draft Task Order",
description="Complete initial task order request form.", description="Complete initial task order request form.",
@ -112,43 +112,49 @@
title="Have your KO submit your final task order", title="Have your KO submit your final task order",
description="Your KO will submit the final task order into your organization's contracting system and receive an official task order number. Your KO should enter your task order number in this system, along with a copy of the submitted task order.", description="Your KO will submit the final task order into your organization's contracting system and receive an official task order number. Your KO should enter your task order number in this system, along with a copy of the submitted task order.",
complete=False) }} complete=False) }}
<h4>Once your required information is submitted in this system, you're funded and ready to start using JEDI cloud services!</h4> <h4 class="panel__content">Once your required information is submitted in this system, you're funded and ready to start using JEDI cloud services!</h4>
</div> </div>
</div> </div>
<div class="task-order-sidebar col"> <div class="task-order-sidebar col">
<div class="task-order-documents panel"> <div class="task-order-documents panel">
<h3>Download documents</h3> <div class="panel__content">
{% set description -%} <h3>Download documents</h3>
last updated on <local-datetime {% set description -%}
timestamp="{{ task_order.time_updated }}" last updated on <local-datetime
format="M/D/YYYY"> timestamp="{{ task_order.time_updated }}"
</local-datetime> format="M/D/YYYY">
{%- endset %} </local-datetime>
{{ DocumentLink( {%- endset %}
title="Task Order Draft", {{ DocumentLink(
link_url=url_for('task_orders.download_summary', task_order_id=task_order.id), title="Task Order Draft",
description=description) }} link_url=url_for('task_orders.download_summary', task_order_id=task_order.id),
description=description) }}
</div>
<hr /> <hr />
{{ DocumentLink( <div class="panel__content">
title="Cloud Services Estimate", {{ DocumentLink(
link_url="#") }} title="Cloud Services Estimate",
{{ DocumentLink( link_url="#") }}
title="Market Research", {{ DocumentLink(
link_url="#") }} title="Market Research",
{{ DocumentLink( link_url="#") }}
title="DD 254", {{ DocumentLink(
link_url="") }} title="DD 254",
link_url="") }}
</div>
</div> </div>
<div class="task-order-invitations panel"> <div class="task-order-invitations panel">
<h3>Invitations</h3> <div class="panel__content">
{{ InvitationStatus('Contracting Officer', task_order.contracting_officer) }} <h3>Invitations</h3>
{{ InvitationStatus('Contracting Officer Representative', task_order.contracting_officer_representative) }} {{ InvitationStatus('Contracting Officer', task_order.contracting_officer) }}
{{ InvitationStatus('IA Security Officer', officer=task_order.security_officer) }} {{ InvitationStatus('Contracting Officer Representative', task_order.contracting_officer_representative) }}
{{ InvitationStatus('IA Security Officer', officer=task_order.security_officer) }}
<a href="{{ url_for('task_orders.new', screen=3, task_order_id=task_order.id) }}" class="icon-link"> <a href="{{ url_for('task_orders.new', screen=3, task_order_id=task_order.id) }}" class="icon-link">
{{ Icon("edit") }} {{ Icon("edit") }}
<span>manage invitations</span> <span>manage invitations</span>
</a> </a>
</div>
</div> </div>
</div> </div>
</div> </div>