Repository: ambari Updated Branches: refs/heads/trunk 6627144d4 -> cfe3c6a6e
AMBARI-4884 UI cleanup and icon. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/cfe3c6a6 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/cfe3c6a6 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/cfe3c6a6 Branch: refs/heads/trunk Commit: cfe3c6a6e2ecb88d5ce5265122a72d730023632e Parents: 6627144 Author: aBabiichuk <[email protected]> Authored: Fri Feb 28 16:47:08 2014 +0200 Committer: aBabiichuk <[email protected]> Committed: Fri Feb 28 16:48:28 2014 +0200 ---------------------------------------------------------------------- ambari-web/app/data/service_configs.js | 2 +- ambari-web/app/styles/application.less | 4 ++++ ambari-web/app/views/main/host/details.js | 2 +- ambari-web/app/views/main/service/item.js | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/cfe3c6a6/ambari-web/app/data/service_configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/data/service_configs.js b/ambari-web/app/data/service_configs.js index c8dcd52..b3266fb 100644 --- a/ambari-web/app/data/service_configs.js +++ b/ambari-web/app/data/service_configs.js @@ -258,7 +258,7 @@ module.exports = [ }, { serviceName: 'TEZ', - displayName: 'TEZ', + displayName: 'Tez', filename: 'tez-site', configCategories: [ App.ServiceConfigCategory.create({ name: 'General', displayName : 'General'}), http://git-wip-us.apache.org/repos/asf/ambari/blob/cfe3c6a6/ambari-web/app/styles/application.less ---------------------------------------------------------------------- diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less index 87209fe..d64e0af 100644 --- a/ambari-web/app/styles/application.less +++ b/ambari-web/app/styles/application.less @@ -835,6 +835,9 @@ h1 { max-width:250px; } } + .dropdown-menu > li > a:hover { + text-shadow: none; + } } .running-host-components-table{ @@ -2293,6 +2296,7 @@ width:100%; text-align: right; margin-bottom: 5px; margin-top: -55px; + margin-left: 10px; ul.dropdown-menu { li { text-align: left; http://git-wip-us.apache.org/repos/asf/ambari/blob/cfe3c6a6/ambari-web/app/views/main/host/details.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/host/details.js b/ambari-web/app/views/main/host/details.js index 2ce416f..d92300b 100644 --- a/ambari-web/app/views/main/host/details.js +++ b/ambari-web/app/views/main/host/details.js @@ -35,7 +35,7 @@ App.MainHostDetailsView = Em.View.extend({ return [ {action: 'startAllComponents', liClass: (this.get('controller.content.isNotHeartBeating')?'disabled':'enabled'), cssClass: 'icon-play', 'label': this.t('hosts.host.details.startAllComponents')}, {action: 'stopAllComponents', liClass: (this.get('controller.content.isNotHeartBeating')?'disabled':'enabled'), cssClass: 'icon-stop', 'label': this.t('hosts.host.details.stopAllComponents')}, - {action: 'restartAllComponents', liClass: (this.get('controller.content.isNotHeartBeating')?'disabled':'enabled'), cssClass: 'icon-forward', 'label': this.t('hosts.host.details.restartAllComponents')}, + {action: 'restartAllComponents', liClass: (this.get('controller.content.isNotHeartBeating')?'disabled':'enabled'), cssClass: 'icon-repeat', 'label': this.t('hosts.host.details.restartAllComponents')}, {action: 'deleteHost', liClass:'', cssClass: 'icon-remove', 'label': this.t('hosts.host.details.deleteHost')}, {action: 'onOffPassiveModeForHost', liClass:'', cssClass: 'icon-medkit', active:this.get('isActive'), 'label': this.t('passiveState.turn' + onOff)}]; }.property('controller.content','isActive', 'controller.content.isNotHeartBeating'), http://git-wip-us.apache.org/repos/asf/ambari/blob/cfe3c6a6/ambari-web/app/views/main/service/item.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/service/item.js b/ambari-web/app/views/main/service/item.js index 33df5ee..da08140 100644 --- a/ambari-web/app/views/main/service/item.js +++ b/ambari-web/app/views/main/service/item.js @@ -37,7 +37,7 @@ App.MainServiceItemView = Em.View.extend({ options.push({action: 'refreshConfigs', cssClass: 'icon-refresh', 'label': Em.I18n.t('hosts.host.details.refreshConfigs'), disabled: disableRefreshConfgis}); } else { // Restart All action - options.push({action:'restartAllHostComponents', cssClass: 'icon-forward', context: serviceName, 'label': Em.I18n.t('restart.service.all'), disabled: false}); + options.push({action:'restartAllHostComponents', cssClass: 'icon-repeat', context: serviceName, 'label': Em.I18n.t('restart.service.all'), disabled: false}); // Rolling Restart action var rrComponentName = batchUtils.getRollingRestartComponentName(serviceName); if (rrComponentName) {
