incubator-ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject svn commit: r1418985 [2/2] - in /incubator/ambari/branches/AMBARI-666/ambari-web: app/ app/controllers/ app/controllers/global/ app/controllers/main/charts/ app/controllers/main/host/ app/controllers/main/service/ app/controllers/wizard/ app/data/ app/...
Date Sun, 09 Dec 2012 14:47:49 GMT
Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/dashboard/service/mapreduce.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/dashboard/service/mapreduce.js?rev=1418985&r1=1418984&r2=1418985&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/dashboard/service/mapreduce.js
(original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/dashboard/service/mapreduce.js
Sun Dec  9 14:47:44 2012
@@ -107,7 +107,10 @@ App.MainDashboardServiceMapreduceView = 
     return App.Component.find().findProperty('componentName', 'TASKTRACKER');
   }.property('components'),
 
+  isCollapsed: false,
+
   toggleInfoView: function() {
     $('#mapreduce-info').toggle('blind', 200);
+    this.set('isCollapsed', !this.isCollapsed);
   }
 });
\ No newline at end of file

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/summary.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/summary.js?rev=1418985&r1=1418984&r2=1418985&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/summary.js
(original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/info/summary.js
Sun Dec  9 14:47:44 2012
@@ -28,7 +28,8 @@ App.MainServiceInfoSummaryView = Em.View
     hbase:false,
     zookeeper:false,
     oozie:false,
-    hive:false
+    hive:false,
+    ganglia:false
   },
 
   data:{
@@ -38,6 +39,14 @@ App.MainServiceInfoSummaryView = Em.View
       "user":"hive"
     }
   },
+  gangliaServer:function(){
+    var tmp=this.get('controller.content');
+    if(tmp.get("id") == "GANGLIA"){
+      return tmp.get("components").objectAt(0).get("host").get("id");
+    }else{
+      return "";
+    }
+  }.property('controller.content'),
   service:function () {
     var svc = this.get('controller.content');
     var svcName = svc.get('serviceName');

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/menu.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/menu.js?rev=1418985&r1=1418984&r2=1418985&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/menu.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/main/service/menu.js Sun Dec
 9 14:47:44 2012
@@ -66,7 +66,7 @@ App.MainServiceMenuView = Em.CollectionV
       var allAlerts = App.router.get('clusterController.alerts');
       var serviceId = this.get('content.serviceName');
       if (serviceId) {
-        return allAlerts.filterProperty('serviceType', serviceId).length;
+        return allAlerts.filterProperty('serviceType', serviceId).filterProperty('isOk',
false).length;
       }
       return 0;
     }.property('App.router.clusterController.alerts'),

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step1_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step1_view.js?rev=1418985&r1=1418984&r2=1418985&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step1_view.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step1_view.js Sun Dec
 9 14:47:44 2012
@@ -21,6 +21,7 @@ var App = require('app');
 
 App.WizardStep1View = Em.View.extend({
 
+  tagName: "form",
   templateName: require('templates/wizard/step1'),
 
   didInsertElement: function () {
@@ -31,6 +32,10 @@ App.WizardStep1View = Em.View.extend({
 
   onError: function () {
     return this.get('controller.clusterNameError') !== '';
-  }.property('controller.clusterNameError')
+  }.property('controller.clusterNameError'),
+
+  submit: function(event) {
+    App.router.wizardStep1Controller.submit();
+  }
 
 });

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step3_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step3_view.js?rev=1418985&r1=1418984&r2=1418985&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step3_view.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step3_view.js Sun Dec
 9 14:47:44 2012
@@ -48,7 +48,7 @@ App.WizardHostView = Em.View.extend({
   }.property(),
 
   isRetryable: function() {
-    return ['pending', 'error'].contains(this.get('hostInfo.bootStatus'));
+    return ['FAILED'].contains(this.get('hostInfo.bootStatus'));
   }.property('hostInfo.bootStatus')
 
 });

Modified: incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step8_view.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step8_view.js?rev=1418985&r1=1418984&r2=1418985&view=diff
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step8_view.js (original)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/app/views/wizard/step8_view.js Sun Dec
 9 14:47:44 2012
@@ -26,5 +26,47 @@ App.WizardStep8View = Em.View.extend({
   didInsertElement: function () {
     var controller = this.get('controller');
     controller.loadStep();
-  }
+  },
+
+  showLoadingIndicator: function(){
+    if(!this.get('controller.isSubmitDisabled')){
+      return;
+    }
+
+    var opts = {
+      lines: 13, // The number of lines to draw
+      length: 7, // The length of each line
+      width: 4, // The line thickness
+      radius: 10, // The radius of the inner circle
+      corners: 1, // Corner roundness (0..1)
+      rotate: 0, // The rotation offset
+      color: '#000', // #rgb or #rrggbb
+      speed: 1, // Rounds per second
+      trail: 60, // Afterglow percentage
+      shadow: false, // Whether to render a shadow
+      hwaccel: false, // Whether to use hardware acceleration
+      className: 'spinner', // The CSS class to assign to the spinner
+      zIndex: 2e9, // The z-index (defaults to 2000000000)
+      top: 'auto', // Top position relative to parent in px
+      left: 'auto' // Left position relative to parent in px
+    };
+    var target = $('#spinner')[0];
+    var spinner = new Spinner(opts).spin(target);
+
+    /*var el = $('#spinner').children('b');
+    el.css('display', 'inline-block');
+    var deg = 0;
+    var timeoutId = setInterval(function(){
+      if(!$('#spinner').length){
+        clearInterval(timeoutId);
+      }
+      deg += 15;
+      deg %= 360;
+      el.css('transform', 'rotate(' + deg + 'deg)');
+      el.css('-ms-transform', 'rotate(' + deg + 'deg)');
+      el.css('-o-transform', 'rotate(' + deg + 'deg)');
+      el.css('-moz-transform', 'rotate(' + deg + 'deg)');
+      el.css('-webkit-transform', 'rotate(' + deg + 'deg)');
+    }, 80);*/
+  }.observes('controller.isSubmitDisabled')
 });

Added: incubator/ambari/branches/AMBARI-666/ambari-web/vendor/scripts/spin.min.js
URL: http://svn.apache.org/viewvc/incubator/ambari/branches/AMBARI-666/ambari-web/vendor/scripts/spin.min.js?rev=1418985&view=auto
==============================================================================
--- incubator/ambari/branches/AMBARI-666/ambari-web/vendor/scripts/spin.min.js (added)
+++ incubator/ambari/branches/AMBARI-666/ambari-web/vendor/scripts/spin.min.js Sun Dec  9
14:47:44 2012
@@ -0,0 +1,2 @@
+//fgnass.github.com/spin.js#v1.2.7
+!function(e,t,n){function o(e,n){var r=t.createElement(e||"div"),i;for(i in n)r[i]=n[i];return
r}function u(e){for(var t=1,n=arguments.length;t<n;t++)e.appendChild(arguments[t]);return
e}function f(e,t,n,r){var o=["opacity",t,~~(e*100),n,r].join("-"),u=.01+n/r*100,f=Math.max(1-(1-e)/t*(100-u),e),l=s.substring(0,s.indexOf("Animation")).toLowerCase(),c=l&&"-"+l+"-"||"";return
i[o]||(a.insertRule("@"+c+"keyframes "+o+"{"+"0%{opacity:"+f+"}"+u+"%{opacity:"+e+"}"+(u+.01)+"%{opacity:1}"+(u+t)%100+"%{opacity:"+e+"}"+"100%{opacity:"+f+"}"+"}",a.cssRules.length),i[o]=1),o}function
l(e,t){var i=e.style,s,o;if(i[t]!==n)return t;t=t.charAt(0).toUpperCase()+t.slice(1);for(o=0;o<r.length;o++){s=r[o]+t;if(i[s]!==n)return
s}}function c(e,t){for(var n in t)e.style[l(e,n)||n]=t[n];return e}function h(e){for(var t=1;t<arguments.length;t++){var
r=arguments[t];for(var i in r)e[i]===n&&(e[i]=r[i])}return e}function p(e){var t={x:e.offsetLeft,y:e.offsetTop};while(e=e.offsetParent)t.x+=e.offsetLeft
 ,t.y+=e.offsetTop;return t}var r=["webkit","Moz","ms","O"],i={},s,a=function(){var e=o("style",{type:"text/css"});return
u(t.getElementsByTagName("head")[0],e),e.sheet||e.styleSheet}(),d={lines:12,length:7,width:5,radius:10,rotate:0,corners:1,color:"#000",speed:1,trail:100,opacity:.25,fps:20,zIndex:2e9,className:"spinner",top:"auto",left:"auto",position:"relative"},v=function
m(e){if(!this.spin)return new m(e);this.opts=h(e||{},m.defaults,d)};v.defaults={},h(v.prototype,{spin:function(e){this.stop();var
t=this,n=t.opts,r=t.el=c(o(0,{className:n.className}),{position:n.position,width:0,zIndex:n.zIndex}),i=n.radius+n.length+n.width,u,a;e&&(e.insertBefore(r,e.firstChild||null),a=p(e),u=p(r),c(r,{left:(n.left=="auto"?a.x-u.x+(e.offsetWidth>>1):parseInt(n.left,10)+i)+"px",top:(n.top=="auto"?a.y-u.y+(e.offsetHeight>>1):parseInt(n.top,10)+i)+"px"})),r.setAttribute("aria-role","progressbar"),t.lines(r,t.opts);if(!s){var
f=0,l=n.fps,h=l/n.speed,d=(1-n.opacity)/(h*n.trail/100),v=h/n.l
 ines;(function m(){f++;for(var e=n.lines;e;e--){var i=Math.max(1-(f+e*v)%h*d,n.opacity);t.opacity(r,n.lines-e,i,n)}t.timeout=t.el&&setTimeout(m,~~(1e3/l))})()}return
t},stop:function(){var e=this.el;return e&&(clearTimeout(this.timeout),e.parentNode&&e.parentNode.removeChild(e),this.el=n),this},lines:function(e,t){function
i(e,r){return c(o(),{position:"absolute",width:t.length+t.width+"px",height:t.width+"px",background:e,boxShadow:r,transformOrigin:"left",transform:"rotate("+~~(360/t.lines*n+t.rotate)+"deg)
translate("+t.radius+"px"+",0)",borderRadius:(t.corners*t.width>>1)+"px"})}var n=0,r;for(;n<t.lines;n++)r=c(o(),{position:"absolute",top:1+~(t.width/2)+"px",transform:t.hwaccel?"translate3d(0,0,0)":"",opacity:t.opacity,animation:s&&f(t.opacity,t.trail,n,t.lines)+"
"+1/t.speed+"s linear infinite"}),t.shadow&&u(r,c(i("#000","0 0 4px #000"),{top:"2px"})),u(e,u(r,i(t.color,"0
0 1px rgba(0,0,0,.1)")));return e},opacity:function(e,t,n){t<e.childNodes.length&&(e.childNodes[t].
 style.opacity=n)}}),function(){function e(e,t){return o("<"+e+' xmlns="urn:schemas-microsoft.com:vml"
class="spin-vml">',t)}var t=c(o("group"),{behavior:"url(#default#VML)"});!l(t,"transform")&&t.adj?(a.addRule(".spin-vml","behavior:url(#default#VML)"),v.prototype.lines=function(t,n){function
s(){return c(e("group",{coordsize:i+" "+i,coordorigin:-r+" "+ -r}),{width:i,height:i})}function
l(t,i,o){u(a,u(c(s(),{rotation:360/n.lines*t+"deg",left:~~i}),u(c(e("roundrect",{arcsize:n.corners}),{width:r,height:n.width,left:n.radius,top:-n.width>>1,filter:o}),e("fill",{color:n.color,opacity:n.opacity}),e("stroke",{opacity:0}))))}var
r=n.length+n.width,i=2*r,o=-(n.width+n.length)*2+"px",a=c(s(),{position:"absolute",top:o,left:o}),f;if(n.shadow)for(f=1;f<=n.lines;f++)l(f,-2,"progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)");for(f=1;f<=n.lines;f++)l(f);return
u(t,a)},v.prototype.opacity=function(e,t,n,r){var i=e.firstChild;r=r.shadow&&r.lines||0,i&&t+r
 <i.childNodes.length&&(i=i.childNodes[t+r],i=i&&i.firstChild,i=i&&i.firstChild,i&&(i.opacity=n))}):s=l(t,"animation")}(),typeof
define=="function"&&define.amd?define(function(){return v}):e.Spinner=v}(window,document);
\ No newline at end of file



Mime
View raw message