Merge pull request #26 from dod-ccpo/new_request

New request: Organizational Information & Review screens
This commit is contained in:
luisgov 2018-06-12 14:53:59 -04:00 committed by GitHub
commit 7823942b79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 402 additions and 107 deletions

View File

@ -6,8 +6,10 @@
@import 'base/buttons'; @import 'base/buttons';
@import 'base/tables'; @import 'base/tables';
@import 'components/site_action';
@import 'components/empty_state'; @import 'components/empty_state';
@import 'sections/layout'; @import 'sections/main';
@import 'sections/navigation';
@import 'sections/footer';
@import 'sections/login'; @import 'sections/login';

View File

@ -0,0 +1,12 @@
from {
margin-bottom: 3rem;
}
.usa-date-input label {
margin-top: 0;
}
.input-label {
margin-top: 1rem;
}

View File

@ -8,3 +8,11 @@ h1, h2, h3, h4, h5, h6 {
} }
} }
h1 {
margin-top: 0.5em;
}
label {
font-style: italic;
}

View File

@ -0,0 +1 @@
$nav-width: 300px;

View File

@ -0,0 +1,15 @@
.site-action {
border-bottom: 1px solid $color-gray-lightest;
display: block;
padding-top: 0.5rem;
padding-bottom: 0.5rem;
margin-top: 0.25rem;
a {
font-size: 1.3rem;
text-transform: uppercase;
text-decoration: none;
color: $color-primary !important;
}
}

View File

@ -0,0 +1,9 @@
footer {
position: fixed;
bottom: 0;
width: 100%;
padding-top: 0.5rem;
padding-bottom: 1em;
background-color: $color-gray-lightest;
border-top: 1px solid $color-gray-lighter;
}

View File

@ -1,17 +0,0 @@
.content {
}
header {
}
section {
}
footer {
position: fixed;
bottom: 0;
width: 100%;
}

3
scss/sections/_main.scss Normal file
View File

@ -0,0 +1,3 @@
section {
margin-bottom: 10rem;
}

View File

@ -0,0 +1,16 @@
.usa-navbar {
height: 5rem;
width: 5%;
}
.usa-nav {
padding-top: 1rem;
padding-left: 0;
}
.usa-nav-primary {
li:last-child {
padding-left: 3rem;
}
}

View File

@ -13,11 +13,11 @@
{% include 'header.html.to' %} {% include 'header.html.to' %}
<div class='usa-grid'> <section class='usa-grid'>
{% block content %} {% block content %}
these are not the droids you are looking for these are not the droids you are looking for
{% end %} {% end %}
</div> </section>

View File

@ -2,7 +2,7 @@
{% block content %} {% block content %}
<main class="usa-section usa-content" id="main-content"> <main class="usa-section usa-content">
<h1>Calculator</h1> <h1>Calculator</h1>

View File

@ -1,52 +1,9 @@
<footer class="usa-footer usa-footer-slim" role="contentinfo"> <footer class="usa-footer usa-footer-slim">
<div class="usa-grid usa-footer-return-to-top">
<a href="#">Return to top</a>
</div>
<div class="usa-footer-primary-section">
<div class="usa-grid"> <div class="usa-grid">
<nav class="usa-footer-nav usa-width-two-thirds"> <div class="usa-footer-logo">
<ul class="usa-unstyled-list"> <h5 class="usa-footer-slim-logo-heading">Joint Enterprise Defense Infrastructure</h5>
<li class="usa-width-one-fourth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="javascript:void(0);">Home</a>
</li>
<li class="usa-width-one-fourth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="javascript:void(0);">Accounts</a>
</li>
<li class="usa-width-one-fourth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="javascript:void(0);">Requests</a>
</li>
<li class="usa-width-one-fourth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="javascript:void(0);">Users</a>
</li>
<li class="usa-width-one-fourth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="javascript:void(0);">Reports</a>
</li>
<li class="usa-width-one-fourth usa-footer-primary-content">
<a class="usa-footer-primary-link" href="javascript:void(0);">Usage Calculator</a>
</li>
</ul>
</nav>
<address>
<div class="usa-width-one-third">
<div class="usa-footer-primary-content usa-footer-contact_info">
<p>
<a href="tel:1-800-555-5555">(800) CALL-GOVT</a>
</p>
</div>
<div class="usa-footer-primary-content usa-footer-contact_info">
<p><a href="mailto:info@dds.mil">info@dds.mil</a></p>
</div>
</div>
</address>
</div> </div>
</div> </div>
<div class="usa-footer-secondary_section">
<div class="usa-grid">
<div class="usa-footer-logo">
<img class="usa-footer-slim-logo-img" src="/static/img/logo.png" alt="Defense Digital Service Logo">
<h3 class="usa-footer-slim-logo-heading">Defense Digital Service</h3>
</div>
</div>
</div>
</footer> </footer>

View File

@ -16,7 +16,6 @@
['requests', 'Requests'], ['requests', 'Requests'],
['users', 'Users' ], ['users', 'Users' ],
['reports', 'Reports' ], ['reports', 'Reports' ],
['calculator','Usage Calculator'],
] ]
%} %}
<li> <li>

View File

@ -2,7 +2,7 @@
{% block content %} {% block content %}
<main class="usa-section usa-content" id="main-content"> <main class="usa-section usa-content">
<h1>Home</h1> <h1>Home</h1>

View File

@ -11,7 +11,7 @@
</head> </head>
<body> <body>
<main class="usa-grid-full usa-section login-area" id="main-content"> <main class="usa-grid-full usa-section login-area">
<img class="logo-img" src="/static/img/logo-alt.png" alt="Defense Digital Service Logo"> <img class="logo-img" src="/static/img/logo-alt.png" alt="Defense Digital Service Logo">

View File

@ -1,7 +1,7 @@
<aside class="usa-width-one-fourth usa-layout-docs-sidenav"> <aside class="usa-width-one-fourth usa-layout-docs-sidenav">
<ul class="usa-sidenav-list"> <ul class="usa-sidenav-list">
<li> <li>
<a class="usa-current" href="#details-of-use">1. Details of Use</a> <a href="#details-of-use">1. Details of Use</a>
<ul class="usa-sidenav-sub_list"> <ul class="usa-sidenav-sub_list">
<li> <li>
<a href="#application-details">Application Details</a> <a href="#application-details">Application Details</a>
@ -17,7 +17,16 @@
<li> <li>
<a href="#">2. Organizational Info</a> <a href="#">2. Organizational Info</a>
<ul class="usa-sidenav-sub_list">
<li>
<a href="#information-about-you">Information About You</a>
</li> </li>
<li>
<a href="#information-about-your-collaborators">Information About Your Collaborators</a>
</li>
</ul>
</li>
<li> <li>
<a href="#">3. Funding/Contracting</a> <a href="#">3. Funding/Contracting</a>
</li> </li>

View File

@ -2,7 +2,7 @@
{% block content %} {% block content %}
<main class="usa-section usa-content" id="main-content"> <main class="usa-section usa-content">
<h1>Reports</h1> <h1>Reports</h1>

View File

@ -2,7 +2,7 @@
{% block content %} {% block content %}
<main class="usa-section usa-content" id="main-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> <h1>Requests <a class="usa-button usa-button-secondary" href='{{ reverse_url('request_new') }}'>New Request</a></h1>

View File

@ -0,0 +1,12 @@
{% extends '../requests_new.html.to' %}
{% block form %}
<h2>New JEDI Request</h2>
<p class="usa-font-lead">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Natus error omnis a, tenetur similique quo officiis voluptates eum recusandae dolorem minus dignissimos, magni consequatur, maxime debitis reprehenderit sint non iusto?</p>
<a class='usa-button usa-button-secondary' href='{{ reverse_url('request_form',next_screen) }}'>New Application</a>
<a class='usa-button usa-button-secondary' href='{{ reverse_url('request_form',next_screen) }}'>Existing Application</a>
<a class='usa-button usa-button-secondary' href='{{ reverse_url('request_form',next_screen) }}'>Sandbox Environment</a>
{% end %}

View File

@ -155,15 +155,3 @@
{% end %} {% end %}
<!--
<div class="usa-width-three-fourths usa-layout-docs-main_content">
<h2 id="details-of-use">Details of Use</h2>
<p class="usa-font-lead">
To use JEDI, we want to know more about your needs for cloud services. Please fill out the form regarding computation, storage, and usage.
</p>
-->

View File

@ -2,7 +2,94 @@
{% block form %} {% block form %}
<h2>Organizational Info</h2> <h2>Organizational Info</h2>
<input type='textbox'> <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Doloremque placeat distinctio accusamus quo temporibus facilis, dicta delectus asperiores. Nihil aut quod quibusdam id fugit, officia dolorum laudantium! Quidem tempora, aliquam.</p>
<h3 id="information-about-you">Information About You</h3>
<form>
<label for="">Name</label>
<input id="" name="" type="text">
<label for="">Email</label>
<input id="" name="" type="email" placeholder="i.e. name@mail.gov">
<label for="">Phone Number</label>
<input id="" name="" type="text" placeholder="i.e. (123) 456-7890">
<label for="">Office Symbol / Department</label>
<input id="" name="" type="text" placeholder="i.e. Army PEO-EIS">
<fieldset>
<label for="">Citizenship</label>
<ul class="usa-unstyled-list">
<li>
<input id="" type="radio" name="" value"">
<label class="input-label">United States</label>
</li>
<li>
<input id="" type="radio" name="" value"">
<label class="input-label">Foreign National</label>
</li>
<li>
<input id="" type="radio" name="" value"">
<label class="input-label">Other</label>
</li>
</ul>
</fieldset>
<fieldset>
<label for="">Designation of Person</label>
<ul class="usa-unstyled-list">
<li>
<input id="" type="radio" name="" value"">
<label class="input-label">Military</label>
</li>
<li>
<input id="" type="radio" name="" value"">
<label class="input-label">Civilian</label>
</li>
<li>
<input id="" type="radio" name="" value"">
<label class="input-label">Contractor</label>
</li>
</ul>
</fieldset>
<fieldset>
<label for="">Latest IA Training completion date</label>
<div class="usa-date-input">
<div class="usa-form-group usa-form-group-month">
<label for="">Month</label>
<input class="usa-input-inline" id="" name="" type="number" min="1" max="12" value="">
</div>
<div class="usa-form-group usa-form-group-day">
<label for="">Day</label>
<input class="usa-input-inline" id="" name="" type="number" min="1" max="31" value="">
</div>
<div class="usa-form-group usa-form-group-year">
<label for="">Year</label>
<input class="usa-input-inline" id="" name="" type="number" min="1900" max="2000" value="">
</div>
</div>
</fieldset>
</form>
<h3 id="information-about-your-collaborators">Information About Your Collaborators</h3>
<form>
<p>Please designate a Contracting Officer that will help you complete this process.</p>
<label for="">Name</label>
<input id="" name="" type="text">
<label for="">Email</label>
<input id="" name="" type="text" placeholder="i.e. name@mail.gov">
</form>
{% end %} {% end %}

View File

@ -2,9 +2,201 @@
{% block form %} {% block form %}
<h2>Review &amp; Submit</h2> <h2>Review &amp; Submit</h2>
<input type='textbox'> <p class="usa-font-lead">Lorem ipsum dolor sit amet, consectetur adipisicing elit. Beatae placeat maiores illo totam consequuntur ipsum quo animi earum voluptatem, velit minus, perferendis aperiam, tenetur alias nemo ratione accusantium, ullam at!</p>
<h3>1. Details of Use <a href="" class="usa-button usa-button-secondary">Edit</a></h3>
<h4>Applications &amp; Environments (2)</h4>
<table class="usa-table-borderless" width="100%">
<thead>
<tr>
<th scope="col">Application Name</th>
<th scope="col">Total Users</th>
<th scope="col">Estimated Cost</th>
</tr>
</thead>
<tbody>
<tr>
<td><a href="#app-code-mil">Code.mil</a></td>
<td>235</td>
<td>$1,000,000,000</td>
</tr>
<tr>
<td><a href="#app-digital-dojo">Digital Dojo</a></td>
<td>1,337</td>
<td>$10,000</td>
</tr>
</tbody>
</table>
<h5 id="app-code-mil">Code.mil</h5>
<h6>Application Details</h6>
<label>Application description</label>
<span>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolore tempora provident labore, deleniti facilis dolorum impedit repellat, et, quisquam modi eos libero nulla ut excepturi omnis. At magnam assumenda vero.</span>
<label>Estimated dollar value of use</label>
<span>$1,000,000,000</span>
<label>How did you arrive at this estimate?</label>
<span>CSP Calculator</span>
<label>Expected start date</label>
<span>2020-03-02</span>
<label>Desired period of performance</label>
<span>Lots of it</span>
<label>Classification level</label>
<span>Secret</span>
<label>Primary service branch usage</label>
<span>Army</span>
<label>Cloud model service</label>
<span>IaaS and PaaS</span>
<h6>Computation</h6>
<label>Number of cores</label>
<span>32</span>
<label>Total RAM</label>
<span>128GB</span>
<h6>Storage</h6>
<label>Object storage</label>
<span>10TB</span>
<label>Server storage</label>
<span>100TB</span>
<h6>Estimated Application Storage</h6>
<label>Expected active users</label>
<span>300</span>
<label>Expected peak concurrent users</label>
<span>1,000</span>
<label>Expected requests per minute</label>
<span>1,000</span>
<label>Number of application environments</label>
<span>3</span>
<h5 id="app-digital-dojo">Digital Dojo</h5>
<h6>Application Details</h6>
<label>Application description</label>
<span>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Dolore tempora provident labore, deleniti facilis dolorum impedit repellat, et, quisquam modi eos libero nulla ut excepturi omnis. At magnam assumenda vero.</span>
<label>Estimated dollar value of use</label>
<span>$10,000</span>
<label>How did you arrive at this estimate?</label>
<span>CSP Calculator</span>
<label>Expected start date</label>
<span>2020-03-02</span>
<label>Desired period of performance</label>
<span>Lots of it</span>
<label>Classification level</label>
<span>Secret</span>
<label>Primary service branch usage</label>
<span>Army</span>
<label>Cloud model service</label>
<span>IaaS and PaaS</span>
<h6>Computation</h6>
<label>Number of cores</label>
<span>32</span>
<label>Total RAM</label>
<span>128GB</span>
<h6>Storage</h6>
<label>Object storage</label>
<span>10TB</span>
<label>Server storage</label>
<span>100TB</span>
<h6>Estimated Application Storage</h6>
<label>Expected active users</label>
<span>300</span>
<label>Expected peak concurrent users</label>
<span>1,000</span>
<label>Expected requests per minute</label>
<span>1,000</span>
<label>Number of application environments</label>
<span>3</span>
<h3>2. Organizational Info <a href="" class="usa-button usa-button-secondary">Edit</a></h3>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Sint qui rem molestiae officia vitae quas error ut, est commodi quo! Error itaque earum, facere quod dolore qui beatae repudiandae accusantium.</p>
<h4>Information About Requester</h4>
<label>Name</label>
<span>Friedrich Straat</span>
<label>Email</label>
<span>fstraat@mail.gov</span>
<label>Phone Number</label>
<span>(123) 456-7890</span>
<label>Office Symbol / Department</label>
<span>Army</span>
<label>Citizenship</label>
<span>United States</span>
<label>Designation of Person</label>
<span>Military</span>
<label>Latest IA Training completion date</label>
<span>2018-04-12</span>
<h4>Information About Collaborators</h4>
<label>Name</label>
<span>Pietro Quirinis</span>
<label>Email</label>
<span>quirinis@mail.gov</span>
<h3>3. Funding &amp; Contracting <a href="" class="usa-button usa-button-secondary">Edit</a></h3>
<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit. Esse inventore non illo quibusdam tempora vero temporibus reprehenderit sapiente cumque enim quaerat fuga praesentium nemo vel, expedita numquam sequi sed iusto!</p>
<br><br>
{% end %} {% end %}
{% block next %} {% block next %}
<b class='usa-button'>Submit to Contracting Officer</b> <a class='usa-button'>Submit</a>
{% end %} {% end %}

View File

@ -2,16 +2,18 @@
{% block content %} {% block content %}
<main class="usa-content" id="main-content">
<a href="/requests">&#8249; All requests</a>
<h1>New Request</h1>
<aside class="usa-width-one-fourth usa-layout-docs-sidenav"> <div class="site-action"><a href="/requests">&#8249; All requests</a></div>
<h1>New Request</h1>
<aside class="sidenav usa-width-one-third">
{% include 'requests/sidebar.html.to' %} {% include 'requests/sidebar.html.to' %}
</aside> </aside>
<div class="usa-width-three-fourths usa-layout-docs-main_content">
<main class="main-content usa-width-two-thirds">
{% block form %} {% block form %}
form goes here form goes here
@ -19,9 +21,9 @@
{% block next %} {% block next %}
<a class='usa-button usa-button-primary' href='{{ reverse_url('request_form',next_screen) }}'>Save &amp; Continue</a> <a class='usa-button usa-button-primary' href='{{ reverse_url('request_form',next_screen) }}'>Save &amp; Continue</a>
{% end %} {% end %}
</div>
</main> </main>
{% end %} {% end %}

View File

@ -2,7 +2,7 @@
{% block content %} {% block content %}
<main class="usa-section usa-content" id="main-content"> <main class="usa-section usa-content">
<h1>Users</h1> <h1>Users</h1>

View File

@ -2,7 +2,7 @@
{% block content %} {% block content %}
<main class="usa-section usa-content usa-width-one-whole" id="main-content"> <main class="usa-section usa-content usa-width-one-whole">
<h1>Workspaces</h1> <h1>Workspaces</h1>