Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp,v
diff -u -r1.39.2.20 -r1.39.2.21
--- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	13 Dec 2016 05:55:03 -0000	1.39.2.20
+++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp	10 Apr 2017 09:22:56 -0000	1.39.2.21
@@ -24,7 +24,6 @@
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.theme.bootstrap.css">
 	<link rel="stylesheet" type="text/css" href="${lams}css/jquery.tablesorter.pager.css"> 
 	<link type="text/css" rel="stylesheet" href="<html:rewrite page='/includes/qalearning.css'/>">
-	
 	<style media="screen,projection" type="text/css">
 		.rating-stars-div {
 			padding-top: 12px;
@@ -95,9 +94,6 @@
 	<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/jquery.timeago.js"></script>
 	<script type="text/javascript" src="${lams}includes/javascript/timeagoi18n/jquery.timeago.${fn:toLowerCase(localeLanguage)}.js"></script>
-	
-	
- 	<!-- ******************** FCK Editor related javascript & HTML ********************** -->
 	<script type="text/javascript">
 	
 		var POSTED_BY_LABEL = '<fmt:message key="label.posted.by"><fmt:param>{0}</fmt:param><fmt:param>{1}</fmt:param></fmt:message>';
@@ -366,40 +362,39 @@
 	<html:hidden property="httpSessionID"/>					
 	<html:hidden property="contentFolderID"/>	
 	
-<lams:Page title="${title}" type="navbar">
-
-	<lams:Tabs title="${title}" control="true" helpToolSignature="<%= QaAppConstants.MY_SIGNATURE %>" helpModule="monitoring">
-		<lams:Tab id="1" key="label.summary" />
-		<lams:Tab id="2" key="label.editActivity" />
-		<lams:Tab id="3" key="label.stats" />
-	</lams:Tabs>
-
-
-	<lams:TabBodyArea>
-		<lams:TabBodys>
-			<lams:TabBody id="1" titleKey="label.summary" page="SummaryContent.jsp" />
-			<lams:TabBody id="2" titleKey="label.editActivity" page="Edit.jsp" />
-			<lams:TabBody id="3" titleKey="label.stats" page="Stats.jsp" />
-		</lams:TabBodys>
-	</lams:TabBodyArea>
-		
-	<div id="footer"></div>
+	<lams:Page title="${title}" type="navbar">
 	
-	<div id="edit-response-dialog" title="<fmt:message key='label.modify.users.response' />" class="dialog">
-		<br>
-	</div>
+		<lams:Tabs title="${title}" control="true" helpToolSignature="<%= QaAppConstants.MY_SIGNATURE %>" helpModule="monitoring">
+			<lams:Tab id="1" key="label.summary" />
+			<lams:Tab id="2" key="label.editActivity" />
+			<lams:Tab id="3" key="label.stats" />
+		</lams:Tabs>
 	
-	<div id="updated-response-editor" class="dialog">
-		<c:choose>
-			<c:when test="${content.allowRichEditor}">
-				<lams:CKEditor id="updated-response" value="" toolbarSet="DefaultMonitor"/>
-			</c:when>
-			<c:otherwise>
-				<lams:textarea name="updated-response" id="updated-response" rows="16" cols="108"> </lams:textarea>
-			</c:otherwise>
-		</c:choose>
-	</div>
-</lams:Page>
+		<lams:TabBodyArea>
+			<lams:TabBodys>
+				<lams:TabBody id="1" titleKey="label.summary" page="SummaryContent.jsp" />
+				<lams:TabBody id="2" titleKey="label.editActivity" page="Edit.jsp" />
+				<lams:TabBody id="3" titleKey="label.stats" page="Stats.jsp" />
+			</lams:TabBodys>
+		</lams:TabBodyArea>
+			
+		<div id="footer"></div>
+		
+		<div id="edit-response-dialog" title="<fmt:message key='label.modify.users.response' />" class="dialog">
+			<br>
+		</div>
+		
+		<div id="updated-response-editor" class="dialog">
+			<c:choose>
+				<c:when test="${content.allowRichEditor}">
+					<lams:CKEditor id="updated-response" value="" toolbarSet="DefaultMonitor"/>
+				</c:when>
+				<c:otherwise>
+					<lams:textarea name="updated-response" id="updated-response" rows="16" cols="108"> </lams:textarea>
+				</c:otherwise>
+			</c:choose>
+		</div>
+	</lams:Page>
 </html:form>
 </body>
 </lams:html>
Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/SummaryContent.jsp,v
diff -u -r1.46.2.7 -r1.46.2.8
--- lams_tool_laqa/web/monitoring/SummaryContent.jsp	11 Dec 2016 01:34:11 -0000	1.46.2.7
+++ lams_tool_laqa/web/monitoring/SummaryContent.jsp	10 Apr 2017 09:22:56 -0000	1.46.2.8
@@ -21,30 +21,28 @@
 	</c:if>
 </div>
 
-
-
-
 <c:forEach var="groupDto" items="${listAllGroupsDTO}" varStatus="status">
 			  
 	<c:if test="${isGroupedActivity}">	
 	    <div class="panel panel-default" >
         <div class="panel-heading" id="heading${sessionDto.sessionID}">
         	<span class="panel-title collapsable-icon-left">
-        	<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${groupDto.sessionId}" 
-					aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${groupDto.sessionId}" >
-			<fmt:message key="group.label" />:	<c:out value="${groupDto.sessionName}" /></a>
+	        	<a class="${status.first ? '' : 'collapsed'}" role="button" data-toggle="collapse" href="#collapse${groupDto.sessionId}" 
+						aria-expanded="${status.first ? 'false' : 'true'}" aria-controls="collapse${groupDto.sessionId}" >
+					<fmt:message key="group.label" />:	<c:out value="${groupDto.sessionName}" />
+				</a>
 			</span>
         </div>
         
         <div id="collapse${groupDto.sessionId}" class="panel-collapse collapse ${status.first ? 'in' : ''}" role="tabpanel"
-        	 aria-labelledby="heading${groupDto.sessionId}">
+				aria-labelledby="heading${groupDto.sessionId}">
 	</c:if>	 
 	
 	<c:if test="${content.reflect}"> 			
 		<div style="margin-bottom: 20px">
 			<c:set var="viewReflectionsURL"><lams:WebAppURL/>/monitoring/Reflections.jsp?toolSessionID=${groupDto.sessionId}</c:set>
 			<html:button property="viewAllMarks" onclick="javascript:launchPopup('${viewReflectionsURL}')"
-						 styleClass="btn btn-default loffset5 voffset10" >
+					styleClass="btn btn-default loffset5 voffset10" >
 				<fmt:message key="label.notebook.entries" />
 			</html:button>
 		</div>
@@ -57,17 +55,21 @@
 			</div>
 			<lams:TSTable numColumns="${content.allowRateAnswers ? (isCommentsEnabled ? 3 : 2) : (isCommentsEnabled ? 2 : 1)}"
 						  dataId="data-session-id='${groupDto.sessionId}' data-question-uid='${question.uid}'">
-					<th title="<fmt:message key='label.sort.by.answer'/>"><fmt:message key="label.learning.answer"/></th>
-					<c:if test="${isRatingsEnabled}">
-						<th title="<fmt:message key='label.sort.by.rating'/>">
-							<fmt:message key="label.learning.rating" />
-						</th>
-					</c:if>
-					<c:if test="${isCommentsEnabled}">
-						<th>
-							<fmt:message key="label.comment" />
-						</th>
-					</c:if>
+				<th title="<fmt:message key='label.sort.by.answer'/>">
+					<fmt:message key="label.learning.answer"/>
+				</th>
+				
+				<c:if test="${isRatingsEnabled}">
+					<th title="<fmt:message key='label.sort.by.rating'/>">
+						<fmt:message key="label.learning.rating" />
+					</th>
+				</c:if>
+				
+				<c:if test="${isCommentsEnabled}">
+					<th>
+						<fmt:message key="label.comment" />
+					</th>
+				</c:if>
 			</lams:TSTable>
 		</div>
 	</c:forEach>