dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 11526
committer: Lars Helge Øverland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Fri 2013-07-26 08:59:52 +0200
message:
  Minor
modified:
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js
  dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css


--
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/dashboard.js'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js	2013-07-25 18:52:33 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/javascript/dashboard.js	2013-07-26 06:59:52 +0000
@@ -94,6 +94,8 @@
 dhis2.db.addDashboard = function()
 {
 	var item = '{"name": "' + $( "#dashboardName" ).val() + '"}';
+
+	$( "#addDashboardForm" ).dialog( "destroy" );
 	
 	$.ajax( {
 		type: "post",
@@ -101,7 +103,6 @@
 		data: item,
 		contentType: "application/json",
 		success: function( data, text, xhr ) {
-			$( "#addDashboardForm" ).dialog( "destroy" );
 			$( "#dashboardName" ).val( "" );
 			dhis2.db.renderDashboardListLoadFirst();
 		}
@@ -112,6 +113,8 @@
 {
 	var name = $( "#dashboardRename" ).val();
 	
+	$( "#manageDashboardForm" ).dialog( "destroy" );
+	
 	if ( undefined !== dhis2.db.current && undefined !== name && name.trim().length > 0 )
 	{
 		var data = "{ \"name\": \"" + name + "\"}";
@@ -122,7 +125,6 @@
 	    	contentType: "application/json",
 	    	data: data,
 	    	success: function() {
-	    		$( "#manageDashboardForm" ).dialog( "destroy" );
 	    		$( "#dashboardRename" ).val( "" );
 	    		dhis2.db.renderDashboardListLoadFirst();
 	    	}

=== modified file 'dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css'
--- dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2013-07-25 18:52:33 +0000
+++ dhis-2/dhis-web/dhis-web-dashboard-integration/src/main/webapp/dhis-web-dashboard-integration/style/dashboard.css	2013-07-26 06:59:52 +0000
@@ -88,7 +88,7 @@
 
 .dropItem
 {
-  width: 20px;
+  width: 405px;
   margin-right: 19px;
   height: 340px;
   border: 1px solid #b0d2e8;