diff --git a/ui/core/app/controllers/scopes/scope/orgs.js b/ui/core/app/controllers/scopes/scope/orgs.js index 9e553d5a3..d52189e5f 100644 --- a/ui/core/app/controllers/scopes/scope/orgs.js +++ b/ui/core/app/controllers/scopes/scope/orgs.js @@ -12,6 +12,6 @@ export default class ScopesScopeOrgsController extends Controller { * @type {string} */ get breadCrumb() { - return this.intl.t('resources.orgs'); + return this.intl.t('resources.org.title_plural'); } } diff --git a/ui/core/app/templates/scopes/scope/orgs.hbs b/ui/core/app/templates/scopes/scope/orgs.hbs index 35fbae66b..0f9dd522a 100644 --- a/ui/core/app/templates/scopes/scope/orgs.hbs +++ b/ui/core/app/templates/scopes/scope/orgs.hbs @@ -1,3 +1,3 @@ -{{title (t "resources.orgs")}} +{{title (t "resources.org.title_plural")}} {{outlet}} diff --git a/ui/core/app/templates/scopes/scope/orgs/index.hbs b/ui/core/app/templates/scopes/scope/orgs/index.hbs index 10b4f04a9..ed79b4e04 100644 --- a/ui/core/app/templates/scopes/scope/orgs/index.hbs +++ b/ui/core/app/templates/scopes/scope/orgs/index.hbs @@ -5,8 +5,10 @@ -

{{t "resources.orgs"}}

-

{{t "resources.descriptions.orgs"}}

+

{{t "resources.org.title_plural"}}

+ {{#if @model}} +

{{t "resources.org.description"}}

+ {{/if}}
@@ -39,9 +41,9 @@ {{else}} - + - {{t 'descriptions.orgs-welcome'}} + {{t 'resources.org.description'}} diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml index 815f6cdc2..fea6094ff 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 - orgs-welcome: Welcome to Orgs projects-welcome: Welcome to Projects host-sets-welcome: Welcome to Host Sets hosts-welcome: Welcome to Hosts @@ -46,7 +45,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. - orgs-welcome: Create your orgs here. 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. diff --git a/ui/core/translations/resources/en-us.yaml b/ui/core/translations/resources/en-us.yaml index 921c15124..534ac93ac 100644 --- a/ui/core/translations/resources/en-us.yaml +++ b/ui/core/translations/resources/en-us.yaml @@ -59,12 +59,20 @@ session: none: title: No Sessions description: There are no active sessions within the current scope. +org: + title: Organization + title_plural: Organizations + description: An organization is a type of scope used to organize projects and IAM resources. Organizations contain projects and is a child scope of global. + messages: + welcome: + title: Welcome to Organizations + none: + title: No Sessions + description: There are no active sessions within the current scope. user: User users: Users role: Role roles: Roles -orgs: Orgs -org: Org projects: Projects project: Project host-set: Host Set @@ -80,8 +88,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. - org: When an Organization is deleted, all resources owned by it are also deleted. - orgs: An Organization is a top-level container, and owns zero to many Projects and zero to many Authentication Methods. An Organization inherits from Scope ("is-a" Scope) allowing it to own zero to many Groups, Roles, Targets, or Host Catalogs. The lifecycle of an Organization is not tied to anything else. A Role at the Organization level can grant permissions at the Project level. 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.