Index: lams_admin/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/language/lams/ApplicationResources.properties,v diff -u -r1.52.2.4.2.7 -r1.52.2.4.2.8 --- lams_admin/conf/language/lams/ApplicationResources.properties 31 Mar 2010 19:15:41 -0000 1.52.2.4.2.7 +++ lams_admin/conf/language/lams/ApplicationResources.properties 6 Apr 2010 20:31:38 -0000 1.52.2.4.2.8 @@ -95,12 +95,6 @@ admin.timezone.raw.offset =Raw offset (Hours : Minutes) admin.timezone.dst.offset =DST offset (Minutes) admin.timezone.display.name =Display name -admin.timezone. = -admin.timezone. = -admin.timezone. = -admin.timezone. = -admin.timezone. = - admin.user.actions =Actions admin.user.add =Add/Remove Users admin.user.address_line_1 =Address Line 1 @@ -429,6 +423,8 @@ sysadmin.userinfoUrl =User Information URL table.heading.organisation.id =Organisation ID title.job.list =Jobs +admin.user.enable.flash.for.learner.window =Enable Flash for Learner Window +admin.user.time.zone =Time Zone #======= End labels: Exported 409 labels for en AU ===== Index: lams_admin/conf/xdoclet/struts-forms.xml =================================================================== RCS file: /usr/local/cvsroot/lams_admin/conf/xdoclet/struts-forms.xml,v diff -u -r1.31.2.1.2.2 -r1.31.2.1.2.3 --- lams_admin/conf/xdoclet/struts-forms.xml 31 Mar 2010 19:15:41 -0000 1.31.2.1.2.2 +++ lams_admin/conf/xdoclet/struts-forms.xml 6 Apr 2010 20:31:38 -0000 1.31.2.1.2.3 @@ -44,6 +44,8 @@ + + Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java,v diff -u -r1.48.10.1 -r1.48.10.2 --- lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java 1 Mar 2010 04:56:25 -0000 1.48.10.1 +++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java 6 Apr 2010 20:31:38 -0000 1.48.10.2 @@ -27,6 +27,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +import java.util.TimeZone; +import java.util.TreeSet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -42,6 +44,10 @@ import org.lamsfoundation.lams.admin.web.dto.UserOrgRoleDTO; import org.lamsfoundation.lams.themes.Theme; import org.lamsfoundation.lams.themes.service.IThemeService; +import org.lamsfoundation.lams.timezone.Timezone; +import org.lamsfoundation.lams.timezone.dto.TimezoneDTO; +import org.lamsfoundation.lams.timezone.service.ITimezoneService; +import org.lamsfoundation.lams.timezone.util.TimezoneDTOComparator; import org.lamsfoundation.lams.usermanagement.AuthenticationMethod; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.OrganisationState; @@ -79,6 +85,7 @@ private IUserManagementService service; private MessageService messageService; private static IThemeService themeService; + private static ITimezoneService timezoneService; private static List locales; private static List authenticationMethods; @@ -92,6 +99,9 @@ if (themeService == null) { themeService = AdminServiceProxy.getThemeService(getServlet().getServletContext()); } + if (timezoneService == null) { + timezoneService = AdminServiceProxy.getTimezoneService(getServlet().getServletContext()); + } } public ActionForward edit(ActionMapping mapping, ActionForm form, HttpServletRequest request, @@ -212,6 +222,18 @@ } } userForm.set("orgId", (org == null ? null : org.getOrganisationId())); + + // Get all available time zones + List availableTimeZones = timezoneService.getAllTimezones(); + TreeSet timezoneDtos = new TreeSet(new TimezoneDTOComparator()); + for (Timezone availableTimeZone : availableTimeZones) { + String timezoneId = availableTimeZone.getId(); + TimezoneDTO timezoneDto = new TimezoneDTO(); + timezoneDto.setTimeZoneId(timezoneId); + timezoneDto.setDisplayName(TimeZone.getTimeZone(timezoneId).getDisplayName()); + timezoneDtos.add(timezoneDto); + } + request.setAttribute("timezoneDtos", timezoneDtos); // for breadcrumb links if (org != null) { Index: lams_admin/web/user.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/user.jsp,v diff -u -r1.26.10.1 -r1.26.10.2 --- lams_admin/web/user.jsp 1 Mar 2010 04:56:25 -0000 1.26.10.1 +++ lams_admin/web/user.jsp 6 Apr 2010 20:31:38 -0000 1.26.10.2 @@ -1,4 +1,5 @@ <%@ include file="/taglibs.jsp"%> +<%@ page import="org.lamsfoundation.lams.util.Configuration" import="org.lamsfoundation.lams.util.ConfigurationKeys" %> @@ -118,6 +119,24 @@ : + + <%=Configuration.get(ConfigurationKeys.FLASH_ENABLE)%> + + + + : + + + + + + + + + + + + : @@ -130,7 +149,21 @@ + + : + + + + + ${timezoneDto.timeZoneId} - ${timezoneDto.displayName} + + + + + + + : Index: lams_admin/web/WEB-INF/struts/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_admin/web/WEB-INF/struts/Attic/struts-config.xml,v diff -u -r1.24.2.1.2.2 -r1.24.2.1.2.3 --- lams_admin/web/WEB-INF/struts/struts-config.xml 31 Mar 2010 19:15:41 -0000 1.24.2.1.2.2 +++ lams_admin/web/WEB-INF/struts/struts-config.xml 6 Apr 2010 20:31:38 -0000 1.24.2.1.2.3 @@ -92,6 +92,8 @@ + +