Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -rc33d82bf97152099b7a309a156ec2707239b622c -r353fe07604639c2166ed68fbf832810959f3f3cf
Binary files differ
Index: lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
===================================================================
diff -u -rc33d82bf97152099b7a309a156ec2707239b622c -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision c33d82bf97152099b7a309a156ec2707239b622c)
+++ lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java	(.../DisplayGroupAction.java)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -115,6 +115,10 @@
 		request.setAttribute("tools",
 			getLearningDesignService().getToolDTOs(false, false, request.getRemoteUser()));
 	    }
+	    
+	    //set whether organisation is favorite
+	    boolean isFavorite = service.isOrganisationFavorite(orgId, user.getUserId());
+	    iob.setFavorite(isFavorite);
 	}
 
 	return mapping.findForward("group");
Index: lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
===================================================================
diff -u -rc33d82bf97152099b7a309a156ec2707239b622c -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision c33d82bf97152099b7a309a156ec2707239b622c)
+++ lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(.../IndexAction.java)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -43,6 +43,7 @@
 import org.apache.tomcat.util.json.JSONObject;
 import org.lamsfoundation.lams.config.Registration;
 import org.lamsfoundation.lams.index.IndexLinkBean;
+import org.lamsfoundation.lams.usermanagement.Organisation;
 import org.lamsfoundation.lams.usermanagement.Role;
 import org.lamsfoundation.lams.usermanagement.User;
 import org.lamsfoundation.lams.usermanagement.dto.OrganisationDTO;
@@ -123,6 +124,9 @@
 	if (reg != null) {
 	    request.setAttribute("lamsCommunityEnabled", reg.isEnableLamsCommunityIntegration());
 	}
+	
+	List<Organisation> favoriteOrganisations = userManagementService.getFavoriteOrganisationsByUser(userDTO.getUserID());
+	request.setAttribute("favoriteOrganisations", favoriteOrganisations);
 
 	return mapping.findForward("main");
     }
@@ -159,7 +163,7 @@
     }
 
     /**
-     * Returns list of organisations for .
+     * Returns list of organisations for user. Used by offcanvas tablesorter on main.jsp.
      */
     public ActionForward getOrgs(ActionMapping mapping, ActionForm form, HttpServletRequest request,
 	    HttpServletResponse res) throws IOException, ServletException, JSONException {
@@ -206,7 +210,53 @@
 	res.getWriter().print(new String(responcedata.toString()));
 	return null;
     }
+    
+    /**
+     * Toggles whether organisation is marked as favorite.
+     */
+    public ActionForward toggleFavoriteOrganisation(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse res) throws IOException, ServletException {
+	getUserManagementService();
+	Integer orgId = WebUtil.readIntParam(request, "orgId", false);
+	Integer userId = getUserId();
 
+	if (orgId != null) {
+	    userManagementService.toggleOrganisationFavorite(orgId, userId);
+	}
+
+	List<Organisation> favoriteOrganisations = userManagementService.getFavoriteOrganisationsByUser(userId);
+	request.setAttribute("favoriteOrganisations", favoriteOrganisations);
+	
+	String activeOrgId = request.getParameter("activeOrgId");
+	request.setAttribute("activeOrgId", activeOrgId);
+
+	return mapping.findForward("favoriteOrganisations");
+    }
+    
+    /**
+     * Saves to DB last visited organisation. It's required for displaying some org on main.jsp next time user logs in.
+     */
+    public ActionForward storeLastVisitedOrganisation(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+	    HttpServletResponse res) throws IOException, ServletException {
+	getUserManagementService();
+	Integer lastVisitedOrganisationId = WebUtil.readIntParam(request, "orgId", false);
+
+	//saves to DB last visited organisation
+	if (lastVisitedOrganisationId != null) {
+	    User user = userManagementService.getUserByLogin(request.getRemoteUser());
+	    user.setLastVisitedOrganisationId(lastVisitedOrganisationId);
+	    userManagementService.save(user);
+	}
+
+	return null;
+    }
+    
+    private Integer getUserId() {
+	HttpSession ss = SessionManager.getSession();
+	UserDTO learner = (UserDTO) ss.getAttribute(AttributeNames.USER);
+	return learner != null ? learner.getUserID() : null;
+    }
+
     private IUserManagementService getUserManagementService() {
 	if (userManagementService == null) {
 	    WebApplicationContext ctx = WebApplicationContextUtils
Fisheye: Tag 353fe07604639c2166ed68fbf832810959f3f3cf refers to a dead (removed) revision in file `lams_central/src/java/org/lamsfoundation/lams/web/UpdateCollapsedGroupServlet.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/WEB-INF/struts-config.xml
===================================================================
diff -u -rc33d82bf97152099b7a309a156ec2707239b622c -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_central/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision c33d82bf97152099b7a309a156ec2707239b622c)
+++ lams_central/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -130,6 +130,11 @@
         redirect="false"
       />
       <forward
+        name="favoriteOrganisations"
+        path="/favoriteOrganisations.jsp"
+        redirect="false"
+      />      
+      <forward
         name="profile"
         path="/profile.do?method=view"
         redirect="false"
Index: lams_central/web/WEB-INF/web.xml
===================================================================
diff -u -r6c25dd12df73e7840338036b707f0d461c4bdcad -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 6c25dd12df73e7840338036b707f0d461c4bdcad)
+++ lams_central/web/WEB-INF/web.xml	(.../web.xml)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -182,12 +182,6 @@
 	</listener>
 
 	<servlet>
-		<servlet-name>updateCollapsedGroup</servlet-name>
-		<servlet-class>org.lamsfoundation.lams.web.UpdateCollapsedGroupServlet
-		</servlet-class>
-	</servlet>
-
-	<servlet>
 		<servlet-name>GetRecordingServlet</servlet-name>
 		<servlet-class>org.lamsfoundation.lams.webservice.GetRecordingServlet
 		</servlet-class>
@@ -465,10 +459,6 @@
 	</servlet-mapping>
 
 	<servlet-mapping>
-		<servlet-name>updateCollapsedGroup</servlet-name>
-		<url-pattern>/servlet/updateCollapsedGroup</url-pattern>
-	</servlet-mapping>
-	<servlet-mapping>
 		<servlet-name>GetRecordingServlet</servlet-name>
 		<url-pattern>/GetRecording</url-pattern>
 	</servlet-mapping>
Fisheye: Tag 353fe07604639c2166ed68fbf832810959f3f3cf refers to a dead (removed) revision in file `lams_central/web/css/index.css'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_central/web/css/main.css
===================================================================
diff -u -rff04fcd49940d68f8206489d3623716706a5e240 -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_central/web/css/main.css	(.../main.css)	(revision ff04fcd49940d68f8206489d3623716706a5e240)
+++ lams_central/web/css/main.css	(.../main.css)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -9,7 +9,7 @@
 }
 #offcanvas {
 	position: fixed;
-	width: 300px;
+	width: 220px;
 	z-index: 10;
 	height: 100%;
 	background: #2f4050;
@@ -29,7 +29,7 @@
 }
 #page-wrapper {
 	min-height: 1000px;
-	margin: 0 0 0 300px;
+	margin: 0 0 0 220px;
 	padding: 10px 20px 0px;
 }
 .offcanvas-hidden #offcanvas {
@@ -62,6 +62,15 @@
 	}
 }
 
+.content {
+	/*background: #fff;*/
+	padding: 7px 10px;
+	background: #fff;
+}
+#org-container {
+	padding: 17px 10px 17px 25px;
+}
+
 /*FOOTER*/
 footer {
     background: #fff;
@@ -79,13 +88,17 @@
 }
 
 /*OFFCANVAS BAR*/
-#offcanvas-menu > li > a, .tablesorter a {
+#favorite-organisations {
+    border-top: 1px solid rgba(255, 255, 255, 0.16);
+	border-bottom: 1px solid rgba(255, 255, 255, 0.16);
+}
+#favorite-organisations > li > a, .tablesorter a {
     color: #a7b1c2;
     font-weight: 400;
     padding: 14px 20px 14px 25px;
 }
-#offcanvas-menu > li > a:hover,
-#offcanvas-menu > li > a:focus,
+#favorite-organisations > li > a:hover,
+#favorite-organisations > li > a:focus,
 .pagesize:hover,
 .tablesorter a:hover,
 .tablesorter a:focus {
@@ -109,22 +122,20 @@
     border-right: 10px solid #19aa8d;
     background: #293846;
 }
-li.offcanvas-logo {
+.offcanvas-logo {
 	padding: 20px 0px 0px 25px;
     background-color: #293846;
 }
-img.offcanvas-logo{
+.offcanvas-logo img{
 	width: 100px;
 }
-li.offcanvas-header {
-	padding: 10px 0px 0px 0px;
+.offcanvas-header {
+	padding: 15px 0px 0px 0px;
     background-color: #293846;
-    border-bottom: 1px solid rgba(255, 255, 255, 0.16);
 }
-li.offcanvas-search {
-	padding: 20px 19px 10px;
+.offcanvas-search {
+	padding: 15px 19px 15px;
 	margin-bottom: 0;
-	border-top: 1px solid rgba(255, 255, 255, 0.16);
 }
 .offcanvas-search .form-control {
     box-shadow: inset 0 1px 0px rgba(208, 206, 206, 0.25);
@@ -154,12 +165,15 @@
 .ts-pager .btn{
 	color: #2f4050;
     background-color: #a7b1c2;
+    padding: 2px 5px;
+    line-height: 1;
 }
 .tablesorter tfoot i {
 	font-size: 11px;
 }
 .tablesorter tfoot th {
-	    background-color: #25323E !important;
+	background-color: #293846 !important;
+	padding: 10px 0;
 }
 
 .pagesize {
@@ -168,7 +182,6 @@
     cursor: pointer;
 }
 
-/*ICON*/
 .icon-remove {
 	cursor: pointer;
 	position: absolute;
@@ -238,7 +251,8 @@
     margin: 2px 2px 0;
     width: 98% !important;
 }
-/*HEADER links*/
+
+/*TOP HEADER LINKS*/
 .offcanvas-toggle-wrapper:hover, ul.dropdown-usermenu li a:focus, ul.dropdown-usermenu li a:hover, .top_nav .nav > li > a:hover, .top_nav .nav .open > a, .top_nav .nav .open > a:focus, .top_nav .nav .open > a:hover {
     background: #D9DEE4;
 }
@@ -300,17 +314,232 @@
 	border-radius: 10px;
 }
 
-/*MAIN*/
-.content {
-	/*background: #fff;*/
-	padding: 7px 10px;
-	background: #fff;
+/*DIALOGS*/
+.dialogContainer {
+	-webkit-overflow-scrolling: touch !important;
 }
-.container-turned-off-lams {
-	    background: #fff;
-    padding: 7px 10px;
+
+.dialogContainer .modal-body {
+	height : 100%;
+	max-height: calc(100% - 60px);
+	padding: 0;
 }
-/*OLDER STUFF*/
-.orgTab {
-	padding: 10px 0 10px 15px;
+
+.dialogContainer iframe {
+	width: 100%;
+	height: 100%;
+	border: none;
+}
+
+.dialogContainer button {
+	cursor: pointer;
+}
+.dialogContainer button:focus {
+	outline: none;
+}
+
+.dialogContainer button .fa {
+  font-size: 16px;
+  margin-left: 10px;
+}
+
+.dialogContainer .ui-draggable .modal-header {
+	cursor: move;
+}
+
+#dialogMinContainer {
+	height: 35px;
+	bottom: 1px;
+	left: 1px;
+	position: fixed;
+	right: 1px;
+	z-index: 9999;
+}
+
+.dialogMin {
+	overflow: hidden !important;
+	padding: 0 !important;
+	margin: 0;
+	float: left;
+	position: static !important;
+}
+
+.dialogMin .modal-title {
+	white-space: nowrap;
+	overflow: hidden;
+}
+
+.dialogMin .modal-dialog {
+	left: 0 !important;
+	top: 0 !important;
+}
+
+.dialogMin .modal-dialog, .dialogMin .modal-content {
+	width: 250px !important;
+	height: 35px !important;
+	margin: 0 !important;
+	padding: 0 !important;
+}
+
+.dialogMin .modal-header {
+	height: 100%;
+	margin: 0 !important;
+	padding: 3px 5px !important;
+}
+
+.ui-dialog .ui-dialog-content {
+	padding: 3px;
+}
+
+#dialogPrivateNotifications table tr:first-child td {
+	font-weight: bold;
+	text-align: center;
+}
+
+#dialogPrivateNotifications td.notificationsReadCell {
+	font-size: 16px;
+	width: 30px;
+	text-align: center;
+}
+
+#dialogPrivateNotifications td.notificationsPendingCell {
+	font-weight: bold;
+}
+
+#dialogPrivateNotifications td.notificationsClickableCell:hover {
+	cursor: pointer;
+	border-color: #9be0f9;
+	background-color: #F0F8FF;
+	/* CSS3 glow effect: */
+	-moz-border-radius: 6px;
+	-webkit-border-radius: 6px;
+	border-radius: 6px;
+	-moz-box-shadow: 0 0 5px #A6E5FD;
+	-webkit-box-shadow: 0 0 5px #A6E5FD;
+	box-shadow: 0 0 5px #A6E5FD;
+}
+
+/* GROUP CONTAINER */
+.j-single-lesson {
+	list-style: none;
+	margin: 6px;
+	padding: 3px 3px 3px 10px;
+	position: relative;
+}
+
+.j-single-lesson:hover {
+	border-color: #9be0f9;
+	background-color: #F0F8FF;
+	display: block;
+	/* CSS3 glow effect: */
+	-moz-border-radius: 3px;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	-moz-box-shadow: 0 0 5px #A6E5FD;
+	-webkit-box-shadow: 0 0 5px #A6E5FD;
+	box-shadow: 0 0 5px #A6E5FD;
+}
+
+.j-single-lesson:hover .lesson-actions {
+	opacity: 1;
+	filter: alpha(opacity = 100); /* msie */
+	display: block;
+}
+
+.j-single-lesson:hover .mycourses-monitor-img {
+}
+
+.j-single-lesson:hover .mycourses-mark-img {
+}
+
+.j-single-lesson:hover .mycourses-notifications-img {
+}
+
+.j-single-lesson:hover .mycourses-conditions-img {
+}
+
+.j-single-lesson:hover .mycourses-removelesson-img {
+}
+
+.j-single-lesson:hover .mycourses-move-img {
+	background: url('../images/css/arrow_move.png') no-repeat 0 0px;
+}
+
+.lesson-actions {
+	float: right;
+	font-size: 1.2em;
+	opacity: 0.3;
+	filter: alpha(opacity = 10); /* msie */
+}
+
+.lesson-actions a {
+	border-bottom: none;	
+}
+
+.child-org-name {
+	float: left;
+	padding-top: 5px;
+}
+
+.split-ui-button+ul {
+	z-index: 1;
+}
+
+.split-ui-button+ul li {
+	list-style-type: none;
+}
+
+.split-ui-button+ul li a {
+	border: none;
+}
+
+.split-ui-button div:first-child {
+	margin-right: -0.4em;
+}
+
+.split-ui-button + ul span {
+	color: #999;
+}
+
+.ui-button, .split-ui-button div {
+	font-size: 12px !important;
+	font-weight: normal !important;
+}
+
+a.sorting {
+	border-bottom: none;
+	cursor: pointer;
+}
+
+.lesson-table {
+	margin: 0 auto;
+	width: 100%;
+}
+
+.subgroup-lesson-table {
+	padding-top: 30px;
+}
+
+.course-right-buttons {
+	padding-right: 20px;
+}
+
+.group-name {
+	margin-top: 20px;
+	margin-left: 30px;
+}
+
+.group-name p {
+	padding-top: 0px;
+	margin-bottom: 0px;
+	padding-left: 0px;
+	margin-left: 0px;
+}
+
+.group-name strong {
+	color: #666;
+}
+
+.course-header i{
+	font-size: 16px;
 }
\ No newline at end of file
Index: lams_central/web/editprofile.jsp
===================================================================
diff -u -rc33d82bf97152099b7a309a156ec2707239b622c -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision c33d82bf97152099b7a309a156ec2707239b622c)
+++ lams_central/web/editprofile.jsp	(.../editprofile.jsp)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -17,7 +17,7 @@
 	
 	<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/profile.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function () {
 			//update dialog's height and title
Index: lams_central/web/favoriteOrganisations.jsp
===================================================================
diff -u
--- lams_central/web/favoriteOrganisations.jsp	(revision 0)
+++ lams_central/web/favoriteOrganisations.jsp	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -0,0 +1,25 @@
+<%@ page contentType="text/html; charset=utf-8" language="java"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-function" prefix="fn"%>
+<%@ taglib uri="tags-tiles" prefix="tiles" %>
+
+<div id="favorite-organisations-container">
+
+	<c:if test="${not empty favoriteOrganisations}">
+		<ul class="nav" id="favorite-organisations">
+			<c:forEach var="favoriteOrganisation" items="${favoriteOrganisations}">
+				<li id="favorite-li-${favoriteOrganisation.organisationId}" 
+						<c:if test="${favoriteOrganisation.organisationId == activeOrgId}">class="active"</c:if>>
+					<a data-id="${favoriteOrganisation.organisationId}" href="#nogo" 
+							onClick="javascript:selectOrganisation(${favoriteOrganisation.organisationId})">
+						${favoriteOrganisation.name}
+						<span class="pull-right"><i class="fa fa-star"></i></span>
+					</a>
+				</li>
+			</c:forEach>
+		</ul>
+	</c:if>
+            
+</div>
\ No newline at end of file
Index: lams_central/web/group.jsp
===================================================================
diff -u -rb3ac8b06b9377eac584d8aa906d615cb31a808b8 -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_central/web/group.jsp	(.../group.jsp)	(revision b3ac8b06b9377eac584d8aa906d615cb31a808b8)
+++ lams_central/web/group.jsp	(.../group.jsp)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -5,13 +5,25 @@
 <%@ taglib uri="tags-lams" prefix="lams"%>
 
 <div class="course-header" style="padding-bottom: 5px; border-bottom: 1px solid #eee;">
-<span class="lead"><strong><c:out value="${orgBean.name}" /></strong></span>
-<!-- Group header -->
-<c:set var="org" value="${orgBean}" />
-<%@ include file="groupHeader.jsp"%>
+	<span class="lead">
+		<strong><c:out value="${orgBean.name}" /></strong>
+	</span>
+	<a href="#" onclick="javascript:toggleFavoriteOrganisation(${orgBean.id});">
+		<c:choose>
+			<c:when test="${orgBean.favorite}">
+				<i id="favorite-star" class="fa fa-star" title="<fmt:message key='label.remove.org.favorite'/>"></i>
+			</c:when>
+			<c:otherwise>
+				<i id="favorite-star" class="fa fa-star-o" title="<fmt:message key='label.mark.org.favorite'/>"></i>
+			</c:otherwise>
+		</c:choose>
+	</a>
+	
+	<!-- Group header -->
+	<c:set var="org" value="${orgBean}" />
+	<%@ include file="groupHeader.jsp"%>
 </div>
 
-
 <!-- Group contents -->
 <div class="j-course-contents">
 	<div class="sequence-list">
@@ -40,12 +52,11 @@
 	</c:forEach>
 </div>
 
-
-
 <c:if test="${orgBean.allowSorting}">
 	<div class="pull-right">
-		<a class="sorting text-muted" href="#" onClick="javascript:makeOrgSortable(${orgBean.id})" title="<fmt:message key="label.enable.lesson.sorting"/>">
-			<i class="fa fa-sort"></i></a>
+		<a class="sorting text-muted" href="#" onClick="javascript:makeOrgSortable()" title="<fmt:message key="label.enable.lesson.sorting"/>">
+			<i class="fa fa-sort"></i>
+		</a>
 	</div>
 </c:if>
 
Index: lams_central/web/includes/javascript/groupDisplay.js
===================================================================
diff -u -r85c430d42fb0158e724933e655cc0230ae201f18 -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_central/web/includes/javascript/groupDisplay.js	(.../groupDisplay.js)	(revision 85c430d42fb0158e724933e655cc0230ae201f18)
+++ lams_central/web/includes/javascript/groupDisplay.js	(.../groupDisplay.js)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -1,685 +1,16 @@
-function initMainPage() {
-	initButtons();
-	
-	//in case active course is not yet chosen by user, select the fist one from the list
-	
-			
-	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();
+/**
+* Called from within Course Groups dialog, it saves groups and loads grouping
+* page.
+*/
+function saveOrgGroups() {
+	var groupsSaved = $('#dialogOrgGroup iframe')[0].contentWindow.saveGroups();
+	if (groupsSaved) {
+		showOrgGroupDialogContents(null, 460, 460,
+			LAMS_URL + 'OrganisationGroup.do?method=viewGroupings&organisationID='
+			         + $('#dialogOrgGroup').dialog('option', 'orgID'));
 	}
-	
-	refreshPrivateNotificationCount();
-			}
-	
-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;
-
-	$(".ui-button", container).button();
-	$(".split-ui-button", container).each(function(){
-		var buttonContainer = $(this),
-			buttons = buttonContainer.children();
-		
-		buttons.first().button()
-			   .next().button({
-			text : false,
-			icons : {
-				primary : "ui-icon-triangle-1-s"
-			}
-		});
-		
-		buttonContainer.buttonset().next().hide().menu();
-		
-		buttons.each(function(){
-			var button = $(this);
-			if (!button.attr('onclick')) {
-				button.click(function() {
-					var menu = $(this).parent().next().show().position({
-						my : "right top",
-						at : "right bottom",
-						of : $(this).parent()
-					});
-					$(document).one("click", function() {
-						menu.hide();
-					});
-					return false;
-				});
-			}
-		});
-	});
-}
-
-
-function makeOrgSortable(orgId) {
-	var org = jQuery("div.orgTab[id$='-org-" + orgId + "']");
-	$(".lesson-table", org).each(function() {
-		makeSortable(this);
-	});
-	
-	$("a.sorting", org).attr({
-		"onClick" : null,
-		"title"   : LABELS.SORTING_DISABLE
-	}).off('click').click(function(){
-		makeOrgUnsortable(orgId);
-	}).find("img")
-	  .attr("src", "images/sorting_enabled.gif");
-	
-}
-
-function makeOrgUnsortable(orgId) {
-	var org = jQuery("div.orgTab[id$='-org-" + orgId + "']");
-	$(".lesson-table", org).each(function() {
-		$(this).sortable('destroy');
-	});
-	
-	$("a.sorting", org).attr({
-		"onClick" : null,
-		"title"   : LABELS.SORTING_ENABLE
-	}).off('click').click(function(){
-		makeOrgSortable(orgId);
-	}).find("img")
-	  .attr("src", "images/sorting_disabled.gif");
-}
-
-function makeSortable(element) {
-	$(element).sortable({
-		axis : "y",
-		delay : 100,
-		tolerance : 'pointer',
-		cursor : 'n-resize',
-		helper : function(e, tr) {
-			var $originals = tr.children();
-			var $helper = tr.clone();
-			$helper.children().each(function(index) {
-				// Set helper cell sizes to match the original
-				// sizes
-				$(this).width($originals.eq(index).width())
-			});
-			return $helper;
-		},
-		forceHelperSize : true,
-		forcePlaceholderSize : true,
-		containment : 'parent',
-		stop : function() {
-			var ids = $(this).sortable('toArray');
-			
-			var jLessonsId = $(this).attr("id");
-			var dashIndex = jLessonsId.indexOf("-");
-			var orgId = (dashIndex > 0 ? jLessonsId.substring(0,
-					dashIndex) : jLessonsId);
-
-			$.ajax({
-				url : "servlet/saveLessonOrder",
-				data : {
-					orgId : orgId,
-					ids : ids.join(",")
-				},
-				error : function() {
-					loadOrganisation();
-				}
-			});
-		}
-	}).disableSelection();
-}
-
-
-
-function showMonitorLessonDialog(lessonID) {
-	var id = "dialogMonitorLesson" + lessonID,
-		dialog = showDialog(id, {
-			'data' : {
-				'lessonID' : lessonID
-			},
-			'autoOpen' : false,
-			'height' : 600,
-			'width' : 1024,
-			'title' : LABELS.MONITORING_TITLE,
-			'open' : function() {
-				// load contents after opening the dialog
-				$('iframe', this).attr('src', LAMS_URL
-					+ 'home.do?method=monitorLesson&lessonID='
-					+ $(this).data('lessonID'));
-			},
-
-		}, true);
-	
-	// if it was just created
-	if (dialog) {
-		// tell the dialog contents that it was resized
-		$('.modal-content', dialog).on('resizestop', resizeSequenceCanvas);
-		// initial resize
-		$('iframe', dialog).load(resizeSequenceCanvas);
-		
-		dialog.modal('show');
-	}
-}
-
-function resizeSequenceCanvas(){
-	var body = $('.modal-body'),
-		frame = $('iframe', body);
-	if (frame.length > 0) {
-		var win = frame[0].contentWindow || frame[0].contentDocument;
-		if (win.resizeSequenceCanvas) {
-			win.resizeSequenceCanvas(body.width(), body.height());
-		}
-	}
-}
-
-
-function showAddLessonDialog(orgID) {
-	showDialog("dialogAddLesson", {
-		'data' : {
-			'orgID' : orgID
-		},
-		'modal' : true,
-		'height' : 740,
-		'width' : 'auto',
-		'title' : LABELS.ADD_LESSON_TITLE,
-		'open' : function() {
-			var dialog = $(this);
-			// load contents after opening the dialog
-			$('iframe', dialog)
-					.attr('src', LAMS_URL
-						+ 'home.do?method=addLesson&organisationID='
-						+ dialog.data('orgID'));
-			$(this).css("maxWidth", "850px").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 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' : {
-			'orgID' : orgID
-		},
-		'modal' : true,
-		'height' : 460,
-		'width' : 'auto',
-		'title' : LABELS.COURSE_GROUPS_TITLE,
-		'open' : function() {
-			// load contents after opening the dialog
-			$('iframe', this)
-					.attr('src', LAMS_URL
-						+ 'OrganisationGroup.do?method=viewGroupings&organisationID='
-						+ $(this).data('orgID'));
-			$(this).css("maxWidth", "460px").css("margin", "auto");
-
-		}
-	}, true);
-}
-
-function showAddSingleActivityLessonDialog(orgID, toolID, learningLibraryID) {
-	showDialog("dialogAddSingleActivityLesson", {
-		'data' : {
-			'orgID' : orgID,
-			'toolID' : toolID,
-			'learningLibraryID' : learningLibraryID
-		},
-		'modal' : true,
-		'height' : 600,
-		'width' : 'auto',
-		'title' : LABELS.SINGLE_ACTIVITY_LESSON_TITLE,
-		'open' : function() {
-			var dialog = $(this),
-				toolID = dialog.data('toolID');
-			$(this).css("maxWidth", "850px").css("margin", "auto");
-			$.ajax({
-				async : false,
-				cache : false,
-				url : LAMS_URL + "authoring/author.do",
-				dataType : 'json',
-				data : {
-					'method' : 'createToolContent',
-					'toolID' : toolID
-				},
-				success : function(response) {
-					dialog.data({
-						'toolContentID' :  response.toolContentID,
-						'contentFolderID' : response.contentFolderID
-					});
-
-					$('iframe', dialog).load(function(){
-						if ($(this).contents().find('span.editForm').length > 0){
-							closeAddSingleActivityLessonDialog('save');
-						}
-					})
-					.attr('src', response.authorURL + '&notifyCloseURL='
-						+ encodeURIComponent(LAMS_URL
-						+ 'dialogCloser.jsp?function=closeAddSingleActivityLessonDialog&noopener=true'));
-				}
-			});
-		}
-	}, true);
-}
-
-
-function showNotificationsDialog(orgID, lessonID) {
-	var id = "dialogNotifications" + (lessonID ? "Lesson" + lessonID : "Org" + orgID);
-	showDialog(id, {
-		'data' : {
-			'orgID' : orgID,
-			'lessonID' : lessonID
-		},
-		'height' : 650,
-		'width' : 'auto',
-		'title' : LABELS.EMAIL_NOTIFICATIONS_TITLE,
-		'open' : function() {
-			var dialog = $(this),
-				lessonID = dialog.data('lessonID');
-			// if lesson ID is given, use lesson view; otherwise use course view
-			if (lessonID) {
-				// load contents after opening the dialog
-				$('iframe', dialog).attr('src', LAMS_URL
-					+ 'monitoring/emailNotifications.do?method=getLessonView&lessonID='
-					+ lessonID);
-			} else {
-				$('iframe', dialog).attr('src', LAMS_URL
-					+ 'monitoring/emailNotifications.do?method=getCourseView&organisationID='
-					+ orgID);
-			}
-			$(this).css("maxWidth", "800px").css("margin", "auto");
-		}
-	}, true);
-}
-
-
-function showPrivateNotificationsDialog(){
-	showDialog("dialogPrivateNotifications", {
-		'height' : 470,
-		'width' : 600,
-		'title' : LABELS.PRIVATE_NOTIFICATIONS_TITLE,
-		'close' : function(){
-			refreshPrivateNotificationCount();
-			// completely delete the dialog
-			$(this).remove();
-		},
-		'open' : function() {
-			// build the table from the scratch
-			var dialog = $(this),
-				table = $('<table />').appendTo(dialog),
-				// table header
-				headerRow = $('<tr />').appendTo(table);
-			$('<td />').text(LABELS.PRIVATE_NOTIFICATIONS_MESSAGES).appendTo(headerRow);
-			// click it to mark all notifications as read
-			$('<td class="notificationsClickableCell"/>').text(LABELS.PRIVATE_NOTIFICATIONS_READ)
-														 .attr('title', LABELS.PRIVATE_NOTIFICATIONS_READ_ALL_HINT)
-														 .click(markAllPrivateNotificationsAsRead)
-														 .appendTo(headerRow);
-			$('iframe', dialog).remove();
-			$.ajax({
-				cache : false,
-				url : LAMS_URL + "notification.do",
-				dataType : 'json',
-				data : {
-					'method' : 'getNotificationSubscriptions',
-					// maybe it will change for paging; "offset" param is also available
-					'limit'  : 10
-				},
-				success : function(notifications) {
-					if (!notifications) {
-						return;
-					}
-					
-					// build notification rows one by one
-					$.each(notifications, function(){
-						var notification = this,
-							row = $('<tr />').attr('id', 'subscription-' + notification.subscriptionUid)
-											 .appendTo(table),
-							messageCell = $('<td />').appendTo(row),
-							readCell = $('<td class="notificationsReadCell" />')
-											.appendTo(row);
-						// is it a link?
-						if (notification.message.indexOf('<a ') === 0) {
-							var link = $(notification.message);
-							// make it navigable
-							messageCell.text(link.text()).addClass('notificationsClickableCell').click(function(){
-								if (!readCell.text()) {
-									markPrivateNotificationAsRead(notification.subscriptionUid);
-								}
-								// open in a new tab/window
-								window.open(link.attr('href'), '_blank');
-							});
-						} else {
-							messageCell.text(notification.message);
-						}
-						// was it read already?
-						if (notification.pending) {
-							messageCell.addClass('notificationsPendingCell');
-							readCell.addClass('notificationsClickableCell')
-									.attr('title', LABELS.PRIVATE_NOTIFICATIONS_READ_HINT)
-									.click(function(){
-										markPrivateNotificationAsRead(notification.subscriptionUid);
-									});
-						} else {
-							readCell.html('&#10004;');
-						}
-					});
-				}
-			});
-		}
-	}, true);
-}
-
-function markAllPrivateNotificationsAsRead(){
-	$('#dialogPrivateNotifications tr[id^=subscription-]').each(function(){
-		var row = $(this),
-			read = $('td', row).last().text();
-		if (!read) {
-			markPrivateNotificationAsRead(row.attr('id').split('-')[1]);
-		}
-	});
-}
-
-function markPrivateNotificationAsRead(subscriptionUid){
-	$.ajax({
-		cache : false,
-		url : LAMS_URL + "notification.do",
-		data : {
-			'method' 		  : 'markNotificationAsRead',
-			'subscriptionUid' : subscriptionUid
-		},
-		success : function() {
-			// mark the message as read
-			$('#dialogPrivateNotifications tr#subscription-' + subscriptionUid + ' > td')
-				// message cell
-				.first().removeClass('notificationsPendingCell')
-				// read cell
-				.next().html('&#10004;').removeClass('notificationsClickableCell').attr('title', null).off('click');
-		}
-	});
-}
-
-function refreshPrivateNotificationCount(){
-	$.ajax({
-		cache : false,
-		url : LAMS_URL + "notification.do",
-		dataType : 'text',
-		data : {
-			'method' : 'getPendingNotificationCount'
-		},
-		success : function(count) {
-			$('#notificationsPendingCount').text(count == 0 ? '0' : count);
-		}
-	});
-}
-
-function showGradebookCourseDialog(orgID){
-	var id = "dialoGradebookCourse" + orgID;
-	showDialog(id, {
-		'orgID' : orgID,
-		'height' : 650,
-		'width' : 'auto',
-		'title' : LABELS.GRADEBOOK_COURSE_TITLE,
-		'open' : function() {
-			var orgID = $(this).dialog('option', 'orgID');
-			// load contents after opening the dialog
-			$('iframe', this).attr('src', LAMS_URL
-				+ 'gradebook/gradebookMonitoring.do?dispatch=courseMonitor&organisationID=' + orgID);
-			$(this).css("maxWidth", "850").css("margin", "auto");
-		}
-	}, true);
-}
-
-function showGradebookLessonDialog(lessonID){
-	var id = "dialogGradebookLesson" + lessonID;
-	showDialog(id, {
-		'data' : {
-			'lessonID' : lessonID
-		},
-		'height' : 650,
-		'width' : 'auto',
-		'title' : LABELS.GRADEBOOK_LESSON_TITLE,
-		'open' : function() {
-			var lessonID = $(this).data('lessonID');
-			// load contents after opening the dialog
-			$('iframe', this).attr('src', LAMS_URL + 'gradebook/gradebookMonitoring.do?lessonID=' + lessonID);
-			$(this).css("maxWidth", "850px").css("margin", "auto");
-		}
-	}, true);
-}
-
-function showGradebookLearnerDialog(orgID){
-	var id = "dialogGradebookLearner" + orgID;
-	showDialog(id, {
-		'data'  : {
-			'orgID' : orgID
-		},
-		'height' : 400,
-		'width' : 'auto',
-		'title' : LABELS.GRADEBOOK_LEARNER_TITLE,
-		'open' : function() {
-			var orgID = $(this).data('orgID');
-			// load contents after opening the dialog
-			$('iframe', this).attr('src', LAMS_URL
-				+ 'gradebook/gradebookLearning.do?dispatch=courseLearner&organisationID=' + orgID);
-			$(this).css("maxWidth", "750").css("margin", "auto");
-		}
-	}, true);
-}
-
-function showConditionsDialog(lessonID){
-	var id = "dialogConditions" + lessonID;
-	showDialog(id, {
-		'data' : {
-			'lessonID' : lessonID
-		},
-		'height' : 750,
-		'width' : 'auto',
-		'title' : LABELS.CONDITIONS_TITLE,
-		'open' : function() {
-			var lessonID = $(this).data('lessonID');
-			// load contents after opening the dialog
-			$('iframe', this).attr('src', LAMS_URL
-				+ 'lessonConditions.do?method=getIndexLessonConditions&lsId=' + lessonID);
-			$(this).css("maxWidth", "610px").css("margin", "auto");
-
-		}
-	}, true);
-}
-
-function showSearchLessonDialog(orgID){
-	var id = "dialogSearchLesson" + orgID;
-	showDialog(id, {
-		'data' : {
-			'orgID' : orgID
-		},
-		'height' : 400,
-		'width' : 'auto',
-		'title' : LABELS.SEARCH_LESSON_TITLE,
-		'open' : function() {
-			var orgID = $(this).data('orgID');
-			// load contents after opening the dialog
-			$('iframe', this).attr('src', LAMS_URL
-				+ 'findUserLessons.do?dispatch=getResults&courseID=' + orgID);
-			$(this).css("maxWidth", "830px").css("margin", "auto");
-		}
-	}, true);
-}
-
-
-function showAuthoringDialog(learningDesignID){
-	showDialog('dialogAuthoring', {
-		'height' : Math.max(300, $(window).height() - 40),
-		'width' : 1280,
-		'modal' : false,
-		'title' : LABELS.AUTHORING_TITLE,
-		'beforeClose' : function(){
-			// if LD was modified, ask the user if he really wants to exit
-			var innerLib = $('iframe', this)[0].contentWindow.GeneralLib,
-				// no innerLib means that an exception occured in Authoring
-				// and the interface is not usable anyway
-				canClose = !innerLib || innerLib.canClose() || confirm(LABELS.NAVIGATE_AWAY_CONFIRM);
-			if (canClose) {
-				$('iframe', this).attr('src', null);
-			} else {
-				return false;
-			}
-		},
-		'open' : function() {
-			var url = LAMS_URL + 'authoring/author.do?method=openAuthoring';
-			
-			if (learningDesignID) {
-				url += '&learningDesignID=' + learningDesignID;
-			}
-			
-			// load contents after opening the dialog
-			$('iframe', this).attr('src', url);
-		}
-	}, true);
-}
-
-
-function closeAddSingleActivityLessonDialog(action) {
-	var id = 'dialogAddSingleActivityLesson',
-		dialog = $('#' + id),
-		save = action == 'save';
-	
-	if (save) {
-		$.ajax({
-			async : false,
-			cache : false,
-			url : LAMS_URL + "authoring/author.do",
-			dataType : 'text',
-			data : {
-				'method' : 'createSingleActivityLesson',
-				'organisationID'  : dialog.data('orgID'),
-				'toolID' : dialog.data('toolID'),
-				'toolContentID' : dialog.data('toolContentID'),
-				'contentFolderID' : dialog.data('contentFolderID'),
-				'learningLibraryID' : dialog.data('learningLibraryID')
-			},
-			// create LD SVG
-			success : function(learningDesignID) {
-				// check if the LD was created successfully
-				if (learningDesignID) {
-					var frame = $('iframe', dialog);
-					// disable previous onload handler, set in
-					// showAddSingleActivityLessonDialog()
-					frame.off('load').load(function(){
-						// disable current onload handler as closing the dialog
-						// reloads the iframe
-						frame.off('load');
-						
-						// call svgGenerator.jsp code to store LD SVG on the
-						// server
-						var win = frame[0].contentWindow || frame[0].contentDocument;
-						win.GeneralLib.saveLearningDesignImage();
-						
-						closeDialog(id, true);
-					});
-					// load svgGenerator.jsp to render LD SVG
-					frame.attr('src', LAMS_URL + 'authoring/author.do?method=generateSVG&selectable=false&learningDesignID='
-											   + learningDesignID);
-				}
-			}
-		});
-	} else {
-		closeDialog(id, false);
-	}
-}
-
-
-function closeDialog(id, refresh) {
-	// was the dialog just closed or a lesson removed
-	// if latter, refresh the list
-	if (refresh) {
-		loadOrganisation();
-	}
-	$("#" + id).modal('hide');
-}
-
 function showOrgGroupDialogContents(title, width, height, url) {
 	var id = "dialogOrgGroup",
 		dialog = $('#' + id),
@@ -702,37 +33,4 @@
 			$('iframe', this).attr('src', url);
 		}
 	}, true, exists);
-}
-
-/**
- * Called from within Course Groups dialog, it saves groups and loads grouping
- * page.
- */
-function saveOrgGroups() {
-	var groupsSaved = $('#dialogOrgGroup iframe')[0].contentWindow.saveGroups();
-	if (groupsSaved) {
-		showOrgGroupDialogContents(null, 460, 460,
-			LAMS_URL + 'OrganisationGroup.do?method=viewGroupings&organisationID='
-			         + $('#dialogOrgGroup').dialog('option', 'orgID'));
-	}
-}
-
-function removeLesson(lessonID) {
-	if (confirm(LABELS.REMOVE_LESSON_CONFIRM1)) {
-		if (confirm(LABELS.REMOVE_LESSON_CONFIRM2)) {
-			$.ajax({
-				async : false,
-				url : LAMS_URL + "monitoring/monitoring.do",
-				data : "method=removeLesson&lessonID=" + lessonID,
-				type : "POST",
-				success : function(json) {
-					if (json.removeLesson == true) {
-						loadOrganisation();
-					} else {
-						alert(json.removeLesson);
-					}
-				}
-			});
-		}
-	}
 }
\ No newline at end of file
Index: lams_central/web/includes/javascript/main.js
===================================================================
diff -u -rc33d82bf97152099b7a309a156ec2707239b622c -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_central/web/includes/javascript/main.js	(.../main.js)	(revision c33d82bf97152099b7a309a156ec2707239b622c)
+++ lams_central/web/includes/javascript/main.js	(.../main.js)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -1,5 +1,93 @@
 $(document).ready(function () {
+	
+	//initButtons(); //TODO remove?
+	
+	// open active course. in case active course is not yet chosen by user, it will be opened after tablesorter's pager receives all orgs
+	if (activeOrgId != null) {
+		loadOrganisation();
+	}
+	
+	refreshPrivateNotificationCount();
+	
+	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 : LAMS_URL + "/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 +'"';
+						if (activeOrgId == orgId) {
+							rows += ' class="active"';
+						}
+						rows += '>';
+						
+						rows += 	'<a data-id="' + orgId + '" href="#" onClick="javascript:selectOrganisation(' + orgId + ')">';
+						rows += 		orgData["name"];						
+						if (activeOrgId == orgId) {
+							rows +=     '<i class="fa fa-chevron-circle-right fa-lg pull-right"></i>';
+						}
+						rows += 	'</a>';
+						rows += '</td>';
+						
+						rows += '</tr>';
+					}
+		            
+					json.total = data.total_rows;
+					json.rows = $(rows);
+					return json;
+		    	}
+			}
+		})
+	});
+
+	$('.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 == null) && (event.type == "pagerComplete") && (data.totalRows > 0)) {
+	    	var firstOrgId = $('.tablesorter a').first().data("id");
+			selectOrganisation(firstOrgId);
+		}
+	});
+
     // handler for offcanvas bar minimize button
     $('.offcanvas-toggle').on('click', function () {
         $("body").toggleClass("offcanvas-hidden");
@@ -39,3 +127,698 @@
     adjustOffcanvasBarHeight();
 
 });
+
+
+function selectOrganisation(newOrgId) {
+	//remove active CSS class from the old org
+	if (activeOrgId != null) {
+		$("#org-row-" + activeOrgId + ", #favorite-li-" + activeOrgId).removeClass("active");
+		$("#org-row-" + activeOrgId + " a>i").remove();
+	}	
+	
+	//add active CSS class
+	$("#org-row-" + newOrgId + ", #favorite-li-" + 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
+	$("#org-container").load(
+		"index.do",
+		{
+			dispatch : "storeLastVisitedOrganisation",
+			orgId   : activeOrgId
+		},
+		function() {
+			//initButtons("org-container"); //TODO remove?
+		}
+	);
+}
+
+
+function loadOrganisation() {	
+	$("#org-container").load(
+		"displayGroup.do",
+		{
+			stateId : stateId,
+			orgId   : activeOrgId
+		},
+		function() {
+			//initButtons("org-container"); //TODO remove?
+		}
+	);
+}
+
+
+function toggleFavoriteOrganisation(orgId) {
+	$("#favorite-organisations-container").load(
+		"index.do",
+		{
+			dispatch: "toggleFavoriteOrganisation",
+			orgId   : orgId,
+			activeOrgId : activeOrgId
+		},
+		function() {
+			if ($("#favorite-star").hasClass("fa-star-o")) {
+				$("#favorite-star").switchClass("fa-star-o", "fa-star").attr('title', LABELS.REMOVE_ORG_FAVORITE);
+			} else {
+				$("#favorite-star").switchClass("fa-star", "fa-star-o").attr('title', LABELS.MARK_ORG_FAVORITE);
+			}
+		}
+	);	
+}
+
+//TODO remove?
+function initButtons(containerId) {
+	var container = containerId ? $('#' + containerId) : document;
+
+	$(".ui-button", container).button();
+	$(".split-ui-button", container).each(function(){
+		var buttonContainer = $(this),
+			buttons = buttonContainer.children();
+		
+		buttons.first().button()
+			   .next().button({
+			text : false,
+			icons : {
+				primary : "ui-icon-triangle-1-s"
+			}
+		});
+		
+		buttonContainer.buttonset().next().hide().menu();
+		
+		buttons.each(function(){
+			var button = $(this);
+			if (!button.attr('onclick')) {
+				button.click(function() {
+					var menu = $(this).parent().next().show().position({
+						my : "right top",
+						at : "right bottom",
+						of : $(this).parent()
+					});
+					$(document).one("click", function() {
+						menu.hide();
+					});
+					return false;
+				});
+			}
+		});
+	});
+}
+
+
+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 makeOrgSortable() {
+	var org = jQuery("#org-container");
+	$(".lesson-table", org).each(function() {
+		makeSortable(this);
+	});
+	
+	$("a.sorting", org).attr({
+		"onClick" : null,
+		"title"   : LABELS.SORTING_DISABLE
+	}).off('click').click(function(){
+		makeOrgUnsortable();
+	}).find("img")
+	  .attr("src", "images/sorting_enabled.gif");
+}
+
+function makeOrgUnsortable() {
+	var org = jQuery("#org-container");
+	$(".lesson-table", org).each(function() {
+		$(this).sortable('destroy');
+	});
+	
+	$("a.sorting", org).attr({
+		"onClick" : null,
+		"title"   : LABELS.SORTING_ENABLE
+	}).off('click').click(function(){
+		makeOrgSortable();
+	}).find("img")
+	  .attr("src", "images/sorting_disabled.gif");
+}
+
+function makeSortable(element) {
+	$(element).sortable({
+		axis : "y",
+		delay : 100,
+		tolerance : 'pointer',
+		cursor : 'n-resize',
+		helper : function(e, tr) {
+			var $originals = tr.children();
+			var $helper = tr.clone();
+			$helper.children().each(function(index) {
+				// Set helper cell sizes to match the original
+				// sizes
+				$(this).width($originals.eq(index).width())
+			});
+			return $helper;
+		},
+		forceHelperSize : true,
+		forcePlaceholderSize : true,
+		containment : 'parent',
+		stop : function() {
+			var ids = $(this).sortable('toArray');
+			
+			var jLessonsId = $(this).attr("id");
+			var dashIndex = jLessonsId.indexOf("-");
+			var orgId = (dashIndex > 0 ? jLessonsId.substring(0,
+					dashIndex) : jLessonsId);
+
+			$.ajax({
+				url : "servlet/saveLessonOrder",
+				data : {
+					orgId : orgId,
+					ids : ids.join(",")
+				},
+				error : function() {
+					//loadOrganisation();
+				}
+			});
+		}
+	}).disableSelection();
+}
+
+
+function showMonitorLessonDialog(lessonID) {
+	var id = "dialogMonitorLesson" + lessonID,
+		dialog = showDialog(id, {
+			'data' : {
+				'lessonID' : lessonID
+			},
+			'autoOpen' : false,
+			'height' : 600,
+			'width' : 1024,
+			'title' : LABELS.MONITORING_TITLE,
+			'open' : function() {
+				// load contents after opening the dialog
+				$('iframe', this).attr('src', LAMS_URL
+					+ 'home.do?method=monitorLesson&lessonID='
+					+ $(this).data('lessonID'));
+			},
+
+		}, true);
+	
+	// if it was just created
+	if (dialog) {
+		// tell the dialog contents that it was resized
+		$('.modal-content', dialog).on('resizestop', resizeSequenceCanvas);
+		// initial resize
+		$('iframe', dialog).load(resizeSequenceCanvas);
+		
+		dialog.modal('show');
+	}
+}
+
+function resizeSequenceCanvas(){
+	var body = $('.modal-body'),
+		frame = $('iframe', body);
+	if (frame.length > 0) {
+		var win = frame[0].contentWindow || frame[0].contentDocument;
+		if (win.resizeSequenceCanvas) {
+			win.resizeSequenceCanvas(body.width(), body.height());
+		}
+	}
+}
+
+
+function showAddLessonDialog(orgID) {
+	showDialog("dialogAddLesson", {
+		'data' : {
+			'orgID' : orgID
+		},
+		'modal' : true,
+		'height' : 740,
+		'width' : 'auto',
+		'title' : LABELS.ADD_LESSON_TITLE,
+		'open' : function() {
+			var dialog = $(this);
+			// load contents after opening the dialog
+			$('iframe', dialog)
+					.attr('src', LAMS_URL
+						+ 'home.do?method=addLesson&organisationID='
+						+ dialog.data('orgID'));
+			$(this).css("maxWidth", "850px").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 showOrgGroupDialog(orgID) {
+	showDialog("dialogOrgGroup", {
+		'data' : {
+			'orgID' : orgID
+		},
+		'modal' : true,
+		'height' : 460,
+		'width' : 'auto',
+		'title' : LABELS.COURSE_GROUPS_TITLE,
+		'open' : function() {
+			// load contents after opening the dialog
+			$('iframe', this)
+					.attr('src', LAMS_URL
+						+ 'OrganisationGroup.do?method=viewGroupings&organisationID='
+						+ $(this).data('orgID'));
+			$(this).css("maxWidth", "460px").css("margin", "auto");
+		}
+	}, true);
+}
+
+function showAddSingleActivityLessonDialog(orgID, toolID, learningLibraryID) {
+	showDialog("dialogAddSingleActivityLesson", {
+		'data' : {
+			'orgID' : orgID,
+			'toolID' : toolID,
+			'learningLibraryID' : learningLibraryID
+		},
+		'modal' : true,
+		'height' : 600,
+		'width' : 'auto',
+		'title' : LABELS.SINGLE_ACTIVITY_LESSON_TITLE,
+		'open' : function() {
+			var dialog = $(this),
+				toolID = dialog.data('toolID');
+			$(this).css("maxWidth", "850px").css("margin", "auto");
+			$.ajax({
+				async : false,
+				cache : false,
+				url : LAMS_URL + "authoring/author.do",
+				dataType : 'json',
+				data : {
+					'method' : 'createToolContent',
+					'toolID' : toolID
+				},
+				success : function(response) {
+					dialog.data({
+						'toolContentID' :  response.toolContentID,
+						'contentFolderID' : response.contentFolderID
+					});
+
+					$('iframe', dialog).load(function(){
+						if ($(this).contents().find('span.editForm').length > 0){
+							closeAddSingleActivityLessonDialog('save');
+						}
+					})
+					.attr('src', response.authorURL + '&notifyCloseURL='
+						+ encodeURIComponent(LAMS_URL
+						+ 'dialogCloser.jsp?function=closeAddSingleActivityLessonDialog&noopener=true'));
+				}
+			});
+		}
+	}, true);
+}
+
+
+function showNotificationsDialog(orgID, lessonID) {
+	var id = "dialogNotifications" + (lessonID ? "Lesson" + lessonID : "Org" + orgID);
+	showDialog(id, {
+		'data' : {
+			'orgID' : orgID,
+			'lessonID' : lessonID
+		},
+		'height' : 650,
+		'width' : 'auto',
+		'title' : LABELS.EMAIL_NOTIFICATIONS_TITLE,
+		'open' : function() {
+			var dialog = $(this),
+				lessonID = dialog.data('lessonID');
+			// if lesson ID is given, use lesson view; otherwise use course view
+			if (lessonID) {
+				// load contents after opening the dialog
+				$('iframe', dialog).attr('src', LAMS_URL
+					+ 'monitoring/emailNotifications.do?method=getLessonView&lessonID='
+					+ lessonID);
+			} else {
+				$('iframe', dialog).attr('src', LAMS_URL
+					+ 'monitoring/emailNotifications.do?method=getCourseView&organisationID='
+					+ orgID);
+			}
+			$(this).css("maxWidth", "800px").css("margin", "auto");
+		}
+	}, true);
+}
+
+
+function showPrivateNotificationsDialog(){
+	showDialog("dialogPrivateNotifications", {
+		'height' : 470,
+		'width' : 600,
+		'title' : LABELS.PRIVATE_NOTIFICATIONS_TITLE,
+		'close' : function(){
+			refreshPrivateNotificationCount();
+			// completely delete the dialog
+			$(this).remove();
+		},
+		'open' : function() {
+			// build the table from the scratch
+			var dialog = $(this),
+				table = $('<table />').appendTo(dialog),
+				// table header
+				headerRow = $('<tr />').appendTo(table);
+			$('<td />').text(LABELS.PRIVATE_NOTIFICATIONS_MESSAGES).appendTo(headerRow);
+			// click it to mark all notifications as read
+			$('<td class="notificationsClickableCell"/>').text(LABELS.PRIVATE_NOTIFICATIONS_READ)
+														 .attr('title', LABELS.PRIVATE_NOTIFICATIONS_READ_ALL_HINT)
+														 .click(markAllPrivateNotificationsAsRead)
+														 .appendTo(headerRow);
+			$('iframe', dialog).remove();
+			$.ajax({
+				cache : false,
+				url : LAMS_URL + "notification.do",
+				dataType : 'json',
+				data : {
+					'method' : 'getNotificationSubscriptions',
+					// maybe it will change for paging; "offset" param is also available
+					'limit'  : 10
+				},
+				success : function(notifications) {
+					if (!notifications) {
+						return;
+					}
+					
+					// build notification rows one by one
+					$.each(notifications, function(){
+						var notification = this,
+							row = $('<tr />').attr('id', 'subscription-' + notification.subscriptionUid)
+											 .appendTo(table),
+							messageCell = $('<td />').appendTo(row),
+							readCell = $('<td class="notificationsReadCell" />')
+											.appendTo(row);
+						// is it a link?
+						if (notification.message.indexOf('<a ') === 0) {
+							var link = $(notification.message);
+							// make it navigable
+							messageCell.text(link.text()).addClass('notificationsClickableCell').click(function(){
+								if (!readCell.text()) {
+									markPrivateNotificationAsRead(notification.subscriptionUid);
+								}
+								// open in a new tab/window
+								window.open(link.attr('href'), '_blank');
+							});
+						} else {
+							messageCell.text(notification.message);
+						}
+						// was it read already?
+						if (notification.pending) {
+							messageCell.addClass('notificationsPendingCell');
+							readCell.addClass('notificationsClickableCell')
+									.attr('title', LABELS.PRIVATE_NOTIFICATIONS_READ_HINT)
+									.click(function(){
+										markPrivateNotificationAsRead(notification.subscriptionUid);
+									});
+						} else {
+							readCell.html('&#10004;');
+						}
+					});
+				}
+			});
+		}
+	}, true);
+}
+
+function markAllPrivateNotificationsAsRead(){
+	$('#dialogPrivateNotifications tr[id^=subscription-]').each(function(){
+		var row = $(this),
+			read = $('td', row).last().text();
+		if (!read) {
+			markPrivateNotificationAsRead(row.attr('id').split('-')[1]);
+		}
+	});
+}
+
+function markPrivateNotificationAsRead(subscriptionUid){
+	$.ajax({
+		cache : false,
+		url : LAMS_URL + "notification.do",
+		data : {
+			'method' 		  : 'markNotificationAsRead',
+			'subscriptionUid' : subscriptionUid
+		},
+		success : function() {
+			// mark the message as read
+			$('#dialogPrivateNotifications tr#subscription-' + subscriptionUid + ' > td')
+				// message cell
+				.first().removeClass('notificationsPendingCell')
+				// read cell
+				.next().html('&#10004;').removeClass('notificationsClickableCell').attr('title', null).off('click');
+		}
+	});
+}
+
+function refreshPrivateNotificationCount(){
+	$.ajax({
+		cache : false,
+		url : LAMS_URL + "notification.do",
+		dataType : 'text',
+		data : {
+			'method' : 'getPendingNotificationCount'
+		},
+		success : function(count) {
+			$('#notificationsPendingCount').text(count == 0 ? '0' : count);
+		}
+	});
+}
+
+function showGradebookCourseDialog(orgID){
+	var id = "dialoGradebookCourse" + orgID;
+	showDialog(id, {
+		'orgID' : orgID,
+		'height' : 650,
+		'width' : 'auto',
+		'title' : LABELS.GRADEBOOK_COURSE_TITLE,
+		'open' : function() {
+			var orgID = $(this).dialog('option', 'orgID');
+			// load contents after opening the dialog
+			$('iframe', this).attr('src', LAMS_URL
+				+ 'gradebook/gradebookMonitoring.do?dispatch=courseMonitor&organisationID=' + orgID);
+			$(this).css("maxWidth", "850").css("margin", "auto");
+		}
+	}, true);
+}
+
+function showGradebookLessonDialog(lessonID){
+	var id = "dialogGradebookLesson" + lessonID;
+	showDialog(id, {
+		'data' : {
+			'lessonID' : lessonID
+		},
+		'height' : 650,
+		'width' : 'auto',
+		'title' : LABELS.GRADEBOOK_LESSON_TITLE,
+		'open' : function() {
+			var lessonID = $(this).data('lessonID');
+			// load contents after opening the dialog
+			$('iframe', this).attr('src', LAMS_URL + 'gradebook/gradebookMonitoring.do?lessonID=' + lessonID);
+			$(this).css("maxWidth", "850").css("margin", "auto");
+		}
+	}, true);
+}
+
+
+
+function showGradebookLearnerDialog(orgID){
+	var id = "dialogGradebookLearner" + orgID;
+	showDialog(id, {
+		'data'  : {
+			'orgID' : orgID
+		},
+		'height' : 400,
+		'width' : 'auto',
+		'title' : LABELS.GRADEBOOK_LEARNER_TITLE,
+		'open' : function() {
+			var orgID = $(this).data('orgID');
+			// load contents after opening the dialog
+			$('iframe', this).attr('src', LAMS_URL
+				+ 'gradebook/gradebookLearning.do?dispatch=courseLearner&organisationID=' + orgID);
+			$(this).css("maxWidth", "750").css("margin", "auto");
+		}
+	}, true);
+}
+
+function showConditionsDialog(lessonID){
+	var id = "dialogConditions" + lessonID;
+	showDialog(id, {
+		'data' : {
+			'lessonID' : lessonID
+		},
+		'height' : 750,
+		'width' : 'auto',
+		'title' : LABELS.CONDITIONS_TITLE,
+		'open' : function() {
+			var lessonID = $(this).data('lessonID');
+			// load contents after opening the dialog
+			$('iframe', this).attr('src', LAMS_URL
+				+ 'lessonConditions.do?method=getIndexLessonConditions&lsId=' + lessonID);
+			$(this).css("maxWidth", "610px").css("margin", "auto");
+		}
+	}, true);
+}
+
+function showSearchLessonDialog(orgID){
+	var id = "dialogSearchLesson" + orgID;
+	showDialog(id, {
+		'data' : {
+			'orgID' : orgID
+		},
+		'height' : 400,
+		'width' : 'auto',
+		'title' : LABELS.SEARCH_LESSON_TITLE,
+		'open' : function() {
+			var orgID = $(this).data('orgID');
+			// load contents after opening the dialog
+			$('iframe', this).attr('src', LAMS_URL
+				+ 'findUserLessons.do?dispatch=getResults&courseID=' + orgID);
+			$(this).css("maxWidth", "830px").css("margin", "auto");
+		}
+	}, true);
+}
+
+
+function closeAddSingleActivityLessonDialog(action) {
+	var id = 'dialogAddSingleActivityLesson',
+		dialog = $('#' + id),
+		save = action == 'save';
+	
+	if (save) {
+		$.ajax({
+			async : false,
+			cache : false,
+			url : LAMS_URL + "authoring/author.do",
+			dataType : 'text',
+			data : {
+				'method' : 'createSingleActivityLesson',
+				'organisationID'  : dialog.data('orgID'),
+				'toolID' : dialog.data('toolID'),
+				'toolContentID' : dialog.data('toolContentID'),
+				'contentFolderID' : dialog.data('contentFolderID'),
+				'learningLibraryID' : dialog.data('learningLibraryID')
+			},
+			// create LD SVG
+			success : function(learningDesignID) {
+				// check if the LD was created successfully
+				if (learningDesignID) {
+					var frame = $('iframe', dialog);
+					// disable previous onload handler, set in
+					// showAddSingleActivityLessonDialog()
+					frame.off('load').load(function(){
+						// disable current onload handler as closing the dialog
+						// reloads the iframe
+						frame.off('load');
+						
+						// call svgGenerator.jsp code to store LD SVG on the
+						// server
+						var win = frame[0].contentWindow || frame[0].contentDocument;
+						win.GeneralLib.saveLearningDesignImage();
+						
+						closeDialog(id, true);
+					});
+					// load svgGenerator.jsp to render LD SVG
+					frame.attr('src', LAMS_URL + 'authoring/author.do?method=generateSVG&selectable=false&learningDesignID='
+											   + learningDesignID);
+				}
+			}
+		});
+	} else {
+		closeDialog(id, false);
+	}
+}
+
+
+function closeDialog(id, refresh) {
+	// was the dialog just closed or a lesson removed
+	// if latter, refresh the list
+	if (refresh) {
+		loadOrganisation();
+	}
+	$("#" + id).modal('hide');
+}
+
+
+//used in main.jsp and /lti/addlesson.jsp
+function showAuthoringDialog(learningDesignID){
+	showDialog('dialogAuthoring', {
+		'height' : Math.max(300, $(window).height() - 40),
+		'width' : 1280,
+		'modal' : false,
+		'title' : LABELS.AUTHORING_TITLE,
+		'beforeClose' : function(){
+			// if LD was modified, ask the user if he really wants to exit
+			var innerLib = $('iframe', this)[0].contentWindow.GeneralLib,
+				// no innerLib means that an exception occured in Authoring
+				// and the interface is not usable anyway
+				canClose = !innerLib || innerLib.canClose() || confirm(LABELS.NAVIGATE_AWAY_CONFIRM);
+			if (canClose) {
+				$('iframe', this).attr('src', null);
+			} else {
+				return false;
+			}
+		},
+		'open' : function() {
+			var url = LAMS_URL + 'authoring/author.do?method=openAuthoring';
+			
+			if (learningDesignID) {
+				url += '&learningDesignID=' + learningDesignID;
+			}
+			
+			// load contents after opening the dialog
+			$('iframe', this).attr('src', url);
+		}
+	}, true);
+}
+
+
+function removeLesson(lessonID) {
+	if (confirm(LABELS.REMOVE_LESSON_CONFIRM1)) {
+		if (confirm(LABELS.REMOVE_LESSON_CONFIRM2)) {
+			$.ajax({
+				async : false,
+				url : LAMS_URL + "monitoring/monitoring.do",
+				data : "method=removeLesson&lessonID=" + lessonID,
+				type : "POST",
+				success : function(json) {
+					if (json.removeLesson == true) {
+						loadOrganisation();
+					} else {
+						alert(json.removeLesson);
+					}
+				}
+			});
+		}
+	}
+}
\ No newline at end of file
Index: lams_central/web/includes/javascript/profile.js
===================================================================
diff -u
--- lams_central/web/includes/javascript/profile.js	(revision 0)
+++ lams_central/web/includes/javascript/profile.js	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -0,0 +1,15 @@
+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);
+}
\ No newline at end of file
Index: lams_central/web/lessons.jsp
===================================================================
diff -u -rc33d82bf97152099b7a309a156ec2707239b622c -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_central/web/lessons.jsp	(.../lessons.jsp)	(revision c33d82bf97152099b7a309a156ec2707239b622c)
+++ lams_central/web/lessons.jsp	(.../lessons.jsp)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -14,7 +14,7 @@
 	
 	<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/profile.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function () {
 			//update dialog's height and title
Index: lams_central/web/lti/addLesson.jsp
===================================================================
diff -u -rde884cf8c730a25d2f2296f7a768d3fd45508c99 -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_central/web/lti/addLesson.jsp	(.../addLesson.jsp)	(revision de884cf8c730a25d2f2296f7a768d3fd45508c99)
+++ lams_central/web/lti/addLesson.jsp	(.../addLesson.jsp)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -49,7 +49,8 @@
 	<script type="text/javascript" src="includes/javascript/jquery-ui.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>	
+	<!-- import of showAuthoringDialog() method  -->
+	<script type="text/javascript" src="includes/javascript/main.js"></script>
 	<script type="text/javascript">
     	var isSelected = false;
 		var tree;
Index: lams_central/web/main.jsp
===================================================================
diff -u -r5199d1dc08051a94fead98f76b225edeb92f01f8 -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_central/web/main.jsp	(.../main.jsp)	(revision 5199d1dc08051a94fead98f76b225edeb92f01f8)
+++ lams_central/web/main.jsp	(.../main.jsp)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -6,6 +6,7 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-function" prefix="fn"%>
 <%@ taglib uri="tags-tiles" prefix="tiles" %>
+<c:set var="lastVisitedOrganisationId"><lams:user property="lastVisitedOrganisationId"/></c:set>
 
 <!DOCTYPE html>
 <lams:html>
@@ -14,12 +15,10 @@
 	<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" />
 	
-	<lams:css style="main"/>
+	<lams:css/>
 	<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>
@@ -84,13 +83,13 @@
 				<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" />',
+				REMOVE_ORG_FAVORITE : '<fmt:message key="label.remove.org.favorite"/>',
+				MARK_ORG_FAVORITE : '<fmt:message key="label.mark.org.favorite"/>',
 			},
 			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
+			activeOrgId = <c:choose><c:when test="${empty lastVisitedOrganisationId}">null</c:when><c:otherwise>${lastVisitedOrganisationId}</c:otherwise></c:choose>;
 
 		$(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">
@@ -100,135 +99,39 @@
 			 		$.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;
-				    	}
-					}
-				})
-			});
-
-			$('.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 > <!-- class="offcanvas-hidden" -->
+<body <c:if test="${not empty lastVisitedOrganisationId}">class="offcanvas-hidden"</c:if>>
 
 <!-- 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="offcanvas-logo" src="images/svg/lams_logo_white.svg">
-                    </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 input-sm" placeholder="Search for courses..."
-								data-column="1" type="search">
-                </li>
-<!-- 
-                <li class="active">
-                    <a href="#"> Course B  </a>
-                </li>
- -->
-
-            </ul>
+			<div class="offcanvas-logo">
+				<div>
+					<img alt="LAMS" src="images/svg/lams_logo_white.svg">
+				</div>
+				<i class="icon-remove fa fa-close fa-lg offcanvas-toggle"></i>
+			</div>
+			
+			<div class="offcanvas-header">
+				<span class="courses-title ">
+					<i class="fa fa-table"></i>&nbsp;&nbsp;Courses
+				</span>
+			</div>
+        
+			<%@ include file="favoriteOrganisations.jsp"%>
             
+			<div class="form-group offcanvas-search">
+				<input type="text" id="offcanvas-search-input" class="form-control input-sm" placeholder="Search for courses..."
+						data-column="1" type="search">
+			</div>
+            
 			<lams:TSTable numColumns="2">
 			</lams:TSTable>
 
         </div>
-
-        </div>
     </nav>
 <!-- /Offcanvas Bar -->
 
@@ -335,8 +238,6 @@
 						<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>
@@ -355,9 +256,7 @@
 		
 		<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 id="org-container"></div>
 		  	</div>
 		</div>
 	
Index: lams_central/web/passwordChangeContent.jsp
===================================================================
diff -u -rc6b80dfdf1fa898b96bd84e2888ee287cf0a6079 -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision c6b80dfdf1fa898b96bd84e2888ee287cf0a6079)
+++ lams_central/web/passwordChangeContent.jsp	(.../passwordChangeContent.jsp)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -23,7 +23,7 @@
 
 	<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/profile.js"></script>
 	<script type="text/javascript" src="includes/javascript/jquery.validate.js"></script>
 	<script type="text/javascript">
 		$.validator.addMethod("pwcheck", function(value) {
Index: lams_central/web/portrait.jsp
===================================================================
diff -u -rc33d82bf97152099b7a309a156ec2707239b622c -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision c33d82bf97152099b7a309a156ec2707239b622c)
+++ lams_central/web/portrait.jsp	(.../portrait.jsp)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -50,7 +50,7 @@
 
 	<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/profile.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>
Index: lams_central/web/profile.jsp
===================================================================
diff -u -rc33d82bf97152099b7a309a156ec2707239b622c -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_central/web/profile.jsp	(.../profile.jsp)	(revision c33d82bf97152099b7a309a156ec2707239b622c)
+++ lams_central/web/profile.jsp	(.../profile.jsp)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -17,7 +17,7 @@
 	
 	<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/profile.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function () {
 			//update dialog's height and title
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/FavoriteOrganisation.hbm.xml
===================================================================
diff -u
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/FavoriteOrganisation.hbm.xml	(revision 0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/FavoriteOrganisation.hbm.xml	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<!DOCTYPE hibernate-mapping PUBLIC
+    "-//Hibernate/Hibernate Mapping DTD 3.0//EN"
+    "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd" >
+    
+<hibernate-mapping>
+
+<class 
+    name="org.lamsfoundation.lams.usermanagement.FavoriteOrganisation" 
+    table="lams_favorite_organisation"
+>
+    <meta attribute="class-description" inherit="false">
+       @hibernate.class
+        table="lams_favorite_organisation"
+    </meta>
+    <meta attribute="implement-equals" inherit="false">true</meta>
+
+	<cache usage="transactional" />
+	
+    <id
+        name="favoriteOrganisationId"
+        type="java.lang.Integer"
+        column="favorite_organisation_id"
+    >
+        <meta attribute="field-description">
+           @hibernate.id
+            generator-class="native"
+            type="java.lang.Integer"
+            column="favorite_organisation_id"
+
+
+        </meta>
+        <generator class="native" />
+    </id>
+
+
+    <!-- Associations -->
+    <!-- bi-directional many-to-one association to User -->
+    <many-to-one
+        name="user"
+        class="org.lamsfoundation.lams.usermanagement.User"
+        not-null="true"
+    >
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="user_id"         
+        </meta>
+        <column name="user_id" />
+    </many-to-one>
+    
+    <!-- bi-directional many-to-one association to Organisation -->
+    <many-to-one
+        name="organisation"
+        class="org.lamsfoundation.lams.usermanagement.Organisation"
+        not-null="true"
+    >
+        <meta attribute="use-in-equals">true</meta>
+        <meta attribute="field-description">
+           @hibernate.many-to-one
+            not-null="true"
+           @hibernate.column name="organisation_id"         
+        </meta>
+        <column name="organisation_id" />
+    </many-to-one>
+
+</class>
+
+</hibernate-mapping>
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
===================================================================
diff -u -r9eaeb8328024c0c652dd7d17372dc4caf3a5852c -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 9eaeb8328024c0c652dd7d17372dc4caf3a5852c)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml	(.../User.hbm.xml)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -23,8 +23,6 @@
 				generator-class="native"
 				type="java.lang.Integer"
 				column="user_id"
-
-
 			</meta>
 			<generator class="native" />
 		</id>
@@ -214,6 +212,7 @@
 				not-null="true"
 			</meta>
 		</property>
+		<property name="lastVisitedOrganisationId" type="java.lang.Integer" column="last_visited_organisation_id"/>
 
 		<!-- Associations -->
 
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml
===================================================================
diff -u -rbcd6ef084d8ebb8cd4fc7198c6a9f1b56ab72563 -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision bcd6ef084d8ebb8cd4fc7198c6a9f1b56ab72563)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml	(.../UserOrganisation.hbm.xml)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -41,13 +41,6 @@
 
 
     <!-- Associations -->
-    <!-- bi-directional one-to-one association with UserOrganisationCollapsed -->
-	<one-to-one
-        name="userOrganisationCollapsed"
-        class="org.lamsfoundation.lams.usermanagement.UserOrganisationCollapsed"
-        cascade="all"
-    >
-    </one-to-one>
     <!-- bi-directional many-to-one association to User -->
     <many-to-one
         name="user"
Fisheye: Tag 353fe07604639c2166ed68fbf832810959f3f3cf refers to a dead (removed) revision in file `lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisationCollapsed.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r14340cffb8e7ee719460a70a3d0ddf0cebe7930b -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 14340cffb8e7ee719460a70a3d0ddf0cebe7930b)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -48,6 +48,7 @@
 		<property name="groupDAO"><ref bean="groupDAO"/></property>
 		<property name="roleDAO"><ref bean="roleDAO"/></property>
 		<property name="organisationDAO"><ref bean="organisationDAO"/></property>
+		<property name="favoriteOrganisationDAO"><ref bean="favoriteOrganisationDAO"/></property>
 		<property name="userDAO"><ref bean="userDAO"/></property>
 		<property name="userOrganisationDAO"><ref bean="userOrganisationDAO"/></property>
 		<property name="messageService"><ref bean="commonMessageService"/></property>
@@ -75,6 +76,7 @@
 				<prop key="disable*">PROPAGATION_REQUIRED</prop>
 				<prop key="set*">PROPAGATION_REQUIRED</prop>
 				<prop key="is*">PROPAGATION_REQUIRED</prop>
+				<prop key="toggleOrganisationFavorite">PROPAGATION_REQUIRED</prop>
 				<prop key="userHasData">PROPAGATION_REQUIRED</prop>
 			</props>
 		</property>
@@ -531,6 +533,10 @@
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
 	
+	<bean id="favoriteOrganisationDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.FavoriteOrganisationDAO">
+		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
+	</bean>
+	
 	<bean id="userDAO" class="org.lamsfoundation.lams.usermanagement.dao.hibernate.UserDAO">
 		<property name="sessionFactory"><ref bean="coreSessionFactory"/></property>
 	</bean>
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040073.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040073.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040073.sql	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -0,0 +1,24 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+
+-- LDEV-3962 Bootstrap index page
+DROP TABLE lams_user_organisation_collapsed;
+
+CREATE TABLE lams_favorite_organisation (
+       favorite_organisation_id BIGINT(20) NOT NULL AUTO_INCREMENT
+     , organisation_id BIGINT(20) NOT NULL
+     , user_id BIGINT(20) NOT NULL
+     , PRIMARY KEY (favorite_organisation_id)
+     , INDEX (organisation_id)
+     , CONSTRAINT FK_lams_favorite_organisation_1 FOREIGN KEY (organisation_id)
+                  REFERENCES lams_organisation (organisation_id) ON DELETE NO ACTION ON UPDATE NO ACTION
+     , INDEX (user_id)
+     , CONSTRAINT FK_lams_favorite_organisation_2 FOREIGN KEY (user_id)
+                  REFERENCES lams_user (user_id) ON DELETE NO ACTION ON UPDATE NO ACTION
+)ENGINE=InnoDB;
+
+ALTER TABLE lams_user ADD COLUMN last_visited_organisation_id BIGINT(20), 
+	ADD CONSTRAINT FK_lams_user_7 FOREIGN KEY (last_visited_organisation_id) REFERENCES lams_organisation(organisation_id);
+
+COMMIT;
+SET AUTOCOMMIT = 1;
Index: lams_common/src/java/org/lamsfoundation/lams/index/IndexOrgBean.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_common/src/java/org/lamsfoundation/lams/index/IndexOrgBean.java	(.../IndexOrgBean.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_common/src/java/org/lamsfoundation/lams/index/IndexOrgBean.java	(.../IndexOrgBean.java)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -29,15 +29,11 @@
 import org.apache.commons.lang.builder.EqualsBuilder;
 
 /**
- * @version
+ * <p>
+ * <a href="OrgIndexBean.java.html"><i>View Source</i></a>
+ * </p>
  *
- *          <p>
- *          <a href="OrgIndexBean.java.html"><i>View Source</i></a>
- *          </p>
- *
  * @author <a href="mailto:fyang@melcoe.mq.edu.au">Fei Yang</a>
- *
- *         Created at 10:01:23 on 14/06/2006
  */
 public class IndexOrgBean implements Comparable {
 
@@ -46,6 +42,7 @@
     private Date archivedDate;
     private Integer type;
     private Boolean allowSorting = false;
+    private boolean favorite = false;
     private List<IndexLinkBean> links;
     private List<IndexLinkBean> moreLinks;
     private List<IndexLessonBean> lessons;
@@ -211,5 +208,16 @@
     public void setAllowSorting(Boolean allowSorting) {
 	this.allowSorting = allowSorting;
     }
+    
+    /**
+     * @return whether user marked this organisation as favorite
+     */
+    public boolean isFavorite() {
+	return favorite;
+    }
 
+    public void setFavorite(boolean favorite) {
+	this.favorite = favorite;
+    }
+
 }
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/FavoriteOrganisation.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/FavoriteOrganisation.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/FavoriteOrganisation.java	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -0,0 +1,96 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.usermanagement;
+
+import java.io.Serializable;
+
+import org.apache.commons.lang.builder.EqualsBuilder;
+import org.apache.commons.lang.builder.HashCodeBuilder;
+import org.apache.commons.lang.builder.ToStringBuilder;
+
+public class FavoriteOrganisation implements Serializable {
+
+    /** identifier field */
+    private Integer favoriteOrganisationId;
+
+    /** persistent field */
+    private User user;
+
+    /** persistent field */
+    private Organisation organisation;
+
+    /** full constructor */
+    public FavoriteOrganisation(User user, Organisation organisation) {
+	this.user = user;
+	this.organisation = organisation;
+    }
+
+    /** default constructor */
+    public FavoriteOrganisation() {
+    }
+
+    public Integer getFavoriteOrganisationId() {
+	return this.favoriteOrganisationId;
+    }
+
+    public void setFavoriteOrganisationId(Integer userOrganisationId) {
+	this.favoriteOrganisationId = userOrganisationId;
+    }
+
+    public User getUser() {
+	return this.user;
+    }
+
+    public void setUser(User user) {
+	this.user = user;
+    }
+
+    public Organisation getOrganisation() {
+	return this.organisation;
+    }
+
+    public void setOrganisation(Organisation organisation) {
+	this.organisation = organisation;
+    }
+
+    @Override
+    public String toString() {
+	return new ToStringBuilder(this).append("favoriteOrganisationId", getFavoriteOrganisationId()).toString();
+    }
+
+    @Override
+    public boolean equals(Object other) {
+	if (!(other instanceof FavoriteOrganisation)) {
+	    return false;
+	}
+	FavoriteOrganisation castOther = (FavoriteOrganisation) other;
+	return new EqualsBuilder().append(this.getFavoriteOrganisationId(), castOther.getFavoriteOrganisationId()).isEquals();
+    }
+
+    @Override
+    public int hashCode() {
+	return new HashCodeBuilder().append(getFavoriteOrganisationId()).toHashCode();
+    }
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
===================================================================
diff -u -r9eaeb8328024c0c652dd7d17372dc4caf3a5852c -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 9eaeb8328024c0c652dd7d17372dc4caf3a5852c)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java	(.../User.java)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -128,6 +128,9 @@
 
     /** persistent field */
     private Set<UserOrganisation> userOrganisations;
+    
+    /** persistent field */
+    private Integer lastVisitedOrganisationId;
 
     /** persistent field */
     private Theme theme;
@@ -398,7 +401,15 @@
     public void setUserOrganisations(Set userOrganisations) {
 	this.userOrganisations = userOrganisations;
     }
+    
+    public Integer getLastVisitedOrganisationId() {
+	return lastVisitedOrganisationId;
+    }
 
+    public void setLastVisitedOrganisationId(Integer lastVisitedOrganisationId) {
+	this.lastVisitedOrganisationId = lastVisitedOrganisationId;
+    }
+
     /** This methods adds a new membership for the given user */
     public void addUserOrganisation(UserOrganisation userOrganisation) {
 	if (userOrganisations == null) {
@@ -493,10 +504,11 @@
 		new ThemeDTO(theme),
 		// TimeZone.getTimeZone("Australia/Sydney"),
 		timeZone, authenticationMethod.getAuthenticationMethodId(), fckLanguageMapping, lamsCommunityToken,
-		lamsCommunityUsername, (tutorialsDisabled == null ? false : true), // assume tutorials enabled if not
-		// set
-		tutorialPages, (firstLogin == null ? true : false) // assume no firstLogin value means they haven't
-	// logged in
+		lamsCommunityUsername, 
+		(tutorialsDisabled == null ? false : true), // assume tutorials enabled if not set
+		tutorialPages, 
+		(firstLogin == null ? true : false), // assume no firstLogin value means they haven't logged in
+		lastVisitedOrganisationId
 	);
     }
 
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java	(.../UserOrganisation.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisation.java	(.../UserOrganisation.java)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -42,8 +42,6 @@
     /** persistent field */
     private Organisation organisation;
 
-    private UserOrganisationCollapsed userOrganisationCollapsed;
-
     /** persistent field */
     private Set userOrganisationRoles;
 
@@ -88,14 +86,6 @@
 	this.organisation = organisation;
     }
 
-    public UserOrganisationCollapsed getUserOrganisationCollapsed() {
-	return this.userOrganisationCollapsed;
-    }
-
-    public void setUserOrganisationCollapsed(UserOrganisationCollapsed uoc) {
-	this.userOrganisationCollapsed = uoc;
-    }
-
     public Set getUserOrganisationRoles() {
 	return this.userOrganisationRoles;
     }
Fisheye: Tag 353fe07604639c2166ed68fbf832810959f3f3cf refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/usermanagement/UserOrganisationCollapsed.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IFavoriteOrganisationDAO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IFavoriteOrganisationDAO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/IFavoriteOrganisationDAO.java	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -0,0 +1,65 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+
+package org.lamsfoundation.lams.usermanagement.dao;
+
+import java.util.List;
+
+import org.lamsfoundation.lams.dao.IBaseDAO;
+import org.lamsfoundation.lams.usermanagement.FavoriteOrganisation;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.User;
+
+/**
+ * DAO methods for FavoriteOrganisation class.
+ * 
+ * @author Andrey Balan
+ */
+public interface IFavoriteOrganisationDAO extends IBaseDAO {
+    
+    /**
+     * Returns FavoriteOrganisation object for given user and organisation.
+     * 
+     * @param organisationId
+     * @param userId
+     * @return
+     */
+    FavoriteOrganisation getFavoriteOrganisation(Integer organisationId, Integer userId);
+
+    /**
+     * Return all organisations that were marked as favorite by the specified user
+     * 
+     * @param userId
+     * @return
+     */
+    List<Organisation> getFavoriteOrganisationsByUser(Integer userId);
+    
+    /**
+     * Checks whether user marked this organisation as favorite.
+     * 
+     * @param organisationId
+     * @param userId
+     * @return
+     */
+    boolean isOrganisationFavorite(Integer organisationId, Integer userId);
+}
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/FavoriteOrganisationDAO.java
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/FavoriteOrganisationDAO.java	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/FavoriteOrganisationDAO.java	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -0,0 +1,63 @@
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ *
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+
+package org.lamsfoundation.lams.usermanagement.dao.hibernate;
+
+import java.util.List;
+
+import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO;
+import org.lamsfoundation.lams.usermanagement.FavoriteOrganisation;
+import org.lamsfoundation.lams.usermanagement.Organisation;
+import org.lamsfoundation.lams.usermanagement.dao.IFavoriteOrganisationDAO;
+import org.springframework.stereotype.Repository;
+
+/**
+ * Hibernate implementation of IFavoriteOrganisationDAO
+ *
+ * @author Andrey Balan
+ */
+@Repository
+public class FavoriteOrganisationDAO extends LAMSBaseDAO implements IFavoriteOrganisationDAO {
+    
+    @Override
+    public FavoriteOrganisation getFavoriteOrganisation(Integer organisationId, Integer userId) {
+	final String query = "SELECT fav from FavoriteOrganisation fav WHERE fav.organisation.organisationId=" + organisationId
+		+ " AND fav.user.userId=" + userId;
+	return (FavoriteOrganisation) getSession().createQuery(query).uniqueResult();
+    }
+
+    @Override
+    public List<Organisation> getFavoriteOrganisationsByUser(Integer userId) {
+	final String query = "SELECT fav.organisation from FavoriteOrganisation fav WHERE fav.user.userId=" + userId
+		+ " ORDER BY fav.organisation.name";
+	return find(query);
+    }
+    
+    @Override
+    public boolean isOrganisationFavorite(Integer organisationId, Integer userId) {
+
+	final String query = "SELECT COUNT(*) from FavoriteOrganisation fav WHERE fav.organisation.organisationId=" + organisationId
+		+ " AND fav.user.userId=" + userId;
+	return ((Number) getSession().createQuery(query).uniqueResult()).intValue() == 1;
+    }
+}
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java
===================================================================
diff -u -r52b2e7c9cebda1dc4f158859c54914e85877bdd5 -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java	(.../UserDAO.java)	(revision 52b2e7c9cebda1dc4f158859c54914e85877bdd5)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java	(.../UserDAO.java)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -60,7 +60,7 @@
 	    String email = (String) element[4];
 
 	    UserDTO userDto = new UserDTO(userId, firstName, lastName, login, null, null, null, email, null, null, null,
-		    null, null, null, true, null, false);
+		    null, null, null, true, null, false, null);
 
 	    userDtos.add(userDto);
 	}
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
===================================================================
diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(.../UserDTO.java)	(revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java	(.../UserDTO.java)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -55,12 +55,13 @@
     private Boolean tutorialsDisabled;
     private Set<String> pagesWithDisabledTutorials;
     private Boolean firstLogin;
+    private Integer lastVisitedOrganisationId;
 
     public UserDTO(Integer userID, String firstName, String lastName, String login, String localeLanguage,
 	    String localeCountry, String direction, String email, ThemeDTO htmlTheme, TimeZone timezone,
 	    Integer authenticationMethodId, String fckLanguageMapping, String lamsCommunityToken,
 	    String lamsCommunityUsername, Boolean tutorialsDisabled, Set<String> pagesWithDisabledTutorials,
-	    Boolean firstLogin) {
+	    Boolean firstLogin, Integer lastVisitedOrganisationId) {
 	this.userID = userID;
 	this.firstName = firstName;
 	this.lastName = lastName;
@@ -78,6 +79,7 @@
 	this.tutorialsDisabled = tutorialsDisabled;
 	this.pagesWithDisabledTutorials = pagesWithDisabledTutorials;
 	this.firstLogin = firstLogin;
+	this.lastVisitedOrganisationId = lastVisitedOrganisationId;
     }
 
     /**
@@ -229,4 +231,8 @@
     public void setFirstLogin(Boolean firstLogin) {
 	this.firstLogin = firstLogin;
     }
+
+    public Integer getLastVisitedOrganisationId() {
+	return lastVisitedOrganisationId;
+    }
 }
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
===================================================================
diff -u -rc33d82bf97152099b7a309a156ec2707239b622c -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	(.../IUserManagementService.java)	(revision c33d82bf97152099b7a309a156ec2707239b622c)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java	(.../IUserManagementService.java)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -131,6 +131,31 @@
      * @return UserBasicDTO objectsin a Vector
      */
     Vector getUsersFromOrganisationByRole(Integer organisationID, String roleName, boolean getUser);
+    
+    /**
+     * Return all organisations that were marked as favorite by the specified user
+     * 
+     * @param userId
+     * @return
+     */
+    List<Organisation> getFavoriteOrganisationsByUser(Integer userId);
+    
+    /**
+     * Checks whether user marked this organisation as favorite.
+     * 
+     * @param organisationId
+     * @param userId
+     * @return
+     */
+    boolean isOrganisationFavorite(Integer organisationId, Integer userId);
+    
+    /**
+     * Toggles whether organisation is marked as favorite
+     * 
+     * @param organisation
+     * @param user user performing toggling
+     */
+    void toggleOrganisationFavorite(Integer orgId, Integer userId);
 
     Organisation getRootOrganisation();
 
Index: lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
===================================================================
diff -u -rc33d82bf97152099b7a309a156ec2707239b622c -r353fe07604639c2166ed68fbf832810959f3f3cf
--- lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision c33d82bf97152099b7a309a156ec2707239b622c)
+++ lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(.../UserManagementService.java)	(revision 353fe07604639c2166ed68fbf832810959f3f3cf)
@@ -41,6 +41,7 @@
 import org.lamsfoundation.lams.dao.IBaseDAO;
 import org.lamsfoundation.lams.learningdesign.dao.IGroupDAO;
 import org.lamsfoundation.lams.themes.Theme;
+import org.lamsfoundation.lams.usermanagement.FavoriteOrganisation;
 import org.lamsfoundation.lams.usermanagement.ForgotPasswordRequest;
 import org.lamsfoundation.lams.usermanagement.IUserDAO;
 import org.lamsfoundation.lams.usermanagement.Organisation;
@@ -52,6 +53,7 @@
 import org.lamsfoundation.lams.usermanagement.UserOrganisation;
 import org.lamsfoundation.lams.usermanagement.UserOrganisationRole;
 import org.lamsfoundation.lams.usermanagement.WorkspaceFolder;
+import org.lamsfoundation.lams.usermanagement.dao.IFavoriteOrganisationDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IOrganisationDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IRoleDAO;
 import org.lamsfoundation.lams.usermanagement.dao.IUserOrganisationDAO;
@@ -97,6 +99,8 @@
     private IUserDAO userDAO;
 
     private IUserOrganisationDAO userOrganisationDAO;
+    
+    private IFavoriteOrganisationDAO favoriteOrganisationDAO;
 
     protected MessageService messageService;
 
@@ -242,6 +246,34 @@
 
 	return users;
     }
+    
+    @Override
+    public List<Organisation> getFavoriteOrganisationsByUser(Integer userId) {
+	return favoriteOrganisationDAO.getFavoriteOrganisationsByUser(userId);
+    }
+    
+    @Override
+    public boolean isOrganisationFavorite(Integer organisationId, Integer userId) {
+	return favoriteOrganisationDAO.isOrganisationFavorite(organisationId, userId);
+    }
+    
+    @Override
+    public void toggleOrganisationFavorite(Integer orgId, Integer userId) {
+	FavoriteOrganisation favoriteOrganisation = favoriteOrganisationDAO.getFavoriteOrganisation(orgId, userId);
+	
+	//create new favoriteOrganisation if it doesn't exist
+	if (favoriteOrganisation == null) {
+	    
+	    User user = (User) findById(User.class, userId);
+	    Organisation organisation = (Organisation) findById(Organisation.class, orgId);
+	    favoriteOrganisation = new FavoriteOrganisation(user, organisation);
+	    save(favoriteOrganisation);
+	   
+	//remove favoriteOrganisation if it existed
+	} else {
+	    delete(favoriteOrganisation);
+	}
+    }
 
     @Override
     public Organisation getRootOrganisation() {
@@ -997,6 +1029,10 @@
     public void setUserOrganisationDAO(IUserOrganisationDAO userOrganisationDAO) {
 	this.userOrganisationDAO = userOrganisationDAO;
     }
+    
+    public void setFavoriteOrganisationDAO(IFavoriteOrganisationDAO favoriteOrganisationDAO) {
+	this.favoriteOrganisationDAO = favoriteOrganisationDAO;
+    }
 
     private IAuditService getAuditService() {
 	if (UserManagementService.auditService == null) {