=== 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 2015-04-07 09:42:13 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/security/login.vm 2015-10-12 15:13:12 +0000 @@ -33,11 +33,7 @@
- #if ( $keyCustomLoginPageLogo ) - - #else - - #end +
=== 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 2015-09-30 18:50:42 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2015-10-12 15:13:12 +0000 @@ -104,11 +104,7 @@ - #if ( $keyCustomTopMenuLogo ) - #set( $logoBanner = "../external-static/logo_banner.png" ) - #else - #set( $logoBanner = "../dhis-web-commons/css/${stylesheetDirectory}/logo_banner.png" ) - #end + #set( $logoBanner = "/api/staticContent/logo_banner" ) #parse( "macros.vm" )