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

rename Project to Application in user-facing contexts

Browse Source
This commit is contained in:
dandds 2019-01-10 15:45:12 -05:00
parent 142395f1e9
commit 9ad3c45200
10 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
atst/utils/flash.py
View File

@ -47,7 +47,7 @@ MESSAGES = {
"new_workspace": {
"title_template": "Portfolio created!",
"message_template": """
<p>You are now ready to create projects and environments within the JEDI Cloud.</p>
<p>You are now ready to create applications and environments within the JEDI Cloud.</p>
""",
"category": "success",
},

2
templates/about.html
View File

@ -39,7 +39,7 @@
</li>
<li>
<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>
<p>Once your JEDI Cloud Access Request is approved by the CCPO the portfolio owner will need to set up applications, 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_role.html
View File

@ -12,7 +12,7 @@
<br>
in Environment <code>{{ event.event_details["environment_id"] }}</code> ({{ event.event_details["environment"] }})
<br>
in Project <code>{{ event.event_details["project_id"] }}</code> ({{ event.event_details["project"] }})
in Application <code>{{ event.event_details["project_id"] }}</code> ({{ event.event_details["project"] }})
<br>
in Portfolio <code>{{ event.event_details["workspace_id"] }}</code> ({{ event.event_details["workspace"] }})
{% endif %}

2
templates/emails/invitation.txt
View File

@ -7,6 +7,6 @@ What is JEDI Cloud?
JEDI Cloud is a DoD enterprise-wide solution for commercial cloud services.
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.
A JEDI Cloud Portfolio is where you may access and manage the cloud resources associated with your applications and environments.
JEDI Cloud is managed by the Cloud Computing Program Office. Learn more at jedi.cloud.

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

@ -63,7 +63,7 @@
<tr>
<td>Program BA Code</td>
<td><em>Example: <br>02</em></td>
<td>The Budget Activity Code (or BA Code) is a two digit number that is the category within each appropriation and fund account used to identify the purposes, projects, or types of activities financed by the appropriation fund.</td>
<td>The Budget Activity Code (or BA Code) is a two digit number that is the category within each appropriation and fund account used to identify the purposes, applications, or types of activities financed by the appropriation fund.</td>
</tr>
</tbody>
</table>
@ -122,15 +122,15 @@
<hr>
<h2 id='jedi-cloud-projects'>JEDI Cloud Projects</h2>
<h2 id='jedi-cloud-projects'>JEDI Cloud Applications</h2>
<h3>How are projects organized in the JEDI Cloud?</h3>
<h3>How are applications organized in the JEDI Cloud?</h3>
<h4>Project Structure for JEDI Cloud</h4>
<h4>Application Structure for JEDI Cloud</h4>
<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>Separate your portfolio into applications 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>
Application 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>
<img src='/static/img/at-at_faqs_content.svg' alt='AT-AT FAQs Content'>

8
templates/workspaces/members/edit.html
View File

@ -47,14 +47,14 @@
{{ ConfirmationButton (
"Resend Invitation",
url_for("workspaces.resend_invitation", workspace_id=workspace.id, token=member.latest_invitation.token),
confirm_msg="Are you sure? This will send an email to invite the user to join this workspace."
confirm_msg="Are you sure? This will send an email to invite the user to join this portfolio."
)}}
{% endif %}
{% if can_revoke_access %}
{{ ConfirmationButton (
"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.",
confirm_msg="Are you sure? This will remove this user from the portfolio.",
)}}
{% endif %}
</div>
@ -69,8 +69,8 @@
<div class='search-bar'>
<div class='usa-input search-input'>
<label for='project-search'>Search by project name</label>
<input type='search' id='project-search' name='project-search' placeholder="Search by project name"/>
<label for='project-search'>Search by application name</label>
<input type='search' id='project-search' name='project-search' placeholder="Search by application name"/>
<button type="submit">
<span class="hide">Search</span>
</button>

6
templates/workspaces/projects/edit.html
View File

@ -10,9 +10,9 @@
<div class="block-list project-list-item">
<header class="block-list__header block-list__header--grow">
<h2 class="block-list__title">Project Environments</h2>
<h2 class="block-list__title">Application Environments</h2>
<p>
Each environment created within a project is an enclave of cloud resources that is logically separated from each other for increased security.
Each environment created within an application is an enclave of cloud resources that is logically separated from each other for increased security.
</p>
</header>
@ -29,7 +29,7 @@
</div>
<div class="action-group">
<button class="usa-button usa-button-primary" tabindex="0" type="submit">Update Project</button>
<button class="usa-button usa-button-primary" tabindex="0" type="submit">Update Application</button>
</div>
</form>

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

@ -11,8 +11,8 @@
{% set can_create_projects = user_can(permissions.ADD_APPLICATION_IN_WORKSPACE) %}
{{ EmptyState(
'This portfolio doesn’t have any projects yet.',
action_label='Add a New Project' if can_create_projects else None,
'This portfolio doesn’t have any applications yet.',
action_label='Add a New Application' 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 portfolio administrator to set up a new project.'

12
templates/workspaces/projects/new.html
View File

@ -14,10 +14,10 @@
<form method="POST" action="{{ url_for('workspaces.create_project', workspace_id=workspace.id) }}" v-on:submit="handleSubmit">
{% call Modal(name=modalName, dismissable=False) %}
<h1>Create project !{ name }</h1>
<h1>Create application !{ name }</h1>
<p>
When you click <em>Create Project</em>, the environments
When you click <em>Create Application</em>, the environments
<span v-for="(environment, index) in environments">
<strong>!{environment.name}</strong><template v-if="index < (environments.length - 1)">, </template>
</span>
@ -25,7 +25,7 @@
</p>
<div class='action-group'>
<button autofocus type='submit' class='action-group__action usa-button' tabindex='0'>Create Project</button>
<button autofocus type='submit' class='action-group__action usa-button' tabindex='0'>Create Application</button>
<button type='button' v-on:click="handleCancelSubmit" class='icon-link action-group__action' tabindex='0'>Cancel</button>
</div>
{% endcall %}
@ -40,9 +40,9 @@
<div class="block-list project-list-item">
<header class="block-list__header block-list__header--grow">
<h2 class="block-list__title">Project Environments</h2>
<h2 class="block-list__title">Application Environments</h2>
<p>
Each environment created within a project is an enclave of cloud resources that is logically separated from each other for increased security.
Each environment created within an application is an enclave of cloud resources that is logically separated from each other for increased security.
</p>
</header>
@ -66,7 +66,7 @@
</div>
<div class="action-group">
<button class="usa-button usa-button-primary" tabindex="0" type="submit">Create Project</button>
<button class="usa-button usa-button-primary" tabindex="0" type="submit">Create Application</button>
</div>
</form>
</new-project>

6
templates/workspaces/reports/index.html
View File

@ -7,7 +7,7 @@
{% block workspace_content %}
{{ Alert("Budget Report for Portfolio " + workspace.name,
message="<p>Track your monthly and cumulative expenditures for your workspace, projects, and environments below.</p>\
message="<p>Track your monthly and cumulative expenditures for your portfolio, applications, 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=[
{"label": "Learn More", "href": url_for('atst.helpdocs'), "icon": "info"}
@ -116,14 +116,14 @@
{% if not workspace.projects %}
{% set can_create_projects = user_can(permissions.ADD_APPLICATION_IN_WORKSPACE) %}
{% 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.'
{% set message = 'This portfolio has no cloud environments set up, so there is no spending data to report. Create an application with some cloud environments to get started.'
if can_create_projects
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(
'Nothing to report',
action_label='Add a New Project' if can_create_projects else None,
action_label='Add a New Application' if can_create_projects else None,
action_href=url_for('workspaces.new_project', workspace_id=workspace.id) if can_create_projects else None,
icon='chart',
sub_message=message