You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by sp...@apache.org on 2014/01/21 20:11:55 UTC
git commit: AMBARI-4200: Minor UI cleanup
Updated Branches:
refs/heads/trunk 76e0c5547 -> 75a5655a9
AMBARI-4200: Minor UI cleanup
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/75a5655a
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/75a5655a
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/75a5655a
Branch: refs/heads/trunk
Commit: 75a5655a93a40561448e5607ea568875a9b33032
Parents: 76e0c55
Author: Jeff Sposetti <js...@HW10505.local>
Authored: Tue Jan 21 11:10:35 2014 -0800
Committer: Jeff Sposetti <js...@HW10505.local>
Committed: Tue Jan 21 11:10:57 2014 -0800
----------------------------------------------------------------------
ambari-web/app/messages.js | 8 ++++----
ambari-web/app/styles/application.less | 2 --
.../main/service/manage_configuration_groups_popup.hbs | 2 +-
3 files changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/75a5655a/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index fefaa33..77eb4b4 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1140,7 +1140,7 @@ Em.I18n.translations = {
'services.service.config.failSaveConfigHostOverrides':'Failure in saving service configuration overrides',
'services.service.config.addPropertyWindow.errorMessage':'This is required',
'services.service.config.addPropertyWindow.error.derivedKey':'This property is already defined',
- 'services.service.config.stopService.runningHostComponents':'{0} components on {1} hosts are still running',
+ 'services.service.config.stopService.runningHostComponents':'{0} components on {1} hosts are running',
'services.service.config.stopService.unknownHostComponents':'{0} components on {1} hosts are in unknown state. These components might actually be running and need restarting later to make the changes effective.',
'services.service.config.confirmDirectoryChange':'You are about to make changes to service directories that are core to {0}. Before you proceed, be absolutely certain of the implications and that you have taken necessary manual steps, if any, for the changes. Are you sure you want to proceed?',
'services.service.config.configOverride.head':'Config Override',
@@ -1374,7 +1374,7 @@ Em.I18n.translations = {
'hosts.host.summary.header':'Summary',
'hosts.host.summary.hostname':'Hostname',
- 'hosts.host.summary.agentHeartbeat':'Agent <br/> Heartbeat',
+ 'hosts.host.summary.agentHeartbeat':'Heartbeat',
'hosts.host.summary.hostMetrics':'Host Metrics',
'hosts.host.summary.addComponent':'Add Component',
@@ -1410,7 +1410,7 @@ Em.I18n.translations = {
'hosts.host.healthStatusCategory.green': "Healthy",
'hosts.host.healthStatusCategory.red': "Master Down",
'hosts.host.healthStatusCategory.orange': "Slave Down",
- 'hosts.host.healthStatusCategory.yellow': "No Heartbeat",
+ 'hosts.host.healthStatusCategory.yellow': "Lost Heartbeat",
'hosts.host.alerts.label': 'Alerts',
'hosts.host.maintainance.stopAllComponents.context': 'Stop All Host Components',
'hosts.host.maintainance.startAllComponents.context': 'Start All Host Components',
@@ -1430,7 +1430,7 @@ Em.I18n.translations = {
'hosts.cant.do.popup.masterList.body':'This host cannot be deleted since it has the following master components:',
'hosts.cant.do.popup.masterList.body.end':'To delete this host, you must first move all the master components listed above to another host.',
'hosts.cant.do.popup.nonDeletableList.body':'Deletion of the following {0} components is not supported. ',
- 'hosts.cant.do.popup.runningList.body':'This host cannot be deleted since the following components are still running:',
+ 'hosts.cant.do.popup.runningList.body':'This host cannot be deleted since the following components are running:',
'hosts.cant.do.popup.runningList.body.end':'To delete this host, you must first stop all the running components listed above. ' +
'If this host has a DataNode, it should be decommissioned first to prevent data loss.',
'hosts.add.header':'Add Host Wizard',
http://git-wip-us.apache.org/repos/asf/ambari/blob/75a5655a/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 7df483e..330e3d9 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -1782,7 +1782,6 @@ width:100%;
/*start alerts summary*/
.alerts {
- border: 1px solid #ddd;
margin: 0px;
max-height: 500px;
overflow-y: auto;
@@ -3195,7 +3194,6 @@ background: url( data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByU
.host-components {
padding: 10px;
padding-bottom: 0;
- border: 1px solid #DEDEDE;
border-radius: 4px;
background: #FFF;
http://git-wip-us.apache.org/repos/asf/ambari/blob/75a5655a/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs b/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs
index 6ffcd8e..9d20458 100644
--- a/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs
+++ b/ambari-web/app/templates/main/service/manage_configuration_groups_popup.hbs
@@ -49,7 +49,7 @@
</div>
</div>
<div class="span8">
- <span>{{t common.hosts}}</span>
+ <span> </span>
<div class="row-fluid">
<div class="span12 pull-right">
{{view Em.Select