dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 16726
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Tue 2014-09-16 01:04:48 +0200
message:
  Included font awesome in data entry / cache manifest so it can be used in custom forms
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/RestoreOptions.java
  dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.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-services/dhis-service-core/src/main/java/org/hisp/dhis/security/RestoreOptions.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/RestoreOptions.java	2014-03-18 08:10:10 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/security/RestoreOptions.java	2014-09-15 23:04:48 +0000
@@ -76,7 +76,7 @@
 
     static public RestoreOptions getRestoreOptions( String token )
     {
-        for (RestoreOptions ro : RestoreOptions.values())
+        for ( RestoreOptions ro : RestoreOptions.values() )
         {
             if ( token.startsWith( ro.getTokenPrefix() ) )
             {

=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm	2014-09-09 23:57:34 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/cacheManifest.vm	2014-09-15 23:04:48 +0000
@@ -5,6 +5,7 @@
 NETWORK:
 *
 CACHE:
+../dhis-web-commons/font-awesome/css/font-awesome.min.css?_rev=$!{buildRevision}
 ../dhis-web-commons/css/light_blue/light_blue.css?_rev=$!{buildRevision}
 ../dhis-web-commons/css/light_blue/logo_banner.png
 ../dhis-web-commons/css/india/india.css?_rev=$!{buildRevision}