pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename Workspace to Portfolio in user-facing contexts

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/about.html
View File

@@ -38,8 +38,8 @@
<p>After your Task Order is approved you must add that information to your JEDI Cloud Access Request for financial verification.</p>
</li>
<li>
<h3 class="h4">Designate Workspace Users</h3>
<p>Once your JEDI Cloud Access Request is approved by the CCPO the workspace owner will need to set up projects, environments, and users. The workspace owner is the technical POC you originally designated on the request.</p>
<h3 class="h4">Designate Portfolio Users</h3>
<p>Once your JEDI Cloud Access Request is approved by the CCPO the portfolio owner will need to set up projects, environments, and users. The portfolio owner is the technical POC you originally designated on the request.</p>
</li>
<li>
<h3 class="h4">Use JEDI Cloud</h3>

2
templates/audit_log/events/environment.html
View File

@@ -1,5 +1,5 @@
{% extends "audit_log/events/_base.html" %}
{% block content %}
in Workspace <code>{{ event.workspace_id }}</code> ({{ event.workspace.name }})
in Portfolio <code>{{ event.workspace_id }}</code> ({{ event.workspace.name }})
{% endblock %}

2
templates/audit_log/events/environment_role.html
View File

@@ -14,6 +14,6 @@
<br>
in Project <code>{{ event.event_details["project_id"] }}</code> ({{ event.event_details["project"] }})
<br>
in Workspace <code>{{ event.event_details["workspace_id"] }}</code> ({{ event.event_details["workspace"] }})
in Portfolio <code>{{ event.event_details["workspace_id"] }}</code> ({{ event.event_details["workspace"] }})
{% endif %}
{% endblock %}

2
templates/audit_log/events/invitation.html
View File

@@ -10,5 +10,5 @@
invited {{ event.event_details.email }} (DOD <code>{{ event.event_details.dod_id }}</code>)
<br>
{% endif %}
in Workspace <code>{{ event.workspace_id }}</code> ({{ event.workspace.name }})
in Portfolio <code>{{ event.workspace_id }}</code> ({{ event.workspace.name }})
{% endblock %}

2
templates/audit_log/events/workspace_role.html
View File

@@ -2,7 +2,7 @@
{% block content %}
for User <code>{{ event.event_details.updated_user_id }}</code> ({{ event.event_details.updated_user_name }})
in Workspace <code>{{ event.workspace_id }}</code> ({{ event.workspace.name }})
in Portfolio <code>{{ event.workspace_id }}</code> ({{ event.workspace.name }})
{% if event.changed_state.status %}
from status "{{ event.changed_state.status[0] }}" to "{{ event.changed_state.status[1] }}"

8
templates/emails/invitation.txt
View File

@@ -1,12 +1,12 @@
Join this JEDI Cloud Workspace
{{ owner }} has invited you to join a JEDI Cloud Workspace. Login now to view or use your JEDI Cloud resources.
Join this JEDI Cloud Portfolio
{{ owner }} has invited you to join a JEDI Cloud Portfolio. Login now to view or use your JEDI Cloud resources.
{{ url_for("workspaces.accept_invitation", token=token, _external=True) }}
What is JEDI Cloud?
JEDI Cloud is a DoD enterprise-wide solution for commercial cloud services.
What is a JEDI Cloud Workspace?
A JEDI Cloud Workspace is where you may access and manage the cloud resources associated with your projects and environments.
What is a JEDI Cloud Portfolio?
A JEDI Cloud Portfolio is where you may access and manage the cloud resources associated with your projects and environments.
JEDI Cloud is managed by the Cloud Computing Program Office. Learn more at jedi.cloud.

2
templates/help/docs/getting-started.html
View File

@@ -128,7 +128,7 @@
<h4>Project Structure for JEDI Cloud</h4>
<p>Separate your workspace into projects and environments; this allows your team to manage user access to systems more securely and track expenditures for each project.</p>
<p>Separate your portfolio into projects and environments; this allows your team to manage user access to systems more securely and track expenditures for each project.</p>
<p>Here’s an example:<br>
Project A has a development environment, production environment, and sandbox environment. The cloud resources in the development environment are grouped and accessed separately from the production environment and sandbox environment.</p>

2
templates/nav-side.html.to
View File

@@ -13,4 +13,4 @@
<a class="sidenav__link" href="/">Logout</a>
</li>
</ul>
</div>
</div>

2
templates/navigation/global_navigation.html
View File

@@ -9,7 +9,7 @@
) }}
{% if g.current_user.has_workspaces %}
{{ SidenavItem("Workspaces", href="/workspaces", icon="cloud", active=g.matchesPath('/workspaces')) }}
{{ SidenavItem("Portfolios", href="/workspaces", icon="cloud", active=g.matchesPath('/workspaces')) }}
{% endif %}
{% if g.Authorization.has_atat_permission(g.current_user, g.Permissions.VIEW_AUDIT_LOG) %}

2
templates/requests/_review.html
View File

@@ -128,7 +128,7 @@
<hr>
<h2>
Workspace Owner
Portfolio Owner
{% if editable %}
<a href="{{ EditLink(3) }}" class="icon-link">
{{ Icon('edit') }}

8
templates/requests/screen-3.html
View File

@@ -4,7 +4,7 @@
{% from "components/checkbox_input.html" import CheckboxInput %}
{% block heading %}
Designate a Workspace Owner
Designate a Portfolio Owner
{% endblock %}
{% block form %}
@@ -14,17 +14,17 @@
<poc inline-template v-bind:initial-data='{{ f.data|tojson }}'>
<div>
<p>The Workspace Owner is the primary point of contact and technical administrator of the JEDI Cloud Workspace and will have the
<p>The Portfolio Owner is the primary point of contact and technical administrator of the JEDI Cloud Portfolio and will have the
following responsibilities:</p>
<ul>
<li>Organize your cloud-hosted systems into projects and environments</li>
<li>Add users to this workspace and manage members</li>
<li>Add users to this portfolio and manage members</li>
<li>Manage access to the JEDI Cloud service provider’s portal</li>
</ul>
</p>
<p>This person must be a DoD employee (not a contractor).</p>
<p>The Workspace Owner may be you. You will be able to add other administrators later. This person will be invited via email
<p>The Portfolio Owner may be you. You will be able to add other administrators later. This person will be invited via email
once your request is approved.</p>
{{ CheckboxInput(f.am_poc) }}

2
templates/workspaces/edit.html
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">

2
templates/workspaces/index.html
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>

2
templates/workspaces/members/edit.html
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.",
)}}

4
templates/workspaces/members/index.html
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'
) }}

4
templates/workspaces/projects/index.html
View File

@@ -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 %}

8
templates/workspaces/reports/index.html
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(

2
templates/workspaces/task_orders/index.html
View File

@@ -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',