=== 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 2011-08-19 07:40:22 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2011-08-19 08:56:53 +0000 @@ -509,6 +509,8 @@ */ function setHeaderMessage( message ) { + window.clearTimeout( headerMessageTimeout ); + $( 'div#headerMessage' ).html( message ); if ( isHeaderMessageHidden() ) @@ -525,6 +527,8 @@ */ function setHeaderWaitMessage( message ) { + window.clearTimeout( headerMessageTimeout ); + $( 'div#headerMessage' ).html( message + "   " + _loading_bar_html ); if ( isHeaderMessageHidden() ) @@ -540,7 +544,7 @@ { setHeaderMessage( message ); - window.clearTimeout( headerMessageTimeout ); // Clear waiting invocations + window.clearTimeout( headerMessageTimeout ); headerMessageTimeout = window.setTimeout( "hideHeaderMessage();", 8000 ); } @@ -552,7 +556,7 @@ { setHeaderWaitMessage( message ); - window.clearTimeout( headerMessageTimeout ); // Clear waiting invocations + window.clearTimeout( headerMessageTimeout ); headerMessageTimeout = window.setTimeout( "hideHeaderMessage();", 8000 ); } === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js 2011-08-18 07:55:27 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/entry.js 2011-08-19 08:56:53 +0000 @@ -198,7 +198,7 @@ */ function alertField( fieldId, alertMessage ) { - $( fieldId ).css( fieldId, COLOR_YELLOW ); + $( fieldId ).css( 'background-color', COLOR_YELLOW ); $( fieldId ).select(); $( fieldId ).focus(); window.alert( alertMessage );