Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== diff -u -raaca705a11ef49c4f5eacfff51ac07510fbac65b -rb6c65c755217e6099fb5a3769a1ac049d9fcfaf3 --- lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision aaca705a11ef49c4f5eacfff51ac07510fbac65b) +++ lams_admin/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision b6c65c755217e6099fb5a3769a1ac049d9fcfaf3) @@ -530,6 +530,6 @@ config.failed.attempts =Number of failed logins before locking account config.lock.out.time =Number of minutes to lock account for config.default.html.theme =Default theme +config.show.timezone.warning =Show warning when user's LAMS timezone does not match their computer/device. - #======= End labels: Exported 524 labels for en AU ===== Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java =================================================================== diff -u -rfebc5ec394566f98439ce776a0be320b34310b0a -rb6c65c755217e6099fb5a3769a1ac049d9fcfaf3 --- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (.../IndexAction.java) (revision febc5ec394566f98439ce776a0be320b34310b0a) +++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java (.../IndexAction.java) (revision b6c65c755217e6099fb5a3769a1ac049d9fcfaf3) @@ -123,6 +123,18 @@ request.setAttribute("lamsCommunityEnabled", reg.isEnableLamsCommunityIntegration()); } + // only show the growl warning the first time after a user has logged in & if turned on in configuration + Boolean tzWarning = Configuration.getAsBoolean(ConfigurationKeys.SHOW_TIMEZONE_WARNING); + request.setAttribute("showTimezoneWarning", tzWarning); + request.setAttribute("showTimezoneWarningPopup", false); + if ( tzWarning ) { + Boolean ssWarningShown = (Boolean) ss.getAttribute("timezoneWarningShown"); + if ( ! Boolean.TRUE.equals(ssWarningShown) ) { + ss.setAttribute("timezoneWarningShown", Boolean.TRUE); + request.setAttribute("showTimezoneWarningPopup", true); + } + } + List favoriteOrganisations = userManagementService.getFavoriteOrganisationsByUser(userDTO.getUserID()); request.setAttribute("favoriteOrganisations", favoriteOrganisations); request.setAttribute("activeOrgId", user.getLastVisitedOrganisationId()); Index: lams_central/web/main.jsp =================================================================== diff -u -r2079d168be1ddba5613804efe9f03b2b87a9b260 -rb6c65c755217e6099fb5a3769a1ac049d9fcfaf3 --- lams_central/web/main.jsp (.../main.jsp) (revision 2079d168be1ddba5613804efe9f03b2b87a9b260) +++ lams_central/web/main.jsp (.../main.jsp) (revision b6c65c755217e6099fb5a3769a1ac049d9fcfaf3) @@ -26,6 +26,7 @@ + @@ -98,13 +99,33 @@ } + var current_date = new Date( ); var client_gmt_offset_minutes = current_date.getTimezoneOffset( ); $('#offset').html( client_gmt_offset_minutes / 60 ); var lams_gmt_offset_minutes = ( + ) / 60000; if ( client_gmt_offset_minutes != -lams_gmt_offset_minutes ) { $('#timezoneWarning').html( '
'); - } + + $.blockUI({ + message: '

', + fadeIn: 700, + fadeOut: 700, + width: 500, + timeout: 8000, + showOverlay: false, + centerY: false, + css: { + backgroundColor: '#000', + '-webkit-border-radius': '10px', + '-moz-border-radius': '10px', + opacity: .6, + color: '#fff' + } + }); +
+ } +
}); Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040082.sql =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040082.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040082.sql (revision b6c65c755217e6099fb5a3769a1ac049d9fcfaf3) @@ -0,0 +1,10 @@ +SET AUTOCOMMIT = 0; +set FOREIGN_KEY_CHECKS = 0; + +-- LDEV-4144 Timezone warning +insert into lams_configuration (config_key, config_value, description_key, header_name, format, required) +values ('ShowTimezoneWarning','true', 'config.show.timezone.warning', 'config.header.features', 'BOOLEAN', 1); + +COMMIT; +SET AUTOCOMMIT = 1; +set FOREIGN_KEY_CHECKS = 1; \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java =================================================================== diff -u -r2bd42e9a3a1774b3d51a0295f55f7184273848af -rb6c65c755217e6099fb5a3769a1ac049d9fcfaf3 --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision 2bd42e9a3a1774b3d51a0295f55f7184273848af) +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java (.../ConfigurationKeys.java) (revision b6c65c755217e6099fb5a3769a1ac049d9fcfaf3) @@ -282,4 +282,7 @@ public static String LOCK_OUT_TIME = "LockOutTime"; + // LDEV-4144 + public static String SHOW_TIMEZONE_WARNING = "ShowTimezoneWarning"; + }