dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 6581
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2012-04-14 23:03:54 +0200
message:
  UI fix
modified:
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importDataValue.vm
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importSummary.vm
  dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/importDataValue.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-importexport/src/main/webapp/dhis-web-importexport/importDataValue.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importDataValue.vm	2012-04-13 22:38:23 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importDataValue.vm	2012-04-14 21:03:54 +0000
@@ -36,7 +36,7 @@
 #if( $running )
 
 <div id="notificationDiv">
-<table id="notificationTable" class="notificationTable">
+<table id="notificationTable" class="notificationTable" style="width:422px">
 <col width="120">
 <col width="380">
 </table>
@@ -51,4 +51,4 @@
 
 #end
 
-<div id="importSummaryDiv" class="page"></div>
\ No newline at end of file
+<div id="importSummaryDiv" class="page formSection" style="display:none; width:400px;"></div>
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importSummary.vm'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importSummary.vm	2012-04-11 20:16:18 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/importSummary.vm	2012-04-14 21:03:54 +0000
@@ -1,7 +1,7 @@
 
 <h3>$i18n.getString( "import_summary" )</h3>
 
-#if( $summary.dataSetComplete )
+#if( ${summary.dataSetComplete} != "false" )
 <p>$i18n.getString( "data_set_completed_on" ) ${summary.dataSetComplete}</p>
 #end
 

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/importDataValue.js'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/importDataValue.js	2012-04-11 20:40:12 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/importDataValue.js	2012-04-14 21:03:54 +0000
@@ -28,5 +28,5 @@
 function displaySummary()
 {	
 	$( '#notificationDiv' ).hide();
-	$( '#importSummaryDiv' ).show( 'slow' ).load( 'getDataValueImportSummary.action' );
+	$( '#importSummaryDiv' ).show( 'fast' ).load( 'getDataValueImportSummary.action' );
 }
\ No newline at end of file