Index: lams_central/web/group.jsp
===================================================================
diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rebb598b9d631fa479aef19110dc7b8c2cce0575b
--- lams_central/web/group.jsp	(.../group.jsp)	(revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80)
+++ lams_central/web/group.jsp	(.../group.jsp)	(revision ebb598b9d631fa479aef19110dc7b8c2cce0575b)
@@ -1,9 +1,18 @@
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
+<%@ page import="org.lamsfoundation.lams.util.Configuration"%>
+<%@ page import="org.lamsfoundation.lams.util.ConfigurationKeys"%>
 
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<c:set var="isCollapsingSubcoursesEnabled"><%=Configuration.getAsBoolean(ConfigurationKeys.ENABLE_COLLAPSING_SUBCOURSES)%></c:set>
 
+<script>
+$(document).ready(function(){
+
+})
+</script>
+
 <div class="course-header">
 	<span class="lead">
 		<strong><c:out value="${orgBean.name}" /></strong>
@@ -37,18 +46,46 @@
 	<c:forEach var="childOrg" items="${orgBean.childIndexOrgBeans}">
 		<div class="group-name">
 			<div class="child-org-name">
-				<strong><c:out value="${childOrg.name}" /></strong>
+			
+				<c:choose>
+					<c:when test="${isCollapsingSubcoursesEnabled && not empty childOrg.lessons}">
+						<a data-toggle="collapse" class="subcourse-title collapsed" data-groupid="${childOrg.id}">
+							<c:choose>
+								<c:when test="${childOrg.collapsed}">
+									<i class="fa fa-plus-square-o"></i>
+								</c:when>
+								<c:otherwise>
+									<i class="fa fa-minus-square-o"></i>
+								</c:otherwise>
+							</c:choose>
+						
+							<strong><c:out value="${childOrg.name}" /></strong>
+						</a>
+					</c:when>
+					
+					<c:when test="${isCollapsingSubcoursesEnabled}">
+						<i class="fa" style="min-width:12px;"></i>
+						<strong><c:out value="${childOrg.name}" /></strong>
+					</c:when>
+					
+					<c:otherwise>
+						<strong><c:out value="${childOrg.name}" /></strong>
+					</c:otherwise>
+				</c:choose>
+				
 				<c:if test="${not empty childOrg.archivedDate}">
 					<small>(<fmt:message key="label.archived"/> <lams:Date value="${childOrg.archivedDate}"/>)</small>
 				</c:if>
 			</div>
 			
 			<c:set var="org" value="${childOrg}" />
 			<%@ include file="groupHeader.jsp"%>
-
-			<div id="${childOrg.id}-lessons" class="lesson-table subgroup-lesson-table">
+			
+			<div id="${childOrg.id}-lessons" class="lesson-table subgroup-lesson-table panel-collapse collapse 
+				<c:if test="${!childOrg.collapsed}">in</c:if>">
 				<%@ include file="groupContents.jsp"%>
 			</div>
+
 		</div>
 	</c:forEach>
 </div>