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

Only one action for each task order

Browse Source
This commit is contained in:
richard-dds 2019-06-05 12:07:15 -04:00
parent 667bc3b3c9
commit 5aa95f60d4
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
styles/sections/_task_order.scss
View File

@ -66,7 +66,7 @@
} }
} }
.task-order-card__action { .task-order-card__buttons .usa-button {
min-width: 10rem; min-width: 10rem;
} }

9
templates/portfolios/task_orders/index.html
View File

@ -6,8 +6,8 @@
{% block portfolio_content %} {% block portfolio_content %}
{% macro ViewLink(task_order, text="Edit", className="usa-button-primary") %} {% macro ViewLink(task_order, text="Edit") %}
<a href="{{ url_for('task_orders.view_task_order', task_order_id=task_order.id) }}" class="usa-button {{ className }} task-order-card__action"> <a href="{{ url_for('task_orders.view_task_order', task_order_id=task_order.id) }}" class="usa-button">
{{ text }} {{ text }}
</a> </a>
{% endmacro %} {% endmacro %}
@ -29,11 +29,10 @@
{% endmacro %} {% endmacro %}
{% macro TaskOrderActions(task_order) %} {% macro TaskOrderActions(task_order) %}
<div class="task-order-buttons"> <div class="task-order-card__buttons">
{% if task_order.is_pending %} {% if task_order.is_pending %}
{{ ViewLink(task_order, text="Edit") }} {{ ViewLink(task_order, text="Edit") }}
{% elif task_order.is_active %} {% elif task_order.is_active %}
{{ ViewLink(task_order, text="Add Funding", className="usa-button-secondary") }}
{{ ViewLink(task_order, text="Modify") }} {{ ViewLink(task_order, text="Modify") }}
{% else %} {% else %}
{{ ViewLink(task_order, text="View") }} {{ ViewLink(task_order, text="View") }}
@ -44,7 +43,7 @@
{% macro TaskOrderList(task_orders, label='success') %} {% macro TaskOrderList(task_orders, label='success') %}
<div> <div>
{% for task_order in task_orders %} {% for task_order in task_orders %}
<div class="card"> <div class="card task-order-card">
<div class="card__status"> <div class="card__status">
<span class='label label--{{ label }}'>{{ task_order.display_status }}</span> <span class='label label--{{ label }}'>{{ task_order.display_status }}</span>
{{ TaskOrderDate(task_order) }} {{ TaskOrderDate(task_order) }}