From 9308f0eb7b1713a13584d1230a006a07a26255c0 Mon Sep 17 00:00:00 2001
From: luis cielak
Date: Thu, 13 Sep 2018 13:29:16 -0400
Subject: [PATCH] Change all instance of JEDI to JEDI Cloud
---
templates/error_base.html | 2 +-
templates/fragments/pending_ccpo_approval_alert.html | 2 +-
templates/fragments/pending_ccpo_approval_modal.html | 2 +-
templates/fragments/pending_financial_verification.html | 2 +-
templates/navigation/topbar.html | 2 +-
templates/requests/_review.html | 4 ++--
templates/requests/approval.html | 2 +-
templates/requests/index.html | 4 ++--
templates/requests/screen-1.html | 2 +-
templates/requests/screen-3.html | 2 +-
templates/workspaces/members/index.html | 2 +-
templates/workspaces/projects/index.html | 2 +-
12 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/templates/error_base.html b/templates/error_base.html
index 5ef0878d..efe3f113 100644
--- a/templates/error_base.html
+++ b/templates/error_base.html
@@ -3,7 +3,7 @@
- {% block title %}JEDI{% endblock %}
+ {% block title %}JEDI Cloud{% endblock %}
{% assets "css" %}
{% endassets %}
diff --git a/templates/fragments/pending_ccpo_approval_alert.html b/templates/fragments/pending_ccpo_approval_alert.html
index 5c4036ea..78ec1707 100644
--- a/templates/fragments/pending_ccpo_approval_alert.html
+++ b/templates/fragments/pending_ccpo_approval_alert.html
@@ -7,5 +7,5 @@
- Learn more about the JEDI Task Order and the Financial Verification process.
+ Learn more about the JEDI Cloud Task Order and the Financial Verification process.
diff --git a/templates/fragments/pending_ccpo_approval_modal.html b/templates/fragments/pending_ccpo_approval_modal.html
index bfedc8b6..f414b4ad 100644
--- a/templates/fragments/pending_ccpo_approval_modal.html
+++ b/templates/fragments/pending_ccpo_approval_modal.html
@@ -31,5 +31,5 @@
- Learn more about the JEDI Task Order and the Financial Verification process.
+ Learn more about the JEDI Cloud Task Order and the Financial Verification process.
diff --git a/templates/fragments/pending_financial_verification.html b/templates/fragments/pending_financial_verification.html
index 858b3e26..2bbfdf7e 100644
--- a/templates/fragments/pending_financial_verification.html
+++ b/templates/fragments/pending_financial_verification.html
@@ -8,5 +8,5 @@
details about the task order in the Financial Verification step.
- Learn more about the JEDI Task Order and the Financial Verification process.
+ Learn more about the JEDI Cloud Task Order and the Financial Verification process.
diff --git a/templates/navigation/topbar.html b/templates/navigation/topbar.html
index f560df6e..4db599f3 100644
--- a/templates/navigation/topbar.html
+++ b/templates/navigation/topbar.html
@@ -2,7 +2,7 @@
-
+
{{ Icon('shield', classes='topbar__link-icon') }}
diff --git a/templates/requests/_review.html b/templates/requests/_review.html
index 8a2e40d4..4caeaf53 100644
--- a/templates/requests/_review.html
+++ b/templates/requests/_review.html
@@ -39,11 +39,11 @@
{{ DefinitionReviewField("DoD Component", "details_of_use", "dod_component", filter="getOptionLabel", filter_args=[service_branches]) }}
- {{ DefinitionReviewField("JEDI Usage", "details_of_use", "jedi_usage") }}
+ {{ DefinitionReviewField("JEDI Cloud Usage", "details_of_use", "jedi_usage") }}
{{ DefinitionReviewField("Number of software systems", "details_of_use", "num_software_systems", filter="readableInteger") }}
- {{ DefinitionReviewField("JEDI Migration", "details_of_use", "jedi_migration") }}
+ {{ DefinitionReviewField("JEDI Cloud Migration", "details_of_use", "jedi_migration") }}
{% if data['details_of_use']['jedi_migration'] == 'yes' %}
{{ DefinitionReviewField("Rationalization of Software Systems", "details_of_use", "rationalization_software_systems") }}
diff --git a/templates/requests/approval.html b/templates/requests/approval.html
index a8e7f450..b9559712 100644
--- a/templates/requests/approval.html
+++ b/templates/requests/approval.html
@@ -45,7 +45,7 @@
Instructions for the Requestor
- Provide instructions or notes for additional information that is necessary to approve the request here. The requestor may then re-submit the updated request or initiate contact outside of AT-AT if further discussion is required. These notes will be visible to the person making the JEDI request .
+ Provide instructions or notes for additional information that is necessary to approve the request here. The requestor may then re-submit the updated request or initiate contact outside of AT-AT if further discussion is required. These notes will be visible to the person making the JEDI Cloud request .
{{ TextInput(f.comment, paragraph=True, placeholder="Add notes or comments explaining what changes are being requested or why further discussion is needed about this request.") }}
diff --git a/templates/requests/index.html b/templates/requests/index.html
index 334b8240..dfee7184 100644
--- a/templates/requests/index.html
+++ b/templates/requests/index.html
@@ -36,8 +36,8 @@
{% if not requests %}
{{ EmptyState(
- 'You currently have no JEDI workspaces.',
- sub_message='A JEDI Workspace is where you manage your projects and control user access to those projects.',
+ 'You currently have no JEDI Cloud workspaces.',
+ sub_message='A JEDI Cloud Workspace is where you manage your projects and control user access to those projects.',
action_label='Create a new JEDI Cloud Request',
action_href=url_for('requests.requests_form_new', screen=1),
icon='document'
diff --git a/templates/requests/screen-1.html b/templates/requests/screen-1.html
index fdd9f44e..a3b3c871 100644
--- a/templates/requests/screen-1.html
+++ b/templates/requests/screen-1.html
@@ -76,7 +76,7 @@
- {{ TextInput(f.dollar_value, validation='dollars', placeholder='$0', tooltip='You may specify a different Total Spend amount to cover other JEDI Cloud services that the JEDI cost calculator was not able to estimate. Examples may include support packages from the cloud service provider.') }}
+ {{ TextInput(f.dollar_value, validation='dollars', placeholder='$0', tooltip='You may specify a different Total Spend amount to cover other JEDI Cloud services that the JEDI Cloud cost calculator was not able to estimate. Examples may include support packages from the cloud service provider.') }}
{{ DateInput(f.start_date, placeholder='MM / DD / YYYY', validation='date') }}
diff --git a/templates/requests/screen-3.html b/templates/requests/screen-3.html
index cabead7c..1281efa4 100644
--- a/templates/requests/screen-3.html
+++ b/templates/requests/screen-3.html
@@ -20,7 +20,7 @@
-
The Workspace Owner is the primary point of contact and technical administrator of the JEDI Workspace and will have the
+
The Workspace Owner is the primary point of contact and technical administrator of the JEDI Cloud Workspace and will have the
following responsibilities:
Organize your cloud-hosted systems into projects and environments
diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html
index 60d0d431..02b721a1 100644
--- a/templates/workspaces/members/index.html
+++ b/templates/workspaces/members/index.html
@@ -13,7 +13,7 @@
'There are currently no members in this Workspace.',
action_label='Invite a new Member' if user_can_invite else None,
action_href='/members/new' if user_can_invite else None,
- sub_message=None if user_can_invite else 'Please contact your JEDI workspace administrator to invite new members.',
+ sub_message=None if user_can_invite else 'Please contact your JEDI Cloud workspace administrator to invite new members.',
icon='avatar'
) }}
diff --git a/templates/workspaces/projects/index.html b/templates/workspaces/projects/index.html
index 8dfaf373..0ae585fa 100644
--- a/templates/workspaces/projects/index.html
+++ b/templates/workspaces/projects/index.html
@@ -16,7 +16,7 @@
action_label='Add a New Project' if can_create_projects else None,
action_href=url_for('workspaces.new_project', workspace_id=workspace.id) if can_create_projects else None,
icon='cloud',
- sub_message=None if can_create_projects else 'Please contact your JEDI workspace administrator to set up a new project.'
+ sub_message=None if can_create_projects else 'Please contact your JEDI Cloud workspace administrator to set up a new project.'
) }}
{% else %}