=== 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	2013-05-28 07:52:46 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js	2013-06-25 13:58:55 +0000
@@ -1416,11 +1416,6 @@
 	jQuery.growlUI( i18n_warning, message, 'warning', time ); 	
 }
 
-function showWaitMessage( message, time )
-{
-	jQuery.growlUI( i18n_waiting, message, 'waiting', time );
-}
-
 function markInvalid( elementId, message )
 {	
 	var element = jQuery("#" + elementId );

=== modified file 'dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/import.js'
--- dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/import.js	2011-07-15 02:53:51 +0000
+++ dhis-2/dhis-web/dhis-web-importexport/src/main/webapp/dhis-web-importexport/javascript/import.js	2013-06-25 13:58:55 +0000
@@ -390,7 +390,7 @@
 	
 	if ( selectedIndex == -1 )
 	{
-		showWarningMessage( i18n_no_item_to_match );
+		setHeaderDelayMessage( i18n_no_item_to_match );
 	}
 	else
 	{

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/removeLockExceptionBatch.vm'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/removeLockExceptionBatch.vm	2012-02-17 13:28:30 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/webapp/dhis-web-maintenance-dataadmin/removeLockExceptionBatch.vm	2013-06-25 13:58:55 +0000
@@ -8,7 +8,7 @@
 
         if(result)
         {
-            showWaitMessage( i18n_deleting_lock_exceptions, 0 );
+            setHeaderMessage( i18n_deleting_lock_exceptions, 0 );
 
             $.postJSON(
            	    "batchRemoveLockException.action",
@@ -27,11 +27,11 @@
        	                jQuery( "table.listTable tbody tr:even" ).addClass( "listRow" );
        					jQuery( "table.listTable tbody" ).trigger("update");
 
-       					showSuccessMessage( i18n_delete_success );
+       					setHeaderDelayMessage( i18n_delete_success );
            	    	}
            	    	else if ( json.response == "error" )
            	    	{
-       					showWarningMessage( json.message );
+       					setHeaderDelayMessage( json.message );
            	    	}
            	    }
            	);

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties	2013-04-22 10:01:08 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/resources/org/hisp/dhis/dd/i18n_module.properties	2013-06-25 13:58:55 +0000
@@ -98,7 +98,7 @@
 selected_data_elements=Selected data elements
 selected_indicators=Selected indicators
 available_indicators=Available indicators
-item_deleted_successfully=Item Deleted Successfully
+item_deleted_successfully=Item deleted successfully
 value=Value
 confirm_delete_indicator=Do you want to delete indicator?
 adding_indicator_failed=Adding indicator failed

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView.js	2012-02-06 03:35:35 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/dataElementGroupEditorView.js	2013-06-25 13:58:55 +0000
@@ -214,7 +214,7 @@
                         dataElementGroups[json.dataElementGroup.id] = json.dataElementGroup.name;
                         loadAvailableGroups();
                         jQuery( '#addDataElementGroupForm' ).dialog( 'close' );
-                        showSuccessMessage( i18n_update_success );
+                        setHeaderDelayMessage( i18n_update_success );
                     } );
                 } else
                 {
@@ -260,7 +260,7 @@
                         dataElementGroups[json.dataElementGroup.id] = json.dataElementGroup.name;
                         loadAvailableGroups();
                         jQuery( '#addDataElementGroupForm' ).dialog( 'close' );
-                        showSuccessMessage( i18n_update_success );
+                        setHeaderDelayMessage( i18n_update_success );
                     } );
                 } else
                 {
@@ -288,10 +288,10 @@
             {
                 dataElementGroups.splice( id, 1 );
                 loadAvailableGroups();
-                showSuccessMessage( json.message );
+                setHeaderDelayMessage( json.message );
             } else
             {
-                showErrorMessage( json.message );
+            	setHeaderDelayMessage( json.message );
             }
         } );
     }
@@ -311,10 +311,10 @@
             {
                 dataElementGroups.splice( id, 1 );
                 loadAvailableGroups();
-                showSuccessMessage( json.message );
+                setHeaderDelayMessage( json.message );
             } else
             {
-                showErrorMessage( json.message );
+            	setHeaderDelayMessage( json.message );
             }
         } );
     }
@@ -327,7 +327,7 @@
     jQuery.getJSON( "updateDataElementGroupEditor.action?id=" + id + "&"
             + toQueryString( '#view_1 #selectedDataElements', 'groupMembers' ), function( json )
     {
-        showSuccessMessage( i18n_update_success );
+    	setHeaderDelayMessage( i18n_update_success );
     } );
 }
 
@@ -380,6 +380,6 @@
     jQuery.getJSON( "asignGroupsForDataElement.action?dataElementId=" + dataElementId + "&"
             + toQueryString( '#view_2 #assignedGroups', 'dataElementGroups' ), function( json )
     {
-        showSuccessMessage( i18n_update_success );
+    	setHeaderDelayMessage( i18n_update_success );
     } );
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView.js	2011-12-06 07:58:47 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-datadictionary/src/main/webapp/dhis-web-maintenance-datadictionary/javascript/indicatorGroupEditorView.js	2013-06-25 13:58:55 +0000
@@ -178,7 +178,7 @@
                         indicatorGroups[id] = jQuery( '#addIndicatorGroupForm #name' ).val();
                         loadAvailableGroups();
                         jQuery( '#addIndicatorGroupForm' ).dialog( 'close' );
-                        showSuccessMessage( i18n_update_success );
+                        setHeaderDelayMessage( i18n_update_success );
                     } );
                 } else
                 {
@@ -209,10 +209,10 @@
             {
                 indicatorGroups.splice( id, 1 );
                 loadAvailableGroups();
-                showSuccessMessage( json.message );
+                setHeaderDelayMessage( json.message );
             } else
             {
-                showErrorMessage( json.message );
+            	setHeaderDelayMessage( json.message );
             }
         } );
     }
@@ -225,7 +225,7 @@
     jQuery.getJSON( "updateIndicatorGroupEditor.action?id=" + id + "&"
             + toQueryString( '#view_1 #selectedIndicators', 'groupMembers' ), function( json )
     {
-        showSuccessMessage( i18n_update_success );
+    	setHeaderDelayMessage( i18n_update_success );
     } );
 }
 
@@ -344,7 +344,7 @@
                         indicatorGroups[id] = jQuery( '#addIndicatorGroupForm #name' ).val();
                         loadAvailableGroups();
                         jQuery( '#addIndicatorGroupForm' ).dialog( 'close' );
-                        showSuccessMessage( i18n_update_success );
+                        setHeaderDelayMessage( i18n_update_success );
                     } );
                 } else
                 {
@@ -374,10 +374,10 @@
             {
                 indicatorGroups.splice( id, 1 );
                 loadAvailableGroups();
-                showSuccessMessage( json.message );
+                setHeaderDelayMessage( json.message );
             } else
             {
-                showErrorMessage( json.message );
+            	setHeaderDelayMessage( json.message );
             }
         } );
     }
@@ -390,6 +390,6 @@
     jQuery.getJSON( "asignGroupsForIndicator.action?indicatorId=" + id + "&"
             + toQueryString( '#view_2 #assignedGroups', 'indicatorGroups' ), function( json )
     {
-        showSuccessMessage( i18n_update_success );
+    	setHeaderDelayMessage( i18n_update_success );
     } );
 }

=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js	2012-04-23 11:43:13 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataset/src/main/webapp/dhis-web-maintenance-dataset/javascript/section.js	2013-06-25 13:58:55 +0000
@@ -49,7 +49,7 @@
 	} 
 	else 
 	{
-		showWarningMessage( i18n_please_select_dataset_categorycombo );		
+		setHeaderDelayMessage( i18n_please_select_dataset_categorycombo );		
 	}
 }
 

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/dashboard.js'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/dashboard.js	2012-06-18 06:14:19 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/dashboard.js	2013-06-25 13:58:55 +0000
@@ -22,7 +22,7 @@
 {
 	if ( $( "#selectionTree" ).length && selectionTreeSelection.getSelected().length == 0 )
 	{
-		setMessage( i18n_please_select_unit );
+		setHeaderDelayMessage( i18n_please_select_unit );
 		return true;
 	}
 	

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/patient.js'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/patient.js	2013-03-19 05:52:08 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/patient.js	2013-06-25 13:58:55 +0000
@@ -206,7 +206,7 @@
 			var elementName = $(this).attr('name');
 			if( elementName=='searchText' && jQuery( item ).val() == '')
 			{
-				showWarningMessage( i18n_specify_search_criteria );
+				setHeaderDelayMessage( i18n_specify_search_criteria );
 				flag = false;
 			}
 		});

=== modified file 'dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/sendSMS.js'
--- dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/sendSMS.js	2013-03-20 04:23:51 +0000
+++ dhis-2/dhis-web/dhis-web-sms/src/main/webapp/dhis-web-sms/javascript/sendSMS.js	2013-06-25 13:58:55 +0000
@@ -56,7 +56,7 @@
 
 		if ( list == '' )
 		{
-			showErrorMessage( i18n_no_recipient );
+			setHeaderDelayMessage( i18n_no_recipient );
 			return;
 		}
 		
@@ -76,7 +76,7 @@
 
 		if ( userGroup == null )
 		{
-			showErrorMessage( i18n_please_select_user_group );
+			setHeaderDelayMessage( i18n_please_select_user_group );
 			return;
 		}
 	}
@@ -84,7 +84,7 @@
 	{
 		if ( !isOrgunitSelected )
 		{
-			showErrorMessage( i18n_please_select_orgunit );
+			setHeaderDelayMessage( i18n_please_select_orgunit );
 			return;
 		}
 	}
@@ -111,10 +111,10 @@
 	}, function ( json )
 	{
 		if ( json.response == "success" ) {
-			showSuccessMessage( json.message );
+			setHeaderDelayMessage( json.message );
 		}
 		else {
-			showErrorMessage( json.message, 7000 );
+			setHeaderDelayMessage( json.message, 7000 );
 		}
 	} );
 }