From a0f5ac3588fd46855cc070d69c3477facf613071 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Tue, 10 Jul 2018 11:07:38 -0400 Subject: [PATCH 1/5] Add sidenav to requests page --- templates/home.html.to | 6 +++ templates/nav-side.html.to | 48 +++++---------------- templates/requests.html.to | 78 +++++++++++++++++++++------------- templates/requests_new.html.to | 9 +--- 4 files changed, 67 insertions(+), 74 deletions(-) diff --git a/templates/home.html.to b/templates/home.html.to index 4003234c..e5f7c8f7 100644 --- a/templates/home.html.to +++ b/templates/home.html.to @@ -1,5 +1,9 @@ {% extends "base.html.to" %} +{% block sidenav %} +{% include 'nav-side.html.to' %} +{% end %} + {% block content %}
@@ -10,3 +14,5 @@ {% end %} + + diff --git a/templates/nav-side.html.to b/templates/nav-side.html.to index 547ee714..4c17c7f6 100644 --- a/templates/nav-side.html.to +++ b/templates/nav-side.html.to @@ -1,40 +1,14 @@ - + + + \ No newline at end of file diff --git a/templates/requests.html.to b/templates/requests.html.to index 431d9175..ff1835ce 100644 --- a/templates/requests.html.to +++ b/templates/requests.html.to @@ -1,39 +1,57 @@ {% extends "base.html.to" %} +{% block sidenav %} +{% include 'nav-side.html.to' %} +{% end %} + {% block content %} -
- -

Requests New Request

- - - - - - - - - - - - - - {% for r in requests %} - - {% end %} - - - - - - - {% end %} - -
Order IDRequest DateRequesterTotal AppsStatusActions
{{ r['order_id'] }} - {% if r['is_new'] %}New{{ r['date'] }}{{ r['full_name'] }}{{ r['app_count'] }}{{ r['status'] }}Download
-
+ +
+ +
+ +
+ +
+

Requests New Request

+
+ + + + + + + + + + + + + + {% for r in requests %} + + + {% end %} + + + + + + + {% end %} + +
Order IDRequest DateRequesterTotal AppsStatusActions
{{ r['order_id'] }} + {% if r['is_new'] %}New + {{ r['date'] }}{{ r['full_name'] }}{{ r['app_count'] }}{{ r['status'] }}Download
+ + + +
+
+
{% end %} diff --git a/templates/requests_new.html.to b/templates/requests_new.html.to index 5437a8a6..2fe33e54 100644 --- a/templates/requests_new.html.to +++ b/templates/requests_new.html.to @@ -16,9 +16,7 @@

New Request

- - - + {% if request_id %}
{% else %} @@ -33,10 +31,7 @@ {% end %}
- - - - +
From 1c360784b25bffb4f538b44dbcd17ed07b8d85f2 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Tue, 10 Jul 2018 11:19:59 -0400 Subject: [PATCH 2/5] Add few cosmetic changes to the request form, made some updates to form verbiage --- atst/forms/financial.py | 12 ++++++------ atst/forms/request.py | 11 +++-------- scss/elements/_panels.scss | 8 ++++++++ templates/requests/screen-1.html.to | 6 +++--- templates/requests/screen-2.html.to | 2 +- templates/requests/screen-3.html.to | 2 +- templates/requests/screen-4.html.to | 2 +- templates/requests/screen-5.html.to | 2 +- 8 files changed, 24 insertions(+), 21 deletions(-) diff --git a/atst/forms/financial.py b/atst/forms/financial.py index 5654495b..b8cae4c6 100644 --- a/atst/forms/financial.py +++ b/atst/forms/financial.py @@ -59,29 +59,29 @@ class FinancialForm(Form): ) clin_0001 = StringField( - "CLIN 0001 - Unclassified IaaS and PaaS Amount", validators=[Required()] + "CLIN 0001 - Unclassified IaaS and PaaS Amount", validators=[Required()] ) clin_0003 = StringField( - "CLIN 0003 - Unclassified Cloud Support Package", validators=[Required()] + "CLIN 0003 - Unclassified Cloud Support Package", validators=[Required()] ) clin_1001 = StringField( - "CLIN 1001 - Unclassified IaaS and PaaS Amount OPTION PERIOD 1", + "CLIN 1001 - Unclassified IaaS and PaaS Amount
OPTION PERIOD 1", validators=[Required()], ) clin_1003 = StringField( - "CLIN 1003 - Unclassified Cloud Support Package OPTION PERIOD 1", + "CLIN 1003 - Unclassified Cloud Support Package
OPTION PERIOD 1", validators=[Required()], ) clin_2001 = StringField( - "CLIN 2001 - Unclassified IaaS and PaaS Amount OPTION PERIOD 2", + "CLIN 2001 - Unclassified IaaS and PaaS Amount
OPTION PERIOD 2", validators=[Required()], ) clin_2003 = StringField( - "CLIN 2003 - Unclassified Cloud Support Package OPTION PERIOD 2", + "CLIN 2003 - Unclassified Cloud Support Package
OPTION PERIOD 2", validators=[Required()], ) diff --git a/atst/forms/request.py b/atst/forms/request.py index 36aa2043..0029a22e 100644 --- a/atst/forms/request.py +++ b/atst/forms/request.py @@ -16,7 +16,7 @@ class RequestForm(Form): ) num_applications = IntegerField( - "Please estimate the number of applications that might be supported by this request", + "Estimate the number of applications that might be supported by this request", validators=[InputRequired(), NumberRange(min=1)], ) @@ -32,7 +32,7 @@ class RequestForm(Form): ) app_description = TextAreaField( - "Please briefly describe how your team is expecting to use the JEDI Cloud" + "Describe how your team is expecting to use the JEDI Cloud" ) supported_organizations = StringField( @@ -70,11 +70,6 @@ class RequestForm(Form): validators=[InputRequired()], ) - supporting_organization = TextAreaField( - "Please describe the organizations that are supporting you, include both government and contractor resources", - validators=[InputRequired()], - ) - has_migration_office = RadioField( "Do you have a migration office that you're working with to migrate to the cloud?", choices=[("yes", "Yes"), ("no", "No")], @@ -82,6 +77,6 @@ class RequestForm(Form): ) supporting_organization = StringField( - "Please describe the organizations that are supporting you, include both government and contractor resources.", + "Describe the organizations that are supporting you, include both government and contractor resources", validators=[InputRequired()], ) diff --git a/scss/elements/_panels.scss b/scss/elements/_panels.scss index 6f655012..04bf75f9 100644 --- a/scss/elements/_panels.scss +++ b/scss/elements/_panels.scss @@ -54,5 +54,13 @@ @include grid-pad; } + h1 { + margin-bottom: 0; + } + + h2 { + color: $color-gray; + } + } diff --git a/templates/requests/screen-1.html.to b/templates/requests/screen-1.html.to index e82ad01f..efbf57eb 100644 --- a/templates/requests/screen-1.html.to +++ b/templates/requests/screen-1.html.to @@ -13,7 +13,7 @@

Overall Request Details

-

Please help us understand the size and scope of your resource request.

+

Please help us understand the size and scope of your resource request.

{{ f.dollar_value.label }} {{ f.dollar_value(placeholder="Total dollar amount to be associated with the Task Order")}} @@ -59,7 +59,7 @@

Cloud Resources

-

Please tell us about your expected cloud resource usage as best as you can. Refer to the Cloud Service Provider as necessary.

+

Please tell us about your expected cloud resource usage as best as you can. Refer to the Cloud Service Provider as necessary.

{{ f.total_cores.label }} {{ f.total_cores(placeholder="Expected total cores", min="1", max="32") }} @@ -105,7 +105,7 @@

Support Staff

-

We want to learn more about the people helping you with the cloud.

+

We want to learn more about the people helping you with the cloud.

diff --git a/templates/requests/screen-2.html.to b/templates/requests/screen-2.html.to index 984d6a15..951cfe6f 100644 --- a/templates/requests/screen-2.html.to +++ b/templates/requests/screen-2.html.to @@ -9,7 +9,7 @@

Information About You

-

Please tell us more about yourself.

+

Please tell us more about yourself.

{{ f.fname_request.label }} {{ f.fname_request(placeholder="Your first name") }} diff --git a/templates/requests/screen-3.html.to b/templates/requests/screen-3.html.to index c8ecdb99..15c26b51 100644 --- a/templates/requests/screen-3.html.to +++ b/templates/requests/screen-3.html.to @@ -8,7 +8,7 @@ {% end %}

Primary Government/Military
Point of Contact (POC)

-

Please designate a Primary Point of Contact that will be responsible for owning the workspace in the JEDI Cloud.

+

Please designate a Primary Point of Contact that will be responsible for owning the workspace in the JEDI Cloud.

The Point of Contact will become the primary owner of the workspace created to use the JEDI Cloud. As a workspace owner, this person will have the ability to:

  • Create multiple application stacks and environments in the workspace to access the commercial cloud service provider portal
    • diff --git a/templates/requests/screen-4.html.to b/templates/requests/screen-4.html.to index 97b89859..d60dd907 100644 --- a/templates/requests/screen-4.html.to +++ b/templates/requests/screen-4.html.to @@ -8,7 +8,7 @@ {% end %}

    Review & Submit

    -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Autem ullam veritatis fuga non repellendus repellat dolorum labore nulla iure aspernatur ipsam recusandae saepe harum iste, dolorem adipisci dolores eum, doloribus?

    +

    Before you can submit your request, please take a moment to review the information entered in the form. You may make changes by clicking the edit link on each section. When all information looks right, go ahead and submit.

    Details of Use Edit

    diff --git a/templates/requests/screen-5.html.to b/templates/requests/screen-5.html.to index 0a87e206..e6b1a179 100644 --- a/templates/requests/screen-5.html.to +++ b/templates/requests/screen-5.html.to @@ -9,7 +9,7 @@

    Financial Verification

    -

    In order to get you access to the JEDI Cloud, we will need you to enter the details below that will help us verify and account for your Task Order.

    +

    In order to get you access to the JEDI Cloud, we will need you to enter the details below that will help us verify and account for your Task Order.

    {{ f.task_order_id.label }} {{ f.task_order_id(placeholder="Example: 1234567899C0001") }} From 40328dea6ab6b9cef69dd5a24ee2d4a88dcbd117 Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Tue, 10 Jul 2018 13:55:51 -0400 Subject: [PATCH 3/5] Add each link to their own li --- templates/nav-side.html.to | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/nav-side.html.to b/templates/nav-side.html.to index 4c17c7f6..41b16f9a 100644 --- a/templates/nav-side.html.to +++ b/templates/nav-side.html.to @@ -2,6 +2,8 @@ From 14281703826afe5bcfe6b116a8f95f173edde09b Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Tue, 17 Jul 2018 14:29:54 -0400 Subject: [PATCH 4/5] Treat form label as definition of field --- atst/forms/financial.py | 12 ++++++------ scss/elements/_typography.scss | 5 +++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/atst/forms/financial.py b/atst/forms/financial.py index b8cae4c6..23e6a27d 100644 --- a/atst/forms/financial.py +++ b/atst/forms/financial.py @@ -59,29 +59,29 @@ class FinancialForm(Form): ) clin_0001 = StringField( - "CLIN 0001 - Unclassified IaaS and PaaS Amount", validators=[Required()] + "
    CLIN 0001
    - Unclassified IaaS and PaaS Amount
    ", validators=[Required()] ) clin_0003 = StringField( - "CLIN 0003 - Unclassified Cloud Support Package", validators=[Required()] + "
    CLIN 0003
    - Unclassified Cloud Support Package
    ", validators=[Required()] ) clin_1001 = StringField( - "CLIN 1001 - Unclassified IaaS and PaaS Amount
    OPTION PERIOD 1", + "
    CLIN 1001
    - Unclassified IaaS and PaaS Amount
    OPTION PERIOD 1
    ", validators=[Required()], ) clin_1003 = StringField( - "CLIN 1003 - Unclassified Cloud Support Package
    OPTION PERIOD 1", + "
    CLIN 1003
    - Unclassified Cloud Support Package
    OPTION PERIOD 1
    ", validators=[Required()], ) clin_2001 = StringField( - "CLIN 2001 - Unclassified IaaS and PaaS Amount
    OPTION PERIOD 2", + "
    CLIN 2001
    - Unclassified IaaS and PaaS Amount
    OPTION PERIOD 2
    ", validators=[Required()], ) clin_2003 = StringField( - "CLIN 2003 - Unclassified Cloud Support Package
    OPTION PERIOD 2", + "
    CLIN 2003
    - Unclassified Cloud Support Package
    OPTION PERIOD 2
    ", validators=[Required()], ) diff --git a/scss/elements/_typography.scss b/scss/elements/_typography.scss index 23637cd6..87022e95 100644 --- a/scss/elements/_typography.scss +++ b/scss/elements/_typography.scss @@ -32,3 +32,8 @@ a > span { box-shadow 0.2s, color 0.2s, } + +dt { + display: inline; + font-weight: bold; +} \ No newline at end of file From 162c8d12c5ca2b90999d010048776294c859163f Mon Sep 17 00:00:00 2001 From: Luis Cielak Date: Tue, 17 Jul 2018 14:50:52 -0400 Subject: [PATCH 5/5] Add dd to definition of field --- atst/forms/financial.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/atst/forms/financial.py b/atst/forms/financial.py index 23e6a27d..dfa2550c 100644 --- a/atst/forms/financial.py +++ b/atst/forms/financial.py @@ -59,29 +59,29 @@ class FinancialForm(Form): ) clin_0001 = StringField( - "
    CLIN 0001
    - Unclassified IaaS and PaaS Amount
    ", validators=[Required()] + "
    CLIN 0001
    -
    Unclassified IaaS and PaaS Amount
    ", validators=[Required()] ) clin_0003 = StringField( - "
    CLIN 0003
    - Unclassified Cloud Support Package
    ", validators=[Required()] + "
    CLIN 0003
    -
    Unclassified Cloud Support Package
    ", validators=[Required()] ) clin_1001 = StringField( - "
    CLIN 1001
    - Unclassified IaaS and PaaS Amount
    OPTION PERIOD 1
    ", + "
    CLIN 1001
    -
    Unclassified IaaS and PaaS Amount
    OPTION PERIOD 1
    ", validators=[Required()], ) clin_1003 = StringField( - "
    CLIN 1003
    - Unclassified Cloud Support Package
    OPTION PERIOD 1
    ", + "
    CLIN 1003
    -
    Unclassified Cloud Support Package
    OPTION PERIOD 1
    ", validators=[Required()], ) clin_2001 = StringField( - "
    CLIN 2001
    - Unclassified IaaS and PaaS Amount
    OPTION PERIOD 2
    ", + "
    CLIN 2001
    -
    Unclassified IaaS and PaaS Amount
    OPTION PERIOD 2
    ", validators=[Required()], ) clin_2003 = StringField( - "
    CLIN 2003
    - Unclassified Cloud Support Package
    OPTION PERIOD 2
    ", + "
    CLIN 2003
    -
    Unclassified Cloud Support Package
    OPTION PERIOD 2
    ", validators=[Required()], )