Index: lams_central/web/groupContents.jsp
===================================================================
diff -u -r4f284603a74199f14d9eb0d5e1cc04b89755ba31 -rdc7b67e7677c8cd2289130c67094a62b39177d05
--- lams_central/web/groupContents.jsp	(.../groupContents.jsp)	(revision 4f284603a74199f14d9eb0d5e1cc04b89755ba31)
+++ lams_central/web/groupContents.jsp	(.../groupContents.jsp)	(revision dc7b67e7677c8cd2289130c67094a62b39177d05)
@@ -1,202 +1,47 @@
 <%@ page contentType="text/html; charset=utf-8" language="java"%>
+
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-core" prefix="c"%>
-<%@ taglib uri="tags-lams" prefix="lams"%>
 
-<c:set var="hasLessonToSort">false</c:set>
-
-<div class="j-course-contents">
-		
-	<div class="sequence-name">
-		<div id="<c:out value="${orgBean.id}"/>-lessons" class="j-lessons">
-		<c:if test="${allowSorting}">
-			<div id="sorter-div-${orgBean.id}" class="mycourses-right-buttons" style="display:none;">
-				<a class="sorting" onclick="makeOrgSortable(<c:out value="${orgBean.id}"/>)" title="<fmt:message key="label.enable.lesson.sorting"/>">
-					<img src="<lams:LAMSURL/>/images/sorting_disabled.gif">
+<c:forEach var="lesson" items="${org.lessons}">
+	<div id="${lesson.id}" class="j-single-lesson">
+		<c:choose>
+			<c:when test="${empty lesson.url}">
+				<a class="disabled-sequence-name-link"> <c:out value="${lesson.name}" />
 				</a>
-			</div>
+			</c:when>
+			<c:otherwise>
+				<a href="<c:out value="${lesson.url}"/>" class="sequence-name-link"> <c:out value="${lesson.name}" />
+				</a>
+			</c:otherwise>
+		</c:choose>
+		<c:if test="${lesson.state eq 4}">
+			<span class="mycourses-stop-img mycourses-span" title="<fmt:message key="label.disabled"/>">&nbsp;</span>
 		</c:if>
-		<table class="lesson-table">
-			<c:forEach var="lesson" items="${orgBean.lessons}">
-				<c:set var="hasLessonToSort">true</c:set>
-			<tr id="<c:out value="${lesson.id}"/>" class="j-single-lesson">
-					<td class="td-lesson" style="width: 25px;">
-					<c:if test="${lesson.completed}"> <span class="mycourses-completed-img" title="<fmt:message key="label.completed"/>" >&nbsp;</span> </c:if>
-                    </td>
-					<td class="td-lesson" style="word-wrap: break-word;">
-						<c:choose>
-							<c:when test="${empty lesson.url}">
-								<a class="disabled-sequence-name-link"> <c:out value="${lesson.name}" /></a> 
-							</c:when>
-							<c:otherwise>
-								<a href="<c:out value="${lesson.url}"/>" class="sequence-name-link"> <c:out value="${lesson.name}" /></a> 
-							</c:otherwise>
-						</c:choose>
-                        </td>
-					<td class="td-lesson" style="width: 150px;">
-						<c:if test="${lesson.state eq 4}"> <span class="mycourses-stop-img" title="<fmt:message key="label.disabled"/>" >&nbsp;</span> </c:if>
-						<c:if test="${lesson.state eq 6}"> <span class="mycourses-stop-img" title="<fmt:message key="label.archived"/>" >&nbsp;</span> </c:if>
-						<c:if test="${lesson.dependent or lesson.scheduledFinish}"> <span class="mycourses-conditions-img" title="<fmt:message key="index.conditions.flag.tooltip"/>" >&nbsp;</span> </c:if>
-					</td>
-					<c:choose>
-						<c:when test="${empty lesson.links}">
-							<td class="td-lesson" style="width: 220px;"></td>
-						</c:when>
-						<c:otherwise>
-							<td class="split-menu-button" style="width: 220px;">
-								<ul>
-									<li>
-										<c:forEach var="lessonlink" items="${lesson.links}" varStatus="status">
-											<c:set var="tooltip" value="" />
-											<c:if test="${lessonlink.tooltip ne null}">
-												<c:set var="tooltip">
-													<fmt:message key="${lessonlink.tooltip}" />
-												</c:set>
-											</c:if>
-											
-											<c:choose>
-												<c:when test="${status.first}">
-													<a href="#nogo" class="${lessonlink.style}">
-						                        		<span onclick="<c:out value='${lessonlink.url}'/>" title="${tooltip}" 
-						                        		class="${lessonlink.spanStyle}" style="margin-right:0px">
-						                        			<fmt:message key="${lessonlink.name}" /> &nbsp;
-						                        		</span>
-														<em class="em-menu-button">
-															<img src="<lams:LAMSURL/>/images/icons/bullet_arrow_down.png" alt="dropdown" style="border-style: none;">
-														</em>
-													</a>
-													<ul class="button-menu">
-												</c:when>
-												<c:otherwise>
-													<li>
-														<a href="<c:out value='${lessonlink.url}'/>" class="${lessonlink.style}">
-															<span class="${lessonlink.spanStyle}" title="${tooltip}"><fmt:message key="${lessonlink.name}" /> &nbsp;</span>
-														</a>
-													</li>
-													<c:if test="${status.last}">
-														</ul>
-													</c:if>
-												</c:otherwise>
-											</c:choose>
-										</c:forEach>
-									</li>
-								</ul>
-			        		</td>
-						</c:otherwise>
-					</c:choose>
-				</tr>
-			</c:forEach>
-		</table>
-		</div>
-	</div>
-		
-	<c:forEach var="childOrg" items="${orgBean.childIndexOrgBeans}">
-	<div class="group-name">
-		<p>
-			<c:out value="${childOrg.name}" />
-			<c:if test="${not empty childOrg.archivedDate}">
-				<small>(<fmt:message key="label.archived"/> <lams:Date value="${childOrg.archivedDate}"/>)</small>
-			</c:if>
-			<c:forEach var="childlink" items="${childOrg.links}">
-				<a href="<c:out value='${childlink.url}'/>" class="sequence-action-link"> 
-					<span class="mycourses-addlesson-img" >
-						<fmt:message key="${childlink.name}" />
-					</span>
+		<c:if test="${lesson.state eq 6}">
+			<span class="mycourses-stop-img mycourses-span" title="<fmt:message key="label.archived"/>">&nbsp;</span>
+		</c:if>
+		<c:if test="${lesson.dependent or lesson.scheduledFinish}">
+			<span class="mycourses-conditions-img mycourses-span" title="<fmt:message key="index.conditions.flag.tooltip"/>">&nbsp;</span>
+		</c:if>
+		<c:if test="${lesson.completed}">
+			<span class="mycourses-completed-img mycourses-span" title="<fmt:message key="label.completed"/>">&nbsp;</span>
+		</c:if>
+
+		<div class="lesson-actions">
+			<c:forEach var="lessonlink" items="${lesson.links}">
+				<a href="<c:out value='${lessonlink.url}'/>"
+					<c:if test="${not empty lessonlink.tooltip}">
+						title="<fmt:message key='${lessonlink.tooltip}'/>"
+					</c:if>
+				>
+					<div class="${lessonlink.style} mycourses-div">
+						<span class="lesson-action-label">
+							<fmt:message key="${lessonlink.name}" />
+						</span>
+					</div>
 				</a>
 			</c:forEach>
-			<c:forEach var="childlink" items="${childOrg.moreLinks}">
-				<a href="${childlink.url}" class="sequence-action-link" title="${childlink.tooltip}"> 
-					<span class="${childlink.style}" >
-						<fmt:message key="${childlink.name}" />
-					</span>
-				</a>
-			</c:forEach>    
-		</p>
-		
-		<div class="sequence-name">
-			<div id="<c:out value="${childOrg.id}"/>" class="j-subgroup-lessons">
-			<table class="lesson-table">
-			
-				<c:forEach var="childLesson" items="${childOrg.lessons}">
-					<c:set var="hasLessonToSort">true</c:set>
-					<tr id="<c:out value="${childLesson.id}"/>" class="j-single-lesson">
-						<td class="td-lesson" style="width: 25px;">
-							<c:if test="${childLesson.completed}"> <span class="mycourses-completed-img" title="<fmt:message key="label.completed"/>" >&nbsp;</span> </c:if>
-	                    </td>
-						<td class="td-lesson" style="word-wrap: break-word;">
-							<c:choose>
-								<c:when test="${empty childLesson.url}">
-									<a class="disabled-sequence-name-link"> <c:out value="${childLesson.name}" /></a> 
-								</c:when>
-								<c:otherwise>
-									<a href="<c:out value="${childLesson.url}"/>" class="sequence-name-link"> <c:out value="${childLesson.name}" /></a> 
-								</c:otherwise>
-							</c:choose>
-						</td>
-						<td class="td-lesson" style="width: 150px;">
-							<c:if test="${childLesson.state eq 4}"> <span class="mycourses-stop-img" title="<fmt:message key="label.disabled"/>" >&nbsp;</span> </c:if>
-							<c:if test="${childLesson.state eq 6}"> <span class="mycourses-stop-img" title="<fmt:message key="label.archived"/>" >&nbsp;</span> </c:if>
-							<c:if test="${childLesson.dependent or childLesson.scheduledFinish}"> <span class="mycourses-conditions-img" title="<fmt:message key="index.conditions.flag.tooltip"/>" >&nbsp;</span> </c:if>
-						</td>
-						<c:choose>
-							<c:when test="${empty childLesson.links}">
-							<td class="td-lesson" style="width: 220px;"></td>
-							</c:when>
-							<c:otherwise>
-								<td class="split-menu-button" style="width: 220px;">
-									<ul>
-										<li>
-											<c:forEach var="childLessonlink" items="${childLesson.links}" varStatus="status">
-												<c:set var="tooltip" value="" />
-												<c:if test="${childLessonlink.tooltip ne null}">
-													<c:set var="tooltip">
-														<fmt:message key="${childLessonlink.tooltip}" />
-													</c:set>
-												</c:if>
-												
-												<c:choose>
-													<c:when test="${status.first}">
-														<a href="#nogo" class="${childLessonlink.style}">
-							                        		<span onclick="<c:out value='${childLessonlink.url}'/>" title="${tooltip}" 
-							                        		class="${childLessonlink.spanStyle}" style="margin-right:0px">
-							                        			<fmt:message key="${childLessonlink.name}" /> &nbsp;
-							                        		</span>
-															<em class="em-menu-button">
-																<img src="<lams:LAMSURL/>/images/icons/bullet_arrow_down.png" alt="dropdown">
-															</em>
-														</a>
-														<ul class="button-menu">
-													</c:when>
-													<c:otherwise>
-														<li>
-															<a href="<c:out value='${childLessonlink.url}'/>" class="${childLessonlink.style}">
-																<span class="${childLessonlink.spanStyle}" title="${tooltip}"><fmt:message key="${childLessonlink.name}" /> &nbsp;</span>
-															</a>
-														</li>
-														<c:if test="${status.last}">
-															</ul>
-														</c:if>
-													</c:otherwise>
-												</c:choose>
-											</c:forEach>
-										</li>
-									</ul>
-			        			</td>
-		   					</c:otherwise>
-						</c:choose>
-					</tr>
-				</c:forEach>
-				
-			</table>
-			</div>
 		</div>
 	</div>
-	</c:forEach>
-	
-</div>
-
-<c:if test="${allowSorting && (hasLessonToSort eq 'true')}">
-<script>
-	jQuery("#sorter-div-${orgBean.id}").show();
-</script>
-</c:if>
\ No newline at end of file
+</c:forEach>
\ No newline at end of file