------------------------------------------------------------ revno: 4264 committer: Lars Helge Overland <[email protected]> branch nick: dhis2 timestamp: Mon 2011-08-08 19:57:47 +0200 message: Changed doctype to HTML only (html5). Added a cache.manifest file for offline access. Added a new static property to the portal for indicating that a page should be available offline. added: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cache.manifest modified: dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalParamsInterceptor.java dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/WEB-INF/web.xml dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml
-- 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
=== added file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cache.manifest' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cache.manifest 1970-01-01 00:00:00 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cache.manifest 2011-08-08 17:57:47 +0000 @@ -0,0 +1,45 @@ +CACHE MANIFEST +# 2.4-SNAPSHOT Version 6 +NETWORK: +* +CACHE: +dhis-web-commons/css/light_blue/dom.js +dhis-web-commons/css/light_blue/head.png +dhis-web-commons/css/light_blue/light_blue.css +dhis-web-commons/css/light_blue/logo_background.png +dhis-web-commons/css/light_blue/logo_banner.png +dhis-web-commons/css/light_blue/logo_left.png +dhis-web-commons/css/light_blue/logo_right.png +dhis-web-commons/css/light_blue/logo_separator.png +dhis-web-commons/css/widgets.css +dhis-web-commons/javascripts/jQuery/jquery-1.6.1.min.js +dhis-web-commons/javascripts/jQuery/jquery.metadata.js +dhis-web-commons/javascripts/jQuery/jquery.glob.js +dhis-web-commons/javascripts/jQuery/jquery.date.js +dhis-web-commons/javascripts/jQuery/jquery.tmpl.js +dhis-web-commons/javascripts/commons.js +dhis-web-commons/javascripts/lists.js +dhis-web-commons/javascripts/periodType.js +dhis-web-commons/javascripts/date.js +main.js +dhis-web-commons/ouwt/ouwt.js +dhis-web-commons/fonts/LiberationSans-Regular-webfont.eot +dhis-web-commons/fonts/LiberationSans-Regular-webfont.woff +dhis-web-commons/fonts/LiberationSans-Regular-webfont.ttf +dhis-web-commons/fonts/LiberationSans-Regular-webfont.svg +dhis-web-commons/fonts/LiberationSans-Bold-webfont.eot +dhis-web-commons/fonts/LiberationSans-Bold-webfont.woff +dhis-web-commons/fonts/LiberationSans-Bold-webfont.ttf +dhis-web-commons/fonts/LiberationSans-Bold-webfont.svg +dhis-web-commons/images/treeview-gray-line.gif +images/show_menu.png +images/hide_menu.png +images/search.png +images/colapse.png +images/help.png +images/hide.png +images/ajax-loader-circle.gif +dhis-web-dataentry/javascript/entry.js +dhis-web-dataentry/javascript/form.js +dhis-web-dataentry/javascript/history.js +dhis-web-dataentry/style/dhis-web-dataentry.css \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm' --- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2011-08-08 15:09:46 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2011-08-08 17:57:47 +0000 @@ -1,5 +1,5 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd";> -<html> +<!DOCTYPE HTML> +<html#if( $offline && $offline == "true" ) manifest="../cache.manifest"#end> <head> <title>DHIS 2</title> <link type="text/css" rel="stylesheet" media="screen" href="../dhis-web-commons/javascripts/jQuery/ui/css/redmond/jquery-ui-1.8.12.custom.css" /> === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalParamsInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalParamsInterceptor.java 2011-05-05 21:15:45 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/webportal/interceptor/XWorkPortalParamsInterceptor.java 2011-08-08 17:57:47 +0000 @@ -72,14 +72,10 @@ public void destroy() { - // TODO Auto-generated method stub - } public void init() { - // TODO Auto-generated method stub - } public String intercept( ActionInvocation actionInvocation ) === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml' --- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2011-08-08 15:09:46 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/beans.xml 2011-08-08 17:57:47 +0000 @@ -46,6 +46,7 @@ <value>page</value> <value>menu</value> <value>menuTreeHeight</value> + <value>offline</value> </set> </property> <property name="commaSeparatedParams"> === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml 2011-07-28 07:34:34 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/resources/struts.xml 2011-08-08 17:57:47 +0000 @@ -16,6 +16,7 @@ <param name="menuTreeHeight">420</param> <param name="javascripts">../dhis-web-commons/ouwt/ouwt.js,javascript/form.js,javascript/entry.js,javascript/history.js</param> <param name="stylesheets">style/dhis-web-dataentry.css</param> + <param name="offline">true</param> </action> <action name="getDataValues" class="org.hisp.dhis.de.action.GetDataValuesForDataSetAction"> === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/WEB-INF/web.xml' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/WEB-INF/web.xml 2011-03-02 19:07:04 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/WEB-INF/web.xml 2011-08-08 17:57:47 +0000 @@ -13,6 +13,11 @@ <param-value>ghostAdmin</param-value> </context-param> + <mime-mapping> + <extension>manifest</extension> + <mime-type>text/cache-manifest</mime-type> + </mime-mapping> + <filter> <filter-name>RedirectFilter</filter-name> <filter-class>org.hisp.dhis.servlet.filter.HttpRedirectFilter</filter-class> === modified file 'dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js' --- dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2011-08-05 14:45:27 +0000 +++ dhis-2/dhis-web/dhis-web-dataentry/src/main/webapp/dhis-web-dataentry/javascript/form.js 2011-08-08 17:57:47 +0000 @@ -40,6 +40,12 @@ var COLOR_ORANGE = '#ff6600'; var COLOR_WHITE = '#ffffff'; +//Page init + +$( document ).ready( function() { + selection.setListenerFunction( organisationUnitSelected ); +} ); + function addEventListeners() { $( '[name="entryfield"]' ).each( function( i ) @@ -211,8 +217,6 @@ } } -selection.setListenerFunction( organisationUnitSelected ); - // ----------------------------------------------------------------------------- // Next/Previous Periods Selection // ----------------------------------------------------------------------------- === modified file 'dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml' --- dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml 2011-03-02 19:07:04 +0000 +++ dhis-2/dhis-web/dhis-web-portal/src/main/webapp/WEB-INF/web.xml 2011-08-08 17:57:47 +0000 @@ -13,6 +13,11 @@ <param-value>databaseAdmin</param-value> </context-param> + <mime-mapping> + <extension>manifest</extension> + <mime-type>text/cache-manifest</mime-type> + </mime-mapping> + <filter> <filter-name>RedirectFilter</filter-name> <filter-class>org.hisp.dhis.servlet.filter.HttpRedirectFilter</filter-class>
_______________________________________________ Mailing list: https://launchpad.net/~dhis2-devs Post to : [email protected] Unsubscribe : https://launchpad.net/~dhis2-devs More help : https://help.launchpad.net/ListHelp
