diff --git a/templates/workspaces/index.html b/templates/workspaces/index.html
index 6cedaa88..546529e2 100644
--- a/templates/workspaces/index.html
+++ b/templates/workspaces/index.html
@@ -5,7 +5,7 @@
- | Workspace Name |
+ Portfolio Name |
Task Order |
Users |
diff --git a/templates/workspaces/members/edit.html b/templates/workspaces/members/edit.html
index 64a9fd0b..61d37bd8 100644
--- a/templates/workspaces/members/edit.html
+++ b/templates/workspaces/members/edit.html
@@ -52,7 +52,7 @@
{% endif %}
{% if can_revoke_access %}
{{ ConfirmationButton (
- "Remove Workspace Access",
+ "Remove Portfolio Access",
url_for("workspaces.revoke_access", workspace_id=workspace.id, member_id=member.id),
confirm_msg="Are you sure? This will remove this user from the workspace.",
)}}
diff --git a/templates/workspaces/members/index.html b/templates/workspaces/members/index.html
index 9c0ae962..d1ceef7c 100644
--- a/templates/workspaces/members/index.html
+++ b/templates/workspaces/members/index.html
@@ -10,10 +10,10 @@
{% set user_can_invite = user_can(permissions.ASSIGN_AND_UNASSIGN_ATAT_ROLE) %}
{{ EmptyState(
- 'There are currently no members in this Workspace.',
+ 'There are currently no members in this Portfolio.',
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 Cloud workspace administrator to invite new members.',
+ sub_message=None if user_can_invite else 'Please contact your JEDI Cloud portfolio administrator to invite new members.',
icon='avatar'
) }}
diff --git a/templates/workspaces/projects/index.html b/templates/workspaces/projects/index.html
index 3244f3a0..548e2435 100644
--- a/templates/workspaces/projects/index.html
+++ b/templates/workspaces/projects/index.html
@@ -11,11 +11,11 @@
{% set can_create_projects = user_can(permissions.ADD_APPLICATION_IN_WORKSPACE) %}
{{ EmptyState(
- 'This workspace doesn’t have any projects yet.',
+ 'This portfolio doesn’t have any projects yet.',
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 Cloud workspace administrator to set up a new project.'
+ sub_message=None if can_create_projects else 'Please contact your JEDI Cloud portfolio administrator to set up a new project.'
) }}
{% else %}
diff --git a/templates/workspaces/reports/index.html b/templates/workspaces/reports/index.html
index 2aae11d2..830e9c37 100644
--- a/templates/workspaces/reports/index.html
+++ b/templates/workspaces/reports/index.html
@@ -6,7 +6,7 @@
{% block workspace_content %}
- {{ Alert("Budget Report for Workspace " + workspace.name,
+ {{ Alert("Budget Report for Portfolio " + workspace.name,
message="Track your monthly and cumulative expenditures for your workspace, projects, and environments below.
\
Please note that the projected spend is based on the average expense over the last three completed months and therefore does not account for future changes that might be made in scale or configuration of your cloud services.
",
actions=[
@@ -18,7 +18,7 @@
-
Workspace Total Spend
+
Portfolio Total Spend
{% set budget = workspace_totals['budget'] %}
{% set spent = workspace_totals['spent'] %}
@@ -116,9 +116,9 @@
{% if not workspace.projects %}
{% set can_create_projects = user_can(permissions.ADD_APPLICATION_IN_WORKSPACE) %}
- {% set message = 'This workspace has no cloud environments set up, so there is no spending data to report. Create a project with some cloud environments to get started.'
+ {% set message = 'This portfolio has no cloud environments set up, so there is no spending data to report. Create a project with some cloud environments to get started.'
if can_create_projects
- else 'This workspace has no cloud environments set up, so there is no spending data to report. Contact the workspace owner to set up some cloud environments.'
+ else 'This portfolio has no cloud environments set up, so there is no spending data to report. Contact the portfolio owner to set up some cloud environments.'
%}
{{ EmptyState(
diff --git a/templates/workspaces/task_orders/index.html b/templates/workspaces/task_orders/index.html
index 19de849c..5c716816 100644
--- a/templates/workspaces/task_orders/index.html
+++ b/templates/workspaces/task_orders/index.html
@@ -7,7 +7,7 @@
{% if not workspace.task_orders %}
{{ EmptyState(
- 'This workspace doesn’t have any task orders yet.',
+ 'This portfolio doesn’t have any task orders yet.',
action_label='Add a New Task Order',
action_href=url_for('task_orders.new', screen=1, workspace_id=workspace.id),
icon='cloud',
diff --git a/tests/routes/workspaces/test_members.py b/tests/routes/workspaces/test_members.py
index c93e85c6..41e40712 100644
--- a/tests/routes/workspaces/test_members.py
+++ b/tests/routes/workspaces/test_members.py
@@ -234,7 +234,7 @@ def test_does_not_show_any_buttons_if_owner(client, user_session):
member_id=workspace.owner.id,
)
)
- assert "Remove Workspace Access" not in response.data.decode()
+ assert "Remove Portfolio Access" not in response.data.decode()
assert "Resend Invitation" not in response.data.decode()
assert "Revoke Invitation" not in response.data.decode()
@@ -252,7 +252,7 @@ def test_only_shows_revoke_access_button_if_active(client, user_session):
member_id=member.user.id,
)
)
- assert "Remove Workspace Access" in response.data.decode()
+ assert "Remove Portfolio Access" in response.data.decode()
assert "Revoke Invitation" not in response.data.decode()
assert "Resend Invitation" not in response.data.decode()
@@ -271,7 +271,7 @@ def test_only_shows_revoke_invite_button_if_pending(client, user_session):
)
)
assert "Revoke Invitation" in response.data.decode()
- assert "Remove Workspace Access" not in response.data.decode()
+ assert "Remove Portfolio Access" not in response.data.decode()
assert "Resend Invitation" not in response.data.decode()
@@ -291,7 +291,7 @@ def test_only_shows_resend_button_if_expired(client, user_session):
)
assert "Resend Invitation" in response.data.decode()
assert "Revoke Invitation" not in response.data.decode()
- assert "Remove Workspace Access" not in response.data.decode()
+ assert "Remove Portfolio Access" not in response.data.decode()
def test_only_shows_resend_button_if_revoked(client, user_session):
@@ -308,5 +308,5 @@ def test_only_shows_resend_button_if_revoked(client, user_session):
)
)
assert "Resend Invitation" in response.data.decode()
- assert "Remove Workspace Access" not in response.data.decode()
+ assert "Remove Portfolio Access" not in response.data.decode()
assert "Revoke Invitation" not in response.data.decode()
diff --git a/translations.yaml b/translations.yaml
index 860fa292..3e626a21 100644
--- a/translations.yaml
+++ b/translations.yaml
@@ -54,7 +54,7 @@ forms:
phone_ext_mao_label: Extension (optional)
phone_mao_label: Mission Owner phone number (optional)
edit_member:
- workspace_role_label: Workspace Role
+ workspace_role_label: Portfolio Role
edit_user:
citizenship_description: What is your citizenship status?
date_latest_training_description: |
@@ -119,10 +119,10 @@ forms:
email_label: Email Address
first_name_label: First Name
last_name_label: Last Name
- workspace_role_description: 'The workspace role controls whether a member is permitted to organize a workspace into projects and environments, add members to this workspace, and view billing information.'
- workspace_role_label: Workspace Role
+ workspace_role_description: 'The portfolio role controls whether a member is permitted to organize a portfolio into projects and environments, add members to this portfolio, and view billing information.'
+ workspace_role_label: Portfolio Role
new_request:
- am_poc_label: I am the Workspace Owner
+ am_poc_label: I am the Portfolio Owner
average_daily_traffic_description: What is the average daily traffic you expect the systems under this cloud contract to use?
average_daily_traffic_gb_description: What is the average daily traffic you expect the systems under this cloud contract to use?
average_daily_traffic_gb_label: Average Daily Traffic (GB)
@@ -145,7 +145,7 @@ forms:
jedi_usage_description: Your answer will help us provide tangible examples to DoD leadership how and why commercial cloud resources are accelerating the Department's missions
jedi_usage_label: JEDI Usage
lname_poc_label: Last Name
- name_description: This name serves as a reference for your initial request and the associated workspace that will be created once this request is approved. You may edit this name later.
+ name_description: This name serves as a reference for your initial request and the associated portfolio that will be created once this request is approved. You may edit this name later.
name_label: Name Your Request
name_length_validation_message: Request names must be at least 4 and not more than 100 characters
num_software_systems_description: Estimate the number of software systems that will be supported by this JEDI Cloud access request
@@ -209,12 +209,12 @@ forms:
name_message: 'This field accepts letters, numbers, commas, apostrophes, hyphens, and periods.'
phone_number_message: Please enter a valid 5 or 10 digit phone number.
workspace:
- name_label: Workspace Name
- name_length_validation_message: Workspace names must be at least 4 and not more than 50 characters
+ name_label: Portfolio Name
+ name_length_validation_message: Portfolio names must be at least 4 and not more than 50 characters
fragments:
edit_project_form:
existing_project_title: 'Edit {project_name} project'
- explain: 'AT-AT allows you to organize your workspace into multiple projects, each of which may have environments.'
+ explain: 'AT-AT allows you to organize your portfolio into multiple projects, each of which may have environments.'
new_project_title: Add a new project
edit_user_form:
date_last_training_tooltip: When was the last time you completed the IA training?
Information Assurance (IA) training is an important step in cyber awareness.
@@ -225,7 +225,7 @@ fragments:
paragraph_2: 'While your request is being reviewed, your next step is to create a Task Order (TO) associated with the JEDI Cloud. Please contact a Contracting Officer (KO), Contracting Officer Representative (COR), or a Financial Manager to help with this step.'
pending_ccpo_approval_modal:
paragraph_1: The CCPO will review and respond to your Financial Verification submission in 3 business days. You will be notified via email or phone.
- paragraph_2: Once the financial verification is approved you will be invited to create your JEDI Workspace and set-up your projects. Click here for more details.
+ paragraph_2: Once the financial verification is approved you will be invited to create your JEDI Portfolio and set-up your projects. Click here for more details.
pending_financial_verification:
learn_more_link_text: Learn more about the JEDI Cloud Task Order and the Financial Verification process.
paragraph_1: 'The next step is to create a Task Order associated with JEDI Cloud. Please contact a Contracting Officer (KO), Contracting Officer Representative (COR), or a Financial Manager to help with this step.'
@@ -243,10 +243,10 @@ navigation:
topbar:
jedi_cloud_link_text: JEDI Cloud
logout_link_title: Log out of JEDI Cloud
- named_workspace: 'Workspace {workspace}'
- no_other_active_workspaces: You have no other active JEDI workspaces.
- other_active_workspaces: Other Active Workspaces
- request_workspace_link_text: Request a new JEDI Workspace
+ named_workspace: 'Portfolio {workspace}'
+ no_other_active_workspaces: You have no other active JEDI portfolios.
+ other_active_workspaces: Other Active Portfolios
+ request_workspace_link_text: Request a new JEDI Portfolio
workspace_navigation:
add_new_member_label: Add New Member
add_new_project_label: Add New Project
@@ -255,7 +255,7 @@ navigation:
members: Members
projects: Projects
task_orders: Task Orders
- workspace_settings: Workspace Settings
+ workspace_settings: Portfolio Settings
requests:
_new:
new_request: New Request
@@ -308,8 +308,8 @@ requests:
financial_verification_submitted_title: Financial Verification submitted!
no_requests_found: No requests found.
no_workspaces_action_label: Create a new JEDI Cloud Request
- no_workspaces_label: You currently have no JEDI Cloud workspaces.
- no_workspaces_sub_message: A JEDI Cloud Workspace is where you manage your projects and control user access to those projects.
+ no_workspaces_label: You currently have no JEDI Cloud portfolios.
+ no_workspaces_sub_message: A JEDI Cloud Portfolio is where you manage your projects and control user access to those projects.
pending_ccpo_action: Pending CCPO Action
request_submitted_title: Request submitted!
requests_in_progress: Requests in progress