Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java	(.../CleanupPreviewLessonsController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java	(.../CleanupPreviewLessonsController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -69,7 +69,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping(path = "/start", method = RequestMethod.POST)
+    @RequestMapping(path = "/start")
     public String unspecified(HttpServletRequest request, HttpServletResponse response) throws IOException {
 	if (!getSecurityService().isSysadmin(getUserID(), "display cleanup preview lessons", false)) {
 	    response.sendError(HttpServletResponse.SC_FORBIDDEN, "User is not a sysadmin");
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java	(.../CleanupTempFilesController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupTempFilesController.java	(.../CleanupTempFilesController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -65,7 +65,7 @@
     @Qualifier("adminMessageService")
     private MessageService adminMessageService;
 
-    @RequestMapping(path = "/start", method = RequestMethod.POST)
+    @RequestMapping(path = "/start")
     public String execute(@ModelAttribute CleanupForm cleanupForm, HttpServletRequest request) throws Exception {
 
 	// check user is sysadmin
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java	(.../ConfigController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java	(.../ConfigController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -51,7 +51,6 @@
  *
  */
 @Controller
-@RequestMapping("/config")
 public class ConfigController {
 
     private static Configuration configurationService;
@@ -70,15 +69,15 @@
 	return configurationService;
     }
 
-    @RequestMapping(path = "/start", method = RequestMethod.POST)
-    public String unspecified(HttpServletRequest request) throws Exception {
+    @RequestMapping(path = "/config")
+    public String unspecified(@ModelAttribute ConfigForm configForm, HttpServletRequest request) throws Exception {
 
 	request.setAttribute("config", getConfiguration().arrangeItems(Configuration.ITEMS_NON_LDAP));
 
 	return "config/editconfig";
     }
 
-    @RequestMapping(path = "/save", method = RequestMethod.POST)
+    @RequestMapping(path = "/config/save", method = RequestMethod.POST)
     public String save(@ModelAttribute ConfigForm configForm, HttpServletRequest request) throws Exception {
 
 	if (request.getAttribute("CANCEL") != null) {
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java	(.../ImportGroupsController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ImportGroupsController.java	(.../ImportGroupsController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -56,7 +56,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping(path = "/importgroups", method = RequestMethod.POST)
+    @RequestMapping(path = "/importgroups")
     public String execute(@ModelAttribute ImportExcelForm importForm, HttpServletRequest request) throws Exception {
 
 	if (request.getAttribute("CANCEL") != null) {
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java	(.../LdapConfigController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LdapConfigController.java	(.../LdapConfigController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -94,7 +94,7 @@
 	return configurationService;
     }
 
-    @RequestMapping(path = "/start", method = RequestMethod.POST)
+    @RequestMapping(path = "/start")
     public String execute(HttpServletRequest request) throws Exception {
 
 	String action = WebUtil.readStrParam(request, "action", true);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java	(.../LogEventController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java	(.../LogEventController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -68,7 +68,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping(path = "/start", method = RequestMethod.POST)
+    @RequestMapping(path = "/start")
     public String unspecified(HttpServletRequest request) throws Exception {
 
 	// check permission
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginMaintainController.java
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginMaintainController.java	(.../LoginMaintainController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginMaintainController.java	(.../LoginMaintainController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -61,7 +61,7 @@
     private static final String NEWS_PAGE_PATH_SUFFIX = File.separatorChar + "lams-www.war" + File.separatorChar
 	    + "news.html";
 
-    @RequestMapping(path = "/loginmaintain", method = RequestMethod.POST)
+    @RequestMapping(path = "/loginmaintain")
     public String execute(@ModelAttribute LoginMaintainForm loginMaintainForm, HttpServletRequest request)
 	    throws Exception {
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java	(.../LoginSaveController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginSaveController.java	(.../LoginSaveController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -74,7 +74,7 @@
 	    }
 	}
 
-	return "redirect:/sysadminstart.do";
+	return bWriter.toString();
     }
 
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java	(.../LtiConsumerManagementController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java	(.../LtiConsumerManagementController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -9,7 +9,6 @@
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.struts.action.ActionMessage;
 import org.lamsfoundation.lams.admin.service.AdminServiceProxy;
 import org.lamsfoundation.lams.admin.web.form.ExtServerForm;
 import org.lamsfoundation.lams.admin.web.form.LtiConsumerForm;
@@ -20,8 +19,7 @@
 import org.lamsfoundation.lams.util.WebUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
-import org.springframework.util.LinkedMultiValueMap;
-import org.springframework.util.MultiValueMap;
+import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -57,7 +55,7 @@
     /**
      * Shows all available LTI tool consumers
      */
-    @RequestMapping(path = "/start", method = RequestMethod.POST)
+    @RequestMapping(path = "/start")
     public String unspecified(HttpServletRequest request) {
 	initServices();
 
@@ -128,7 +126,7 @@
      * Stores in the DB a new or edited LTI tool consumer
      */
     @RequestMapping(path = "/save", method = RequestMethod.POST)
-    public String save(@ModelAttribute ExtServerForm extServerForm, HttpServletRequest request,
+    public String save(@ModelAttribute ExtServerForm extServerForm, Errors errors, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
 	initServices();
@@ -138,37 +136,34 @@
 	    return unspecified(request);
 	}
 
-	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 	String[] requiredFields = extServerForm.getRequiredFields();
 	for (String requiredField : requiredFields) {
 	    if (StringUtils.trimToNull(requiredField) == null) {
-		errorMap.add("error.required", messageService.getMessage("sysadmin." + requiredField));
+		errors.reject("error.required", messageService.getMessage("sysadmin." + requiredField));
 	    }
 	}
 
 	Integer sid = extServerForm.getSid();
 	//check duplication
-	if (errorMap.isEmpty()) {
+	if (!errors.hasErrors()) {
 	    String[] uniqueFields = extServerForm.getUniqueFields();
 	    for (String uniqueField : uniqueFields) {
 		List<ExtServer> list = userManagementService.findByProperty(ExtServer.class, "uniqueField",
 			uniqueField);
 		if (list != null && list.size() > 0) {
 		    if (sid.equals(0)) {//new map
-			errorMap.add("error.not.unique",
-				messageService.getMessage("sysadmin." + uniqueField));
+			errors.reject("error.not.unique", messageService.getMessage("sysadmin." + uniqueField));
 		    } else {
 			ExtServer ltiConsumer = list.get(0);
 			if (!ltiConsumer.getSid().equals(sid)) {
-			    errorMap.add("error.not.unique",
-				    messageService.getMessage("sysadmin." + uniqueField));
+			    errors.reject("error.not.unique", messageService.getMessage("sysadmin." + uniqueField));
 			}
 		    }
 
 		}
 	    }
 	}
-	if (errorMap.isEmpty()) {
+	if (!errors.hasErrors()) {
 	    ExtServer ltiConsumer = null;
 	    if (sid.equals(0)) {
 		ltiConsumer = new ExtServer();
@@ -184,7 +179,6 @@
 	    return unspecified(request);
 
 	} else {
-	    request.setAttribute("errorMap", errorMap);
 	    return "lti/ltiConsumer";
 	}
     }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java	(.../OrgManageController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgManageController.java	(.../OrgManageController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -66,15 +66,14 @@
  * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
  */
 @Controller
-@RequestMapping("/orgmanage")
 public class OrgManageController {
 
     private static IUserManagementService userManagementService;
 
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping(path = "/start", method = RequestMethod.POST)
+    @RequestMapping(path = "/orgmanage")
     public String unspecified(@ModelAttribute OrgManageForm orgManageForm, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 	initServices();
@@ -162,7 +161,7 @@
     /**
      * Returns list of organisations for .
      */
-    @RequestMapping("/getOrgs")
+    @RequestMapping("/orgmanage/getOrgs")
     @ResponseBody
     public String getOrgs(HttpServletRequest request, HttpServletResponse res) throws IOException, ServletException {
 	initServices();
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java	(.../OrgSaveController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java	(.../OrgSaveController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -49,6 +49,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
+import org.springframework.validation.Errors;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -91,7 +92,7 @@
     private WebApplicationContext applicationContext;
 
     @RequestMapping(path = "/orgsave", method = RequestMethod.POST)
-    public String execute(@ModelAttribute OrganisationForm organisationForm, HttpServletRequest request,
+    public String execute(@ModelAttribute OrganisationForm organisationForm, Errors errors, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
 	if (service == null) {
@@ -114,20 +115,19 @@
 	    } else {
 		request.setAttribute("org", organisationForm.getParentId());
 	    }
-	    return "redirect:/orgmanage.do";
+	    return "redirect:../orgmanage.do";
 	}
 
-	MultiValueMap<String, String> errorMap = new LinkedMultiValueMap<>();
 
 	//organisation name validation
 	String orgName = (organisationForm.getName() == null) ? null : organisationForm.getName();
 	if (StringUtils.isBlank(orgName)) {
-	    errorMap.add("name", messageService.getMessage("error.name.required"));
+	    errors.reject("name", messageService.getMessage("error.name.required"));
 	} else if (!ValidationUtil.isOrgNameValid(orgName)) {
-	    errorMap.add("name", messageService.getMessage("error.name.invalid.characters"));
+	    errors.reject("name", messageService.getMessage("error.name.invalid.characters"));
 	}
 
-	if (errorMap.isEmpty()) {
+	if (!errors.hasErrors()) {
 	    HttpSession ss = SessionManager.getSession();
 	    UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER);
 	    SupportedLocale locale = (SupportedLocale) service.findById(SupportedLocale.class,
@@ -169,7 +169,6 @@
 	    request.setAttribute("org", organisationForm.getParentId());
 	    return "redirect:/orgmanage.do";
 	} else {
-	    request.setAttribute("errorMap", errorMap);
 	    return "redirect:/organisation/edit.do";
 	}
     }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java	(.../OrganisationController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java	(.../OrganisationController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -73,7 +73,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping(path = "/edit", method = RequestMethod.POST)
+    @RequestMapping(path = "/edit")
     public String edit(@ModelAttribute OrganisationForm organisationForm, HttpServletRequest request) throws Exception {
 
 	OrganisationController.service = AdminServiceProxy.getService(applicationContext.getServletContext());
@@ -94,7 +94,7 @@
 			BeanUtils.copyProperties(organisationForm, org);
 			organisationForm.setParentId(org.getParentOrganisation().getOrganisationId());
 			organisationForm.setParentName(org.getParentOrganisation().getName());
-			organisationForm.setOrgId(org.getOrganisationType().getOrganisationTypeId());
+			organisationForm.setTypeId(org.getOrganisationType().getOrganisationTypeId());
 			organisationForm.setStateId(org.getOrganisationState().getOrganisationStateId());
 			SupportedLocale locale = org.getLocale();
 			organisationForm.setLocaleId(locale != null ? locale.getLocaleId() : null);
@@ -127,17 +127,17 @@
 	return error(request);
     }
 
-    @RequestMapping(path = "/create", method = RequestMethod.POST)
+    @RequestMapping(path = "/create")
     public String create(@ModelAttribute OrganisationForm organisationForm, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 	OrganisationController.service = AdminServiceProxy.getService(applicationContext.getServletContext());
 	initLocalesAndStatus();
 
 	if (!(request.isUserInRole(Role.SYSADMIN) || OrganisationController.service.isUserGlobalGroupAdmin())) {
 	    // only sysadmins and global group admins can create groups
-	    if (((organisationForm.getOrgId() != null)
-		    && organisationForm.getOrgId().equals(OrganisationType.COURSE_TYPE))
-		    || (organisationForm.getOrgId() == null)) {
+	    if (((organisationForm.getTypeId() != null)
+		    && organisationForm.getTypeId().equals(OrganisationType.COURSE_TYPE))
+		    || (organisationForm.getTypeId() == null)) {
 		return error(request);
 	    }
 	}
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerListController.java
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerListController.java	(.../ServerListController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerListController.java	(.../ServerListController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -45,7 +45,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping(path = "/serverlist", method = RequestMethod.POST)
+    @RequestMapping(path = "/serverlist")
     public String execute(HttpServletRequest request) throws Exception {
 	List<ExtServer> extServers = AdminServiceProxy.getIntegrationService(applicationContext.getServletContext())
 		.getAllExtServers();
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java	(.../ServerMaintainController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java	(.../ServerMaintainController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -51,7 +51,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping(path = "/edit", method = RequestMethod.POST)
+    @RequestMapping(path = "/edit")
     public String edit(@ModelAttribute ExtServerForm extServerForm, HttpServletRequest request) throws Exception {
 	Integer sid = WebUtil.readIntParam(request, "sid", true);
 	if (sid != null) {
@@ -62,7 +62,7 @@
 	return "servermaintain";
     }
 
-    @RequestMapping(path = "/disable", method = RequestMethod.POST)
+    @RequestMapping(path = "/disable")
     public String disable(HttpServletRequest request) throws Exception {
 	IIntegrationService service = AdminServiceProxy.getIntegrationService(applicationContext.getServletContext());
 	Integer sid = WebUtil.readIntParam(request, "sid", false);
@@ -72,7 +72,7 @@
 	return "redirect:/serverlist.do";
     }
 
-    @RequestMapping(path = "/enable", method = RequestMethod.POST)
+    @RequestMapping(path = "/enable")
     public String enable(HttpServletRequest request) throws Exception {
 	IIntegrationService service = AdminServiceProxy.getIntegrationService(applicationContext.getServletContext());
 	Integer sid = WebUtil.readIntParam(request, "sid", false);
@@ -82,7 +82,7 @@
 	return "redirect:/serverlist.do";
     }
 
-    @RequestMapping(path = "/delete", method = RequestMethod.POST)
+    @RequestMapping(path = "/delete")
     public String delete(HttpServletRequest request) throws Exception {
 	Integer sid = WebUtil.readIntParam(request, "sid", false);
 	AdminServiceProxy.getService(applicationContext.getServletContext()).deleteById(ExtServer.class, sid);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java	(.../ServerSaveController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java	(.../ServerSaveController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -41,6 +41,7 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -60,7 +61,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/serversave")
+    @RequestMapping(path = "/serversave")
     public String execute(@ModelAttribute ExtServerForm extServerForm, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SessionMaintainController.java
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SessionMaintainController.java	(.../SessionMaintainController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SessionMaintainController.java	(.../SessionMaintainController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -37,7 +37,7 @@
 @RequestMapping("/sessionmaintain")
 public class SessionMaintainController {
 
-    @RequestMapping(path = "/list", method = RequestMethod.POST)
+    @RequestMapping(path = "/list")
     public String list(HttpServletRequest request) {
 	request.setAttribute("sessions", SessionManager.getLoginToSessionIDMappings());
 	return "sessionmaintain";
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java	(.../SignupManagementController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SignupManagementController.java	(.../SignupManagementController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -17,6 +17,7 @@
 import org.lamsfoundation.lams.util.WebUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.stereotype.Controller;
 import org.springframework.util.LinkedMultiValueMap;
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
@@ -33,6 +34,7 @@
  *
  *
  */
+@Controller
 @RequestMapping("/signupManagement")
 public class SignupManagementController {
 
@@ -116,7 +118,7 @@
 	return null;
     }
 
-    @RequestMapping(path = "/add", method = RequestMethod.POST)
+    @RequestMapping(path = "/add")
     public String add(@ModelAttribute SignupManagementForm signupForm, HttpServletRequest request) throws Exception {
 
 	// check if form submitted
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/StatisticsController.java
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/StatisticsController.java	(.../StatisticsController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/StatisticsController.java	(.../StatisticsController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -52,7 +52,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping(path = "/start", method = RequestMethod.POST)
+    @RequestMapping(path = "/start")
     public String unspecified(HttpServletRequest request) throws Exception {
 
 	// check permission
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java	(.../SysAdminStartController.java)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java	(.../SysAdminStartController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -49,7 +49,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping(path = "/sysadminstart", method = RequestMethod.POST)
+    @RequestMapping(path = "/sysadminstart")
     public String execute(HttpServletRequest request) throws Exception {
 
 	service = AdminServiceProxy.getService(applicationContext.getServletContext());
@@ -59,29 +59,29 @@
 	if (request.isUserInRole(Role.SYSADMIN)) {
 	    ArrayList<LinkBean> links = new ArrayList<>();
 	    links.add(new LinkBean("config.do", "sysadmin.config.settings.edit"));
-	    links.add(new LinkBean("timezonemanagement.do", "admin.timezone.title"));
+	    links.add(new LinkBean("timezonemanagement/start.do", "admin.timezone.title"));
 	    links.add(new LinkBean("loginmaintain.do", "sysadmin.maintain.loginpage"));
-	    links.add(new LinkBean("signupManagement.do", "admin.signup.title"));
+	    links.add(new LinkBean("signupManagement/start.do", "admin.signup.title"));
 	    links.add(new LinkBean("serverlist.do", "sysadmin.maintain.external.servers"));
-	    links.add(new LinkBean("ltiConsumerManagement.do", "label.manage.tool.consumers"));
-	    links.add(new LinkBean("toolcontentlist.do", "sysadmin.tool.management"));
-	    links.add(new LinkBean("themeManagement.do", "admin.themes.title"));
-	    links.add(new LinkBean("sessionmaintain.do?method=list", "sysadmin.maintain.session"));
+	    links.add(new LinkBean("ltiConsumerManagement/start.do", "label.manage.tool.consumers"));
+	    links.add(new LinkBean("toolcontentlist/start.do", "sysadmin.tool.management"));
+	    links.add(new LinkBean("themeManagement/start.do", "admin.themes.title"));
+	    links.add(new LinkBean("sessionmaintain/list.do", "sysadmin.maintain.session"));
 	    groupedLinks.add(new Object[] { AdminConstants.START_CONFIG_LINKS, links });
 
 	    links = new ArrayList<>();
-	    links.add(new LinkBean("logevent.do", "label.event.log"));
-	    links.add(new LinkBean("cleanup.do", "sysadmin.batch.temp.file.delete"));
-	    links.add(new LinkBean("cleanupPreviewLessons.do", "sysadmin.batch.preview.lesson.delete"));
-	    links.add(new LinkBean("statistics.do", "admin.statistics.title"));
+	    links.add(new LinkBean("logevent/start.do", "label.event.log"));
+	    links.add(new LinkBean("cleanup/start.do", "sysadmin.batch.temp.file.delete"));
+	    links.add(new LinkBean("cleanupPreviewLessons/start.do", "sysadmin.batch.preview.lesson.delete"));
+	    links.add(new LinkBean("statistics/start.do", "admin.statistics.title"));
 	    groupedLinks.add(new Object[] { AdminConstants.START_MONITOR_LINKS, links });
 
 	    links = new ArrayList<>();
 	    links.add(new LinkBean("usersearch.do", "admin.user.find"));
 	    links.add(new LinkBean("importgroups.do", "sysadmin.import.groups.title"));
 	    links.add(new LinkBean("importexcel.do", "admin.user.import"));
 	    links.add(new LinkBean("disabledmanage.do", "admin.list.disabled.users"));
-	    links.add(new LinkBean("ldap.do", "sysadmin.ldap.configuration"));
+	    links.add(new LinkBean("ldap/start.do", "sysadmin.ldap.configuration"));
 	    groupedLinks.add(new Object[] { AdminConstants.START_COURSE_LINKS, links });
 
 	} else if (service.isUserGlobalGroupAdmin()) {
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java	(.../TimezoneManagementController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/TimezoneManagementController.java	(.../TimezoneManagementController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -66,7 +66,7 @@
      * Displays list of all JRE available timezones.
      */
     @RequestMapping("/start")
-    public String unspecified(HttpServletRequest request) throws Exception {
+    public String unspecified(@ModelAttribute TimezoneForm timezoneForm, HttpServletRequest request) throws Exception {
 
 	timezoneService = AdminServiceProxy.getTimezoneService(applicationContext.getServletContext());
 	List<Timezone> defaultTimezones = timezoneService.getDefaultTimezones();
@@ -111,7 +111,8 @@
      * Shows page where admin can choose server timezone.
      */
     @RequestMapping(path = "/serverTimezoneManagement", method = RequestMethod.POST)
-    public String serverTimezoneManagement(HttpServletRequest request) throws Exception {
+    public String serverTimezoneManagement(@ModelAttribute TimezoneForm timezoneForm, HttpServletRequest request)
+	    throws Exception {
 
 	timezoneService = AdminServiceProxy.getTimezoneService(applicationContext.getServletContext());
 
@@ -132,13 +133,14 @@
      * Changes server timezone with the one selected by user.
      */
     @RequestMapping(path = "/changeServerTimezone", method = RequestMethod.POST)
-    public String changeServerTimezone(HttpServletRequest request) throws Exception {
+    public String changeServerTimezone(@ModelAttribute TimezoneForm timezoneForm, HttpServletRequest request)
+	    throws Exception {
 	timezoneService = AdminServiceProxy.getTimezoneService(applicationContext.getServletContext());
 
 	String timeZoneId = WebUtil.readStrParam(request, "timeZoneId");
 	timezoneService.setServerTimezone(timeZoneId);
 
-	return unspecified(request);
+	return unspecified(timezoneForm, request);
     }
 
 }
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java	(.../ToolContentListController.java)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ToolContentListController.java	(.../ToolContentListController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -82,7 +82,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping(path = "/start", method = RequestMethod.POST)
+    @RequestMapping(path = "/start")
     public String execute(HttpServletRequest request) throws Exception {
 	// check permission
 	if (!(request.isUserInRole(Role.SYSADMIN))) {
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java	(.../UserController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java	(.../UserController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -101,7 +101,7 @@
 	}
     }
 
-    @RequestMapping(path = "/edit", method = RequestMethod.POST)
+    @RequestMapping(path = "/edit")
     public String edit(@ModelAttribute UserForm userForm, HttpServletRequest request) throws Exception {
 
 	initServices();
@@ -290,7 +290,7 @@
     }
 
     // determine whether to disable or delete user based on their lams data
-    @RequestMapping(path = "/remove", method = RequestMethod.POST)
+    @RequestMapping(path = "/remove")
     public String remove(HttpServletRequest request) throws Exception {
 
 	initServices();
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java	(.../UserManageController.java)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserManageController.java	(.../UserManageController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -62,7 +62,6 @@
  *
  */
 @Controller
-@RequestMapping("/usermanage")
 public class UserManageController {
 
     private static final Logger log = Logger.getLogger(UserManageController.class);
@@ -72,7 +71,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping(path = "/start", method = RequestMethod.POST)
+    @RequestMapping(path = "/usermanage")
     public String execute(HttpServletRequest request, HttpServletResponse response) throws Exception {
 
 	service = AdminServiceProxy.getService(applicationContext.getServletContext());
@@ -163,7 +162,7 @@
 	return "userlist";
     }
 
-    @RequestMapping(path = "/forwardError", method = RequestMethod.POST)
+    @RequestMapping(path = "/usermanage/forwardError", method = RequestMethod.POST)
     private String forwardError(HttpServletRequest request, String key) {
 	request.setAttribute("errorName", "UserManageAction");
 	request.setAttribute("errorMessage", messageService.getMessage(key));
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgController.java
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgController.java	(.../UserOrgController.java)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgController.java	(.../UserOrgController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -64,7 +64,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping(path = "/userorg", method = RequestMethod.POST)
+    @RequestMapping(path = "/userorg")
     public String execute(@ModelAttribute UserOrgForm userOrgForm, HttpServletRequest request) throws Exception {
 
 	service = AdminServiceProxy.getService(applicationContext.getServletContext());
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java	(.../UserOrgRoleController.java)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleController.java	(.../UserOrgRoleController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -72,7 +72,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping(path = "/userorgrole", method = RequestMethod.POST)
+    @RequestMapping(path = "/userorgrole")
     public String execute(@ModelAttribute UserOrgRoleForm userOrgRoleForm, HttpServletRequest request)
 	    throws Exception {
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java	(.../UserOrgRoleSaveController.java)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgRoleSaveController.java	(.../UserOrgRoleSaveController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -42,6 +42,7 @@
 import org.springframework.util.MultiValueMap;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -77,7 +78,7 @@
     @Qualifier("adminMessageService")
     private MessageService adminMessageService;
 
-    @RequestMapping("/userorgrolesave")
+    @RequestMapping(path = "/userorgrolesave", method = RequestMethod.POST)
     public String execute(@ModelAttribute UserOrgRoleForm userOrgRoleForm, HttpServletRequest request)
 	    throws Exception {
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java	(.../UserOrgSaveController.java)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserOrgSaveController.java	(.../UserOrgSaveController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -44,6 +44,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.context.WebApplicationContext;
 
 /**
@@ -69,7 +70,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/userorgsave")
+    @RequestMapping(path = "/userorgsave", method = RequestMethod.POST)
     public String execute(@ModelAttribute UserOrgForm userOrgForm, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java	(.../UserSaveController.java)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java	(.../UserSaveController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -72,7 +72,7 @@
  */
 
 @Controller
-@RequestMapping
+@RequestMapping("/usersave")
 public class UserSaveController {
 
     private static Logger log = Logger.getLogger(UserSaveController.class);
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchController.java
===================================================================
diff -u -re2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchController.java	(.../UserSearchController.java)	(revision e2c0c928c2cf3c0527ec942ad9af0ec67a3aa8d7)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSearchController.java	(.../UserSearchController.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -56,7 +56,6 @@
  *
  */
 @Controller
-@RequestMapping("/usersearch")
 public class UserSearchController {
 
     private static Logger log = Logger.getLogger(UserSearchController.class);
@@ -66,7 +65,7 @@
     @Autowired
     private WebApplicationContext applicationContext;
 
-    @RequestMapping("/start")
+    @RequestMapping("/usersearch")
     public String unspecified(HttpServletRequest request) throws Exception {
 	initServices();
 
@@ -84,7 +83,7 @@
     /**
      * Returns list of paged users.
      */
-    @RequestMapping("/getPagedUsers")
+    @RequestMapping("/usersearch/getPagedUsers")
     @ResponseBody
     public String getPagedUsers(HttpServletRequest request, HttpServletResponse res)
 	    throws IOException, ServletException {
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/OrganisationForm.java
===================================================================
diff -u -r550e1b37b507779064955267ef47e9085f791357 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/OrganisationForm.java	(.../OrganisationForm.java)	(revision 550e1b37b507779064955267ef47e9085f791357)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/OrganisationForm.java	(.../OrganisationForm.java)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -27,6 +27,8 @@
     private Integer orgId;
 
     private Integer parentId;
+    
+    private Integer typeId;
 
     private String parentName;
 
@@ -71,7 +73,15 @@
     public void setParentId(Integer parentId) {
 	this.parentId = parentId;
     }
+   
+    public Integer getTypeId() {
+        return typeId;
+    }
 
+    public void setTypeId(Integer typeId) {
+        this.typeId = typeId;
+    }
+
     public String getParentName() {
 	return parentName;
     }
Index: lams_admin/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r550e1b37b507779064955267ef47e9085f791357 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 550e1b37b507779064955267ef47e9085f791357)
+++ lams_admin/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -8,7 +8,7 @@
            				   http://www.springframework.org/schema/context 
    						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 	<!-- Spring MVC -->
-	<context:component-scan base-package="org.lamsfoundation.admin.web.controller" />
+	<context:component-scan base-package="org.lamsfoundation.lams.admin.web.controller" />
 	
 	<bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
 		<property name="prefix" value="/" />
Index: lams_admin/web/cleanup.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/cleanup.jsp	(.../cleanup.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/cleanup.jsp	(.../cleanup.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -18,7 +18,6 @@
     
 <body class="stripes">
 	
-	<c:set var="title"><fmt:message key="sysadmin.batch.temp.file.delete"/></c:set>
 	<lams:Page type="admin" title="${title}" formID="cleanupForm">
 	
 	<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
Index: lams_admin/web/cleanupPreviewLessons.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/cleanupPreviewLessons.jsp	(.../cleanupPreviewLessons.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/cleanupPreviewLessons.jsp	(.../cleanupPreviewLessons.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -73,15 +73,14 @@
     
 <body class="stripes">
 
-	<c:set var="title"><fmt:message key="sysadmin.batch.preview.lesson.delete" /></c:set>
 	<lams:Page type="admin" title="${title}">
 		
 		<p><a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
 		<c:set var="errorKey" value="GLOBAL" />
 			<c:if test="${not empty errorMap and not empty errorMap[errorKey]}">
 				<lams:Alert id="error" type="danger" close="false">
-				<c:forEach var="error" items="${errorMap[errorKey]}"
+				<c:forEach var="error" items="${errorMap[errorKey]}">
 					<c:out value="${error}" />
 				</c:forEach>
 				</lams:Alert>
Index: lams_admin/web/config/editconfig.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/config/editconfig.jsp	(.../editconfig.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -1,8 +1,9 @@
 <!DOCTYPE html>
 
+<%@ include file="/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.config.ConfigurationItem"%>
-<%@ include file="/taglibs.jsp"%>
+<c:set var="BOOLEAN"><%= ConfigurationItem.BOOLEAN_FORMAT %></c:set>
 
 <lams:html>
 <lams:head>
@@ -18,7 +19,6 @@
     
 <body class="stripes">
 
-	<c:set var="title"><fmt:message key="sysadmin.config.settings.edit"/></c:set>
 	<c:set var="help"><fmt:message key="LAMS+Configuration"/></c:set>
 	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
 	<lams:Page type="admin" title="${title}" titleHelpURL="${help}" formID="configForm">
@@ -31,7 +31,7 @@
 			</lams:Alert>
 		</c:if>
 				
-		<form:form action="save.do" modelAttribute="configForm" id="configForm" method="post">
+		<form:form action="config/save.do" modelAttribute="configForm" id="configForm" method="post">
 				
 			<c:forEach items="${config}" var="group">
 				<div class="panel panel-default">
@@ -40,24 +40,23 @@
 					</div>
 									
 					<table class="table table-striped table-condensed" >
-						<c:forEach items="${group}" path="value" var="row">
+						<c:forEach items="${group.value}" var="row">
 							<tr>
 								<td>
 									<fmt:message key="${row.descriptionKey}"/>
 									<c:if test="${row.required}">&nbsp;&nbsp;*</c:if>
 								</td>
 								<td>
-									<form:hidden path="key" name="key" value="${row.key}"/>
-									<c:set var="BOOLEAN"><%= ConfigurationItem.BOOLEAN_FORMAT %></c:set>
+									<input type="hidden" name="key" value="${row.key}"/>
 									<c:choose>
 									<c:when test="${row.format==BOOLEAN}">
 										<form:select id="${row.key}" name="row" path="value" cssClass="form-control form-control-sm">
-										<form:option value="true">true</form:option>
-										<form:option value="false">false&nbsp;&nbsp;</form:option>
+										<form:option value="true" label="true"/>
+										<form:option value="false" label="false"/>&nbsp;&nbsp;
 										</form:select>
 									</c:when>
 									<c:otherwise>
-										<form:input id="${row.key}" path="value" name="row" value="${row.value}" size="50" maxlength="255" cssClass="form-control"/>
+										<input type="text" id="${row.key}" name="value" value="${row.value}" size="50" maxlength="255" class="form-control"/>
 									</c:otherwise>
 									</c:choose>
 								</td>
@@ -68,7 +67,7 @@
 			</c:forEach>
 				
 			<div class="pull-right">
-				<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default">
+				<input type="button" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default">
 				<input type="submit" id="saveButton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
 			</div>
 		</form:form>
Index: lams_admin/web/disabledusers.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/disabledusers.jsp	(.../disabledusers.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/disabledusers.jsp	(.../disabledusers.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -15,11 +15,8 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="subtitle"><fmt:message key="admin.list.disabled.users"/></c:set>	
-	<c:if test="${not empty subtitle}">
-		<c:set var="title">${title}: <fmt:message key="${subtitle}"/></c:set>
-	</c:if>
 	
+	<c:set var="title">${title}: <fmt:message key="admin.list.disabled.users"/></c:set>
 	<lams:Page type="admin" title="${title}">
 		<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
Index: lams_admin/web/import/importGroups.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/import/importGroups.jsp	(.../importGroups.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -7,6 +7,9 @@
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 <%@ page import="org.lamsfoundation.lams.util.FileValidatorSpringUtil" %> 
+<c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set> 
+<c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING"><%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%></c:set> 
+<c:set var="EXE_FILE_TYPES"><%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%></c:set> 
 
 <lams:html>
 <lams:head>
@@ -21,10 +24,6 @@
 	<script language="JavaScript" type="text/JavaScript" src="<lams:LAMSURL/>/includes/javascript/changeStyle.js"></script>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 	
-	<c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set> 
-	<c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING"><%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%></c:set> 
-	<c:set var="EXE_FILE_TYPES"><%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%></c:set> 
-	
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
 	 
@@ -55,7 +54,7 @@
 	<c:set var="title"><fmt:message key="sysadmin.import.groups.title"/></c:set>
 	<c:set var="help"><fmt:message key="Import+Groups"/></c:set>
 	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
-	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}" formID="importForm">
 	
 	<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
@@ -110,16 +109,16 @@
 	<p><fmt:message key="msg.import.conclusion"/></p>
 	
 	<form:form action="importgroups.do" modelAttribute="importForm" id="importForm" method="post" enctype="multipart/form-data" onsubmit="return verifyAndSubmit();">
-	<form:hidden path="orgId" />
+		<form:hidden path="orgId" />
+		
+		<lams:FileUpload fileFieldname="file" fileInputMessageKey="label.excel.spreadsheet" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/> 
+			<lams:WaitingSpinner id="fileUpload_Busy"/> 
+		
+		<div class="pull-right">
+		<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default">
+		<input type="submit" id="importButton" class="btn btn-primary loffset5" value="<fmt:message key="label.import"/>" /> &nbsp; 	
+		</div>
 	
-	<lams:FileUpload fileFieldname="file" fileInputMessageKey="label.excel.spreadsheet" maxFileSize="${UPLOAD_FILE_MAX_SIZE_AS_USER_STRING}"/> 
-		<lams:WaitingSpinner id="fileUpload_Busy"/> 
-	
-	<div class="pull-right">
-	<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default">
-	<input type="submit" id="importButton" class="btn btn-primary loffset5" value="<fmt:message key="label.import"/>" /> &nbsp; 	
-	</div>
-	
 	</form:form>
 	
 	</div>
Index: lams_admin/web/import/importexcel.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/import/importexcel.jsp	(.../importexcel.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -4,9 +4,11 @@
 <%@ page import="org.lamsfoundation.lams.admin.service.IImportService"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
-<%@ page import="org.lamsfoundation.lams.util.FileValidatorUtil" %> 
+<%@ page import="org.lamsfoundation.lams.util.FileValidatorSpringUtil" %> 
+<c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set> 
+<c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING"><%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%></c:set> 
+<c:set var="EXE_FILE_TYPES"><%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%></c:set> 
 
-
 <lams:html>
 <lams:head>
 	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
@@ -25,11 +27,6 @@
 	<c:set var="mustHaveNumerics"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%></c:set>
 	<c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
 	
-	<c:set var="UPLOAD_FILE_MAX_SIZE"><%=Configuration.get(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE)%></c:set> 
-	<c:set var="UPLOAD_FILE_MAX_SIZE_AS_USER_STRING"><%=FileValidatorSpringUtil.formatSize(Configuration.getAsInt(ConfigurationKeys.UPLOAD_FILE_LARGE_MAX_SIZE))%></c:set> 
-	<c:set var="EXE_FILE_TYPES"><%=Configuration.get(ConfigurationKeys.EXE_EXTENSIONS)%></c:set> 
-	
-	
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/upload.js"></script>
 	 
@@ -57,12 +54,11 @@
 	 </script>
 </lams:head>
     
-<body class="stripes">
 
 	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
 	<c:set var="help"><fmt:message key="Import+Users"/></c:set>
 	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
-			<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+			<lams:Page type="admin" title="${title}" titleHelpURL="${help}" formID="importExcelForm">
 				<p>
 					<a href="<lams:LAMSURL/>/admin/sysadminstart.do"
 						class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a>
Index: lams_admin/web/import/importresult.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/import/importresult.jsp	(.../importresult.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/import/importresult.jsp	(.../importresult.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -15,7 +15,6 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
 	<lams:Page type="admin" title="${title}">
 		<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
Index: lams_admin/web/import/status.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/import/status.jsp	(.../status.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/import/status.jsp	(.../status.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -40,7 +40,6 @@
 	</c:set>	
 
 <body class="stripes">
-	<c:set var="title"><fmt:message key="admin.user.import" /></c:set>
 	<lams:Page type="admin" title="${title}">
 	
 		<div align="center">	
Index: lams_admin/web/includes/javascript/learningLibraryGroup.js
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/includes/javascript/learningLibraryGroup.js	(.../learningLibraryGroup.js)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/includes/javascript/learningLibraryGroup.js	(.../learningLibraryGroup.js)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -229,9 +229,8 @@
 		$.ajax({
 			'async'   : false,
 			'cache'   : false,
-			'url'     : 'toolcontentlist.do',
+			'url'     : 'toolcontentlist/saveLearningLibraryGroups.do',
 			'data'    : {
-				'action' : 'saveLearningLibraryGroups',
 				'groups' : JSON.stringify(groups)
 			},
 			'type' 	  : 'POST',
Index: lams_admin/web/ldap.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/ldap.jsp	(.../ldap.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/ldap.jsp	(.../ldap.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -29,10 +29,9 @@
     
 <body class="stripes">
 	
-	<c:set var="title"><fmt:message key="sysadmin.ldap.configuration"/></c:set>
 	<c:set var="help"><fmt:message key="LDAP+Configuration"/></c:set>
 	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
-	<lams:Page type="admin" title="${title}" titleHelpURL="${help}" formID="">
+	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
 		
 		<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
Index: lams_admin/web/logevent.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/logevent.jsp	(.../logevent.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/logevent.jsp	(.../logevent.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -235,7 +235,6 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title"><fmt:message key="label.event.log"/></c:set>
 	<lams:Page type="admin" title="${title}">
 		<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
Index: lams_admin/web/loginmaintain.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/loginmaintain.jsp	(.../loginmaintain.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/loginmaintain.jsp	(.../loginmaintain.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -15,7 +15,6 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title"><fmt:message key="sysadmin.maintain.loginpage"/></c:set>
 	<lams:Page type="admin" title="${title}" formID="loginMaintainForm">
 		
 		<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
@@ -29,12 +28,12 @@
 	      </lams:Alert>
 		  </c:if>
 		
-		<form:form action="./loginsave.do" modelAttribute="loginMaintainForm" id="loginMaintainForm" enctype="multipart/form-data" method="post">
+		<form:form action="../loginsave.do" modelAttribute="loginMaintainForm" id="loginMaintainForm" enctype="multipart/form-data" method="post">
 		<c:set var="language"><lams:user property="localeLanguage"/></c:set>
 		<p class="help-block"><fmt:message key="sysadmin.login.text"/></p>
 		
-		<c:set var="existingContent"><c:out value="${loginMaintainForm.news}" filter='false' /></c:set>
-		
+		<c:set var="existingContent"><c:out value="${loginMaintainForm.news}"/></c:set>
+		..
 		<lams:CKEditor id="news" value="${existingContent}"	contentFolderID="../public" height="600px"></lams:CKEditor>
 		
 		<div class="pull-right voffset5">
Index: lams_admin/web/lti/ltiConsumer.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/lti/ltiConsumer.jsp	(.../ltiConsumer.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/lti/ltiConsumer.jsp	(.../ltiConsumer.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -46,7 +46,7 @@
 <body class="stripes">
 	
 	<c:set var="title"><fmt:message key="label.edit.tool.consumer"/></c:set>
-	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+	<lams:Page type="admin" title="${title}" formID="ltiConsumerForm">
 				<p>
 					<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default">
 						<fmt:message key="sysadmin.maintain" />
@@ -57,15 +57,7 @@
 					</a>
 				</p>
 					
-				<%-- Error Messages --%>
-				 	 <c:set var="errorKey" value="GLOBAL" />
-					 <c:if test="${not empty errorMap and not empty errorMap[errorKey]}">
-						 <lams:Alert id="error" type="danger" close="false">
-						 <c:forEach var="error" items="${errorMap[errorKey]}">
-							 <c:out value="${error}" />
-						 </c:forEach>
-						 </lams:Alert>
-					 </c:if>
+				<form:errors path="*"/>
 				<br />
 				
 				<form:form action="save.do" id="ltiConsumerForm" modelAttribute="ltiConsumerForm" method="post">
Index: lams_admin/web/lti/ltiConsumerList.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/lti/ltiConsumerList.jsp	(.../ltiConsumerList.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/lti/ltiConsumerList.jsp	(.../ltiConsumerList.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -16,7 +16,6 @@
     
 <body class="stripes">
 	
-	<c:set var="title"><fmt:message key="label.manage.tool.consumers"/></c:set>
 	<lams:Page type="admin" title="${title}">
 				<p>
 					<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default">
@@ -54,24 +53,24 @@
 								</c:choose>
 							</td>
 							<td>
-								<a href="ltiConsumerManagement/edit.do?sid=<c:out value='${ltiConsumer.sid}' />">
+								<a href="../ltiConsumerManagement/edit.do?sid=<c:out value='${ltiConsumer.sid}' />">
 									<fmt:message key="admin.edit" />
 								</a>
 								&nbsp;
 								<c:choose>
 									<c:when test="${ltiConsumer.disabled}">
-										<a href="ltiConsumerManagement/disable.do?disable=false&sid=<c:out value='${ltiConsumer.sid}' />">
+										<a href="../ltiConsumerManagement/disable.do?disable=false&sid=<c:out value='${ltiConsumer.sid}' />">
 											<fmt:message key="admin.enable" />
 										</a>
 									</c:when>
 									<c:otherwise>
-										<a href="ltiConsumerManagement/disable.do?disable=true&sid=<c:out value='${ltiConsumer.sid}' />">
+										<a href="../ltiConsumerManagement/disable.do?disable=true&sid=<c:out value='${ltiConsumer.sid}' />">
 											<fmt:message key="admin.disable" />
 										</a>
 									</c:otherwise>
 								</c:choose>
 								&nbsp;
-								<a href="ltiConsumerManagement/delete.do?sid=<c:out value='${ltiConsumer.sid}' />">
+								<a href="../ltiConsumerManagement/delete.do?sid=<c:out value='${ltiConsumer.sid}' />">
 									<fmt:message key="admin.delete" />
 								</a>
 							</td>
@@ -82,7 +81,7 @@
 				<p>${fn:length(ltiConsumers)}&nbsp;<fmt:message key="label.tool.consumers.count" /></p>
 				
 				<input class="btn btn-default pull-right" name="addNewLtiConsumer" type="button" value="<fmt:message key='label.add.tool.consumer' />" 
-						onClick="javascript:document.location='ltiConsumerManagement/edit.do'" />
+						onClick="javascript:document.location='../ltiConsumerManagement/edit.do'" />
 				
 			</lams:Page>
 			
Index: lams_admin/web/orgPasswordChange.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/orgPasswordChange.jsp	(.../orgPasswordChange.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -3,7 +3,12 @@
 <%@ include file="/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
-
+<c:set var="minNumChars"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%></c:set>
+<c:set var="mustHaveUppercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%></c:set>
+<c:set var="mustHaveNumerics"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%></c:set>
+<c:set var="mustHaveLowercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%></c:set>
+<c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
+	
 <lams:html>
 <lams:head>
 	<c:set var="title"><fmt:message key="admin.org.password.change.title"/></c:set>
@@ -15,12 +20,6 @@
 	<script language="JavaScript" type="text/JavaScript" src="<lams:LAMSURL/>/includes/javascript/changeStyle.js"></script>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 	
-	<c:set var="minNumChars"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%></c:set>
-	<c:set var="mustHaveUppercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%></c:set>
-	<c:set var="mustHaveNumerics"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%></c:set>
-	<c:set var="mustHaveLowercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%></c:set>
-	<c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
-	
 	<lams:css />
 	<link type="text/css" href="<lams:LAMSURL/>css/free.ui.jqgrid.min.css" rel="stylesheet" />
 	<style type="text/css">
@@ -135,7 +134,7 @@
 			
 			
 			// Setup form validation 
-			$("#OrgPasswordChangeForm").validate({
+			$("#orgPasswordChangeForm").validate({
 				errorLabelContainer : '#formValidationErrors',
 				errorClass : 'errorMessage',
 				rules : {
@@ -339,8 +338,7 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title"><fmt:message key="admin.org.password.change.title"/></c:set>
-	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+	<lams:Page type="admin" title="${title}">
 				<p>
 					<a href="<lams:LAMSURL/>admin/usermanage.do?org=<c:out value='${orgPasswordChangeForm.organisationID}' />" class="btn btn-default">
 					<fmt:message key="admin.user.manage" /></a>
@@ -417,7 +415,7 @@
 									<td class="changeContainer">
 										<div class="checkbox">
 											<label>
-												<form:checkbox path="isStaffChange" od="isStaffChange"/>
+												<form:checkbox path="isStaffChange" id="isStaffChange" />
 													<fmt:message key="admin.org.password.change.is.staff" />
 											</label>
 										</div>
@@ -428,7 +426,7 @@
 									<td class="changeContainer">
 										<div class="checkbox">
 											<label>
-												<form:checkbox path="isLearnerChange" id="isLearnerChange">
+												<form:checkbox path="isLearnerChange" id="isLearnerChange" />
 													<fmt:message key="admin.org.password.change.is.learner" />
 											</label>
 										</div>
Index: lams_admin/web/organisation/cloneResult.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/organisation/cloneResult.jsp	(.../cloneResult.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/organisation/cloneResult.jsp	(.../cloneResult.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -2,6 +2,7 @@
 
 <%@ include file="/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.usermanagement.OrganisationType" %>
+<c:set var="classTypeId"><%= OrganisationType.CLASS_TYPE %></c:set>
 
 <lams:html>
 <lams:head>
@@ -17,11 +18,9 @@
     
 <body class="stripes">
 
-	<c:set var="title"><fmt:message key="title.clone.lessons"/></c:set>
 	<lams:Page type="admin" title="${title}">
 	
 		<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a> :
-			<c:set var="classTypeId"><%= OrganisationType.CLASS_TYPE %></c:set>
 			<c:if test="${org.organisationType.organisationTypeId eq classTypeId}">
 				<a href="orgmanage.do?org=<c:out value="${org.parentOrganisation.organisationId}" />" class="btn btn-default">
 				<c:out value="${org.parentOrganisation.name}" />
Index: lams_admin/web/organisation/cloneStart.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/organisation/cloneStart.jsp	(.../cloneStart.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/organisation/cloneStart.jsp	(.../cloneStart.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -134,7 +134,6 @@
     
 <body class="stripes">
 
-	<c:set var="title"><fmt:message key="title.clone.lessons"/></c:set>
 	<lams:Page type="admin" title="${title}" formID="cloneForm">
 			
 			<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a> :
@@ -192,7 +191,7 @@
 			</div>
 			
 			
-			<form name="cloneForm" id="cloneForm" action="clone.do" method="post">
+			<form name="cloneForm" id="cloneForm" action="start.do" method="post">
 				<input type="hidden" name="groupId" value="<c:out value="${org.organisationId}" />">
 				<input type="hidden" name="lessons">
 				<input type="hidden" name="staff">
Index: lams_admin/web/organisation/courseAdminEdit.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/organisation/courseAdminEdit.jsp	(.../courseAdminEdit.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/organisation/courseAdminEdit.jsp	(.../courseAdminEdit.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -15,10 +15,10 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title"><fmt:message key="admin.organisation.entry"/></c:set>
+
 	<lams:Page type="admin" title="${title}" formID="organisationForm">
 	
-		<form:form action="orgsave.do" modelAttribute="organisationForm" id="organisationForm" method="post">
+		<form:form action="../orgsave.do" modelAttribute="organisationForm" id="organisationForm" method="post">
 				<form:hidden path="orgId" />
 				<form:hidden path="parentId" />
 				<form:hidden path="typeId" />
@@ -43,15 +43,15 @@
 				<table  class="table table-no-border">
 					<tr>
 						<td><fmt:message key="admin.organisation.name"/>:</td>
-						<td><input type="text" name="name" size="40" class="form-control"/> *</td>
+						<td><input type="text" name="name" size="40" class="form-control" value="${organisationForm.name}" /> *</td>
 					</tr>
 					<tr>
 					<td><fmt:message key="admin.organisation.code"/>:</td>
-						<td><input type="text" name="code" size="20"  class="form-control"/></td>
+						<td><input type="text" name="code" size="20"  class="form-control" value="${organisationForm.code}" /></td>
 					</tr>
 					<tr>
 						<td><fmt:message key="admin.organisation.description"/>:</td>
-						<td><form:textarea path="description" cols="50" rows="3"  cssClass="form-control"/></td>
+						<td><textarea name="description" cols="50" rows="3"  class="form-control">${organisationForm.description}</textarea></td>
 					</tr>
 					<tr>
 						<td><fmt:message key="admin.organisation.locale"/>:</td>
Index: lams_admin/web/organisation/createOrEdit.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/organisation/createOrEdit.jsp	(.../createOrEdit.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -38,28 +38,28 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title"><fmt:message key="admin.organisation.entry"/></c:set>
+
 	<lams:Page type="admin" title="${title}" formID="organisationForm">
-		<form:form action="orgsave.do" method="post" modelAttribute="organisationForm" onsubmit="return warnIfRemoved()">
+		<form:form action="../orgsave.do" method="post" modelAttribute="organisationForm" id="organisationForm" onsubmit="return warnIfRemoved()">
 				<form:hidden path="orgId" />
 				<form:hidden path="parentId" />
 				<form:hidden path="typeId" />
 				
-				<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+				<p><a href="../orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
 					<c:if test="${organisationForm.typeId == 3}">
-						: <a href="orgmanage.do?org=<c:out value="${organisationForm.parentId}" />" class="btn btn-default"><c:out value="${organisationForm.parentName}"/></a>
+						: <a href="../orgmanage.do?org=<c:out value="${organisationForm.parentId}" />" class="btn btn-default"><c:out value="${organisationForm.parentName}"/></a>
 					</c:if>
 					
 					<c:if test="${not empty organisationForm.orgId}">
-						: <a href="orgmanage.do?org=<c:out value="${organisationForm.orgId}" />" class="btn btn-default"><c:out value="${organisationForm.name}"/></a>
+						: <a href="../orgmanage.do?org=<c:out value="${organisationForm.orgId}" />" class="btn btn-default"><c:out value="${organisationForm.name}"/></a>
 					</c:if>
 				</p>
 				
 				<h4>
 					<c:if test="${not empty organisationForm.orgId}">
 						<fmt:message key="admin.edit"/>&nbsp;<c:out value="${organisationForm.name}"/>&nbsp;
 					</c:if>
-					<<c:if test="${empty organisationForm.orgId}">
+					<c:if test="${empty organisationForm.orgId}">
 						<c:if test="${organisationForm.typeId == 2}">
 							<fmt:message key="admin.course.add"/>
 						</c:if>
@@ -70,14 +70,7 @@
 				</h4>
 				
 				<div align="center">
-					 <c:set var="errorKey" value="GLOBAL" />
-					   <c:if test="${not empty errorMap and not empty errorMap[errorKey]}">
-					      <lams:Alert id="error" type="danger" close="false">
-					        <c:forEach var="error" items="${errorMap[errorKey]}">
-					           <c:out value="${error}" />
-					        </c:forEach>
-					      </lams:Alert>
-					  </c:if>
+					<form:errors path="*"/>
 				</div>
 				
 				<div id="deleteAllLessonsBox" class="alert alert-info" style="display: none">
@@ -89,15 +82,15 @@
 				<table class="table table-condensed table-no-border">
 					<tr>
 						<td width="15%"><fmt:message key="admin.organisation.name"/> *</td>
-						<td><input type="text" name="name" size="40" class="form-control" maxlength="240"/></td>
+						<td><input type="text" name="name" size="40" class="form-control" maxlength="240" value="${organisationForm.name}"/></td>
 					</tr>
 					<tr>
 					<td><fmt:message key="admin.organisation.code"/></td>
-						<td><input type="text" name="code" size="20" class="form-control" maxlength="20"/></td>
+						<td><input type="text" name="code" size="20" class="form-control" maxlength="20" value="${organisationForm.code}"/></td>
 					</tr>
 					<tr>
 						<td><fmt:message key="admin.organisation.description"/></td>
-						<td><input type="text" name="description" cols="50" rows="3" class="form-control" id="description" /></td>
+						<td><input type="text" name="description" cols="50" rows="3" class="form-control" id="description" value="${organisationForm.description}"/></td>
 					</tr>
 					<tr>
 						<td><fmt:message key="admin.organisation.locale"/></td>
Index: lams_admin/web/organisation/deleteAllLessons.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/organisation/deleteAllLessons.jsp	(.../deleteAllLessons.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/organisation/deleteAllLessons.jsp	(.../deleteAllLessons.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -73,7 +73,7 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title"><fmt:message key="sysadmin.lesson.delete.title"/></c:set>
+
 	<lams:Page type="admin" title="${title}">
 				<p>
 					<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
Index: lams_admin/web/organisation/list.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/organisation/list.jsp	(.../list.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -3,6 +3,9 @@
 <%@ include file="/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.usermanagement.Role" %>
 <%@ page import=" org.lamsfoundation.lams.util.FileUtil" %>
+<c:set var="lams"><lams:LAMSURL /></c:set>
+<c:set var="datePattern"><%= FileUtil.EXPORT_TO_SPREADSHEET_TITLE_DATE_FORMAT.toPattern() %></c:set>
+	
 
 <lams:html>
 <lams:head>
@@ -15,9 +18,6 @@
 	<script language="JavaScript" type="text/JavaScript" src="<lams:LAMSURL/>/includes/javascript/changeStyle.js"></script>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 	
-	<c:set var="lams"><lams:LAMSURL /></c:set>
-	<c:set var="datePattern"><%= FileUtil.EXPORT_TO_SPREADSHEET_TITLE_DATE_FORMAT.toPattern() %></c:set>
-	
 	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
 	<link type="text/css" href="${lams}css/jquery.tablesorter.pager.css" rel="stylesheet">
 	<style >
@@ -122,7 +122,7 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title"><fmt:message key="admin.course.manage"/></c:set>
+
 	<lams:Page type="admin" title="${title}" formID="orgManageForm">
 		<c:if test="${orgManageForm.type == 1}">
 				<form>
@@ -145,7 +145,7 @@
 				<p style="padding-top:10px;"><c:out value="${numUsers}"/></p>
 				</form>
 			
-				<form:form cssClass="indentPad" action="start.do" modelAttribute="orgManageForm" id="orgManageForm" method="post">
+				<form:form cssClass="indentPad" action="orgmanage.do" modelAttribute="orgManageForm" id="orgManageForm" method="post">
 					<input type="hidden" name="org" value="<c:out value="${orgManageForm.parentId}"/>" />
 					<fmt:message key="label.show"/>&nbsp;
 					<form:select path="stateId" id="org-state-id" cssClass="form-control form-control-inline input-sm">
@@ -158,7 +158,7 @@
 		</c:if>
 			
 		<c:if test="${orgManageForm.type == 2}">
-				<p><a href="orgmanage/start.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a></p>
+				<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a></p>
 			
 				<div class="panel panel-default voffset5" >
 					<div class="panel-heading">
@@ -171,10 +171,10 @@
 								</c:if>
 								<a href="usermanage.do?org=<c:out value="${orgManageForm.parentId}"/>" id="manageUsers" class="btn btn-default"><i class="fa fa-users"></i> <span class="hidden-xs"><fmt:message key="admin.user.manage" /></span></a>
 								
-								<% if (request.isUserInRole(Role.SYSADMIN)) { %>
+								<c:if test="${request.isUserInRole(Role.SYSADMIN)}">
 									<a href="clone/start.do?groupId=<c:out value="${orgManageForm.parentId}"/>" class="btn btn-default"><i class="fa fa-clone"></i><span class="hidden-xs"> <fmt:message key="title.clone.lessons" /></span></a>
 									<a href="organisation/deleteAllLessonsInit.do?orgId=<c:out value="${orgManageForm.parentId}"/>" class="btn btn-default"><i class="fa fa-bomb"></i><span class="hidden-xs"> <fmt:message key="admin.delete.lessons" /></span></a>
-								<% } %>
+								</c:if>
 							</div>
 						</div>
 					</div>
@@ -242,25 +242,25 @@
 				</form:form>
 		</c:if>
 			
-		<c:if test=${orgManageForm.type == 3}>
+		<c:if test="${orgManageForm.type == 3}">
 				<p>
-					<a href="orgmanage/start.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-					: <a href="orgmanage/start.do?org=<c:out value="${parentGroupId}"/>" class="btn btn-default"><c:out value="${parentGroupName}"/></a>
+					<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+					: <a href="orgmanage.do?org=<c:out value="${parentGroupId}"/>" class="btn btn-default"><c:out value="${parentGroupName}"/></a>
 				</p>
 				
 				<div class="panel panel-default voffset5" >
 					<div class="panel-heading">
 						<div class="panel-title">
-							<span><c:out value="${OrgManageForm.parentName}"/></span>
+							<span><c:out value="${orgManageForm.parentName}"/></span>
 							<div class="btn-group btn-group-sm  pull-right">
 								<c:if test="${editGroup == true}">
 									<input class="btn btn-default" type="button" value="<fmt:message key="admin.edit" />&nbsp;<c:out value="${orgManageForm.parentName}"/>" onclick=javascript:document.location='organisation/edit.do?orgId=<c:out value="${orgManageForm.parentId}"/>' />
 								</c:if>
 								<input class="btn btn-default" type="button" value="<fmt:message key="admin.user.manage" />" onclick=javascript:document.location='usermanage.do?org=<c:out value="${orgManageForm.parentId}"/>' />
-								<% if (request.isUserInRole(Role.SYSADMIN)) { %>
+								<c:if test="${request.isUserInRole(Role.SYSADMIN)}">
 										<input class="btn btn-default" type="button" value="<fmt:message key="title.clone.lessons" />" onclick="javascript:document.location='clone/start.do?groupId=<c:out value="${orgManageForm.parentId}"/>';">
 										<a href="organisation/deleteAllLessonsInit.do?orgId=<c:out value="${orgManageForm.parentId}"/>" class="btn btn-default"><i class="fa fa-bomb"></i><span class="hidden-xs"> <fmt:message key="admin.delete.lessons" /></span></a>
-								<% } %>
+								</c:if>
 						</div>
 						</div>
 					</div>
Index: lams_admin/web/remove.jsp
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/remove.jsp	(.../remove.jsp)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/web/remove.jsp	(.../remove.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -15,8 +15,7 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
-	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+	<lams:Page type="admin" title="${title}">
 		<form>
 
 				<c:if test="${empty orgId}">
Index: lams_admin/web/serverlist.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/serverlist.jsp	(.../serverlist.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/serverlist.jsp	(.../serverlist.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -15,7 +15,6 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title"><fmt:message key="sysadmin.maintain.external.servers"/></c:set>
 	<lams:Page type="admin" title="${title}">
 			<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
@@ -65,7 +64,7 @@
 			</table>
 			<p>${fn:length(servers)}&nbsp;<fmt:message key="sysadmin.integrated.servers" /></p>
 			
-			<input class="btn btn-default pull-right" name="addnewserver" type="button" value="<fmt:message key='sysadmin.server.add' />" onClick="javascript:document.location='servermaintain.do?method=edit'" />
+			<input class="btn btn-default pull-right" name="addnewserver" type="button" value="<fmt:message key='sysadmin.server.add' />" onClick="javascript:document.location='servermaintain/edit.do'" />
 
 
 	</lams:Page>
Index: lams_admin/web/servermaintain.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/servermaintain.jsp	(.../servermaintain.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -56,7 +56,6 @@
     
 <body class="stripes">
 	
-	<c:set var="title"><fmt:message key="sysadmin.maintain.server.edit"/></c:set>
 	<c:set var="help"><fmt:message key="Integrations"/></c:set>
 	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
 	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
@@ -72,7 +71,7 @@
 				            </lams:Alert>
 				        </c:if>
 				
-				<form:form action="serversave.do" id="extServerForm" modelAttribute="extServerForm" method="post">
+				<form:form action="../serversave.do" id="extServerForm" modelAttribute="extServerForm" method="post">
 					<form:hidden path="sid" />
 					
 				<table class="table table-no-border">
@@ -109,8 +108,7 @@
 							<input type="hidden" name="timeToLiveLoginRequestEnabled" value="false">
 						</td>
 					</tr>
-					
-					<tr id="ttl-login-request-wrap" <c:if test="${!extServerForm.map.timeToLiveLoginRequestEnabled}">style="display:none;"</c:if>>
+					<tr id="ttl-login-request-wrap" <c:if test="${!extServerForm.timeToLiveLoginRequestEnabled}">style="display:none;"</c:if>>
 						<td><fmt:message key="sysadmin.login.request.ttl" /></td>
 						<td><input type="text" name="timeToLiveLoginRequest" size="10" id="ttl-login-request" class="form-control"/></td>
 					</tr>
@@ -135,7 +133,7 @@
 				</div>
 				</form:form>
 				
-				<a href="sysadminstart.do" class="btn btn-default pull-left"><fmt:message key="sysadmin.maintain" /></a>
+				<a href="<lams:LAMSURL/>admin/sysadminstart.do" class="btn btn-default pull-left"><fmt:message key="sysadmin.maintain" /></a>
 			</lams:Page>
 
 </body>
Index: lams_admin/web/sessionmaintain.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/sessionmaintain.jsp	(.../sessionmaintain.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/sessionmaintain.jsp	(.../sessionmaintain.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -15,7 +15,7 @@
 </lams:head>
     
 <body class="stripes">
-	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+	<lams:Page type="admin" title="${title}">
 		<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
 		<table class="table table-striped">
Index: lams_admin/web/signupmanagement/add.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -15,19 +15,16 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="subtitle"><fmt:message key="admin.add.edit.signup.page"/></c:set>	
-	<c:if test="${not empty subtitle}">
-		<c:set var="title">${title}: <fmt:message key="${subtitle}"/></c:set>
-	</c:if>
 	
-	<lams:Page type="admin" title="${title}">
+	<c:set var="title">${title}: <fmt:message key="admin.add.edit.signup.page"/></c:set>
+	<lams:Page type="admin" title="${title}" formID="signupForm">
 		<div>
 			<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a>
 			<a href="signupManagement.do" class="btn btn-default loffset5"><fmt:message key="admin.signup.title" /></a>
 			</div>
 			
 			<form:form action="add.do" modelAttribute="signupForm" id="signupForm" method="post">
-				<form:hidden path="signupOrganisationId" />
+				<input type="hidden" name="signupOrganisationId" />
 				
 				<table class="table table-condensed table-no-border">
 					<tr>
Index: lams_admin/web/signupmanagement/list.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/signupmanagement/list.jsp	(.../list.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/signupmanagement/list.jsp	(.../list.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -16,7 +16,6 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title"><fmt:message key="admin.signup.title"/></c:set>
 	<c:set var="help"><fmt:message key="LAMS+Signup"/></c:set>
 	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
 	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
@@ -63,15 +62,15 @@
 						<c:out value="${signupOrganisation.context}" />
 					</td>
 					<td>
-						<a href="/signupManagement/edit.do?soid=${signupOrganisation.signupOrganisationId}"><fmt:message key="admin.edit"/></a>
+						<a href="../signupManagement/edit.do?soid=${signupOrganisation.signupOrganisationId}"><fmt:message key="admin.edit"/></a>
 						&nbsp;&nbsp;
-						<a href="/signupManagement/delete.do?soid=${signupOrganisation.signupOrganisationId}"><fmt:message key="admin.delete"/></a>
+						<a href="../signupManagement/delete.do?soid=${signupOrganisation.signupOrganisationId}"><fmt:message key="admin.delete"/></a>
 					</td>
 				</tr>
 			</c:forEach>
 		</table>
 		
-		<a href="/signupManagement/add.do" class="btn btn-primary pull-right"><fmt:message key="admin.add.new.signup.page"/></a>
+		<a href="../signupManagement/add.do" class="btn btn-primary pull-right"><fmt:message key="admin.add.new.signup.page"/></a>
 
 	</lams:Page>
 
Index: lams_admin/web/statistics.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/statistics.jsp	(.../statistics.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/statistics.jsp	(.../statistics.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -36,8 +36,7 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title"><fmt:message key="admin.statistics.title"/></c:set>
-	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+	<lams:Page type="admin" title="${title}">
 			<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 			
 			<div class="panel panel-default">
Index: lams_admin/web/sysadmin.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/sysadmin.jsp	(.../sysadmin.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/sysadmin.jsp	(.../sysadmin.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -15,7 +15,6 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title"><fmt:message key="sysadmin.maintain"/></c:set>
 	<lams:Page type="admin" title="${title}">
 			<c:forEach items="${groupedLinks}" var="links">
 				<div class="panel panel-default">
Index: lams_admin/web/taglibs.jsp
===================================================================
diff -u -r550e1b37b507779064955267ef47e9085f791357 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/taglibs.jsp	(.../taglibs.jsp)	(revision 550e1b37b507779064955267ef47e9085f791357)
+++ lams_admin/web/taglibs.jsp	(.../taglibs.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -11,3 +11,4 @@
 <%@ taglib uri="tags-html-el" prefix="html-el" %>
 <%@ taglib uri="tags-bean-el" prefix="bean-el" %>
 <%@ taglib uri="tags-logic-el" prefix="logic-el" %>
+
Index: lams_admin/web/themeManagement.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/themeManagement.jsp	(.../themeManagement.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -75,7 +75,6 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title"><fmt:message key="admin.themes.title"/></c:set>
 	<lams:Page type="admin" title="${title}" formID="themeForm">
 			<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
Index: lams_admin/web/timezoneManagement.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/timezoneManagement.jsp	(.../timezoneManagement.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/timezoneManagement.jsp	(.../timezoneManagement.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -36,7 +36,6 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title"><fmt:message key="admin.timezone.title"/></c:set>
 	<c:set var="help"><fmt:message key="LAMS+Configuration"/></c:set>
 	<c:set var="help"><lams:help style="small" page="${help}" /></c:set>
 		<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
@@ -62,7 +61,7 @@
 					<tr>
 						<th width="10%" align="center"><fmt:message key="admin.timezone.select" />
 						<!-- added this check box for the user to enable all available time zones -->
-						  <html:checkbox property="selected" styleId="currentSelectAllTZ"> </html:checkbox>
+						  <form:checkbox path="${selected}" id="currentSelectAllTZ"/>
 						</th>
 						<th width="22%"><fmt:message key="admin.timezone.time.zone.id" /></th>
 						<th width="24%" align="center"><fmt:message key="admin.timezone.raw.offset" /></th>
Index: lams_admin/web/timezoneServerManagement.jsp
===================================================================
diff -u -r1ba327f73cb27c822d8a4ef36c386dd5a1432aef -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/timezoneServerManagement.jsp	(.../timezoneServerManagement.jsp)	(revision 1ba327f73cb27c822d8a4ef36c386dd5a1432aef)
+++ lams_admin/web/timezoneServerManagement.jsp	(.../timezoneServerManagement.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -39,7 +39,7 @@
 </lams:head>
     
 <body class="stripes">
-			<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+			<lams:Page type="admin" title="${title}">
 				<h4 class="loffset10"><fmt:message key="admin.servertimezone.select.server.timezone" /></h4>
 				<div style="padding: 13px 20px 20px;">
 			
Index: lams_admin/web/toolcontent/toolcontentlist.jsp
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/web/toolcontent/toolcontentlist.jsp	(.../toolcontentlist.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -24,7 +24,7 @@
 				'height'   : 700,
 				'title'	   : '<fmt:message key="tool.groups.dialog.title" />',
 				'open' 	   : function(){
-					$('#toolGroupsFrame', this).attr('src', 'toolcontentlist/openLearningLibraryGroups.do');
+					$('#toolGroupsFrame', this).attr('src', './openLearningLibraryGroups.do');
 				},
 				'beforeClose'	   : function(){
 					$('#toolGroupsFrame', this).attr('src', null);
@@ -50,7 +50,6 @@
     
 <body class="stripes">
 	
-	<c:set var="title"><fmt:message key="sysadmin.tool.management"/></c:set>
 	<lams:Page type="admin" title="${title}">
 				<p><a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default"><fmt:message key="sysadmin.maintain" /></a></p>
 
@@ -110,10 +109,10 @@
 							<td>
 								<c:choose>
 									<c:when test="${learningLibraryValidity[dto.learningLibraryID]}">
-										[<a id="disable${dto.activityTitle}" href="<c:url value='toolcontentlist/disable.do?libraryID=${dto.learningLibraryID}' />"><fmt:message key="admin.disable" /></a>] 
+										[<a id="disable${dto.activityTitle}" href="<c:url value='../toolcontentlist/disable.do?libraryID=${dto.learningLibraryID}' />"><fmt:message key="admin.disable" /></a>] 
 									</c:when>
 									<c:otherwise>
-										[<a id="enable${dto.activityTitle}" href="<c:url value='toolcontentlist/enable.do?libraryID=${dto.learningLibraryID}'/>"><fmt:message key="admin.enable" /></a>]
+										[<a id="enable${dto.activityTitle}" href="<c:url value='../toolcontentlist/enable.do?libraryID=${dto.learningLibraryID}'/>"><fmt:message key="admin.enable" /></a>]
 									</c:otherwise>
 								</c:choose>
 								<c:if test="${not empty dto.toolContentID}">
Index: lams_admin/web/user.jsp
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/user.jsp	(.../user.jsp)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/web/user.jsp	(.../user.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -3,7 +3,11 @@
 <%@ include file="/taglibs.jsp"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
-<%@ page import="org.apache.struts.action.ActionMessages"%>
+<c:set var="minNumChars"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%></c:set>
+<c:set var="mustHaveUppercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%></c:set>
+<c:set var="mustHaveLowercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%></c:set>
+<c:set var="mustHaveNumerics"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%></c:set>
+<c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
 
 <lams:html>
 <lams:head>
@@ -16,12 +20,6 @@
 	<script language="JavaScript" type="text/JavaScript" src="<lams:LAMSURL/>/includes/javascript/changeStyle.js"></script>
 	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
 	
-	<c:set var="minNumChars"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%></c:set>
-	<c:set var="mustHaveUppercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%></c:set>
-	<c:set var="mustHaveLowercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_LOWERCASE)%></c:set>
-	<c:set var="mustHaveNumerics"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%></c:set>
-	<c:set var="mustHaveSymbols"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_SYMBOLS)%></c:set>
-	
 	<lams:css/>
 	
 	<script src="/lams/includes/javascript/jquery.js"></script>
@@ -153,37 +151,36 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="subtitle"><fmt:message key="admin.user.edit"/></c:set>	
-	<c:if test="${not empty subtitle}">
-		<c:set var="title">${title}: <fmt:message key="${subtitle}"/></c:set>
-	</c:if>
+
+	<c:set var="title">${title}: <fmt:message key="admin.user.edit"/></c:set>
 	
-	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
-				<form:form id="userForm" action="saveUserDetails.do" modelAttribute="userForm" method="post">
+	<lams:Page type="admin" title="${title}" formID="userForm">
+	
+				<form:form id="userForm" action="../usersave/saveUserDetails.do" modelAttribute="userForm" method="post">
 				<form:hidden path="userId" />
 				<form:hidden path="orgId" />
 			
 				<c:if test="${not empty userForm.orgId}">
-					<a href="orgmanage.do?org=1" class="btn btn-default">
+					<a href="../orgmanage.do?org=1" class="btn btn-default">
 						<fmt:message key="admin.course.manage" />
 					</a>
 					<c:if test="${not empty pOrgId}">
-						: <a href="orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default">
+						: <a href="../orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default">
 							<c:out value="${parentName}" />
 						  </a>
-						: <a href="usermanage.do?org=<c:out value="${userForm.orgId}" />" class="btn btn-default">
+						: <a href="../usermanage.do?org=<c:out value="${userForm.orgId}" />" class="btn btn-default">
 							<c:out value="${orgName}" />
 						  </a>
 					</c:if>
 					<c:if test="${empty pOrgId}">
-						: <a href="orgmanage.do?org=<c:out value="${userForm.orgId}" />" class="btn btn-default">
+						: <a href="../orgmanage.do?org=<c:out value="${userForm.orgId}" />" class="btn btn-default">
 							<c:out value="${orgName}" />
 						  </a>
 					</c:if>
 				</c:if>
 			
 				<c:if test="${empty userForm.orgId}">
-					<a href="orgmanage.do?org=1" class="btn btn-default">
+					<a href="../orgmanage.do?org=1" class="btn btn-default">
 						<fmt:message key="admin.course.manage" />
 					</a>
 				</c:if>
@@ -196,11 +193,11 @@
 			                    <c:out value="${error}" />
 			                </c:forEach>
 			            </lams:Alert>
-			        </c:if
+			        </c:if>
 			
 				<div class="panel panel-default voffset5">
 					<div class="panel-heading">
-						<span class="panel-title"> <c:if test="${not empty userForm.userId}>
+						<span class="panel-title"> <c:if test="${not empty userForm.userId}">
 								<fmt:message key="admin.user.edit" />
 							</c:if> <c:if test="${empty userForm.userId}">
 								<fmt:message key="admin.user.create" />
@@ -268,7 +265,7 @@
 								<td class="align-right"><fmt:message key="admin.user.login" />
 									*:</td>
 								<td><input type="text" id="login" name="login"  maxlength="50"
-										class="form-control" /></td>
+										class="form-control" value="${userForm.login}"/></td>
 							</tr>
 							<c:if test="${empty userForm.userId}">
 							<tr>
@@ -299,102 +296,102 @@
 							<tr>
 								<td class="align-right"><fmt:message key="admin.user.title" />:</td>
 								<td><input type="text" name="title" size="32" maxlength="32"
-										id="title" class="form-control" /></td>
+										id="title" class="form-control" value="${userForm.title}"/></td>
 							</tr>
 							<tr>
 								<td class="align-right"><fmt:message
 										key="admin.user.first_name" /> *:</td>
 								<td><input type="text" name="firstName" 
-										id="firstName" maxlength="128" class="form-control" /></td>
+										id="firstName" maxlength="128" class="form-control" value="${userForm.firstName}"/></td>
 							</tr>
 							<tr>
 								<td class="align-right"><fmt:message
 										key="admin.user.last_name" /> *:</td>
 								<td><input type="text" name="lastName" 
-										id="lastName" maxlength="128" class="form-control" /></td>
+										id="lastName" maxlength="128" class="form-control" value="${userForm.lastName}"/></td>
 							</tr>
 							<tr>
 								<td class="align-right"><fmt:message key="admin.user.email" />
 									*:</td>
 								<td><input type="text" name="email" maxlength="128"
-										class="form-control" /></td>
+										class="form-control" value="${userForm.email}"/></td>
 							</tr>
 							<tr>
 								<td class="align-right"><fmt:message
 										key="admin.user.address_line_1" />:</td>
 								<td><input type="text" name="addressLine1" 
-										maxlength="64" class="form-control" /></td>
+										maxlength="64" class="form-control" value="${userForm.addressLine1}"/></td>
 							</tr>
 							<tr>
 								<td class="align-right"><fmt:message
 										key="admin.user.address_line_2" />:</td>
 								<td><input type="text" name="addressLine2" 
-										maxlength="64" class="form-control" /></td>
+										maxlength="64" class="form-control" value="${userForm.addressLine2}"/></td>
 							</tr>
 							<tr>
 								<td class="align-right"><fmt:message
 										key="admin.user.address_line_3" />:</td>
 								<td><input type="text" name="addressLine3" 
-										maxlength="64" class="form-control" /></td>
+										maxlength="64" class="form-control" value="${userForm.addressLine3}"/></td>
 							</tr>
 							<tr>
 								<td class="align-right"><fmt:message key="admin.user.city" />:</td>
 								<td><input type="text" name="city"  maxlength="64"
-										class="form-control" /></td>
+										class="form-control" value="${userForm.city}"/></td>
 							</tr>
 							<tr>
 								<td class="align-right">
 									<fmt:message key="admin.user.postcode" />:
 								</td>
 								<td>
-									<input type="text" name="postcode" size="10" maxlength="10" class="form-control" />
+									<input type="text" name="postcode" size="10" maxlength="10" class="form-control" value="${userForm.postcode}"/>
 								</td>
 							</tr>
 							<tr>
 								<td class="align-right">	
 									<fmt:message key="admin.user.state" />:
 								</td>
 								<td><input type="text" name="state"  maxlength="64"
-										class="form-control" />
+										class="form-control" value="${userForm.state}" />
 								</td>
 							</tr>
 							<tr>
 								<td class="align-right">
 									<fmt:message key="admin.user.country" />:
 								</td>
 								<td><input type="text" name="country"  maxlength="64"
-										class="form-control" />
+										class="form-control" value="${userForm.country}"/>
 								</td>
 							</tr>
 							<tr>
 								<td class="align-right">
 									<fmt:message key="admin.user.day_phone" />:
 								</td>
 								<td>
-									<input type="text" name="dayPhone"  maxlength="64" class="form-control" />
+									<input type="text" name="dayPhone"  maxlength="64" class="form-control" value="${userForm.dayPhone}"/>
 								</td>
 							</tr>
 							<tr>
 								<td class="align-right">
 									<fmt:message key="admin.user.evening_phone" />:
 								</td>
 								<td>
-									<input type="text" name="eveningPhone" maxlength="64" class="form-control" />		
+									<input type="text" name="eveningPhone" maxlength="64" class="form-control" value="${userForm.eveningPhone}" />		
 								</td>
 							</tr>
 							<tr>
 								<td class="align-right">
 									<fmt:message key="admin.user.mobile_phone" />:
 								</td>
 								<td>
-									<input type="text" name="mobilePhone" maxlength="64" class="form-control" />
+									<input type="text" name="mobilePhone" maxlength="64" class="form-control" value="${userForm.mobilePhone}" />
 								</td>
 							</tr>
 							<tr>
 								<td class="align-right">
 									<fmt:message key="admin.user.fax" />:</td>
 								<td>
-									<input type="text" name="fax"  maxlength="64" class="form-control" />
+									<input type="text" name="fax"  maxlength="64" class="form-control" value="${userForm.fax}"/>
 								</td>
 							</tr>
 			
@@ -418,7 +415,7 @@
 									<fmt:message key="admin.user.time.zone" />:
 								</td>
 								<td>
-									<form:select property="timeZone" cssClass="form-control">
+									<form:select path="timeZone" cssClass="form-control">
 										<c:forEach items="${timezoneDtos}" var="timezoneDto">
 											<form:option value="${timezoneDto.timeZoneId}">
 												${timezoneDto.timeZoneId} - ${timezoneDto.displayName}
@@ -467,9 +464,9 @@
 					
 					<div class="row">
 					<div class="col-md-12">
-						<c:if test="${not empty userForm.userId}>
+						<c:if test="${not empty userForm.userId}">
 							<div class="pull-left">
-							<a href="userChangePass.jsp?userId=<c:out value="${userForm.userId}" />&login=<c:out value="${userForm.login}" />" class="btn btn-primary"><fmt:message key="admin.user.changePassword" /></a>
+							<a href="userChangePass.jsp?userId=${userForm.userId}&login=${userForm.login}" class="btn btn-primary"><fmt:message key="admin.user.changePassword" /></a>
 							</div>
 						</c:if>
 						<div class="pull-right">
Index: lams_admin/web/userChangePass.jsp
===================================================================
diff -u -rce9875cacd54d5d9b3c6a8425c19164e77fe6c49 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/userChangePass.jsp	(.../userChangePass.jsp)	(revision ce9875cacd54d5d9b3c6a8425c19164e77fe6c49)
+++ lams_admin/web/userChangePass.jsp	(.../userChangePass.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -2,7 +2,6 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ page import="org.lamsfoundation.lams.util.Configuration"%>
 <%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
-<%@ page import="org.apache.struts.action.ActionMessages"%>
 <c:set var="minNumChars"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_MINIMUM_CHARACTERS)%></c:set>
 <c:set var="mustHaveUppercase"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_UPPERCASE)%></c:set>
 <c:set var="mustHaveNumerics"><%=Configuration.get(ConfigurationKeys.PASSWORD_POLICY_NUMERICS)%></c:set>
Index: lams_admin/web/userlist.jsp
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/web/userlist.jsp	(.../userlist.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -58,16 +58,15 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
-	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+	<lams:Page type="admin" title="${title}">
 				
 			<p>
 				<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
 				<c:if test="${orgType == 2}">
 					: <a href="orgmanage.do?org=<c:out value="${userManageForm.orgId}" />" class="btn btn-default"><c:out value="${userManageForm.orgName}" /></a>
 				</c:if>
 				<c:if test="${orgType == 3}">
-					: <a href="orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><bean:write name="pOrgName"/></a>
+					: <a href="orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><c:out value="${pOrgName}"/></a>
 					: <a href="orgmanage.do?org=<c:out value="${userManageForm.orgId}" />" class="btn btn-default"><c:out value="${userManageForm.orgName}"/></a>
 				</c:if>
 			</p>
@@ -83,12 +82,12 @@
 						</c:if>
 					</span>
 					<div class="pull-right btn-group btn-group-sm">
-						<input id="addRemoveUsers" class="btn btn-default" type="button" value="<fmt:message key="admin.user.add"/>" onclick=javascript:document.location='userorg.do?orgId=<c:out value="${userManageForm.orgId}"/>' />
+						<input id="addRemoveUsers" class="btn btn-default" type="button" value="<fmt:message key="admin.user.add"/>" onclick="javascript:document.location='userorg.do?orgId=<c:out value="${userManageForm.orgId}"/>'" />
 						<c:if test="${userManageForm.canResetOrgPassword == true}">
-							<a class="btn btn-default" href="orgPasswordChange.do?organisationID=<c:out value="${userManageForm.orgId}"/>"><fmt:message key='admin.org.password.change.button'/></a>
+							<a class="btn btn-default" href="orgPasswordChange/start.do?organisationID=<c:out value="${userManageForm.orgId}"/>"><fmt:message key='admin.org.password.change.button'/></a>
 						</c:if>
 						<c:if test="${userManageForm.courseAdminCanAddNewUsers == true}">
-							<input class="btn btn-default" type="button" value="<fmt:message key="admin.user.create"/>" onclick=javascript:document.location='user/edit.do?orgId=<c:out value="${userManageForm.orgId}"/>' />
+							<input class="btn btn-default" type="button" value="<fmt:message key="admin.user.create"/>" onclick="javascript:document.location='user/edit.do?orgId=<c:out value="${userManageForm.orgId}"/>'" />
 						</c:if>
 					</div>
 				</div>
@@ -175,11 +174,11 @@
 								<a href="userroles.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><fmt:message key="admin.user.assign.roles"/></a>
 								&nbsp;
 								<c:if test="${userManageForm.courseAdminCanAddNewUsers == true }">
-									<a href="user/edit.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageBean.orgId}"/>"><fmt:message key="admin.edit" /></a>
+									<a href="user/edit.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><fmt:message key="admin.edit" /></a>
 									&nbsp;
 								</c:if>
 								<c:if test="${canDeleteUser == true}">
-									<a href="user/remove.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageBean.orgId"/>"><fmt:message key="admin.user.delete"/></a>
+									<a href="user/remove.do?userId=<c:out value="${userManageBean.userId}" />&orgId=<c:out value="${userManageForm.orgId}"/>"><fmt:message key="admin.user.delete"/></a>
 								</c:if>
 								<br/>
 						</td>		
Index: lams_admin/web/userorg.jsp
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/web/userorg.jsp	(.../userorg.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -149,19 +149,15 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="subtitle"><fmt:message key="admin.user.add"/></c:set>	
-	<c:if test="${not empty subtitle}">
-		<c:set var="title">${title}: <fmt:message key="${subtitle}"/></c:set>
-	</c:if>
-	
-	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
+	<c:set var="title">${title}: <fmt:message key="admin.user.add"/></c:set>
+	<lams:Page type="admin" title="${title}">
 				<p>
 					<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
 				    <c:if test="${not empty pOrgId}">
-				        : <a href="orgmanage.do?org=<c:out value="pOrgId" />" class="btn btn-default"><bean:write name="pOrgName"/></a>
+				        : <a href="orgmanage.do?org=<c:out value="pOrgId" />" class="btn btn-default"><c:out value="${pOrgName}"/></a>
 				    </c:if>
 				    <c:if test="${userOrgForm.orgId != 1}">
-						: <a href="<c:if test="${userOrgForm.orgType == 3}">user</c:if><c:if test="${userOrgForm.orgType != 3}"/>org</c:if>manage.do?org=<c:out value="${userOrgForm.orgId}" />" class="btn btn-default">
+						: <a href="<c:if test="${userOrgForm.orgType == 3}">user</c:if><c:if test="${userOrgForm.orgType != 3}">org</c:if>manage.do?org=<c:out value="${userOrgForm.orgId}" />" class="btn btn-default">
 						<c:out value="${userOrgForm.orgName}"/></a>
 					</c:if>
 					<c:if test="${userOrgForm.orgId == 1}">
@@ -220,7 +216,7 @@
 				
 				<div id="form" class="pull-right">
 					<form:form action="userorgsave.do" modelAttribute="userOrgForm" id="userOrgForm" method="post">
-						<form:hidden property="orgId" />
+						<form:hidden path="orgId" />
 						<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default">
 						<input type="submit" id="nextButton" class="btn btn-primary loffset5" onclick="return populateForm();" value="<fmt:message key="label.next"/>" />
 					</form:form>
Index: lams_admin/web/userorgrole.jsp
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/web/userorgrole.jsp	(.../userorgrole.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -15,19 +15,15 @@
 	
 	<script language="javascript" type="text/JavaScript">
 	function toggleCheckboxes(roleIndex, object){
-		<c:forEach var="userBean" items="${UserOrgRoleForm.userBeans}" indexId="beanIndex" >
+		<c:forEach var="userBean" items="${userOrgRoleForm.userBeans}" indexId="beanIndex" >
 		document.forms.UserOrgRoleForm.elements[roleIndex+1+<c:out value="${numroles}" />*(<c:out value="${beanIndex}" />+1)].checked=object.checked;
 		</c:forEach>
 	}
 	</script>
 </lams:head>
     
 <body class="stripes">
-	<c:set var="subtitle" value="<fmt:message key="admin.user.assign.roles"/>">	
-	<c:if test="${not empty subtitle}">
-		<c:set var="title">${title}: <fmt:message key="${subtitle}"/></c:set>
-	</c:if>
-	
+	<c:set var="title">${title}: <fmt:message key="admin.user.assign.roles"/></c:set>
 	<lams:Page type="admin" title="${title}" formID="userOrgRoleForm">
 				<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
 			    <c:if test=${not empty pOrgId}>
Index: lams_admin/web/userrole.jsp
===================================================================
diff -u -rd4dec47dab74477560cfee18e74c7e4494bd1426 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision d4dec47dab74477560cfee18e74c7e4494bd1426)
+++ lams_admin/web/userrole.jsp	(.../userrole.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -15,73 +15,63 @@
 </lams:head>
     
 <body class="stripes">
-	<c:set var="subtitle"><fmt:message key="admin.user.assign.roles"/></c:set>	
-	<c:if test="${not empty subtitle}">
-		<c:set var="title">${title}: <fmt:message key="${subtitle}"/></c:set>
-	</c:if>
-	
-	<lams:Page type="admin" title="${title}" titleHelpURL="${help}">
-
+	<c:set var="title">${title}: <fmt:message key="admin.user.assign.roles"/></c:set>
+	<lams:Page type="admin" title="${title}">
+		<form:form action="./userrolessave.do" modelAttribute="userRolesForm" id="userRolesForm" method="post">
+		<form:hidden path="userId" />
+		<form:hidden path="orgId" />
+		<p>
+			<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+			<c:if test="${not empty pOrgId}">
+				: <a href="orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><c:out value="${parentName}" /></a>
+				: <a href="usermanage.do?org=<c:out value="${userRolesForm.orgId}" />" class="btn btn-default"><c:out value="${orgName}" /></a>
+			</c:if>
+			<c:if test="${empty pOrgId}">
+				<c:if test="${userRolesForm.orgId != 1}">
+					: <a href="orgmanage.do?org=<c:out value="${userRolesForm.orgId}" />" class="btn btn-default"><c:out value="${orgName}" /></a>
+				</c:if>
+				<c:if test="${userRolesForm.orgId == 1}">
+					: <a href="usermanage.do?org=<c:out value="${userRolesForm.orgId}" />" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
+				</c:if>
+			</c:if>
+		</p>
+		
+		<p><fmt:message key="msg.roles.mandatory"/></p>
+		
+		<div align="center"><html-el:errors/><html-el:messages id="roles" message="true"><c:out value="${roles}" /></html-el:messages></div>
+		
+		<div class="container-fluid">
+		<div class="row">
+		  <div class="col-xs-2"><fmt:message key="admin.user.login"/>:</div>
+		  <div class="col-xs-10"><c:out value="${login}" /></div>
+		</div>
+		
+		<div class="row">
+		  <div class="col-xs-2"><fmt:message key="admin.user.name"/>:</div>
+		  <div class="col-xs-10"><c:out value="${fullName}" /></div>
+		</div>
+		
+		<div class="row">
+		  <div class="col-xs-2"><fmt:message key="admin.user.roles"/>:</div>
+		  <div class="col-xs-10">            
+		  	<c:forEach items="${rolelist}" var="role">
+		    	<form:select path="roles" multiple="true" items="${userRolesForm.roles}" itemValue="${role.roleId}"/>
+		        <fmt:message>role.<lams:role role="${role.name}" /></fmt:message><br/>
+		    </c:forEach>
+		  </div>
+		</div>
+		</div>
+		
+		<div class="pull-right">
+			<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default">
+			<input type="reset" class="btn btn-default" value="<fmt:message key="admin.reset" />" />
+			<input type="submit" name="submitbutton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
+		</div>
+		
+		</form:form>
 	</lams:Page>
 
 
 </body>
 </lams:html>
 
-
-
-
-<%@ include file="/taglibs.jsp"%>
-
-<form:form action="./userrolessave.do" modelAttribute="userRolesForm" id="userRolesForm" method="post">
-<form:hidden path="userId" />
-<form:hidden path="orgId" />
-<p>
-	<a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-	<c:if test="${not empty pOrgId}">
-		: <a href="orgmanage.do?org=<c:out value="${pOrgId}" />" class="btn btn-default"><c:out value="${parentName}" /></a>
-		: <a href="usermanage.do?org=<c:out value="${userRolesForm.orgId}" />" class="btn btn-default"><c:out value="${orgName}" /></a>
-	</c:if>
-	<c:if test="${empty pOrgId}">
-		<c:if test=${userRolesForm.orgId != 1}">
-			: <a href="orgmanage.do?org=<c:out value="${userRolesForm.orgId}" />" class="btn btn-default"><c:out value="${orgName}" /></a>
-		</c:if>
-		<c:if test=${userRolesForm.orgId == 1}">
-			: <a href="usermanage.do?org=<c:out value="${userRolesForm.orgId}" />" class="btn btn-default"><fmt:message key="admin.global.roles.manage" /></a>
-		</c:if>
-	</c:if>
-</p>
-
-<p><fmt:message key="msg.roles.mandatory"/></p>
-
-<div align="center"><html-el:errors/><html-el:messages id="roles" message="true"><c:out value="${roles}" /></html-el:messages></div>
-
-<div class="container-fluid">
-<div class="row">
-  <div class="col-xs-2"><fmt:message key="admin.user.login"/>:</div>
-  <div class="col-xs-10"><c:out value="${login}" /></div>
-</div>
-
-<div class="row">
-  <div class="col-xs-2"><fmt:message key="admin.user.name"/>:</div>
-  <div class="col-xs-10"><c:out value="${fullName}" /></div>
-</div>
-
-<div class="row">
-  <div class="col-xs-2"><fmt:message key="admin.user.roles"/>:</div>
-  <div class="col-xs-10">            
-  	<c:forEach items="${rolelist}" var="role">
-    	<form:multibox path="${userRolesForm.roles}" value="${role.roleId}"/>
-        <fmt:message>role.<lams:role role="${role.name}" /></fmt:message><br/>
-    </c:forEach>
-  </div>
-</div>
-</div>
-
-<div class="pull-right">
-	<input type="submit" name="CANCEL" value="<fmt:message key="admin.cancel"/>" onclick="bCancel=true;" class="btn btn-default">
-	<input type="reset" class="btn btn-default" value="<fmt:message key="admin.reset" />" />
-	<input type="submit" name="submitbutton" class="btn btn-primary loffset5" value="<fmt:message key="admin.save" />" />
-</div>
-
-</form:form>
Index: lams_admin/web/usersearchlist.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0aee88559b0d79e0516dd3630c24111361aeb787
--- lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_admin/web/usersearchlist.jsp	(.../usersearchlist.jsp)	(revision 0aee88559b0d79e0516dd3630c24111361aeb787)
@@ -1,164 +1,188 @@
+<!DOCTYPE html>
+
 <%@ include file="/taglibs.jsp"%>
 <c:set var="lams"><lams:LAMSURL /></c:set>
-
 <c:set var="useInternalSMTPServer"><lams:Configuration key="InternalSMTPServer"/></c:set>
 <c:set var="smtpServer"><lams:Configuration key="SMTPServer"/></c:set>
 
-<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
-<link type="text/css" href="${lams}css/jquery.tablesorter.pager.css" rel="stylesheet">
-<style>
-	#tablesorter thead .disabled {
-		display: none
-	}
-</style>
+<lams:html>
+<lams:head>
+	<c:set var="title"><fmt:message key="admin.user.management"/></c:set>
+	<title>${title}</title>
 
-<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
-<script type="text/javascript" src="${lams}/includes/javascript/portrait.js" ></script>
-
-<script type="text/javascript">
-  	$(document).ready(function(){
-  	
-  		var $table = $(".tablesorter").tablesorter({
-  			theme: 'bootstrap',
-  			headerTemplate : '{content} {icon}',
-			widgets: ["uitheme", "zebra", "filter"],
-		    widgetOptions : {
-		    	filter_external : '.search',
-		        // include column filters
-		        filter_columnFilters: false,
-		        filter_placeholder: { search : 'Search...' },
-		        filter_saveFilters : true,
-		        filter_reset: '.reset'
-		      },
-		    widthFixed: true,
-			headers : { 5 : { sorter: false } },
-		    sortInitialOrder: 'desc',
-            sortList: [[1]] 
-		});
-		
-		$(".tablesorter").each(function() {
-			$(this).tablesorterPager({
-				savePages: false,
-                container: $(this).find(".ts-pager"),
-                output: '{startRow} to {endRow} ({totalRows})',
-                cssPageDisplay: '.pagedisplay',
-                cssPageSize: '.pagesize',
-                cssDisabled: 'disabled',
-                ajaxUrl : "<c:url value='/usersearch.do'/>?dispatch=getPagedUsers&page={page}&size={size}&{sortList:column}&{filterList:fcol}",
-				ajaxProcessing: function (data, table) {
-
-			    	if (data && data.hasOwnProperty('rows')) {
-			    		var rows = [],
-			            json = {};
-			    		
-						for (i = 0; i < data.rows.length; i++){
-							var orgData = data.rows[i];
-							
-							rows += '<tr>';
-							
-							rows += '<td>';
-							rows += 	definePortraitPopover(orgData["portraitId"], orgData["userId"], orgData["userId"], orgData["userId"]);
-							rows += '</td>';
-
-							rows += '<td>';
-							rows += 	definePortraitPopover(orgData["portraitId"], orgData["userId"], orgData["login"], orgData["login"]);
-							rows += '</td>';
-
-							rows += '<td>';
-							rows += 	orgData["firstName"];
-							rows += '</td>';
-
-							rows += '<td>';
-							rows += 	orgData["lastName"];
-							rows += '</td>';
-
-							rows += '<td>';
-							rows += 	orgData["email"];
-							rows += '</td>';
-							
-							rows += '<td>';
-							rows += 	'[<a href="user.do?method=edit&userId=' + orgData["userId"] + '">';
-							rows += 		'<fmt:message key="admin.edit"/>';
-							rows += 	'</a>]';
-							rows += 	'&nbsp;';
-							rows += 	'[<a href="user.do?method=remove&userId=' + orgData["userId"] + '">';
-							rows += 		'<fmt:message key="admin.user.delete"/>';
-							rows += 	'</a>]';
-							rows += 	'&nbsp;';
-							rows += 	'[<a href="<lams:LAMSURL/>/loginas.do?login=' + orgData["login"] + '">';
-							rows += 		'<fmt:message key="label.login.as"/>';
-							rows += 	'</a>]';
-							rows += 	'&nbsp;';
-
-							if (${(useInternalSMTPServer || not empty smtpServer)} && orgData["email"] != null && orgData["email"] != "") {
-							rows += 	'[<a href="<lams:LAMSURL/>emailUser.do?method=composeMail&returnUrl=admin/usersearch.do&userID=' + orgData["userId"] + '">';
-							rows += 		'<fmt:message key="label.email"/>';
-							rows += 	'</a>]';
+	<lams:css/>
+	<link rel="stylesheet" href="<lams:LAMSURL/>/admin/css/admin.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-smoothness-theme.css" type="text/css" media="screen">
+	<script language="JavaScript" type="text/JavaScript" src="<lams:LAMSURL/>/includes/javascript/changeStyle.js"></script>
+	<link rel="shortcut icon" href="<lams:LAMSURL/>/favicon.ico" type="image/x-icon" />
+	
+	<link rel="stylesheet" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
+	<link type="text/css" href="${lams}css/jquery.tablesorter.pager.css" rel="stylesheet">
+	<style>
+		#tablesorter thead .disabled {
+			display: none
+		}
+	</style>
+	
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-pager.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/jquery.tablesorter-widgets.js"></script>
+	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${lams}/includes/javascript/portrait.js" ></script>
+	
+	<script type="text/javascript">
+	  	$(document).ready(function(){
+	  	
+	  		var $table = $(".tablesorter").tablesorter({
+	  			theme: 'bootstrap',
+	  			headerTemplate : '{content} {icon}',
+				widgets: ["uitheme", "zebra", "filter"],
+			    widgetOptions : {
+			    	filter_external : '.search',
+			        // include column filters
+			        filter_columnFilters: false,
+			        filter_placeholder: { search : 'Search...' },
+			        filter_saveFilters : true,
+			        filter_reset: '.reset'
+			      },
+			    widthFixed: true,
+				headers : { 5 : { sorter: false } },
+			    sortInitialOrder: 'desc',
+	            sortList: [[1]] 
+			});
+			
+			$(".tablesorter").each(function() {
+				$(this).tablesorterPager({
+					savePages: false,
+	                container: $(this).find(".ts-pager"),
+	                output: '{startRow} to {endRow} ({totalRows})',
+	                cssPageDisplay: '.pagedisplay',
+	                cssPageSize: '.pagesize',
+	                cssDisabled: 'disabled',
+	                ajaxUrl : "<c:url value='/usersearch/getPagedUsers.do'/>?page={page}&size={size}&{sortList:column}&{filterList:fcol}",
+					ajaxProcessing: function (data, table) {
+	
+				    	if (data && data.hasOwnProperty('rows')) {
+				    		var rows = [],
+				            json = {};
+				    		
+							for (i = 0; i < data.rows.length; i++){
+								var orgData = data.rows[i];
+								
+								rows += '<tr>';
+								
+								rows += '<td>';
+								rows += 	definePortraitPopover(orgData["portraitId"], orgData["userId"], orgData["userId"], orgData["userId"]);
+								rows += '</td>';
+	
+								rows += '<td>';
+								rows += 	definePortraitPopover(orgData["portraitId"], orgData["userId"], orgData["login"], orgData["login"]);
+								rows += '</td>';
+	
+								rows += '<td>';
+								rows += 	orgData["firstName"];
+								rows += '</td>';
+	
+								rows += '<td>';
+								rows += 	orgData["lastName"];
+								rows += '</td>';
+	
+								rows += '<td>';
+								rows += 	orgData["email"];
+								rows += '</td>';
+								
+								rows += '<td>';
+								rows += 	'[<a href="user/edit.do?userId=' + orgData["userId"] + '">';
+								rows += 		'<fmt:message key="admin.edit"/>';
+								rows += 	'</a>]';
+								rows += 	'&nbsp;';
+								rows += 	'[<a href="user/remove.do?userId=' + orgData["userId"] + '">';
+								rows += 		'<fmt:message key="admin.user.delete"/>';
+								rows += 	'</a>]';
+								rows += 	'&nbsp;';
+								rows += 	'[<a href="<lams:LAMSURL/>/loginas.do?login=' + orgData["login"] + '">';
+								rows += 		'<fmt:message key="label.login.as"/>';
+								rows += 	'</a>]';
+								rows += 	'&nbsp;';
+	
+								if (${(useInternalSMTPServer || not empty smtpServer)} && orgData["email"] != null && orgData["email"] != "") {
+								rows += 	'[<a href="<lams:LAMSURL/>emailUser.do?method=composeMail&returnUrl=admin/usersearch.do&userID=' + orgData["userId"] + '">';
+								rows += 		'<fmt:message key="label.email"/>';
+								rows += 	'</a>]';
+								}
+								
+								rows += '</td>';
+								
+								rows += '</tr>';
 							}
-							
-							rows += '</td>';
-							
-							rows += '</tr>';
-						}
-			            
-						json.total = data.total_rows;
-						json.rows = $(rows);
-						return json;
-			            
-			    	}
-				}
-            })
-            .bind('pagerInitialized pagerComplete', function(event, options){
-				initializePortraitPopover('${lams}');
-			})
+				            
+							json.total = data.total_rows;
+							json.rows = $(rows);
+							return json;
+				            
+				    	}
+					}
+	            })
+	            .bind('pagerInitialized pagerComplete', function(event, options){
+					initializePortraitPopover('${lams}');
+				})
+	
+			});
+			
+			// make demo search buttons work
+			$('button[data-column]').on('click', function(){
+				var $this = $(this),
+			    	filter = [];
+	
+			    // text to add to filter
+			    filter[ $this.data('1') ] = $this.text();
+			    $table.trigger('search', [ filter ]);
+			    return false;
+			});
+	  	})
+	</script>
+</lams:head>
+    
+<body class="stripes">
 
-		});
+	<lams:Page type="admin" title="${title}">
+		<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
+		<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default loffset5"><fmt:message key="sysadmin.maintain" /></a></p>
 		
-		// make demo search buttons work
-		$('button[data-column]').on('click', function(){
-			var $this = $(this),
-		    	filter = [];
+		<p><input class="btn btn-default" type="button" value="<fmt:message key="admin.user.create"/>" onclick="javascript:document.location='user/edit.do'" />
+		
+		<span class="pull-right">
+			<fmt:message key="admin.search" />:&nbsp;<input class="search form-control form-control-inline" type="search" data-column="1">
+		</span>
+		</p>
+		
+		<lams:TSTable numColumns="6"> 
+			<th width="3%">
+				<fmt:message key="admin.user.userid"/>
+			</th>
+			<th width="15%" align="center">
+				<fmt:message key="admin.user.login"/>
+			</th>
+			<th width="15%" align="center">
+				<fmt:message key="admin.user.first_name"/>
+			</th>
+			<th width="15%" align="center">
+				<fmt:message key="admin.user.last_name"/>
+			</th>
+			<th width="15%" align="center">
+				<fmt:message key="admin.user.email"/>
+			</th>
+			<th width="20%" align="center">
+				<fmt:message key="admin.user.actions"/>
+			</th>
+		</lams:TSTable>			
+				
+	</lams:Page>
 
-		    // text to add to filter
-		    filter[ $this.data('1') ] = $this.text();
-		    $table.trigger('search', [ filter ]);
-		    return false;
-		});
-  	})
-</script>
+</body>
+</lams:html>
 
-<p><a href="orgmanage.do?org=1" class="btn btn-default"><fmt:message key="admin.course.manage" /></a>
-<a href="<lams:LAMSURL/>/admin/sysadminstart.do" class="btn btn-default loffset5"><fmt:message key="sysadmin.maintain" /></a></p>
 
-<p><input class="btn btn-default" type="button" value="<fmt:message key="admin.user.create"/>" onclick=javascript:document.location='user.do?method=edit' />
 
-<span class="pull-right">
-	<fmt:message key="admin.search" />:&nbsp;<input class="search form-control form-control-inline" type="search" data-column="1">
-</span>
-</p>
 
-<lams:TSTable numColumns="6"> 
-	<th width="3%">
-		<fmt:message key="admin.user.userid"/>
-	</th>
-	<th width="15%" align="center">
-		<fmt:message key="admin.user.login"/>
-	</th>
-	<th width="15%" align="center">
-		<fmt:message key="admin.user.first_name"/>
-	</th>
-	<th width="15%" align="center">
-		<fmt:message key="admin.user.last_name"/>
-	</th>
-	<th width="15%" align="center">
-		<fmt:message key="admin.user.email"/>
-	</th>
-	<th width="20%" align="center">
-		<fmt:message key="admin.user.actions"/>
-	</th>
-</lams:TSTable>			
-		
\ No newline at end of file