From 4f6e2b8d7f552676c5a82fe02979b128d2c1c7c0 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Mon, 11 Jun 2018 16:34:52 -0400 Subject: [PATCH] Add Organizational Info fields --- scss/base/_forms.scss | 12 ++ templates/requests/screen-0.html.to | 12 ++ templates/requests/screen-1.html.to | 157 ++++++++++++++++++++- templates/requests/screen-2.html.to | 205 ++++++++++------------------ templates/requests/screen-3.html.to | 3 +- templates/requests/screen-4.html.to | 2 +- templates/requests/screen-5.html.to | 5 +- templates/requests/screen-6.html.to | 10 -- 8 files changed, 254 insertions(+), 152 deletions(-) create mode 100644 templates/requests/screen-0.html.to delete mode 100644 templates/requests/screen-6.html.to diff --git a/scss/base/_forms.scss b/scss/base/_forms.scss index e69de29b..31f2f705 100644 --- a/scss/base/_forms.scss +++ b/scss/base/_forms.scss @@ -0,0 +1,12 @@ +from { + margin-bottom: 3rem; +} + +.usa-date-input label { + margin-top: 0; +} + + +.input-label { + margin-top: 1rem; +} diff --git a/templates/requests/screen-0.html.to b/templates/requests/screen-0.html.to new file mode 100644 index 00000000..a48e9b63 --- /dev/null +++ b/templates/requests/screen-0.html.to @@ -0,0 +1,12 @@ +{% extends '../requests_new.html.to' %} + +{% block form %} +

New JEDI Request

+ +

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?

+ +New Application +Existing Application +Sandbox Environment + +{% end %} \ No newline at end of file diff --git a/templates/requests/screen-1.html.to b/templates/requests/screen-1.html.to index a48e9b63..baa50df0 100644 --- a/templates/requests/screen-1.html.to +++ b/templates/requests/screen-1.html.to @@ -1,12 +1,157 @@ {% extends '../requests_new.html.to' %} {% block form %} -

New JEDI Request

+

Details of Use

+

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.

+
+

Application Details

+

These headings introduce, respectively, sections and subsections within your body copy. As you create these headings, follow the same guidelines that you use when writing section headings: Be succinct, descriptive, and precise.

-

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?

+ + + -New Application -Existing Application -Sandbox Environment -{% end %} \ No newline at end of file + + + + + + + + + + + + +
+ +
+
+ + +
+
+ + +
+
+ + +
+
+
+ + + + + +
+ +
+ +
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
+
+ + + + + +
+ +
+ +
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
+
+ + + + +

Computation

+

These headings introduce, respectively, sections and subsections within your body copy. As you create these headings, follow the same guidelines that you use when writing section headings: Be succinct, descriptive, and precise.

+ + + + + + + + + + +

Storage

+

The particulars of your body copy will be determined by the topic of your page. Regardless of topic, it’s a good practice to follow the inverted pyramid structure when writing copy: Begin with the information that’s most important to your users and then present information of less importance.

+ + + + + + + + + + +

Estimated Application Storage

+

The particulars of your body copy will be determined by the topic of your page. Regardless of topic, it’s a good practice to follow the inverted pyramid structure when writing copy: Begin with the information that’s most important to your users and then present information of less importance.

+ + + + + + + + + + + + + + + + +

+ + +
+ + +
+ + +{% end %} diff --git a/templates/requests/screen-2.html.to b/templates/requests/screen-2.html.to index baa50df0..26f60a93 100644 --- a/templates/requests/screen-2.html.to +++ b/templates/requests/screen-2.html.to @@ -1,157 +1,98 @@ {% extends '../requests_new.html.to' %} {% block form %} -

Details of Use

+ + +

Organizational Info

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.

+ +

Information About You

+ + + +
-

Application Details

-

These headings introduce, respectively, sections and subsections within your body copy. As you create these headings, follow the same guidelines that you use when writing section headings: Be succinct, descriptive, and precise.

+ + - - - + + + + - - - - - - - - - - - + +
- -
+ +
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
+
+ +
+ +
    +
  • + + +
    • +
  • + + +
    • +
  • + + +
    • +
+
+ + + +
+ + +
- - + +
- - + +
- - + +
+
- - +

Information About Your Collaborators

+
+

Please designate a Contracting Officer that will help you complete this process.

+ + -
- -
- -
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
-
- - - - - -
- -
- -
    -
  • - - -
    • -
  • - - -
    • -
  • - - -
    • -
-
- - - - -

Computation

-

These headings introduce, respectively, sections and subsections within your body copy. As you create these headings, follow the same guidelines that you use when writing section headings: Be succinct, descriptive, and precise.

- - - - - - - - - - -

Storage

-

The particulars of your body copy will be determined by the topic of your page. Regardless of topic, it’s a good practice to follow the inverted pyramid structure when writing copy: Begin with the information that’s most important to your users and then present information of less importance.

- - - - - - - - - - -

Estimated Application Storage

-

The particulars of your body copy will be determined by the topic of your page. Regardless of topic, it’s a good practice to follow the inverted pyramid structure when writing copy: Begin with the information that’s most important to your users and then present information of less importance.

- - - - - - - - - - - - - - - - -

- - -
- + +
- {% end %} + diff --git a/templates/requests/screen-3.html.to b/templates/requests/screen-3.html.to index a6c67aaf..aed60b90 100644 --- a/templates/requests/screen-3.html.to +++ b/templates/requests/screen-3.html.to @@ -1,8 +1,7 @@ {% extends '../requests_new.html.to' %} {% block form %} - -

Organizational Info

+

Funding/Contracting

{% end %} diff --git a/templates/requests/screen-4.html.to b/templates/requests/screen-4.html.to index aed60b90..1e864aee 100644 --- a/templates/requests/screen-4.html.to +++ b/templates/requests/screen-4.html.to @@ -1,7 +1,7 @@ {% extends '../requests_new.html.to' %} {% block form %} -

Funding/Contracting

+

Readiness Survey

{% end %} diff --git a/templates/requests/screen-5.html.to b/templates/requests/screen-5.html.to index 1e864aee..f5298ed9 100644 --- a/templates/requests/screen-5.html.to +++ b/templates/requests/screen-5.html.to @@ -1,7 +1,10 @@ {% extends '../requests_new.html.to' %} {% block form %} -

Readiness Survey

+

Review & Submit

{% end %} +{% block next %} +Submit to Contracting Officer +{% end %} diff --git a/templates/requests/screen-6.html.to b/templates/requests/screen-6.html.to deleted file mode 100644 index f5298ed9..00000000 --- a/templates/requests/screen-6.html.to +++ /dev/null @@ -1,10 +0,0 @@ -{% extends '../requests_new.html.to' %} - -{% block form %} -

Review & Submit

- -{% end %} - -{% block next %} -Submit to Contracting Officer -{% end %}