← Back to team overview

dhis2-devs team mailing list archive

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8618: mobile: disable messages/settings if client is offline

 

------------------------------------------------------------
revno: 8618
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-10-22 00:21:22 +0200
message:
  mobile: disable messages/settings if client is offline
modified:
  dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/base.vm
  dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm
  dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/dhis-web-mobile-resources/manifest.appcache


--
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/base.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/base.vm	2012-10-21 22:00:21 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/base.vm	2012-10-21 22:21:22 +0000
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
-<!--  <html manifest="../dhis-web-mobile-resources/manifest.appcache"> -->
-<html>
+<html manifest="../dhis-web-mobile-resources/manifest.appcache">
+<!--  <html> -->
 
 <head>
 	<title>DHIS2</title>

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm	2012-10-21 22:11:28 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm	2012-10-21 22:21:22 +0000
@@ -19,10 +19,12 @@
             dataType: 'json'
         }).success(function(data) {
             if( data.unreadMessageConversation > 0 ) {
-                $('#messages a').append("<span class='ui-li-count'>" + data.unreadMessageConversation + "</span>");
+                $( '#messages a' ).append("<span class='ui-li-count'>" + data.unreadMessageConversation + "</span>");
             }
         }).error(function() {
-            $('#messages a').append("<span class='ui-li-count'>Offline</span>");
+            // $('#messages a').append("<span class='ui-li-count'>Offline</span>");
+            $( '#messages').addClass('ui-disabled');
+            $( '#settings').addClass('ui-disabled');
             $.mobile.hidePageLoadingMsg();
         });
     }

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/dhis-web-mobile-resources/manifest.appcache'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/dhis-web-mobile-resources/manifest.appcache	2012-10-21 17:43:34 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/dhis-web-mobile-resources/manifest.appcache	2012-10-21 22:21:22 +0000
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Version: 7
+# Version: 10
 
 CACHE:
 ../mobile/index