← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 10603: Adjustment to dashboard calculation of no of charts to display

 

------------------------------------------------------------
revno: 10603
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2013-04-17 14:40:42 +0200
message:
  Adjustment to dashboard calculation of no of charts to display
modified:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js


--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js	2013-03-22 10:30:47 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dropdown.js	2013-04-17 12:40:42 +0000
@@ -15,7 +15,7 @@
 	$( "#searchField" ).keyup( search );
 	
 	var viewportWidth = parseInt( $( window ).width() );
-	var linkWidth = parseInt( 338 );
+	var linkWidth = parseInt( 334 );
 	var chartWidth = parseInt( 325 );
 	
 	if ( viewportWidth == undefined )
@@ -23,7 +23,7 @@
 		viewportWidth = parseInt( 1366 );
 	}
 	
-	var noCharts = 2 * Math.floor( ( viewportWidth - linkWidth ) / chartWidth ); 
+	var noCharts = 2 * Math.floor( ( viewportWidth - linkWidth + 4 ) / chartWidth ); 
 		
 	$( "#contentDiv" ).load( "provideContent.action?noCharts=" + noCharts + "&_dc=" + getRandomNumber() );
 } );