dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 1351
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Tue 2010-01-26 22:17:32 +0100
message:
  Added some effects to data integrity checks
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataIntegrityForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataIntegrity.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-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js	2010-01-26 15:20:42 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js	2010-01-26 21:17:32 +0000
@@ -575,8 +575,8 @@
  */
 function showLoader()
 {
-    $( "#loaderDiv" ).css({ display: "block" });
-    $( "#contentDiv" ).css({ display: "none" });
+    $( "div#loaderDiv" ).show();
+    $( "div#contentDiv" ).hide();
 }
 
 /**
@@ -584,6 +584,6 @@
  */
 function hideLoader()
 {
-    $( "#loaderDiv" ).css({ display: "none" });
-    $( "#contentDiv" ).css({ display: "block" });
+    $( "div#loaderDiv" ).hide();
+    $( "div#contentDiv" ).show();
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataIntegrityForm.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataIntegrityForm.vm	2010-01-26 14:30:54 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/dataIntegrityForm.vm	2010-01-26 21:17:32 +0000
@@ -2,7 +2,7 @@
 #macro( integrityItem $header $id )
 <h4>${header}&nbsp;<img id="${id}Button"></h4>
 
-<div id="${id}Div"></div>
+<div id="${id}Div" style="border:1px solid #a0a0a0; padding:10px; width:600px"></div>
 
 #end
 

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataIntegrity.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataIntegrity.js	2010-01-26 15:20:42 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/javascript/dataIntegrity.js	2010-01-26 21:17:32 +0000
@@ -33,14 +33,14 @@
 {
     if ( list.length > 0 )
     {
-    	// Display image button
+    	// Display image "drop-down" button
     	
         $( "#" + id + "Button" )
            .attr({ src: "../images/down.png", title: "View violations" })
            .css({ cursor: "pointer" })
-           .click( function() { showHideDiv( id + "Div" ) } );
+           .click( function() { $( "#" + id + "Div" ).slideToggle( "fast" ) } );
 
-        // Populate and hide violation div
+        // Populate violation div
 
         var violations = "";
         
@@ -49,13 +49,14 @@
             violations += list[i] + "<br>";
         }
         
-        $( "#" + id + "Div" )
-            .html( violations )
-            .css({ display: "none" });        
+        $( "#" + id + "Div" ).html( violations );
     }
     else
     {
-        $( "#" + id + "Button" )
-            .attr({ src: "../images/check.png", title: "No violations" });
+    	// Display image "check" button
+    	
+        $( "#" + id + "Button" ).attr({ src: "../images/check.png", title: "No violations" });
     }
+        
+    $( "#" + id + "Div" ).hide();
 }