Index: lams_central/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources.properties,v diff -u -r1.138.2.42 -r1.138.2.43 --- lams_central/conf/language/lams/ApplicationResources.properties 17 Dec 2016 07:15:11 -0000 1.138.2.42 +++ lams_central/conf/language/lams/ApplicationResources.properties 17 Dec 2016 12:26:13 -0000 1.138.2.43 @@ -716,6 +716,7 @@ authoring.fla.modify.error =You cannot modify this resource authoring.fla.folder.move.to.child.error =Cannot move a folder into its child label.password.must.lcase =at least 1 lower case letter +label.timezone.warning=Warning: The timezone in LAMS does not match timezone on your computer. The times shown in LAMS will be for the LAMS timezone set in your profile. #======= End labels: Exported 714 labels for en AU ===== Index: lams_central/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_central/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.111.2.21 -r1.111.2.22 --- lams_central/conf/language/lams/ApplicationResources_en_AU.properties 14 Dec 2016 01:30:11 -0000 1.111.2.21 +++ lams_central/conf/language/lams/ApplicationResources_en_AU.properties 17 Dec 2016 12:26:13 -0000 1.111.2.22 @@ -720,6 +720,7 @@ authoring.fla.modify.error =You cannot modify this resource authoring.fla.folder.move.to.child.error =Cannot move a folder into its child label.password.must.lcase =at least 1 lower case letter +label.timezone.warning=Warning: The timezone in LAMS does not match timezone on your computer. The times shown in LAMS will be for the LAMS timezone set in your profile. #======= End labels: Exported 714 labels for en AU ===== Index: lams_central/web/main.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v diff -u -r1.77.2.38 -r1.77.2.39 --- lams_central/web/main.jsp 16 Dec 2016 09:24:17 -0000 1.77.2.38 +++ lams_central/web/main.jsp 17 Dec 2016 12:26:13 -0000 1.77.2.39 @@ -98,15 +98,13 @@ } - debugger; 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( "
Warning: The timezone in LAMS does not match timezone on your computer. The times shown in LAMS will be for the LAMS timezone set in your profile. " - +": os "+client_gmt_offset_minutes+" minutes : lams "+lams_gmt_offset_minutes+" minutes" ); - } + $('#timezoneWarning').html( '
'); + } });