diff --git a/ui-v2/app/router.js b/ui-v2/app/router.js index 794b5f98a..5114afc21 100644 --- a/ui-v2/app/router.js +++ b/ui-v2/app/router.js @@ -49,9 +49,6 @@ export const routes = { addresses: { _options: { path: '/addresses' }, }, - tags: { - _options: { path: '/tags' }, - }, metadata: { _options: { path: '/metadata' }, }, diff --git a/ui-v2/app/routes/dc/services/instance/tags.js b/ui-v2/app/routes/dc/services/instance/tags.js deleted file mode 100644 index 9793d62c0..000000000 --- a/ui-v2/app/routes/dc/services/instance/tags.js +++ /dev/null @@ -1,14 +0,0 @@ -import Route from '@ember/routing/route'; - -export default Route.extend({ - model: function() { - const parent = this.routeName - .split('.') - .slice(0, -1) - .join('.'); - return this.modelFor(parent); - }, - setupController: function(controller, model) { - controller.setProperties(model); - }, -}); diff --git a/ui-v2/app/styles/base/components/tabs/layout.scss b/ui-v2/app/styles/base/components/tabs/layout.scss index 92d6a8549..3578479fd 100644 --- a/ui-v2/app/styles/base/components/tabs/layout.scss +++ b/ui-v2/app/styles/base/components/tabs/layout.scss @@ -29,5 +29,5 @@ border-bottom: 1px solid $gray-200; } %tab-section section > h3 { - margin: 24px 0; + margin: 24px 0 12px 0; } diff --git a/ui-v2/app/templates/dc/services/instance.hbs b/ui-v2/app/templates/dc/services/instance.hbs index 86269b8aa..81be4bd2a 100644 --- a/ui-v2/app/templates/dc/services/instance.hbs +++ b/ui-v2/app/templates/dc/services/instance.hbs @@ -39,8 +39,7 @@ (hash label="Proxy Info" href=(href-to "dc.services.instance.proxy") selected=(is-href "dc.services.instance.proxy")) ) - (hash label="Tags" href=(href-to "dc.services.instance.tags") selected=(is-href "dc.services.instance.tags")) - (hash label="Metadata" href=(href-to "dc.services.instance.metadata") selected=(is-href "dc.services.instance.metadata")) + (hash label="Tags & Meta" href=(href-to "dc.services.instance.metadata") selected=(is-href "dc.services.instance.metadata")) ) }}/> {{outlet}} diff --git a/ui-v2/app/templates/dc/services/instance/metadata.hbs b/ui-v2/app/templates/dc/services/instance/metadata.hbs index b38931c70..8ec4c816d 100644 --- a/ui-v2/app/templates/dc/services/instance/metadata.hbs +++ b/ui-v2/app/templates/dc/services/instance/metadata.hbs @@ -1,11 +1,24 @@ -
- This instance has no metadata. -
-{{/if}} + +