You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/06/21 00:53:45 UTC
svn commit: r1495221 - in /incubator/ambari/trunk/ambari-web/app:
templates/main/dashboard/widgets/ views/main/dashboard/
views/main/dashboard/widgets/
Author: yusaku
Date: Thu Jun 20 22:53:44 2013
New Revision: 1495221
URL: http://svn.apache.org/r1495221
Log:
AMBARI-2439. Widget tweaks for hover info. (Xi Wang via yusaku)
Modified:
incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs
incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs
incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widget.js
incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/datanode_live.js
incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/hbase_master_uptime.js
incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/jobtracker_uptime.js
incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/mapreduce_slots.js
incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/namenode_uptime.js
incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/tasktracker_live.js
Modified: incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs?rev=1495221&r1=1495220&r2=1495221&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/simple_text.hbs Thu Jun 20 22:53:44 2013
@@ -26,7 +26,7 @@
<i class="icon-edit"></i>
</a>
- <div class="hidden-info">
+ <div {{bindAttr class="view.hiddenInfoClass" }}>
<table align="center">
{{#each line in view.hiddenInfo}}
<tr><td>{{line}}</td></tr>
Modified: incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs?rev=1495221&r1=1495220&r2=1495221&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/main/dashboard/widgets/uptime.hbs Thu Jun 20 22:53:44 2013
@@ -22,7 +22,7 @@
<i class="icon-remove-sign icon-large"></i>
</a>
<div class="caption span11"> {{view.title}} </div>
- <div class="hidden-info-three-line">
+ <div {{bindAttr class="view.hiddenInfoClass"}}>
<table align="center">
{{#each line in view.hiddenInfo}}
<tr>
Modified: incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widget.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widget.js?rev=1495221&r1=1495220&r2=1495221&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widget.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widget.js Thu Jun 20 22:53:44 2013
@@ -45,6 +45,7 @@ App.DashboardWidgetView = Em.View.extend
isLinks: false,
content: null, // widget content pieChart/ text/ progress bar/links/ metrics. etc
hiddenInfo: null, // more info details
+ hiddenInfoClass: "hidden-info",
thresh1: null, //num not string
thresh2: null,
Modified: incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/datanode_live.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/datanode_live.js?rev=1495221&r1=1495220&r2=1495221&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/datanode_live.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/datanode_live.js Thu Jun 20 22:53:44 2013
@@ -31,11 +31,12 @@ App.DataNodeUpView = App.DashboardWidget
hiddenInfo: function () {
var result = [];
- result.pushObject(this.get('model.liveDataNodes.length') + ' ' + this.t('dashboard.services.hdfs.nodes.live') + '/ ' +
- this.get('model.deadDataNodes.length') + ' ' + this.t('dashboard.services.hdfs.nodes.dead') + '/ ' +
- this.get('model.decommissionDataNodes.length')+ ' ' + this.t('dashboard.services.hdfs.nodes.decom'));
+ result.pushObject(this.get('model.liveDataNodes.length') + ' ' + this.t('dashboard.services.hdfs.nodes.live'));
+ result.pushObject(this.get('model.deadDataNodes.length') + ' ' + this.t('dashboard.services.hdfs.nodes.dead'));
+ result.pushObject(this.get('model.decommissionDataNodes.length')+ ' ' + this.t('dashboard.services.hdfs.nodes.decom'));
return result;
}.property('model.liveDataNodes.length','model.deadDataNodes.length','model.decommissionDataNodes.length'),
+ hiddenInfoClass: "hidden-info-three-line",
classNameBindings: ['isRed', 'isOrange', 'isGreen'],
isRed: function () {
Modified: incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/hbase_master_uptime.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/hbase_master_uptime.js?rev=1495221&r1=1495220&r2=1495221&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/hbase_master_uptime.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/hbase_master_uptime.js Thu Jun 20 22:53:44 2013
@@ -30,6 +30,7 @@ App.HBaseMasterUptimeView = App.Dashboar
isProgressBar: false,
model_type: 'hbase',
hiddenInfo: [],
+ hiddenInfoClass: "hidden-info-three-line",
classNameBindings: ['isRed', 'isOrange', 'isGreen', 'isNA'],
isGreen: function () {
Modified: incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/jobtracker_uptime.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/jobtracker_uptime.js?rev=1495221&r1=1495220&r2=1495221&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/jobtracker_uptime.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/jobtracker_uptime.js Thu Jun 20 22:53:44 2013
@@ -30,6 +30,7 @@ App.JobTrackerUptimeView = App.Dashboard
isProgressBar: false,
model_type: 'mapreduce',
hiddenInfo: [],
+ hiddenInfoClass: "hidden-info-three-line",
classNameBindings: ['isRed', 'isOrange', 'isGreen', 'isNA'],
isGreen: function () {
Modified: incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/mapreduce_slots.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/mapreduce_slots.js?rev=1495221&r1=1495220&r2=1495221&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/mapreduce_slots.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/mapreduce_slots.js Thu Jun 20 22:53:44 2013
@@ -31,12 +31,15 @@ App.MapReduceSlotsView = App.DashboardWi
hiddenInfo: function (){
var result = [];
if(this.get('isViewExist')){
- result.pushObject('Occupied Slots/ Reserved Slots/ Total Slots');
+ var line1 = "Map: " + this.get('model.mapSlotsOccupied') + " Occupied / " + this.get('model.mapSlotsReserved') + " Reserved / " + this.get('model.mapSlots') + " Total";
+ result.pushObject(line1);
+ var line2 = "Reduce: " + this.get('model.reduceSlotsOccupied') + " Occupied / " + this.get('model.reduceSlotsReserved') + " Reserved / " + this.get('model.reduceSlots') + " Total";
+ result.pushObject(line2);
}else{
result.pushObject('MapReduce Not Started');
}
return result;
- }.property('isViewExist'),
+ }.property('isViewExist', 'map_display_text', 'reduce_display_text'),
isViewExist: function () {
return this.get('model.mapSlotsOccupied') != null && this.get('model.mapSlotsReserved') != null && this.get('model.reduceSlotsOccupied') != null && this.get('model.reduceSlotsReserved') != null;
}.property('model.mapSlotsReserved', 'model.mapSlotsOccupied', 'model.reduceSlotsReserved', 'model.reduceSlotsOccupied'),
Modified: incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/namenode_uptime.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/namenode_uptime.js?rev=1495221&r1=1495220&r2=1495221&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/namenode_uptime.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/namenode_uptime.js Thu Jun 20 22:53:44 2013
@@ -30,6 +30,7 @@ App.NameNodeUptimeView = App.DashboardWi
isProgressBar: false,
model_type: 'hdfs',
hiddenInfo: [],
+ hiddenInfoClass: "hidden-info-three-line",
classNameBindings: ['isRed', 'isOrange', 'isGreen', 'isNA'],
isGreen: function () {
Modified: incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/tasktracker_live.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/tasktracker_live.js?rev=1495221&r1=1495220&r2=1495221&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/tasktracker_live.js (original)
+++ incubator/ambari/trunk/ambari-web/app/views/main/dashboard/widgets/tasktracker_live.js Thu Jun 20 22:53:44 2013
@@ -33,9 +33,9 @@ App.TaskTrackerUpView = App.DashboardWid
var svc = this.get('model');
var liveCount = svc.get('aliveTrackers').get('length');
var totalCount = svc.get('taskTrackers').get('length');
- var template = this.t('dashboard.services.mapreduce.trackersSummary');
var result = [];
- result.pushObject(template.format(liveCount, totalCount));
+ result.pushObject(liveCount + " live");
+ result.pushObject(totalCount + " total");
return result;
}.property('model.aliveTrackers.length', 'model.taskTrackers.length'),