dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #04851
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 1620: Minor fix
------------------------------------------------------------
revno: 1620
committer: Lars Helge Oeverland <larshelge@xxxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-03-11 13:12:36 +0100
message:
Minor fix
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js
dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.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-03-11 11:56:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/util/commons.js 2010-03-11 12:12:36 +0000
@@ -368,6 +368,10 @@
return htmlEncode( document.getElementById( fieldId ).value );
}
+// -----------------------------------------------------------------------------
+// Message, warning, info, headerMessage
+// -----------------------------------------------------------------------------
+
/**
* Shows the message span and sets the message as text.
*
@@ -440,6 +444,15 @@
}
/**
+ * Sets the header message and hides it after 3 seconds.
+ */
+function setHeaderDelayMessage( message )
+{
+ setHeaderMessage( message );
+ setTimeout( "hideHeaderMessage();", 3000 );
+}
+
+/**
* Hides the header message div.
*/
function hideHeaderMessage()
=== modified file 'dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js'
--- dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js 2010-03-11 11:56:49 +0000
+++ dhis-2/dhis-web/dhis-web-reporting/src/main/webapp/dhis-web-reporting/javascript/chart.js 2010-03-11 12:12:36 +0000
@@ -7,7 +7,7 @@
function runAndViewChart( chartId )
{
- setHeaderWaitMessage( "Please wait" );
+ setHeaderWaitMessage( i18n_please_wait );
tempChartId = chartId;