rename Workspace to Portfolio in user-facing contexts

This commit is contained in:
dandds
2019-01-10 15:28:34 -05:00
parent b8c36f371f
commit 142395f1e9
21 changed files with 54 additions and 54 deletions

View File

@@ -13,7 +13,7 @@
<div class="panel">
<div class="panel__heading">
<h1>Workspace Settings</h1>
<h1>Portfolio Settings</h1>
</div>
<div class="panel__content">

View File

@@ -5,7 +5,7 @@
<table>
<thead>
<tr>
<th>Workspace Name</th>
<th>Portfolio Name</th>
<th>Task Order</th>
<th>Users</th>
</tr>

View File

@@ -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.",
)}}

View File

@@ -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'
) }}

View File

@@ -11,11 +11,11 @@
{% set can_create_projects = user_can(permissions.ADD_APPLICATION_IN_WORKSPACE) %}
{{ EmptyState(
'This workspace doesnt have any projects yet.',
'This portfolio doesnt 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 %}

View File

@@ -6,7 +6,7 @@
{% block workspace_content %}
{{ Alert("Budget Report for Workspace " + workspace.name,
{{ Alert("Budget Report for Portfolio " + workspace.name,
message="<p>Track your monthly and cumulative expenditures for your workspace, projects, and environments below.</p>\
<p>Please note that the projected spend is based on the <em>average expense over the last three completed months</em> and therefore does not account for future changes that might be made in scale or configuration of your cloud services.</p>",
actions=[
@@ -18,7 +18,7 @@
<div class='funding-summary-row__col'>
<div class='panel spend-summary'>
<div class='row'>
<h2 class='spend-summary__heading col'>Workspace Total Spend</h2>
<h2 class='spend-summary__heading col'>Portfolio Total Spend</h2>
<dl class='spend-summary__budget'>
{% 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(

View File

@@ -7,7 +7,7 @@
{% if not workspace.task_orders %}
{{ EmptyState(
'This workspace doesnt have any task orders yet.',
'This portfolio doesnt 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',