From 50ec3cbb870513682d29832a5d2f694a63f25c5f Mon Sep 17 00:00:00 2001 From: rachel-dtr Date: Mon, 11 Feb 2019 15:45:42 -0500 Subject: [PATCH 1/9] Updates verbiage for Cloud Calculations --- translations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations.yaml b/translations.yaml index 1f5202b6..d5f60950 100644 --- a/translations.yaml +++ b/translations.yaml @@ -413,7 +413,7 @@ task_orders: estimate_usage_description: Calculate how much your cloud usage will cost. A technical representative from your team should help you complete this calculation. These calculations will become your CLINs. estimate_usage_paragraph: This is only an estimation tool to help you make an informed evaluation of what you expect to use. While you're tied to the dollar amount you specify in your task order, you're not obligated by the resources you indicate in the calculator. cloud_calculations_title: Cloud Usage Calculations - cloud_calculations_paragraph: Enter the results of your cloud usage calculations. + cloud_calculations_paragraph: Enter the results of your cloud usage calculations below. cloud_offerings_title: Cloud Offerings cloud_offerings_paragraph: Infrastructure as a Service (IaaS) and Platform as a Service (PaaS) offerings support_assistance_title: Cloud Support and Assistance From 5c09e0fb039ad882c7f188be35f2101b34933b2d Mon Sep 17 00:00:00 2001 From: rachel-dtr Date: Mon, 11 Feb 2019 15:50:52 -0500 Subject: [PATCH 2/9] Updates supporting text for KO --- translations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations.yaml b/translations.yaml index d5f60950..c874e269 100644 --- a/translations.yaml +++ b/translations.yaml @@ -422,7 +422,7 @@ task_orders: oversight: section_title: Oversight ko_info_title: Contracting Officer (KO) Information - ko_info_paragraph: Your KO will need to approve funding for this Task Order by logging into the JEDI Cloud Portal, submitting the Task Order documents within their official system of record, and electronically signing. You might want to work with your program Financial Manager to get your TO documents moving in the right dirction. + ko_info_paragraph: Your KO will need to approve funding for this Task Order by logging into the JEDI Cloud Portal, submitting the Task Order documents within their official system of record, and then finally providing a digital signature. It might be helpful to work with your program's Financial Manager to get your TO documents moving. skip_ko_label: "Skip for now (We'll remind you to enter one later)" cor_info_title: Contracting Officer Representative (COR) Information cor_info_paragraph: Your COR may assist in submitting the Task Order documents within their official system of record. They may also be invited to log in and manage the Task Order entry within the JEDI Cloud portal. From 91f5c4820bfe00aaf69089c231e17ab54961ab60 Mon Sep 17 00:00:00 2001 From: rachel-dtr Date: Mon, 11 Feb 2019 15:59:45 -0500 Subject: [PATCH 3/9] Updates Period of Performance text --- translations.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations.yaml b/translations.yaml index c874e269..3987d0be 100644 --- a/translations.yaml +++ b/translations.yaml @@ -408,7 +408,7 @@ task_orders: section_title: Funding performance_period_title: Period of Performance performance_period_description: Choose the length of time your task order will cover. - performance_period_paragraph: Because your funds will be lost if you don’t use them, we strongly recommend submitting small, short-duration task orders, usually a three month period. We’ll notify you when your period of performance is nearing the end so you can request your next set of funds with a new task order. + performance_period_paragraph: Be aware that your funds will be lost if you don’t use them. Because of this, we strongly recommend submitting small, short-duration task orders, usually around a three month period. We’ll notify you when your period of performance is nearing its end so you can request your next set of funds with a new task order. estimate_usage_title: Estimate Your Cloud Usage estimate_usage_description: Calculate how much your cloud usage will cost. A technical representative from your team should help you complete this calculation. These calculations will become your CLINs. estimate_usage_paragraph: This is only an estimation tool to help you make an informed evaluation of what you expect to use. While you're tied to the dollar amount you specify in your task order, you're not obligated by the resources you indicate in the calculator. @@ -438,7 +438,7 @@ task_orders: complexity: Project Complexity team: Development Team funding: Funding - performance_period: Period of Performance length + performance_period: Period of Performance usage_est_link: View Usage Estimate to_value: Task Order Value clin_1: 'CLIN #1: Unclassified Cloud' From 6344318c1eca9379ba36b9c020eaa32778fe8acd Mon Sep 17 00:00:00 2001 From: rachel-dtr Date: Mon, 11 Feb 2019 16:04:25 -0500 Subject: [PATCH 4/9] Updates email text in user profile --- translations.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/translations.yaml b/translations.yaml index 3987d0be..444f4fdb 100644 --- a/translations.yaml +++ b/translations.yaml @@ -76,7 +76,7 @@ forms: date_latest_training_label: Latest Information Assurance (IA) Training Completion Date designation_description: What is your designation within the DoD? designation_label: Designation of Person - email_description: Enter your preferred contact e-mail address + email_description: Enter your preferred e-mail address email_label: E-mail Address first_name_label: First Name last_name_label: Last Name From a2c9f28ad13c75ece4e732d399fa9de2021eb525 Mon Sep 17 00:00:00 2001 From: rachel-dtr Date: Tue, 12 Feb 2019 09:32:30 -0500 Subject: [PATCH 5/9] Updates Get Started content --- templates/task_orders/new/get_started.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/templates/task_orders/new/get_started.html b/templates/task_orders/new/get_started.html index 15418505..be8c897b 100644 --- a/templates/task_orders/new/get_started.html +++ b/templates/task_orders/new/get_started.html @@ -18,7 +18,7 @@

Let's get started

- To create a portfolio of JEDI cloud applications, you'll complete and submit a task order in your organization's system of record. We'll help you complete the necessary pieces of that task order, including your: + To create a portfolio of JEDI cloud applications, you'll need to submit a task order in your organization's system of record. We'll walk you through the necessary steps of that task order, including the following:

@@ -43,13 +43,13 @@ {{ Help( name="Security Lead", icon_name="shield", - description="Your security lead will review and approve your security classification needs, as well as a standardized DD-254.", - link_text="You'll need their DOD ID number") }} + description="Your security lead will review and approve your security classification needs. They will also review and complete a standardized DD-254.", + link_text="You'll need their DoD ID number") }} {{ Help( name="Contracting Officer", icon_name="dollar-sign", description="Your contracting officer will review your funding needs and ultimately approve your task order.", - link_text="You'll need their DOD ID number") }} + link_text="You'll need their DoD ID number") }} @@ -62,7 +62,7 @@ Let's do cloud!
-

Create a JEDI cloud application portfolio & start building a task order

+

Create a portfolio by starting a new task order

From 8ed34760481d6d94a727b081d1f4d854a64e4622 Mon Sep 17 00:00:00 2001 From: rachel-dtr Date: Tue, 12 Feb 2019 09:35:26 -0500 Subject: [PATCH 6/9] Updates Get Started content again --- templates/task_orders/new/get_started.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/task_orders/new/get_started.html b/templates/task_orders/new/get_started.html index be8c897b..b129b164 100644 --- a/templates/task_orders/new/get_started.html +++ b/templates/task_orders/new/get_started.html @@ -33,7 +33,7 @@
-

You'll need help getting a task order

+

You'll need a little help getting a task order

{{ Help( name="Development Lead", From 47f14b3f1fccab6343cd098b1c2083cce86c460e Mon Sep 17 00:00:00 2001 From: rachel-dtr Date: Tue, 12 Feb 2019 10:21:14 -0500 Subject: [PATCH 7/9] Updates About Your Project text --- translations.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/translations.yaml b/translations.yaml index 444f4fdb..ded7e506 100644 --- a/translations.yaml +++ b/translations.yaml @@ -182,15 +182,15 @@ forms: defense_component_label: Department of Defense Component app_migration: label: App Migration - description: Do you plan to migrate existing application(s) to the cloud? + description: Do you plan to migrate one or more existing application(s) to the cloud? on_premise: Yes, migrating from an on-premise data center cloud: Yes, migrating from another cloud provider both: Yes, migrating from an on-premise data center and another cloud provider none: Not planning to migrate any applications - not_sure: "Not Sure" + not_sure: "Not sure" native_apps: label: Native Apps - description: Do you plan to develop application(s) natively in the cloud? + description: Do you plan to develop any applications natively in the cloud? 'yes': Yes, planning to develop natively in the cloud 'no': No, not planning to develop natively in the cloud not_sure: Not sure, unsure if planning to develop natively in the cloud @@ -202,7 +202,7 @@ forms: conus: CONUS Access oconus: OCONUS Access tactical_edge: Tactical Edge Access - not_sure: Not Sure + not_sure: Not sure other: Other complexity_other_label: Project Complexity Other dev_team: @@ -399,7 +399,7 @@ task_orders: section_title: "What You're Making" basic_info_title: Basic information sample_scope: | - Not sure how to describe your scope? Read some Sample Scopes to get an idea of what is appropriate. + Not sure how to describe your scope? Read some examples to get some inspiration. project_title: About your project team_title: About your team market_research_title: Market Research From 61f75b968067f642908a310d792c23b27822368a Mon Sep 17 00:00:00 2001 From: rachel-dtr Date: Tue, 12 Feb 2019 13:38:16 -0500 Subject: [PATCH 8/9] Updates content in the TO flow --- translations.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/translations.yaml b/translations.yaml index ded7e506..a759b879 100644 --- a/translations.yaml +++ b/translations.yaml @@ -207,7 +207,7 @@ forms: complexity_other_label: Project Complexity Other dev_team: label: Development Team - description: Which people or teams will be completing the development work for your cloud applications? Select all that apply. + description: Who will be completing the development work for your cloud application(s)? Select all that apply. civilians: Government Civilians military: Military contractor: Contractor @@ -218,8 +218,8 @@ forms: description: How much experience does your team have with development in the cloud? none: No previous experience planned: Researched or planned a cloud build or migration - built_1: Built or Migrated 1-2 applications - built_3: Built or Migrated 3-5 applications + built_1: Built or migrated 1-2 applications + built_3: Built or migrated 3-5 applications built_many: Built or migrated many applications, or consulted on several such projects performance_length: label: Period of Performance length @@ -244,7 +244,7 @@ forms: cor_invite_label: Invite COR to Task Order Builder so_invite_label: Invite Security Officer to Task Order Builder skip_invite_description: | - You may choose to skip this for now and invite them later. + The invitation won't actually be sent until you click Done on the Review page. You can skip this for now and invite them later. validators: is_number_message: Please enter a valid number. list_item_required_message: Please provide at least one. @@ -400,8 +400,8 @@ task_orders: basic_info_title: Basic information sample_scope: | Not sure how to describe your scope? Read some examples to get some inspiration. - project_title: About your project - team_title: About your team + project_title: About Your Project + team_title: About Your Team market_research_title: Market Research market_research_paragraph: 'The JEDI Cloud Computing Program Office (CCPO) has completed the market research requirements for all related task orders. The Department of Defense CIO has approved this research.
View JEDI Market Research Memo' funding: From 8fb48b8f4166ca92e84e73d758e96ccd9a67868d Mon Sep 17 00:00:00 2001 From: rachel-dtr Date: Tue, 12 Feb 2019 14:09:37 -0500 Subject: [PATCH 9/9] Updates content on invitation checkbox & Basic Information title --- translations.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/translations.yaml b/translations.yaml index a759b879..ac897d24 100644 --- a/translations.yaml +++ b/translations.yaml @@ -244,7 +244,7 @@ forms: cor_invite_label: Invite COR to Task Order Builder so_invite_label: Invite Security Officer to Task Order Builder skip_invite_description: | - The invitation won't actually be sent until you click Done on the Review page. You can skip this for now and invite them later. + An invitation won't actually be sent until you click Done on the Review page. You can skip this for now and invite them later. validators: is_number_message: Please enter a valid number. list_item_required_message: Please provide at least one. @@ -397,7 +397,7 @@ task_orders: new: app_info: section_title: "What You're Making" - basic_info_title: Basic information + basic_info_title: Basic Information sample_scope: | Not sure how to describe your scope? Read some examples to get some inspiration. project_title: About Your Project