diff --git a/ui/core/app/controllers/scopes/scope/projects.js b/ui/core/app/controllers/scopes/scope/projects.js index af28cf813..fb93923df 100644 --- a/ui/core/app/controllers/scopes/scope/projects.js +++ b/ui/core/app/controllers/scopes/scope/projects.js @@ -12,6 +12,6 @@ export default class ScopesScopeProjectsController extends Controller { * @type {string} */ get breadCrumb() { - return this.intl.t('resources.projects'); + return this.intl.t('resources.project.title_plural'); } } diff --git a/ui/core/app/templates/scopes/scope.hbs b/ui/core/app/templates/scopes/scope.hbs index 0692adaa0..1cf097811 100644 --- a/ui/core/app/templates/scopes/scope.hbs +++ b/ui/core/app/templates/scopes/scope.hbs @@ -5,7 +5,7 @@ - {{t "resources.projects"}} + {{t "resources.project.title_plural"}} diff --git a/ui/core/app/templates/scopes/scope/projects.hbs b/ui/core/app/templates/scopes/scope/projects.hbs index 1f709c7f7..dd40ba6c8 100644 --- a/ui/core/app/templates/scopes/scope/projects.hbs +++ b/ui/core/app/templates/scopes/scope/projects.hbs @@ -1,3 +1,3 @@ -{{title (t "resources.projects")}} +{{title (t "resources.project.title_plural")}} {{outlet}} diff --git a/ui/core/app/templates/scopes/scope/projects/index.hbs b/ui/core/app/templates/scopes/scope/projects/index.hbs index 9c5ae805a..0d05ddf30 100644 --- a/ui/core/app/templates/scopes/scope/projects/index.hbs +++ b/ui/core/app/templates/scopes/scope/projects/index.hbs @@ -5,8 +5,10 @@ -

{{t "resources.projects"}}

-

{{t "resources.descriptions.projects"}}

+

{{t "resources.project.title_plural"}}

+ {{#if @model}} +

{{t "resources.project.description"}}

+ {{/if}}
@@ -39,9 +41,9 @@ {{else}} - + - {{t 'descriptions.projects-welcome'}} + {{t 'resources.project.description'}} diff --git a/ui/core/app/templates/scopes/scope/projects/project/index.hbs b/ui/core/app/templates/scopes/scope/projects/project/index.hbs index 243ef1276..3990c70e8 100644 --- a/ui/core/app/templates/scopes/scope/projects/project/index.hbs +++ b/ui/core/app/templates/scopes/scope/projects/project/index.hbs @@ -5,8 +5,8 @@ -

{{t "resources.project"}}

-

{{t "resources.descriptions.project"}}

+

{{t "resources.project.title"}}

+

{{t "resources.project.description"}}

diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml index fea6094ff..500c14ff4 100644 --- a/ui/core/translations/en-us.yaml +++ b/ui/core/translations/en-us.yaml @@ -23,7 +23,6 @@ titles: overview: Overview settings: Settings empty-set: No Items Yet - projects-welcome: Welcome to Projects host-sets-welcome: Welcome to Host Sets hosts-welcome: Welcome to Hosts users-welcome: Welcome to Users @@ -45,7 +44,6 @@ titles: actions: Actions descriptions: empty-set: There are no items to display yet. You may be able to add items or try back later. - projects-welcome: Projects allow you to create and manage host catalogs. To start, create a project. host-sets-welcome: Configure a static host set in this host catalog. hosts-welcome: Configure a static host in this host catalog. users-welcome: Users are authorized to access Boundary. diff --git a/ui/core/translations/resources/en-us.yaml b/ui/core/translations/resources/en-us.yaml index 534ac93ac..22c7be5aa 100644 --- a/ui/core/translations/resources/en-us.yaml +++ b/ui/core/translations/resources/en-us.yaml @@ -66,15 +66,17 @@ org: messages: welcome: title: Welcome to Organizations - none: - title: No Sessions - description: There are no active sessions within the current scope. +project: + title: Project + title_plural: Projects + description: A project is a type of scope used to organize resources such as by targets and host catalogs. + messages: + welcome: + title: Welcome to Projects user: User users: Users role: Role roles: Roles -projects: Projects -project: Project host-set: Host Set host-sets: Host Sets host: Host @@ -88,8 +90,6 @@ descriptions: roles: A role is a collection of capabilities granted to any Principal the Role is assigned to. A Role belongs to one and only one Scope. A Role owns zero or more Direct Grants. The lifecycle of a Role is not tied to the lifecycle of any Principal. grants: A grant represents a set of capabilities granted to a role. It couples a set of Actions to either a set of Resource Types or an individual Resource. A Direct Grant belongs exclusively to one and only one Role. However, equivalent Direct Grants may exist across different Roles. A Direct Grant references one or more Actions and either one or more Resource types or one specific Resource. A Direct Grant is deleted when the Role it belongs to is deleted. A Direct Grant is also deleted if it is associated with a specific Resource and that Resource itself is deleted. The lifecycle of a Direct Grant is not tied to the lifecycle of any Action or Resource Type. principals: A principal is any entity which can be assigned capabilities. Principal is abstract. User, Group, and Project are concrete Principals. A Principal can be assigned to zero or more Roles. - project: When a Project is deleted, all resources owned by it are also deleted. The lifecycle of a Project is not tied to any resource it contains. - projects: A project is a child scope of an organization and is owned by an Organization. A Project inherits from Scope ("is-a" Scope) allowing it to own zero to many Groups, Roles, Targets, or Host Catalogs. A Project also inherits from Principal ("is-a" Principal) allowing it to be associated with zero or more Roles. A Project has no additional relationships beyond those defined in Scope and Principal. A Project is deleted when the Organization it belongs to is deleted. host-set: Host Set is abstract. A Host Set is deleted when the Host Catalog it belongs to is deleted. host-sets: A host set is a resource which provides a subset of Hosts from the set of Hosts of the Host Catalog it belongs to. A Host Set belongs to one and only one Host Catalog. A Host Set can contain zero or more Hosts. A Host Set can be contained by zero or more Targets. The lifecycle of a Host Set is not tied to the lifecycle of any Targets or Hosts. host: Host is abstract. A Host is deleted when the Host Catalog it belongs to is deleted.