← Back to team overview

dhis2-devs team mailing list archive

  1. dhis2-devs team
  2. Mailing list archive
  3. Message #19618

[Branch ~dhis2-devs-core/dhis2/trunk] Rev 8636: mobile: changed location of application-cache file

  Thread Previous • Date Previous • • Thread Next 
------------------------------------------------------------
revno: 8636
committer: Morten Olav Hansen <mortenoh@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2012-10-22 11:18:33 +0200
message:
  mobile: changed location of application-cache file
removed:
  dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/dhis-web-mobile-resources/manifest.appcache
added:
  dhis-2/dhis-web/dhis-web-mobile/src/main/resources/dhis-mobile-manifest.appcache
modified:
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.validate.js
  dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java
  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


--
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/jQuery/jquery.validate.js'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.validate.js	2011-04-01 20:21:05 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/javascripts/jQuery/jquery.validate.js	2012-10-22 09:18:33 +0000
@@ -262,7 +262,7 @@
 		$.extend( $.validator.defaults, settings );
 	},
 
-	/* -- Custom code by mortenoh -- */
+	/* -- Custom code by    mortenoh -- */
 	setMessages : function( messages ) {
 		this.messages = messages;
 	},

=== modified file 'dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java	2012-10-10 07:42:55 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/java/org/hisp/dhis/web/mobile/controller/MobileController.java	2012-10-22 09:18:33 +0000
@@ -27,13 +27,19 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+import org.apache.commons.io.IOUtils;
 import org.hisp.dhis.api.utils.ContextUtils;
+import org.springframework.core.io.ClassPathResource;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
 
 /**
  * @author Morten Olav Hansen <mortenoh@xxxxxxxxx>
@@ -117,4 +123,12 @@
 
         return "base";
     }
+
+    @RequestMapping( value = "/app-cache" )
+    public void appCache( HttpServletResponse response ) throws IOException
+    {
+        response.setContentType( "text/cache-manifest" );
+        InputStream inputStream = new ClassPathResource( "dhis-mobile-manifest.appcache" ).getInputStream();
+        IOUtils.copy( inputStream, response.getOutputStream() );
+    }
 }

=== added file 'dhis-2/dhis-web/dhis-web-mobile/src/main/resources/dhis-mobile-manifest.appcache'
--- dhis-2/dhis-web/dhis-web-mobile/src/main/resources/dhis-mobile-manifest.appcache	1970-01-01 00:00:00 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/resources/dhis-mobile-manifest.appcache	2012-10-22 09:18:33 +0000
@@ -0,0 +1,26 @@
+CACHE MANIFEST
+# Version: 13
+
+CACHE:
+../mobile/index
+../mobile/data-entry
+../dhis-web-commons/javascripts/jQuery/jquery.min.js?v=1.7.1
+../dhis-web-commons/i18nJavaScript.action
+../dhis-web-commons/javascripts/jQuery/jquery.glob.js
+../dhis-web-commons/javascripts/jQuery/jquery.date.js
+../dhis-web-commons/javascripts/date.js
+../dhis-web-commons/javascripts/periodType.js
+../dhis-web-commons/css/light_blue/logo_banner.png
+../dhis-web-mobile-resources/css/jquery.mobile.min.css?v=1.1.1
+../dhis-web-mobile-resources/css/images/ajax-loader.gif
+../dhis-web-mobile-resources/css/images/ajax-loader.png
+../dhis-web-mobile-resources/css/images/icons-18-white.png
+../dhis-web-mobile-resources/css/images/icons-18-black.png
+../dhis-web-mobile-resources/css/images/icons-36-white.png
+../dhis-web-mobile-resources/css/images/icons-36-black.png
+../dhis-web-mobile-resources/js/underscore.min.js?v=1.3.3
+../dhis-web-mobile-resources/js/jquery.mobile.min.js?v=1.1.1
+../dhis-web-mobile-resources/js/dhis2.storage.js
+
+NETWORK:
+*

=== 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:21:22 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/base.vm	2012-10-22 09:18:33 +0000
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html manifest="../dhis-web-mobile-resources/manifest.appcache">
+<html manifest="app-cache">
 <!--  <html> -->
 
 <head>

=== 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:23:00 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/WEB-INF/dhis-web-mobile-velocity/index.vm	2012-10-22 09:18:33 +0000
@@ -33,7 +33,7 @@
 
         getDashboard().always(function() {
             $('section[data-role="content"] ul').listview('refresh');
-        }).then( fm.getMetaData().then( fm.uploadDataValueSets()).always( $.mobile.hidePageLoadingMsg ));
+        }).then( fm.getMetaData().then( fm.uploadDataValueSets() ).always( $.mobile.hidePageLoadingMsg ));
     })
 </script>
 

=== removed 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 22:21:22 +0000
+++ dhis-2/dhis-web/dhis-web-mobile/src/main/webapp/dhis-web-mobile-resources/manifest.appcache	1970-01-01 00:00:00 +0000
@@ -1,26 +0,0 @@
-CACHE MANIFEST
-# Version: 10
-
-CACHE:
-../mobile/index
-../mobile/data-entry
-../dhis-web-commons/javascripts/jQuery/jquery.min.js?v=1.7.1
-../dhis-web-commons/i18nJavaScript.action
-../dhis-web-commons/javascripts/jQuery/jquery.glob.js
-../dhis-web-commons/javascripts/jQuery/jquery.date.js
-../dhis-web-commons/javascripts/date.js
-../dhis-web-commons/javascripts/periodType.js
-../dhis-web-commons/css/light_blue/logo_banner.png
-css/jquery.mobile.min.css?v=1.1.1
-css/images/ajax-loader.gif
-css/images/ajax-loader.png
-css/images/icons-18-white.png
-css/images/icons-18-black.png
-css/images/icons-36-white.png
-css/images/icons-36-black.png
-js/underscore.min.js?v=1.3.3
-js/jquery.mobile.min.js?v=1.1.1
-js/dhis2.storage.js
-
-NETWORK:
-*
  Thread Previous • Date Previous • • Thread Next