Author: jaimin
Date: Wed Feb 6 22:25:11 2013
New Revision: 1443244
URL: http://svn.apache.org/viewvc?rev=1443244&view=rev
Log:
AMBARI-1354. "No alerts" badge on the Host Detail page should be green, not
red. (jaimin)
Modified:
incubator/ambari/trunk/CHANGES.txt
incubator/ambari/trunk/ambari-web/app/messages.js
incubator/ambari/trunk/ambari-web/app/templates/main/host/details.hbs
Modified: incubator/ambari/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1443244&r1=1443243&r2=1443244&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed Feb 6 22:25:11 2013
@@ -255,6 +255,8 @@ Trunk (unreleased changes):
BUG FIXES
+ AMBARI-1354. "No alerts" badge on the Host Detail page should be green, not
red. (jaimin)
+
AMBARI-1353. "Missing translation" shown in Job Browser. (jaimin)
AMBARI-1351. Provide consistent ordering of hosts in heatmap. (jaimin)
Modified: incubator/ambari/trunk/ambari-web/app/messages.js
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/messages.js?rev=1443244&r1=1443243&r2=1443244&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/messages.js (original)
+++ incubator/ambari/trunk/ambari-web/app/messages.js Wed Feb 6 22:25:11 2013
@@ -442,6 +442,7 @@ Em.I18n.translations = {
'hosts.host.stop.popup.header':'Confirmation',
'hosts.host.start.popup.body':'Are you sure?',
'hosts.host.stop.popup.body':'Are you sure?',
+ 'hosts.host.alert.noAlerts':'No alerts',
'hosts.host.healthStatus.heartBeatNotReceived':'The server has not received
a heartbeat from this host for more than 3 minutes.',
'hosts.host.healthStatus.mastersDown':"The following master components are
down:\n",
'hosts.host.healthStatus.slavesDown':"The following slave components are
down:\n",
Modified: incubator/ambari/trunk/ambari-web/app/templates/main/host/details.hbs
URL:
http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/host/details.hbs?rev=1443244&r1=1443243&r2=1443244&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/host/details.hbs
(original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/host/details.hbs Wed
Feb 6 22:25:11 2013
@@ -21,7 +21,7 @@
{{#if view.content.alertsCount}}
<span class="label label-important alerts-count" {{action
"showAlertsPopup" content
target="App.router.mainHostController"}}>{{view.content.alertsCount}}</span>
{{else}}
- <span class="label label-important alerts-count">No alerts</span>
+ <span class="label label-success alerts-count">{{t
hosts.host.alert.noAlerts}}</span>
{{/if}}
<div><a href="javascript:void(null)" data-toggle="modal" {{action
backToHostsList}}><i class="icon-arrow-left"></i> {{t
hosts.host.back}}</a></div>
<!-- {{#if App.isAdmin}} -->
