From 9ad3c4520006450b3b24bfe1653e31e161da7b6a Mon Sep 17 00:00:00 2001 From: dandds Date: Thu, 10 Jan 2019 15:45:12 -0500 Subject: [PATCH] rename Project to Application in user-facing contexts --- atst/utils/flash.py | 2 +- templates/about.html | 2 +- templates/audit_log/events/environment_role.html | 2 +- templates/emails/invitation.txt | 2 +- templates/help/docs/getting-started.html | 12 ++++++------ templates/workspaces/members/edit.html | 8 ++++---- templates/workspaces/projects/edit.html | 6 +++--- templates/workspaces/projects/index.html | 4 ++-- templates/workspaces/projects/new.html | 12 ++++++------ templates/workspaces/reports/index.html | 6 +++--- 10 files changed, 28 insertions(+), 28 deletions(-) diff --git a/atst/utils/flash.py b/atst/utils/flash.py index 186c4f00..e857cc87 100644 --- a/atst/utils/flash.py +++ b/atst/utils/flash.py @@ -47,7 +47,7 @@ MESSAGES = { "new_workspace": { "title_template": "Portfolio created!", "message_template": """ -

You are now ready to create projects and environments within the JEDI Cloud.

+

You are now ready to create applications and environments within the JEDI Cloud.

""", "category": "success", }, diff --git a/templates/about.html b/templates/about.html index 6a61f22b..b7ebce79 100644 --- a/templates/about.html +++ b/templates/about.html @@ -39,7 +39,7 @@

  • Designate Portfolio Users

    -

    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.

    +

    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.

  • Use JEDI Cloud

    diff --git a/templates/audit_log/events/environment_role.html b/templates/audit_log/events/environment_role.html index d7960c6f..ea25fd6f 100644 --- a/templates/audit_log/events/environment_role.html +++ b/templates/audit_log/events/environment_role.html @@ -12,7 +12,7 @@
    in Environment {{ event.event_details["environment_id"] }} ({{ event.event_details["environment"] }})
    - in Project {{ event.event_details["project_id"] }} ({{ event.event_details["project"] }}) + in Application {{ event.event_details["project_id"] }} ({{ event.event_details["project"] }})
    in Portfolio {{ event.event_details["workspace_id"] }} ({{ event.event_details["workspace"] }}) {% endif %} diff --git a/templates/emails/invitation.txt b/templates/emails/invitation.txt index e26b71d0..131d0393 100644 --- a/templates/emails/invitation.txt +++ b/templates/emails/invitation.txt @@ -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. diff --git a/templates/help/docs/getting-started.html b/templates/help/docs/getting-started.html index eae1c9ee..61065f83 100644 --- a/templates/help/docs/getting-started.html +++ b/templates/help/docs/getting-started.html @@ -63,7 +63,7 @@ Program BA Code Example:
    02     - 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. + 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. @@ -122,15 +122,15 @@
    -

    JEDI Cloud Projects

    +

    JEDI Cloud Applications

    -

    How are projects organized in the JEDI Cloud?

    +

    How are applications organized in the JEDI Cloud?

    -

    Project Structure for JEDI Cloud

    +

    Application Structure for JEDI Cloud

    -

    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.

    +

    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.

    Here’s an example:
    -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.

    +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.

    AT-AT FAQs Content diff --git a/templates/workspaces/members/edit.html b/templates/workspaces/members/edit.html index 61d37bd8..d36365cb 100644 --- a/templates/workspaces/members/edit.html +++ b/templates/workspaces/members/edit.html @@ -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 %} @@ -69,8 +69,8 @@
    - - + + diff --git a/templates/workspaces/projects/edit.html b/templates/workspaces/projects/edit.html index c9785f2d..b20fb476 100644 --- a/templates/workspaces/projects/edit.html +++ b/templates/workspaces/projects/edit.html @@ -10,9 +10,9 @@
    -

    Project Environments

    +

    Application Environments

    - 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.

    @@ -29,7 +29,7 @@
    - +
    diff --git a/templates/workspaces/projects/index.html b/templates/workspaces/projects/index.html index 548e2435..6f4e02ee 100644 --- a/templates/workspaces/projects/index.html +++ b/templates/workspaces/projects/index.html @@ -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.' diff --git a/templates/workspaces/projects/new.html b/templates/workspaces/projects/new.html index 6fb0b3ea..c64c4ef3 100644 --- a/templates/workspaces/projects/new.html +++ b/templates/workspaces/projects/new.html @@ -14,10 +14,10 @@
    {% call Modal(name=modalName, dismissable=False) %} -

    Create project !{ name }

    +

    Create application !{ name }

    - When you click Create Project, the environments + When you click Create Application, the environments !{environment.name} @@ -25,7 +25,7 @@

    - +
    {% endcall %} @@ -40,9 +40,9 @@
    -

    Project Environments

    +

    Application Environments

    - 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.

    @@ -66,7 +66,7 @@
    - +
    diff --git a/templates/workspaces/reports/index.html b/templates/workspaces/reports/index.html index 830e9c37..34017f6e 100644 --- a/templates/workspaces/reports/index.html +++ b/templates/workspaces/reports/index.html @@ -7,7 +7,7 @@ {% block workspace_content %} {{ Alert("Budget Report for Portfolio " + workspace.name, - message="

    Track your monthly and cumulative expenditures for your workspace, projects, and environments below.

    \ + message="

    Track your monthly and cumulative expenditures for your portfolio, applications, 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=[ {"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