Return-Path: X-Original-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ambari-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 3E3F298C2 for ; Fri, 24 May 2013 01:22:46 +0000 (UTC) Received: (qmail 50447 invoked by uid 500); 24 May 2013 01:22:46 -0000 Delivered-To: apmail-incubator-ambari-commits-archive@incubator.apache.org Received: (qmail 50423 invoked by uid 500); 24 May 2013 01:22:46 -0000 Mailing-List: contact ambari-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@incubator.apache.org Delivered-To: mailing list ambari-commits@incubator.apache.org Received: (qmail 50407 invoked by uid 99); 24 May 2013 01:22:45 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 May 2013 01:22:45 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 May 2013 01:22:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id B634D23889DE; Fri, 24 May 2013 01:22:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1485916 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/mappers/jobs_mapper.js ambari-web/vendor/scripts/workflow_visualization.js Date: Fri, 24 May 2013 01:22:24 -0000 To: ambari-commits@incubator.apache.org From: srimanth@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130524012224.B634D23889DE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: srimanth Date: Fri May 24 01:22:24 2013 New Revision: 1485916 URL: http://svn.apache.org/r1485916 Log: AMBARI-2197. Jobs page usability issues - remove the "ramps". (srimanth) Modified: incubator/ambari/trunk/CHANGES.txt incubator/ambari/trunk/ambari-web/app/mappers/jobs_mapper.js incubator/ambari/trunk/ambari-web/vendor/scripts/workflow_visualization.js Modified: incubator/ambari/trunk/CHANGES.txt URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1485916&r1=1485915&r2=1485916&view=diff ============================================================================== --- incubator/ambari/trunk/CHANGES.txt (original) +++ incubator/ambari/trunk/CHANGES.txt Fri May 24 01:22:24 2013 @@ -895,6 +895,8 @@ Trunk (unreleased changes): BUG FIXES + AMBARI-2197. Jobs page usability issues - remove the "ramps". (srimanth) + AMBARI-2196. Install Wizard, Customize Services changes. (srimanth) AMBARI-2193. Remove zookeeper dependency for HIVE and HCAT. (srimanth) Modified: incubator/ambari/trunk/ambari-web/app/mappers/jobs_mapper.js URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/mappers/jobs_mapper.js?rev=1485916&r1=1485915&r2=1485916&view=diff ============================================================================== --- incubator/ambari/trunk/ambari-web/app/mappers/jobs_mapper.js (original) +++ incubator/ambari/trunk/ambari-web/app/mappers/jobs_mapper.js Fri May 24 01:22:24 2013 @@ -64,10 +64,35 @@ App.jobTimeLineMapper = App.QuickDataMap map:function (json) { var job = this.get('model'); // @model App.MainAppsItemBarView var parseResult = this.parseIt(json, this.config); - + var self = this; $.each(parseResult, function (field, value) { - job.set(field, value); + var d = self.coordinatesModify(value); + d.reverse(); + d = self.coordinatesModify(d); + d.reverse(); + job.set(field, d); + }); + }, + + coordinatesModify: function(data) { + var d = this.zeroAdding(data); + d.reverse(); + d = this.zeroAdding(d); + d.reverse(); + return d; + }, + + zeroAdding: function(data) { + var d = []; + var last_y = 0; + data.forEach(function(coordinates) { + if (coordinates.y != 0 && last_y == 0) { + d.push({x: coordinates.x, y: 0}); + } + d.push(coordinates); + last_y = coordinates.y; }); + return d; } }); Modified: incubator/ambari/trunk/ambari-web/vendor/scripts/workflow_visualization.js URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/vendor/scripts/workflow_visualization.js?rev=1485916&r1=1485915&r2=1485916&view=diff ============================================================================== --- incubator/ambari/trunk/ambari-web/vendor/scripts/workflow_visualization.js (original) +++ incubator/ambari/trunk/ambari-web/vendor/scripts/workflow_visualization.js Fri May 24 01:22:24 2013 @@ -383,7 +383,7 @@ DagViewer.prototype.addTimeSeries = func .attr("class", function(d) { return d.name;}) .attr("style", function(d) { if (d.name.substring(0,3)=="all") - return "stroke:"+d3.interpolateRgb(d.color, 'black')(0.125)+";fill:white"; + return ""; else return "stroke:"+d3.interpolateRgb(d.color, 'black')(0.125)+";fill:"+d.color; })