dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 8775
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2012-10-30 16:35:11 +0100
message:
  mobile: loader fixes
modified:
  dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/message.vm
  dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/messages.vm
  dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/new-message.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-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/message.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/message.vm	2012-10-30 14:02:06 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/message.vm	2012-10-30 15:35:11 +0000
@@ -32,8 +32,8 @@
                 location.reload(true);
             }).error(function () {
                 $.mobile.loading( 'show', {
-                    text: 'Unable to send reply, please try again later',
-                    textonly: true
+                    html: '<h1>Unable to send reply, please try again later</h1>',
+                    textVisible: true
                 });
 
                 setTimeout( function() {
@@ -60,8 +60,8 @@
             bindSubmitHandler();
         }).error(function () {
             $.mobile.loading( 'show', {
-                text: 'Unable to load message, please try again later',
-                textonly: true
+                html: '<h1>Unable to load message, please try again later</h1>',
+                textVisible: true
             });
 
             setTimeout( function() {

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/messages.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/messages.vm	2012-10-30 14:02:06 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/messages.vm	2012-10-30 15:35:11 +0000
@@ -20,8 +20,8 @@
             }
         }).error(function() {
             $.mobile.loading( 'show', {
-                text: 'Unable to get inbox, please try again later',
-                textonly: true
+                html: '<h1>Unable to get inbox, please try again later</h1>',
+                textVisible: true
             });
 
             setTimeout( function() {

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/new-message.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/new-message.vm	2012-10-30 14:02:06 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/new-message.vm	2012-10-30 15:35:11 +0000
@@ -187,8 +187,8 @@
                 $.mobile.hidePageLoadingMsg();
             }).error(function() {
                 $.mobile.loading( 'show', {
-                    text: 'Unable to search, please try again later',
-                    textonly: true
+                    html: '<h1>Unable to search, please try again later</h1>',
+                    textVisible: true
                 });
 
                 setTimeout( function() {
@@ -215,8 +215,8 @@
 
         if( !message.subject.length > 0 ) {
             $.mobile.loading( 'show', {
-                text: 'Please fill in subject',
-                textonly: true
+                html: '<h1>Please fill in subject</h1>',
+                textVisible: true
             });
 
             setTimeout( function() {
@@ -228,8 +228,8 @@
 
         if( !message.text.length > 0 ) {
             $.mobile.loading( 'show', {
-                text: 'Please fill in text',
-                textonly: true
+                html: '<h1>Please fill in text</h1>',
+                textVisible: true
             });
 
             setTimeout( function() {
@@ -257,8 +257,15 @@
         });
 
         if( !( message.organisationUnits.length > 0 || message.users.length > 0 || message.userGroups.length > 0 ) ) {
-            $.mobile.showPageLoadingMsg( $.mobile.pageLoadErrorMessageTheme, "Please add at least one recipient", true );
-            setTimeout( $.mobile.hidePageLoadingMsg, 1500 );
+            $.mobile.loading( 'show', {
+                html: '<h1>Please add at least one recipient</h1>',
+                textVisible: true
+            });
+
+            setTimeout( function() {
+                $.mobile.loading( 'hide' );
+            }, 1500);
+
             return false;
         }
 
@@ -273,8 +280,8 @@
             window.location.href = '../messages';
         }).error(function() {
             $.mobile.loading( 'show', {
-                text: 'Unable to send message, please try again later',
-                textonly: true
+                html: '<h1>Unable to send message, please try again later</h1>',
+                textVisible: true
             });
 
             setTimeout( function() {