Index: lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Attic/Message.hbm.xml,v
diff -u -r1.18.2.2 -r1.18.2.3
--- lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	27 Apr 2016 13:22:35 -0000	1.18.2.2
+++ lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml	13 Feb 2017 07:48:01 -0000	1.18.2.3
@@ -177,6 +177,14 @@
             column="hide_flag"
         />
 
+        <property
+            name="isMonitor"
+            type="boolean"
+            update="true"
+            insert="true"
+            column="is_monitor"
+        />
+
         <many-to-one
             name="report"
             class="org.lamsfoundation.lams.tool.forum.persistence.ForumReport"
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20160213.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java,v
diff -u -r1.40.2.6 -r1.40.2.7
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	27 Nov 2016 06:51:35 -0000	1.40.2.6
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java	13 Feb 2017 07:48:01 -0000	1.40.2.7
@@ -51,6 +51,7 @@
     private int sequenceId;
     private boolean isAuthored;
     private boolean isAnonymous;
+    private boolean isMonitor;
 
     private Date created;
     private Date updated;
@@ -134,6 +135,7 @@
 	clone.setSequenceId(this.getSequenceId());
 	clone.setHideFlag(this.isHideFlag());
 	clone.setIsAnonymous(this.isAnonymous);
+	clone.setIsMonitor(this.isMonitor);
 	clone.setIsAuthored(this.getIsAuthored());
 	clone.setLastReplyDate(this.getLastReplyDate());
 	clone.setModifiedBy(clone.getModifiedBy());
@@ -392,6 +394,24 @@
     }
 
     /**
+     * @return Returns whether the Message should be shown as a teacher/tutor message created in monitoring
+     *
+     *
+     *
+     */
+    public boolean getIsMonitor() {
+	return isMonitor;
+    }
+
+    /**
+     * @param isAnonymous
+     *            Indicates whether the Message should be shown as a teacher/tutor message created in monitoring
+     */
+    public void setIsMonitor(boolean isMonitor) {
+	this.isMonitor = isMonitor;
+    }
+
+    /**
      * Gets the toolSession
      *
      *
Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java,v
diff -u -r1.85.2.8 -r1.85.2.9
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	9 Sep 2016 07:24:15 -0000	1.85.2.8
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java	13 Feb 2017 07:48:01 -0000	1.85.2.9
@@ -696,6 +696,7 @@
 	message.setCreatedBy(forumUser);
 	message.setModifiedBy(forumUser);
 	setAttachment(messageForm, message);
+	setMonitorMode(sessionMap, message);
 
 	// save message into database
 	forumService = getForumManager();
@@ -797,6 +798,7 @@
 	message.setCreatedBy(forumUser);
 	message.setModifiedBy(forumUser);
 	setAttachment(messageForm, message);
+	setMonitorMode(sessionMap, message);
 
 	// save message into database
 	forumService = getForumManager();
@@ -844,6 +846,7 @@
 	message.setCreatedBy(forumUser);
 	message.setModifiedBy(forumUser);
 	setAttachment(messageForm, message);
+	setMonitorMode(sessionMap, message);
 
 	// save message into database
 	forumService = getForumManager();
@@ -871,6 +874,11 @@
 	return null;
     }
 
+    private void setMonitorMode(SessionMap<String, Object> sessionMap, Message message) {
+	message.setIsMonitor(ToolAccessMode.TEACHER.equals(sessionMap.get(AttributeNames.ATTR_MODE)));
+    }
+    
+    
     /**
      * Display a editable form for a special topic in order to update it.
      *
Index: lams_tool_forum/web/css/jquery.treetable.forum.css
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/css/jquery.treetable.forum.css,v
diff -u -r1.3.2.5 -r1.3.2.6
--- lams_tool_forum/web/css/jquery.treetable.forum.css	17 Nov 2016 23:40:47 -0000	1.3.2.5
+++ lams_tool_forum/web/css/jquery.treetable.forum.css	13 Feb 2017 07:48:01 -0000	1.3.2.6
@@ -54,9 +54,12 @@
 }
 
 div.highlight {
-	border:2px solid #cacdd1; 
+	background-color: #fcf0ad;
 }
- 
+table.highlight {
+	background : none;
+}
+
 #clearfix:after { 
     content: " "; 
     display: block;
Index: lams_tool_forum/web/includes/layout.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/layout.jsp,v
diff -u -r1.19.12.2 -r1.19.12.3
--- lams_tool_forum/web/includes/layout.jsp	9 May 2016 12:03:50 -0000	1.19.12.2
+++ lams_tool_forum/web/includes/layout.jsp	13 Feb 2017 07:48:01 -0000	1.19.12.3
@@ -19,7 +19,7 @@
 			</logic:notEmpty>
 			</c:set>
 
-			<lams:Page type="learner" title="${title}">
+			<lams:Page type="monitor" title="${title}">
 
 			<tiles:insert attribute="body" />
 
Index: lams_tool_forum/web/includes/javascript/message.js
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/includes/javascript/message.js,v
diff -u -r1.3.14.3 -r1.3.14.4
--- lams_tool_forum/web/includes/javascript/message.js	9 May 2016 12:03:50 -0000	1.3.14.3
+++ lams_tool_forum/web/includes/javascript/message.js	13 Feb 2017 07:48:01 -0000	1.3.14.4
@@ -42,8 +42,10 @@
 	
 	function highlightMessage() {
 		$('.highlight').filter($('table')).css('background','none');
-		$('.highlight').filter($('div')).effect('highlight', {color: "#fcf0ad"}, 6000);
-		$('.highlight').removeClass('highlight');
+		$('.highlight').filter($('div')).switchClass('highlight', '', 6000);
+		// monitor messages have bg-info class - need to fade from highlight yellow to that, otherwise from yellow to nothing
+		$('.highlight').filter($('div')).children('.bg-info').removeClass('bg-info').switchClass('highlight', 'bg-info', 6000);
+
 	}
 
 	function setupJRating(rateMessagePath) {
Index: lams_tool_forum/web/jsps/learning/message/msgview.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/msgview.jsp,v
diff -u -r1.2.2.10 -r1.2.2.11
--- lams_tool_forum/web/jsps/learning/message/msgview.jsp	23 Sep 2016 08:38:43 -0000	1.2.2.10
+++ lams_tool_forum/web/jsps/learning/message/msgview.jsp	13 Feb 2017 07:48:01 -0000	1.2.2.11
@@ -29,7 +29,21 @@
 <div class="panel panel-default ${highlightClass} msg" id="msg${msgDto.message.uid}">
 	<div class="panel-heading">
 		<h4 class="panel-title">
-			<span style="float: right"> <i class="fa fa-xs fa-user"></i> 
+
+			<c:choose>
+				<c:when test="${msgDto.message.isMonitor}">
+ 	            	<c:set var="textClass" value="text-info"/>
+ 	                <c:set var="bgClass" value="bg-info"/>
+ 	                <c:set var="iconClass" value ="fa-mortar-board ${textClass}"/>
+ 	            </c:when>
+				<c:otherwise>
+ 	            	<c:set var="textClass" value=""/>
+ 	                <c:set var="bgClass" value=""/>
+ 	                <c:set var="iconClass" value ="fa-user ${textClass}"/>
+ 	            </c:otherwise>
+ 	        </c:choose>
+ 	        
+			<span style="float: right" class="${textClass}"> <i class="fa fa-xs ${iconClass}"></i> 
 			  <c:if test='${(sessionMap.mode == "teacher") || (not hidden)}'>
 					<c:set var="author" value="${msgDto.author}" />
 					<c:if test="${empty author}">
@@ -42,6 +56,7 @@
 				<lams:Date value="${msgDto.message.updated}" timeago="true"/>
 				</c:if>
 			</span>
+			<span class="${textClass}">
 			<c:choose>
 				<c:when test='${(sessionMap.mode == "teacher") || (not hidden)}'>
 					<c:out value="${msgDto.message.subject}" />
@@ -50,10 +65,11 @@
 				&nbsp;<fmt:message key="topic.message.subject.hidden" />
 				</c:otherwise>
 			</c:choose>
+			</span>
 		</h4>
 	</div> <!--  end of panel-heading -->
 
-	<div class="panel-body" id="pb-msg${msgDto.message.uid}">
+	<div class="panel-body ${bgClass}" id="pb-msg${msgDto.message.uid}">
 		<span> <c:if test='${(not hidden) || (hidden && sessionMap.mode == "teacher")}'>
 				<c:out value="${msgDto.message.body}" escapeXml="false" />
 			</c:if> <c:if test='${hidden}'>
Index: lams_tool_forum/web/jsps/monitoring/viewmarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/viewmarks.jsp,v
diff -u -r1.10.2.4 -r1.10.2.5
--- lams_tool_forum/web/jsps/monitoring/viewmarks.jsp	23 Sep 2016 08:38:43 -0000	1.10.2.4
+++ lams_tool_forum/web/jsps/monitoring/viewmarks.jsp	13 Feb 2017 07:48:01 -0000	1.10.2.5
@@ -19,16 +19,32 @@
 <c:forEach items="${messages}" var="topic">
 
 <div class="panel panel-default ${highlightClass} msg" >
+
+	<c:choose>
+		<c:when test="${topic.message.isMonitor}">
+            	<c:set var="textClass" value="text-info"/>
+                <c:set var="bgClass" value="bg-info"/>
+                <c:set var="iconClass" value ="fa-mortar-board ${textClass}"/>
+            </c:when>
+		<c:otherwise>
+            	<c:set var="textClass" value=""/>
+                <c:set var="bgClass" value=""/>
+                <c:set var="iconClass" value ="fa-user ${textClass}"/>
+        </c:otherwise>
+    </c:choose>
+
 	<div class="panel-heading">
 		<h4 class="panel-title">
-			<span style="float: right"> <i class="fa fa-xs fa-user"></i> 
+		<span class="${textClass}">
+			<span style="float: right"> <i class="fa fa-xs ${iconClass}"></i> 
 				<lams:Date value="${topic.message.updated}" />
 			</span>
 			<c:out value="${topic.message.subject}" />
+		</span>
 		</h4>
 	</div>
 
-	<div class="panel-body" >
+	<div class="panel-body ${bgClass}" >
 
 	<div class="pull-right"><html:form action="/monitoring/editMark" method="post">
 			<html:hidden property="sessionMapID" value="${sessionMapID}"/>