dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #11978
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 3528: Centralized ajax loader html
------------------------------------------------------------
revno: 3528
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Sat 2011-05-07 15:17:10 +0200
message:
Centralized ajax loader html
removed:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/ajax-loader-preview.gif
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/ajax-loader.gif
renamed:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/ajax-loader-bar-small.gif => dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/ajax-loader-bar.gif
modified:
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.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/javascripts/commons.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2011-04-15 16:34:17 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/commons.js 2011-05-07 13:17:10 +0000
@@ -4,6 +4,8 @@
// -----------------------------------------------------------------------------
var headerMessageTimeout = -1;
+var _loading_bar_html = "<img src='../images/ajax-loader-bar.gif'>";
+var _loading_circle_html = "<img src='../images/ajax-loader-circle.gif'>";
/**
* Go back using the document.referrer.
@@ -510,7 +512,7 @@
*/
function setWaitMessage( message )
{
- setMessage( message + " <img src='../../images/ajax-loader-bar-small.gif'>" );
+ setMessage( message + " " + _loading_bar_html );
}
/**
@@ -553,7 +555,7 @@
*/
function setHeaderWaitMessage( message )
{
- $( 'div#headerMessage' ).html( message + " <img src='../../images/ajax-loader-bar-small.gif'>" );
+ $( 'div#headerMessage' ).html( message + " " + _loading_bar_html );
$( 'div#headerMessage' ).slideDown( 'fast' );
}
@@ -565,7 +567,7 @@
*/
function updateHeaderWaitMessage( message )
{
- $( 'div#headerMessage' ).html( message + " <img src='../../images/ajax-loader-bar-small.gif'>" );
+ $( 'div#headerMessage' ).html( message + " " + _loading_bar_html );
}
/**
=== renamed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/ajax-loader-bar-small.gif' => 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/ajax-loader-bar.gif'
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/ajax-loader-preview.gif'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/ajax-loader-preview.gif 2009-11-30 04:26:38 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/ajax-loader-preview.gif 1970-01-01 00:00:00 +0000 differ
=== removed file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/ajax-loader.gif'
Binary files dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/ajax-loader.gif 2009-03-09 08:28:19 +0000 and dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/images/ajax-loader.gif 1970-01-01 00:00:00 +0000 differ