AMBARI-21742. Usability and Style Changes For Upgrade History (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/53fb9af3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/53fb9af3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/53fb9af3 Branch: refs/heads/branch-2.6 Commit: 53fb9af353696e4767c0f1f6bcd2cc8a3ad71f71 Parents: 3387974 Author: Alex Antonenko <[email protected]> Authored: Thu Aug 17 15:23:31 2017 +0300 Committer: Alex Antonenko <[email protected]> Committed: Thu Aug 17 17:05:14 2017 +0300 ---------------------------------------------------------------------- ambari-web/app/styles/stack_versions.less | 4 ++++ .../templates/main/admin/stack_upgrade/upgrade_history.hbs | 9 ++++----- .../views/main/admin/stack_upgrade/upgrade_history_view.js | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/53fb9af3/ambari-web/app/styles/stack_versions.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/stack_versions.less b/ambari-web/app/styles/stack_versions.less index 8f52a76..4d1e5bf 100644 --- a/ambari-web/app/styles/stack_versions.less +++ b/ambari-web/app/styles/stack_versions.less @@ -817,11 +817,15 @@ } #upgrade-summary-table { + & > tbody > tr { + cursor: pointer; + } .wide-column { width: 14%; } .accordion-group { border-right: none; + border-bottom: none; } .accordion-inner { border-top: none; http://git-wip-us.apache.org/repos/asf/ambari/blob/53fb9af3/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs index 6b226cc..b355fda 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs @@ -57,13 +57,12 @@ <tbody class="accordion" id="versionsAccordion"> {{#if view.pageContent}} {{#each item in view.pageContent}} - <tr> + <tr data-toggle="collapse" + data-parent="#versionsAccordion" + {{bindAttr href="item.idHref"}}> <td class="name accordion-group"> <span class="trim_hostname accordion-heading"> - <i class="icon-caret-right accordion-toggle" - data-toggle="collapse" - data-parent="#versionsAccordion" - {{bindAttr href="item.idHref"}}></i> + <i class="icon-caret-right accordion-toggle"></i> <a href="#" class="black" {{action "showUpgradeHistoryRecord" item.stackUpgradeHistoryItem target="view"}}> {{unbound item.directionLabel}} http://git-wip-us.apache.org/repos/asf/ambari/blob/53fb9af3/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js index 674783e..456b7f3 100644 --- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js +++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js @@ -307,6 +307,7 @@ App.MainAdminStackUpgradeHistoryView = App.TableView.extend(App.TableServerViewM }, showUpgradeHistoryRecord: function (event) { + event.stopPropagation(); var record = event.context; var direction = App.format.normalizeName(record.get('direction')); var associatedVersion = record.get('associatedVersion');
