Repository: ambari Updated Branches: refs/heads/trunk 37b847069 -> 2e170e480
AMBARI-22024. Stack and versions view style issues (alexantonenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2e170e48 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2e170e48 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2e170e48 Branch: refs/heads/trunk Commit: 2e170e4801794ddbbcd331585782a5f5b7e897a1 Parents: 37b8470 Author: Alex Antonenko <aantone...@hortonworks.com> Authored: Thu Sep 21 18:42:05 2017 +0300 Committer: Alex Antonenko <aantone...@hortonworks.com> Committed: Thu Sep 21 18:42:05 2017 +0300 ---------------------------------------------------------------------- ambari-web/app/styles/stack_versions.less | 1 + .../admin/stack_upgrade/upgrade_version_box_view.js | 4 ++-- .../stack_upgrade/upgrade_version_box_view_test.js | 12 ++++++------ 3 files changed, 9 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2e170e48/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 9d05d9b..2e4faff 100644 --- a/ambari-web/app/styles/stack_versions.less +++ b/ambari-web/app/styles/stack_versions.less @@ -211,6 +211,7 @@ } .dropdown-menu { cursor: pointer; + text-align: left; } } .installing { http://git-wip-us.apache.org/repos/asf/ambari/blob/2e170e48/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js index 6cf84fa..b37a094 100644 --- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js +++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_version_box_view.js @@ -299,7 +299,7 @@ App.UpgradeVersionBoxView = Em.View.extend({ if (this.get('content.isPatch')) { element.get('buttons').pushObject({ - text: Em.I18n.t('common.discard'), + text: Em.I18n.t('common.hide'), action: 'confirmDiscardRepoVersion', isDisabled: isDisabled }); @@ -329,7 +329,7 @@ App.UpgradeVersionBoxView = Em.View.extend({ element.set('isButtonGroup', true); element.set('isButton', false); element.get('buttons').pushObject({ - text: Em.I18n.t('common.discard'), + text: Em.I18n.t('common.hide'), action: 'confirmDiscardRepoVersion', isDisabled: isDisabledOnInit }); http://git-wip-us.apache.org/repos/asf/ambari/blob/2e170e48/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js index fbf72a2..174f51c 100644 --- a/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js +++ b/ambari-web/test/views/main/admin/stack_upgrade/upgrade_version_box_view_test.js @@ -503,7 +503,7 @@ describe('App.UpgradeVersionBoxView', function () { { "action": "confirmDiscardRepoVersion", "isDisabled": false, - "text": "Discard" + "text": Em.I18n.t('common.hide') } ], isDisabled: true @@ -532,7 +532,7 @@ describe('App.UpgradeVersionBoxView', function () { { "action": "confirmDiscardRepoVersion", "isDisabled": true, - "text": "Discard" + "text": Em.I18n.t('common.hide') } ], isDisabled: true @@ -729,7 +729,7 @@ describe('App.UpgradeVersionBoxView', function () { { "action": "confirmDiscardRepoVersion", "isDisabled": true, - "text": "Discard" + "text": Em.I18n.t('common.hide') } ], isDisabled: true @@ -1443,7 +1443,7 @@ describe('App.UpgradeVersionBoxView', function () { isDisabled: false }, { - "text": Em.I18n.t('common.discard'), + "text": Em.I18n.t('common.hide'), "action": "confirmDiscardRepoVersion", "isDisabled": false } @@ -1479,7 +1479,7 @@ describe('App.UpgradeVersionBoxView', function () { expect(JSON.stringify(element)).to.be.equal(JSON.stringify(Em.Object.create({ "buttons": [ { - "text": Em.I18n.t('common.discard'), + "text": Em.I18n.t('common.hide'), "action": "confirmDiscardRepoVersion", "isDisabled": false } @@ -1507,7 +1507,7 @@ describe('App.UpgradeVersionBoxView', function () { expect(JSON.stringify(element)).to.be.equal(JSON.stringify(Em.Object.create({ "buttons": [ { - "text": Em.I18n.t('common.discard'), + "text": Em.I18n.t('common.hide'), "action": "confirmDiscardRepoVersion", "isDisabled": false }
