Add sidenav to requests page

This commit is contained in:
Luis Cielak 2018-07-10 11:07:38 -04:00
parent e8e8a4f1b2
commit a0f5ac3588
4 changed files with 67 additions and 74 deletions

View File

@ -1,5 +1,9 @@
{% extends "base.html.to" %}
{% block sidenav %}
{% include 'nav-side.html.to' %}
{% end %}
{% block content %}
<main class="usa-section usa-content">
@ -10,3 +14,5 @@
{% end %}

View File

@ -1,40 +1,14 @@
<aside class="usa-width-one-fourth usa-layout-docs-sidenav">
<ul class="usa-sidenav-list">
<div class="sidenav">
<ul>
<li>
<a href="#details-of-use">1. Details of Use</a>
<ul class="usa-sidenav-sub_list">
<li>
<a href="#application-details">Application Details</a>
</li>
<li>
<a href="#application-computation">Computation</a>
</li>
<li>
<a href="#application-storage">Storage</a>
</li>
</ul>
<a class="sidenav__link" href="/home">Home</a>
<a class="sidenav__link" href="/requests">Requests</a>
</li>
<li>
<a href="#">2. Organizational Info</a>
<ul class="usa-sidenav-sub_list">
<li>
<a href="#information-about-you">Information About You</a>
</li>
<li>
<a href="#information-about-your-collaborators">Information About Your Collaborators</a>
</li>
</ul>
</li>
<li>
<a href="#">3. Funding/Contracting</a>
</li>
<li>
<a href="#">4. Readiness Survey</a>
</li>
<li>
<a href="#">5. Review &amp; Submit</a>
</li>
</ul>
</aside>
<ul>
<li>
<a class="sidenav__link" href="/">Logout</a>
</li>
</ul>
</div>

View File

@ -1,39 +1,57 @@
{% extends "base.html.to" %}
{% block sidenav %}
{% include 'nav-side.html.to' %}
{% end %}
{% block content %}
<main class="usa-section usa-content">
<h1>Requests <a class="usa-button usa-button-secondary" href='{{ reverse_url('request_new') }}'>New Request</a></h1>
<table class="usa-table-borderless" width="100%">
<thead>
<tr>
<th scope="col">Order ID</th>
<th scope="col">Request Date</th>
<th scope="col">Requester</th>
<th scope="col">Total Apps</th>
<th scope="col">Status</th>
<th scope="col">Actions</th>
</tr>
</thead>
<tbody>
{% for r in requests %}
<tr>
<th scope="row"><a href="{{ reverse_url('request_form_update', 1, r['order_id']) }}">{{ r['order_id'] }}</a>
{% if r['is_new'] %}<span class="usa-label">New</span></th>{% end %}
<td>{{ r['date'] }}</td>
<td>{{ r['full_name'] }}</td>
<td>{{ r['app_count'] }}</td>
<td>{{ r['status'] }}</td>
<td><a href="">Download</a></td>
</tr>
{% end %}
</tbody>
</table>
</main>
<div class="col col--grow">
<div class="panel">
<div class="panel__content">
<div class="panel__heading">
<h1>Requests <a class="usa-button usa-button-secondary" href='{{ reverse_url('request_new') }}'>New Request</a></h1>
</div>
<table class="usa-table-borderless" width="100%">
<thead>
<tr>
<th scope="col">Order ID</th>
<th scope="col">Request Date</th>
<th scope="col">Requester</th>
<th scope="col">Total Apps</th>
<th scope="col">Status</th>
<th scope="col">Actions</th>
</tr>
</thead>
<tbody>
{% for r in requests %}
<tr>
<th scope="row"><a href="{{ reverse_url('request_form_update', 1, r['order_id']) }}">{{ r['order_id'] }}</a>
{% if r['is_new'] %}<span class="usa-label">New</span>
</th>
{% end %}
<td>{{ r['date'] }}</td>
<td>{{ r['full_name'] }}</td>
<td>{{ r['app_count'] }}</td>
<td>{{ r['status'] }}</td>
<td><a href="">Download</a></td>
</tr>
{% end %}
</tbody>
</table>
</div>
</div>
</div>
{% end %}

View File

@ -16,9 +16,7 @@
<div class="panel__heading">
<h1>New Request</h1>
</div>
{% if request_id %}
<form method='POST' action="{{ reverse_url('request_form_update', current, request_id) }}" autocomplete="off">
{% else %}
@ -33,10 +31,7 @@
<input type='submit' class='usa-button usa-button-primary' value='Save & Continue' />
{% end %}
</form>
</main>