=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/FileController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/FileController.java 2014-07-09 09:08:45 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/FileController.java 2014-07-09 09:26:23 +0000
@@ -99,7 +99,10 @@
// Custom style
// -------------------------------------------------------------------------
- @RequestMapping( value = "/style", method = RequestMethod.GET )
+ /**
+ * The style/external mapping enables style to be reached from login page / before authentication.
+ */
+ @RequestMapping( value = { "/style", "/style/external" }, method = RequestMethod.GET )
public void getCustomStyle( HttpServletResponse response, Writer writer )
throws IOException
{
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm 2014-07-09 07:48:02 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm 2014-07-09 09:26:23 +0000
@@ -9,7 +9,7 @@
-
+
$!encoder.htmlEncode( ${applicationTitle} )
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2014-07-09 09:08:45 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2014-07-09 09:26:23 +0000
@@ -23,7 +23,7 @@
-
+