You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2017/09/05 10:36:04 UTC
ambari git commit: AMBARI-21875. Remove Revert Icon In Favor of Text
Dropdown Action (alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 f452063a9 -> a6cfc132c
AMBARI-21875. Remove Revert Icon In Favor of Text Dropdown Action (alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a6cfc132
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a6cfc132
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a6cfc132
Branch: refs/heads/branch-2.6
Commit: a6cfc132c289064b2992b3d3b5152869d8a47d49
Parents: f452063
Author: Alex Antonenko <aa...@hortonworks.com>
Authored: Tue Sep 5 13:35:41 2017 +0300
Committer: Alex Antonenko <aa...@hortonworks.com>
Committed: Tue Sep 5 13:35:41 2017 +0300
----------------------------------------------------------------------
ambari-web/app/styles/stack_versions.less | 29 ++++++++++++++++----
.../stack_upgrade/upgrade_version_column.hbs | 14 ++++++++--
.../upgrade_version_column_view.js | 3 +-
3 files changed, 37 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6cfc132/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 8dee023..c1b2ab6 100644
--- a/ambari-web/app/styles/stack_versions.less
+++ b/ambari-web/app/styles/stack_versions.less
@@ -97,10 +97,6 @@
a {
cursor: pointer;
}
- .icon-undo {
- color: rgb(243, 178, 11);
- margin-right: 2px;
- }
}
}
}
@@ -266,6 +262,28 @@
.hosts-section .host-link {
font-size: 12px;
}
+ .revert-dropdown{
+ position: absolute;
+ top: 0;
+ width: 100%;
+ z-index: 1000;
+ .btn {
+ position: relative;
+ top: 3px;
+ float: right;
+ background: transparent;
+ border: none;
+ box-shadow: none;
+ outline: none;
+ .caret{
+ border-top-color: #fff;
+ }
+ }
+ .dropdown-menu{
+ right: 0;
+ cursor: pointer;
+ }
+ }
}
.version-column {
min-height: 500px;
@@ -312,7 +330,8 @@
width: 100%;
display: inline-block;
padding: 0;
- line-height: 30px;
+ line-height: 35px;
+ height: 30px;
position: relative;
z-index: 2;
&:after,&:before{
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6cfc132/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
index 1909f82..1ea8de4 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_version_column.hbs
@@ -74,6 +74,17 @@
{{/if}}
</div>
+{{#if view.stateElement.canBeReverted}}
+ <div class="revert-dropdown">
+ <button class="btn dropdown-toggle" data-toggle="dropdown">
+ <span class="caret"></span>
+ </button>
+ <ul class="dropdown-menu">
+ <li><a {{action confirmRevertPatchUpgrade view.content target="controller"}}>{{t common.revert}}</a></li>
+ </ul>
+ </div>
+{{/if}}
+
<p class="version-column-display-name">
{{#if view.content.isStandard}}
<span>{{view.content.displayNameSimple}}</span>
@@ -85,9 +96,6 @@
<i class="icon-medkit" aria-hidden="true"></i>
{{/if}}
<span>{{view.content.displayName}}</span>
- {{#if view.stateElement.canBeReverted}}
- <i class="icon-undo" {{action confirmRevertPatchUpgrade view.content target="controller"}}></i>
- {{/if}}
{{/if}}
</p>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a6cfc132/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
index 3bff550..a031b92 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_column_view.js
@@ -27,7 +27,8 @@ App.UpgradeVersionColumnView = App.UpgradeVersionBoxView.extend({
didInsertElement: function () {
App.tooltip($('.out-of-sync-badge'), {title: Em.I18n.t('hosts.host.stackVersions.status.out_of_sync')});
App.tooltip($('.not-upgradable'), {title: Em.I18n.t('admin.stackVersions.version.service.notUpgradable')});
- App.tooltip($('.icon-trash'), {title: Em.I18n.t('common.revert.patch')});
+ App.tooltip($('.icon-bug'), {title: Em.I18n.t('common.patch')});
+ App.tooltip($('.icon-medkit'), {title: Em.I18n.t('common.maint')});
if (!this.get('content.isCompatible')) {
App.tooltip(this.$(".repo-version-tooltip"), {
title: Em.I18n.t('admin.stackVersions.version.noCompatible.tooltip')