diff --git a/addons/rose/addon/styles/rose/components/layout/_global.scss b/addons/rose/addon/styles/rose/components/layout/_global.scss index 2100c70eb..cfc218e4e 100644 --- a/addons/rose/addon/styles/rose/components/layout/_global.scss +++ b/addons/rose/addon/styles/rose/components/layout/_global.scss @@ -13,6 +13,7 @@ .rose-layout-global-body { grid-area: body; + margin: 0 sizing.rems(m); } .rose-layout-global-header { diff --git a/ui/core/app/styles/app.scss b/ui/core/app/styles/app.scss index f7c1e37f1..20dbbe53f 100644 --- a/ui/core/app/styles/app.scss +++ b/ui/core/app/styles/app.scss @@ -19,14 +19,8 @@ } } -.projects-overview { - margin: sizing.rems(l); -} - .project-overview, .project-new { - margin: sizing.rems(l); - .breadcrumbs, .breadcrumbs a { color: #6f7682; diff --git a/ui/core/app/templates/orgs/org/projects/project/host-catalogs/index.hbs b/ui/core/app/templates/orgs/org/projects/project/host-catalogs/index.hbs index 490cb5b65..006513fa8 100644 --- a/ui/core/app/templates/orgs/org/projects/project/host-catalogs/index.hbs +++ b/ui/core/app/templates/orgs/org/projects/project/host-catalogs/index.hbs @@ -1,7 +1,6 @@ - - + -

{{t "resources.host-catalogs"}}

+

{{t 'resources.host-catalogs'}}

@@ -13,18 +12,33 @@ -
    - {{#each @model as |hostCatalog|}} -
  • - - {{hostCatalog.name}} - -
  • - {{/each}} -
+

{{t 'descriptions.host-catalogs'}}

+ + + + + {{t 'form.label.name'}} + {{t 'form.label.type'}} + {{t 'form.label.description'}} + + + + {{#each @model as |hostCatalog|}} + + + + {{hostCatalog.name}} + + + {{hostCatalog.type}} + {{hostCatalog.description}} + + {{/each}} + +
diff --git a/ui/core/tests/acceptance/host-catalogs-test.js b/ui/core/tests/acceptance/host-catalogs-test.js index acdacafa7..7a54340b3 100644 --- a/ui/core/tests/acceptance/host-catalogs-test.js +++ b/ui/core/tests/acceptance/host-catalogs-test.js @@ -23,7 +23,7 @@ module('Acceptance | host catalogs', function(hooks) { this.server.createList('project', 1); this.server.createList('host-catalog', 1); await visit('/orgs/1/projects/1/host-catalogs'); - await click('main ul li:first-child a'); + await click('main .rose-table-cell:first-child a'); await a11yAudit(); assert.equal(currentURL(), '/orgs/1/projects/1/host-catalogs/1'); }); diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml index a6cb7e4c1..4b51a1dc2 100644 --- a/ui/core/translations/en-us.yaml +++ b/ui/core/translations/en-us.yaml @@ -12,6 +12,8 @@ titles: new: New overview: Overview settings: Settings +descriptions: + host-catalogs: Overview of collections of hosts and host sets. states: info: Info success: Success @@ -21,6 +23,7 @@ form: label: name: Name description: Description + type: Type dev: default-org: Default Org menu-item: Menu item