dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2332
committer: Tran Chau <tran.hispvietnam@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-10-07 19:19:06 +0700
message:
  Minor fix.
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.vm
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js
  dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm


--
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/i18n/i18n.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.vm	2010-10-04 10:59:24 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/i18n/i18n.vm	2010-10-07 12:19:06 +0000
@@ -141,4 +141,5 @@
 		,custome_regex: validatorFormat("{1}")
 		,greaterDate: '$encoder.jsEscape($i18n.getString('closedDate_should_be_greater_than_openDate' ) , "'")'
 };
-
+var i18n_process = '$encoder.jsEscape( $i18n.getString( "process" ) , "'" )';
+var i18n_delete_success = '$encoder.jsEscape( $i18n.getString( "delete_success" ) , "'" )';

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2010-10-07 07:10:30 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2010-10-07 12:19:06 +0000
@@ -714,6 +714,7 @@
     
     if ( result )
     {
+		setWaitMessage( i18n_process );
     	$.postJSON(
     	    action,
     	    {
@@ -728,6 +729,7 @@
 	                jQuery( "table.listTable tbody tr" ).removeClass( "listRow listAlternateRow" );
 	                jQuery( "table.listTable tbody tr:odd" ).addClass( "listAlternateRow" );
 	                jQuery( "table.listTable tbody tr:even" ).addClass( "listRow" );
+					setMessage( i18n_delete_success );
     	    	}
     	    	else if ( json.response == "error" )
     	    	{

=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2010-10-07 08:40:58 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties	2010-10-07 12:19:06 +0000
@@ -354,4 +354,7 @@
 no_of_pages 	= No. of pages
 size_of_page 	= Size of page
 jump_to_page 	= Jump to page
-go				= Go
\ No newline at end of file
+go				= Go
+
+delete_success = Delete object successfully.
+process = Processing .... 
\ No newline at end of file

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm	2010-09-27 11:52:43 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-organisationunit/src/main/webapp/dhis-web-maintenance-organisationunit/organisationUnit.vm	2010-10-07 12:19:06 +0000
@@ -68,6 +68,8 @@
 	</tr>
 </table>
 
+<span id="message"></span>
+
 <script type="text/javascript">
 	var none = '$encoder.jsEscape( $i18n.getString( "none" ) , "'" )';
 	var yes = '$encoder.jsEscape( $i18n.getString( "yes" ) , "'" )';