Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v diff -u -r1.100.2.24 -r1.100.2.25 --- lams_admin/conf/language/lams/ApplicationResources.properties 16 Dec 2016 07:49:41 -0000 1.100.2.24 +++ lams_admin/conf/language/lams/ApplicationResources.properties 20 Dec 2016 06:05:00 -0000 1.100.2.25 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java,v diff -u -r1.54.2.13 -r1.54.2.14 --- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java 29 Nov 2016 10:23:21 -0000 1.54.2.13 +++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java 20 Dec 2016 06:03:53 -0000 1.54.2.14 @@ -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 =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v diff -u -r1.77.2.39 -r1.77.2.40 --- lams_central/web/main.jsp 17 Dec 2016 12:26:13 -0000 1.77.2.39 +++ lams_central/web/main.jsp 20 Dec 2016 06:03:53 -0000 1.77.2.40 @@ -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' + } + }); +
+ } +
}); Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040082.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java,v diff -u -r1.53.2.14 -r1.53.2.15 --- lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 29 Nov 2016 09:20:06 -0000 1.53.2.14 +++ lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java 20 Dec 2016 06:03:27 -0000 1.53.2.15 @@ -282,4 +282,7 @@ public static String LOCK_OUT_TIME = "LockOutTime"; + // LDEV-4144 + public static String SHOW_TIMEZONE_WARNING = "ShowTimezoneWarning"; + }