Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.420.2.96 -r1.420.2.97
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java,v
diff -u -r1.45.2.10 -r1.45.2.11
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	13 Oct 2016 06:43:46 -0000	1.45.2.10
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	24 Oct 2016 14:55:28 -0000	1.45.2.11
@@ -61,9 +61,6 @@
 
 /**
  * @author jliew
- *
- *
- *
  */
 public class DisplayGroupAction extends Action {
     private static IUserManagementService service;
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java,v
diff -u -r1.54.2.8 -r1.54.2.9
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	26 Aug 2016 15:02:59 -0000	1.54.2.8
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	24 Oct 2016 14:55:28 -0000	1.54.2.9
@@ -23,30 +23,35 @@
 package org.lamsfoundation.lams.web;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.apache.struts.action.Action;
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
-import org.lamsfoundation.lams.authoring.service.IAuthoringService;
+import org.apache.tomcat.util.json.JSONArray;
+import org.apache.tomcat.util.json.JSONException;
+import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.config.Registration;
 import org.lamsfoundation.lams.index.IndexLinkBean;
-import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
+import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.WebUtil;
+import org.lamsfoundation.lams.web.action.LamsDispatchAction;
 import org.lamsfoundation.lams.web.session.SessionManager;
 import org.lamsfoundation.lams.web.util.AttributeNames;
 import org.springframework.web.context.WebApplicationContext;
@@ -56,7 +61,7 @@
  *
  * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
  */
-public class IndexAction extends Action {
+public class IndexAction extends LamsDispatchAction {
 
     private static final String PATH_PEDAGOGICAL_PLANNER = "pedagogical_planner";
     private static final String PATH_LAMS_CENTRAL = "lams-central.war";
@@ -66,10 +71,10 @@
 
     @Override
     @SuppressWarnings("unchecked")
-    public ActionForward execute(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+    public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse response) throws Exception {
 
-	IndexAction.setHeaderLinks(request);
+	setHeaderLinks(request);
 	setAdminLinks(request);
 
 	// check if this is user's first login; some action (like displaying a dialog for disabling tutorials) can be
@@ -89,67 +94,48 @@
 	if (loggedInUser.getChangePassword() != null && loggedInUser.getChangePassword()) {
 	    return mapping.findForward("password");
 	}
-	
+
 	// check if user needs to get his shared two-factor authorization secret
-	if (loggedInUser.isTwoFactorAuthenticationEnabled() && loggedInUser.getTwoFactorAuthenticationSecret() == null) {
+	if (loggedInUser.isTwoFactorAuthenticationEnabled()
+		&& loggedInUser.getTwoFactorAuthenticationSecret() == null) {
 	    return mapping.findForward("twoFactorAuthentication");
 	}
 
 	User user = getUserManagementService().getUserByLogin(userDTO.getLogin());
 	request.setAttribute("portraitUuid", user.getPortraitUuid());
 
-	String tab = WebUtil.readStrParam(request, "tab", true);
-	if (StringUtils.equals(tab, "profile")) {
+	String method = WebUtil.readStrParam(request, "method", true);
+	if (StringUtils.equals(method, "profile")) {
 	    return mapping.findForward("profile");
-	} else if (StringUtils.equals(tab, "editprofile")) {
+	} else if (StringUtils.equals(method, "editprofile")) {
 	    return mapping.findForward("editprofile");
-	} else if (StringUtils.equals(tab, "password")) {
+	} else if (StringUtils.equals(method, "password")) {
 	    return mapping.findForward("password");
-	} else if (StringUtils.equals(tab, "passwordChanged")) {
-	    request.setAttribute("tab", "profile");
+	} else if (StringUtils.equals(method, "passwordChanged")) {
 	    return mapping.findForward("passwordChanged");
-	} else if (StringUtils.equals(tab, "portrait")) {
+	} else if (StringUtils.equals(method, "portrait")) {
 	    return mapping.findForward("portrait");
-	} else if (StringUtils.equals(tab, "lessons")) {
+	} else if (StringUtils.equals(method, "lessons")) {
 	    return mapping.findForward("lessons");
-	} else if (StringUtils.equals(tab, "community")) {
-
-	    String comLoginUrl = Configuration.get(ConfigurationKeys.SERVER_URL) + "/lamsCommunityLogin.do";
-	    request.setAttribute("comLoginUrl", comLoginUrl);
-	    request.setAttribute("tab", tab);
-	    return mapping.findForward("community");
 	}
 
 	Registration reg = Configuration.getRegistration();
 	if (reg != null) {
 	    request.setAttribute("lamsCommunityEnabled", reg.isEnableLamsCommunityIntegration());
 	}
 
-	List orgDTOs = getUserManagementService().getActiveCourseIdsByUser(loggedInUser.getUserId(),
-		request.isUserInRole(Role.SYSADMIN));
-	request.setAttribute("orgDTOs", orgDTOs);
 	return mapping.findForward("main");
     }
 
     private static void setHeaderLinks(HttpServletRequest request) {
 	List<IndexLinkBean> headerLinks = new ArrayList<IndexLinkBean>();
 	if (request.isUserInRole(Role.AUTHOR)) {
-	    if (IndexAction.isPedagogicalPlannerAvailable()) {
+	    if (isPedagogicalPlannerAvailable()) {
 		headerLinks.add(new IndexLinkBean("index.planner", "javascript:openPedagogicalPlanner()"));
 	    }
 	    headerLinks.add(new IndexLinkBean("index.author", "javascript:showAuthoringDialog()"));
 	}
-	headerLinks.add(new IndexLinkBean("index.myprofile", "index.do?tab=profile"));
 
-	Registration reg = Configuration.getRegistration();
-	if (reg != null) {
-	    if (request.isUserInRole(Role.SYSADMIN) || request.isUserInRole(Role.GROUP_ADMIN)
-		    || request.isUserInRole(Role.GROUP_MANAGER) || request.isUserInRole(Role.AUTHOR)
-		    || request.isUserInRole(Role.MONITOR)) {
-		headerLinks.add(new IndexLinkBean("index.community", "index.do?tab=community"));
-	    }
-	}
-
 	String customTabText = Configuration.get(ConfigurationKeys.CUSTOM_TAB_TITLE);
 	String customTabLink = Configuration.get(ConfigurationKeys.CUSTOM_TAB_LINK);
 	if (customTabLink != null && customTabLink.trim().length() > 0) {
@@ -172,19 +158,68 @@
 	request.setAttribute("adminLinks", adminLinks);
     }
 
+    /**
+     * Returns list of organisations for .
+     */
+    public ActionForward getOrgs(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse res) throws IOException, ServletException, JSONException {
+	getUserManagementService();
+	User loggedInUser = getUserManagementService().getUserByLogin(request.getRemoteUser());
+	
+	Integer userId = loggedInUser.getUserId();
+	boolean isSysadmin = request.isUserInRole(Role.SYSADMIN);
+	String searchString = WebUtil.readStrParam(request, "fcol[1]", true);
+
+	// paging parameters of tablesorter
+	int size = WebUtil.readIntParam(request, "size");
+	int page = WebUtil.readIntParam(request, "page");
+//	Integer isSort1 = WebUtil.readIntParam(request, "column[0]", true);
+//	Integer isSort2 = WebUtil.readIntParam(request, "column[1]", true);
+//	Integer isSort3 = WebUtil.readIntParam(request, "column[2]", true);
+//	Integer isSort4 = WebUtil.readIntParam(request, "column[3]", true);
+//
+//	String sortBy = "";
+//	String sortOrder = "";
+//	if (isSort2 != null) {
+//	    sortBy = "name";
+//	    sortOrder = isSort2.equals(0) ? "ASC" : "DESC";
+//
+//	}
+
+	List<OrganisationDTO> orgDtos = userManagementService.getActiveCoursesByUser(userId, isSysadmin, page, size, searchString);
+
+	JSONObject responcedata = new JSONObject();
+	responcedata.put("total_rows", userManagementService.getCountActiveCoursesByUser(userId, isSysadmin, searchString));
+
+	JSONArray rows = new JSONArray();
+	for (OrganisationDTO orgDto : orgDtos) {
+
+	    JSONObject responseRow = new JSONObject();
+	    responseRow.put("id", orgDto.getOrganisationID());
+	    String orgName = orgDto.getName() == null ? "" : orgDto.getName();
+	    responseRow.put("name", StringEscapeUtils.escapeHtml(orgName));
+
+	    rows.put(responseRow);
+	}
+	responcedata.put("rows", rows);
+	res.setContentType("application/json;charset=utf-8");
+	res.getWriter().print(new String(responcedata.toString()));
+	return null;
+    }
+
     private IUserManagementService getUserManagementService() {
-	if (IndexAction.userManagementService == null) {
+	if (userManagementService == null) {
 	    WebApplicationContext ctx = WebApplicationContextUtils
 		    .getRequiredWebApplicationContext(getServlet().getServletContext());
-	    IndexAction.userManagementService = (IUserManagementService) ctx.getBean("userManagementService");
+	    userManagementService = (IUserManagementService) ctx.getBean("userManagementService");
 	}
-	return IndexAction.userManagementService;
+	return userManagementService;
     }
 
     private static boolean isPedagogicalPlannerAvailable() {
 	String lamsEarPath = Configuration.get(ConfigurationKeys.LAMS_EAR_DIR);
-	String plannerPath = lamsEarPath + File.separator + IndexAction.PATH_LAMS_CENTRAL + File.separator
-		+ IndexAction.PATH_PEDAGOGICAL_PLANNER;
+	String plannerPath = lamsEarPath + File.separator + PATH_LAMS_CENTRAL + File.separator
+		+ PATH_PEDAGOGICAL_PLANNER;
 	File plannerDir = new File(plannerPath);
 	return plannerDir.isDirectory();
     }
Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/PasswordAction.java,v
diff -u -r1.3.22.4 -r1.3.22.5
--- lams_central/src/java/org/lamsfoundation/lams/web/PasswordAction.java	26 Aug 2016 15:02:59 -0000	1.3.22.4
+++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordAction.java	24 Oct 2016 14:55:28 -0000	1.3.22.5
@@ -42,7 +42,6 @@
 
 	PasswordChangeActionForm passwordChangeForm = (PasswordChangeActionForm) form;
 	passwordChangeForm.setLogin(request.getRemoteUser());
-	request.setAttribute("tab", "profile");
 	return mapping.findForward("passwordChange");
     }
 }
Index: lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java,v
diff -u -r1.14.2.4 -r1.14.2.5
--- lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java	11 May 2016 07:07:58 -0000	1.14.2.4
+++ lams_central/src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java	24 Oct 2016 14:55:28 -0000	1.14.2.5
@@ -44,13 +44,6 @@
 
 /**
  * @author Fei Yang
- *
- *
- *
- *
- *
- *
- *
  */
 public class PasswordChangeAction extends Action {
 
@@ -150,7 +143,6 @@
 	    return (mapping.findForward("error.system"));
 	}
 
-	request.setAttribute("tab", "password");
 	return mapping.findForward("okay");
 
     }
Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/PortraitAction.java,v
diff -u -r1.5.14.3 -r1.5.14.4
--- lams_central/src/java/org/lamsfoundation/lams/web/PortraitAction.java	11 May 2016 07:07:58 -0000	1.5.14.3
+++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitAction.java	24 Oct 2016 14:55:28 -0000	1.5.14.4
@@ -21,7 +21,6 @@
  * ****************************************************************
  */
 
-
 package org.lamsfoundation.lams.web;
 
 import javax.servlet.http.HttpServletRequest;
@@ -38,13 +37,6 @@
 
 /**
  * @author jliew
- *
- *
- *
- *
- *
- *
- *
  */
 public class PortraitAction extends Action {
 
@@ -60,7 +52,6 @@
 	log.debug("using portraitUuid=" + portraitUuid);
 	// if no portrait has been uploaded, set the uuid to 0
 	portraitForm.setPortraitUuid(portraitUuid == null ? 0 : portraitUuid);
-	request.setAttribute("tab", "profile");
 	return mapping.findForward("portrait");
     }
 
Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitActionForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/PortraitActionForm.java,v
diff -u -r1.2.22.3 -r1.2.22.4
--- lams_central/src/java/org/lamsfoundation/lams/web/PortraitActionForm.java	11 May 2016 07:07:58 -0000	1.2.22.3
+++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitActionForm.java	24 Oct 2016 14:55:28 -0000	1.2.22.4
@@ -29,8 +29,6 @@
 
 /**
  * @author jliew
- *
- *
  */
 public class PortraitActionForm extends ActionForm {
 
Index: lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java,v
diff -u -r1.11.2.3 -r1.11.2.4
--- lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java	11 May 2016 07:07:58 -0000	1.11.2.3
+++ lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java	24 Oct 2016 14:55:28 -0000	1.11.2.4
@@ -55,11 +55,6 @@
 /**
  * @author jliew
  * @author Andrey Balan
- *
- *
- *
- *
- *
  */
 public class PortraitSaveAction extends LamsDispatchAction {
 
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java,v
diff -u -r1.25.2.4 -r1.25.2.5
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	26 Aug 2016 15:02:58 -0000	1.25.2.4
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	24 Oct 2016 14:55:28 -0000	1.25.2.5
@@ -66,7 +66,6 @@
 import org.springframework.web.context.support.WebApplicationContextUtils;
 
 /**
- *
  * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
  */
 public class ProfileAction extends LamsDispatchAction {
@@ -94,7 +93,6 @@
 	request.setAttribute("fullName", fullName);
 	request.setAttribute("email", (email != null ? email : ""));
 	request.setAttribute("portraitUuid", requestor.getPortraitUuid());
-	request.setAttribute("tab", "profile");
 
 	return mapping.findForward("view");
     }
@@ -173,7 +171,6 @@
 	}
 
 	request.setAttribute("beans", beans);
-	request.setAttribute("tab", "profile");
 
 	return mapping.findForward("lessons");
     }
@@ -217,7 +214,6 @@
 	if (requestor.isTwoFactorAuthenticationEnabled()) {
 	    request.setAttribute("sharedSecret", requestor.getTwoFactorAuthenticationSecret());    
 	}
-	request.setAttribute("tab", "profile");
 
 	boolean hasLamsCommunityToken = requestor.getLamsCommunityToken() != null;
 	request.setAttribute("hasLamsCommunityToken", hasLamsCommunityToken);
Index: lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java,v
diff -u -r1.18.2.5 -r1.18.2.6
--- lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java	11 May 2016 07:07:58 -0000	1.18.2.5
+++ lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java	24 Oct 2016 14:55:28 -0000	1.18.2.6
@@ -52,15 +52,7 @@
 
 /**
  * @author jliew
- *
  */
-
-/**
- *
- *
- *
- *
- */
 public class ProfileSaveAction extends Action {
 
     private static Logger log = Logger.getLogger(ProfileSaveAction.class);
Index: lams_central/src/java/org/lamsfoundation/lams/web/action/TwoFactorAuthenticationAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_central/src/java/org/lamsfoundation/lams/web/action/Attic/TwoFactorAuthenticationAction.java,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_central/src/java/org/lamsfoundation/lams/web/action/TwoFactorAuthenticationAction.java	26 Aug 2016 15:02:59 -0000	1.1.2.1
+++ lams_central/src/java/org/lamsfoundation/lams/web/action/TwoFactorAuthenticationAction.java	24 Oct 2016 14:55:28 -0000	1.1.2.2
@@ -68,7 +68,6 @@
 	    request.setAttribute("QRCode", QRCode);
 	}
 
-	request.setAttribute("tab", "profile");
 	return mapping.findForward("secret");
     }
 }
Index: lams_central/web/editprofile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/editprofile.jsp,v
diff -u -r1.23.2.4 -r1.23.2.5
--- lams_central/web/editprofile.jsp	14 Oct 2016 03:41:33 -0000	1.23.2.4
+++ lams_central/web/editprofile.jsp	24 Oct 2016 14:55:28 -0000	1.23.2.5
@@ -1,20 +1,32 @@
-<%@ page contentType="text/html; charset=utf-8" language="java"%>
+<!DOCTYPE html>
 
+<%@ page contentType="text/html; charset=utf-8" language="java"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-logic" prefix="logic"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<%@ page
-	import="org.lamsfoundation.lams.usermanagement.AuthenticationMethod"%>
-<%@ page import="org.lamsfoundation.lams.util.Configuration"
+<%@ page import="org.lamsfoundation.lams.usermanagement.AuthenticationMethod"
+	import="org.lamsfoundation.lams.util.Configuration"
 	import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
-<link rel="stylesheet" href="css/defaultHTML_learner.css"
-	type="text/css" />
-<link rel="stylesheet" href="css/bootstrap.min.css" type="text/css" />
 
+<lams:html>
+<lams:head>
+	<link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" />
+	
+	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="includes/javascript/groupDisplay.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			//update dialog's height and title
+			updateMyProfileDialogSettings('<fmt:message key="title.profile.edit.screen" />', '100%');
+		});
+	</script>
+</lams:head>
 
+<body>
 <html:form action="/saveprofile.do" method="post">
 	<html:hidden property="userId" />
 	<html:hidden property="login" />
@@ -34,12 +46,7 @@
 		<div class="row vertical-center-row">
 			<div
 				class="col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
-				<div class="panel panel-default">
-					<div class="panel-heading">
-						<div class="panel-title">
-							<fmt:message key="title.profile.edit.screen" />
-						</div>
-					</div>
+				<div class="panel">
 					<div class="panel-body">
 						<form class="form-horizontal">
 							<c:set var="authenticationMethodId">
@@ -412,5 +419,6 @@
 		</div>
 	</div>
 </html:form>
+</body>
+</lams:html>
 
-
Index: lams_central/web/lessons.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/lessons.jsp,v
diff -u -r1.2.16.1 -r1.2.16.2
--- lams_central/web/lessons.jsp	14 Oct 2016 03:41:06 -0000	1.2.16.1
+++ lams_central/web/lessons.jsp	24 Oct 2016 14:55:28 -0000	1.2.16.2
@@ -1,36 +1,53 @@
-<%@ page language="java" pageEncoding="UTF-8"
-	contentType="text/html;charset=utf-8"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<!DOCTYPE html>
+
+<%@ page contentType="text/html; charset=utf-8" language="java"%>
+<%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<link rel="stylesheet" href="css/defaultHTML_learner.css"
-	type="text/css" />
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-logic" prefix="logic"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
+<lams:html>
+<lams:head>
+	<link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" />
+	
+	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="includes/javascript/groupDisplay.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			//update dialog's height and title
+			updateMyProfileDialogSettings('<fmt:message key="title.all.my.lessons" />', '80%');
+		});
+	</script>
+</lams:head>
+
+<body>
 <div style="clear: both;"></div>
 <div class="container">
 	<div class="row vertical-center-row">
 		<div
 			class="col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
-			<div class="panel panel-default">
-				<div class="panel-heading">
-					<div class="panel-title">
-						<fmt:message key="title.all.my.lessons" />
-					</div>
-				</div>
+			<div class="panel">
 				<div class="panel-body">
 					<div class="text-left">
 						<c:if test="${not empty beans}">
+						
 							<c:forEach var="group" items="${beans}">
 								<br />
 								<h4>
 									<c:out value="${group.name}" />
 								</h4>
+								
 								<ul>
 									<c:forEach var="lesson" items="${group.lessons}">
 										<li><a href="<c:out value="${lesson.url}"/>"
 											class="sequence-name-link"> <c:out value="${lesson.name}" />
 										</a></li>
 									</c:forEach>
 								</ul>
+								
 								<ul>
 									<c:forEach var="subgroup" items="${group.childIndexOrgBeans}">
 										<c:out value="${subgroup.name}" />
@@ -45,21 +62,26 @@
 									</c:forEach>
 								</ul>
 							</c:forEach>
+							
 						</c:if>
+						
 						<c:if test="${empty beans}">
 							<p class="align-left">
 								<fmt:message key="msg.no.lessons" />
 							</p>
 						</c:if>
 					</div>
+					
 					<div align="center">
 						<input class="btn btn-sm btn-default offset5" type="button"
 							value="<fmt:message key="label.return.to.myprofile" />"
-							onclick="javascript:document.location='index.do?state=active&tab=profile'" />
+							onclick="javascript:document.location='index.do?state=active&method=profile'" />
 					</div>
 
 				</div>
 			</div>
 		</div>
 	</div>
 </div>
+</body>
+</lams:html>
Index: lams_central/web/main.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/main.jsp,v
diff -u -r1.77.2.24 -r1.77.2.25
--- lams_central/web/main.jsp	21 Oct 2016 15:14:58 -0000	1.77.2.24
+++ lams_central/web/main.jsp	24 Oct 2016 14:55:28 -0000	1.77.2.25
@@ -11,267 +11,384 @@
 <lams:html>
 <lams:head>
 	<c:choose>
-	<c:when test="${page_direction == 'RTL'}">
-		<title><fmt:message key="index.welcome" /> :: <fmt:message key="title.lams"/></title>
-	</c:when>
-	<c:otherwise>
-		<title><fmt:message key="title.lams"/> :: <fmt:message key="index.welcome" /></title>
-	</c:otherwise>
+		<c:when test="${page_direction == 'RTL'}">
+			<title><fmt:message key="index.welcome" /> :: <fmt:message key="title.lams"/></title>
+		</c:when>
+		<c:otherwise>
+			<title><fmt:message key="title.lams"/> :: <fmt:message key="index.welcome" /></title>
+		</c:otherwise>
 	</c:choose>
-	
-	<lams:css style="main" />
-	<link href="/lams/includes/font-awesome/css/font-awesome.css" rel="stylesheet" type="text/css">
-	<link href="/lams/css/defaultHTML_learner.css" rel="stylesheet" type="text/css">
-	
 	<link rel="icon" href="<lams:LAMSURL/>favicon.ico" type="image/x-icon" />
 	<link rel="shortcut icon" href="<lams:LAMSURL/>favicon.ico" type="image/x-icon" />
 	
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/index.css" type="text/css" media="screen">
-	<link rel="stylesheet" href="<lams:LAMSURL/>css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen">
+	<lams:css style="main"/>
+	<link rel="stylesheet" href="/lams/includes/font-awesome/css/font-awesome.css" type="text/css">
+	<link rel="stylesheet" href="/lams/css/jquery.tablesorter.theme.bootstrap.css">
+	<link rel="stylesheet" href="/lams/css/defaultHTML_learner.css" type="text/css">
+	<link rel="stylesheet" href="/lams/css/jquery-ui-bootstrap-theme.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="/lams/css/index.css" type="text/css" media="screen">
+	<link rel="stylesheet" href="/lams/css/main.css" type="text/css" media="screen">
 
 	<script type="text/javascript" src="includes/javascript/getSysInfo.js"></script>
 	<script type="text/javascript" src="loadVars.jsp"></script>
 	<script type="text/javascript" src="includes/javascript/openUrls.js"></script>
 	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
 	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery.tablesorter.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery.tablesorter-pager.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery.tablesorter-widgets.js"></script> 	
 	<script type="text/javascript" src="includes/javascript/jquery.dialogextend.js"></script>	
 	<script type="text/javascript" src="includes/javascript/dialog.js"></script>
 	<script type="text/javascript" src="includes/javascript/groupDisplay.js"></script>	
-	<script type="text/javascript" src="/lams/includes/javascript/bootstrap.min.js"></script>
-	<script type="text/javascript" src="/lams/includes/javascript/jquery.ui.touch-punch.js"></script>
-
+	<script type="text/javascript" src="includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery.ui.touch-punch.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery.slimscroll.js"></script>
+	<script type="text/javascript" src="includes/javascript/main.js"></script>
 	<script type="text/javascript">
-			var LAMS_URL = '<lams:LAMSURL/>',
-			
-				decoderDiv = $('<div />'),
-				LABELS = {
-					<fmt:message key="index.emailnotifications" var="EMAIL_NOTIFICATIONS_TITLE_VAR"/>
-					EMAIL_NOTIFICATIONS_TITLE : '<c:out value="${EMAIL_NOTIFICATIONS_TITLE_VAR}" />',
-					<fmt:message key="index.remove.lesson.confirm1" var="REMOVE_LESSON_CONFIRM1_VAR"/>
-					REMOVE_LESSON_CONFIRM1 : decoderDiv.html('<c:out value="${REMOVE_LESSON_CONFIRM1_VAR}" />').text(),
-					<fmt:message key="index.remove.lesson.confirm2" var="REMOVE_LESSON_CONFIRM2_VAR"/>
-					REMOVE_LESSON_CONFIRM2 : decoderDiv.html('<c:out value="${REMOVE_LESSON_CONFIRM2_VAR}" />').text(),
-					<fmt:message key="label.enable.lesson.sorting" var="SORTING_ENABLE_VAR"/>
-					SORTING_ENABLE : '<c:out value="${SORTING_ENABLE_VAR}" />',
-					<fmt:message key="label.disable.lesson.sorting" var="SORTING_DISABLE_VAR"/>
-					SORTING_DISABLE : '<c:out value="${SORTING_DISABLE_VAR}" />',
-					<fmt:message key="index.addlesson" var="ADD_LESSON_TITLE_VAR"/>
-					ADD_LESSON_TITLE : '<c:out value="${ADD_LESSON_TITLE_VAR}" />',
-					<fmt:message key="index.single.activity.lesson.title" var="SINGLE_ACTIVITY_LESSON_TITLE_VAR"/>
-					SINGLE_ACTIVITY_LESSON_TITLE : '<c:out value="${SINGLE_ACTIVITY_LESSON_TITLE_VAR}" />',
-					<fmt:message key="index.gradebook.course.title" var="GRADEBOOK_COURSE_TITLE_VAR"/>
-					GRADEBOOK_COURSE_TITLE : '<c:out value="${GRADEBOOK_COURSE_TITLE_VAR}" />',
-					<fmt:message key="index.gradebook.lesson.title" var="GRADEBOOK_LESSON_TITLE_VAR"/>
-					GRADEBOOK_LESSON_TITLE : '<c:out value="${GRADEBOOK_LESSON_TITLE_VAR}" />',
-					<fmt:message key="index.gradebook.learner.title" var="GRADEBOOK_LEARNER_TITLE_VAR"/>
-					GRADEBOOK_LEARNER_TITLE : '<c:out value="${GRADEBOOK_LEARNER_TITLE_VAR}" />',
-					<fmt:message key="index.conditions.title" var="CONDITIONS_TITLE_VAR"/>
-					CONDITIONS_TITLE : '<c:out value="${CONDITIONS_TITLE_VAR}" />',
-					<fmt:message key="index.search.lesson.title" var="SEARCH_LESSON_TITLE_VAR"/>
-					SEARCH_LESSON_TITLE : '<c:out value="${SEARCH_LESSON_TITLE_VAR}" />',
-					<fmt:message key="index.course.groups.title" var="COURSE_GROUPS_TITLE_VAR"/>
-					COURSE_GROUPS_TITLE : '<c:out value="${COURSE_GROUPS_TITLE_VAR}" />',
-					<fmt:message key="authoring.fla.navigate.away.confirm" var="NAVIGATE_AWAY_CONFIRM_VAR"/>
-					NAVIGATE_AWAY_CONFIRM : decoderDiv.html('<c:out value="${NAVIGATE_AWAY_CONFIRM_VAR}" />').text(),
-					<fmt:message key="index.monitoring.title" var="MONITORING_TITLE_VAR"/>
-					MONITORING_TITLE : '<c:out value="${MONITORING_TITLE_VAR}" />',
-					<fmt:message key="label.private.notifications.title" var="PRIVATE_NOTIFICATIONS_TITLE_VAR"/>
-					PRIVATE_NOTIFICATIONS_TITLE : '<c:out value="${PRIVATE_NOTIFICATIONS_TITLE_VAR}" />',
-					<fmt:message key="label.private.notifications.messages" var="PRIVATE_NOTIFICATIONS_MESSAGES_VAR"/>
-					PRIVATE_NOTIFICATIONS_MESSAGES : '<c:out value="${PRIVATE_NOTIFICATIONS_MESSAGES_VAR}" />',
-					<fmt:message key="label.private.notifications.read" var="PRIVATE_NOTIFICATIONS_READ_VAR"/>
-					PRIVATE_NOTIFICATIONS_READ : '<c:out value="${PRIVATE_NOTIFICATIONS_READ_VAR}" />',
-					<fmt:message key="label.private.notifications.read.hint" var="PRIVATE_NOTIFICATIONS_READ_HINT_VAR"/>
-					PRIVATE_NOTIFICATIONS_READ_HINT : '<c:out value="${PRIVATE_NOTIFICATIONS_READ_HINT_VAR}" />',
-					<fmt:message key="label.private.notifications.read.all.hint" var="PRIVATE_NOTIFICATIONS_READ_ALL_HINT_VAR"/>
-					PRIVATE_NOTIFICATIONS_READ_ALL_HINT : '<c:out value="${PRIVATE_NOTIFICATIONS_READ_ALL_HINT_VAR}" />',
-				},
-				
-				tabName = '${tab}',
-				stateId = tabName == 'profile' ? 3 : 1;
+		var LAMS_URL = '<lams:LAMSURL/>',	
+			decoderDiv = $('<div />'),
+			LABELS = {
+				<fmt:message key="index.emailnotifications" var="EMAIL_NOTIFICATIONS_TITLE_VAR"/>
+				EMAIL_NOTIFICATIONS_TITLE : '<c:out value="${EMAIL_NOTIFICATIONS_TITLE_VAR}" />',
+				<fmt:message key="index.remove.lesson.confirm1" var="REMOVE_LESSON_CONFIRM1_VAR"/>
+				REMOVE_LESSON_CONFIRM1 : decoderDiv.html('<c:out value="${REMOVE_LESSON_CONFIRM1_VAR}" />').text(),
+				<fmt:message key="index.remove.lesson.confirm2" var="REMOVE_LESSON_CONFIRM2_VAR"/>
+				REMOVE_LESSON_CONFIRM2 : decoderDiv.html('<c:out value="${REMOVE_LESSON_CONFIRM2_VAR}" />').text(),
+				<fmt:message key="label.enable.lesson.sorting" var="SORTING_ENABLE_VAR"/>
+				SORTING_ENABLE : '<c:out value="${SORTING_ENABLE_VAR}" />',
+				<fmt:message key="label.disable.lesson.sorting" var="SORTING_DISABLE_VAR"/>
+				SORTING_DISABLE : '<c:out value="${SORTING_DISABLE_VAR}" />',
+				<fmt:message key="index.addlesson" var="ADD_LESSON_TITLE_VAR"/>
+				ADD_LESSON_TITLE : '<c:out value="${ADD_LESSON_TITLE_VAR}" />',
+				<fmt:message key="index.single.activity.lesson.title" var="SINGLE_ACTIVITY_LESSON_TITLE_VAR"/>
+				SINGLE_ACTIVITY_LESSON_TITLE : '<c:out value="${SINGLE_ACTIVITY_LESSON_TITLE_VAR}" />',
+				<fmt:message key="index.gradebook.course.title" var="GRADEBOOK_COURSE_TITLE_VAR"/>
+				GRADEBOOK_COURSE_TITLE : '<c:out value="${GRADEBOOK_COURSE_TITLE_VAR}" />',
+				<fmt:message key="index.gradebook.lesson.title" var="GRADEBOOK_LESSON_TITLE_VAR"/>
+				GRADEBOOK_LESSON_TITLE : '<c:out value="${GRADEBOOK_LESSON_TITLE_VAR}" />',
+				<fmt:message key="index.gradebook.learner.title" var="GRADEBOOK_LEARNER_TITLE_VAR"/>
+				GRADEBOOK_LEARNER_TITLE : '<c:out value="${GRADEBOOK_LEARNER_TITLE_VAR}" />',
+				<fmt:message key="index.conditions.title" var="CONDITIONS_TITLE_VAR"/>
+				CONDITIONS_TITLE : '<c:out value="${CONDITIONS_TITLE_VAR}" />',
+				<fmt:message key="index.search.lesson.title" var="SEARCH_LESSON_TITLE_VAR"/>
+				SEARCH_LESSON_TITLE : '<c:out value="${SEARCH_LESSON_TITLE_VAR}" />',
+				<fmt:message key="index.course.groups.title" var="COURSE_GROUPS_TITLE_VAR"/>
+				COURSE_GROUPS_TITLE : '<c:out value="${COURSE_GROUPS_TITLE_VAR}" />',
+				<fmt:message key="authoring.fla.navigate.away.confirm" var="NAVIGATE_AWAY_CONFIRM_VAR"/>
+				NAVIGATE_AWAY_CONFIRM : decoderDiv.html('<c:out value="${NAVIGATE_AWAY_CONFIRM_VAR}" />').text(),
+				<fmt:message key="index.monitoring.title" var="MONITORING_TITLE_VAR"/>
+				MONITORING_TITLE : '<c:out value="${MONITORING_TITLE_VAR}" />',
+				<fmt:message key="label.private.notifications.title" var="PRIVATE_NOTIFICATIONS_TITLE_VAR"/>
+				PRIVATE_NOTIFICATIONS_TITLE : '<c:out value="${PRIVATE_NOTIFICATIONS_TITLE_VAR}" />',
+				<fmt:message key="label.private.notifications.messages" var="PRIVATE_NOTIFICATIONS_MESSAGES_VAR"/>
+				PRIVATE_NOTIFICATIONS_MESSAGES : '<c:out value="${PRIVATE_NOTIFICATIONS_MESSAGES_VAR}" />',
+				<fmt:message key="label.private.notifications.read" var="PRIVATE_NOTIFICATIONS_READ_VAR"/>
+				PRIVATE_NOTIFICATIONS_READ : '<c:out value="${PRIVATE_NOTIFICATIONS_READ_VAR}" />',
+				<fmt:message key="label.private.notifications.read.hint" var="PRIVATE_NOTIFICATIONS_READ_HINT_VAR"/>
+				PRIVATE_NOTIFICATIONS_READ_HINT : '<c:out value="${PRIVATE_NOTIFICATIONS_READ_HINT_VAR}" />',
+				<fmt:message key="label.private.notifications.read.all.hint" var="PRIVATE_NOTIFICATIONS_READ_ALL_HINT_VAR"/>
+				PRIVATE_NOTIFICATIONS_READ_ALL_HINT : '<c:out value="${PRIVATE_NOTIFICATIONS_READ_ALL_HINT_VAR}" />',
+				MY_PROFILE : '<fmt:message key="index.myprofile" />',
+			},
+			stateId = 1, // TODO Figure out when stateId is required to be equal 3. Old version code: stateId = tabName == 'profile' ? 3 : 1;
+			activeOrgId = -1; //not set for now
 
-			$(document).ready(function(){
-				initMainPage();
+		$(document).ready(function(){
+			initMainPage();
 				
-				<%-- If it's the user's first login, display a dialog asking if tutorial videos should be shown --%>
-				<c:if test="${firstLogin}">
-					<c:url var="disableAllTutorialVideosUrl" value="tutorial.do">
-						<c:param name="method" value="disableAllTutorialVideos" />
-					</c:url>
-					if (!confirm("<fmt:message key='label.tutorial.disable.all' />")){
-				 		$.get("${disableAllTutorialVideosUrl}");
+			<%-- If it's the user's first login, display a dialog asking if tutorial videos should be shown --%>
+			<c:if test="${firstLogin}">
+				<c:url var="disableAllTutorialVideosUrl" value="tutorial.do">
+					<c:param name="method" value="disableAllTutorialVideos" />
+				</c:url>
+				if (!confirm("<fmt:message key='label.tutorial.disable.all' />")){
+			 		$.get("${disableAllTutorialVideosUrl}");
+				}
+			</c:if>
+
+			var $tablesorter = $(".tablesorter").tablesorter({
+				theme: 'bootstrap',
+				headerTemplate : '{content} {icon}',
+				widgets: ["filter"],
+			    widgetOptions : {
+			        filter_columnFilters: false
+			    },
+			    widthFixed: true,
+			    sortInitialOrder: 'desc',
+	            sortList: [[1]],
+	            headers: { 0: { sorter: false, filter: false} }
+			});
+
+			$.tablesorter.filter.bindSearch($tablesorter, $('#offcanvas-search-input') );
+
+			$(".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='/index.do'/>?dispatch=getOrgs&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];
+								var orgId = orgData["id"];
+								
+								rows += '<tr>';
+
+								rows += '<td style="display: none;">';
+								rows += '</td>';
+								
+								rows += '<td id="org-row-' + orgId +'">';
+								rows += 	'<a data-id="' + orgId + '" href="#" onClick="javascript:selectOrganisation(' + orgId + ')">';
+								rows += 		orgData["name"];
+								rows += 	'</a>';
+								rows += '</td>';
+								
+								rows += '</tr>';
+							}
+				            
+							json.total = data.total_rows;
+							json.rows = $(rows);
+							return json;
+				    	}
 					}
-				</c:if>
+				})
 			});
 
+			$('.tablesorter').bind('filterEnd pagerComplete', function(event, data){
+				
+				//hide pager if total amount of courses is less than 10
+	    		if (data.totalRows < 10) {
+	    			$(".tablesorter-pager").hide();
+		    	} else {
+		    		$(".tablesorter-pager").show();
+			    }
+
+	    		//in case active course is not yet chosen by user, select the fist one from the list
+			    if ((activeOrgId < 0) && (event.type == "pagerComplete") && (data.totalRows > 0)) {
+			    	var firstOrgId = $('.tablesorter a').first().data("id");
+					selectOrganisation(firstOrgId);
+				}
+			});
+
+		});
 	</script>
 </lams:head>
-<body>
+<body > <!-- class="offcanvas-hidden" -->
 
-<div id="page-mycourses">
-	<div id="header-my-courses">
-		<div id="nav-right">
-			<div class="nav-box-right">
-				<c:choose>
-					<c:when test="${empty tab}">
-						<div class="tab-left-selected"></div>
-						<div class="tab-middle-selected"><a class="tab-middle-link-selected" style="border:0;" href="index.do"><fmt:message key="index.mycourses"/> </a></div>
-						<div class="tab-right-selected"></div>
-					</c:when>
-					<c:otherwise>
-						<div class="tab-left"></div>
-						<div class="tab-middle"><a class="tab-middle-link" style="border:0;" href="index.do"><fmt:message key="index.mycourses"/> </a></div>
-						<div class="tab-right"></div>
-					</c:otherwise>
-				</c:choose>
-			</div>
-			<c:forEach var="headerlink" items="${headerLinks}">
-			<div class="nav-box-right">
-				
-				<c:set var="tabLeft" value="tab-left"/>
-				<c:set var="tabMiddle" value="tab-middle"/>
-				<c:set var="tabRight" value="tab-right"/>	
-				<c:set var="highlight" value="false" />
-				<c:if test="${tab eq 'profile'}">
-					<c:if test="${headerlink.name eq 'index.myprofile'}">
-						<c:set var="tabLeft" value="tab-left-selected"/>
-						<c:set var="tabMiddle" value="tab-middle-selected"/>
-						<c:set var="tabRight" value="tab-right-selected"/>	
-						<c:set var="highlight" value="false" />
-					</c:if>
-				</c:if>
-				<c:if test="${tab eq 'community'}">
-					<c:if test="${headerlink.name eq 'index.community'}">
-						<c:set var="tabLeft" value="tab-left-selected"/>
-						<c:set var="tabMiddle" value="tab-middle-selected"/>
-						<c:set var="tabRight" value="tab-right-selected"/>	
-						<c:set var="highlight" value="false" />
-					</c:if>
-				</c:if>
-				<c:if test="${headerlink.name eq 'index.author'}">
-					<c:set var="tabLeft" value="tab-left-highlight"/>
-					<c:set var="tabMiddle" value="tab-middle-highlight"/>
-					<c:set var="tabRight" value="tab-right-highlight"/>	
-					<c:set var="highlight" value="true" />					
-				</c:if>
-				<c:if test="${headerlink.name eq 'index.planner'}">
-					<c:set var="tabLeft" value="tab-left-highlight"/>
-					<c:set var="tabMiddle" value="tab-middle-highlight"/>
-					<c:set var="tabRight" value="tab-right-highlight"/>	
-					<c:set var="highlight" value="true" />					
-				</c:if>
-	
-				<div class="${tabLeft}"></div>
-				<div class="${tabMiddle}">
+<!-- Offcanvas Bar -->
+    <nav id="offcanvas" role="navigation">
+        <div class="offcanvas-scroll-area">
+        
+        <div class="offcanvas-collapse">
+            <ul class="nav" id="offcanvas-menu">
+                <li class="offcanvas-logo">
+                    <div class="logo-element">
+                        <img alt="image" class="img-circle" src="images/css/lams_login.gif">
+                    </div>
+        			<i class="icon-remove fa fa-close fa-lg offcanvas-toggle"></i>
+                </li>
+                <li class="offcanvas-header">
+            	    <span class="courses-title "><i class="fa fa-table"></i>&nbsp;&nbsp;Courses</span>
+        		</li> 
+                <li>
+                    <a href="#nogo">
+                    	<span class="nav-label">Previous course asdadljl oijoiu s 1</span>
+                    	<span class="label label-warning2 pull-right"><i class="fa fa-star"></i></span>
+                    </a>
+                </li>
+                <li>
+                    <a href="#nogo">
+                    	<span class="nav-label">Previous course 2</span> 
+                    	<span class="label label-warning2 pull-right"><i class="fa fa-star"></i></span>
+                    </a>
+                </li> 
+                <li>
+                    <a href="#nogo">
+                    	<span class="nav-label">Previous course 3</span> 
+                    	<span class="label label-warning2 pull-right"><i class="fa fa-star"></i></span>
+                    </a>
+                </li>
+                
+                <li class="form-group offcanvas-search">
+						<input type="text" id="offcanvas-search-input" class="form-control" placeholder="Search for courses..."
+								data-column="1" type="search">
+                </li>
+<!-- 
+                <li class="active">
+                    <a href="#"> Course B  </a>
+                </li>
+ -->
+
+            </ul>
+            
+			<lams:TSTable numColumns="2">
+			</lams:TSTable>
+
+        </div>
+
+        </div>
+    </nav>
+<!-- /Offcanvas Bar -->
+
+<div id="page-wrapper">
+
+	<!-- header -->
+	<div class="top_nav">
+		<div class="nav_menu">
+			<nav>
+				<div class="nav offcanvas-toggle-wrapper">
+					<a class="offcanvas-toggle"><i class="fa fa-bars"></i></a>
+				</div>
+
+				<ul class="nav navbar-nav navbar-right">
+					<li>
+						<a href="javascript:;" class="user-profile dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+	                  		<c:choose>
+	                  			<c:when test="${not empty portraitUuid}">
+	                  				<c:set var="portraitSrc">download/?uuid=${portraitUuid}&preferDownload=false</c:set>
+	                  			</c:when>
+	                  			<c:otherwise>
+	                  				<c:set var="portraitSrc">images/css/john-doe-portrait.jpg</c:set>
+	                  			</c:otherwise>
+	                  		</c:choose>
+			                <img src="${portraitSrc}" alt="">
+			                  
+							<c:set var="firstName">
+								<lams:user property="firstName" />
+							</c:set>
+							<c:set var="lastName">
+								 <lams:user property="lastName" />
+							</c:set>
+							<span class="xs-hidden">
+								<c:out value="${firstName}" escapeXml="true"/>&nbsp;<c:out value="${lastName}" escapeXml="true"/>								
+							</span>
+							<span class=" fa fa-angle-down"></span>
+						</a>
+						
+						<ul class="dropdown-menu dropdown-usermenu pull-right">
+							<li>
+								<a href="#" onclick="javascript:showMyProfileDialog(); return false;">
+									<i class="fa fa-user"></i> <fmt:message key="index.myprofile"/>
+								</a>
+							</li>
+							
+							<c:forEach var="adminlink" items="${adminLinks}">
+								
+								<c:choose>
+			                		<c:when test="${adminlink.name == 'index.courseman'}">
+			                			<c:set var="iconClass">fa-users</c:set>
+			                		</c:when>
+			                		<c:when test="${adminlink.name == 'index.sysadmin'}">
+			                			<c:set var="iconClass">fa-gear</c:set>
+			                		</c:when>
+			                	</c:choose>
+									
+								<li>
+									<a href="javascript:;" onclick="<c:out value="${adminlink.url}"/>">
+										<span><i class="fa ${iconClass}"></i> <fmt:message key="${adminlink.name}"/></span>
+									</a>
+								</li>
+							</c:forEach>
+							                  
+							<li>
+								<a href="#nogo" onclick="javascript:closeAllChildren(); document.location.href='home.do?method=logout'">
+									<i class="fa fa-sign-out"></i> <fmt:message key="index.logout" />
+								</a>
+							</li>
+						</ul>
+					</li>
+					
+					<c:forEach var="headerlink" items="${headerLinks}">
 						<c:choose>
-							<c:when test="${fn:startsWith(headerlink.name,'index')}">
-								<lams:TabName url="${headerlink.url}" highlight="${highlight}"><fmt:message key="${headerlink.name}" /></lams:TabName>
+							<c:when test="${fn:startsWith(headerlink.name, 'index')}">
+								<c:set var="headerLinkName"><fmt:message key="${headerlink.name}" /></c:set>
+								<c:set var="headerLinkIcon">fa-edit</c:set>
 							</c:when>
+							
+							<c:otherwise>							
+								<c:set var="headerLinkName"><c:out value="${headerlink.name}" /></c:set>
+								<c:set var="headerLinkIcon">fa-at</c:set>
+							</c:otherwise>
+						</c:choose>
+						
+						<c:choose>
+							<c:when test="${fn:length(headerLinkName) > 12}">
+								<c:set var="headerLinkTitle" value="${headerLinkName}"/>
+								<c:set var="headerLinkName" value="${fn:substring(headerLinkName, 0, 12-2)}..."/>
+							</c:when>
 							<c:otherwise>
-								<lams:TabName url="${headerlink.url}" highlight="${highlight}"><c:out value="${headerlink.name}" /></lams:TabName>						
+								<c:set var="headerLinkName" value="${headerLinkName}"/>
 							</c:otherwise>
 						</c:choose>
-				</div>
-				<div class="${tabRight}"></div>
-			</div>
-			</c:forEach>
+						
+						<li role="presentation">       
+							<a href="<c:out value='${headerlink.url}' />" title="${headerLinkTitle}">
+								<i class="fa ${headerLinkIcon}"></i> 
+								<span class="xs-hidden"><c:out value='${headerLinkName}'/></span>
+							</a>
+						</li>
+					</c:forEach>
+					
+					<li role="presentation" class="dropdown">       
+						<a href="javascript:;" onclick="javascript:showPrivateNotificationsDialog();" class="dropdown-toggle info-number" data-toggle="dropdown" aria-expanded="false">
+							<i class="fa fa-envelope-o"></i>
+                    		<span id="notificationsPendingCount"></span>
+                    		
+							<span class="xs-hidden">&nbsp;&nbsp;&nbsp;Notifications</span>
+						</a>
+					</li>
+				</ul>
+			</nav>
 		</div>
 	</div>
-	<div id="content-main">
-		<table>
-			<tr>
-				<c:if test="${not empty portraitUuid}">
-					<td>
-						<img class="img-border" src="download/?uuid=${portraitUuid}&preferDownload=false" />
-					</td>
-				</c:if>
-				<td>
-					<fmt:message key="index.welcome" />
-					<c:set var="firstName">
-						<lams:user property="firstName" />
-					</c:set>
-					<c:out value="${firstName}" escapeXml="true"/>
-				</td>
-				
-				<td id="messageCell">
-				<%--
-					<div id="message">Important annoucements might be posted here...</div>
-				--%>
-				</td>
-				
-				<td class="linksCell">
-					<c:if test="${not empty adminLinks}">
-						<c:forEach var="adminlink" items="${adminLinks}">
-							<div class="ui-button" id="<fmt:message key="${adminlink.name}"/>" 
-							     onClick='<c:out value="${adminlink.url}"/>'>
-									<fmt:message key="${adminlink.name}"/>
-							</div> 
-						</c:forEach>
-					</c:if>
-				</td>
-				<td class="linksCell">
-					<div id="refreshButton" class="ui-button" title="<fmt:message key="index.refresh.hint"/>"
-						 onClick="javascript:refreshPrivateNotificationCount();loadOrgTab(null, true)">
-							<fmt:message key="index.refresh" />
-					</div>
-					<div id="notificationsButton" class="ui-button" onClick="javascript:showPrivateNotificationsDialog()">
-						Notifications <span id="notificationsPendingCount"></span>
-					</div>
-					<div id="logoutButton" class="ui-button" onClick="javascript:closeAllChildren();document.location.href='home.do?method=logout'">
-							<fmt:message key="index.logout" />
-					</div>
-				</td>
-			</tr>
-		</table>
-		<c:if test="${empty tab}">
-			<table id="mainContentTable" cellpadding="0" cellspacing="0">
-				<tr>
-					<td>
-						<c:if test="${not empty orgDTOs}">
-							<table id="orgTabs" cellpadding="0" cellspacing="0">
-								<tr>
-									<td>
-										<ul>
-											<c:forEach items="${orgDTOs}" var="dto" varStatus="status">
-												<li class="orgTabsHeader">
-													<a href="#orgTab-${status.index}-org-${dto.orgId}"><c:out value="${dto.orgName}" /></a>
-												</li>
-											</c:forEach>
-										</ul>
-									</td>
-								</tr>
-							</table>
-                                        </td>
-                                </tr>
-                        </table>
-						</c:if>
-		</c:if>
-		<c:if test="${tab eq 'profile'}">
-			<tiles:insert attribute="profile" />
-		</c:if>
-		<c:if test="${tab eq 'community'}">
-			<tiles:insert attribute="community" />
-		</c:if>
+	<!-- /header -->
+
+	<!-- content -->      
+	<div class="content">
+		<div id="messageCell">
+			<%--
+				<div id="message">Important annoucements might be posted here...</div>
+			--%>
+		</div>
+		
+		<div class="row no-gutter">
+			<div class="col-xs-12">
+		    	<div class="container-turned-off-lams">
+		        	<div id="org-container" class="orgTab"></div>
+		     	</div>
+		  	</div>
+		</div>
+	
+	<!-- TODO ADD this button	<div id="refreshButton" class="btn btn-default btn-sm pull-right" title="<fmt:message key="index.refresh.hint"/>"
+				 onClick="javascript:refreshPrivateNotificationCount();loadOrganisation()">
+				<fmt:message key="index.refresh" />
+		</div>
+	 -->
 	</div>
-	<div id="footer">
-		<p>
-			<fmt:message key="msg.LAMS.version" /> <%=Configuration.get(ConfigurationKeys.VERSION)%>
-			<a href="<lams:LAMSURL/>/www/copyright.jsp" target='copyright' onClick="openCopyRight()">
-				&copy; <fmt:message key="msg.LAMS.copyright.short" /> 
-			</a>
-		</p>
-	</div>
+	<!-- /content -->
+	        
+	<!-- footer -->
+	<footer>
+		<div class="">
+			<p class="text-muted text-center">
+				<fmt:message key="msg.LAMS.version" /> <%=Configuration.get(ConfigurationKeys.VERSION)%>
+				<a href="<lams:LAMSURL/>/www/copyright.jsp" target='copyright' onClick="openCopyRight()">
+					&copy; <fmt:message key="msg.LAMS.copyright.short" /> 
+				</a>
+			</p>
+		</div>
+		<div class="clearfix"></div>
+	</footer>
+	<!-- /footer -->
+
 </div>
-<hr>
-<div class="row no-gutter">
-  <div class="col-xs-12">
-    <div class="container">
-      <c:forEach items="${orgDTOs}" var="dto" varStatus="status">
-        <div id="orgTab-${status.index}-org-${dto.orgId}" class="orgTab"></div>
-      </c:forEach>
-     </div>
-  </div>
-</div>
 
 </body>
 </lams:html>
Index: lams_central/web/passwordChangeContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/passwordChangeContent.jsp,v
diff -u -r1.10.12.2 -r1.10.12.3
--- lams_central/web/passwordChangeContent.jsp	14 Oct 2016 03:42:05 -0000	1.10.12.2
+++ lams_central/web/passwordChangeContent.jsp	24 Oct 2016 14:55:28 -0000	1.10.12.3
@@ -1,40 +1,46 @@
-<%@page import="org.lamsfoundation.lams.web.PasswordChangeActionForm"%>
-<%@page import="org.apache.struts.action.ActionMessages"%>
+<!DOCTYPE html>
+
+<%@ page contentType="text/html; charset=utf-8" language="java"%>
 <%@ taglib uri="tags-html" prefix="html"%>
-<%@ taglib uri="tags-logic" prefix="logic"%>
+<%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-logic" prefix="logic"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
-<script type="text/javascript"
-	src="<lams:LAMSURL/>includes/javascript/jquery.js"></script>
-<script type="text/javascript"
-	src="<lams:LAMSURL/>includes/javascript/jquery.validate.js"></script>
-<link rel="stylesheet" href="css/defaultHTML_learner.css"
-	type="text/css" />
-<link rel="stylesheet" href="css/bootstrap.min.css" type="text/css" />
-<script type="text/javascript">
-	function checkPasswordField(field) {
-		if (/^\s*$/.test(field.value)) {
-			alert("Password cannot be empty");
-		}
-	};
-</script>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ page import="org.apache.struts.action.ActionMessages"
+	import="org.lamsfoundation.lams.web.PasswordChangeActionForm"%>
 
+<lams:html>
+<lams:head>
+	<link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" />
 
+	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="includes/javascript/groupDisplay.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery.validate.js"></script>
+	<script type="text/javascript">
+		function checkPasswordField(field) {
+			if (/^\s*$/.test(field.value)) {
+				alert("Password cannot be empty");
+			}
+		};
+		
+		$(document).ready(function () {
+			//update dialog's height and title
+			updateMyProfileDialogSettings('<fmt:message key="title.password.change.screen" />', '430');
+		});	
+	</script>
+</lams:head>
+
+<body>
 <html:form action="/passwordChanged" method="post">
 
-
 	<div style="clear: both"></div>
 
 	<div class="container">
 		<div class="row vertical-center-row">
-			<div
-				class="col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
-				<div class="panel panel-default">
-					<div class="panel-heading">
-						<div class="panel-title">
-							<fmt:message key="title.password.change.screen" />
-						</div>
-					</div>
+			<div class="col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
+				<div class="panel voffset20">
 					<logic:messagesPresent message="true">
 						<p class="warning">
 							<html:messages message="true" id="errMsg">
@@ -89,6 +95,5 @@
 		</div>
 	</div>
 </html:form>
-
-
-
+</body>
+</lams:html>
Index: lams_central/web/passwordChangeOkContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/passwordChangeOkContent.jsp,v
diff -u -r1.5 -r1.5.22.1
--- lams_central/web/passwordChangeOkContent.jsp	21 Nov 2006 05:09:50 -0000	1.5
+++ lams_central/web/passwordChangeOkContent.jsp	24 Oct 2016 14:55:28 -0000	1.5.22.1
@@ -1,13 +1,42 @@
-<%@ taglib uri="tags-fmt" prefix="fmt" %>
+<!DOCTYPE html>
 
-<table width="100%" height="177" border="0" cellpadding="5" cellspacing="0" bgcolor="#FFFFFF">
-	<tr> 
-		<td valign="top">
-			<p class=body><fmt:message key="msg.password.changed"/></p>
-			<p class=body>	
-				<input type="submit" class="button" value="Ok"
-					onClick="javascript:document.location='index.do?state=active&tab=profile';" />
-			</p>
-		</td>
-	</tr>
-</table>
+<%@ page contentType="text/html; charset=utf-8" language="java"%>
+<%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-bean" prefix="bean"%>
+<%@ taglib uri="tags-logic" prefix="logic"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<lams:html>
+<lams:head>
+	<link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" />
+</lams:head>
+
+<body>
+	<div style="clear: both"></div>
+
+	<div class="container">
+		<div class="row vertical-center-row">
+			<div class="col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
+				<div class="panel voffset20">
+					<div class="panel-body">
+					<div class="col-xs-12 text-center">
+						<fmt:message key="msg.password.changed"/>
+					</div>
+					
+					<div class="col-xs-12 text-center voffset10">
+						<a class="btn btn-sm btn-default"
+							href="index.do?state=active&method=profile" role="button">
+							Ok
+						</a>
+					</div>
+					
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+
+</body>
+</lams:html>
\ No newline at end of file
Index: lams_central/web/portrait.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/portrait.jsp,v
diff -u -r1.8.2.3 -r1.8.2.4
--- lams_central/web/portrait.jsp	15 Oct 2016 09:42:33 -0000	1.8.2.3
+++ lams_central/web/portrait.jsp	24 Oct 2016 14:55:28 -0000	1.8.2.4
@@ -1,122 +1,122 @@
+<!DOCTYPE html>
 
+<%@ page contentType="text/html; charset=utf-8" language="java"%>
 <%@ taglib uri="tags-html" prefix="html"%>
+<%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-bean" prefix="bean"%>
-<%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-logic" prefix="logic"%>
-<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
-<link rel="stylesheet" href="css/defaultHTML_learner.css"
-	type="text/css" />
-<style media="screen,projection" type="text/css">
-.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited,
-	.ui-state-active a:hover {
-	color: #47bc23 !important;
-	background-image: none;
-	background-color: transparent;
-}
 
-.button {
-	font-size: 11px;
-	font-family: verdana, arial, helvetica, sans-serif;
-}
+<lams:html>
+<lams:head>
+	<link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" />
+	<style type="text/css">
+		.ui-state-active a, .ui-state-active a:link, .ui-state-active a:visited, .ui-state-active a:hover {
+			color: #47bc23 !important;
+			background-image: none;
+			background-color: transparent;
+		}
+		
+		.button {
+			font-size: 11px;
+			font-family: verdana, arial, helvetica, sans-serif;
+		}
+		
+		.tableCaptions {
+			text-align: right;
+			vertical-align: top;
+			width: 30%;
+		}
+		
+		#accordion h3 a {
+			border-bottom: 0;
+		}
+		
+		#accordion div {
+			text-align: center;
+		}
+		
+		#accordion p {
+			text-align: center;
+			padding-bottom: 0px;
+			margin-bottom: 0xp;
+		}
+		
+		#webcam {
+			padding-bottom: 17px;
+		}
+	</style>
 
-.tableCaptions {
-	text-align: right;
-	vertical-align: top;
-	width: 30%;
-}
-
-#accordion h3 a {
-	border-bottom: 0;
-}
-
-#accordion div {
-	text-align: center;
-}
-
-#accordion p {
-	text-align: center;
-	padding-bottom: 0px;
-	margin-bottom: 0xp;
-}
-
-#webcam {
-	padding-bottom: 17px;
-}
-</style>
-<script type="text/javascript"
-	src="/lams/includes/javascript/bootstrap.min.js"></script>
-<script language="JavaScript" type="text/javascript"
-	src="includes/javascript/jquery.blockUI.js"></script>
-<script language="JavaScript" type="text/javascript"
-	src="includes/javascript/webcam.js"></script>
-
-
-
-<script language="JavaScript">
-	webcam.set_swf_url("includes/flash/webcam.swf");
-	webcam.set_shutter_sound(true, "includes/sounds/shutter.mp3"); // play shutter click sound
-	webcam
-			.set_api_url('<c:url value="/saveportrait.do"/>?method=saveWebcamPortrait');
-	webcam.set_quality(100); // JPEG quality (1 - 100)
-	//set onComplete callback
-	webcam.set_hook('onComplete', 'onCompleteWebcam');
-	function onCompleteWebcam(response) {
-		window.location.href = '<c:url value="/index.do"/>?tab=profile';
-	}
-	//set onError callback
-	webcam.set_hook('onError', 'onErrorWebcam');
-	function onErrorWebcam(msg) {
-		var activeHeader = $("#accordion").accordion("option", "active");
-		if (activeHeader == "0") {
-			alert($("#webcam").attr("height") + "JPEGCam Flash Error: " + msg);
+	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="includes/javascript/groupDisplay.js"></script>
+	<script type="text/javascript" src="/lams/includes/javascript/bootstrap.min.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery.blockUI.js"></script>
+	<script type="text/javascript" src="includes/javascript/webcam.js"></script>
+	<script type="text/javascript">
+	
+		webcam.set_swf_url("includes/flash/webcam.swf");
+		webcam.set_shutter_sound(true, "includes/sounds/shutter.mp3"); // play shutter click sound
+		webcam.set_api_url('<c:url value="/saveportrait.do"/>?method=saveWebcamPortrait');
+		webcam.set_quality(100); // JPEG quality (1 - 100)
+		
+		//set onComplete callback
+		webcam.set_hook('onComplete', 'onCompleteWebcam');
+		function onCompleteWebcam(response) {
+			window.location.href = '<c:url value="/index.do"/>?method=profile';
 		}
-		return true;
-	}
+		
+		//set onError callback
+		webcam.set_hook('onError', 'onErrorWebcam');
+		function onErrorWebcam(msg) {
+			var activeHeader = $("#accordion").accordion("option", "active");
+			if (activeHeader == "0") {
+				alert($("#webcam").attr("height") + "JPEGCam Flash Error: " + msg);
+			}
+			return true;
+		}
+	
+		jQuery(document).ready(function() {
+			//initialize webcam
+			$("#webcam").html(webcam.get_html(320, 240, 120, 90));
 
-	jQuery(document)
-			.ready(
-					function() {
-						//initialize webcam
-						$("#webcam").html(
-														webcam.get_html(320,
-																240, 120, 90));
+			$('#takeSnapshot').click(function() {
+				webcam.freeze();
+				showConfirmationButtons();
+			});
 
-						$('#takeSnapshot').click(function() {
-							webcam.freeze();
-							showConfirmationButtons();
-						});
+			$('#uploadWebcam').click(function() {
+				$.blockUI({
+					message : '<h1><img src="images/loading.gif" style="padding-right:25px;"> <fmt:message key="label.portrait.please.wait" /> </h1>'
+				});
+				webcam.upload();
+				hideConfirmationButtons();
+			});
 
-						$('#uploadWebcam')
-								.click(
-										function() {
-											$
-													.blockUI({
-														message : '<h1><img src="images/loading.gif" style="padding-right:25px;"> <fmt:message key="label.portrait.please.wait" /> </h1>'
-													});
-											webcam.upload();
-											hideConfirmationButtons();
-										});
+			$('#resetWebcam').click(function() {
+				webcam.reset();
+				hideConfirmationButtons();
+			});
 
-						$('#resetWebcam').click(function() {
-							webcam.reset();
-							hideConfirmationButtons();
-						});
+			function hideConfirmationButtons() {
+				$('#takeSnapshotArea').show();
+				$('#uploadToServerArea').hide();
+			}
 
-						function hideConfirmationButtons() {
-							$('#takeSnapshotArea').show();
-							$('#uploadToServerArea').hide();
-						}
+			function showConfirmationButtons() {
+				$('#takeSnapshotArea').hide();
+				$('#uploadToServerArea').show();
+			}
 
-						function showConfirmationButtons() {
-							$('#takeSnapshotArea').hide();
-							$('#uploadToServerArea').show();
-						}
-					});
-</script>
+			//update dialog's height and title
+			updateMyProfileDialogSettings('<fmt:message key="title.portrait.change.screen" />', '680');
+		});
+	</script>
+</lams:head>
 
-<html:form action="/saveportrait.do" method="post"
-	enctype="multipart/form-data">
+<body>
+<html:form action="/saveportrait.do" method="post"	enctype="multipart/form-data">
 	<html:hidden name="PortraitActionForm" property="portraitUuid" />
 	<div style="clear: both"></div>
 	<div class="container">
@@ -126,21 +126,18 @@
 				<div class="currentPortrait text-center" style="margin:10px">
 					<fmt:message key="label.portrait.current" />:<br/>
 	
-					<logic:notEqual name="PortraitActionForm" property="portraitUuid"
-						value="0">
-						<img class="img-thumbnail"
-							src="/lams/download/?uuid=<bean:write name="PortraitActionForm" property="portraitUuid" />&preferDownload=false" />
+					<logic:notEqual name="PortraitActionForm" property="portraitUuid" value="0">
+						<img class="img-thumbnail" src="/lams/download/?uuid=<bean:write name="PortraitActionForm" 
+								property="portraitUuid" />&preferDownload=false" />
 					</logic:notEqual>
 	
-					<logic:equal name="PortraitActionForm" property="portraitUuid"
-						value="0">
+					<logic:equal name="PortraitActionForm" property="portraitUuid"	value="0">
 						<c:set var="lams">
 							<lams:LAMSURL />
 						</c:set>
 						<em><fmt:message key="msg.portrait.none" /></em>
 					</logic:equal>
 				</div>
-
 			
 			<!--  -->
 			<div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true">
@@ -176,7 +173,7 @@
 									href="javascript:return false;"><fmt:message
 										key='label.portrait.no.take.another.one' /></a>
 							</div>
-			
+
 			      </div>
 			    </div>
 			  </div>
@@ -199,19 +196,19 @@
 							</div>	
 							<br /> <a
 								class="btn btn-sm btn-file btn-default offset5" role="button"
-								href="<c:url value='/index.do'/>?tab=profile"><fmt:message
+								href="<c:url value='/index.do'/>?method=profile"><fmt:message
 									key="button.cancel" /></a>
 									<a class="btn btn-sm btn-default offset5"
 								href="javascript:document.PortraitActionForm.submit();"
-								role="button"><fmt:message key="button.save" /></a> 
-
+								role="button"><fmt:message key="button.save" /></a>
 			
-			
 			      </div>
 			    </div>
 			  </div>
 		</div>
 	</div>
 </div>
 </div>	
-</html:form>
\ No newline at end of file
+</html:form>
+</body>
+</lams:html>
\ No newline at end of file
Index: lams_central/web/profile.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/profile.jsp,v
diff -u -r1.23.2.2 -r1.23.2.3
--- lams_central/web/profile.jsp	14 Oct 2016 03:42:39 -0000	1.23.2.2
+++ lams_central/web/profile.jsp	24 Oct 2016 14:55:28 -0000	1.23.2.3
@@ -1,33 +1,37 @@
-<%@ page language="java" pageEncoding="UTF-8"
-	contentType="text/html;charset=utf-8"%>
+<!DOCTYPE html>
+
+<%@ page contentType="text/html; charset=utf-8" language="java"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
 <%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-logic" prefix="logic"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ page
-	import="org.lamsfoundation.lams.usermanagement.AuthenticationMethod"
+<%@ page import="org.lamsfoundation.lams.usermanagement.AuthenticationMethod"
 	import="org.lamsfoundation.lams.util.Configuration"
 	import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
-<link rel="stylesheet" href="css/defaultHTML_learner.css"
-	type="text/css" />
-
-<link rel="stylesheet" href="css/bootstrap.min.css" type="text/css" />
-
-
 <c:set var="showAllMyLessonLink"><%=Configuration.get(ConfigurationKeys.SHOW_ALL_MY_LESSON_LINK)%></c:set>
 
+<lams:html>
+<lams:head>
+	<link rel="stylesheet" href="css/defaultHTML_learner.css" type="text/css" />
+	
+	<script type="text/javascript" src="includes/javascript/jquery.js"></script>
+	<script type="text/javascript" src="includes/javascript/jquery-ui.js"></script>
+	<script type="text/javascript" src="includes/javascript/groupDisplay.js"></script>
+	<script type="text/javascript">
+		$(document).ready(function () {
+			//update dialog's height and title
+			updateMyProfileDialogSettings('<fmt:message key="index.myprofile" />', '430');
+		});
+	</script>
+</lams:head>
 
+<body>
 <div class="container">
 	<div class="row vertical-center-row">
 		<div
 			class="col-xs-12 col-sm-8 col-sm-offset-2 col-md-6 col-md-offset-3">
-			<div class="panel panel-default">
-				<div class="panel-heading">
-					<div class="panel-title">
-						<fmt:message key="index.myprofile" />
-					</div>
-				</div>
+			<div class="panel voffset20">
 				<div class="panel-body">
 					<div class="text-center">
 
@@ -59,7 +63,7 @@
 					<!-- Split button -->
 					<div class="col-xs-12 text-center">
 						<a class="btn btn-sm btn-default offset5"
-							href="index.do?state=active&tab=editprofile" role="button"><i
+							href="index.do?state=active&method=editprofile" role="button"><i
 							class="fa fa-fw fa-pencil"></i> <span class="hidden-xs"><fmt:message
 									key="title.profile.edit.screen" /></span></i></a>&nbsp;&nbsp;
 						<c:set var="authenticationMethodId">
@@ -69,18 +73,18 @@
 						<c:if test="${authenticationMethodId eq dbId}">
 
 							<a class="btn btn-sm btn-default voffset5"
-								href="index.do?state=active&tab=password" role="button"><i
+								href="index.do?state=active&method=password" role="button"><i
 								class="fa fa-fw fa-lock"></i> <span class="hidden-xs"><fmt:message
 										key="title.password.change.screen" /></span></i></a>
 						</c:if>
 						<a class="btn btn-sm btn-default offset5"
-							href="index.do?state=active&tab=portrait" role="button"><i
+							href="index.do?state=active&method=portrait" role="button"><i
 							class="fa fa-fw fa-camera"></i> <span class="hidden-xs"><fmt:message
 									key="title.portrait.change.screen" /></span></i></a>&nbsp;&nbsp;
 
 						<c:if test="${showAllMyLessonLink}">
 							<a class="btn btn-sm btn-default offset5"
-								href="index.do?state=active&tab=lessons" role="button"><i
+								href="index.do?state=active&method=lessons" role="button"><i
 								class="fa fa-fw fa-book"></i> <span class="hidden-xs"><fmt:message
 										key="title.all.my.lessons" /></span></i></a>
 						</c:if>
@@ -91,19 +95,7 @@
 	</div>
 
 </div>
-</div>
 
-</div>
-</div>
-</div>
+</body>
+</lams:html>
 
-</div>
-</div>
-</div>
-
-
-
-
-
-
-
Index: lams_central/web/twoFactorAuthSecret.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/Attic/twoFactorAuthSecret.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_central/web/twoFactorAuthSecret.jsp	26 Aug 2016 15:02:59 -0000	1.1.2.1
+++ lams_central/web/twoFactorAuthSecret.jsp	24 Oct 2016 14:55:28 -0000	1.1.2.2
@@ -10,5 +10,5 @@
 </p>
 <p class=body>	
 	<input type="submit" class="button" value="Ok"
-		onClick="javascript:document.location='index.do?state=active&tab=profile';" />
+		onClick="javascript:document.location='index.do?state=active&method=profile';" />
 </p>
Index: lams_central/web/WEB-INF/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/Attic/struts-config.xml,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_central/web/WEB-INF/struts-config.xml	27 Sep 2016 06:22:57 -0000	1.1.2.3
+++ lams_central/web/WEB-INF/struts-config.xml	24 Oct 2016 14:55:28 -0000	1.1.2.4
@@ -115,6 +115,7 @@
     <action
       path="/index"
       type="org.lamsfoundation.lams.web.IndexAction"
+      parameter="dispatch"
       unknown="false"
       validate="false"
     >
@@ -145,7 +146,7 @@
       />
       <forward
         name="passwordChanged"
-        path=".passwordChangeOk"
+        path="/passwordChangeOkContent.jsp"
         redirect="false"
       />
       <forward
@@ -280,7 +281,7 @@
     >
       <forward
         name="passwordChange"
-        path=".passwordChange"
+        path="/passwordChangeContent.jsp"
         redirect="false"
       />
     </action>
@@ -448,7 +449,7 @@
       />
       <forward
         name="passwordChange"
-        path=".passwordChange"
+        path="/passwordChangeContent.jsp"
         redirect="false"
       />
       <forward
@@ -489,7 +490,7 @@
     >
       <forward
         name="portrait"
-        path=".portrait"
+        path="/portrait.jsp"
         redirect="false"
       />
     </action>
@@ -526,18 +527,18 @@
       type="org.lamsfoundation.lams.web.ProfileSaveAction"
       name="UserForm"
       scope="request"
-      input=".editprofile"
+      input="/editprofile.jsp"
       unknown="false"
       validate="false"
     >
       <forward
         name="profile"
-        path="/index.do?state=active&amp;tab=profile"
+        path="/index.do?state=active&amp;method=profile"
         redirect="true"
       />
       <forward
         name="editprofile"
-        path="/index.do?state=active&amp;tab=editprofile"
+        path="/index.do?state=active&amp;method=editprofile"
         redirect="false"
       />
     </action>
@@ -552,17 +553,17 @@
     >
       <forward
         name="view"
-        path=".profile"
+        path="/profile.jsp"
         redirect="false"
       />
       <forward
         name="lessons"
-        path=".lessons"
+        path="/lessons.jsp"
         redirect="false"
       />
       <forward
         name="edit"
-        path=".editprofile"
+        path="/editprofile.jsp"
         redirect="false"
       />
     </action>
@@ -584,19 +585,19 @@
       type="org.lamsfoundation.lams.web.PortraitSaveAction"
       name="PortraitActionForm"
       scope="request"
-      input=".portrait"
+      input="/portrait.jsp"
       parameter="method"
       unknown="false"
       validate="false"
     >
       <forward
         name="profile"
-        path="/index.do?state=active&amp;tab=profile"
+        path="/index.do?state=active&amp;method=profile"
         redirect="false"
       />
       <forward
         name="errors"
-        path="/index.do?state=active&amp;tab=portrait"
+        path="/index.do?state=active&amp;method=portrait"
         redirect="false"
       />
     </action>
@@ -669,23 +670,23 @@
       type="org.lamsfoundation.lams.web.PasswordChangeAction"
       name="PasswordChangeActionForm"
       scope="request"
-      input=".passwordChange"
+      input="/passwordChangeContent.jsp"
       unknown="false"
       validate="false"
     >
       <forward
         name="okay"
-        path="/index.do?state=active&amp;tab=passwordChanged"
+        path="/index.do?state=active&amp;method=passwordChanged"
         redirect="false"
       />
       <forward
         name="cancelled"
-        path="/index.do?state=active&amp;tab=profile"
+        path="/index.do?state=active&amp;method=profile"
         redirect="false"
       />
       <forward
         name="errors"
-        path="/index.do?state=active&amp;tab=password"
+        path="/index.do?state=active&amp;method=password"
         redirect="false"
       />
     </action>
Index: lams_central/web/WEB-INF/tiles-defs.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tiles-defs.xml,v
diff -u -r1.3.2.3 -r1.3.2.4
--- lams_central/web/WEB-INF/tiles-defs.xml	26 Aug 2016 15:02:59 -0000	1.3.2.3
+++ lams_central/web/WEB-INF/tiles-defs.xml	24 Oct 2016 14:55:28 -0000	1.3.2.4
@@ -25,35 +25,11 @@
   http://www.gnu.org/licenses/gpl.txt
 -->
 <tiles-definitions>
-
-	<definition name=".portrait" path="/main.jsp">
-		<put name="profile" value="portrait.jsp"/>	
-	</definition>
 	
-	<definition name=".lessons" path="/main.jsp">
-		<put name="profile" value="lessons.jsp"/>	
-	</definition>
-
-	<definition name=".profile" path="/main.jsp">
-		<put name="profile" value="profile.jsp"/>	
-	</definition>
-	
 	<definition name=".community" path="/main.jsp">
 		<put name="community" value="lamscommunity/community.jsp"/>	
 	</definition>
 	
-	<definition name=".editprofile" path="/main.jsp">
-		<put name="profile" value="editprofile.jsp"/>	
-	</definition>
-
-	<definition name=".passwordChange" path="/main.jsp">
-		<put name="profile" value="passwordChangeContent.jsp"/>	
-	</definition>
-	
-	<definition name=".passwordChangeOk" path="/main.jsp">
-		<put name="profile" value="passwordChangeOkContent.jsp" />	
-	</definition>
-	
 	<definition name=".twoFactorAuthenticationSecret" path="/main.jsp">
 		<put name="profile" value="twoFactorAuthSecret.jsp"/>	
 	</definition>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/css/main.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/images/css/john-doe-portrait.jpg
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/images/css/Attic/john-doe-portrait.jpg,v
diff -u -r1.1 -r1.1.2.1
Binary files differ
Index: lams_central/web/includes/javascript/addLesson.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/addLesson.js,v
diff -u -r1.7.2.5 -r1.7.2.6
--- lams_central/web/includes/javascript/addLesson.js	22 Oct 2016 06:14:02 -0000	1.7.2.5
+++ lams_central/web/includes/javascript/addLesson.js	24 Oct 2016 14:55:28 -0000	1.7.2.6
@@ -13,7 +13,7 @@
 }
 
 /**
- * Sets up widgets in the main tab.
+ * Sets up widgets on the main.jsp page
  */
 function initLessonTab(){
 	$('#ldScreenshotAuthor').load(function(){
Index: lams_central/web/includes/javascript/groupDisplay.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/groupDisplay.js,v
diff -u -r1.37.2.24 -r1.37.2.25
--- lams_central/web/includes/javascript/groupDisplay.js	23 Oct 2016 15:13:54 -0000	1.37.2.24
+++ lams_central/web/includes/javascript/groupDisplay.js	24 Oct 2016 14:55:28 -0000	1.37.2.25
@@ -1,45 +1,55 @@
 function initMainPage() {
 	initButtons();
 	
-	if ($('#orgTabs').length > 0) {
-		$('#orgTabs').tabs({
-			'activate' : function(event, ui){
-				loadOrgTab(ui.newPanel);
-			}
-		}).addClass('ui-tabs-vertical ui-helper-clearfix')
-		  .find('li').removeClass('ui-corner-top').addClass('ui-corner-left');
+	//in case active course is not yet chosen by user, select the fist one from the list
 	
-		loadOrgTab($('.orgTab').first());
+			
+	if (activeOrgId > 0) {
+		//$('#orgTabs').tabs({
+		//	'activate' : function(event, ui){
+		//		loadOrganisation();
+		//	}
+		//}).addClass('ui-tabs-vertical ui-helper-clearfix')
+		// .find('li').removeClass('ui-corner-top').addClass('ui-corner-left');
+	
+		loadOrganisation();
 	}
 	
-	$("#actionAccord").accordion({
-		'heightStyle' : 'content'
-	});
-	
 	refreshPrivateNotificationCount();
 }
 
-function loadOrgTab(orgTab, refresh) {
-	if (!orgTab) {
-		orgTab = $('div.orgTab[id^=orgTab-' + $('#orgTabs').tabs('option','active') + ']');
-	}
-	if (orgTab && (refresh || !orgTab.text())) {
-		var orgTabId = orgTab.attr("id");
-		var orgId = orgTabId.split('-')[3];
-		
-		orgTab.load(
-			"displayGroup.do",
-			{
-				stateId : stateId,
-				orgId   : orgId
-			},
-			function() {
-				initButtons(orgTabId);
-			});
-	}
+function selectOrganisation(newOrgId) {
+	//remove active CSS class from the old org
+	if (activeOrgId > 0) {
+		$("#org-row-" + activeOrgId).removeClass("active");
+		$("#org-row-" + activeOrgId + " a>i").remove();
+	}	
+	
+	//add active CSS class
+	$("#org-row-" + newOrgId).addClass("active");
+	$("#org-row-" + newOrgId + " a").append( "<i class='fa fa-chevron-circle-right fa-lg pull-right'></i>" )
+	
+	activeOrgId = newOrgId;
+	loadOrganisation();
+	
+	//store last visited
+	// TODO
 }
 
+function loadOrganisation() {	
+	$("#org-container").load(
+		"displayGroup.do",
+		{
+			stateId : stateId,
+			orgId   : activeOrgId
+		},
+		function() {
+			initButtons("org-container");
+		}
+	);
+}
 
+
 function initButtons(containerId) {
 	var container = containerId ? $('#' + containerId) : document;
 
@@ -143,7 +153,7 @@
 					ids : ids.join(",")
 				},
 				error : function() {
-					loadOrgTab(null, true);
+					loadOrganisation();
 				}
 			});
 		}
@@ -225,6 +235,49 @@
 }
 
 
+function showMyProfileDialog() {
+	showDialog("dialogMyProfile", {
+		'title' : LABELS.MY_PROFILE,
+		'modal' : true,
+		'width' : 'auto',
+		'height' : 430,
+		'open' : function() {
+			var dialog = $(this);
+			// load contents after opening the dialog
+			$('iframe', dialog).attr('src', LAMS_URL + 'index.do?method=profile');
+			$(this).css("maxWidth", "770px").css("margin", "auto");
+			
+			// in case of mobile devices allow iframe scrolling
+			if( /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent) ) {
+			    setTimeout(function() {
+			    	dialog.css({
+			    		'overflow-y' : 'scroll',
+			    		'-webkit-overflow-scrolling' : 'touch'
+			    	});
+			    },500);
+			}
+		}
+	});
+}
+
+
+function updateMyProfileDialogSettings(title, height) {
+	var id = 'dialogMyProfile';
+	var dialog = $("#" + id, window.parent.document);
+
+	// update height
+	$('.modal-content', dialog).height(height);
+	if (height.match("%$")) {
+		$('.modal-dialog', dialog).height(height);
+	} else {
+		$('.modal-dialog', dialog).height('');
+	}
+
+	// update title
+	$('.modal-title', dialog).attr('id',  id + 'Label').text(title);
+}
+
+
 function showOrgGroupDialog(orgID) {
 	showDialog("dialogOrgGroup", {
 		'data' : {
@@ -433,7 +486,7 @@
 			'method' : 'getPendingNotificationCount'
 		},
 		success : function(count) {
-			$('#notificationsPendingCount').text(count == 0 ? '' : '(' + count + ')');
+			$('#notificationsPendingCount').text(count == 0 ? '0' : count);
 		}
 	});
 }
@@ -611,7 +664,7 @@
 	// was the dialog just closed or a lesson removed
 	// if latter, refresh the list
 	if (refresh) {
-		loadOrgTab(null, true);
+		loadOrganisation();
 	}
 	$("#" + id).modal('hide');
 }
@@ -663,7 +716,7 @@
 				type : "POST",
 				success : function(json) {
 					if (json.removeLesson == true) {
-						loadOrgTab(null, true);
+						loadOrganisation();
 					} else {
 						alert(json.removeLesson);
 					}
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/jquery.slimscroll.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/includes/javascript/jquery.tablesorter.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/jquery.tablesorter.js,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_central/web/includes/javascript/jquery.tablesorter.js	15 Jun 2015 22:42:48 -0000	1.1.2.3
+++ lams_central/web/includes/javascript/jquery.tablesorter.js	24 Oct 2016 14:55:28 -0000	1.1.2.4
@@ -1,3 +1,2 @@
-/* tablesorter (FORK) pager plugin updated 12/22/2014 (v2.18.4) */
-!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&"object"==typeof module.exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){return function(a){"use strict";a.extend({tablesorter:new function(){function b(){var a=arguments[0],b=arguments.length>1?Array.prototype.slice.call(arguments):a;"undefined"!=typeof console&&"undefined"!=typeof console.log?console[/error/i.test(a)?"error":/warn/i.test(a)?"warn":"log"](b):alert(b)}function c(a,c){b(a+" ("+((new Date).getTime()-c.getTime())+"ms)")}function d(a){for(var b in a)return!1;return!0}function e(c,d,e,f){for(var g,h,i=c.config,j=v.parsers.length,k=!1,l="",m=!0;""===l&&m;)e++,d[e]?(k=d[e].cells[f],l=v.getElementText(i,k,f),h=a(k),c.config.debug&&b("Checking if value was empty on row "+e+", column: "+f+': "'+l+'"')):m=!1;for(;--j>=0;)if(g=v.parsers[j],g&&"text"!==g.id&&g.is&&g.is(l,c,k,h))return g;return v.getParserById("text")}function f(a,b,c,d){"undefined"==typeof d&&(d=v.getElementText(a,b,c));var e=""+d,f=a.parsers[c],g=a.extractors[c];return f&&(g&&"function"==typeof g.format&&(d=g.format(d,a.table,b,c)),e="no-parser"===f.id?"":f.format(""+d,a.table,b,c),a.ignoreCase&&"string"==typeof e&&(e=e.toLowerCase())),e}function g(a){var d,f,g,h,i,j,k,l,m,n,o=a.config,p=o.$tbodies=o.$table.children("tbody:not(."+o.cssInfoBlock+")"),q=0,r="",s=p.length;if(0===s)return o.debug?b("Warning: *Empty table!* Not building a parser cache"):"";for(o.debug&&(n=new Date,b("Detecting parsers for each column")),f={extractors:[],parsers:[]};s>q;){if(d=p[q].rows,d.length)for(g=o.columns,h=0;g>h;h++)i=o.$headerIndexed[h],j=v.getColumnData(a,o.headers,h),m=v.getParserById(v.getData(i,j,"extractor")),l=v.getParserById(v.getData(i,j,"sorter")),k="false"===v.getData(i,j,"parser"),o.empties[h]=(v.getData(i,j,"empty")||o.emptyTo||(o.emptyToBottom?"bottom":"top")).toLowerCase(),o.strings[h]=(v.getData(i,j,"string")||o.stringTo||"max").toLowerCase(),k&&(l=v.getParserById("no-parser")),m||(m=!1),l||(l=e(a,d,-1,h)),o.debug&&(r+="column:"+h+"; extractor:"+m.id+"; parser:"+l.id+"; string:"+o.strings[h]+"; empty: "+o.empties[h]+"\n"),f.parsers[h]=l,f.extractors[h]=m;q+=f.parsers.length?s:1}o.debug&&(b(r?r:"No parsers detected"),c("Completed detecting parsers",n)),o.parsers=f.parsers,o.extractors=f.extractors}function h(d){var e,g,h,i,j,k,l,m,n,o,p,q,r,s=d.config,t=s.$tbodies,u=s.parsers;if(s.cache={},s.totalRows=0,!u)return s.debug?b("Warning: *Empty table!* Not building a cache"):"";for(s.debug&&(n=new Date),s.showProcessing&&v.isProcessing(d,!0),k=0;k<t.length;k++){for(r=[],e=s.cache[k]={normalized:[]},o=t[k]&&t[k].rows.length||0,i=0;o>i;++i)if(p={child:[],raw:[]},l=a(t[k].rows[i]),m=[],l.hasClass(s.cssChildRow)&&0!==i)for(g=e.normalized.length-1,q=e.normalized[g][s.columns],q.$row=q.$row.add(l),l.prev().hasClass(s.cssChildRow)||l.prev().addClass(v.css.cssHasChild),h=l.children("th, td"),g=q.child.length,q.child[g]=[],j=0;j<s.columns;j++)q.child[g][j]=f(s,h[j],j);else{for(p.$row=l,p.order=i,j=0;j<s.columns;++j)"undefined"!=typeof u[j]?(g=v.getElementText(s,l[0].cells[j],j),p.raw.push(g),h=f(s,l[0].cells[j],j,g),m.push(h),"numeric"===(u[j].type||"").toLowerCase()&&(r[j]=Math.max(Math.abs(h)||0,r[j]||0))):s.debug&&b("No parser found for cell:",l[0].cells[j],"does it have a header?");m[s.columns]=p,e.normalized.push(m)}e.colMax=r,s.totalRows+=e.normalized.length}s.showProcessing&&v.isProcessing(d),s.debug&&c("Building cache for "+o+" rows",n)}function i(a,b){var e,f,g,h,i,j,k,l=a.config,m=l.widgetOptions,n=l.$tbodies,o=[],p=l.cache;if(d(p))return l.appender?l.appender(a,o):a.isUpdating?l.$table.trigger("updateComplete",a):"";for(l.debug&&(k=new Date),j=0;j<n.length;j++)if(g=n.eq(j),g.length){for(h=v.processTbody(a,g,!0),e=p[j].normalized,f=e.length,i=0;f>i;i++)o.push(e[i][l.columns].$row),l.appender&&(!l.pager||l.pager.removeRows&&m.pager_removeRows||l.pager.ajax)||h.append(e[i][l.columns].$row);v.processTbody(a,h,!1)}l.appender&&l.appender(a,o),l.debug&&c("Rebuilt table",k),b||l.appender||v.applyWidget(a),a.isUpdating&&l.$table.trigger("updateComplete",a)}function j(a){return/^d/i.test(a)||1===a}function k(d){var e,f,g,h,i,k,l,n,o=d.config;for(o.headerList=[],o.headerContent=[],o.debug&&(l=new Date),o.columns=v.computeColumnIndex(o.$table.children("thead, tfoot").children("tr")),h=o.cssIcon?'<i class="'+(o.cssIcon===v.css.icon?v.css.icon:o.cssIcon+" "+v.css.icon)+'"></i>':"",o.$headers=a(a.map(a(d).find(o.selectorHeaders),function(b,c){return f=a(b),f.parent().hasClass(o.cssIgnoreRow)?void 0:(e=v.getColumnData(d,o.headers,c,!0),o.headerContent[c]=f.html(),""===o.headerTemplate||f.find("."+v.css.headerIn).length||(i=o.headerTemplate.replace(/\{content\}/g,f.html()).replace(/\{icon\}/g,f.find("."+v.css.icon).length?"":h),o.onRenderTemplate&&(g=o.onRenderTemplate.apply(f,[c,i]),g&&"string"==typeof g&&(i=g)),f.html('<div class="'+v.css.headerIn+'">'+i+"</div>")),o.onRenderHeader&&o.onRenderHeader.apply(f,[c,o,o.$table]),b.column=parseInt(f.attr("data-column"),10),b.order=j(v.getData(f,e,"sortInitialOrder")||o.sortInitialOrder)?[1,0,2]:[0,1,2],b.count=-1,b.lockedOrder=!1,k=v.getData(f,e,"lockedOrder")||!1,"undefined"!=typeof k&&k!==!1&&(b.order=b.lockedOrder=j(k)?[1,1,1]:[0,0,0]),f.addClass(v.css.header+" "+o.cssHeader),o.headerList[c]=b,f.parent().addClass(v.css.headerRow+" "+o.cssHeaderRow).attr("role","row"),o.tabIndex&&f.attr("tabindex",0),b)})),o.$headerIndexed=[],n=0;n<o.columns;n++)f=o.$headers.filter('[data-column="'+n+'"]'),o.$headerIndexed[n]=f.not(".sorter-false").length?f.not(".sorter-false").filter(":last"):f.filter(":last");a(d).find(o.selectorHeaders).attr({scope:"col",role:"columnheader"}),m(d),o.debug&&(c("Built headers:",l),b(o.$headers))}function l(a,b,c){var d=a.config;d.$table.find(d.selectorRemove).remove(),g(a),h(a),t(d,b,c)}function m(a){var b,c,d,e,f=a.config,g=f.$headers.length;for(b=0;g>b;b++)d=f.$headers.eq(b),e=v.getColumnData(a,f.headers,b,!0),c="false"===v.getData(d,e,"sorter")||"false"===v.getData(d,e,"parser"),d[0].sortDisabled=c,d[c?"addClass":"removeClass"]("sorter-false").attr("aria-disabled",""+c),a.id&&(c?d.removeAttr("aria-controls"):d.attr("aria-controls",a.id))}function n(b){var c,d,e,f,g,h,i,j,k=b.config,l=k.sortList,m=l.length,n=v.css.sortNone+" "+k.cssNone,o=[v.css.sortAsc+" "+k.cssAsc,v.css.sortDesc+" "+k.cssDesc],p=[k.cssIconAsc,k.cssIconDesc,k.cssIconNone],q=["ascending","descending"],r=a(b).find("tfoot tr").children().add(a(k.namespace+"_extra_headers")).removeClass(o.join(" "));for(k.$headers.removeClass(o.join(" ")).addClass(n).attr("aria-sort","none").find("."+v.css.icon).removeClass(p.join(" ")).addClass(p[2]),e=0;m>e;e++)if(2!==l[e][1]&&(c=k.$headers.not(".sorter-false").filter('[data-column="'+l[e][0]+'"]'+(1===m?":last":"")),c.length)){for(f=0;f<c.length;f++)c[f].sortDisabled||c.eq(f).removeClass(n).addClass(o[l[e][1]]).attr("aria-sort",q[l[e][1]]).find("."+v.css.icon).removeClass(p[2]).addClass(p[l[e][1]]);r.length&&r.filter('[data-column="'+l[e][0]+'"]').removeClass(n).addClass(o[l[e][1]])}for(m=k.$headers.length,g=k.$headers.not(".sorter-false"),e=0;m>e;e++)h=g.eq(e),h.length&&(d=g[e],i=d.order[(d.count+1)%(k.sortReset?3:2)],j=a.trim(h.text())+": "+v.language[h.hasClass(v.css.sortAsc)?"sortAsc":h.hasClass(v.css.sortDesc)?"sortDesc":"sortNone"]+v.language[0===i?"nextAsc":1===i?"nextDesc":"nextNone"],h.attr("aria-label",j))}function o(b,c){var d,e,f,g,h,i,j,k,l=b.config,m=c||l.sortList,n=m.length;for(l.sortList=[],h=0;n>h;h++)if(k=m[h],d=parseInt(k[0],10),d<l.columns&&l.$headerIndexed[d]){switch(g=l.$headerIndexed[d][0],e=(""+k[1]).match(/^(1|d|s|o|n)/),e=e?e[0]:""){case"1":case"d":e=1;break;case"s":e=i||0;break;case"o":j=g.order[(i||0)%(l.sortReset?3:2)],e=0===j?1:1===j?0:2;break;case"n":g.count=g.count+1,e=g.order[g.count%(l.sortReset?3:2)];break;default:e=0}i=0===h?e:i,f=[d,parseInt(e,10)||0],l.sortList.push(f),e=a.inArray(f[1],g.order),g.count=e>=0?e:f[1]%(l.sortReset?3:2)}}function p(a,b){return a&&a[b]?a[b].type||"":""}function q(b,c,d){if(b.isUpdating)return setTimeout(function(){q(b,c,d)},50);var e,f,g,h,j,k,l,m=b.config,o=!d[m.sortMultiSortKey],p=m.$table,s=m.$headers.length;if(p.trigger("sortStart",b),c.count=d[m.sortResetKey]?2:(c.count+1)%(m.sortReset?3:2),m.sortRestart)for(f=c,g=0;s>g;g++)l=m.$headers.eq(g),l[0]===f||!o&&l.is("."+v.css.sortDesc+",."+v.css.sortAsc)||(l[0].count=-1);if(f=parseInt(a(c).attr("data-column"),10),o){if(m.sortList=[],null!==m.sortForce)for(e=m.sortForce,h=0;h<e.length;h++)e[h][0]!==f&&m.sortList.push(e[h]);if(j=c.order[c.count],2>j&&(m.sortList.push([f,j]),c.colSpan>1))for(h=1;h<c.colSpan;h++)m.sortList.push([f+h,j])}else{if(m.sortAppend&&m.sortList.length>1)for(h=0;h<m.sortAppend.length;h++)k=v.isValueInArray(m.sortAppend[h][0],m.sortList),k>=0&&m.sortList.splice(k,1);if(v.isValueInArray(f,m.sortList)>=0)for(h=0;h<m.sortList.length;h++)k=m.sortList[h],j=m.$headerIndexed[k[0]][0],k[0]===f&&(k[1]=j.order[c.count],2===k[1]&&(m.sortList.splice(h,1),j.count=-1));else if(j=c.order[c.count],2>j&&(m.sortList.push([f,j]),c.colSpan>1))for(h=1;h<c.colSpan;h++)m.sortList.push([f+h,j])}if(null!==m.sortAppend)for(e=m.sortAppend,h=0;h<e.length;h++)e[h][0]!==f&&m.sortList.push(e[h]);p.trigger("sortBegin",b),setTimeout(function(){n(b),r(b),i(b),p.trigger("sortEnd",b)},1)}function r(a){var b,e,f,g,h,i,j,k,l,m,n,o=0,q=a.config,r=q.textSorter||"",s=q.sortList,t=s.length,u=q.$tbodies.length;if(!q.serverSideSorting&&!d(q.cache)){for(q.debug&&(h=new Date),e=0;u>e;e++)i=q.cache[e].colMax,j=q.cache[e].normalized,j.sort(function(c,d){for(b=0;t>b;b++){if(g=s[b][0],k=s[b][1],o=0===k,q.sortStable&&c[g]===d[g]&&1===t)return c[q.columns].order-d[q.columns].order;if(f=/n/i.test(p(q.parsers,g)),f&&q.strings[g]?(f="boolean"==typeof q.string[q.strings[g]]?(o?1:-1)*(q.string[q.strings[g]]?-1:1):q.strings[g]?q.string[q.strings[g]]||0:0,l=q.numberSorter?q.numberSorter(c[g],d[g],o,i[g],a):v["sortNumeric"+(o?"Asc":"Desc")](c[g],d[g],f,i[g],g,a)):(m=o?c:d,n=o?d:c,l="function"==typeof r?r(m[g],n[g],o,g,a):"object"==typeof r&&r.hasOwnProperty(g)?r[g](m[g],n[g],o,g,a):v["sortNatural"+(o?"Asc":"Desc")](c[g],d[g],g,a,q)),l)return l}return c[q.columns].order-d[q.columns].order});q.debug&&c("Sorting on "+s.toString()+" and dir "+k+" time",h)}}function s(b,c){b.table.isUpdating&&b.$table.trigger("updateComplete",b.table),a.isFunction(c)&&c(b.table)}function t(b,c,d){var e=a.isArray(c)?c:b.sortList,f="undefined"==typeof c?b.resort:c;f===!1||b.serverSideSorting||b.table.isProcessing?(s(b,d),v.applyWidget(b.table,!1)):e.length?b.$table.trigger("sorton",[e,function(){s(b,d)},!0]):b.$table.trigger("sortReset",[function(){s(b,d),v.applyWidget(b.table,!1)}])}function u(b){var c=b.config,e=c.$table,j="sortReset update updateRows updateCell updateAll addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave ".split(" ").join(c.namespace+" ");e.unbind(j.replace(/\s+/g," ")).bind("sortReset"+c.namespace,function(d,e){d.stopPropagation(),c.sortList=[],n(b),r(b),i(b),a.isFunction(e)&&e(b)}).bind("updateAll"+c.namespace,function(a,d,e){a.stopPropagation(),b.isUpdating=!0,v.refreshWidgets(b,!0,!0),k(b),v.bindEvents(b,c.$headers,!0),u(b),l(b,d,e)}).bind("update"+c.namespace+" updateRows"+c.namespace,function(a,c,d){a.stopPropagation(),b.isUpdating=!0,m(b),l(b,c,d)}).bind("updateCell"+c.namespace,function(d,g,h,i){d.stopPropagation(),b.isUpdating=!0,e.find(c.selectorRemove).remove();var j,k,l,m,n=c.$tbodies,o=a(g),p=n.index(a.fn.closest?o.closest("tbody"):o.parents("tbody").filter(":first")),q=c.cache[p],r=a.fn.closest?o.closest("tr"):o.parents("tr").filter(":first");g=o[0],n.length&&p>=0&&(k=n.eq(p).find("tr").index(r),m=q.normalized[k],l=o.index(),j=f(c,g,l),m[l]=j,m[c.columns].$row=r,"numeric"===(c.parsers[l].type||"").toLowerCase()&&(q.colMax[l]=Math.max(Math.abs(j)||0,q.colMax[l]||0)),j="undefined"!==h?h:c.resort,j!==!1?t(c,j,i):(a.isFunction(i)&&i(b),c.$table.trigger("updateComplete",c.table)))}).bind("addRows"+c.namespace,function(e,h,i,j){if(e.stopPropagation(),b.isUpdating=!0,d(c.cache))m(b),l(b,i,j);else{h=a(h).attr("role","row");var k,n,o,p,q,r=h.filter("tr").length,s=c.$tbodies.index(h.parents("tbody").filter(":first"));for(c.parsers&&c.parsers.length||g(b),k=0;r>k;k++){for(o=h[k].cells.length,q=[],p={child:[],$row:h.eq(k),order:c.cache[s].normalized.length},n=0;o>n;n++)q[n]=f(c,h[k].cells[n],n),"numeric"===(c.parsers[n].type||"").toLowerCase()&&(c.cache[s].colMax[n]=Math.max(Math.abs(q[n])||0,c.cache[s].colMax[n]||0));q.push(p),c.cache[s].normalized.push(q)}t(c,i,j)}}).bind("updateComplete"+c.namespace,function(){b.isUpdating=!1}).bind("sorton"+c.namespace,function(c,f,g,j){var k=b.config;c.stopPropagation(),e.trigger("sortStart",this),o(b,f),n(b),k.delayInit&&d(k.cache)&&h(b),e.trigger("sortBegin",this),r(b),i(b,j),e.trigger("sortEnd",this),v.applyWidget(b),a.isFunction(g)&&g(b)}).bind("appendCache"+c.namespace,function(c,d,e){c.stopPropagation(),i(b,e),a.isFunction(d)&&d(b)}).bind("updateCache"+c.namespace,function(d,e){c.parsers&&c.parsers.length||g(b),h(b),a.isFunction(e)&&e(b)}).bind("applyWidgetId"+c.namespace,function(a,d){a.stopPropagation(),v.getWidgetById(d).format(b,c,c.widgetOptions)}).bind("applyWidgets"+c.namespace,function(a,c){a.stopPropagation(),v.applyWidget(b,c)}).bind("refreshWidgets"+c.namespace,function(a,c,d){a.stopPropagation(),v.refreshWidgets(b,c,d)}).bind("destroy"+c.namespace,function(a,c,d){a.stopPropagation(),v.destroy(b,c,d)}).bind("resetToLoadState"+c.namespace,function(){v.removeWidget(b,!0,!1),c=a.extend(!0,v.defaults,c.originalSettings),b.hasInitialized=!1,v.setup(b,c)})}var v=this;v.version="2.22.1",v.parsers=[],v.widgets=[],v.defaults={theme:"default",widthFixed:!1,showProcessing:!1,headerTemplate:"{content}",onRenderTemplate:null,onRenderHeader:null,cancelSelection:!0,tabIndex:!0,dateFormat:"mmddyyyy",sortMultiSortKey:"shiftKey",sortResetKey:"ctrlKey",usNumberFormat:!0,delayInit:!1,serverSideSorting:!1,resort:!0,headers:{},ignoreCase:!0,sortForce:null,sortList:[],sortAppend:null,sortStable:!1,sortInitialOrder:"asc",sortLocaleCompare:!1,sortReset:!1,sortRestart:!1,emptyTo:"bottom",stringTo:"max",textExtraction:"basic",textAttribute:"data-text",textSorter:null,numberSorter:null,widgets:[],widgetOptions:{zebra:["even","odd"]},initWidgets:!0,widgetClass:"widget-{name}",initialized:null,tableClass:"",cssAsc:"",cssDesc:"",cssNone:"",cssHeader:"",cssHeaderRow:"",cssProcessing:"",cssChildRow:"tablesorter-childRow",cssIcon:"tablesorter-icon",cssIconNone:"",cssIconAsc:"",cssIconDesc:"",cssInfoBlock:"tablesorter-infoOnly",cssNoSort:"tablesorter-noSort",cssIgnoreRow:"tablesorter-ignoreRow",pointerClick:"click",pointerDown:"mousedown",pointerUp:"mouseup",selectorHeaders:"> thead th, > thead td",selectorSort:"th, td",selectorRemove:".remove-me",debug:!1,headerList:[],empties:{},strings:{},parsers:[]},v.css={table:"tablesorter",cssHasChild:"tablesorter-hasChildRow",childRow:"tablesorter-childRow",colgroup:"tablesorter-colgroup",header:"tablesorter-header",headerRow:"tablesorter-headerRow",headerIn:"tablesorter-header-inner",icon:"tablesorter-icon",processing:"tablesorter-processing",sortAsc:"tablesorter-headerAsc",sortDesc:"tablesorter-headerDesc",sortNone:"tablesorter-headerUnSorted"},v.language={sortAsc:"Ascending sort applied, ",sortDesc:"Descending sort applied, ",sortNone:"No sort applied, ",nextAsc:"activate to apply an ascending sort",nextDesc:"activate to apply a descending sort",nextNone:"activate to remove the sort"},v.instanceMethods={},v.log=b,v.benchmark=c,v.getElementText=function(b,c,d){if(!c)return"";var e,f=b.textExtraction||"",g=c.jquery?c:a(c);return"string"==typeof f?a.trim(("basic"===f?g.attr(b.textAttribute)||c.textContent:c.textContent)||g.text()):"function"==typeof f?a.trim(f(g[0],b.table,d)):"function"==typeof(e=v.getColumnData(b.table,f,d))?a.trim(e(g[0],b.table,d)):a.trim(g[0].textContent||g.text())},v.construct=function(b){return this.each(function(){var c=this,d=a.extend(!0,{},v.defaults,b,v.instanceMethods);d.originalSettings=b,!c.hasInitialized&&v.buildTable&&"TABLE"!==this.nodeName?v.buildTable(c,d):v.setup(c,d)})},v.setup=function(c,d){if(!c||!c.tHead||0===c.tBodies.length||c.hasInitialized===!0)return d.debug?b("ERROR: stopping initialization! No table, thead, tbody or tablesorter has already been initialized"):"";var e="",f=a(c),i=a.metadata;c.hasInitialized=!1,c.isProcessing=!0,c.config=d,a.data(c,"tablesorter",d),d.debug&&a.data(c,"startoveralltimer",new Date),d.supportsDataObject=function(a){return a[0]=parseInt(a[0],10),a[0]>1||1===a[0]&&parseInt(a[1],10)>=4}(a.fn.jquery.split(".")),d.string={max:1,min:-1,emptymin:1,emptymax:-1,zero:0,none:0,"null":0,top:!0,bottom:!1},d.emptyTo=d.emptyTo.toLowerCase(),d.stringTo=d.stringTo.toLowerCase(),/tablesorter\-/.test(f.attr("class"))||(e=""!==d.theme?" tablesorter-"+d.theme:""),d.table=c,d.$table=f.addClass(v.css.table+" "+d.tableClass+e).attr("role","grid"),d.$headers=f.find(d.selectorHeaders),d.namespace?d.namespace="."+d.namespace.replace(/\W/g,""):d.namespace=".tablesorter"+Math.random().toString(16).slice(2),d.$table.children().children("tr").attr("role","row"),d.$tbodies=f.children("tbody:not(."+d.cssInfoBlock+")").attr({"aria-live":"polite","aria-relevant":"all"}),d.$table.children("caption").length&&(e=d.$table.children("caption")[0],e.id||(e.id=d.namespace.slice(1)+"caption"),d.$table.attr("aria-labelledby",e.id)),d.widgetInit={},d.textExtraction=d.$table.attr("data-text-extraction")||d.textExtraction||"basic",k(c),v.fixColumnWidth(c),v.applyWidgetOptions(c,d),g(c),d.totalRows=0,d.delayInit||h(c),v.bindEvents(c,d.$headers,!0),u(c),d.supportsDataObject&&"undefined"!=typeof f.data().sortlist?d.sortList=f.data().sortlist:i&&f.metadata()&&f.metadata().sortlist&&(d.sortList=f.metadata().sortlist),v.applyWidget(c,!0),d.sortList.length>0?f.trigger("sorton",[d.sortList,{},!d.initWidgets,!0]):(n(c),d.initWidgets&&v.applyWidget(c,!1)),d.showProcessing&&f.unbind("sortBegin"+d.namespace+" sortEnd"+d.namespace).bind("sortBegin"+d.namespace+" sortEnd"+d.namespace,function(a){clearTimeout(d.processTimer),v.isProcessing(c),"sortBegin"===a.type&&(d.processTimer=setTimeout(function(){v.isProcessing(c,!0)},500))}),c.hasInitialized=!0,c.isProcessing=!1,d.debug&&v.benchmark("Overall initialization time",a.data(c,"startoveralltimer")),f.trigger("tablesorter-initialized",c),"function"==typeof d.initialized&&d.initialized(c)},v.fixColumnWidth=function(b){b=a(b)[0];var c,d,e,f,g,h=b.config,i=h.$table.children("colgroup");if(i.length&&i.hasClass(v.css.colgroup)&&i.remove(),h.widthFixed&&0===h.$table.children("colgroup").length){for(i=a('<colgroup class="'+v.css.colgroup+'">'),c=h.$table.width(),e=h.$tbodies.find("tr:first").children(":visible"),f=e.length,g=0;f>g;g++)d=parseInt(e.eq(g).width()/c*1e3,10)/10+"%",i.append(a("<col>").css("width",d));h.$table.prepend(i)}},v.getColumnData=function(b,c,d,e,f){if("undefined"!=typeof c&&null!==c){b=a(b)[0];var g,h,i=b.config,j=f||i.$headers,k=i.$headerIndexed&&i.$headerIndexed[d]||j.filter('[data-column="'+d+'"]:last');if(c[d])return e?c[d]:c[j.index(k)];for(h in c)if("string"==typeof h&&(g=k.filter(h).add(k.find(h)),g.length))return c[h]}},v.computeColumnIndex=function(b){var c,d,e,f,g,h,i,j,k,l,m,n,o=[],p=[],q={};for(c=0;c<b.length;c++)for(i=b[c].cells,d=0;d<i.length;d++){for(h=i[d],g=a(h),j=h.parentNode.rowIndex,k=j+"-"+g.index(),l=h.rowSpan||1,m=h.colSpan||1,"undefined"==typeof o[j]&&(o[j]=[]),e=0;e<o[j].length+1;e++)if("undefined"==typeof o[j][e]){n=e;break}for(q[k]=n,g.attr({"data-column":n}),e=j;j+l>e;e++)for("undefined"==typeof o[e]&&(o[e]=[]),p=o[e],f=n;n+m>f;f++)p[f]="x"}return p.length},v.isProcessing=function(b,c,d){b=a(b);var e=b[0].config,f=d||b.find("."+v.css.header);c?("undefined"!=typeof d&&e.sortList.length>0&&(f=f.filter(function(){return this.sortDisabled?!1:v.isValueInArray(parseFloat(a(this).attr("data-column")),e.sortList)>=0})),b.add(f).addClass(v.css.processing+" "+e.cssProcessing)):b.add(f).removeClass(v.css.processing+" "+e.cssProcessing)},v.processTbody=function(b,c,d){b=a(b)[0];var e;return d?(b.isProcessing=!0,c.before('<span class="tablesorter-savemyplace"/>'),e=a.fn.detach?c.detach():c.remove()):(e=a(b).find("span.tablesorter-savemyplace"),c.insertAfter(e),e.remove(),void(b.isProcessing=!1))},v.clearTableBody=function(b){a(b)[0].config.$tbodies.children().detach()},v.bindEvents=function(b,c,e){b=a(b)[0];var f,g=null,i=b.config;e!==!0&&(c.addClass(i.namespace.slice(1)+"_extra_headers"),f=a.fn.closest?c.closest("table")[0]:c.parents("table")[0],f&&"TABLE"===f.nodeName&&f!==b&&a(f).addClass(i.namespace.slice(1)+"_extra_table")),f=(i.pointerDown+" "+i.pointerUp+" "+i.pointerClick+" sort keyup ").replace(/\s+/g," ").split(" ").join(i.namespace+" "),c.find(i.selectorSort).add(c.filter(i.selectorSort)).unbind(f).bind(f,function(e,f){var j,k,l=a(e.target),m=" "+e.type+" ";if(!(1!==(e.which||e.button)&&!m.match(" "+i.pointerClick+" | sort | keyup ")||" keyup "===m&&13!==e.which||m.match(" "+i.pointerClick+" ")&&"undefined"!=typeof e.which||m.match(" "+i.pointerUp+" ")&&g!==e.target&&f!==!0)){if(m.match(" "+i.pointerDown+" "))return g=e.target,k=l.jquery.split("."),void("1"===k[0]&&k[1]<4&&e.preventDefault());if(g=null,/(input|select|button|textarea)/i.test(e.target.nodeName)||l.hasClass(i.cssNoSort)||l.parents("."+i.cssNoSort).length>0||l.parents("button").length>0)return!i.cancelSelection;i.delayInit&&d(i.cache)&&h(b),j=a.fn.closest?a(this).closest("th, td")[0]:/TH|TD/.test(this.nodeName)?this:a(this).parents("th, td")[0],j=i.$headers[c.index(j)],j.sortDisabled||q(b,j,e)}}),i.cancelSelection&&c.attr("unselectable","on").bind("selectstart",!1).css({"user-select":"none",MozUserSelect:"none"})},v.restoreHeaders=function(b){var c,d,e=a(b)[0].config,f=e.$table.find(e.selectorHeaders),g=f.length;for(c=0;g>c;c++)d=f.eq(c),d.find("."+v.css.headerIn).length&&d.html(e.headerContent[c])},v.destroy=function(b,c,d){if(b=a(b)[0],b.hasInitialized){v.removeWidget(b,!0,!1);var e,f=a(b),g=b.config,h=f.find("thead:first"),i=h.find("tr."+v.css.headerRow).removeClass(v.css.headerRow+" "+g.cssHeaderRow),j=f.find("tfoot:first > tr").children("th, td");c===!1&&a.inArray("uitheme",g.widgets)>=0&&(f.trigger("applyWidgetId",["uitheme"]),f.trigger("applyWidgetId",["zebra"])),h.find("tr").not(i).remove(),e="sortReset update updateAll updateRows updateCell addRows updateComplete sorton appendCache updateCache "+"applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave keypress sortBegin sortEnd resetToLoadState ".split(" ").join(g.namespace+" "),f.removeData("tablesorter").unbind(e.replace(/\s+/g," ")),g.$headers.add(j).removeClass([v.css.header,g.cssHeader,g.cssAsc,g.cssDesc,v.css.sortAsc,v.css.sortDesc,v.css.sortNone].join(" ")).removeAttr("data-column").removeAttr("aria-label").attr("aria-disabled","true"),i.find(g.selectorSort).unbind("mousedown mouseup keypress ".split(" ").join(g.namespace+" ").replace(/\s+/g," ")),v.restoreHeaders(b),f.toggleClass(v.css.table+" "+g.tableClass+" tablesorter-"+g.theme,c===!1),b.hasInitialized=!1,delete b.config.cache,"function"==typeof d&&d(b)}},v.regex={chunk:/(^([+\-]?(?:0|[1-9]\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi,chunks:/(^\\0|\\0$)/,hex:/^0x[0-9a-f]+$/i},v.sortNatural=function(a,b){if(a===b)return 0;var c,d,e,f,g,h,i,j,k=v.regex;if(k.hex.test(b)){if(d=parseInt(a.match(k.hex),16),f=parseInt(b.match(k.hex),16),f>d)return-1;if(d>f)return 1}for(c=a.replace(k.chunk,"\\0$1\\0").replace(k.chunks,"").split("\\0"),e=b.replace(k.chunk,"\\0$1\\0").replace(k.chunks,"").split("\\0"),j=Math.max(c.length,e.length),i=0;j>i;i++){if(g=isNaN(c[i])?c[i]||0:parseFloat(c[i])||0,h=isNaN(e[i])?e[i]||0:parseFloat(e[i])||0,isNaN(g)!==isNaN(h))return isNaN(g)?1:-1;if(typeof g!=typeof h&&(g+="",h+=""),h>g)return-1;if(g>h)return 1}return 0},v.sortNaturalAsc=function(a,b,c,d,e){if(a===b)return 0;var f=e.string[e.empties[c]||e.emptyTo];return""===a&&0!==f?"boolean"==typeof f?f?-1:1:-f||-1:""===b&&0!==f?"boolean"==typeof f?f?1:-1:f||1:v.sortNatural(a,b)},v.sortNaturalDesc=function(a,b,c,d,e){if(a===b)return 0;var f=e.string[e.empties[c]||e.emptyTo];return""===a&&0!==f?"boolean"==typeof f?f?-1:1:f||1:""===b&&0!==f?"boolean"==typeof f?f?1:-1:-f||-1:v.sortNatural(b,a)},v.sortText=function(a,b){return a>b?1:b>a?-1:0},v.getTextValue=function(a,b,c){if(c){var d,e=a?a.length:0,f=c+b;for(d=0;e>d;d++)f+=a.charCodeAt(d);return b*f}return 0},v.sortNumericAsc=function(a,b,c,d,e,f){if(a===b)return 0;var g=f.config,h=g.string[g.empties[e]||g.emptyTo];return""===a&&0!==h?"boolean"==typeof h?h?-1:1:-h||-1:""===b&&0!==h?"boolean"==typeof h?h?1:-1:h||1:(isNaN(a)&&(a=v.getTextValue(a,c,d)),isNaN(b)&&(b=v.getTextValue(b,c,d)),a-b)},v.sortNumericDesc=function(a,b,c,d,e,f){if(a===b)return 0;var g=f.config,h=g.string[g.empties[e]||g.emptyTo];return""===a&&0!==h?"boolean"==typeof h?h?-1:1:h||1:""===b&&0!==h?"boolean"==typeof h?h?1:-1:-h||-1:(isNaN(a)&&(a=v.getTextValue(a,c,d)),isNaN(b)&&(b=v.getTextValue(b,c,d)),b-a)},v.sortNumeric=function(a,b){return a-b},v.characterEquivalents={a:"áàâãäąå",A:"ÁÀÂÃÄĄÅ",c:"çćč",C:"ÇĆČ",e:"éèêëěę",E:"ÉÈÊËĚĘ",i:"íìİîïı",I:"ÍÌİÎÏ",o:"óòôõöō",O:"ÓÒÔÕÖŌ",ss:"ß",SS:"ẞ",u:"úùûüů",U:"ÚÙÛÜŮ"},v.replaceAccents=function(a){var b,c="[",d=v.characterEquivalents;if(!v.characterRegex){v.characterRegexArray={};for(b in d)"string"==typeof b&&(c+=d[b],v.characterRegexArray[b]=new RegExp("["+d[b]+"]","g"));v.characterRegex=new RegExp(c+"]")}if(v.characterRegex.test(a))for(b in d)"string"==typeof b&&(a=a.replace(v.characterRegexArray[b],b));return a},v.isValueInArray=function(a,b){var c,d=b.length;for(c=0;d>c;c++)if(b[c][0]===a)return c;return-1},v.addParser=function(a){var b,c=v.parsers.length,d=!0;for(b=0;c>b;b++)v.parsers[b].id.toLowerCase()===a.id.toLowerCase()&&(d=!1);d&&v.parsers.push(a)},v.addInstanceMethods=function(b){a.extend(v.instanceMethods,b)},v.getParserById=function(a){if("false"==a)return!1;var b,c=v.parsers.length;for(b=0;c>b;b++)if(v.parsers[b].id.toLowerCase()===a.toString().toLowerCase())return v.parsers[b];return!1},v.addWidget=function(a){v.widgets.push(a)},v.hasWidget=function(b,c){return b=a(b),b.length&&b[0].config&&b[0].config.widgetInit[c]||!1},v.getWidgetById=function(a){var b,c,d=v.widgets.length;for(b=0;d>b;b++)if(c=v.widgets[b],c&&c.hasOwnProperty("id")&&c.id.toLowerCase()===a.toLowerCase())return c},v.applyWidgetOptions=function(b,c){var d,e,f=c.widgets.length,g=c.widgetOptions;if(f)for(d=0;f>d;d++)e=v.getWidgetById(c.widgets[d]),e&&"options"in e&&(g=b.config.widgetOptions=a.extend(!0,{},e.options,g))},v.applyWidget=function(b,d,e){b=a(b)[0];var f,g,h,i,j,k,l,m=b.config,n=m.widgetOptions,o=" "+m.table.className+" ",p=[];if(d===!1||!b.hasInitialized||!b.isApplyingWidgets&&!b.isUpdating){if(m.debug&&(i=new Date),l=new RegExp("\\s"+m.widgetClass.replace(/\{name\}/i,"([\\w-]+)")+"\\s","g"),o.match(l)&&(k=o.match(l)))for(g=k.length,f=0;g>f;f++)m.widgets.push(k[f].replace(l,"$1"));if(m.widgets.length){for(b.isApplyingWidgets=!0,m.widgets=a.grep(m.widgets,function(b,c){return a.inArray(b,m.widgets)===c}),h=m.widgets||[],g=h.length,f=0;g>f;f++)l=v.getWidgetById(h[f]),l&&l.id&&(l.priority||(l.priority=10),p[f]=l);for(p.sort(function(a,b){return a.priority<b.priority?-1:a.priority===b.priority?0:1}),g=p.length,f=0;g>f;f++)p[f]&&((d||!m.widgetInit[p[f].id])&&(m.widgetInit[p[f].id]=!0,b.hasInitialized&&v.applyWidgetOptions(b,m),"init"in p[f]&&(m.debug&&(j=new Date),p[f].init(b,p[f],m,n),m.debug&&v.benchmark("Initializing "+p[f].id+" widget",j))),!d&&"format"in p[f]&&(m.debug&&(j=new Date),p[f].format(b,m,n,!1),m.debug&&v.benchmark((d?"Initializing ":"Applying ")+p[f].id+" widget",j)));d||"function"!=typeof e||e(b)}setTimeout(function(){b.isApplyingWidgets=!1,a.data(b,"lastWidgetApplication",new Date)},0),m.debug&&(k=m.widgets.length,c("Completed "+(d===!0?"initializing ":"applying ")+k+" widget"+(1!==k?"s":""),i))}},v.removeWidget=function(c,d,e){c=a(c)[0];var f,g,h,i,j=c.config;if(d===!0)for(d=[],i=v.widgets.length,h=0;i>h;h++)g=v.widgets[h],g&&g.id&&d.push(g.id);else d=(a.isArray(d)?d.join(","):d||"").toLowerCase().split(/[\s,]+/);for(i=d.length,f=0;i>f;f++)g=v.getWidgetById(d[f]),h=a.inArray(d[f],j.widgets),g&&"remove"in g&&(j.debug&&h>=0&&b('Removing "'+d[f]+'" widget'),g.remove(c,j,j.widgetOptions,e),j.widgetInit[d[f]]=!1),h>=0&&e!==!0&&j.widgets.splice(h,1)},v.refreshWidgets=function(b,c,d){b=a(b)[0];var e,f=b.config,g=f.widgets,h=v.widgets,i=h.length,j=[],k=function(b){a(b).trigger("refreshComplete")};for(e=0;i>e;e++)h[e]&&h[e].id&&(c||a.inArray(h[e].id,g)<0)&&j.push(h[e].id);v.removeWidget(b,j.join(","),!0),d!==!0?(v.applyWidget(b,c||!1,k),c&&v.applyWidget(b,!1,k)):k(b)},v.getColumnText=function(b,c,e){b=a(b)[0];var f,g,h,i,j,k,l,m,n,o,p="function"==typeof e,q="all"===c,r={raw:[],parsed:[],$cell:[]},s=b.config;if(!d(s)){for(j=s.$tbodies.length,f=0;j>f;f++)for(h=s.cache[f].normalized,k=h.length,g=0;k>g;g++)o=!0,i=h[g],m=q?i.slice(0,s.columns):i[c],i=i[s.columns],l=q?i.raw:i.raw[c],n=q?i.$row.children():i.$row.children().eq(c),p&&(o=e({tbodyIndex:f,rowIndex:g,parsed:m,raw:l,$row:i.$row,$cell:n})),o!==!1&&(r.parsed.push(m),r.raw.push(l),r.$cell.push(n));return r}},v.getData=function(b,c,d){var e,f,g="",h=a(b);return h.length?(e=a.metadata?h.metadata():!1,f=" "+(h.attr("class")||""),"undefined"!=typeof h.data(d)||"undefined"!=typeof h.data(d.toLowerCase())?g+=h.data(d)||h.data(d.toLowerCase()):e&&"undefined"!=typeof e[d]?g+=e[d]:c&&"undefined"!=typeof c[d]?g+=c[d]:" "!==f&&f.match(" "+d+"-")&&(g=f.match(new RegExp("\\s"+d+"-([\\w-]+)"))[1]||""),a.trim(g)):""},v.formatFloat=function(b,c){if("string"!=typeof b||""===b)return b;var d,e=c&&c.config?c.config.usNumberFormat!==!1:"undefined"!=typeof c?c:!0;return b=e?b.replace(/,/g,""):b.replace(/[\s|\.]/g,"").replace(/,/g,"."),/^\s*\([.\d]+\)/.test(b)&&(b=b.replace(/^\s*\(([.\d]+)\)/,"-$1")),d=parseFloat(b),isNaN(d)?a.trim(b):d},v.isDigit=function(a){return isNaN(a)?/^[\-+(]?\d+[)]?$/.test(a.toString().replace(/[,.'"\s]/g,"")):""!==a}}});var b=a.tablesorter;a.fn.extend({tablesorter:b.construct}),b.addParser({id:"no-parser",is:function(){return!1},format:function(){return""},type:"text"}),b.addParser({id:"text",is:function(){return!0},format:function(c,d){var e=d.config;return c&&(c=a.trim(e.ignoreCase?c.toLocaleLowerCase():c),c=e.sortLocaleCompare?b.replaceAccents(c):c),c},type:"text"}),b.addParser({id:"digit",is:function(a){return b.isDigit(a)},format:function(c,d){var e=b.formatFloat((c||"").replace(/[^\w,. \-()]/g,""),d);return c&&"number"==typeof e?e:c?a.trim(c&&d.config.ignoreCase?c.toLocaleLowerCase():c):c},type:"numeric"}),b.addParser({id:"currency",is:function(a){return/^\(?\d+[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]|[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]\d+\)?$/.test((a||"").replace(/[+\-,. ]/g,""))},format:function(c,d){var e=b.formatFloat((c||"").replace(/[^\w,. \-()]/g,""),d);return c&&"number"==typeof e?e:c?a.trim(c&&d.config.ignoreCase?c.toLocaleLowerCase():c):c},type:"numeric"}),b.addParser({id:"url",is:function(a){return/^(https?|ftp|file):\/\//.test(a)},format:function(b){return b?a.trim(b.replace(/(https?|ftp|file):\/\//,"")):b},parsed:!0,type:"text"}),b.addParser({id:"isoDate",is:function(a){return/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}/.test(a)},format:function(a,b){var c=a?new Date(a.replace(/-/g,"/")):a;return c instanceof Date&&isFinite(c)?c.getTime():a},type:"numeric"}),b.addParser({id:"percent",is:function(a){return/(\d\s*?%|%\s*?\d)/.test(a)&&a.length<15},format:function(a,c){return a?b.formatFloat(a.replace(/%/g,""),c):a},type:"numeric"}),b.addParser({id:"image",is:function(a,b,c,d){return d.find("img").length>0},format:function(b,c,d){return a(d).find("img").attr(c.config.imgAttr||"alt")||b},parsed:!0,type:"text"}),b.addParser({id:"usLongDate",is:function(a){return/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4})(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?$/i.test(a)||/^\d{1,2}\s+[A-Z]{3,10}\s+\d{4}/i.test(a)},format:function(a,b){var c=a?new Date(a.replace(/(\S)([AP]M)$/i,"$1 $2")):a;
-return c instanceof Date&&isFinite(c)?c.getTime():a},type:"numeric"}),b.addParser({id:"shortDate",is:function(a){return/(^\d{1,2}[\/\s]\d{1,2}[\/\s]\d{4})|(^\d{4}[\/\s]\d{1,2}[\/\s]\d{1,2})/.test((a||"").replace(/\s+/g," ").replace(/[\-.,]/g,"/"))},format:function(a,c,d,e){if(a){var f,g,h=c.config,i=h.$headerIndexed[e],j=i.length&&i[0].dateFormat||b.getData(i,b.getColumnData(c,h.headers,e),"dateFormat")||h.dateFormat;return g=a.replace(/\s+/g," ").replace(/[\-.,]/g,"/"),"mmddyyyy"===j?g=g.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$1/$2"):"ddmmyyyy"===j?g=g.replace(/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,"$3/$2/$1"):"yyyymmdd"===j&&(g=g.replace(/(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/,"$1/$2/$3")),f=new Date(g),f instanceof Date&&isFinite(f)?f.getTime():a}return a},type:"numeric"}),b.addParser({id:"time",is:function(a){return/^(([0-2]?\d:[0-5]\d)|([0-1]?\d:[0-5]\d\s?([AP]M)))$/i.test(a)},format:function(a,b){var c=a?new Date("2000/01/01 "+a.replace(/(\S)([AP]M)$/i,"$1 $2")):a;return c instanceof Date&&isFinite(c)?c.getTime():a},type:"numeric"}),b.addParser({id:"metadata",is:function(){return!1},format:function(b,c,d){var e=c.config,f=e.parserMetadataName?e.parserMetadataName:"sortValue";return a(d).metadata()[f]},type:"numeric"}),b.addWidget({id:"zebra",priority:90,format:function(b,c,d){var e,f,g,h,i,j,k,l,m=new RegExp(c.cssChildRow,"i"),n=c.$tbodies.add(a(c.namespace+"_extra_table").children("tbody:not(."+c.cssInfoBlock+")"));for(c.debug&&(i=new Date),j=0;j<n.length;j++)for(g=0,e=n.eq(j).children("tr:visible").not(c.selectorRemove),l=e.length,k=0;l>k;k++)f=e.eq(k),m.test(f[0].className)||g++,h=g%2===0,f.removeClass(d.zebra[h?1:0]).addClass(d.zebra[h?0:1])},remove:function(a,c,d,e){if(!e){var f,g,h=c.$tbodies,i=(d.zebra||["even","odd"]).join(" ");for(f=0;f<h.length;f++)g=b.processTbody(a,h.eq(f),!0),g.children().removeClass(i),b.processTbody(a,g,!1)}}})}(jQuery),a.tablesorter});
\ No newline at end of file
+!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&"object"==typeof module.exports?module.exports=a(require("jquery")):a(jQuery)}(function(a){return function(b){"use strict";var c=b.tablesorter={version:"2.27.5",parsers:[],widgets:[],defaults:{theme:"default",widthFixed:!1,showProcessing:!1,headerTemplate:"{content}",onRenderTemplate:null,onRenderHeader:null,cancelSelection:!0,tabIndex:!0,dateFormat:"mmddyyyy",sortMultiSortKey:"shiftKey",sortResetKey:"ctrlKey",usNumberFormat:!0,delayInit:!1,serverSideSorting:!1,resort:!0,headers:{},ignoreCase:!0,sortForce:null,sortList:[],sortAppend:null,sortStable:!1,sortInitialOrder:"asc",sortLocaleCompare:!1,sortReset:!1,sortRestart:!1,emptyTo:"bottom",stringTo:"max",duplicateSpan:!0,textExtraction:"basic",textAttribute:"data-text",textSorter:null,numberSorter:null,initWidgets:!0,widgetClass:"widget-{name}",widgets:[],widgetOptions:{zebra:["even","odd"]},initialized:null,tableClass:"",cssAsc:"",cssDesc:"",cssNone:"",cssHeader:"",cssHeaderRow:"",cssProcessing:"",cssChildRow:"tablesorter-childRow",cssInfoBlock:"tablesorter-infoOnly",cssNoSort:"tablesorter-noSort",cssIgnoreRow:"tablesorter-ignoreRow",cssIcon:"tablesorter-icon",cssIconNone:"",cssIconAsc:"",cssIconDesc:"",pointerClick:"click",pointerDown:"mousedown",pointerUp:"mouseup",selectorHeaders:"> thead th, > thead td",selectorSort:"th, td",selectorRemove:".remove-me",debug:!1,headerList:[],empties:{},strings:{},parsers:[]},css:{table:"tablesorter",cssHasChild:"tablesorter-hasChildRow",childRow:"tablesorter-childRow",colgroup:"tablesorter-colgroup",header:"tablesorter-header",headerRow:"tablesorter-headerRow",headerIn:"tablesorter-header-inner",icon:"tablesorter-icon",processing:"tablesorter-processing",sortAsc:"tablesorter-headerAsc",sortDesc:"tablesorter-headerDesc",sortNone:"tablesorter-headerUnSorted"},language:{sortAsc:"Ascending sort applied, ",sortDesc:"Descending sort applied, ",sortNone:"No sort applied, ",sortDisabled:"sorting is disabled",nextAsc:"activate to apply an ascending sort",nextDesc:"activate to apply a descending sort",nextNone:"activate to remove the sort"},regex:{templateContent:/\{content\}/g,templateIcon:/\{icon\}/g,templateName:/\{name\}/i,spaces:/\s+/g,nonWord:/\W/g,formElements:/(input|select|button|textarea)/i,chunk:/(^([+\-]?(?:\d*)(?:\.\d*)?(?:[eE][+\-]?\d+)?)?$|^0x[0-9a-f]+$|\d+)/gi,chunks:/(^\\0|\\0$)/,hex:/^0x[0-9a-f]+$/i,comma:/,/g,digitNonUS:/[\s|\.]/g,digitNegativeTest:/^\s*\([.\d]+\)/,digitNegativeReplace:/^\s*\(([.\d]+)\)/,digitTest:/^[\-+(]?\d+[)]?$/,digitReplace:/[,.'"\s]/g},string:{max:1,min:-1,emptymin:1,emptymax:-1,zero:0,none:0,null:0,top:!0,bottom:!1},keyCodes:{enter:13},dates:{},instanceMethods:{},setup:function(a,d){if(!a||!a.tHead||0===a.tBodies.length||a.hasInitialized===!0)return void(d.debug&&(a.hasInitialized?console.warn("Stopping initialization. Tablesorter has already been initialized"):console.error("Stopping initialization! No table, thead or tbody",a)));var e="",f=b(a),g=b.metadata;a.hasInitialized=!1,a.isProcessing=!0,a.config=d,b.data(a,"tablesorter",d),d.debug&&(console[console.group?"group":"log"]("Initializing tablesorter"),b.data(a,"startoveralltimer",new Date)),d.supportsDataObject=function(a){return a[0]=parseInt(a[0],10),a[0]>1||1===a[0]&&parseInt(a[1],10)>=4}(b.fn.jquery.split(".")),d.emptyTo=d.emptyTo.toLowerCase(),d.stringTo=d.stringTo.toLowerCase(),d.last={sortList:[],clickedIndex:-1},/tablesorter\-/.test(f.attr("class"))||(e=""!==d.theme?" tablesorter-"+d.theme:""),d.table=a,d.$table=f.addClass(c.css.table+" "+d.tableClass+e).attr("role","grid"),d.$headers=f.find(d.selectorHeaders),d.namespace?d.namespace="."+d.namespace.replace(c.regex.nonWord,""):d.namespace=".tablesorter"+Math.random().toString(16).slice(2),d.$table.children().children("tr").attr("role","row"),d.$tbodies=f.children("tbody:not(."+d.cssInfoBlock+")").attr({"aria-live":"polite","aria-relevant":"all"}),d.$table.children("caption").length&&(e=d.$table.children("caption")[0],e.id||(e.id=d.namespace.slice(1)+"caption"),d.$table.attr("aria-labelledby",e.id)),d.widgetInit={},d.textExtraction=d.$table.attr("data-text-extraction")||d.textExtraction||"basic",c.buildHeaders(d),c.fixColumnWidth(a),c.addWidgetFromClass(a),c.applyWidgetOptions(a),c.setupParsers(d),d.totalRows=0,d.delayInit||c.buildCache(d),c.bindEvents(a,d.$headers,!0),c.bindMethods(d),d.supportsDataObject&&"undefined"!=typeof f.data().sortlist?d.sortList=f.data().sortlist:g&&f.metadata()&&f.metadata().sortlist&&(d.sortList=f.metadata().sortlist),c.applyWidget(a,!0),d.sortList.length>0?c.sortOn(d,d.sortList,{},!d.initWidgets):(c.setHeadersCss(d),d.initWidgets&&c.applyWidget(a,!1)),d.showProcessing&&f.unbind("sortBegin"+d.namespace+" sortEnd"+d.namespace).bind("sortBegin"+d.namespace+" sortEnd"+d.namespace,function(b){clearTimeout(d.timerProcessing),c.isProcessing(a),"sortBegin"===b.type&&(d.timerProcessing=setTimeout(function(){c.isProcessing(a,!0)},500))}),a.hasInitialized=!0,a.isProcessing=!1,d.debug&&(console.log("Overall initialization time: "+c.benchmark(b.data(a,"startoveralltimer"))),d.debug&&console.groupEnd&&console.groupEnd()),f.triggerHandler("tablesorter-initialized",a),"function"==typeof d.initialized&&d.initialized(a)},bindMethods:function(a){var d=a.$table,e=a.namespace,f="sortReset update updateRows updateAll updateHeaders addRows updateCell updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets destroy mouseup mouseleave ".split(" ").join(e+" ");d.unbind(f.replace(c.regex.spaces," ")).bind("sortReset"+e,function(a,b){a.stopPropagation(),c.sortReset(this.config,b)}).bind("updateAll"+e,function(a,b,d){a.stopPropagation(),c.updateAll(this.config,b,d)}).bind("update"+e+" updateRows"+e,function(a,b,d){a.stopPropagation(),c.update(this.config,b,d)}).bind("updateHeaders"+e,function(a,b){a.stopPropagation(),c.updateHeaders(this.config,b)}).bind("updateCell"+e,function(a,b,d,e){a.stopPropagation(),c.updateCell(this.config,b,d,e)}).bind("addRows"+e,function(a,b,d,e){a.stopPropagation(),c.addRows(this.config,b,d,e)}).bind("updateComplete"+e,function(){this.isUpdating=!1}).bind("sorton"+e,function(a,b,d,e){a.stopPropagation(),c.sortOn(this.config,b,d,e)}).bind("appendCache"+e,function(a,d,e){a.stopPropagation(),c.appendCache(this.config,e),b.isFunction(d)&&d(this)}).bind("updateCache"+e,function(a,b,d){a.stopPropagation(),c.updateCache(this.config,b,d)}).bind("applyWidgetId"+e,function(a,b){a.stopPropagation(),c.applyWidgetId(this,b)}).bind("applyWidgets"+e,function(a,b){a.stopPropagation(),c.applyWidget(this,b)}).bind("refreshWidgets"+e,function(a,b,d){a.stopPropagation(),c.refreshWidgets(this,b,d)}).bind("removeWidget"+e,function(a,b,d){a.stopPropagation(),c.removeWidget(this,b,d)}).bind("destroy"+e,function(a,b,d){a.stopPropagation(),c.destroy(this,b,d)}).bind("resetToLoadState"+e,function(d){d.stopPropagation(),c.removeWidget(this,!0,!1),a=b.extend(!0,c.defaults,a.originalSettings),this.hasInitialized=!1,c.setup(this,a)})},bindEvents:function(a,d,e){a=b(a)[0];var f,g=a.config,h=g.namespace,i=null;e!==!0&&(d.addClass(h.slice(1)+"_extra_headers"),f=b.fn.closest?d.closest("table")[0]:d.parents("table")[0],f&&"TABLE"===f.nodeName&&f!==a&&b(f).addClass(h.slice(1)+"_extra_table")),f=(g.pointerDown+" "+g.pointerUp+" "+g.pointerClick+" sort keyup ").replace(c.regex.spaces," ").split(" ").join(h+" "),d.find(g.selectorSort).add(d.filter(g.selectorSort)).unbind(f).bind(f,function(a,e){var f,h,j,k=b(a.target),l=" "+a.type+" ";if(!(1!==(a.which||a.button)&&!l.match(" "+g.pointerClick+" | sort | keyup ")||" keyup "===l&&a.which!==c.keyCodes.enter||l.match(" "+g.pointerClick+" ")&&"undefined"!=typeof a.which||l.match(" "+g.pointerUp+" ")&&i!==a.target&&e!==!0)){if(l.match(" "+g.pointerDown+" "))return i=a.target,j=k.jquery.split("."),void("1"===j[0]&&j[1]<4&&a.preventDefault());if(i=null,c.regex.formElements.test(a.target.nodeName)||k.hasClass(g.cssNoSort)||k.parents("."+g.cssNoSort).length>0||k.parents("button").length>0)return!g.cancelSelection;g.delayInit&&c.isEmptyObject(g.cache)&&c.buildCache(g),f=b.fn.closest?b(this).closest("th, td"):/TH|TD/.test(this.nodeName)?b(this):b(this).parents("th, td"),j=d.index(f),g.last.clickedIndex=j<0?f.attr("data-column"):j,h=g.$headers[g.last.clickedIndex],h&&!h.sortDisabled&&c.initSort(g,h,a)}}),g.cancelSelection&&d.attr("unselectable","on").bind("selectstart",!1).css({"user-select":"none",MozUserSelect:"none"})},buildHeaders:function(a){var d,e,f,g;for(a.headerList=[],a.headerContent=[],a.sortVars=[],a.debug&&(f=new Date),a.columns=c.computeColumnIndex(a.$table.children("thead, tfoot").children("tr")),e=a.cssIcon?'<i class="'+(a.cssIcon===c.css.icon?c.css.icon:a.cssIcon+" "+c.css.icon)+'"></i>':"",a.$headers=b(b.map(a.$table.find(a.selectorHeaders),function(d,f){var g,h,i,j,k,l=b(d);if(!l.parent().hasClass(a.cssIgnoreRow))return g=c.getColumnData(a.table,a.headers,f,!0),a.headerContent[f]=l.html(),""===a.headerTemplate||l.find("."+c.css.headerIn).length||(j=a.headerTemplate.replace(c.regex.templateContent,l.html()).replace(c.regex.templateIcon,l.find("."+c.css.icon).length?"":e),a.onRenderTemplate&&(h=a.onRenderTemplate.apply(l,[f,j]),h&&"string"==typeof h&&(j=h)),l.html('<div class="'+c.css.headerIn+'">'+j+"</div>")),a.onRenderHeader&&a.onRenderHeader.apply(l,[f,a,a.$table]),i=parseInt(l.attr("data-column"),10),d.column=i,k=c.getOrder(c.getData(l,g,"sortInitialOrder")||a.sortInitialOrder),a.sortVars[i]={count:-1,order:k?a.sortReset?[1,0,2]:[1,0]:a.sortReset?[0,1,2]:[0,1],lockedOrder:!1},k=c.getData(l,g,"lockedOrder")||!1,"undefined"!=typeof k&&k!==!1&&(a.sortVars[i].lockedOrder=!0,a.sortVars[i].order=c.getOrder(k)?[1,1]:[0,0]),a.headerList[f]=d,l.addClass(c.css.header+" "+a.cssHeader).parent().addClass(c.css.headerRow+" "+a.cssHeaderRow).attr("role","row"),a.tabIndex&&l.attr("tabindex",0),d})),a.$headerIndexed=[],g=0;g<a.columns;g++)c.isEmptyObject(a.sortVars[g])&&(a.sortVars[g]={}),d=a.$headers.filter('[data-column="'+g+'"]'),a.$headerIndexed[g]=d.length?d.not(".sorter-false").length?d.not(".sorter-false").filter(":last"):d.filter(":last"):b();a.$table.find(a.selectorHeaders).attr({scope:"col",role:"columnheader"}),c.updateHeader(a),a.debug&&(console.log("Built headers:"+c.benchmark(f)),console.log(a.$headers))},addInstanceMethods:function(a){b.extend(c.instanceMethods,a)},setupParsers:function(a,b){var d,e,f,g,h,i,j,k,l,m,n,o,p,q,r=a.table,s=0,t={};if(a.$tbodies=a.$table.children("tbody:not(."+a.cssInfoBlock+")"),p="undefined"==typeof b?a.$tbodies:b,q=p.length,0===q)return a.debug?console.warn("Warning: *Empty table!* Not building a parser cache"):"";for(a.debug&&(o=new Date,console[console.group?"group":"log"]("Detecting parsers for each column")),e={extractors:[],parsers:[]};s<q;){if(d=p[s].rows,d.length)for(h=0,g=a.columns,i=0;i<g;i++){if(j=a.$headerIndexed[h],j&&j.length&&(k=c.getColumnData(r,a.headers,h),n=c.getParserById(c.getData(j,k,"extractor")),m=c.getParserById(c.getData(j,k,"sorter")),l="false"===c.getData(j,k,"parser"),a.empties[h]=(c.getData(j,k,"empty")||a.emptyTo||(a.emptyToBottom?"bottom":"top")).toLowerCase(),a.strings[h]=(c.getData(j,k,"string")||a.stringTo||"max").toLowerCase(),l&&(m=c.getParserById("no-parser")),n||(n=!1),m||(m=c.detectParserForColumn(a,d,-1,h)),a.debug&&(t["("+h+") "+j.text()]={parser:m.id,extractor:n?n.id:"none",string:a.strings[h],empty:a.empties[h]}),e.parsers[h]=m,e.extractors[h]=n,f=j[0].colSpan-1,f>0))for(h+=f,g+=f;f+1>0;)e.parsers[h-f]=m,e.extractors[h-f]=n,f--;h++}s+=e.parsers.length?q:1}a.debug&&(c.isEmptyObject(t)?console.warn("  No parsers detected!"):console[console.table?"table":"log"](t),console.log("Completed detecting parsers"+c.benchmark(o)),console.groupEnd&&console.groupEnd()),a.parsers=e.parsers,a.extractors=e.extractors},addParser:function(a){var b,d=c.parsers.length,e=!0;for(b=0;b<d;b++)c.parsers[b].id.toLowerCase()===a.id.toLowerCase()&&(e=!1);e&&(c.parsers[c.parsers.length]=a)},getParserById:function(a){if("false"==a)return!1;var b,d=c.parsers.length;for(b=0;b<d;b++)if(c.parsers[b].id.toLowerCase()===a.toString().toLowerCase())return c.parsers[b];return!1},detectParserForColumn:function(a,d,e,f){for(var g,h,i,j=c.parsers.length,k=!1,l="",m=!0;""===l&&m;)e++,i=d[e],i&&e<50?i.className.indexOf(c.cssIgnoreRow)<0&&(k=d[e].cells[f],l=c.getElementText(a,k,f),h=b(k),a.debug&&console.log("Checking if value was empty on row "+e+", column: "+f+': "'+l+'"')):m=!1;for(;--j>=0;)if(g=c.parsers[j],g&&"text"!==g.id&&g.is&&g.is(l,a.table,k,h))return g;return c.getParserById("text")},getElementText:function(a,d,e){if(!d)return"";var f,g=a.textExtraction||"",h=d.jquery?d:b(d);return"string"==typeof g?"basic"===g&&"undefined"!=typeof(f=h.attr(a.textAttribute))?b.trim(f):b.trim(d.textContent||h.text()):"function"==typeof g?b.trim(g(h[0],a.table,e)):"function"==typeof(f=c.getColumnData(a.table,g,e))?b.trim(f(h[0],a.table,e)):b.trim(h[0].textContent||h.text())},getParsedText:function(a,b,d,e){"undefined"==typeof e&&(e=c.getElementText(a,b,d));var f=""+e,g=a.parsers[d],h=a.extractors[d];return g&&(h&&"function"==typeof h.format&&(e=h.format(e,a.table,b,d)),f="no-parser"===g.id?"":g.format(""+e,a.table,b,d),a.ignoreCase&&"string"==typeof f&&(f=f.toLowerCase())),f},buildCache:function(a,d,e){var f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B=a.table,C=a.parsers;if(a.$tbodies=a.$table.children("tbody:not(."+a.cssInfoBlock+")"),l="undefined"==typeof e?a.$tbodies:e,a.cache={},a.totalRows=0,!C)return a.debug?console.warn("Warning: *Empty table!* Not building a cache"):"";for(a.debug&&(q=new Date),a.showProcessing&&c.isProcessing(B,!0),k=0;k<l.length;k++){for(u=[],f=a.cache[k]={normalized:[]},r=l[k]&&l[k].rows.length||0,i=0;i<r;++i)if(s={child:[],raw:[]},m=b(l[k].rows[i]),n=[],!m.hasClass(a.selectorRemove.slice(1)))if(m.hasClass(a.cssChildRow)&&0!==i)for(z=f.normalized.length-1,t=f.normalized[z][a.columns],t.$row=t.$row.add(m),m.prev().hasClass(a.cssChildRow)||m.prev().addClass(c.css.cssHasChild),o=m.children("th, td"),z=t.child.length,t.child[z]=[],w=0,y=a.columns,j=0;j<y;j++)p=o[j],p&&(t.child[z][j]=c.getParsedText(a,p,j),v=o[j].colSpan-1,v>0&&(w+=v,y+=v)),w++;else{for(s.$row=m,s.order=i,w=0,y=a.columns,j=0;j<y;++j){if(p=m[0].cells[j],p&&w<a.columns&&(x="undefined"!=typeof C[w],!x&&a.debug&&console.warn("No parser found for row: "+i+", column: "+j+'; cell containing: "'+b(p).text()+'"; does it have a header?'),g=c.getElementText(a,p,w),s.raw[w]=g,h=c.getParsedText(a,p,w,g),n[w]=h,x&&"numeric"===(C[w].type||"").toLowerCase()&&(u[w]=Math.max(Math.abs(h)||0,u[w]||0)),v=p.colSpan-1,v>0)){for(A=0;A<=v;)h=a.duplicateSpan||0===A?g:"string"!=typeof a.textExtraction?c.getElementText(a,p,w+A)||"":"",s.raw[w+A]=h,n[w+A]=h,A++;w+=v,y+=v}w++}n[a.columns]=s,f.normalized[f.normalized.length]=n}f.colMax=u,a.totalRows+=f.normalized.length}if(a.showProcessing&&c.isProcessing(B),a.debug){for(z=Math.min(5,a.cache[0].normalized.length),console[console.group?"group":"log"]("Building cache for "+a.totalRows+" rows (showing "+z+" rows in log) and "+a.columns+" columns"+c.benchmark(q)),g={},j=0;j<a.columns;j++)for(w=0;w<z;w++)g["row: "+w]||(g["row: "+w]={}),g["row: "+w][a.$headerIndexed[j].text()]=a.cache[0].normalized[w][j];console[console.table?"table":"log"](g),console.groupEnd&&console.groupEnd()}b.isFunction(d)&&d(B)},getColumnText:function(a,d,e,f){a=b(a)[0];var g,h,i,j,k,l,m,n,o,p,q="function"==typeof e,r="all"===d,s={raw:[],parsed:[],$cell:[]},t=a.config;if(!c.isEmptyObject(t)){for(k=t.$tbodies.length,g=0;g<k;g++)for(i=t.cache[g].normalized,l=i.length,h=0;h<l;h++)j=i[h],f&&!j[t.columns].$row.is(f)||(p=!0,n=r?j.slice(0,t.columns):j[d],j=j[t.columns],m=r?j.raw:j.raw[d],o=r?j.$row.children():j.$row.children().eq(d),q&&(p=e({tbodyIndex:g,rowIndex:h,parsed:n,raw:m,$row:j.$row,$cell:o})),p!==!1&&(s.parsed[s.parsed.length]=n,s.raw[s.raw.length]=m,s.$cell[s.$cell.length]=o));return s}t.debug&&console.warn("No cache found - aborting getColumnText function!")},setHeadersCss:function(a){var d,e,f,g=a.sortList,h=g.length,i=c.css.sortNone+" "+a.cssNone,j=[c.css.sortAsc+" "+a.cssAsc,c.css.sortDesc+" "+a.cssDesc],k=[a.cssIconAsc,a.cssIconDesc,a.cssIconNone],l=["ascending","descending"],m=a.$table.find("tfoot tr").children("td, th").add(b(a.namespace+"_extra_headers")).removeClass(j.join(" "));for(a.$headers.removeClass(j.join(" ")).addClass(i).attr("aria-sort","none").find("."+c.css.icon).removeClass(k.join(" ")).addClass(k[2]),e=0;e<h;e++)if(2!==g[e][1]&&(d=a.$headers.filter(function(b){for(var d=!0,e=a.$headers.eq(b),f=parseInt(e.attr("data-column"),10),g=f+a.$headers[b].colSpan;f<g;f++)d=!!d&&(d||c.isValueInArray(f,a.sortList)>-1);return d}),d=d.not(".sorter-false").filter('[data-column="'+g[e][0]+'"]'+(1===h?":last":"")),d.length)){for(f=0;f<d.length;f++)d[f].sortDisabled||d.eq(f).removeClass(i).addClass(j[g[e][1]]).attr("aria-sort",l[g[e][1]]).find("."+c.css.icon).removeClass(k[2]).addClass(k[g[e][1]]);m.length&&m.filter('[data-column="'+g[e][0]+'"]').removeClass(i).addClass(j[g[e][1]])}for(h=a.$headers.length,e=0;e<h;e++)c.setColumnAriaLabel(a,a.$headers.eq(e))},setColumnAriaLabel:function(a,d,e){if(d.length){var f=parseInt(d.attr("data-column"),10),g=a.sortVars[f],h=d.hasClass(c.css.sortAsc)?"sortAsc":d.hasClass(c.css.sortDesc)?"sortDesc":"sortNone",i=b.trim(d.text())+": "+c.language[h];d.hasClass("sorter-false")||e===!1?i+=c.language.sortDisabled:(h=(g.count+1)%g.order.length,e=g.order[h],i+=c.language[0===e?"nextAsc":1===e?"nextDesc":"nextNone"]),d.attr("aria-label",i)}},updateHeader:function(a){var b,d,e,f,g=a.table,h=a.$headers.length;for(b=0;b<h;b++)e=a.$headers.eq(b),f=c.getColumnData(g,a.headers,b,!0),d="false"===c.getData(e,f,"sorter")||"false"===c.getData(e,f,"parser"),c.setColumnSort(a,e,d)},setColumnSort:function(a,b,c){var d=a.table.id;b[0].sortDisabled=c,b[c?"addClass":"removeClass"]("sorter-false").attr("aria-disabled",""+c),a.tabIndex&&(c?b.removeAttr("tabindex"):b.attr("tabindex","0")),d&&(c?b.removeAttr("aria-controls"):b.attr("aria-controls",d))},updateHeaderSortCount:function(a,d){var e,f,g,h,i,j,k,l,m=d||a.sortList,n=m.length;for(a.sortList=[],h=0;h<n;h++)if(k=m[h],e=parseInt(k[0],10),e<a.columns){switch(a.sortVars[e].order||(l=c.getOrder(a.sortInitialOrder)?a.sortReset?[1,0,2]:[1,0]:a.sortReset?[0,1,2]:[0,1],a.sortVars[e].order=l,a.sortVars[e].count=0),l=a.sortVars[e].order,f=(""+k[1]).match(/^(1|d|s|o|n)/),f=f?f[0]:""){case"1":case"d":f=1;break;case"s":f=i||0;break;case"o":j=l[(i||0)%l.length],f=0===j?1:1===j?0:2;break;case"n":f=l[++a.sortVars[e].count%l.length];break;default:f=0}i=0===h?f:i,g=[e,parseInt(f,10)||0],a.sortList[a.sortList.length]=g,f=b.inArray(g[1],l),a.sortVars[e].count=f>=0?f:g[1]%l.length}},updateAll:function(a,b,d){var e=a.table;e.isUpdating=!0,c.refreshWidgets(e,!0,!0),c.buildHeaders(a),c.bindEvents(e,a.$headers,!0),c.bindMethods(a),c.commonUpdate(a,b,d)},update:function(a,b,d){var e=a.table;e.isUpdating=!0,c.updateHeader(a),c.commonUpdate(a,b,d)},updateHeaders:function(a,b){a.table.isUpdating=!0,c.buildHeaders(a),c.bindEvents(a.table,a.$headers,!0),c.resortComplete(a,b)},updateCell:function(a,d,e,f){if(c.isEmptyObject(a.cache))return c.updateHeader(a),void c.commonUpdate(a,e,f);a.table.isUpdating=!0,a.$table.find(a.selectorRemove).remove();var g,h,i,j,k,l,m=a.$tbodies,n=b(d),o=m.index(b.fn.closest?n.closest("tbody"):n.parents("tbody").filter(":first")),p=a.cache[o],q=b.fn.closest?n.closest("tr"):n.parents("tr").filter(":first");if(d=n[0],m.length&&o>=0){if(i=m.eq(o).find("tr").index(q),k=p.normalized[i],l=q[0].cells.length,l!==a.columns)for(j=0,g=!1,h=0;h<l;h++)g||q[0].cells[h]===d?g=!0:j+=q[0].cells[h].colSpan;else j=n.index();g=c.getElementText(a,d,j),k[a.columns].raw[j]=g,g=c.getParsedText(a,d,j,g),k[j]=g,k[a.columns].$row=q,"numeric"===(a.parsers[j].type||"").toLowerCase()&&(p.colMax[j]=Math.max(Math.abs(g)||0,p.colMax[j]||0)),g="undefined"!==e?e:a.resort,g!==!1?c.checkResort(a,g,f):c.resortComplete(a,f)}else a.debug&&console.error("updateCell aborted, tbody missing or not within the indicated table"),a.table.isUpdating=!1},addRows:function(d,e,f,g){var h,i,j,k,l,m,n,o,p,q,r,s,t,u="string"==typeof e&&1===d.$tbodies.length&&/<tr/.test(e||""),v=d.table;if(u)e=b(e),d.$tbodies.append(e);else if(!(e&&e instanceof a&&(b.fn.closest?e.closest("table")[0]:e.parents("table")[0])===d.table))return d.debug&&console.error("addRows method requires (1) a jQuery selector reference to rows that have already been added to the table, or (2) row HTML string to be added to a table with only one tbody"),!1;if(v.isUpdating=!0,c.isEmptyObject(d.cache))c.updateHeader(d),c.commonUpdate(d,f,g);else{for(l=e.filter("tr").attr("role","row").length,j=d.$tbodies.index(e.parents("tbody").filter(":first")),d.parsers&&d.parsers.length||c.setupParsers(d),k=0;k<l;k++){for(p=0,n=e[k].cells.length,o=d.cache[j].normalized.length,r=[],q={child:[],raw:[],$row:e.eq(k),order:o},m=0;m<n;m++)s=e[k].cells[m],h=c.getElementText(d,s,p),q.raw[p]=h,i=c.getParsedText(d,s,p,h),r[p]=i,"numeric"===(d.parsers[p].type||"").toLowerCase()&&(d.cache[j].colMax[p]=Math.max(Math.abs(i)||0,d.cache[j].colMax[p]||0)),t=s.colSpan-1,t>0&&(p+=t),p++;r[d.columns]=q,d.cache[j].normalized[o]=r}c.checkResort(d,f,g)}},updateCache:function(a,b,d){a.parsers&&a.parsers.length||c.setupParsers(a,d),c.buildCache(a,b,d)},appendCache:function(a,b){var d,e,f,g,h,i,j,k=a.table,l=a.widgetOptions,m=a.$tbodies,n=[],o=a.cache;if(c.isEmptyObject(o))return a.appender?a.appender(k,n):k.isUpdating?a.$table.triggerHandler("updateComplete",k):"";for(a.debug&&(j=new Date),i=0;i<m.length;i++)if(f=m.eq(i),f.length){for(g=c.processTbody(k,f,!0),d=o[i].normalized,e=d.length,h=0;h<e;h++)n[n.length]=d[h][a.columns].$row,a.appender&&(!a.pager||a.pager.removeRows&&l.pager_removeRows||a.pager.ajax)||g.append(d[h][a.columns].$row);c.processTbody(k,g,!1)}a.appender&&a.appender(k,n),a.debug&&console.log("Rebuilt table"+c.benchmark(j)),b||a.appender||c.applyWidget(k),k.isUpdating&&a.$table.triggerHandler("updateComplete",k)},commonUpdate:function(a,b,d){a.$table.find(a.selectorRemove).remove(),c.setupParsers(a),c.buildCache(a),c.checkResort(a,b,d)},initSort:function(a,d,e){if(a.table.isUpdating)return setTimeout(function(){c.initSort(a,d,e)},50);var f,g,h,i,j,k,l,m=!e[a.sortMultiSortKey],n=a.table,o=a.$headers.length,p=parseInt(b(d).attr("data-column"),10),q=a.sortVars[p].order;if(a.$table.triggerHandler("sortStart",n),k=(a.sortVars[p].count+1)%q.length,a.sortVars[p].count=e[a.sortResetKey]?2:k,a.sortRestart)for(h=0;h<o;h++)l=a.$headers.eq(h),k=parseInt(l.attr("data-column"),10),p!==k&&(m||l.hasClass(c.css.sortNone))&&(a.sortVars[k].count=-1);if(m){if(a.sortList=[],a.last.sortList=[],null!==a.sortForce)for(f=a.sortForce,g=0;g<f.length;g++)f[g][0]!==p&&(a.sortList[a.sortList.length]=f[g]);if(i=q[a.sortVars[p].count],i<2&&(a.sortList[a.sortList.length]=[p,i],d.colSpan>1))for(g=1;g<d.colSpan;g++)a.sortList[a.sortList.length]=[p+g,i],a.sortVars[p+g].count=b.inArray(i,q)}else if(a.sortList=b.extend([],a.last.sortList),c.isValueInArray(p,a.sortList)>=0)for(g=0;g<a.sortList.length;g++)k=a.sortList[g],k[0]===p&&(k[1]=q[a.sortVars[p].count],2===k[1]&&(a.sortList.splice(g,1),a.sortVars[p].count=-1));else if(i=q[a.sortVars[p].count],i<2&&(a.sortList[a.sortList.length]=[p,i],d.colSpan>1))for(g=1;g<d.colSpan;g++)a.sortList[a.sortList.length]=[p+g,i],a.sortVars[p+g].count=b.inArray(i,q);if(a.last.sortList=b.extend([],a.sortList),a.sortList.length&&a.sortAppend&&(f=b.isArray(a.sortAppend)?a.sortAppend:a.sortAppend[a.sortList[0][0]],!c.isEmptyObject(f)))for(g=0;g<f.length;g++)if(f[g][0]!==p&&c.isValueInArray(f[g][0],a.sortList)<0){if(i=f[g][1],j=(""+i).match(/^(a|d|s|o|n)/))switch(k=a.sortList[0][1],j[0]){case"d":i=1;break;case"s":i=k;break;case"o":i=0===k?1:0;break;case"n":i=(k+1)%q.length;break;default:i=0}a.sortList[a.sortList.length]=[f[g][0],i]}a.$table.triggerHandler("sortBegin",n),setTimeout(function(){c.setHeadersCss(a),c.multisort(a),c.appendCache(a),a.$table.triggerHandler("sortBeforeEnd",n),a.$table.triggerHandler("sortEnd",n)},1)},multisort:function(a){var b,d,e,f,g=a.table,h=0,i=a.textSorter||"",j=a.sortList,k=j.length,l=a.$tbodies.length;if(!a.serverSideSorting&&!c.isEmptyObject(a.cache)){for(a.debug&&(d=new Date),b=0;b<l;b++)e=a.cache[b].colMax,f=a.cache[b].normalized,f.sort(function(b,d){var f,l,m,n,o,p,q;for(f=0;f<k;f++){if(m=j[f][0],n=j[f][1],h=0===n,a.sortStable&&b[m]===d[m]&&1===k)return b[a.columns].order-d[a.columns].order;if(l=/n/i.test(c.getSortType(a.parsers,m)),l&&a.strings[m]?(l="boolean"==typeof c.string[a.strings[m]]?(h?1:-1)*(c.string[a.strings[m]]?-1:1):a.strings[m]?c.string[a.strings[m]]||0:0,o=a.numberSorter?a.numberSorter(b[m],d[m],h,e[m],g):c["sortNumeric"+(h?"Asc":"Desc")](b[m],d[m],l,e[m],m,a)):(p=h?b:d,q=h?d:b,o="function"==typeof i?i(p[m],q[m],h,m,g):"object"==typeof i&&i.hasOwnProperty(m)?i[m](p[m],q[m],h,m,g):c["sortNatural"+(h?"Asc":"Desc")](b[m],d[m],m,a)),o)return o}return b[a.columns].order-d[a.columns].order});a.debug&&console.log("Applying sort "+j.toString()+c.benchmark(d))}},resortComplete:function(a,c){a.table.isUpdating&&a.$table.triggerHandler("updateComplete",a.table),b.isFunction(c)&&c(a.table)},checkResort:function(a,d,e){var f=b.isArray(d)?d:a.sortList,g="undefined"==typeof d?a.resort:d;g===!1||a.serverSideSorting||a.table.isProcessing?(c.resortComplete(a,e),c.applyWidget(a.table,!1)):f.length?c.sortOn(a,f,function(){c.resortComplete(a,e)},!0):c.sortReset(a,function(){c.resortComplete(a,e),c.applyWidget(a.table,!1)})},sortOn:function(a,d,e,f){var g=a.table;a.$table.triggerHandler("sortStart",g),c.updateHeaderSortCount(a,d),c.setHeadersCss(a),a.delayInit&&c.isEmptyObject(a.cache)&&c.buildCache(a),a.$table.triggerHandler("sortBegin",g),c.multisort(a),c.appendCache(a,f),a.$table.triggerHandler("sortBeforeEnd",g),a.$table.triggerHandler("sortEnd",g),c.applyWidget(g),b.isFunction(e)&&e(g)},sortReset:function(a,d){a.sortList=[],c.setHeadersCss(a),c.multisort(a),c.appendCache(a),b.isFunction(d)&&d(a.table)},getSortType:function(a,b){return a&&a[b]?a[b].type||"":""},getOrder:function(a){return/^d/i.test(a)||1===a},sortNatural:function(a,b){if(a===b)return 0;var d,e,f,g,h,i,j=c.regex;if(j.hex.test(b)){if(d=parseInt((a||"").match(j.hex),16),e=parseInt((b||"").match(j.hex),16),d<e)return-1;if(d>e)return 1}for(d=(a||"").replace(j.chunk,"\\0$1\\0").replace(j.chunks,"").split("\\0"),e=(b||"").replace(j.chunk,"\\0$1\\0").replace(j.chunks,"").split("\\0"),i=Math.max(d.length,e.length),h=0;h<i;h++){if(f=isNaN(d[h])?d[h]||0:parseFloat(d[h])||0,g=isNaN(e[h])?e[h]||0:parseFloat(e[h])||0,isNaN(f)!==isNaN(g))return isNaN(f)?1:-1;if(typeof f!=typeof g&&(f+="",g+=""),f<g)return-1;if(f>g)return 1}return 0},sortNaturalAsc:function(a,b,d,e){if(a===b)return 0;var f=c.string[e.empties[d]||e.emptyTo];return""===a&&0!==f?"boolean"==typeof f?f?-1:1:-f||-1:""===b&&0!==f?"boolean"==typeof f?f?1:-1:f||1:c.sortNatural(a,b)},sortNaturalDesc:function(a,b,d,e){if(a===b)return 0;var f=c.string[e.empties[d]||e.emptyTo];return""===a&&0!==f?"boolean"==typeof f?f?-1:1:f||1:""===b&&0!==f?"boolean"==typeof f?f?1:-1:-f||-1:c.sortNatural(b,a)},sortText:function(a,b){return a>b?1:a<b?-1:0},getTextValue:function(a,b,c){if(c){var d,e=a?a.length:0,f=c+b;for(d=0;d<e;d++)f+=a.charCodeAt(d);return b*f}return 0},sortNumericAsc:function(a,b,d,e,f,g){if(a===b)return 0;var h=c.string[g.empties[f]||g.emptyTo];return""===a&&0!==h?"boolean"==typeof h?h?-1:1:-h||-1:""===b&&0!==h?"boolean"==typeof h?h?1:-1:h||1:(isNaN(a)&&(a=c.getTextValue(a,d,e)),isNaN(b)&&(b=c.getTextValue(b,d,e)),a-b)},sortNumericDesc:function(a,b,d,e,f,g){if(a===b)return 0;var h=c.string[g.empties[f]||g.emptyTo];return""===a&&0!==h?"boolean"==typeof h?h?-1:1:h||1:""===b&&0!==h?"boolean"==typeof h?h?1:-1:-h||-1:(isNaN(a)&&(a=c.getTextValue(a,d,e)),isNaN(b)&&(b=c.getTextValue(b,d,e)),b-a)},sortNumeric:function(a,b){return a-b},addWidget:function(a){a.id&&!c.isEmptyObject(c.getWidgetById(a.id))&&console.warn('"'+a.id+'" widget was loaded more than once!'),c.widgets[c.widgets.length]=a},hasWidget:function(a,c){return a=b(a),a.length&&a[0].config&&a[0].config.widgetInit[c]||!1},getWidgetById:function(a){var b,d,e=c.widgets.length;for(b=0;b<e;b++)if(d=c.widgets[b],d&&d.id&&d.id.toLowerCase()===a.toLowerCase())return d},applyWidgetOptions:function(a){var d,e,f=a.config,g=f.widgets.length;if(g)for(d=0;d<g;d++)e=c.getWidgetById(f.widgets[d]),e&&e.options&&(f.widgetOptions=b.extend(!0,{},e.options,f.widgetOptions))},addWidgetFromClass:function(a){var b,d,e=a.config,f="^"+e.widgetClass.replace(c.regex.templateName,"(\\S+)+")+"$",g=new RegExp(f,"g"),h=(a.className||"").split(c.regex.spaces);if(h.length)for(b=h.length,d=0;d<b;d++)h[d].match(g)&&(e.widgets[e.widgets.length]=h[d].replace(g,"$1"))},applyWidgetId:function(a,d,e){a=b(a)[0];var f,g,h,i=a.config,j=i.widgetOptions,k=c.getWidgetById(d);k&&(h=k.id,f=!1,b.inArray(h,i.widgets)<0&&(i.widgets[i.widgets.length]=h),i.debug&&(g=new Date),!e&&i.widgetInit[h]||(i.widgetInit[h]=!0,a.hasInitialized&&c.applyWidgetOptions(a),"function"==typeof k.init&&(f=!0,i.debug&&console[console.group?"group":"log"]("Initializing "+h+" widget"),k.init(a,k,i,j))),e||"function"!=typeof k.format||(f=!0,i.debug&&console[console.group?"group":"log"]("Updating "+h+" widget"),k.format(a,i,j,!1)),i.debug&&f&&(console.log("Completed "+(e?"initializing ":"applying ")+h+" widget"+c.benchmark(g)),console.groupEnd&&console.groupEnd()))},applyWidget:function(a,d,e){a=b(a)[0];var f,g,h,i,j,k=a.config,l=[];if(d===!1||!a.hasInitialized||!a.isApplyingWidgets&&!a.isUpdating){if(k.debug&&(j=new Date),c.addWidgetFromClass(a),clearTimeout(k.timerReady),k.widgets.length){for(a.isApplyingWidgets=!0,k.widgets=b.grep(k.widgets,function(a,c){return b.inArray(a,k.widgets)===c}),h=k.widgets||[],g=h.length,f=0;f<g;f++)i=c.getWidgetById(h[f]),i&&i.id?(i.priority||(i.priority=10),l[f]=i):k.debug&&console.warn('"'+h[f]+'" widget code does not exist!');for(l.sort(function(a,b){return a.priority<b.priority?-1:a.priority===b.priority?0:1}),g=l.length,k.debug&&console[console.group?"group":"log"]("Start "+(d?"initializing":"applying")+" widgets"),f=0;f<g;f++)i=l[f],i&&i.id&&c.applyWidgetId(a,i.id,d);k.debug&&console.groupEnd&&console.groupEnd(),d||"function"!=typeof e||e(a)}k.timerReady=setTimeout(function(){a.isApplyingWidgets=!1,b.data(a,"lastWidgetApplication",new Date),k.$table.triggerHandler("tablesorter-ready")},10),k.debug&&(i=k.widgets.length,console.log("Completed "+(d===!0?"initializing ":"applying ")+i+" widget"+(1!==i?"s":"")+c.benchmark(j)))}},removeWidget:function(a,d,e){a=b(a)[0];var f,g,h,i,j=a.config;if(d===!0)for(d=[],i=c.widgets.length,h=0;h<i;h++)g=c.widgets[h],g&&g.id&&(d[d.length]=g.id);else d=(b.isArray(d)?d.join(","):d||"").toLowerCase().split(/[\s,]+/);for(i=d.length,f=0;f<i;f++)g=c.getWidgetById(d[f]),h=b.inArray(d[f],j.widgets),h>=0&&e!==!0&&j.widgets.splice(h,1),g&&g.remove&&(j.debug&&console.log((e?"Refreshing":"Removing")+' "'+d[f]+'" widget'),g.remove(a,j,j.widgetOptions,e),j.widgetInit[d[f]]=!1)},refreshWidgets:function(a,d,e){a=b(a)[0];var f,g,h=a.config,i=h.widgets,j=c.widgets,k=j.length,l=[],m=function(a){b(a).triggerHandler("refreshComplete")};for(f=0;f<k;f++)g=j[f],g&&g.id&&(d||b.inArray(g.id,i)<0)&&(l[l.length]=g.id);c.removeWidget(a,l.join(","),!0),e!==!0?(c.applyWidget(a,d||!1,m),d&&c.applyWidget(a,!1,m)):m(a)},benchmark:function(a){return" ("+((new Date).getTime()-a.getTime())+" ms)"},log:function(){console.log(arguments)},isEmptyObject:function(a){for(var b in a)return!1;return!0},isValueInArray:function(a,b){var c,d=b&&b.length||0;for(c=0;c<d;c++)if(b[c][0]===a)return c;return-1},formatFloat:function(a,d){if("string"!=typeof a||""===a)return a;var e,f=d&&d.config?d.config.usNumberFormat!==!1:"undefined"==typeof d||d;return a=f?a.replace(c.regex.comma,""):a.replace(c.regex.digitNonUS,"").replace(c.regex.comma,"."),c.regex.digitNegativeTest.test(a)&&(a=a.replace(c.regex.digitNegativeReplace,"-$1")),e=parseFloat(a),isNaN(e)?b.trim(a):e},isDigit:function(a){return isNaN(a)?c.regex.digitTest.test(a.toString().replace(c.regex.digitReplace,"")):""!==a;
+},computeColumnIndex:function(a,c){var d,e,f,g,h,i,j,k,l,m,n=c&&c.columns||0,o=[],p=new Array(n);for(d=0;d<a.length;d++)for(i=a[d].cells,e=0;e<i.length;e++){for(h=i[e],j=h.parentNode.rowIndex,k=h.rowSpan||1,l=h.colSpan||1,"undefined"==typeof o[j]&&(o[j]=[]),f=0;f<o[j].length+1;f++)if("undefined"==typeof o[j][f]){m=f;break}for(n&&h.cellIndex===m||(h.setAttribute?h.setAttribute("data-column",m):b(h).attr("data-column",m)),f=j;f<j+k;f++)for("undefined"==typeof o[f]&&(o[f]=[]),p=o[f],g=m;g<m+l;g++)p[g]="x"}return p.length},fixColumnWidth:function(a){a=b(a)[0];var d,e,f,g,h,i=a.config,j=i.$table.children("colgroup");if(j.length&&j.hasClass(c.css.colgroup)&&j.remove(),i.widthFixed&&0===i.$table.children("colgroup").length){for(j=b('<colgroup class="'+c.css.colgroup+'">'),d=i.$table.width(),f=i.$tbodies.find("tr:first").children(":visible"),g=f.length,h=0;h<g;h++)e=parseInt(f.eq(h).width()/d*1e3,10)/10+"%",j.append(b("<col>").css("width",e));i.$table.prepend(j)}},getData:function(a,c,d){var e,f,g="",h=b(a);return h.length?(e=!!b.metadata&&h.metadata(),f=" "+(h.attr("class")||""),"undefined"!=typeof h.data(d)||"undefined"!=typeof h.data(d.toLowerCase())?g+=h.data(d)||h.data(d.toLowerCase()):e&&"undefined"!=typeof e[d]?g+=e[d]:c&&"undefined"!=typeof c[d]?g+=c[d]:" "!==f&&f.match(" "+d+"-")&&(g=f.match(new RegExp("\\s"+d+"-([\\w-]+)"))[1]||""),b.trim(g)):""},getColumnData:function(a,c,d,e,f){if("undefined"!=typeof c&&null!==c){a=b(a)[0];var g,h,i=a.config,j=f||i.$headers,k=i.$headerIndexed&&i.$headerIndexed[d]||j.filter('[data-column="'+d+'"]:last');if("undefined"!=typeof c[d])return e?c[d]:c[j.index(k)];for(h in c)if("string"==typeof h&&(g=k.filter(h).add(k.find(h)),g.length))return c[h]}},isProcessing:function(a,d,e){a=b(a);var f=a[0].config,g=e||a.find("."+c.css.header);d?("undefined"!=typeof e&&f.sortList.length>0&&(g=g.filter(function(){return!this.sortDisabled&&c.isValueInArray(parseFloat(b(this).attr("data-column")),f.sortList)>=0})),a.add(g).addClass(c.css.processing+" "+f.cssProcessing)):a.add(g).removeClass(c.css.processing+" "+f.cssProcessing)},processTbody:function(a,c,d){if(a=b(a)[0],d)return a.isProcessing=!0,c.before('<colgroup class="tablesorter-savemyplace"/>'),b.fn.detach?c.detach():c.remove();var e=b(a).find("colgroup.tablesorter-savemyplace");c.insertAfter(e),e.remove(),a.isProcessing=!1},clearTableBody:function(a){b(a)[0].config.$tbodies.children().detach()},characterEquivalents:{a:"áàâãäąå",A:"ÁÀÂÃÄĄÅ",c:"çćč",C:"ÇĆČ",e:"éèêëěę",E:"ÉÈÊËĚĘ",i:"íìİîïı",I:"ÍÌİÎÏ",o:"óòôõöō",O:"ÓÒÔÕÖŌ",ss:"ß",SS:"ẞ",u:"úùûüů",U:"ÚÙÛÜŮ"},replaceAccents:function(a){var b,d="[",e=c.characterEquivalents;if(!c.characterRegex){c.characterRegexArray={};for(b in e)"string"==typeof b&&(d+=e[b],c.characterRegexArray[b]=new RegExp("["+e[b]+"]","g"));c.characterRegex=new RegExp(d+"]")}if(c.characterRegex.test(a))for(b in e)"string"==typeof b&&(a=a.replace(c.characterRegexArray[b],b));return a},restoreHeaders:function(a){var d,e,f=b(a)[0].config,g=f.$table.find(f.selectorHeaders),h=g.length;for(d=0;d<h;d++)e=g.eq(d),e.find("."+c.css.headerIn).length&&e.html(f.headerContent[d])},destroy:function(a,d,e){if(a=b(a)[0],a.hasInitialized){c.removeWidget(a,!0,!1);var f,g=b(a),h=a.config,i=h.debug,j=g.find("thead:first"),k=j.find("tr."+c.css.headerRow).removeClass(c.css.headerRow+" "+h.cssHeaderRow),l=g.find("tfoot:first > tr").children("th, td");d===!1&&b.inArray("uitheme",h.widgets)>=0&&(g.triggerHandler("applyWidgetId",["uitheme"]),g.triggerHandler("applyWidgetId",["zebra"])),j.find("tr").not(k).remove(),f="sortReset update updateRows updateAll updateHeaders updateCell addRows updateComplete sorton appendCache updateCache applyWidgetId applyWidgets refreshWidgets removeWidget destroy mouseup mouseleave "+"keypress sortBegin sortEnd resetToLoadState ".split(" ").join(h.namespace+" "),g.removeData("tablesorter").unbind(f.replace(c.regex.spaces," ")),h.$headers.add(l).removeClass([c.css.header,h.cssHeader,h.cssAsc,h.cssDesc,c.css.sortAsc,c.css.sortDesc,c.css.sortNone].join(" ")).removeAttr("data-column").removeAttr("aria-label").attr("aria-disabled","true"),k.find(h.selectorSort).unbind("mousedown mouseup keypress ".split(" ").join(h.namespace+" ").replace(c.regex.spaces," ")),c.restoreHeaders(a),g.toggleClass(c.css.table+" "+h.tableClass+" tablesorter-"+h.theme,d===!1),a.hasInitialized=!1,delete a.config.cache,"function"==typeof e&&e(a),i&&console.log("tablesorter has been removed")}}};b.fn.tablesorter=function(a){return this.each(function(){var d=this,e=b.extend(!0,{},c.defaults,a,c.instanceMethods);e.originalSettings=a,!d.hasInitialized&&c.buildTable&&"TABLE"!==this.nodeName?c.buildTable(d,e):c.setup(d,e)})},window.console&&window.console.log||(c.logs=[],console={},console.log=console.warn=console.error=console.table=function(){var a=arguments.length>1?arguments:arguments[0];c.logs[c.logs.length]={date:Date.now(),log:a}}),c.addParser({id:"no-parser",is:function(){return!1},format:function(){return""},type:"text"}),c.addParser({id:"text",is:function(){return!0},format:function(a,d){var e=d.config;return a&&(a=b.trim(e.ignoreCase?a.toLocaleLowerCase():a),a=e.sortLocaleCompare?c.replaceAccents(a):a),a},type:"text"}),c.regex.nondigit=/[^\w,. \-()]/g,c.addParser({id:"digit",is:function(a){return c.isDigit(a)},format:function(a,d){var e=c.formatFloat((a||"").replace(c.regex.nondigit,""),d);return a&&"number"==typeof e?e:a?b.trim(a&&d.config.ignoreCase?a.toLocaleLowerCase():a):a},type:"numeric"}),c.regex.currencyReplace=/[+\-,. ]/g,c.regex.currencyTest=/^\(?\d+[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]|[\u00a3$\u20ac\u00a4\u00a5\u00a2?.]\d+\)?$/,c.addParser({id:"currency",is:function(a){return a=(a||"").replace(c.regex.currencyReplace,""),c.regex.currencyTest.test(a)},format:function(a,d){var e=c.formatFloat((a||"").replace(c.regex.nondigit,""),d);return a&&"number"==typeof e?e:a?b.trim(a&&d.config.ignoreCase?a.toLocaleLowerCase():a):a},type:"numeric"}),c.regex.urlProtocolTest=/^(https?|ftp|file):\/\//,c.regex.urlProtocolReplace=/(https?|ftp|file):\/\/(www\.)?/,c.addParser({id:"url",is:function(a){return c.regex.urlProtocolTest.test(a)},format:function(a){return a?b.trim(a.replace(c.regex.urlProtocolReplace,"")):a},type:"text"}),c.regex.dash=/-/g,c.regex.isoDate=/^\d{4}[\/\-]\d{1,2}[\/\-]\d{1,2}/,c.addParser({id:"isoDate",is:function(a){return c.regex.isoDate.test(a)},format:function(a,b){var d=a?new Date(a.replace(c.regex.dash,"/")):a;return d instanceof Date&&isFinite(d)?d.getTime():a},type:"numeric"}),c.regex.percent=/%/g,c.regex.percentTest=/(\d\s*?%|%\s*?\d)/,c.addParser({id:"percent",is:function(a){return c.regex.percentTest.test(a)&&a.length<15},format:function(a,b){return a?c.formatFloat(a.replace(c.regex.percent,""),b):a},type:"numeric"}),c.addParser({id:"image",is:function(a,b,c,d){return d.find("img").length>0},format:function(a,c,d){return b(d).find("img").attr(c.config.imgAttr||"alt")||a},parsed:!0,type:"text"}),c.regex.dateReplace=/(\S)([AP]M)$/i,c.regex.usLongDateTest1=/^[A-Z]{3,10}\.?\s+\d{1,2},?\s+(\d{4})(\s+\d{1,2}:\d{2}(:\d{2})?(\s+[AP]M)?)?$/i,c.regex.usLongDateTest2=/^\d{1,2}\s+[A-Z]{3,10}\s+\d{4}/i,c.addParser({id:"usLongDate",is:function(a){return c.regex.usLongDateTest1.test(a)||c.regex.usLongDateTest2.test(a)},format:function(a,b){var d=a?new Date(a.replace(c.regex.dateReplace,"$1 $2")):a;return d instanceof Date&&isFinite(d)?d.getTime():a},type:"numeric"}),c.regex.shortDateTest=/(^\d{1,2}[\/\s]\d{1,2}[\/\s]\d{4})|(^\d{4}[\/\s]\d{1,2}[\/\s]\d{1,2})/,c.regex.shortDateReplace=/[\-.,]/g,c.regex.shortDateXXY=/(\d{1,2})[\/\s](\d{1,2})[\/\s](\d{4})/,c.regex.shortDateYMD=/(\d{4})[\/\s](\d{1,2})[\/\s](\d{1,2})/,c.convertFormat=function(a,b){a=(a||"").replace(c.regex.spaces," ").replace(c.regex.shortDateReplace,"/"),"mmddyyyy"===b?a=a.replace(c.regex.shortDateXXY,"$3/$1/$2"):"ddmmyyyy"===b?a=a.replace(c.regex.shortDateXXY,"$3/$2/$1"):"yyyymmdd"===b&&(a=a.replace(c.regex.shortDateYMD,"$1/$2/$3"));var d=new Date(a);return d instanceof Date&&isFinite(d)?d.getTime():""},c.addParser({id:"shortDate",is:function(a){return a=(a||"").replace(c.regex.spaces," ").replace(c.regex.shortDateReplace,"/"),c.regex.shortDateTest.test(a)},format:function(a,b,d,e){if(a){var f=b.config,g=f.$headerIndexed[e],h=g.length&&g.data("dateFormat")||c.getData(g,c.getColumnData(b,f.headers,e),"dateFormat")||f.dateFormat;return g.length&&g.data("dateFormat",h),c.convertFormat(a,h)||a}return a},type:"numeric"}),c.regex.timeTest=/^(0?[1-9]|1[0-2]):([0-5]\d)(\s[AP]M)$|^((?:[01]\d|[2][0-4]):[0-5]\d)$/i,c.regex.timeMatch=/(0?[1-9]|1[0-2]):([0-5]\d)(\s[AP]M)|((?:[01]\d|[2][0-4]):[0-5]\d)/i,c.addParser({id:"time",is:function(a){return c.regex.timeTest.test(a)},format:function(a,b){var d,e=(a||"").match(c.regex.timeMatch),f=new Date(a),g=a&&(null!==e?e[0]:"00:00 AM"),h=g?new Date("2000/01/01 "+g.replace(c.regex.dateReplace,"$1 $2")):g;return h instanceof Date&&isFinite(h)?(d=f instanceof Date&&isFinite(f)?f.getTime():0,d?parseFloat(h.getTime()+"."+f.getTime()):h.getTime()):a},type:"numeric"}),c.addParser({id:"metadata",is:function(){return!1},format:function(a,c,d){var e=c.config,f=e.parserMetadataName?e.parserMetadataName:"sortValue";return b(d).metadata()[f]},type:"numeric"}),c.addWidget({id:"zebra",priority:90,format:function(a,c,d){var e,f,g,h,i,j,k,l=new RegExp(c.cssChildRow,"i"),m=c.$tbodies.add(b(c.namespace+"_extra_table").children("tbody:not(."+c.cssInfoBlock+")"));for(i=0;i<m.length;i++)for(g=0,e=m.eq(i).children("tr:visible").not(c.selectorRemove),k=e.length,j=0;j<k;j++)f=e.eq(j),l.test(f[0].className)||g++,h=g%2===0,f.removeClass(d.zebra[h?1:0]).addClass(d.zebra[h?0:1])},remove:function(a,b,d,e){if(!e){var f,g,h=b.$tbodies,i=(d.zebra||["even","odd"]).join(" ");for(f=0;f<h.length;f++)g=c.processTbody(a,h.eq(f),!0),g.children().removeClass(i),c.processTbody(a,g,!1)}}})}(a),a.tablesorter});
\ No newline at end of file
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_central/web/includes/javascript/main.js'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java,v
diff -u -r1.10.14.4 -r1.10.14.5
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java	11 May 2016 07:07:24 -0000	1.10.14.4
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IOrganisationDAO.java	24 Oct 2016 14:55:35 -0000	1.10.14.5
@@ -27,6 +27,7 @@
 
 import org.lamsfoundation.lams.dao.IBaseDAO;
 import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO;
 
 /**
  * @author jliew
@@ -38,10 +39,17 @@
      *
      * @param userId
      * @param isSysadmin
+     * @param page
+     * @param size
+     * @param searchString
+     *            filters results by course name. It can be null and then doesn't affect results
      * @return list of orgIds
      */
-    List<Integer> getActiveCourseIdsByUser(Integer userId, boolean isSysadmin);
+    List<OrganisationDTO> getActiveCoursesByUser(Integer userId, boolean isSysadmin, int page, int size,
+	    String searchString);
 
+    int getCountActiveCoursesByUser(Integer userId, boolean isSysadmin, String searchString);
+
     /**
      * Returns courses with specified type, state and parent course.
      *
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java,v
diff -u -r1.13.14.8 -r1.13.14.9
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java	11 May 2016 07:07:29 -0000	1.13.14.8
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/OrganisationDAO.java	24 Oct 2016 14:55:36 -0000	1.13.14.9
@@ -23,6 +23,7 @@
 
 package org.lamsfoundation.lams.usermanagement.dao.hibernate;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.hibernate.Query;
@@ -31,6 +32,7 @@
 import org.lamsfoundation.lams.usermanagement.OrganisationState;
 import org.lamsfoundation.lams.usermanagement.OrganisationType;
 import org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO;
+import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -39,16 +41,7 @@
 @Repository
 public class OrganisationDAO extends LAMSBaseDAO implements IOrganisationDAO {
 
-    private static final String GET_ALL_ACTIVE_COURSE_IDS = "select o.organisationId from Organisation o"
-	    + " where o.organisationType.organisationTypeId = " + OrganisationType.COURSE_TYPE
-	    + " and o.organisationState.organisationStateId = " + OrganisationState.ACTIVE + " order by name";
 
-    private static final String GET_ACTIVE_COURSE_IDS_BY_USER = "select uo.organisation.organisationId, uoc.collapsed"
-	    + " from UserOrganisation uo left join uo.userOrganisationCollapsed uoc"
-	    + " where uo.organisation.organisationType.organisationTypeId = " + OrganisationType.COURSE_TYPE
-	    + " and uo.organisation.organisationState.organisationStateId = " + OrganisationState.ACTIVE
-	    + " and uo.user.userId = :userId order by name";
-
     private static final String GET_PAGED_COURSES = "SELECT o FROM Organisation o WHERE o.organisationType.organisationTypeId =:typeId "
 	    + "AND o.organisationState.organisationStateId =:stateId AND o.parentOrganisation.organisationId =:parentOrgId "
 	    + "AND (o.name LIKE CONCAT('%', :searchString, '%')) ORDER BY ";
@@ -61,12 +54,75 @@
 
     @SuppressWarnings("unchecked")
     @Override
-    public List<Integer> getActiveCourseIdsByUser(Integer userId, boolean isSysadmin) {
-	return isSysadmin ? getSession().createQuery(OrganisationDAO.GET_ALL_ACTIVE_COURSE_IDS).list()
-		: getSession().createQuery(OrganisationDAO.GET_ACTIVE_COURSE_IDS_BY_USER).setInteger("userId", userId)
-			.list();
+    public List<OrganisationDTO> getActiveCoursesByUser(Integer userId, boolean isSysadmin, int page, int size,
+	    String searchString) {
+
+	final String GET_ALL_ACTIVE_COURSE_IDS = "SELECT o.organisationId, o.name FROM Organisation o"
+		+ " WHERE o.organisationType.organisationTypeId = " + OrganisationType.COURSE_TYPE
+		+ " AND o.organisationState.organisationStateId = " + OrganisationState.ACTIVE
+		+ " AND (o.name LIKE CONCAT('%', :searchString, '%')) ORDER BY o.name";
+
+	final String GET_ACTIVE_COURSE_IDS_BY_USER = "SELECT uo.organisation.organisationId, uo.organisation.name"
+	    + " FROM UserOrganisation uo "
+	    + " WHERE uo.organisation.organisationType.organisationTypeId = " + OrganisationType.COURSE_TYPE
+	    + " AND uo.organisation.organisationState.organisationStateId = " + OrganisationState.ACTIVE
+	    + " AND uo.user.userId = :userId "
+	    + " AND (uo.organisation.name LIKE CONCAT('%', :searchString, '%')) ORDER BY uo.organisation.name";
+	
+	String queryStr = isSysadmin ? GET_ALL_ACTIVE_COURSE_IDS : GET_ACTIVE_COURSE_IDS_BY_USER;
+	Query query = getSession().createQuery(queryStr);
+	// support for custom search from a toolbar
+	searchString = searchString == null ? "" : searchString;
+	query.setString("searchString", searchString);
+	if (!isSysadmin) {
+	    query.setInteger("userId", userId);
+	}
+	query.setFirstResult(page * size);
+	query.setMaxResults(size);
+	List<Object[]> list = query.list();
+	
+	List<OrganisationDTO> orgDtos = new ArrayList<OrganisationDTO>();
+	if (list != null && list.size() > 0) {
+	    for (Object[] element : list) {
+
+		Integer orgId = ((Number) element[0]).intValue();
+		String name = (String) element[1];
+
+		OrganisationDTO orgDto = new OrganisationDTO(orgId, name);
+		orgDtos.add(orgDto);
+	    }
+
+	}
+
+	return orgDtos;
     }
+    
+    @SuppressWarnings("unchecked")
+    @Override
+    public int getCountActiveCoursesByUser(Integer userId, boolean isSysadmin, String searchString) {
 
+	final String GET_ALL_ACTIVE_COURSE_IDS = "SELECT COUNT(o) FROM Organisation o"
+		+ " WHERE o.organisationType.organisationTypeId = " + OrganisationType.COURSE_TYPE
+		+ " AND o.organisationState.organisationStateId = " + OrganisationState.ACTIVE
+		+ " AND (o.name LIKE CONCAT('%', :searchString, '%'))";
+
+	final String GET_ACTIVE_COURSE_IDS_BY_USER = "SELECT COUNT(uo)" + " FROM UserOrganisation uo "
+		+ " WHERE uo.organisation.organisationType.organisationTypeId = " + OrganisationType.COURSE_TYPE
+		+ " AND uo.organisation.organisationState.organisationStateId = " + OrganisationState.ACTIVE
+		+ " AND uo.user.userId = :userId " + " AND (uo.organisation.name LIKE CONCAT('%', :searchString, '%'))";
+
+	String queryStr = isSysadmin ? GET_ALL_ACTIVE_COURSE_IDS : GET_ACTIVE_COURSE_IDS_BY_USER;
+	Query query = getSession().createQuery(queryStr);
+	// support for custom search from a toolbar
+	searchString = searchString == null ? "" : searchString;
+	query.setString("searchString", searchString);
+	if (!isSysadmin) {
+	    query.setInteger("userId", userId);
+	}
+
+	return ((Number) query.uniqueResult()).intValue();
+    }
+
     @SuppressWarnings("unchecked")
     @Override
     public List<Organisation> getPagedCourses(Integer parentOrgId, Integer typeId, Integer stateId, int page, int size,
Fisheye: Tag 1.2.2.3 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/CollapsedOrgDTO.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java,v
diff -u -r1.11.24.3 -r1.11.24.4
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java	11 May 2016 07:07:29 -0000	1.11.24.3
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/OrganisationDTO.java	24 Oct 2016 14:55:35 -0000	1.11.24.4
@@ -45,6 +45,14 @@
 
     public OrganisationDTO() {
     }
+    
+    public OrganisationDTO(Integer organisationID, String name) {
+	super();
+	this.organisationID = organisationID;
+	this.name = name;
+	this.roleNames = new Vector<String>();
+	this.nodes = new Vector<OrganisationDTO>();
+    }
 
     public OrganisationDTO(Integer organisationID, Integer parentID, String name, String description,
 	    Integer organisationTypeId) {
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java,v
diff -u -r1.65.2.10 -r1.65.2.11
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	11 May 2016 07:07:27 -0000	1.65.2.10
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	24 Oct 2016 14:55:36 -0000	1.65.2.11
@@ -38,6 +38,7 @@
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.UserOrganisation;
+import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.dto.UserManageBean;
 
@@ -367,8 +368,11 @@
      */
     int getCountUsers(String searchString);
 
-    List getActiveCourseIdsByUser(Integer userId, boolean isSysadmin);
+    List<OrganisationDTO> getActiveCoursesByUser(Integer userId, boolean isSysadmin, int page, int size,
+	    String searchString);
 
+    int getCountActiveCoursesByUser(Integer userId, boolean isSysadmin, String searchString);
+
     /**
      * Search users across login, first name, last name and email fields using the search term. Filters out disabled
      * users.
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java,v
diff -u -r1.115.2.17 -r1.115.2.18
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	27 Sep 2016 06:22:54 -0000	1.115.2.17
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	24 Oct 2016 14:55:35 -0000	1.115.2.18
@@ -26,7 +26,6 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -56,10 +55,9 @@
 import org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IRoleDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IUserOrganisationDAO;
-import org.lamsfoundation.lams.usermanagement.dto.CollapsedOrgDTO;
+import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO;
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.dto.UserManageBean;
-import org.lamsfoundation.lams.usermanagement.util.CollapsedOrgDTOComparator;
 import org.lamsfoundation.lams.util.Configuration;
 import org.lamsfoundation.lams.util.ConfigurationKeys;
 import org.lamsfoundation.lams.util.HashUtil;
@@ -879,35 +877,14 @@
     }
 
     @Override
-    public List getActiveCourseIdsByUser(Integer userId, boolean isSysadmin) {
-	List list = organisationDAO.getActiveCourseIdsByUser(userId, isSysadmin);
-	return populateCollapsedOrgDTOs(list, isSysadmin);
+    public List<OrganisationDTO> getActiveCoursesByUser(Integer userId, boolean isSysadmin, int page, int size,
+	    String searchString) {
+	return organisationDAO.getActiveCoursesByUser(userId, isSysadmin, page, size, searchString);
     }
-
-    private List populateCollapsedOrgDTOs(List list, boolean isSysadmin) {
-	ArrayList<CollapsedOrgDTO> dtoList = new ArrayList<CollapsedOrgDTO>();
-	for (Object obj : list) {
-	    // sysadmins get all orgs collapsed; saves storing boolean for every
-	    // org,
-	    // and saves loading time for the sysadmin
-	    if (isSysadmin) {
-		Organisation org = (Organisation) findById(Organisation.class, (Integer) obj);
-		dtoList.add(new CollapsedOrgDTO((Integer) obj, org.getName(), Boolean.TRUE));
-
-	    } else {
-		Object[] array = (Object[]) obj;
-		if (array.length > 1) {
-		    Organisation org = (Organisation) findById(Organisation.class, (Integer) array[0]);
-		    if (array[1] != null) {
-			dtoList.add(new CollapsedOrgDTO((Integer) array[0], org.getName(), (Boolean) array[1]));
-		    } else {
-			dtoList.add(new CollapsedOrgDTO((Integer) array[0], org.getName(), Boolean.FALSE));
-		    }
-		}
-	    }
-	}
-	Collections.sort(dtoList, new CollapsedOrgDTOComparator());
-	return dtoList;
+    
+    @Override
+    public int getCountActiveCoursesByUser(Integer userId, boolean isSysadmin, String searchString) {
+	return organisationDAO.getCountActiveCoursesByUser(userId, isSysadmin, searchString);
     }
 
     @Override
Fisheye: Tag 1.1.2.3 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/usermanagement/util/CollapsedOrgDTOComparator.java'.
Fisheye: No comparison available.  Pass `N' to diff?