diff --git a/atst/forms/financial.py b/atst/forms/financial.py index 19866b49..da4915f3 100644 --- a/atst/forms/financial.py +++ b/atst/forms/financial.py @@ -63,29 +63,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 d6aa1039..e6af039e 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 a2f047ef..f52914b2 100644 --- a/scss/elements/_panels.scss +++ b/scss/elements/_panels.scss @@ -67,5 +67,13 @@ @include grid-pad; } + h1 { + margin-bottom: 0; + } + + h2 { + color: $color-gray; + } + } 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 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..41b16f9a 100644 --- a/templates/nav-side.html.to +++ b/templates/nav-side.html.to @@ -1,40 +1,16 @@ - + + + \ 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/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: