Index: lams_central/web/WEB-INF/tags/Comments.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/WEB-INF/tags/Comments.tag,v
diff -u -r1.4 -r1.5
--- lams_central/web/WEB-INF/tags/Comments.tag	12 Jan 2016 00:49:06 -0000	1.4
+++ lams_central/web/WEB-INF/tags/Comments.tag	18 Jan 2016 02:18:33 -0000	1.5
@@ -18,7 +18,7 @@
 </c:if>
 
 <c:if test="${empty height}">
-	<c:set var="height" value="470px" />
+	<c:set var="height" value="auto" />
 </c:if>
 
 <c:set var="modeStr" value=""/>
@@ -34,19 +34,14 @@
 	<c:set var="readOnly" value="false" />
 </c:if>
 
-<c:if test="${empty pageSize}">
-	<c:set var="pageSize" value="<%= CommentConstants.DEFAULT_PAGE_SIZE %>" />
-</c:if>
-
 <c:if test="${empty sortBy}">
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
-<iframe id="commentFrame" class="commentFrame" src="/lams/comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}" style="width: ${width}; height: ${height};"></iframe>
-
+<div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
 <script>
-function resizeCommentFrame(pixels){
-	pixels+=40;
-    document.getElementById('commentFrame').style.height=pixels+"px";
-}
+$(document).ready(function(){
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$('#commentFrame').load(url);
+});
 </script>
\ No newline at end of file
Index: lams_central/web/comments/comments.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/comments/comments.jsp,v
diff -u -r1.6 -r1.7
--- lams_central/web/comments/comments.jsp	12 Jan 2016 00:49:31 -0000	1.6
+++ lams_central/web/comments/comments.jsp	18 Jan 2016 02:18:33 -0000	1.7
@@ -42,27 +42,25 @@
 			    scrollDoneCallback();
 			    
    				$('#sortMenu').change(function(){
-			        var url = "<lams:LAMSURL />/comments/viewTopic.do?sessionMapID=${sessionMapID}&sortBy="+$(this).find("option:selected").attr('value');
+			        var url = "<lams:LAMSURL />comments/viewTopic.do?sessionMapID=${sessionMapID}&sortBy="+$(this).find("option:selected").attr('value');
 			        reloadScroll(url);
 			    });
 			});
 			
 			function refreshComments(){
 				var reqIDVar = new Date();
-				reloadScroll('<lams:LAMSURL />/comments/viewTopic.do?sessionMapID=${sessionMapID}&reqUid='+reqIDVar.getTime());
+				reloadScroll('<lams:LAMSURL />comments/viewTopic.do?sessionMapID=${sessionMapID}&reqUid='+reqIDVar.getTime());
 			}
 
 			function reloadScroll(url) {
 				$('#newcomments').children().remove();
 				$('.scroll').load(url, function() {
 					$('.scroll').data('jscroll', null);
 					$('.scroll').jscroll({loadingHtml: '<img src="${loading_animation}" alt="${loading_words}" />${loading_words}',padding:30,autoTrigger:false,callback:scrollDoneCallback});
-					resizeIframe();
 				});
 			}
 			
 			function scrollDoneCallback() {
-				resizeIframe();				
 			}
 		</script>		
 		
Index: lams_central/web/comments/edit.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/comments/edit.jsp,v
diff -u -r1.2 -r1.3
--- lams_central/web/comments/edit.jsp	5 Jan 2016 05:43:46 -0000	1.2
+++ lams_central/web/comments/edit.jsp	18 Jan 2016 02:18:33 -0000	1.3
@@ -45,7 +45,7 @@
 					// make sure the old edit form is gone, so the user won't try to submit it again
 					$('#edit').remove();
 				}
-				reloadThread(response);
+				reloadThread(response,'<lams:LAMSURL />','<fmt:message key="error.cannot.redisplay.please.refresh"/>','<fmt:message key="error.please.refresh"/>');
     		});
 		} // end validateBodyText
 		return false;
@@ -58,7 +58,7 @@
 </script>
 
 <div class="comment-entry">
-<form id="editForm" method="GET" action="<html:rewrite page="/comments/updateTopicInline.do"/>">
+<form id="editForm" method="GET" action="<lams:LAMSURL />comments/updateTopicInline.do">
 	<textarea rows="3" cols="80" id="editFormBody" maxlength="<%=CommentConstants.MAX_BODY_LENGTH+2%>" name="body" class="comment">${comment.comment.body}</textarea>
 	<input type="hidden" id="sessionMapID" name="sessionMapID" value="${sessionMapID}"/>
 	<input type="hidden" id="commentUid" name="commentUid" value="${commentUid}"/>
Index: lams_central/web/comments/msgview.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/comments/msgview.jsp,v
diff -u -r1.4 -r1.5
--- lams_central/web/comments/msgview.jsp	5 Jan 2016 05:43:46 -0000	1.4
+++ lams_central/web/comments/msgview.jsp	18 Jan 2016 02:18:33 -0000	1.5
@@ -54,17 +54,13 @@
 			<tr>
 				<td>
 					<c:if test = '${sessionMap.mode == "learner" && not sessionMap.readOnly}'>
-					<c:set var="replytopic">
-						<html:rewrite page="/comments/newReplyTopic.do?sessionMapID=${sessionMapID}&parentUid=${commentDto.comment.uid}" />
-					</c:set>
+					<c:set var="replytopic"><lams:LAMSURL />comments/newReplyTopic.do?sessionMapID=${sessionMapID}&parentUid=${commentDto.comment.uid}</c:set>
 					<a href="#" onclick="javascript:createReply(${commentDto.comment.uid}, '${replytopic}');" class="comment">Reply</a>
 					&middot; 
 					</c:if>
 					
 					<c:if test='${((sessionMap.mode == "teacher") || commentDto.author) && not sessionMap.readOnly }'>
-						<c:set var="edittopic">
-						<html:rewrite page="/comments/editTopic.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&create=${commentDto.comment.created.time}" />
-						</c:set>
+						<c:set var="edittopic"><lams:LAMSURL />comments/editTopic.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&create=${commentDto.comment.created.time}</c:set>
 						<a href="#" onclick="javascript:createEdit(${commentDto.comment.uid}, '${edittopic}');" class="comment">Edit</a> 
 					&middot; 
 					</c:if>
@@ -74,16 +70,12 @@
 					<c:choose>
 						<c:when test="${hidden}">
 							<!--  display a show link  -->
-							<c:set var="hideURL">
-								<html:rewrite page="/comments/hide.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&hideFlag=false" />
-							</c:set>
+							<c:set var="hideURL"><lams:LAMSURL />comments/hide.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&hideFlag=false</c:set>
 							<html:link href="javascript:hideEntry(${commentDto.comment.uid}, '${hideURL}');" styleClass="comment"><fmt:message key="label.show" /></html:link>
 						</c:when>
 						<c:otherwise>
 							<!--  display a hide link -->
-							<c:set var="hideURL">
-								<html:rewrite page="/comments/hide.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&hideFlag=true" />
-							</c:set>
+							<c:set var="hideURL"><lams:LAMSURL />comments/hide.do?sessionMapID=${sessionMapID}&commentUid=${commentDto.comment.uid}&hideFlag=true"</c:set>
 							<html:link href="javascript:hideEntry(${commentDto.comment.uid}, '${hideURL}');" styleClass="comment"><fmt:message key="label.hide" /></html:link>
 						</c:otherwise>
 					</c:choose>
Index: lams_central/web/comments/new.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/comments/new.jsp,v
diff -u -r1.4 -r1.5
--- lams_central/web/comments/new.jsp	8 Jan 2016 05:43:11 -0000	1.4
+++ lams_central/web/comments/new.jsp	18 Jan 2016 02:18:33 -0000	1.5
@@ -40,10 +40,9 @@
        			if ( ! newCommentDiv || ! newThreadDiv ) {
        				alert('<fmt:message key="error.cannot.redisplay.please.refresh"/>');
    				} else if ( commentUid ) {
-       				var loadString = '<html:rewrite page="/comments/viewTopicThread.do?sessionMapID="/>' + response.sessionMapID + "&threadUid=" + threadUid+"&commentUid="+commentUid;
+       				var loadString = '<lams:LAMSURL />comments/viewTopicThread.do?sessionMapID=' + response.sessionMapID + "&threadUid=" + threadUid+"&commentUid="+commentUid;
 					$(newThreadDiv).load(loadString, function() {
 						highlightMessage();
-						resizeIframe();
 					});
 					clearNewForm();
 				} else if ( response.errMessage ) {
@@ -65,7 +64,7 @@
 </script>
 
 <div class="comment-entry">
-<form id="newForm" method="GET" action="<html:rewrite page="/comments/newComment.do"/>">
+<form id="newForm" method="GET" action="<lams:LAMSURL />comments/newComment.do">
 	<textarea rows="3" cols="80" id="newFormBody" maxlength="<%=CommentConstants.MAX_BODY_LENGTH+2%>" name="body" class="comment"></textarea>
 	<input type="hidden" id="sessionMapID" name="sessionMapID" value="${sessionMapID}"/>
 	
Index: lams_central/web/comments/reply.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/comments/reply.jsp,v
diff -u -r1.2 -r1.3
--- lams_central/web/comments/reply.jsp	5 Jan 2016 05:43:46 -0000	1.2
+++ lams_central/web/comments/reply.jsp	18 Jan 2016 02:18:33 -0000	1.3
@@ -44,7 +44,7 @@
         		// the user won't try to submit it again
 				$('#reply').remove();
 				}
-			reloadThread(response);
+			reloadThread(response,'<lams:LAMSURL />','<fmt:message key="error.cannot.redisplay.please.refresh"/>','<fmt:message key="error.please.refresh"/>');
 			});
 		} // end validateBodyText
 	return false;
@@ -57,7 +57,7 @@
 </script>
 
 <div class="comment-entry">
-<form id="replyForm" method="GET" action="<html:rewrite page="/comments/replyTopicInline.do"/>">
+<form id="replyForm" method="GET" action="<lams:LAMSURL />comments/replyTopicInline.do">
 	<textarea rows="3" cols="80" id="replyFormBody" maxlength="<%=CommentConstants.MAX_BODY_LENGTH+2%>" name="body" class="comment"></textarea>
 	<input type="hidden" id="sessionMapID" name="sessionMapID" value="${sessionMapID}"/>
 	<input type="hidden" id="parentUid" name="parentUid" value="${parentUid}"/>
Index: lams_central/web/comments/topicview.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/comments/topicview.jsp,v
diff -u -r1.5 -r1.6
--- lams_central/web/comments/topicview.jsp	8 Jan 2016 05:43:11 -0000	1.5
+++ lams_central/web/comments/topicview.jsp	18 Jan 2016 02:18:33 -0000	1.6
@@ -42,9 +42,7 @@
 			var parentDiv = document.getElementById('msg'+commentUid);
 			parentDiv.appendChild(replyDiv);
 			
-			$(replyDiv).load(url, function() {
-				resizeIframe();
-			});
+			$(replyDiv).load(url);
 		}
 	}
 	
@@ -61,9 +59,7 @@
 			var parentDiv = document.getElementById('msg'+commentUid);
 			parentDiv.appendChild(editDiv);
 
-			$(editDiv).load(url, function() {
-				resizeIframe();
-			});
+			$(editDiv).load(url);
 		}
 	}
 
@@ -74,7 +70,7 @@
 		    url: url
 		})
 	    .done(function (response) {
-			reloadThread(response);
+			reloadThread(response, '<lams:LAMSURL />','<fmt:message key="error.cannot.redisplay.please.refresh"/>','<fmt:message key="error.please.refresh"/>');
 	    });
 	}
 
@@ -98,7 +94,7 @@
 		
 	function likeEntry(commentUid) {
 		updateLike(commentUid,
-			'<html:rewrite page="/comments/like.do"/>?sessionMapID=${sessionMapID}&commentUid='+commentUid,
+			'<lams:LAMSURL />comments/like.do?sessionMapID=${sessionMapID}&commentUid='+commentUid,
 			1);		
 		$( '#msglikebutton'+commentUid ).removeClass( 'fa-thumbs-up fa-faded' ).addClass( 'fa-thumbs-o-up' );
 		$( '#msglikebutton'+commentUid ).prop( 'onclick', null );
@@ -110,7 +106,7 @@
 	<c:if test='${sessionMap.likeAndDislike}'> 
 	function dislikeEntry(commentUid) {
 		updateLike(commentUid, 
-			'<html:rewrite page="/comments/dislike.do"/>?sessionMapID=${sessionMapID}&commentUid='+commentUid,
+			'<lams:LAMSURL />comments/dislike.do?sessionMapID=${sessionMapID}&commentUid='+commentUid,
 			 -1);		
 		$( '#msgdislikebutton'+commentUid ).removeClass( 'fa-thumbs-down fa-faded' ).addClass( 'fa-thumbs-o-down' );
 		$( '#msgdislikebutton'+commentUid ).prop( 'onclick', null );
@@ -169,7 +165,7 @@
 
 <c:if test='${maxThreadUid > 0 && ! noMorePages}'>
 	<div class="float-right">
-	<c:set var="more"><html:rewrite page="/comments/viewTopic.do?pageLastId=${maxThreadUid}&likeCount=${minThreadLike}&pageSize=${sessionMap.pageSize}&sessionMapID=${sessionMapID}" /></c:set>
+	<c:set var="more"><lams:LAMSURL />/comments/viewTopic.do?pageLastId=${maxThreadUid}&likeCount=${minThreadLike}&pageSize=${sessionMap.pageSize}&sessionMapID=${sessionMapID}</c:set>
 	<a href="<c:out value="${more}"/>" class="button"><fmt:message key="label.show.more.messages" /></a>
 	</div>
 </c:if>
Index: lams_central/web/comments/topicviewwrapper.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/comments/topicviewwrapper.jsp,v
diff -u -r1.1 -r1.2
--- lams_central/web/comments/topicviewwrapper.jsp	15 Dec 2015 10:20:53 -0000	1.1
+++ lams_central/web/comments/topicviewwrapper.jsp	18 Jan 2016 02:18:33 -0000	1.2
@@ -12,7 +12,7 @@
 </c:set>
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request" />
 <c:set var="sessionMap" value="${sessionScope[sessionMapID]}" />
-<script type="text/javascript" src="../includes/javascript/jquery.treetable.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.treetable.js"></script>
 
 <%@ include file="topicview.jsp"%>
 
Index: lams_central/web/includes/javascript/comments.js
===================================================================
RCS file: /usr/local/cvsroot/lams_central/web/includes/javascript/comments.js,v
diff -u -r1.3 -r1.4
--- lams_central/web/includes/javascript/comments.js	5 Jan 2016 05:43:46 -0000	1.3
+++ lams_central/web/includes/javascript/comments.js	18 Jan 2016 02:18:33 -0000	1.4
@@ -1,7 +1,3 @@
-	function resizeIframe() {
-		parent.resizeCommentFrame(document.body.scrollHeight); 
-	}						
-
 	function highlightMessage() {
 		$('.highlight').filter($('table')).css('background','none');
 		$('.highlight').filter($('div')).effect('highlight', {color: "#fcf0ad"}, 6000);
@@ -18,16 +14,17 @@
 		}
 	}
 
-	function reloadThread(response) {
+	
+	function reloadThread(response, lamsUrl, savedCannotRedisplayMessage, errorCannotRedisplayMessage) {
 	    var threadDiv = document.getElementById('thread'+response.threadUid);
        	var threadUid = response.threadUid;
        	var commentUid = response.commentUid;
 					
        	if ( commentUid ) {
         	if ( ! threadDiv) {
-        		alert('<fmt:message key="error.cannot.redisplay.please.refresh"/>');
+        		alert(savedCannotRedisplayMessage);
        		} else {
-    			var loadString = "viewTopicThread.do?&sessionMapID=" + response.sessionMapID + "&threadUid=" + threadUid+"&commentUid="+commentUid;
+    			var loadString = lamsUrl+"comments/viewTopicThread.do?&sessionMapID=" + response.sessionMapID + "&threadUid=" + threadUid+"&commentUid="+commentUid;
 				$(threadDiv).load(loadString, function() {
 					// expand up to the reply - in case it is buried down in a lot of replies
 					// don't need to do this if we have started a new thread.
@@ -36,13 +33,12 @@
 						$('#msg'+commentUid).focus();
 					}
 					highlightMessage();
-					resizeIframe();
 				});
 			}
     	} else if ( response.errMessage ) {
 	    	// No valid id? Something failed. Assume it is a response message coming back.
 			alert(response.errMessage);
 		} else {
-    		alert('<fmt:message key="error.please.refresh"/>');
+    		alert(errorCannotRedisplayMessage);
     	} 
 	}
Index: lams_tool_nb/web/WEB-INF/tags/Comments.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/Comments.tag,v
diff -u -r1.5 -r1.6
--- lams_tool_nb/web/WEB-INF/tags/Comments.tag	12 Jan 2016 00:47:41 -0000	1.5
+++ lams_tool_nb/web/WEB-INF/tags/Comments.tag	18 Jan 2016 02:19:08 -0000	1.6
@@ -18,7 +18,7 @@
 </c:if>
 
 <c:if test="${empty height}">
-	<c:set var="height" value="470px" />
+	<c:set var="height" value="auto" />
 </c:if>
 
 <c:set var="modeStr" value=""/>
@@ -38,11 +38,10 @@
 	<c:set var="sortBy" value="0" /> <!-- 0: date, 1: likes -->
 </c:if>
 
-<iframe id="commentFrame" class="commentFrame" src="/lams/comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}" style="width: ${width}; height: ${height};"></iframe>
-
+<div id="commentFrame" class="commentFrame"  style="width: ${width}; height: ${height};"></div>
 <script>
-function resizeCommentFrame(pixels){
-	pixels+=40;
-    document.getElementById('commentFrame').style.height=pixels+"px";
-}
+$(document).ready(function(){
+	var url='<lams:LAMSURL/>comments/comments.do?externalID=${toolSessionId}&externalSig=${toolSignature}&externalType=1${modeStr}&likeAndDislike=${likeAndDislike}&readOnly=${readOnly}&pageSize=${pageSize}&sortBy=${sortBy}';
+	$('#commentFrame').load(url);
+});
 </script>
\ No newline at end of file
Index: lams_tool_nb/web/template/learnerTemplate.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/template/learnerTemplate.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_nb/web/template/learnerTemplate.jsp	8 Jun 2007 01:39:26 -0000	1.6
+++ lams_tool_nb/web/template/learnerTemplate.jsp	18 Jan 2016 02:19:08 -0000	1.7
@@ -14,6 +14,7 @@
 <lams:head>
 	<lams:css />
 	<title><fmt:message key="activity.title"/></title>
+	<script src="${lams}includes/javascript/jquery.js"></script>
 </lams:head>
 
 <body class="stripes">