Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2B367E0FB for ; Wed, 9 Jan 2013 21:03:46 +0000 (UTC) Received: (qmail 90030 invoked by uid 500); 9 Jan 2013 21:03:46 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 90023 invoked by uid 99); 9 Jan 2013 21:03:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Jan 2013 21:03:46 +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; Wed, 09 Jan 2013 21:03:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8BC5723889BF; Wed, 9 Jan 2013 21:03:25 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1431075 - in /lucene/dev/branches/branch_4x: ./ solr/ solr/CHANGES.txt solr/webapp/ solr/webapp/web/js/scripts/index.js Date: Wed, 09 Jan 2013 21:03:25 -0000 To: commits@lucene.apache.org From: steffkes@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130109210325.8BC5723889BF@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: steffkes Date: Wed Jan 9 21:03:25 2013 New Revision: 1431075 URL: http://svn.apache.org/viewvc?rev=1431075&view=rev Log: SOLR-4289: Admin UI - JVM memory bar - dark grey "used" width is too small (merge r1431073) Modified: lucene/dev/branches/branch_4x/ (props changed) lucene/dev/branches/branch_4x/solr/ (props changed) lucene/dev/branches/branch_4x/solr/CHANGES.txt (contents, props changed) lucene/dev/branches/branch_4x/solr/webapp/ (props changed) lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/index.js Modified: lucene/dev/branches/branch_4x/solr/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/CHANGES.txt?rev=1431075&r1=1431074&r2=1431075&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/solr/CHANGES.txt (original) +++ lucene/dev/branches/branch_4x/solr/CHANGES.txt Wed Jan 9 21:03:25 2013 @@ -1668,6 +1668,8 @@ Bug Fixes * SOLR-1958: When using the MailEntityProcessor, import would fail if fetchMailsSince was not specified. (Max Lynch via James Dyer) +* SOLR-4289: Admin UI - JVM memory bar - dark grey "used" width is too small + (steffkes) Other Changes ---------------------- Modified: lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/index.js URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/index.js?rev=1431075&r1=1431074&r2=1431075&view=diff ============================================================================== --- lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/index.js (original) +++ lucene/dev/branches/branch_4x/solr/webapp/web/js/scripts/index.js Wed Jan 9 21:03:25 2013 @@ -36,13 +36,15 @@ var generate_bar = function( bar_contain $( '.bar-max.val', bar_holder ).text( bar_data['max'] ); bar_level++; - $( '.bar-total.bar', bar_holder ).width( new String( (bar_data['total']/bar_data['max'])*100 ) + '%' ); + var total_calc = bar_data['total']/bar_data['max']; + $( '.bar-total.bar', bar_holder ).width( new String( total_calc*100 ) + '%' ); $( '.bar-total.val', bar_holder ).text( bar_data['total'] ); if( bar_data['used'] ) { bar_level++; - $( '.bar-used.bar', bar_holder ).width( new String( (bar_data['used']/bar_data['max'])*100 ) + '%' ); + var used_calc = (bar_data['used']/bar_data['max'])/total_calc; + $( '.bar-used.bar', bar_holder ).width( new String( used_calc*100 ) + '%' ); $( '.bar-used.val', bar_holder ).text( bar_data['used'] ); }