Skip to content
This repository has been archived by the owner on Jan 17, 2024. It is now read-only.

Commit

Permalink
Merge pull request #139 from AppliedIS/feature-ui-design
Browse files Browse the repository at this point in the history
Feature ui design
  • Loading branch information
jefferey committed Nov 15, 2016
2 parents e43d873 + 70dc9a1 commit e7b96ff
Show file tree
Hide file tree
Showing 16 changed files with 420 additions and 123 deletions.
Original file line number Diff line number Diff line change
@@ -1,24 +1,36 @@
<div class="header-title-bar">
<div class="header-title">
<h1>Application for Authority to Employ Workers with Disabilities at Subminimum Wages</h1>
<h2>OMB NO: 1235-0001</h2>
<h2>REVXX/20XX</h2>
<header role="header" class="dol-header-form">
<h1>Section 14(c) Certificate Application</h1>

<nav>
<ul>
<li><a href="">Dashboard</a></li>
<li><a href="" ng-click="vm.userClick()">{{ vm.stateService.user.email ? vm.stateService.user.email : "Username" }}</a></li>
<li><a href="" ng-click="vm.saveClick()">Sign Out</a></li>
</ul>
</nav>
</header>
<div class="dol-applicant-meta">
<div class="dol-applicant-ein">
Applicant EIN: <span>{{ vm.stateService.ein ? vm.stateService.ein : "XX-XXXXXXX" }}</span>
</div>
<div class="header-logo">
<img ng-src="{{ vm.assetService.loadImage('dol_seal.svg') }}" />
<img ng-src="{{ vm.assetService.loadImage('whd_logo.jpg') }}" />

<div class="dol-feedback-save">
<span class="dol-feedback-save-success" ng-show="vm.stateService.formData.lastSaved > 0">
Saved {{vm.stateService.formData.lastSaved | amUtc | amLocal | amDateFormat:'MM/DD/YYYY, h:mm A'}}
</span>
<span class="dol-feedback-save-error" ng-show="vm.stateService.formData.lastSaved === 0">
Error Saving Form
</span>
</div>
</div>
<div class="header-status-bar" ng-show="vm.stateService.user.email">
<p class="pull-left">EIN: <span class="header-ein">{{ vm.stateService.ein ? vm.stateService.ein : "XX-XXXXXXX" }}</span></p>
<div class="dol-form-meta">
<div class="usa-content">
<p>Application for Authority to Employ Workers with Disabilities at Subminimum Wages</p>
</div>

<p class="pull-right"><a href="" ng-click="vm.userClick()">{{ vm.stateService.user.email ? vm.stateService.user.email : "Username" }}</a> | <a href="" ng-click="vm.saveClick()">Save Work & Sign Out</a></p>
<div class="dol-form-omb">
<p>OMB NO: 1235-0001</p>
<p>REV XX/20XX</p>
</div>
</div>
<main-navigation-control></main-navigation-control>

<p class="pull-right" ng-show="vm.stateService.formData.lastSaved > 0">
Saved {{vm.stateService.formData.lastSaved | amUtc | amLocal | amDateFormat:'dddd, MMMM Do YYYY, h:mm:ss a'}}
<p>
<p class="pull-right" ng-show="vm.stateService.formData.lastSaved === 0">
Error Saving Form
<p>
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<div class="main-nav-bar">
<div class="nav-button {{ vm.current === 'assurances' ? 'active' : '' }}" data-sectionid="assurances" ng-click="vm.onNavClick($event)">Assurances</div>
<div class="nav-button {{ vm.current === 'app-info' ? 'active' : '' }}" data-sectionid="app-info" ng-click="vm.onNavClick($event)">Application Info</div>
<div class="nav-button {{ vm.current === 'employer' ? 'active' : '' }}" data-sectionid="employer" ng-click="vm.onNavClick($event)">Employer</div>
<div class="nav-button {{ vm.current === 'wage-data' ? 'active' : '' }}" data-sectionid="wage-data" ng-click="vm.onNavClick($event)">Wage Data</div>
<div class="nav-button {{ vm.current === 'work-sites' ? 'active' : '' }}" data-sectionid="work-sites" ng-click="vm.onNavClick($event)">Work Sites &amp; Employees</div>
<div class="nav-button {{ vm.current === 'wioa' ? 'active' : '' }}" data-sectionid="wioa" ng-click="vm.onNavClick($event)">WIOA</div>
<div class="nav-button {{ vm.current === 'review' ? 'active' : '' }}" data-sectionid="review" ng-click="vm.onNavClick($event)" ng-show="vm.stateService.inReview">Review &amp; Submit</div>
</div>
<nav role="navigation" class="main-nav-bar">
<ul>
<li class="nav-button {{ vm.current === 'assurances' ? 'active' : '' }}" data-sectionid="assurances" ng-click="vm.onNavClick($event)">Assurances</li>
<li class="nav-button {{ vm.current === 'app-info' ? 'active' : '' }}" data-sectionid="app-info" ng-click="vm.onNavClick($event)">Application Info</li>
<li class="nav-button {{ vm.current === 'employer' ? 'active' : '' }}" data-sectionid="employer" ng-click="vm.onNavClick($event)">Employer</li>
<li class="nav-button {{ vm.current === 'wage-data' ? 'active' : '' }}" data-sectionid="wage-data" ng-click="vm.onNavClick($event)">Wage Data</li>
<li class="nav-button {{ vm.current === 'work-sites' ? 'active' : '' }}" data-sectionid="work-sites" ng-click="vm.onNavClick($event)">Work Sites &amp; Employees</li>
<li class="nav-button {{ vm.current === 'wioa' ? 'active' : '' }}" data-sectionid="wioa" ng-click="vm.onNavClick($event)">WIOA</li>
<li class="nav-button {{ vm.current === 'review' ? 'active' : '' }}" data-sectionid="review" ng-click="vm.onNavClick($event)" ng-show="vm.stateService.inReview">Review &amp; Submit</li>
</ul>
</nav>
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
<div class="dol-form-section-title">
<h2>Application Info</h2>

<div class="dol-form-section-help">
<ul>
<li><a href="">Show Help for All Items</a></li>
</ul>
</div>
</div>
<div class="usa-alert usa-alert-error" role="alert" ng-show="validate('__appinfo')">
<div class="usa-alert-body">
<p class="usa-alert-text">Please review this page. There are errors or missing information that we need to collect before you can submit the form.</p>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
<div class="dol-form-section-title">
<h2>Assurances</h2>
</div>
<div class="form-page">
<p>
I certify that I have read this form and to the best of my knowledge and belief, all answers and information given in the application and attachments are true; that the representations set forth in support of this application to obtain or continue the authorization to pay workers with disabilities at subminimum wage rates are true; and I acknowledge that the authorization, if issued or continued, is subject to revocation in accordance with the provisions of 29 C.F.R. part 525. I represent that as set forth in the regulations governing the employment of workers with disabilities, the following conditions exist and will continue to exist:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
<div class="dol-form-section-title">
<h2>Employer</h2>

<div class="dol-form-section-help">
<ul>
<li><a href="" ng-click="vm.showAllHelp = !vm.showAllHelp">Show Help for All Items</a></li>
</ul>
</div>
</div>
<div class="usa-alert usa-alert-error" role="alert" ng-show="validate('__employer')">
<div class="usa-alert-body">
<p class="usa-alert-text">Please review this page. There are errors or missing information that we need to collect before you can submit the form.</p>
</div>
</div>
<a href="" ng-click="vm.showAllHelp = !vm.showAllHelp">Show Help for All Items</a>
<div class="form-page">
<h3>Employer Information</h3>
<hr />
Expand Down Expand Up @@ -313,7 +321,7 @@ <h3>Government Contracts</h3>
</ul>
</fieldset>
</div>
<h3>Label for Section?</h3>
<h3>Additional Questions</h3>
<hr />
<div class="form-question-block" ng-class="validate('employer.representativePayee') ? 'usa-input-error' : ''">
<div class="form-question-text">Was the employer a representative payee Social Security Benefits during the most recently completed fiscal quarter?</div>
Expand Down Expand Up @@ -371,7 +379,7 @@ <h3>Label for Section?</h3>
</fieldset>
</div>
<div class="form-question-block" ng-class="validate('employer.temporaryAuthority') ? 'usa-input-error' : ''">
<div class="form-question-text">Is this a request for Temporarty Authority?</div>
<div class="form-question-text">Is this a request for Temporary Authority?</div>
<div class="form-question-subtext">Answer Yes if the application is being filed by a vocational rehabilitation program administered by a State agency or the U.S. Veterans Administration.</div>
<span class="usa-input-error-message" role="alert" ng-show="validate('employer.temporaryAuthority')">{{ validate('employer.temporaryAuthority') }}</span>
<fieldset class="usa-fieldset-inputs form-question-answer">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
<div class="dol-form-section-title">
<h2>Wage Data</h2>

<div class="dol-form-section-help">
<ul>
<li><a href="" ng-click="vm.showAllHelp = !vm.showAllHelp">Show Help for All Items</a></li>
<li><a href="" ng-click="vm.showLinks = !vm.showLinks">Helpful Links</a></li>
</ul>
</div>
</div>
<div class="usa-alert usa-alert-error" role="alert" ng-show="validate('__wagedata')">
<div class="usa-alert-body">
<p class="usa-alert-text">Please review this page. There are errors or missing information that we need to collect before you can submit the form.</p>
Expand Down Expand Up @@ -27,7 +37,6 @@
<wage-data-pay-type-form paytype="piecerate" show-all-help="vm.showAllHelp" ng-show="formData.payTypeId === 22 || (formData.payTypeId === 23 && vm.activeTab === 2)"></wage-data-pay-type-form>
</div>
<div class="form-sidebar">
<div><a href="" ng-click="vm.showAllHelp = !vm.showAllHelp">Show Help for All Items</a> | <a href="" ng-click="vm.showLinks = !vm.showLinks">Helpful Links</a></div>
<div class="links-block" ng-show="vm.showLinks === true">
Prevailing Wage Calculators:<br>
<a href="">Straight or Simple Average</a><br>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
<div class="dol-form-section-title">
<h2>WIOA</h2>

<div class="dol-form-section-help">
<ul>
<li><a href="" ng-click="vm.showAllHelp = !vm.showAllHelp">Show Help for All Items</a></li>
</ul>
</div>
</div>
<div class="usa-alert usa-alert-error" role="alert" ng-show="validate('__wioa')">
<div class="usa-alert-body">
<p class="usa-alert-text">Please review this page. There are errors or missing information that we need to collect before you can submit the form.</p>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
<div class="dol-form-section-title">
<h2>Work Sites &amp; Employees</h2>

<div class="dol-form-section-help">
<ul>
<li><a href="" ng-click="vm.showAllHelp = !vm.showAllHelp">Show Help for All Items</a></li>
</ul>
</div>
</div>
<div class="usa-alert usa-alert-error" role="alert" ng-show="validate('__worksites')">
<div class="usa-alert-body">
<p class="usa-alert-text">Please review this page. There are errors or missing information that we need to collect before you can submit the form.</p>
Expand Down
14 changes: 12 additions & 2 deletions DOL.WHD.Section14c.Web/src/modules/pages/landingPageTemplate.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
<div class="usa-grid">
<h1>Section 14(c) Certificate Application</h1>
<header role="header" class="dol-header-form">
<h1>Section 14(c) Certificate Application</h1>

<nav>
<ul>
<li><a href="">Dashboard</a></li>
<li><a href="" ng-click="vm.userClick()">{{ vm.stateService.user.email ? vm.stateService.user.email : "Username" }}</a></li>
<li><a href="" ng-click="vm.saveClick()">Sign Out</a></li>
</ul>
</nav>
</header>

<div class="usa-grid">
<div ng-if="!stateService.user.email">
<div class="usa-width-one-half">
<user-registration-form></user-registration-form>
Expand Down
40 changes: 39 additions & 1 deletion DOL.WHD.Section14c.Web/src/styles/defaults.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,41 @@
// Modified USWDS variables for DOL


// Typography
$font-sans: "Source Sans Pro", "Tahoma", "Helvetica Neue", "Helvetica", "Roboto", "Arial", sans-serif;

// Color
$color-primary: #224687 !default;
$color-primary-darker: #1E4072 !default;
$color-primary-darkest: #183560 !default;
$color-primary-darkest: #183560 !default;

$color-secondary: #990000;
$color-secondary-dark: #7b0000;
$color-secondary-darkest: #610000;

$color-white: #ffffff;
$color-base: #212121;
$color-black: #000000;

$color-gray-darker: #333333;
$color-gray-dark: #b3b3b3;
$color-gray: #afafaf;
$color-gray-medium: #c7c7c7;
$color-gray-light: #d9d9d9;
$color-gray-lighter: lighten($color-gray-dark, 80%);
$color-gray-lightest: #f3f3f3;

$color-green: #187d35;
$color-green-dark: #146a2d;
$color-green-darker: #115926;

$color-link: #003399;
$color-hover: $color-base;
$color-visited: #800080;

$text-color: $color-base;

// Mobile First Breakpoints
$small-screen: 481px;
$medium-screen: 600px;
$large-screen: 1201px;
88 changes: 74 additions & 14 deletions DOL.WHD.Section14c.Web/src/styles/forms.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,58 @@

.form-content,
.form-page-full {
h2 {
font-size: 3.4rem;
}

h3 {
font-size: 2.4rem;
}

.form-question-text {
font-size: 2rem;
}
}

.dol-form-section-title {
@include clearfix();

h2 {
margin: 0;
float: left;
}
}

.dol-form-section-help {
float: right;

ul {
padding: 0;
margin: 0;

li {
list-style-type: none;
display: inline-block;
padding-left: 1.5rem;
margin-top: 1.5rem;

&:first-of-type {
&:before {
content: "";
display: inline-block;
width: 20px;
height: 20px;
margin-right: 7px;
vertical-align: middle;
background: url('../images/dol-help-blue.png') center center;
background: url('../images/dol-help-blue.svg') center center;
background-size: contain;
}
}
}
}
}

@include nested(12) {

.form-page {
Expand Down Expand Up @@ -46,27 +101,32 @@
}

label.example {
color: lighten($text-color, 25%);
color: #666;
margin-left: 1.5rem;
}

.help-link {
display: inline-block;
width: 1.1em;
height: 1.1em;
line-height: 1.1em;
font-weight: 700;
border-radius: 50%;
vertical-align: middle;
text-align: center;
background-color: $help-link-color;
color: #fff;
width: 20px;
height: 20px;
vertical-align: -1px;
margin-left: 7px;
cursor: pointer;
background: url('../images/dol-help-blue.png') center center;
background: url('../images/dol-help-blue.svg') center center;
background-size: contain;
text-indent: -9999px;

&:hover {
opacity: 0.8;
}
}

.help-text {
font-weight: 400;
background-color: $help-em-color;
padding: 10px;
padding: 1rem;
margin-top: 1.5rem;
display: none;

&.show {
Expand Down Expand Up @@ -224,7 +284,7 @@
}

h2.form-section-header {
font: 20px $font-stack;
font-size: 20px;
font-weight: bold;
}

Expand Down Expand Up @@ -274,7 +334,7 @@
}

thead th, thead td {
background-color: $button-grey;
background-color: $color-gray-light;
}

td.button-column {
Expand Down Expand Up @@ -399,4 +459,4 @@
}
}
}
}
}
Loading

0 comments on commit e7b96ff

Please sign in to comment.