AMBARI-4617. Update labels for Maintenance Mode. (yusaku)

ambari-web/app/messages.js

@@ -177,7 +177,7 @@ Em.I18n.translations = {
   'common.discard': 'Discard',
   'common.actions': 'Actions',
   'common.maintenance': 'Maintenance',
-  'common.passive_state': 'Out of Service',
+  'common.passive_state': 'Maintenance Mode',
   'common.selected': 'Selected',
   'common.password': 'Password',
   'common.url': 'URL',
@@ -186,10 +186,10 @@ Em.I18n.translations = {
   'common.hostLog.popup.logDir.path':'/var/lib/ambari-agent/data/',
   'common.hostLog.popup.outputLog.value': 'output-{0}.txt',
   'common.hostLog.popup.errorLog.value': 'errors-{0}.txt',
-  'passiveState.turnOn':'Turn On Out-of-Service Mode',
-  'passiveState.turnOff':'Turn Off Out-of-Service Mode',
-  'passiveState.turnOnFor':'Turn On Out-of-Service Mode for',
-  'passiveState.turnOffFor':'Turn Off Out-of-Service Mode for',
+  'passiveState.turnOn':'Turn On Maintenance Mode',
+  'passiveState.turnOff':'Turn Off Maintenance Mode',
+  'passiveState.turnOnFor':'Turn On Maintenance Mode for',
+  'passiveState.turnOffFor':'Turn Off Maintenance Mode for',
 
   'requestInfo.installComponents':'Install Components',
   'requestInfo.installServices':'Install Services',
@@ -1348,8 +1348,8 @@ Em.I18n.translations = {
   'hosts.table.restartComponents.withNames':'Restart {0}',
   'hosts.table.restartComponents.withoutNames':'{0} components should be restarted',
 
-  'hosts.table.componentsInPassiveState.withNames':'{0} in Out-of-Service mode',
-  'hosts.table.componentsInPassiveState.withoutNames':'{0} components in Out-of-Service mode',
+  'hosts.table.componentsInPassiveState.withNames':'{0} in Maintenance Mode',
+  'hosts.table.componentsInPassiveState.withoutNames':'{0} components in Maintenance Mode',
 
   'hosts.table.menu.l1.selectedHosts':'Selected Hosts',
   'hosts.table.menu.l1.filteredHosts':'Filtered Hosts',
@@ -1360,8 +1360,8 @@ Em.I18n.translations = {
   'hosts.bulkOperation.confirmation.header':'Confirm Bulk Operation',
   'hosts.bulkOperation.confirmation.hosts':'Are you sure you want to <strong>{0}</strong> on the following {1} hosts?',
   'hosts.bulkOperation.confirmation.hostComponents':'Are you sure you want to <strong>{0} {1}</strong> on the following {2} hosts?',
-  'hosts.bulkOperation.passiveState.nothingToDo.body':'All hosts that you selected are already in Out-of-Service mode.',
-  'hosts.bulkOperation.host_components.passiveState.nothingToDo.body':'All host components that you selected are already in Out-of-Service mode',
+  'hosts.bulkOperation.passiveState.nothingToDo.body':'All hosts that you selected are already in Maintenance Mode.',
+  'hosts.bulkOperation.host_components.passiveState.nothingToDo.body':'All host components that you selected are already in Maintenance Mode',
 
   'hosts.selectHostsDialog.title': 'Select Configuration Group Hosts',
   'hosts.selectHostsDialog.message': 'Select hosts that should belong to this {0} Configuration Group.  All hosts belonging to this group will have the same set of {0} configurations.',
@@ -1439,13 +1439,13 @@ Em.I18n.translations = {
   'hosts.host.hbase_regionserver.recommission':'Recommission HBase RegionServer',
   'hosts.host.hbase_regionserver.decommission':'Decommission HBase RegionServer',
   'hosts.host.decommissioned':'Decommissioned',
-  'hosts.host.decommissioning':'Decommissioning...',
+  'hosts.host.decommissioning':'Decommissioning',
 
-  'hosts.component.passive.implied.host.mode.tooltip':'Cannot Turn Off Out-of-Service mode because Host is in Out-of-Service mode',
-  'hosts.component.passive.implied.service.mode.tooltip':'Cannot Turn Off Out-of-Service mode because {0} is in Out-of-Service mode',
-  'hosts.component.passive.mode':'Component is in Out-of-Service mode',
-  'hosts.component.passive.short.mode':'Out of Service',
-  'hosts.host.passive.mode':'Host is in Out-of-Service mode',
+  'hosts.component.passive.implied.host.mode.tooltip':'Cannot Turn Off Maintenance Mode because Host is in Maintenance Mode',
+  'hosts.component.passive.implied.service.mode.tooltip':'Cannot Turn Off Maintenance Mode because {0} is in Maintenance Mode',
+  'hosts.component.passive.mode':'Component is in Maintenance Mode',
+  'hosts.component.passive.short.mode':'Maintenance Mode',
+  'hosts.host.passive.mode':'Host is in Maintenance Mode',
   'hosts.host.alert.noAlerts':'No alerts',
   'hosts.host.alert.noAlerts.message':'There are no alerts for this host.',
   'hosts.host.healthStatus.heartBeatNotReceived':'The server has not received a heartbeat from this host for more than 3 minutes.',
@@ -1481,7 +1481,7 @@ Em.I18n.translations = {
     'If this host has a DataNode, it should be decommissioned first to prevent data loss.',
   'hosts.add.header':'Add Host Wizard',
   'hosts.assignRack':'Assign Rack',
-  'hosts.passiveMode.popup':'Are you sure you want to Turn {0} Out-of-Service Mode for {1}?',
+  'hosts.passiveMode.popup':'Are you sure you want to <b>Turn {0} Maintenance Mode</b> for {1}?',
 
   'charts.horizon.chart.showText':'show',
   'charts.horizon.chart.hideText':'hide',
@@ -1817,8 +1817,8 @@ Em.I18n.translations = {
   'rollingrestart.dialog.msg.restart': 'This will restart {0} {1} at a time.',
   'rollingrestart.dialog.msg.restart.plural': 'This will restart {0} {1}s at a time.',
   'rollingrestart.dialog.msg.noRestartHosts': 'There are no {0}s to do rolling restarts',
-  'rollingrestart.dialog.msg.maintainance': 'Note: {0} {1} in Out of Service Mode will not be restarted',
-  'rollingrestart.dialog.msg.maintainance.plural': 'Note: {0} {1}s in Out of Service Mode will not be restarted',
+  'rollingrestart.dialog.msg.maintainance': 'Note: {0} {1} in Maintenance Mode will not be restarted',
+  'rollingrestart.dialog.msg.maintainance.plural': 'Note: {0} {1}s in Maintenance Mode will not be restarted',
   'rollingrestart.dialog.msg.componentsAtATime': '{0}s at a time',
   'rollingrestart.dialog.msg.timegap.prefix': 'Wait ',
   'rollingrestart.dialog.msg.timegap.suffix': 'seconds between batches ',
@@ -1832,10 +1832,10 @@ Em.I18n.translations = {
 
   'rolling.command.context': 'Rolling set {0} to state "{1}" - batch {2} of {3}',
   'rolling.nothingToDo.header': 'Nothing to do',
-  'rolling.nothingToDo.body': '{0} on selected hosts are already in selected state or in Out-of-Service mode.',
+  'rolling.nothingToDo.body': '{0} on selected hosts are already in selected state or in Maintenance Mode.',
 
   'restart.service.all': 'Restart All',
-  'restart.service.rest.context': 'Restart {1}s ({0})',
+  'restart.service.rest.context': 'Restart {0}s',
 
   'menu.item.dashboard':'Dashboard',
   'menu.item.heatmaps':'Heatmaps',

ambari-web/app/styles/application.less

@@ -3295,7 +3295,7 @@ background: url(	data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByU
     background: #FFF;
 
     #add_component{
-      width: 160px;
+      width: 170px;
       height: 30px;
     }
   }
@@ -4403,7 +4403,7 @@ ul.inline li {
 /* TIME RANGE WIDGET END */
 
 #host-details .host-components .btn-group > .btn {
-  width: 130px;
+  width: 140px;
 }
 
 #host-details > .host-maintenance {

ambari-web/app/utils/ajax.js

@@ -1427,7 +1427,7 @@ var urls = {
         type : 'POST',
         data : JSON.stringify({
           "RequestInfo" : {
-            "context" : Em.I18n.t('restart.service.rest.context').format(serviceDisplayName, componentDisplayName),
+            "context" : Em.I18n.t('restart.service.rest.context').format(componentDisplayName),
             "command" : "RESTART",
             "service_name" : data.serviceName,
             "component_name" : data.componentName,