From 59b18f30562156b468fccd81f15f8ec0311b8dc8 Mon Sep 17 00:00:00 2001 From: Anton Arefiev Date: Fri, 10 Nov 2017 18:04:23 +0100 Subject: [PATCH] Disable metadata switch if only one item is available Single metadata item on image details looks like action button, which is confusing, so change cursor from pointer to default. Closes-Bug: #1731884 Change-Id: I50b9a9c3878866249561a58c92aeafff4dffc949 Co-Authored-By: Ivan Kolodyazhny --- .../static/framework/widgets/metadata/display/display.scss | 5 +++-- .../metadata/display/metadata-display.controller.js | 7 +++++++ .../widgets/metadata/display/metadata-display.html | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/horizon/static/framework/widgets/metadata/display/display.scss b/horizon/static/framework/widgets/metadata/display/display.scss index 7f9dcbff2c..88809b1cbc 100644 --- a/horizon/static/framework/widgets/metadata/display/display.scss +++ b/horizon/static/framework/widgets/metadata/display/display.scss @@ -3,9 +3,10 @@ .selector-item { padding: $padding-base-vertical $padding-base-horizontal; color: $link-color; - cursor: pointer; border-radius: $nav-pills-border-radius; - + &.clickable { + cursor: pointer; + } &.active { background: $nav-pills-active-link-hover-bg; color: $nav-pills-active-link-hover-color; diff --git a/horizon/static/framework/widgets/metadata/display/metadata-display.controller.js b/horizon/static/framework/widgets/metadata/display/metadata-display.controller.js index 6d1a2d1fb0..30ea0c52c9 100644 --- a/horizon/static/framework/widgets/metadata/display/metadata-display.controller.js +++ b/horizon/static/framework/widgets/metadata/display/metadata-display.controller.js @@ -76,6 +76,13 @@ return true; // break } }); + + ctrl.count = 0; + ctrl.tree.flatTree.some(function (i) { + if (ctrl.listFilter(i)) { + ctrl.count += 1; + } + }); } } })(); diff --git a/horizon/static/framework/widgets/metadata/display/metadata-display.html b/horizon/static/framework/widgets/metadata/display/metadata-display.html index d03e6583f8..61488962d4 100644 --- a/horizon/static/framework/widgets/metadata/display/metadata-display.html +++ b/horizon/static/framework/widgets/metadata/display/metadata-display.html @@ -4,7 +4,7 @@
+ ng-class="{ active: ctrl.selected === item, clickable: ctrl.count > 1 }">