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 2012/12/09 13:38:09 UTC
svn commit: r1418916 [2/3] - in /incubator/ambari/branches/AMBARI-666: ./
ambari-web/ ambari-web/app/ ambari-web/app/assets/data/hosts/
ambari-web/app/assets/data/racks/ ambari-web/app/controllers/
ambari-web/app/controllers/global/ ambari-web/app/cont...
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/server_data_mapper.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/server_data_mapper.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/server_data_mapper.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/server_data_mapper.js Sun Dec 9 12:37:57 2012
@@ -38,61 +38,64 @@ App.ServerDataMapper = Em.Object.extend(
App.QuickDataMapper = App.ServerDataMapper.extend({
- config : {},
- model : null,
- map:function(json){
- if(!this.get('model')) {return;}
- if(json.items){
+ config: {},
+ model: null,
+ map: function (json) {
+ if (!this.get('model')) {
+ return;
+ }
+
+ if (json.items) {
var result = [];
- if(this.get('model') != "App.Component" ){
- json.items.forEach(function(item){
- result.push(this.parseIt(item, this.config));
- }, this)
- }else{
- json.items.forEach(function(item){
- item.components.forEach(function(component){
- // debugger;
- result.push(this.parseIt(component, this.config));
- }, this)
- }, this)
- }
- //console.log(this.get('model') ,result);
- App.store.loadMany(this.get('model'), result);
+
+ json.items.forEach(function (item) {
+ result.push(this.parseIt(item, this.config));
+ }, this)
+
+ //console.log(this.get('model'), result);
+ App.store.loadMany(this.get('model'), result);
}
},
- parseIt : function(data, config){
+
+ parseIt: function (data, config) {
var result = {};
- for(var i in config){
- if(i.substr(0, 1) === '$'){
+ for (var i in config) {
+ if (i.substr(0, 1) === '$') {
i = i.substr(1, i.length);
- result[i] = config['$'+i];
+ result[i] = config['$' + i];
} else {
- if(i.substr(-4) !== '_key' && typeof config[i] == 'string'){
- result[i] = this.getJsonProperty(data, config[i]);
- } else if(typeof config[i] == 'object'){
- result[i] = [];
- var _data = data[config[i+'_key']];
- var l = _data.length;
- for(var index = 0; index<l; index++){
- result[i].push(this.parseIt(_data[index], config[i]));
- }
+ if (i.substr(-5) !== '_type' && i.substr(-4) !== '_key' && typeof config[i] == 'string') {
+ result[i] = this.getJsonProperty(data, config[i]);
+ } else if (typeof config[i] == 'object') {
+ result[i] = [];
+ var _data = this.getJsonProperty(data, config[i+'_key']);
+ var _type = config[i + '_type'];
+ var l = _data.length;
+ for (var index = 0; index < l; index++) {
+ if(_type == 'array'){
+ result[i].push(this.getJsonProperty(_data[index], config[i].item));
+ } else {
+ result[i].push(this.parseIt(_data[index], config[i]));
+ }
+ }
}
}
}
return result;
},
- getJsonProperty:function(json, path){
+
+ getJsonProperty: function (json, path) {
var pathArr = path.split('.');
var current = json;
- while(pathArr.length){
- if(pathArr[0].substr(-1) == ']'){
- var index = parseInt(pathArr[0].substr(-2,1));
- var attr = pathArr[0].substr(0, pathArr[0].length-3);
+ while (pathArr.length) {
+ if (pathArr[0].substr(-1) == ']') {
+ var index = parseInt(pathArr[0].substr(-2, 1));
+ var attr = pathArr[0].substr(0, pathArr[0].length - 3);
current = current[attr][index];
} else {
current = current[pathArr[0]];
}
- pathArr.splice(0,1);
+ pathArr.splice(0, 1);
}
return current;
}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/services_mapper.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/services_mapper.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/services_mapper.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/mappers/services_mapper.js Sun Dec 9 12:37:57 2012
@@ -21,18 +21,48 @@ App.servicesMapper = App.QuickDataMapper
config : {
id : 'ServiceInfo.service_name',
service_name : 'ServiceInfo.service_name',
- label : 'ServiceInfo.service_name',
- $health_status: 'LIVE',
- $work_status: 'true',
- $serviceAudit: [1, 2, 3],
+ $work_status: 'DEAD',
+ $service_audit: [1, 2, 3],
+ $alerts: [1, 2, 3],
components_key : 'components',
+ components_type : 'array',
components : {
- id : 'ServiceComponentInfo.component_name',
- component_name : 'ServiceComponentInfo.component_name',
- //service_id : 'ServiceComponentInfo.service_name',
- service_name : 'ServiceComponentInfo.service_name',
- state: 'host_components[0].HostRoles.state',
- host_name: 'host_components[0].HostRoles.host_name'
- }
+ item : 'ServiceComponentInfo.component_name'
+ }
+ },
+
+ model2 : App.Component,
+ config2: {
+ id : 'ServiceComponentInfo.component_name',
+ component_name : 'ServiceComponentInfo.component_name',
+ service_id : 'ServiceComponentInfo.service_name',
+ work_status: 'host_components[0].HostRoles.state',
+ host_id: 'host_components[0].HostRoles.host_name',
+ $decommissioned: false
+ },
+
+ map: function (json) {
+ if (!this.get('model')) {
+ return;
+ }
+
+ if (json.items) {
+ var result = [];
+
+ json.items.forEach(function (item) {
+ result.push(this.parseIt(item, this.config));
+ }, this)
+
+ App.store.loadMany(this.get('model'), result);
+
+ result = [];
+ json.items.forEach(function(item){
+ item.components.forEach(function(component){
+ result.push(this.parseIt(component, this.config2));
+ }, this)
+ }, this);
+
+ App.store.loadMany(this.get('model2'), result);
+ }
}
});
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/models.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/models.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/models.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/models.js Sun Dec 9 12:37:57 2012
@@ -23,6 +23,7 @@ require('models/form'); // should be the
require('models/authentication');
require('models/cluster');
require('models/hosts');
+require('models/quick_links');
require('models/service');
require('models/component');
require('models/service_config');
@@ -37,4 +38,3 @@ require('models/job');
require('models/run');
require('models/app');
require('models/background_operation');
-require('models/protoRelations');
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/models/alert.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/models/alert.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/models/alert.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/models/alert.js Sun Dec 9 12:37:57 2012
@@ -29,13 +29,22 @@ App.AlertStatus = {
*/
App.Alert = DS.Model.extend({
alertId: DS.attr('string'),
- title: DS.attr('string'),
+ primaryKey: 'alertId',
+ title: DS.attr('string'),//service_description in ajax response
serviceType: DS.attr('string'),
date: DS.attr('date'),
- status: DS.attr('string'),
- message: DS.attr('string'),
- primaryKey: 'alertId',
-
+ status: DS.attr('string'),//current_state in ajax response
+ message: DS.attr('string'),//plugin_output in ajax response
+ hostName: DS.attr('string'),
+ currentAttempt: DS.attr('string'),
+ lastHardStateChange: DS.attr('number'),
+ lastHardState: DS.attr('number'),
+ lastTimeOk: DS.attr('number'),
+ lastTimeWarning: DS.attr('number'),
+ lastTimeUnknown: DS.attr('number'),
+ lastTimeCritical: DS.attr('number'),
+ isFlapping: DS.attr('number'),
+ lastCheck: DS.attr('number'),
/**
* Used to show correct icon in UI
*/
@@ -77,7 +86,7 @@ App.Alert = DS.Model.extend({
return 'Hive';
}
}
- return '';
+ return 'unknown';
}.property('serviceType'),
/**
@@ -106,15 +115,5 @@ App.Alert = DS.Model.extend({
});
-/*
- * App.Alert.reopenClass() has to be called as opposed
- * to DS.Model.extend() containing URL. Only then will
- * the 'url' property show up for the instance and the
- * RESTAdapter will contact server.
- */
-App.Alert.reopenClass({
-// url: "http://nagiosserver/hdp/nagios/nagios_alerts.php?q1=alerts&alert_type=all"
-});
-
App.Alert.FIXTURES = [
];
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/models/component.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/models/component.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/models/component.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/models/component.js Sun Dec 9 12:37:57 2012
@@ -15,31 +15,67 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-/*
+
var App = require('app');
App.Component = DS.Model.extend({
- componentName:DS.attr('string'),
- label:DS.attr('string'),
- type:DS.attr('boolean'),
- service:DS.belongsTo('App.Service'),
- host:DS.belongsTo('App.Host'),
- workStatus:DS.attr('string'),
- isMaster:function () {
- return this.get('type');
- }.property('type'),
- isSlave:function () {
- return !this.get('type');
- }.property('type'),
- // checkedForHostFilter: true // this is for host page to set checkboxes checked
+
+ componentName: DS.attr('string'),
+
+ displayName: function () {
+ return App.format.role(this.get('componentName'));
+ }.property('componentName'),
+
+ service: DS.belongsTo('App.Service'),
+ //service_id: DS.attr('string'),
+
+ host: DS.belongsTo('App.Host'),
+ //host_id: DS.attr('string'),
+
+ workStatus: DS.attr('string'),
+
+ isMaster: function () {
+ switch (this.get('componentName')) {
+ case 'NAMENODE':
+ case 'SNAMENODE':
+ case 'JOBTRACKER':
+ case 'ZOOKEEPER_SERVER':
+ case 'HIVE_SERVER':
+ case 'HBASE_MASTER':
+ case 'NAGIOS_SERVER':
+ case 'GANGLIA_SERVER':
+ case 'OOZIE_SERVER':
+ case 'TEMPLETON_SERVER':
+ return true;
+ default:
+ return false;
+ }
+ return this.get('componentName');
+ }.property('componentName'),
+
decommissioned: DS.attr('boolean')
});
App.Component.Status = {
- started:"STARTED",
- starting:"STARTING",
- stopped:"STOPPED",
- stopping:"STOPPING"
+ started: "STARTED",
+ starting: "STARTING",
+ stopped: "INSTALLED",
+ stopping: "STOPPING",
+
+ getKeyName:function(value){
+ switch(value){
+ case this.started:
+ return 'started';
+ case this.starting:
+ return 'starting';
+ case this.stopped:
+ return 'installed';
+ case this.stopping:
+ return 'stopping';
+ }
+ return 'none';
+ }
}
-App.Component.FIXTURES = [];*/
+App.Component.FIXTURES = [];
+
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/models/host.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/models/host.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/models/host.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/models/host.js Sun Dec 9 12:37:57 2012
@@ -59,11 +59,11 @@ App.Host = DS.Model.extend({
var status;
var masterComponents = components.filterProperty('isMaster', true);
- if(components.everyProperty('workStatus', "STARTED")){
+ if(components.everyProperty('workStatus', App.Component.Status.started)){
status = 'LIVE';
} else if(false && this.get('isNotHeartBeating')){ //todo uncomment on real data
status = 'DEAD-YELLOW';
- } else if(masterComponents.length > 0 && !masterComponents.everyProperty('workStatus', "STARTED")){
+ } else if(masterComponents.length > 0 && !masterComponents.everyProperty('workStatus', App.Component.Status.started)){
status = 'DEAD';
} else{
status = 'DEAD-ORANGE';
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/models/job.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/models/job.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/models/job.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/models/job.js Sun Dec 9 12:37:57 2012
@@ -24,6 +24,7 @@ var misc = require('utils/misc');
App.Job = DS.Model.extend({
jobId:DS.attr('string'),
workflow:DS.belongsTo('App.Run'),
+ workflowId:DS.attr('string'),
jobName:DS.attr('string'),
workflowEntityName:DS.attr('string'),
userName:DS.attr('string'),
@@ -48,8 +49,10 @@ App.Job = DS.Model.extend({
jobCounters:DS.attr('number'),
input:DS.attr('number'),
output:DS.attr('number'),
+ elapsedTime:DS.attr('number'),
duration: function() {
- return date.dateFormatInterval(parseInt((parseInt(this.get('finishTime')) - parseInt(this.get('launchTime')))/1000));
+ //return date.dateFormatInterval(parseInt((parseInt(this.get('finishTime')) - parseInt(this.get('launchTime')))/1000));
+ return date.dateFormatInterval(parseInt(this.get('elapsedTime') / 1000));
}.property('launchTime', 'finishTime'),
jobTimeline:DS.attr('string'),
jobTaskview:DS.attr('string'),
@@ -69,4 +72,311 @@ App.Job = DS.Model.extend({
}.property('output')
});
-App.Job.FIXTURES = []
+App.Job.FIXTURES = [
+ /*{
+ id:1,
+ job_id:'job_201209201356_0001',
+ workflow:1,
+ job_name:'PiEstimator',
+ workflow_entity_name:'nodeA',
+ user_name:'jsmith',
+ queue:'default',
+ acls:null,
+ conf_path:'hdfs://localhost:9000/tmp/hadoop-jsmith/mapred/staging/jsmith/\.staging/job_201209201356_0001/job\.xml',
+ submit_time:1348174627119,
+ launch_time:1348174627650,
+ finish_time:1348174669539,
+ maps:20,
+ reduces:11,
+ status:'RUNNING',
+ priority:null,
+ finished_maps:12,
+ finished_reduces:5,
+ failed_maps:null, failed_reduces:null,
+
+ maps_runtime:22299,
+ reduces_runtime:11470,
+ map_counters:null,
+ reduce_counters:null,
+ job_counters:null,
+ job_timeline:'[[{"x":0,"y":0},{"x":1,"y":0},{"x":2,"y":0},{"x":3,"y":0},{"x":4,"y":0},{"x":5,"y":0},{"x":6,"y":0},{"x":7,"y":0},{"x":8,"y":0},{"x":9,"y":0},{"x":10,"y":0},{"x":11,"y":0},{"x":12,"y":0},{"x":13,"y":0},{"x":14,"y":0},{"x":15,"y":0},{"x":16,"y":0},{"x":17,"y":0},{"x":18,"y":0},{"x":19,"y":0},{"x":20,"y":0},{"x":21,"y":0},{"x":22,"y":0},{"x":23,"y":0},{"x":24,"y":0},{"x":25,"y":0},{"x":26,"y":0},{"x":27,"y":0},{"x":28,"y":0},{"x":29,"y":0},{"x":30,"y":0},{"x":31,"y":0},{"x":32,"y":0},{"x":33,"y":0},{"x":34,"y":0},{"x":35,"y":0},{"x":36,"y":0},{"x":37,"y":0},{"x":38,"y":0},{"x":39,"y":0},{"x":40,"y":0},{"x":41,"y":0},{"x":42,"y":0},{"x":43,"y":0},{"x":44,"y":0},{"x":45,"y":0},{"x":46,"y":0},{"x":47,"y":0},{"x":48,"y":0},{"x":49,"y":0},{"x":50,"y":0},{"x":51,"y":0},{"x":52,"y":0},{"x":53,"y":0},{"x":54,"y":0},{"x":55,"y":0},{"x":56,"y":0},{"x":57,"y":0},{"x":58,"y":0},{"x":59,"y":0},{"x":60,"y":0},{"x":61,"y":0},{"x":62,"y":0},{"x":63,"y":0},{"x":64,"y":0},{"x"
:65,"y":0},{"x":66,"y":0},{"x":67,"y":0},{"x":68,"y":0},{"x":69,"y":0},{"x":70,"y":0},{"x":71,"y":0},{"x":72,"y":0},{"x":73,"y":0},{"x":74,"y":0},{"x":75,"y":0},{"x":76,"y":0},{"x":77,"y":0},{"x":78,"y":0},{"x":79,"y":0},{"x":80,"y":0},{"x":81,"y":0},{"x":82,"y":0},{"x":83,"y":0},{"x":84,"y":0},{"x":85,"y":0},{"x":86,"y":0},{"x":87,"y":0},{"x":88,"y":0},{"x":89,"y":0},{"x":90,"y":0},{"x":91,"y":0},{"x":92,"y":0},{"x":93,"y":0},{"x":94,"y":0},{"x":95,"y":0},{"x":96,"y":0},{"x":97,"y":0},{"x":98,"y":0},{"x":99,"y":0},{"x":100,"y":0},{"x":101,"y":0},{"x":102,"y":0},{"x":103,"y":0},{"x":104,"y":0},{"x":105,"y":0},{"x":106,"y":0},{"x":107,"y":0},{"x":108,"y":0},{"x":109,"y":0},{"x":110,"y":0},{"x":111,"y":0},{"x":112,"y":0},{"x":113,"y":0},{"x":114,"y":0},{"x":115,"y":0},{"x":116,"y":0},{"x":117,"y":0},{"x":118,"y":0},{"x":119,"y":0},{"x":120,"y":0},{"x":121,"y":0},{"x":122,"y":0},{"x":123,"y":0},{"x":124,"y":0},{"x":125,"y":0},{"x":126,"y":0},{"x":127,"y":0},{"x":128,"y":0},{"x"
:129,"y":0},{"x":130,"y":0},{"x":131,"y":0},{"x":132,"y":0},{"x":133,"y":0},{"x":134,"y":0},{"x":135,"y":0},{"x":136,"y":0},{"x":137,"y":0},{"x":138,"y":0},{"x":139,"y":0},{"x":140,"y":0},{"x":141,"y":0},{"x":142,"y":0},{"x":143,"y":0},{"x":144,"y":0},{"x":145,"y":2},{"x":146,"y":2},{"x":147,"y":2},{"x":148,"y":2},{"x":149,"y":2},{"x":150,"y":2},{"x":151,"y":2},{"x":152,"y":2},{"x":153,"y":2},{"x":154,"y":2},{"x":155,"y":2},{"x":156,"y":2},{"x":157,"y":2},{"x":158,"y":2},{"x":159,"y":2},{"x":160,"y":2},{"x":161,"y":2},{"x":162,"y":2},{"x":163,"y":2},{"x":164,"y":2},{"x":165,"y":2},{"x":166,"y":2},{"x":167,"y":2},{"x":168,"y":2},{"x":169,"y":2},{"x":170,"y":2},{"x":171,"y":2},{"x":172,"y":2},{"x":173,"y":2},{"x":174,"y":2},{"x":175,"y":2},{"x":176,"y":2},{"x":177,"y":2},{"x":178,"y":2},{"x":179,"y":2},{"x":180,"y":2},{"x":181,"y":2},{"x":182,"y":2},{"x":183,"y":2},{"x":184,"y":2},{"x":185,"y":2},{"x":186,"y":2},{"x":187,"y":2},{"x":188,"y":2},{"x":189,"y":2},{"x":190,"y":2},{
"x":191,"y":2},{"x":192,"y":2},{"x":193,"y":2},{"x":194,"y":2},{"x":195,"y":2},{"x":196,"y":2},{"x":197,"y":2},{"x":198,"y":2},{"x":199,"y":2},{"x":200,"y":2},{"x":201,"y":2},{"x":202,"y":2},{"x":203,"y":2},{"x":204,"y":2},{"x":205,"y":2},{"x":206,"y":2},{"x":207,"y":2},{"x":208,"y":2},{"x":209,"y":2},{"x":210,"y":2},{"x":211,"y":2},{"x":212,"y":2},{"x":213,"y":2},{"x":214,"y":2},{"x":215,"y":2},{"x":216,"y":2},{"x":217,"y":2},{"x":218,"y":2},{"x":219,"y":2},{"x":220,"y":2},{"x":221,"y":2},{"x":222,"y":2},{"x":223,"y":2},{"x":224,"y":2},{"x":225,"y":2},{"x":226,"y":2},{"x":227,"y":2},{"x":228,"y":2},{"x":229,"y":2},{"x":230,"y":2},{"x":231,"y":2},{"x":232,"y":2},{"x":233,"y":2},{"x":234,"y":2},{"x":235,"y":2},{"x":236,"y":2},{"x":237,"y":2},{"x":238,"y":2},{"x":239,"y":2},{"x":240,"y":2},{"x":241,"y":2},{"x":242,"y":2},{"x":243,"y":2},{"x":244,"y":2},{"x":245,"y":2},{"x":246,"y":2},{"x":247,"y":2},{"x":248,"y":2},{"x":249,"y":2},{"x":250,"y":2},{"x":251,"y":2},{"x":252,"y":2
},{"x":253,"y":2},{"x":254,"y":2},{"x":255,"y":2},{"x":256,"y":2},{"x":257,"y":2},{"x":258,"y":2},{"x":259,"y":2},{"x":260,"y":2},{"x":261,"y":2},{"x":262,"y":2},{"x":263,"y":2},{"x":264,"y":2},{"x":265,"y":2},{"x":266,"y":2},{"x":267,"y":2},{"x":268,"y":2},{"x":269,"y":2},{"x":270,"y":2},{"x":271,"y":2},{"x":272,"y":2},{"x":273,"y":2},{"x":274,"y":1},{"x":275,"y":1},{"x":276,"y":1},{"x":277,"y":1},{"x":278,"y":1},{"x":279,"y":0},{"x":280,"y":0},{"x":281,"y":0},{"x":282,"y":0},{"x":283,"y":0},{"x":284,"y":0},{"x":285,"y":0},{"x":286,"y":0},{"x":287,"y":0},{"x":288,"y":0},{"x":289,"y":0},{"x":290,"y":0},{"x":291,"y":0},{"x":292,"y":0},{"x":293,"y":0},{"x":294,"y":0},{"x":295,"y":0},{"x":296,"y":0},{"x":297,"y":0},{"x":298,"y":0},{"x":299,"y":0},{"x":300,"y":0},{"x":301,"y":0},{"x":302,"y":0},{"x":303,"y":0},{"x":304,"y":0},{"x":305,"y":0},{"x":306,"y":0},{"x":307,"y":0},{"x":308,"y":0},{"x":309,"y":0},{"x":310,"y":0},{"x":311,"y":0},{"x":312,"y":0},{"x":313,"y":0},{"x":314,"y
":0},{"x":315,"y":0},{"x":316,"y":0},{"x":317,"y":0},{"x":318,"y":0},{"x":319,"y":0},{"x":320,"y":0},{"x":321,"y":0},{"x":322,"y":0},{"x":323,"y":0},{"x":324,"y":0},{"x":325,"y":0},{"x":326,"y":0},{"x":327,"y":0},{"x":328,"y":0},{"x":329,"y":0},{"x":330,"y":0},{"x":331,"y":0},{"x":332,"y":0},{"x":333,"y":0},{"x":334,"y":0},{"x":335,"y":0},{"x":336,"y":0},{"x":337,"y":0},{"x":338,"y":0},{"x":339,"y":0},{"x":340,"y":0},{"x":341,"y":0},{"x":342,"y":0},{"x":343,"y":0},{"x":344,"y":0},{"x":345,"y":0},{"x":346,"y":0},{"x":347,"y":0},{"x":348,"y":0},{"x":349,"y":0},{"x":350,"y":0},{"x":351,"y":0},{"x":352,"y":0},{"x":353,"y":0},{"x":354,"y":0},{"x":355,"y":0},{"x":356,"y":0},{"x":357,"y":0},{"x":358,"y":0},{"x":359,"y":0},{"x":360,"y":0},{"x":361,"y":0},{"x":362,"y":0},{"x":363,"y":0},{"x":364,"y":0},{"x":365,"y":0},{"x":366,"y":0},{"x":367,"y":0},{"x":368,"y":0},{"x":369,"y":0},{"x":370,"y":0},{"x":371,"y":0},{"x":372,"y":0},{"x":373,"y":0},{"x":374,"y":0},{"x":375,"y":0},{"x":376
,"y":0},{"x":377,"y":0},{"x":378,"y":0},{"x":379,"y":0},{"x":380,"y":0},{"x":381,"y":0},{"x":382,"y":0},{"x":383,"y":0},{"x":384,"y":0},{"x":385,"y":0},{"x":386,"y":0},{"x":387,"y":0},{"x":388,"y":0},{"x":389,"y":0},{"x":390,"y":0},{"x":391,"y":0},{"x":392,"y":0},{"x":393,"y":0},{"x":394,"y":0},{"x":395,"y":0},{"x":396,"y":0},{"x":397,"y":0},{"x":398,"y":0},{"x":399,"y":0},{"x":400,"y":0},{"x":401,"y":0},{"x":402,"y":0},{"x":403,"y":0},{"x":404,"y":0},{"x":405,"y":0},{"x":406,"y":0},{"x":407,"y":0},{"x":408,"y":0},{"x":409,"y":0},{"x":410,"y":0},{"x":411,"y":0},{"x":412,"y":0},{"x":413,"y":0},{"x":414,"y":0},{"x":415,"y":0},{"x":416,"y":0},{"x":417,"y":0},{"x":418,"y":0},{"x":419,"y":0},{"x":420,"y":0},{"x":421,"y":0},{"x":422,"y":0},{"x":423,"y":0},{"x":424,"y":0},{"x":425,"y":0},{"x":426,"y":0},{"x":427,"y":0},{"x":428,"y":0},{"x":429,"y":0},{"x":430,"y":0},{"x":431,"y":0},{"x":432,"y":0},{"x":433,"y":0},{"x":434,"y":0},{"x":435,"y":0},{"x":436,"y":0},{"x":437,"y":0},{"x":
438,"y":0},{"x":439,"y":0},{"x":440,"y":0},{"x":441,"y":0},{"x":442,"y":0},{"x":443,"y":0},{"x":444,"y":0},{"x":445,"y":0},{"x":446,"y":0},{"x":447,"y":0},{"x":448,"y":0},{"x":449,"y":0},{"x":450,"y":0},{"x":451,"y":0},{"x":452,"y":0},{"x":453,"y":0},{"x":454,"y":0},{"x":455,"y":0},{"x":456,"y":0},{"x":457,"y":0},{"x":458,"y":0},{"x":459,"y":0},{"x":460,"y":0},{"x":461,"y":0},{"x":462,"y":0},{"x":463,"y":0},{"x":464,"y":0},{"x":465,"y":0},{"x":466,"y":0},{"x":467,"y":0},{"x":468,"y":0},{"x":469,"y":0},{"x":470,"y":0},{"x":471,"y":0},{"x":472,"y":0},{"x":473,"y":0},{"x":474,"y":0},{"x":475,"y":0},{"x":476,"y":0},{"x":477,"y":0},{"x":478,"y":0},{"x":479,"y":0},{"x":480,"y":0},{"x":481,"y":0},{"x":482,"y":0},{"x":483,"y":0},{"x":484,"y":0},{"x":485,"y":0},{"x":486,"y":0},{"x":487,"y":0},{"x":488,"y":0},{"x":489,"y":0},{"x":490,"y":0},{"x":491,"y":0},{"x":492,"y":0},{"x":493,"y":0},{"x":494,"y":0},{"x":495,"y":0},{"x":496,"y":0},{"x":497,"y":0},{"x":498,"y":0},{"x":499,"y":0}],[
{"x":0,"y":0},{"x":1,"y":0},{"x":2,"y":0},{"x":3,"y":0},{"x":4,"y":0},{"x":5,"y":0},{"x":6,"y":0},{"x":7,"y":0},{"x":8,"y":0},{"x":9,"y":0},{"x":10,"y":0},{"x":11,"y":0},{"x":12,"y":0},{"x":13,"y":0},{"x":14,"y":0},{"x":15,"y":0},{"x":16,"y":0},{"x":17,"y":0},{"x":18,"y":0},{"x":19,"y":0},{"x":20,"y":0},{"x":21,"y":0},{"x":22,"y":0},{"x":23,"y":0},{"x":24,"y":0},{"x":25,"y":0},{"x":26,"y":0},{"x":27,"y":0},{"x":28,"y":0},{"x":29,"y":0},{"x":30,"y":0},{"x":31,"y":0},{"x":32,"y":0},{"x":33,"y":0},{"x":34,"y":0},{"x":35,"y":0},{"x":36,"y":0},{"x":37,"y":0},{"x":38,"y":0},{"x":39,"y":0},{"x":40,"y":0},{"x":41,"y":0},{"x":42,"y":0},{"x":43,"y":0},{"x":44,"y":0},{"x":45,"y":0},{"x":46,"y":0},{"x":47,"y":0},{"x":48,"y":0},{"x":49,"y":0},{"x":50,"y":0},{"x":51,"y":0},{"x":52,"y":0},{"x":53,"y":0},{"x":54,"y":0},{"x":55,"y":0},{"x":56,"y":0},{"x":57,"y":0},{"x":58,"y":0},{"x":59,"y":0},{"x":60,"y":0},{"x":61,"y":0},{"x":62,"y":0},{"x":63,"y":0},{"x":64,"y":0},{"x":65,"y":0},{"x":66,"
y":0},{"x":67,"y":0},{"x":68,"y":0},{"x":69,"y":0},{"x":70,"y":0},{"x":71,"y":0},{"x":72,"y":0},{"x":73,"y":0},{"x":74,"y":0},{"x":75,"y":0},{"x":76,"y":0},{"x":77,"y":0},{"x":78,"y":0},{"x":79,"y":0},{"x":80,"y":0},{"x":81,"y":0},{"x":82,"y":0},{"x":83,"y":0},{"x":84,"y":0},{"x":85,"y":0},{"x":86,"y":0},{"x":87,"y":0},{"x":88,"y":0},{"x":89,"y":0},{"x":90,"y":0},{"x":91,"y":0},{"x":92,"y":0},{"x":93,"y":0},{"x":94,"y":0},{"x":95,"y":0},{"x":96,"y":0},{"x":97,"y":0},{"x":98,"y":0},{"x":99,"y":0},{"x":100,"y":0},{"x":101,"y":0},{"x":102,"y":0},{"x":103,"y":0},{"x":104,"y":0},{"x":105,"y":0},{"x":106,"y":0},{"x":107,"y":0},{"x":108,"y":0},{"x":109,"y":0},{"x":110,"y":0},{"x":111,"y":0},{"x":112,"y":0},{"x":113,"y":0},{"x":114,"y":0},{"x":115,"y":0},{"x":116,"y":0},{"x":117,"y":0},{"x":118,"y":0},{"x":119,"y":0},{"x":120,"y":0},{"x":121,"y":0},{"x":122,"y":0},{"x":123,"y":0},{"x":124,"y":0},{"x":125,"y":0},{"x":126,"y":0},{"x":127,"y":0},{"x":128,"y":0},{"x":129,"y":0},{"x":130
,"y":0},{"x":131,"y":0},{"x":132,"y":0},{"x":133,"y":0},{"x":134,"y":0},{"x":135,"y":0},{"x":136,"y":0},{"x":137,"y":0},{"x":138,"y":0},{"x":139,"y":0},{"x":140,"y":0},{"x":141,"y":0},{"x":142,"y":0},{"x":143,"y":0},{"x":144,"y":0},{"x":145,"y":0},{"x":146,"y":0},{"x":147,"y":0},{"x":148,"y":0},{"x":149,"y":0},{"x":150,"y":0},{"x":151,"y":0},{"x":152,"y":0},{"x":153,"y":0},{"x":154,"y":0},{"x":155,"y":0},{"x":156,"y":0},{"x":157,"y":0},{"x":158,"y":0},{"x":159,"y":0},{"x":160,"y":0},{"x":161,"y":0},{"x":162,"y":0},{"x":163,"y":0},{"x":164,"y":0},{"x":165,"y":0},{"x":166,"y":0},{"x":167,"y":0},{"x":168,"y":0},{"x":169,"y":0},{"x":170,"y":0},{"x":171,"y":0},{"x":172,"y":0},{"x":173,"y":0},{"x":174,"y":0},{"x":175,"y":0},{"x":176,"y":0},{"x":177,"y":0},{"x":178,"y":0},{"x":179,"y":0},{"x":180,"y":0},{"x":181,"y":0},{"x":182,"y":0},{"x":183,"y":0},{"x":184,"y":0},{"x":185,"y":0},{"x":186,"y":0},{"x":187,"y":0},{"x":188,"y":0},{"x":189,"y":0},{"x":190,"y":0},{"x":191,"y":0},{"x":
192,"y":0},{"x":193,"y":0},{"x":194,"y":0},{"x":195,"y":0},{"x":196,"y":0},{"x":197,"y":0},{"x":198,"y":0},{"x":199,"y":0},{"x":200,"y":0},{"x":201,"y":0},{"x":202,"y":0},{"x":203,"y":0},{"x":204,"y":0},{"x":205,"y":0},{"x":206,"y":0},{"x":207,"y":0},{"x":208,"y":0},{"x":209,"y":0},{"x":210,"y":0},{"x":211,"y":0},{"x":212,"y":0},{"x":213,"y":0},{"x":214,"y":0},{"x":215,"y":0},{"x":216,"y":0},{"x":217,"y":0},{"x":218,"y":0},{"x":219,"y":0},{"x":220,"y":0},{"x":221,"y":0},{"x":222,"y":0},{"x":223,"y":0},{"x":224,"y":0},{"x":225,"y":0},{"x":226,"y":0},{"x":227,"y":0},{"x":228,"y":0},{"x":229,"y":0},{"x":230,"y":0},{"x":231,"y":0},{"x":232,"y":0},{"x":233,"y":0},{"x":234,"y":0},{"x":235,"y":0},{"x":236,"y":0},{"x":237,"y":0},{"x":238,"y":0},{"x":239,"y":0},{"x":240,"y":0},{"x":241,"y":0},{"x":242,"y":0},{"x":243,"y":0},{"x":244,"y":0},{"x":245,"y":0},{"x":246,"y":0},{"x":247,"y":0},{"x":248,"y":0},{"x":249,"y":0},{"x":250,"y":0},{"x":251,"y":0},{"x":252,"y":0},{"x":253,"y":0},{"
x":254,"y":0},{"x":255,"y":0},{"x":256,"y":0},{"x":257,"y":0},{"x":258,"y":0},{"x":259,"y":0},{"x":260,"y":0},{"x":261,"y":0},{"x":262,"y":0},{"x":263,"y":0},{"x":264,"y":0},{"x":265,"y":0},{"x":266,"y":0},{"x":267,"y":0},{"x":268,"y":0},{"x":269,"y":0},{"x":270,"y":0},{"x":271,"y":0},{"x":272,"y":0},{"x":273,"y":0},{"x":274,"y":0},{"x":275,"y":0},{"x":276,"y":0},{"x":277,"y":0},{"x":278,"y":0},{"x":279,"y":0},{"x":280,"y":0},{"x":281,"y":0},{"x":282,"y":0},{"x":283,"y":0},{"x":284,"y":0},{"x":285,"y":0},{"x":286,"y":0},{"x":287,"y":0},{"x":288,"y":1},{"x":289,"y":1},{"x":290,"y":1},{"x":291,"y":1},{"x":292,"y":1},{"x":293,"y":1},{"x":294,"y":1},{"x":295,"y":1},{"x":296,"y":1},{"x":297,"y":1},{"x":298,"y":1},{"x":299,"y":1},{"x":300,"y":1},{"x":301,"y":1},{"x":302,"y":1},{"x":303,"y":1},{"x":304,"y":1},{"x":305,"y":1},{"x":306,"y":1},{"x":307,"y":1},{"x":308,"y":1},{"x":309,"y":1},{"x":310,"y":1},{"x":311,"y":1},{"x":312,"y":1},{"x":313,"y":1},{"x":314,"y":1},{"x":315,"y":1}
,{"x":316,"y":1},{"x":317,"y":1},{"x":318,"y":1},{"x":319,"y":1},{"x":320,"y":1},{"x":321,"y":1},{"x":322,"y":1},{"x":323,"y":1},{"x":324,"y":1},{"x":325,"y":1},{"x":326,"y":1},{"x":327,"y":1},{"x":328,"y":1},{"x":329,"y":1},{"x":330,"y":1},{"x":331,"y":1},{"x":332,"y":1},{"x":333,"y":1},{"x":334,"y":1},{"x":335,"y":1},{"x":336,"y":1},{"x":337,"y":1},{"x":338,"y":1},{"x":339,"y":1},{"x":340,"y":1},{"x":341,"y":1},{"x":342,"y":1},{"x":343,"y":1},{"x":344,"y":1},{"x":345,"y":1},{"x":346,"y":1},{"x":347,"y":1},{"x":348,"y":1},{"x":349,"y":1},{"x":350,"y":1},{"x":351,"y":1},{"x":352,"y":1},{"x":353,"y":1},{"x":354,"y":1},{"x":355,"y":1},{"x":356,"y":1},{"x":357,"y":1},{"x":358,"y":1},{"x":359,"y":1},{"x":360,"y":1},{"x":361,"y":1},{"x":362,"y":1},{"x":363,"y":1},{"x":364,"y":1},{"x":365,"y":1},{"x":366,"y":1},{"x":367,"y":1},{"x":368,"y":1},{"x":369,"y":1},{"x":370,"y":1},{"x":371,"y":1},{"x":372,"y":1},{"x":373,"y":1},{"x":374,"y":1},{"x":375,"y":1},{"x":376,"y":1},{"x":377,"y"
:1},{"x":378,"y":1},{"x":379,"y":1},{"x":380,"y":1},{"x":381,"y":1},{"x":382,"y":1},{"x":383,"y":1},{"x":384,"y":1},{"x":385,"y":1},{"x":386,"y":1},{"x":387,"y":1},{"x":388,"y":0},{"x":389,"y":0},{"x":390,"y":0},{"x":391,"y":0},{"x":392,"y":0},{"x":393,"y":0},{"x":394,"y":0},{"x":395,"y":0},{"x":396,"y":0},{"x":397,"y":0},{"x":398,"y":0},{"x":399,"y":0},{"x":400,"y":0},{"x":401,"y":0},{"x":402,"y":0},{"x":403,"y":0},{"x":404,"y":0},{"x":405,"y":0},{"x":406,"y":0},{"x":407,"y":0},{"x":408,"y":0},{"x":409,"y":0},{"x":410,"y":0},{"x":411,"y":0},{"x":412,"y":0},{"x":413,"y":0},{"x":414,"y":0},{"x":415,"y":0},{"x":416,"y":0},{"x":417,"y":0},{"x":418,"y":0},{"x":419,"y":0},{"x":420,"y":0},{"x":421,"y":0},{"x":422,"y":0},{"x":423,"y":0},{"x":424,"y":0},{"x":425,"y":0},{"x":426,"y":0},{"x":427,"y":0},{"x":428,"y":0},{"x":429,"y":0},{"x":430,"y":0},{"x":431,"y":0},{"x":432,"y":0},{"x":433,"y":0},{"x":434,"y":0},{"x":435,"y":0},{"x":436,"y":0},{"x":437,"y":0},{"x":438,"y":0},{"x":439,
"y":0},{"x":440,"y":0},{"x":441,"y":0},{"x":442,"y":0},{"x":443,"y":0},{"x":444,"y":0},{"x":445,"y":0},{"x":446,"y":0},{"x":447,"y":0},{"x":448,"y":0},{"x":449,"y":0},{"x":450,"y":0},{"x":451,"y":0},{"x":452,"y":0},{"x":453,"y":0},{"x":454,"y":0},{"x":455,"y":0},{"x":456,"y":0},{"x":457,"y":0},{"x":458,"y":0},{"x":459,"y":0},{"x":460,"y":0},{"x":461,"y":0},{"x":462,"y":0},{"x":463,"y":0},{"x":464,"y":0},{"x":465,"y":0},{"x":466,"y":0},{"x":467,"y":0},{"x":468,"y":0},{"x":469,"y":0},{"x":470,"y":0},{"x":471,"y":0},{"x":472,"y":0},{"x":473,"y":0},{"x":474,"y":0},{"x":475,"y":0},{"x":476,"y":0},{"x":477,"y":0},{"x":478,"y":0},{"x":479,"y":0},{"x":480,"y":0},{"x":481,"y":0},{"x":482,"y":0},{"x":483,"y":0},{"x":484,"y":0},{"x":485,"y":0},{"x":486,"y":0},{"x":487,"y":0},{"x":488,"y":0},{"x":489,"y":0},{"x":490,"y":0},{"x":491,"y":0},{"x":492,"y":0},{"x":493,"y":0},{"x":494,"y":0},{"x":495,"y":0},{"x":496,"y":0},{"x":497,"y":0},{"x":498,"y":0},{"x":499,"y":0}],[{"x":0,"y":0},{"x":1
,"y":0},{"x":2,"y":0},{"x":3,"y":0},{"x":4,"y":0},{"x":5,"y":0},{"x":6,"y":0},{"x":7,"y":0},{"x":8,"y":0},{"x":9,"y":0},{"x":10,"y":0},{"x":11,"y":0},{"x":12,"y":0},{"x":13,"y":0},{"x":14,"y":0},{"x":15,"y":0},{"x":16,"y":0},{"x":17,"y":0},{"x":18,"y":0},{"x":19,"y":0},{"x":20,"y":0},{"x":21,"y":0},{"x":22,"y":0},{"x":23,"y":0},{"x":24,"y":0},{"x":25,"y":0},{"x":26,"y":0},{"x":27,"y":0},{"x":28,"y":0},{"x":29,"y":0},{"x":30,"y":0},{"x":31,"y":0},{"x":32,"y":0},{"x":33,"y":0},{"x":34,"y":0},{"x":35,"y":0},{"x":36,"y":0},{"x":37,"y":0},{"x":38,"y":0},{"x":39,"y":0},{"x":40,"y":0},{"x":41,"y":0},{"x":42,"y":0},{"x":43,"y":0},{"x":44,"y":0},{"x":45,"y":0},{"x":46,"y":0},{"x":47,"y":0},{"x":48,"y":0},{"x":49,"y":0},{"x":50,"y":0},{"x":51,"y":0},{"x":52,"y":0},{"x":53,"y":0},{"x":54,"y":0},{"x":55,"y":0},{"x":56,"y":0},{"x":57,"y":0},{"x":58,"y":0},{"x":59,"y":0},{"x":60,"y":0},{"x":61,"y":0},{"x":62,"y":0},{"x":63,"y":0},{"x":64,"y":0},{"x":65,"y":0},{"x":66,"y":0},{"x":67,"y":0}
,{"x":68,"y":0},{"x":69,"y":0},{"x":70,"y":0},{"x":71,"y":0},{"x":72,"y":0},{"x":73,"y":0},{"x":74,"y":0},{"x":75,"y":0},{"x":76,"y":0},{"x":77,"y":0},{"x":78,"y":0},{"x":79,"y":0},{"x":80,"y":0},{"x":81,"y":0},{"x":82,"y":0},{"x":83,"y":0},{"x":84,"y":0},{"x":85,"y":0},{"x":86,"y":0},{"x":87,"y":0},{"x":88,"y":0},{"x":89,"y":0},{"x":90,"y":0},{"x":91,"y":0},{"x":92,"y":0},{"x":93,"y":0},{"x":94,"y":0},{"x":95,"y":0},{"x":96,"y":0},{"x":97,"y":0},{"x":98,"y":0},{"x":99,"y":0},{"x":100,"y":0},{"x":101,"y":0},{"x":102,"y":0},{"x":103,"y":0},{"x":104,"y":0},{"x":105,"y":0},{"x":106,"y":0},{"x":107,"y":0},{"x":108,"y":0},{"x":109,"y":0},{"x":110,"y":0},{"x":111,"y":0},{"x":112,"y":0},{"x":113,"y":0},{"x":114,"y":0},{"x":115,"y":0},{"x":116,"y":0},{"x":117,"y":0},{"x":118,"y":0},{"x":119,"y":0},{"x":120,"y":0},{"x":121,"y":0},{"x":122,"y":0},{"x":123,"y":0},{"x":124,"y":0},{"x":125,"y":0},{"x":126,"y":0},{"x":127,"y":0},{"x":128,"y":0},{"x":129,"y":0},{"x":130,"y":0},{"x":131,"y"
:0},{"x":132,"y":0},{"x":133,"y":0},{"x":134,"y":0},{"x":135,"y":0},{"x":136,"y":0},{"x":137,"y":0},{"x":138,"y":0},{"x":139,"y":0},{"x":140,"y":0},{"x":141,"y":0},{"x":142,"y":0},{"x":143,"y":0},{"x":144,"y":0},{"x":145,"y":0},{"x":146,"y":0},{"x":147,"y":0},{"x":148,"y":0},{"x":149,"y":0},{"x":150,"y":0},{"x":151,"y":0},{"x":152,"y":0},{"x":153,"y":0},{"x":154,"y":0},{"x":155,"y":0},{"x":156,"y":0},{"x":157,"y":0},{"x":158,"y":0},{"x":159,"y":0},{"x":160,"y":0},{"x":161,"y":0},{"x":162,"y":0},{"x":163,"y":0},{"x":164,"y":0},{"x":165,"y":0},{"x":166,"y":0},{"x":167,"y":0},{"x":168,"y":0},{"x":169,"y":0},{"x":170,"y":0},{"x":171,"y":0},{"x":172,"y":0},{"x":173,"y":0},{"x":174,"y":0},{"x":175,"y":0},{"x":176,"y":0},{"x":177,"y":0},{"x":178,"y":0},{"x":179,"y":0},{"x":180,"y":0},{"x":181,"y":0},{"x":182,"y":0},{"x":183,"y":0},{"x":184,"y":0},{"x":185,"y":0},{"x":186,"y":0},{"x":187,"y":0},{"x":188,"y":0},{"x":189,"y":0},{"x":190,"y":0},{"x":191,"y":0},{"x":192,"y":0},{"x":193,
"y":0},{"x":194,"y":0},{"x":195,"y":0},{"x":196,"y":0},{"x":197,"y":0},{"x":198,"y":0},{"x":199,"y":0},{"x":200,"y":0},{"x":201,"y":0},{"x":202,"y":0},{"x":203,"y":0},{"x":204,"y":0},{"x":205,"y":0},{"x":206,"y":0},{"x":207,"y":0},{"x":208,"y":0},{"x":209,"y":0},{"x":210,"y":0},{"x":211,"y":0},{"x":212,"y":0},{"x":213,"y":0},{"x":214,"y":0},{"x":215,"y":0},{"x":216,"y":0},{"x":217,"y":0},{"x":218,"y":0},{"x":219,"y":0},{"x":220,"y":0},{"x":221,"y":0},{"x":222,"y":0},{"x":223,"y":0},{"x":224,"y":0},{"x":225,"y":0},{"x":226,"y":0},{"x":227,"y":0},{"x":228,"y":0},{"x":229,"y":0},{"x":230,"y":0},{"x":231,"y":0},{"x":232,"y":0},{"x":233,"y":0},{"x":234,"y":0},{"x":235,"y":0},{"x":236,"y":0},{"x":237,"y":0},{"x":238,"y":0},{"x":239,"y":0},{"x":240,"y":0},{"x":241,"y":0},{"x":242,"y":0},{"x":243,"y":0},{"x":244,"y":0},{"x":245,"y":0},{"x":246,"y":0},{"x":247,"y":0},{"x":248,"y":0},{"x":249,"y":0},{"x":250,"y":0},{"x":251,"y":0},{"x":252,"y":0},{"x":253,"y":0},{"x":254,"y":0},{"x":2
55,"y":0},{"x":256,"y":0},{"x":257,"y":0},{"x":258,"y":0},{"x":259,"y":0},{"x":260,"y":0},{"x":261,"y":0},{"x":262,"y":0},{"x":263,"y":0},{"x":264,"y":0},{"x":265,"y":0},{"x":266,"y":0},{"x":267,"y":0},{"x":268,"y":0},{"x":269,"y":0},{"x":270,"y":0},{"x":271,"y":0},{"x":272,"y":0},{"x":273,"y":0},{"x":274,"y":0},{"x":275,"y":0},{"x":276,"y":0},{"x":277,"y":0},{"x":278,"y":0},{"x":279,"y":0},{"x":280,"y":0},{"x":281,"y":0},{"x":282,"y":0},{"x":283,"y":0},{"x":284,"y":0},{"x":285,"y":0},{"x":286,"y":0},{"x":287,"y":0},{"x":288,"y":0},{"x":289,"y":0},{"x":290,"y":0},{"x":291,"y":0},{"x":292,"y":0},{"x":293,"y":0},{"x":294,"y":0},{"x":295,"y":0},{"x":296,"y":0},{"x":297,"y":0},{"x":298,"y":0},{"x":299,"y":0},{"x":300,"y":0},{"x":301,"y":0},{"x":302,"y":0},{"x":303,"y":0},{"x":304,"y":0},{"x":305,"y":0},{"x":306,"y":0},{"x":307,"y":0},{"x":308,"y":0},{"x":309,"y":0},{"x":310,"y":0},{"x":311,"y":0},{"x":312,"y":0},{"x":313,"y":0},{"x":314,"y":0},{"x":315,"y":0},{"x":316,"y":0},{"x
":317,"y":0},{"x":318,"y":0},{"x":319,"y":0},{"x":320,"y":0},{"x":321,"y":0},{"x":322,"y":0},{"x":323,"y":0},{"x":324,"y":0},{"x":325,"y":0},{"x":326,"y":0},{"x":327,"y":0},{"x":328,"y":0},{"x":329,"y":0},{"x":330,"y":0},{"x":331,"y":0},{"x":332,"y":0},{"x":333,"y":0},{"x":334,"y":0},{"x":335,"y":0},{"x":336,"y":0},{"x":337,"y":0},{"x":338,"y":0},{"x":339,"y":0},{"x":340,"y":0},{"x":341,"y":0},{"x":342,"y":0},{"x":343,"y":0},{"x":344,"y":0},{"x":345,"y":0},{"x":346,"y":0},{"x":347,"y":0},{"x":348,"y":0},{"x":349,"y":0},{"x":350,"y":0},{"x":351,"y":0},{"x":352,"y":0},{"x":353,"y":0},{"x":354,"y":0},{"x":355,"y":0},{"x":356,"y":0},{"x":357,"y":0},{"x":358,"y":0},{"x":359,"y":0},{"x":360,"y":0},{"x":361,"y":0},{"x":362,"y":0},{"x":363,"y":0},{"x":364,"y":0},{"x":365,"y":0},{"x":366,"y":0},{"x":367,"y":0},{"x":368,"y":0},{"x":369,"y":0},{"x":370,"y":0},{"x":371,"y":0},{"x":372,"y":0},{"x":373,"y":0},{"x":374,"y":0},{"x":375,"y":0},{"x":376,"y":0},{"x":377,"y":0},{"x":378,"y":0},
{"x":379,"y":0},{"x":380,"y":0},{"x":381,"y":0},{"x":382,"y":0},{"x":383,"y":0},{"x":384,"y":0},{"x":385,"y":0},{"x":386,"y":0},{"x":387,"y":0},{"x":388,"y":1},{"x":389,"y":1},{"x":390,"y":1},{"x":391,"y":1},{"x":392,"y":1},{"x":393,"y":1},{"x":394,"y":1},{"x":395,"y":1},{"x":396,"y":1},{"x":397,"y":1},{"x":398,"y":1},{"x":399,"y":1},{"x":400,"y":1},{"x":401,"y":1},{"x":402,"y":1},{"x":403,"y":1},{"x":404,"y":1},{"x":405,"y":1},{"x":406,"y":1},{"x":407,"y":1},{"x":408,"y":1},{"x":409,"y":1},{"x":410,"y":1},{"x":411,"y":1},{"x":412,"y":1},{"x":413,"y":1},{"x":414,"y":1},{"x":415,"y":1},{"x":416,"y":1},{"x":417,"y":1},{"x":418,"y":1},{"x":419,"y":1},{"x":420,"y":1},{"x":421,"y":1},{"x":422,"y":1},{"x":423,"y":0},{"x":424,"y":0},{"x":425,"y":0},{"x":426,"y":0},{"x":427,"y":0},{"x":428,"y":0},{"x":429,"y":0},{"x":430,"y":0},{"x":431,"y":0},{"x":432,"y":0},{"x":433,"y":0},{"x":434,"y":0},{"x":435,"y":0},{"x":436,"y":0},{"x":437,"y":0},{"x":438,"y":0},{"x":439,"y":0},{"x":440,"y":
0},{"x":441,"y":0},{"x":442,"y":0},{"x":443,"y":0},{"x":444,"y":0},{"x":445,"y":0},{"x":446,"y":0},{"x":447,"y":0},{"x":448,"y":0},{"x":449,"y":0},{"x":450,"y":0},{"x":451,"y":0},{"x":452,"y":0},{"x":453,"y":0},{"x":454,"y":0},{"x":455,"y":0},{"x":456,"y":0},{"x":457,"y":0},{"x":458,"y":0},{"x":459,"y":0},{"x":460,"y":0},{"x":461,"y":0},{"x":462,"y":0},{"x":463,"y":0},{"x":464,"y":0},{"x":465,"y":0},{"x":466,"y":0},{"x":467,"y":0},{"x":468,"y":0},{"x":469,"y":0},{"x":470,"y":0},{"x":471,"y":0},{"x":472,"y":0},{"x":473,"y":0},{"x":474,"y":0},{"x":475,"y":0},{"x":476,"y":0},{"x":477,"y":0},{"x":478,"y":0},{"x":479,"y":0},{"x":480,"y":0},{"x":481,"y":0},{"x":482,"y":0},{"x":483,"y":0},{"x":484,"y":0},{"x":485,"y":0},{"x":486,"y":0},{"x":487,"y":0},{"x":488,"y":0},{"x":489,"y":0},{"x":490,"y":0},{"x":491,"y":0},{"x":492,"y":0},{"x":493,"y":0},{"x":494,"y":0},{"x":495,"y":0},{"x":496,"y":0},{"x":497,"y":0},{"x":498,"y":0},{"x":499,"y":0}]]',
[... 281 lines stripped ...]
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/models/rack.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/models/rack.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/models/rack.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/models/rack.js Sun Dec 9 12:37:57 2012
@@ -29,7 +29,8 @@ App.Rack = DS.Model.extend({
});
App.Rack.FIXTURES = [
- {
+ //here example of data
+ /*{
id: 1,
name: 'Rack-0',
hosts: ['host01', 'host06', 'host05'],
@@ -37,50 +38,5 @@ App.Rack.FIXTURES = [
live_hosts_count: 5,
critical_hosts_count: 0,
dead_hosts_count: 2
- },
- {
- id: 2,
- name: 'Rack-1',
- hosts: ['host04', 'host02', 'host03'],
- status: 'LIVE',
- live_hosts_count: 2,
- critical_hosts_count: 0,
- dead_hosts_count: 1
- },
- {
- id: 3,
- name: 'Rack-2',
- hosts: [1, 2, 3, 4, 8, 9, 10],
- status: 'LIVE',
- live_hosts_count: 5,
- critical_hosts_count: 0,
- dead_hosts_count: 2
- },
- {
- id: 4,
- name: 'Rack-3',
- hosts: [5, 6, 7],
- status: 'LIVE',
- live_hosts_count: 2,
- critical_hosts_count: 0,
- dead_hosts_count: 1
- },
- {
- id: 5,
- name: 'Rack-4',
- hosts: [1, 2, 3, 4, 8, 9, 10],
- status: 'LIVE',
- live_hosts_count: 5,
- critical_hosts_count: 0,
- dead_hosts_count: 2
- },
- {
- id: 6,
- name: 'Rack-5',
- hosts: [5, 6, 7],
- status: 'LIVE',
- live_hosts_count: 2,
- critical_hosts_count: 0,
- dead_hosts_count: 1
- }
+ }*/
];
\ No newline at end of file
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/models/run.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/models/run.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/models/run.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/models/run.js Sun Dec 9 12:37:57 2012
@@ -24,12 +24,42 @@ var misc = require('utils/misc');
App.Run = DS.Model.extend({
runId:DS.attr('string'),
parentRunId:DS.attr('string'),
- workflowContext:DS.attr('string'),
+ workflowId:DS.attr('string'),
userName:DS.attr('string'),
startTime:DS.attr('string'),
- lastUpdateTime:DS.attr('string'),
- appId:DS.attr('number'),
- jobs:DS.hasMany('App.Job'),
+ elapsedTime:DS.attr('string'),
+ appId:DS.attr('string'),
+ /**
+ *
+ */
+ /*workflowContext:function() {
+ var r = '{dag: {';
+ console.log('entries', this.get('entries'));
+ this.get('entries').forEach(function(item) {
+ r += '"' + item.source + '": [';
+ item.targets.forEach(function(target) {
+ r += '"' + target + '",';
+ });
+ r += '],';
+ });
+ r += '}}';
+ console.log('dag', r);
+ return r;
+ }.property('entries'),*/
+ workflowContext:DS.attr('string'),
+ /**
+ * Jobs in the current run
+ */
+ jobs: function() {
+ var self = this;
+ var r = Array();
+ App.Job.find().forEach(function(job) {
+ if (job.get('workflowId') == self.get('workflowId')) {
+ r.push(job);
+ }
+ });
+ return r;
+ }.property('workflowId'),
/**
* Number of comleted jobs.
* Field calculates dynamically using <code>jobs</code> property
@@ -37,8 +67,15 @@ App.Run = DS.Model.extend({
numJobsCompleted: function() {
return this.get('jobs').filterProperty('status', 'RUNNING').length;
}.property('jobs.@each.status'),
+ /**
+ * Sum of the child jobs duration
+ */
duration: function() {
- return date.dateFormatInterval(parseInt((parseInt(this.get('lastUpdateTime')) - parseInt(this.get('startTime')))/1000));
+ var d = 0;
+ this.get('jobs').forEach(function(job) {
+ d += job.get('elapsedTime') / 1000 || 0;
+ });
+ return date.dateFormatInterval(parseInt(d));
}.property('lastUpdateTime', 'startTime'),
/**
* Status of running jobs
@@ -97,8 +134,17 @@ App.Run = DS.Model.extend({
* Field calculates dynamically using <code>jobs</code> property
*/
numJobsTotal: function() {
- return this.get('jobs.content').length;
+ return this.get('jobs').length;
}.property('jobs'),
+ /**
+ *
+ */
+ lastUpdateTime: function() {
+ return parseInt(this.get('startTime')) + parseInt(this.get('elapsedTime'));
+ }.property('elapsedTime', 'startTime'),
+ /**
+ *
+ */
lastUpdateTimeFormatted: function() {
return date.dateFormat(this.get('lastUpdateTime'));
}.property('lastUpdateTime')
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/models/service.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/models/service.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/models/service.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/models/service.js Sun Dec 9 12:37:57 2012
@@ -19,125 +19,64 @@
var App = require('app');
+App.Service = DS.Model.extend({
+ serviceName: DS.attr('string'),
+ serviceAudit: DS.hasMany('App.ServiceAudit'),
-
-App.Component = DS.Model.extend({
- componentName:DS.attr('string'),
- label:DS.attr('string'),
- type:DS.attr('boolean'),
- service:DS.belongsTo('App.Service'),
- host:DS.belongsTo('App.Host'),
- workStatus:DS.attr('string'),
- isMaster:function () {
- return this.get('type');
- }.property('type'),
- isSlave:function () {
- return !this.get('type');
- }.property('type'),
- // checkedForHostFilter: true // this is for host page to set checkboxes checked
- decommissioned: DS.attr('boolean')
-});
-
-App.Component.Status = {
- started:"STARTED",
- starting:"STARTING",
- stopped:"STOPPED",
- stopping:"STOPPING"
-}
-
-App.Component.FIXTURES = [
- {
- id:1,
- component_name:'NameNode',
- label:'NN',
- type:true,
- service_id:1,
- host_id:1,
- work_status:App.Component.Status.stopped
- },
- {
- id:2,
- component_name:'SNameNode',
- label:'SNN',
- type:true,
- service_id:1,
- host_id:2,
- work_status:App.Component.Status.started
- },
- {
- id:3,
- component_name:'DataNode',
- label:'DN',
- service_id:1,
- type:false,
- host_id:2,
- work_status:App.Component.Status.started,
- decommissioned: true
- },
- {
- id:4,
- component_name:'JobTracker',
- label:'JT',
- type:true,
- service_id:2,
- host_id:4,
- work_status:App.Component.Status.started
- },
- {
- id:5,
- component_name:'TaskTracker',
- label:'TT',
- type:false,
- service_id:2,
- host_id:4,
- work_status:App.Component.Status.started
- },
- {
- id:6,
- component_name:'HBase Master',
- label:'HBM',
- type:true,
- service_id:3,
- host_id:4,
- work_status:App.Component.Status.started
- },
- {
- id:7,
- component_name:'Region Server',
- label:'RS',
- type:false,
- service_id:3,
- host_id:2,
- work_status:App.Component.Status.started
- },
- {
- id:8,
- component_name:'Oozie',
- label:'Oz',
- type:false,
- service_id:5,
- host_id:2,
- work_status:App.Component.Status.started
- }
-];
-/*
-App.Service = DS.Model.extend({
- serviceName:DS.attr('string'),
- label:DS.attr('string'),
- components:DS.hasMany('App.Component'),
- serviceAudit:DS.hasMany('App.ServiceAudit'),
- healthStatus:DS.attr('string'),
- workStatus:DS.attr('boolean'),
- alerts:DS.hasMany('App.Alert'),
- quickLinks:DS.hasMany('App.QuickLinks')
+ workStatus: DS.attr('string'),
+ alerts: DS.hasMany('App.Alert'),
+ quickLinks: DS.hasMany('App.QuickLinks'),
+ components: DS.hasMany('App.Component'),
+
+ displayName: function () {
+ switch (this.get('serviceName')) {
+ case 'hdfs':
+ return 'HDFS';
+ case 'mapreduce':
+ return 'MapReduce';
+ case 'hbase':
+ return 'HBase';
+ case 'oozie':
+ return 'Oozie';
+ case 'hive':
+ return 'Hive/HCatalog';
+ case 'zookeeper':
+ return 'ZooKeeper';
+ case 'pig':
+ return 'Pig';
+ case 'sqoop':
+ return 'Sqoop';
+ case 'templeton':
+ return 'Templeton';
+ case 'ganglia':
+ return 'Ganglia';
+ case 'nagios':
+ return 'Nagios';
+ }
+ return this.get('serviceName');
+ }.property('serviceName')
});
App.Service.Health = {
- live:"LIVE",
- dead:"DEAD",
- start:"STARTING",
- stop:"STOPPING"
-}
+ live: "LIVE",
+ dead: "DEAD",
+ starting: "STARTING",
+ stopping: "STOPPING",
+
+ getKeyName:function(value){
+ switch(value){
+ case this.live:
+ return 'live';
+ case this.dead:
+ return 'dead';
+ case this.starting:
+ return 'starting';
+ case this.stopping:
+ return 'stopping';
+ }
+ return 'none';
+ }
+};
-*/
\ No newline at end of file
+App.Service.FIXTURES = [];
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/main.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/main.js?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/main.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/routes/main.js Sun Dec 9 12:37:57 2012
@@ -313,7 +313,7 @@ module.exports = Em.Route.extend({
Ember.run.next(function () {
var service = router.get('mainServiceItemController.content');
if (!service) {
- service = App.Service.find(1); // getting the first service to display
+ service = App.Service.find().objectAt(0); // getting the first service to display
}
router.transitionTo('service.summary', service);
});
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/application.less
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/application.less?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/application.less (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/styles/application.less Sun Dec 9 12:37:57 2012
@@ -453,11 +453,11 @@ a:focus {
min-width: 20px;
margin-left: 0;
}
- .health-status-LIVE {
+ .health-status-LIVE, .health-status-STARTING {
.tab-marker-position;
background-image: @status-live-marker;
}
- .health-status-DEAD {
+ .health-status-DEAD, .health-status-STOPPING {
.tab-marker-position;
background-image: @status-dead-marker;
}
@@ -679,11 +679,11 @@ a:focus {
// background-position: 12px 9px;
// background-repeat: no-repeat;
}
- .health-status-LIVE {
+ .health-status-LIVE , .health-status-STARTING {
.tab-marker-position;
background-image: @status-live-marker;
}
- .health-status-DEAD {
+ .health-status-DEAD, .health-status-STOPPING {
.tab-marker-position;
background-image: @status-dead-marker;
}
@@ -925,12 +925,12 @@ a:focus {
border-top-color: #000000;
border-bottom-color: #000000;
}
- .health-status-STARTED, .health-status-STARTING {
+ .health-status-started, .health-status-starting {
background-image: @status-live-marker;
background-repeat: no-repeat;
background-position: 0px 4px;
}
- .health-status-STOPPED, .health-status-STOPPING {
+ .health-status-installed, .health-status-stopping {
background-image: @status-dead-marker;
background-repeat: no-repeat;
background-position: 0px 4px;
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/application.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/application.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/application.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/application.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div id="main">
<div id="top-nav">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/form.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/form.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/form.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/form.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
{{#each field in view.fields}}
{{view App.FormFieldTemplate fieldBinding="field"}}
{{/each}}
\ No newline at end of file
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/form/checkbox.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/form/checkbox.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/form/checkbox.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/form/checkbox.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div class="controls">
<label class="checkbox" for="input{{unbound view.field.name}}">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/form/field.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/form/field.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/form/field.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/form/field.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<label class="control-label"
for="input{{unbound view.field.name}}">{{unbound view.field.displayName}}</label>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/grid/filter.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/grid/filter.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/grid/filter.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/grid/filter.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
{{#each filter in view.filters}}
<li>
<label class="checkbox">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/grid/header.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/grid/header.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/grid/header.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/grid/header.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
{{view.label}}<i {{action toggleFilter target="view"}} class="icon-filter"></i>
{{#if view.showFilter}}
{{view view.filter}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/grid/pager.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/grid/pager.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/grid/pager.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/grid/pager.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
<ul>
<li {{bindAttr class="view.prevPageDisabled"}}><a {{action activatePrevPage target="view"}} href="#">Prev</a></li>
{{#each page in view.pages}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/metric.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/metric.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/metric.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/metric.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
<div class="span title">
Metrics <i class="icon-question-sign"></i>
</div>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/time_range.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/time_range.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/time_range.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/common/time_range.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
<div class="span title">
Time Range <i class="icon-question-sign"></i>
</div>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/installer.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div id="installer">
<div class="container">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/login.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/login.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/login.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/login.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div class="well login span4">
<h2>{{t login.header}}</h2>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
{{#if isClusterDataLoaded}}
<div id="main-nav">
<div class="navbar">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div class="row-fluid">
<div id="main-admin-menu" class="well span2">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/advanced.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/advanced.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/advanced.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/advanced.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<h5>{{t admin.advanced.title}}<i class="icon-question-sign"></i></h5>
<div class="row">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/advanced/uninstall.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/advanced/uninstall.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/advanced/uninstall.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/advanced/uninstall.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,6 +14,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
Confirm Uninstall
\ No newline at end of file
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/audit.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/audit.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/audit.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/audit.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<table class="table table-striped">
<thead>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/authentication.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/authentication.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/authentication.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/authentication.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
{{view App.FormFieldTemplate fieldBinding="view.form.field.method" id="user-auth-method"}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/security.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/security.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/security.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/security.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<h5>{{t admin.security.title}}<i class="icon-question-sign"></i></h5>
<div>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
{{#if view.ldapUser}}
<p class="text-info">{{t admin.users.ldapAuthentionUsed}}.</p>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user/edit.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user/edit.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user/edit.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user/edit.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<form class="form-horizontal">
{{#each field in view.userForm.fields}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user/row.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user/row.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user/row.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/admin/user/row.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<tr>
<td>{{user.id}}</td>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
<div id="apps">
<!--<div class="breadcrumb">
<li><a href='#' {{action "routeHome" target="controller"}}><i class="icon-home"></i></a><span class="divider">/</span></li>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/item.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/item.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/item.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/item.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
<td colspan="10">
<ul class="nav nav-tabs">
{{#each tab in view.menuTabs}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/item/bar.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/item/bar.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/item/bar.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/item/bar.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div class="btn-group">
<button class="btn btn-primary dropdown-toggle" data-toggle="dropdown">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/item/dag.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/item/dag.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/item/dag.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/item/dag.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div id="dag_viewer"></div>
<table class="table table-bordered table-striped" id="innerTable">
@@ -33,7 +33,7 @@
<tbody>
{{#each job in view.content}}
<tr>
- <td>{{job.id}}</td>
+ <td>{{job.workflowEntityName}}</td>
<td>{{job.jobId}}</td>
<td>{{job.status}}</td>
<td>{{job.maps}} ({{job.mapsProgress}}%)</td>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/list_row.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/list_row.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/list_row.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/list_row.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,9 +14,9 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
-<td><a href="#" {{action "starClick" target="controller"}}"><span class="icon-star"></span><span class="hidden">{{run.id}}</span></a></td>
+<td><a href="#" {{action "starClick" target="controller"}}"><span class="icon-star"></span><span class="hidden">{{run.workflowId}}</span></a></td>
<td><a href="javascript:void(0)">ID {{run.appId}}</a></td>
<td>{{run.appName}}</td>
<td>{{run.type}}</td>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/runs.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/runs.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/runs.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/apps/runs.hbs Sun Dec 9 12:37:57 2012
@@ -0,0 +1,17 @@
+{{!
+* Licensed to the Apache Software Foundation (ASF) under one
+* or more contributor license agreements. See the NOTICE file
+* distributed with this work for additional information
+* regarding copyright ownership. The ASF licenses this file
+* to you under the Apache License, Version 2.0 (the
+* "License"); you may not use this file except in compliance
+* with the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/background_operations_popup.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/background_operations_popup.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/background_operations_popup.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/background_operations_popup.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
{{#each operation in allOperations}}
{{#view App.MainBackgroundOperation contentBinding="operation"}}
<a class="open-details" {{action openDetails target="view"}} href="#">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
{{view App.MetricFilteringWidget controllerBinding="App.router.mainChartsController"}}
{{view App.TimeRangeWidget controllerBinding="App.router.mainChartsController"}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,8 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
+
<div class="heatmap">
{{#each rack in controller.cluster.racks}}
{{view App.MainChartsHeatmapRackView rackBinding="rack" visualSchemaBinding="controller.visualSchema"}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_host.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_host.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_host.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_host.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,6 +14,6 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div {{bindAttr class="view.content.healthStatus view.hostClass"}}></div>
\ No newline at end of file
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_host_detail.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<h6>{{view.details.name}}</h6>
CPU: {{view.details.cpuUsage}}%<br/>
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_rack.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_rack.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_rack.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/heatmap/heatmap_rack.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div class="rackHeader">
<div class="statusName clearfix">
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/horizon.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/horizon.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/horizon.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/horizon.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
{{#each node in view.hosts}}
{{view App.MainChartsHorizonChartView hostBinding="node"}}
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/horizon/chart.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/horizon/chart.hbs?rev=1418916&r1=1418915&r2=1418916&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/horizon/chart.hbs (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/templates/main/charts/horizon/chart.hbs Sun Dec 9 12:37:57 2012
@@ -1,4 +1,4 @@
-<!--
+{{!
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -14,7 +14,7 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
--->
+}}
<div class="row">
<div {{bindAttr class="view.healthStatusClass"}}></div>