From 219f4a149735070f000cfff5024d1ec8a875f6f9 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Wed, 28 Nov 2018 17:09:05 -0500 Subject: [PATCH 1/5] Add routes and templates --- atst/routes/__init__.py | 10 ++++++++++ templates/csp_environment_access.html | 1 + templates/jedi_csp_calculator.html | 1 + 3 files changed, 12 insertions(+) create mode 100644 templates/csp_environment_access.html create mode 100644 templates/jedi_csp_calculator.html diff --git a/atst/routes/__init__.py b/atst/routes/__init__.py index 93f04601..7bea9305 100644 --- a/atst/routes/__init__.py +++ b/atst/routes/__init__.py @@ -143,3 +143,13 @@ def activity_history(): @bp.route("/about") def about(): return render_template("about.html") + + +@bp.route("/csp-environment-access") +def csp_environment_access(): + return render_template("csp_environment_access.html") + + +@bp.route("/jedi-csp-calculator") +def jedi_csp_calculator(): + return render_template("jedi_csp_calculator.html") diff --git a/templates/csp_environment_access.html b/templates/csp_environment_access.html new file mode 100644 index 00000000..3331e70d --- /dev/null +++ b/templates/csp_environment_access.html @@ -0,0 +1 @@ +

You are now being taken to the Cloud Service Provider's console for this environment!

diff --git a/templates/jedi_csp_calculator.html b/templates/jedi_csp_calculator.html new file mode 100644 index 00000000..1d4ee41a --- /dev/null +++ b/templates/jedi_csp_calculator.html @@ -0,0 +1 @@ +

You are now being taken to the Cloud Service Provider's service and price calculator!

From b49c6b0f3899366e3dfba9800aa516d78cda6b54 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Thu, 29 Nov 2018 11:04:02 -0500 Subject: [PATCH 2/5] Add urls to templates --- atst/forms/new_request.py | 2 +- templates/workspaces/projects/index.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/atst/forms/new_request.py b/atst/forms/new_request.py index bc05f412..73f005f5 100644 --- a/atst/forms/new_request.py +++ b/atst/forms/new_request.py @@ -113,7 +113,7 @@ class DetailsOfUseForm(CacheableForm): # Details of Use: Financial Usage estimated_monthly_spend = IntegerField( "Estimated Monthly Spend", - description='Use the JEDI CSP Calculator to estimate your monthly cloud resource usage and enter the dollar amount below. Note these estimates are for initial approval only. After the request is approved, you will be asked to provide a valid Task Order number with specific CLIN amounts for cloud services.', + description='Use the JEDI CSP Calculator to estimate your monthly cloud resource usage and enter the dollar amount below. Note these estimates are for initial approval only. After the request is approved, you will be asked to provide a valid Task Order number with specific CLIN amounts for cloud services.', ) dollar_value = IntegerField( diff --git a/templates/workspaces/projects/index.html b/templates/workspaces/projects/index.html index 3c073ade..fc907b90 100644 --- a/templates/workspaces/projects/index.html +++ b/templates/workspaces/projects/index.html @@ -35,7 +35,7 @@