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 @@
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 @@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 @@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.