From 2f0ca5a06680db054d3bd8d7839f376243df1f9d Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Mon, 8 Jun 2020 11:32:19 -0400 Subject: [PATCH] =?UTF-8?q?chore:=20=F0=9F=A4=96=20add=20project-specific?= =?UTF-8?q?=20sidebar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ui/core/app/routes/orgs/org/projects/project.js | 15 +++++++++++++++ ui/core/app/templates/application.hbs | 7 +++---- .../orgs/org/projects/project/_sidebar.hbs | 15 +++++++++++++++ .../project/host-catalogs/host-catalog.hbs | 4 +++- .../templates/orgs/org/projects/project/index.hbs | 7 ++----- ui/core/translations/en-us.yaml | 7 +++---- 6 files changed, 41 insertions(+), 14 deletions(-) create mode 100644 ui/core/app/templates/orgs/org/projects/project/_sidebar.hbs diff --git a/ui/core/app/routes/orgs/org/projects/project.js b/ui/core/app/routes/orgs/org/projects/project.js index e2e4fabb8..5c0b8b632 100644 --- a/ui/core/app/routes/orgs/org/projects/project.js +++ b/ui/core/app/routes/orgs/org/projects/project.js @@ -28,6 +28,21 @@ export default class OrgsOrgProjectsProjectRoute extends Route { return super.afterModel(...arguments); } + /** + * Renders the project-specific sidebar template. + * @override + * @param {object} controller + * @param {object} model + */ + renderTemplate(controller, model) { + this.render('orgs/org/projects/project/_sidebar', { + into: 'application', + outlet: 'sidebar', + model: model + }); + super.renderTemplate(...arguments); + } + // =actions /** diff --git a/ui/core/app/templates/application.hbs b/ui/core/app/templates/application.hbs index 1746e6247..031b35e69 100644 --- a/ui/core/app/templates/application.hbs +++ b/ui/core/app/templates/application.hbs @@ -29,10 +29,9 @@ - - {{t 'dev.item-name'}} - {{t 'dev.item-name'}} - + + {{outlet "sidebar"}} + diff --git a/ui/core/app/templates/orgs/org/projects/project/_sidebar.hbs b/ui/core/app/templates/orgs/org/projects/project/_sidebar.hbs new file mode 100644 index 000000000..8581e1414 --- /dev/null +++ b/ui/core/app/templates/orgs/org/projects/project/_sidebar.hbs @@ -0,0 +1,15 @@ + + + + {{t "titles.overview"}} + + + + {{t "resources.host-catalogs"}} + + + diff --git a/ui/core/app/templates/orgs/org/projects/project/host-catalogs/host-catalog.hbs b/ui/core/app/templates/orgs/org/projects/project/host-catalogs/host-catalog.hbs index e2147cab0..2b05f838d 100644 --- a/ui/core/app/templates/orgs/org/projects/project/host-catalogs/host-catalog.hbs +++ b/ui/core/app/templates/orgs/org/projects/project/host-catalogs/host-catalog.hbs @@ -1 +1,3 @@ -{{outlet}} \ No newline at end of file +{{title @model.name}} + +{{outlet}} diff --git a/ui/core/app/templates/orgs/org/projects/project/index.hbs b/ui/core/app/templates/orgs/org/projects/project/index.hbs index 08f65ebe0..1b255c4e1 100644 --- a/ui/core/app/templates/orgs/org/projects/project/index.hbs +++ b/ui/core/app/templates/orgs/org/projects/project/index.hbs @@ -5,14 +5,11 @@ {{@model.name}} -

{{t "resources.project.settings"}}

+

{{t "resources.project"}}

- {{t 'dev.item-name'}} - - - {{t 'dev.item-name'}} + {{t 'titles.settings'}} diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml index 3f5623295..a6cb7e4c1 100644 --- a/ui/core/translations/en-us.yaml +++ b/ui/core/translations/en-us.yaml @@ -5,12 +5,13 @@ actions: save: Save resources: projects: Projects - project: - settings: Project Settings + project: Project host-catalog: Host Catalog host-catalogs: Host Catalogs titles: new: New + overview: Overview + settings: Settings states: info: Info success: Success @@ -20,8 +21,6 @@ form: label: name: Name description: Description -nav: - overview: Overview dev: default-org: Default Org menu-item: Menu item