From 78f976cf96fa7b1b8b48c26d380fa69fea43a60d Mon Sep 17 00:00:00 2001 From: Westly Wright Date: Fri, 17 Jun 2016 10:23:33 -0700 Subject: [PATCH] Host view options broken rancher/rancher#5107 remove storage pool detial link until detail page ready rancher/rancher#4527 --- app/components/storagepool-section/template.hbs | 12 +++++++----- app/hosts/index/template.hbs | 8 +++++--- translations/en-us.yaml | 1 + 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/app/components/storagepool-section/template.hbs b/app/components/storagepool-section/template.hbs index 674b1e475..751a6841c 100644 --- a/app/components/storagepool-section/template.hbs +++ b/app/components/storagepool-section/template.hbs @@ -6,11 +6,13 @@
{{badge-state model=model}}
{{/unless}}

- {{#if single}} - {{model.name}} - {{else}} - {{#link-to "storagepools.detail" model.id}} {{model.name}}{{/link-to}} - {{/if}} + {{model.name}} + {{!-- when storage pools details ready --}} + {{!-- {{#if single}} --}} + {{!-- {{model.name}} --}} + {{!-- {{else}} --}} + {{!-- {{#link-to "storagepools.detail" model.id}} {{model.name}}{{/link-to}} --}} + {{!-- {{/if}} --}}

diff --git a/app/hosts/index/template.hbs b/app/hosts/index/template.hbs index 55f739dc1..824f4e7eb 100644 --- a/app/hosts/index/template.hbs +++ b/app/hosts/index/template.hbs @@ -4,12 +4,14 @@ {{#link-to "hosts.new" classNames="btn btn-sm btn-primary"}}{{t 'hostsPage.index.addHost'}}{{/link-to}}
- {{tooltip-link icon="icon-ellipsis" text=(t 'hostsPage.index.tooltip.listView') options=listLinkOptions}} - {{tooltip-link icon="icon-layeredgroup" text=(t 'hostsPage.index.tooltip.groupedView') options=groupLinkOptions}} + {{#link-to "hosts" (query-params mode="dot") classNames="btn btn-sm btn-default"}}{{tooltip-link icon="icon-ellipsis" text=(t 'hostsPage.index.tooltip.listView') options=listLinkOptions}}{{/link-to}} + {{#link-to "hosts" (query-params mode="grouped") classNames="btn btn-sm btn-default"}}{{tooltip-link icon="icon-layeredgroup" text=(t 'hostsPage.index.tooltip.groupedView') options=groupLinkOptions}}{{/link-to}} + +
- +
diff --git a/translations/en-us.yaml b/translations/en-us.yaml index 638c50d71..4cb7091b4 100644 --- a/translations/en-us.yaml +++ b/translations/en-us.yaml @@ -653,6 +653,7 @@ hostsPage: groupedView: Grouped Stacks & Sidekicks columns: emptyMessage: No hosts or containers yet. + showSystem: Show System new: header: linkTo: "Hosts: "