From 7471d062e12f79bbbc16d83bf9e331fbb3127b6c Mon Sep 17 00:00:00 2001 From: luis cielak Date: Thu, 16 Aug 2018 10:44:42 -0400 Subject: [PATCH] Update tooltips --- atst/forms/financial.py | 13 ++++++++---- .../requests/financial_verification.html | 20 +++++++------------ 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/atst/forms/financial.py b/atst/forms/financial.py index f7368f46..d76692b7 100644 --- a/atst/forms/financial.py +++ b/atst/forms/financial.py @@ -62,11 +62,11 @@ class FinancialForm(ValidatedForm): return valid task_order_id = StringField( - "Task Order Number associated with this request.", validators=[Required()] + "Task Order Number associated with this request", validators=[Required()] ) uii_ids = NewlineListField( - "Unique Item Identifier (UII)s related to your application(s) if you already have them." + "Unique Item Identifier (UII)s related to your application(s) if you already have them" ) pe_id = StringField("Program Element (PE) Number related to your request", validators=[Required()]) @@ -106,8 +106,7 @@ class FinancialForm(ValidatedForm): ("OM", "Operations & Maintenance (O&M)"), ("PROC", "Procurement (PROC)"), ("OTHER", "Other"), - ], - validators=[Required()] + ] ) funding_type_other = StringField( @@ -117,29 +116,35 @@ class FinancialForm(ValidatedForm): clin_0001 = StringField( "
CLIN 0001
-
Unclassified IaaS and PaaS Amount
", validators=[Required()], + description="Review your task order document, the amounts for each CLIN must match exactly here" ) clin_0003 = StringField( "
CLIN 0003
-
Unclassified Cloud Support Package
", validators=[Required()], + description="Review your task order document, the amounts for each CLIN must match exactly here" ) clin_1001 = StringField( "
CLIN 1001
-
Unclassified IaaS and PaaS Amount
OPTION PERIOD 1
", validators=[Required()], + description="Review your task order document, the amounts for each CLIN must match exactly here" ) clin_1003 = StringField( "
CLIN 1003
-
Unclassified Cloud Support Package
OPTION PERIOD 1
", validators=[Required()], + description="Review your task order document, the amounts for each CLIN must match exactly here" ) clin_2001 = StringField( "
CLIN 2001
-
Unclassified IaaS and PaaS Amount
OPTION PERIOD 2
", validators=[Required()], + description="Review your task order document, the amounts for each CLIN must match exactly here" ) clin_2003 = StringField( "
CLIN 2003
-
Unclassified Cloud Support Package
OPTION PERIOD 2
", validators=[Required()], + description="Review your task order document, the amounts for each CLIN must match exactly here" ) diff --git a/templates/requests/financial_verification.html b/templates/requests/financial_verification.html index 37141b68..cec36d27 100644 --- a/templates/requests/financial_verification.html +++ b/templates/requests/financial_verification.html @@ -106,7 +106,7 @@ ) }} {{ OptionsInput( - f.funding_type, + f.funding_type ) }} {{ TextInput( @@ -115,37 +115,31 @@ {{ TextInput( f.clin_0001,placeholder="50,000", - validation='integer', - tooltip="Review your task order document, the amounts for each CLIN must match exactly here." + validation='integer' ) }} {{ TextInput( f.clin_0003,placeholder="13,000", - validation='integer', - tooltip="Review your task order document, the amounts for each CLIN must match exactly here." + validation='integer' ) }} {{ TextInput( f.clin_1001,placeholder="30,000", - validation='integer', - tooltip="Review your task order document, the amounts for each CLIN must match exactly here." + validation='integer' ) }} {{ TextInput( f.clin_1003,placeholder="7,000", - validation='integer', - tooltip="Review your task order document, the amounts for each CLIN must match exactly here." + validation='integer' ) }} {{ TextInput( f.clin_2001,placeholder="30,000", - validation='integer', - tooltip="Review your task order document, the amounts for each CLIN must match exactly here." + validation='integer' ) }} {{ TextInput(f.clin_2003,placeholder="7,000", - validation='integer', - tooltip="Review your task order document, the amounts for each CLIN must match exactly here." + validation='integer' ) }}