+ #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 2014-06-04 14:37:34 +0000 +++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/main.vm 2014-06-26 14:38:54 +0000 @@ -99,11 +99,17 @@ + #if ( $keyCustomLoginPageLogo ) + #set( $logoBanner = "../external-static/logo_banner.png" ) + #else + #set( $logoBanner = "../dhis-web-commons/css/${stylesheetDirectory}/logo_banner.png" ) + #end + #parse( "macros.vm" )

$encoder.htmlEncode( $applicationTitle ) === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java 2014-05-15 13:16:11 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java 2014-06-26 14:38:54 +0000 @@ -48,6 +48,8 @@ public class SystemSettingInterceptor implements Interceptor { + private static final String DATE_FORMAT = "dateFormat"; + // ------------------------------------------------------------------------- // Dependencies // ------------------------------------------------------------------------- @@ -88,7 +90,7 @@ map.put( KEY_CALENDAR, systemSettingManager.getSystemSetting( KEY_CALENDAR, DEFAULT_CALENDAR ) ); map.put( KEY_DATE_FORMAT, systemSettingManager.getSystemSetting( KEY_DATE_FORMAT, DEFAULT_DATE_FORMAT ) ); - map.put( "dateFormat", calendarService.getSystemDateFormat() ); + map.put( DATE_FORMAT, calendarService.getSystemDateFormat() ); map.put( KEY_CACHE_STRATEGY, systemSettingManager.getSystemSetting( KEY_CACHE_STRATEGY, DEFAULT_CACHE_STRATEGY ) ); map.put( KEY_ANALYTICS_MAX_LIMIT, systemSettingManager.getSystemSetting( KEY_ANALYTICS_MAX_LIMIT, DEFAULT_ANALYTICS_MAX_LIMIT ) ); map.put( KEY_APPLICATION_TITLE, systemSettingManager.getSystemSetting( KEY_APPLICATION_TITLE, DEFAULT_APPLICATION_TITLE ) ); @@ -113,7 +115,8 @@ map.put( KEY_OPENID_PROVIDER_LABEL, systemSettingManager.getSystemSetting( KEY_OPENID_PROVIDER_LABEL ) ); map.put( KEY_CAN_GRANT_OWN_USER_AUTHORITY_GROUPS, systemSettingManager.getSystemSetting( KEY_CAN_GRANT_OWN_USER_AUTHORITY_GROUPS, false ) ); map.put( KEY_ONLY_MANAGE_WITHIN_USER_GROUPS, systemSettingManager.getSystemSetting( KEY_ONLY_MANAGE_WITHIN_USER_GROUPS, false ) ); - + map.put( KEY_CUSTOM_LOGIN_PAGE_LOGO, systemSettingManager.getSystemSetting( KEY_CUSTOM_LOGIN_PAGE_LOGO, false ) ); + map.put( KEY_CUSTOM_TOP_MENU_LOGO, systemSettingManager.getSystemSetting( KEY_CUSTOM_TOP_MENU_LOGO, false ) ); map.put( SYSPROP_PORTAL, defaultIfEmpty( System.getProperty( SYSPROP_PORTAL ), String.valueOf( false ) ) ); invocation.getStack().push( map ); === 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-04-23 10:19:42 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/META-INF/dhis/security.xml 2014-06-26 14:38:54 +0000 @@ -23,6 +23,7 @@ + === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAppearanceSettingsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAppearanceSettingsAction.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/GetAppearanceSettingsAction.java 2014-06-26 14:38:54 +0000 @@ -122,30 +122,14 @@ return availableLocales; } -// private Locale currentLocale; -// -// public Locale getCurrentLocale() -// { -// return currentLocale; -// } - // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- public String execute() { - // --------------------------------------------------------------------- - // Get available UI locales - // --------------------------------------------------------------------- availableLocales = localeManager.getAvailableLocales(); - //currentLocale = localeManager.getCurrentLocale(); - - // --------------------------------------------------------------------- - // Others - // --------------------------------------------------------------------- - styles = styleManager.getStyles(); currentStyle = styleManager.getSystemStyle(); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAppearanceSettingsAction.java' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAppearanceSettingsAction.java 2014-03-18 08:10:10 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/java/org/hisp/dhis/settings/action/system/SetAppearanceSettingsAction.java 2014-06-26 14:38:54 +0000 @@ -33,7 +33,7 @@ import static org.hisp.dhis.setting.SystemSettingManager.KEY_APPLICATION_NOTIFICATION; import static org.hisp.dhis.setting.SystemSettingManager.KEY_APPLICATION_FOOTER; import static org.hisp.dhis.setting.SystemSettingManager.KEY_FLAG; -import static org.hisp.dhis.setting.SystemSettingManager.KEY_START_MODULE; +import static org.hisp.dhis.setting.SystemSettingManager.*; import org.apache.commons.lang.StringUtils; import org.hisp.dhis.i18n.I18n; @@ -141,6 +141,20 @@ this.localeSelect = localeSelect; } + private boolean customLoginPageLogo; + + public void setCustomLoginPageLogo( boolean customLoginPageLogo ) + { + this.customLoginPageLogo = customLoginPageLogo; + } + + private boolean customTopMenuLogo; + + public void setCustomTopMenuLogo( boolean customTopMenuLogo ) + { + this.customTopMenuLogo = customTopMenuLogo; + } + // ------------------------------------------------------------------------- // Action implementation // ------------------------------------------------------------------------- @@ -168,6 +182,8 @@ systemSettingManager.saveSystemSetting( KEY_APPLICATION_FOOTER + localeSelect, applicationFooter ); systemSettingManager.saveSystemSetting( KEY_FLAG, flag ); systemSettingManager.saveSystemSetting( KEY_START_MODULE, startModule ); + systemSettingManager.saveSystemSetting( KEY_CUSTOM_LOGIN_PAGE_LOGO, customLoginPageLogo ); + systemSettingManager.saveSystemSetting( KEY_CUSTOM_TOP_MENU_LOGO, customTopMenuLogo ); styleManager.setSystemStyle( currentStyle ); message = i18n.getString( "settings_updated" ); === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties 2014-06-20 15:48:37 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/resources/org/hisp/dhis/settings/i18n_module.properties 2014-06-26 14:38:54 +0000 @@ -102,4 +102,7 @@ users_must_belong_to_a_group_controlled_by_the_user_manager=Users must belong to a group controlled by the user manager object_not_deleted_associated_by_objects=Object not deleted because it is associated by objects of type analytics_max_limit=Maximum number of analytics records -unlimited=Unlimited \ No newline at end of file +unlimited=Unlimited +uses_image_from=will use image from +custom_login_page_logo=Custom login page logo +custom_top_menu_logo=Custom top menu logo \ No newline at end of file === modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettings.vm' --- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettings.vm 2013-10-09 13:47:12 +0000 +++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-settings/src/main/webapp/dhis-web-maintenance-settings/systemAppearanceSettings.vm 2014-06-26 14:38:54 +0000 @@ -7,8 +7,10 @@ applicationNotification: getFieldValue( 'applicationNotification' ), applicationFooter: getFieldValue( 'applicationFooter' ), currentStyle: getFieldValue( 'currentStyle' ), + startModule: getFieldValue( 'startModule' ), flag: getFieldValue( 'flag' ), - startModule: getFieldValue( 'startModule' ), + customLoginPageLogo: $( '#customLoginPageLogo' ).is( ':checked' ), + customTopMenuLogo: $( '#customTopMenuLogo' ).is( ':checked' ), localeSelect: getFieldValue( 'localeSelect' ) }, function( json ) { if ( json.response == "success" ) { @@ -58,6 +60,17 @@

$i18n.getString( "start_page" )

+ +

$i18n.getString( "flag" )

@@ -69,15 +82,16 @@

$i18n.getString( "start_page" )

+ + $i18n.getString( "custom_login_page_logo" ) (88x24) - $i18n.getString( "uses_image_from" ):
+ <base url>/external-static/logo_front.png +

- + + $i18n.getString( "custom_top_menu_logo" ) (64x17) - $i18n.getString( "uses_image_from" ):
+ <base url>/external-static/logo_banner.png