Index: lams_tool_assessment/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -rfb2d35766faadf7fa8e0247feb943da34f8fba4f -rb93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98
--- lams_tool_assessment/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision fb2d35766faadf7fa8e0247feb943da34f8fba4f)
+++ lams_tool_assessment/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision b93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98)
@@ -1,13 +1,16 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="commentPanelHeaderKey" required="false" rtexprvalue="true"%>
 
+
 <c:if test="${empty allowCommentsVariableName}">
 	<c:set var="allowCommentsVariableName" value="allowComments" />
 </c:if>
@@ -23,7 +26,11 @@
 <c:if test="${empty likeDislikeLabelKey}">
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
+<c:if test="${empty commentPanelHeaderKey}">
+	<c:set var="commentPanelHeaderKey" value="advanced.comment.header" />
+</c:if>
 
+<lams:SimplePanel titleKey="advanced.comment.header">
 <div class="checkbox">
 	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
@@ -36,6 +43,7 @@
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
+</lams:SimplePanel>
 
 <script>
 jQuery( document ).ready(function( $ ) {
Index: lams_tool_chat/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r8955c559e118a75bcdec763ebae2e745a0421236 -rb93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98
--- lams_tool_chat/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 8955c559e118a75bcdec763ebae2e745a0421236)
+++ lams_tool_chat/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision b93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98)
@@ -1,13 +1,16 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="commentPanelHeaderKey" required="false" rtexprvalue="true"%>
 
+
 <c:if test="${empty allowCommentsVariableName}">
 	<c:set var="allowCommentsVariableName" value="allowComments" />
 </c:if>
@@ -23,7 +26,11 @@
 <c:if test="${empty likeDislikeLabelKey}">
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
+<c:if test="${empty commentPanelHeaderKey}">
+	<c:set var="commentPanelHeaderKey" value="advanced.comment.header" />
+</c:if>
 
+<lams:SimplePanel titleKey="advanced.comment.header">
 <div class="checkbox">
 	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
@@ -36,6 +43,7 @@
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
+</lams:SimplePanel>
 
 <script>
 jQuery( document ).ready(function( $ ) {
Index: lams_tool_daco/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r0978f4c3fff33f106dc928704ad6249815cd131c -rb93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98
--- lams_tool_daco/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 0978f4c3fff33f106dc928704ad6249815cd131c)
+++ lams_tool_daco/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision b93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98)
@@ -1,13 +1,16 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="commentPanelHeaderKey" required="false" rtexprvalue="true"%>
 
+
 <c:if test="${empty allowCommentsVariableName}">
 	<c:set var="allowCommentsVariableName" value="allowComments" />
 </c:if>
@@ -23,7 +26,11 @@
 <c:if test="${empty likeDislikeLabelKey}">
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
+<c:if test="${empty commentPanelHeaderKey}">
+	<c:set var="commentPanelHeaderKey" value="advanced.comment.header" />
+</c:if>
 
+<lams:SimplePanel titleKey="advanced.comment.header">
 <div class="checkbox">
 	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
@@ -36,6 +43,7 @@
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
+</lams:SimplePanel>
 
 <script>
 jQuery( document ).ready(function( $ ) {
Index: lams_tool_forum/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r26a0240d04a160036cc15d1adca267cd1e9c42e5 -rb93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98
--- lams_tool_forum/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 26a0240d04a160036cc15d1adca267cd1e9c42e5)
+++ lams_tool_forum/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision b93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98)
@@ -1,13 +1,16 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="commentPanelHeaderKey" required="false" rtexprvalue="true"%>
 
+
 <c:if test="${empty allowCommentsVariableName}">
 	<c:set var="allowCommentsVariableName" value="allowComments" />
 </c:if>
@@ -23,7 +26,11 @@
 <c:if test="${empty likeDislikeLabelKey}">
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
+<c:if test="${empty commentPanelHeaderKey}">
+	<c:set var="commentPanelHeaderKey" value="advanced.comment.header" />
+</c:if>
 
+<lams:SimplePanel titleKey="advanced.comment.header">
 <div class="checkbox">
 	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
@@ -36,6 +43,7 @@
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
+</lams:SimplePanel>
 
 <script>
 jQuery( document ).ready(function( $ ) {
Index: lams_tool_gmap/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r5b49576bf16056685db96302cc25b044bd39e9ce -rb93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98
--- lams_tool_gmap/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 5b49576bf16056685db96302cc25b044bd39e9ce)
+++ lams_tool_gmap/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision b93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98)
@@ -1,13 +1,16 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="commentPanelHeaderKey" required="false" rtexprvalue="true"%>
 
+
 <c:if test="${empty allowCommentsVariableName}">
 	<c:set var="allowCommentsVariableName" value="allowComments" />
 </c:if>
@@ -23,7 +26,11 @@
 <c:if test="${empty likeDislikeLabelKey}">
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
+<c:if test="${empty commentPanelHeaderKey}">
+	<c:set var="commentPanelHeaderKey" value="advanced.comment.header" />
+</c:if>
 
+<lams:SimplePanel titleKey="advanced.comment.header">
 <div class="checkbox">
 	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
@@ -36,6 +43,7 @@
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
+</lams:SimplePanel>
 
 <script>
 jQuery( document ).ready(function( $ ) {
Index: lams_tool_imscc/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -rd703ba41fe0d49d4dee425f8aed091eeb0c958b3 -rb93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98
--- lams_tool_imscc/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision d703ba41fe0d49d4dee425f8aed091eeb0c958b3)
+++ lams_tool_imscc/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision b93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98)
@@ -1,13 +1,16 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="commentPanelHeaderKey" required="false" rtexprvalue="true"%>
 
+
 <c:if test="${empty allowCommentsVariableName}">
 	<c:set var="allowCommentsVariableName" value="allowComments" />
 </c:if>
@@ -23,7 +26,11 @@
 <c:if test="${empty likeDislikeLabelKey}">
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
+<c:if test="${empty commentPanelHeaderKey}">
+	<c:set var="commentPanelHeaderKey" value="advanced.comment.header" />
+</c:if>
 
+<lams:SimplePanel titleKey="advanced.comment.header">
 <div class="checkbox">
 	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
@@ -36,6 +43,7 @@
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
+</lams:SimplePanel>
 
 <script>
 jQuery( document ).ready(function( $ ) {
Index: lams_tool_kaltura/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r9dffcfc34a162e2764264327642af2c6fae5ee01 -rb93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98
--- lams_tool_kaltura/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 9dffcfc34a162e2764264327642af2c6fae5ee01)
+++ lams_tool_kaltura/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision b93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98)
@@ -1,13 +1,16 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="commentPanelHeaderKey" required="false" rtexprvalue="true"%>
 
+
 <c:if test="${empty allowCommentsVariableName}">
 	<c:set var="allowCommentsVariableName" value="allowComments" />
 </c:if>
@@ -23,7 +26,11 @@
 <c:if test="${empty likeDislikeLabelKey}">
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
+<c:if test="${empty commentPanelHeaderKey}">
+	<c:set var="commentPanelHeaderKey" value="advanced.comment.header" />
+</c:if>
 
+<lams:SimplePanel titleKey="advanced.comment.header">
 <div class="checkbox">
 	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
@@ -36,6 +43,7 @@
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
+</lams:SimplePanel>
 
 <script>
 jQuery( document ).ready(function( $ ) {
Index: lams_tool_lamc/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r00937d78dacc0993260d5ed7b39e4376e432cf45 -rb93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98
--- lams_tool_lamc/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 00937d78dacc0993260d5ed7b39e4376e432cf45)
+++ lams_tool_lamc/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision b93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98)
@@ -1,13 +1,16 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="commentPanelHeaderKey" required="false" rtexprvalue="true"%>
 
+
 <c:if test="${empty allowCommentsVariableName}">
 	<c:set var="allowCommentsVariableName" value="allowComments" />
 </c:if>
@@ -23,7 +26,11 @@
 <c:if test="${empty likeDislikeLabelKey}">
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
+<c:if test="${empty commentPanelHeaderKey}">
+	<c:set var="commentPanelHeaderKey" value="advanced.comment.header" />
+</c:if>
 
+<lams:SimplePanel titleKey="advanced.comment.header">
 <div class="checkbox">
 	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
@@ -36,6 +43,7 @@
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
+</lams:SimplePanel>
 
 <script>
 jQuery( document ).ready(function( $ ) {
Index: lams_tool_leader/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -ra6f139bf7f2aeceb96792867e30e3de3959bd1f0 -rb93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98
--- lams_tool_leader/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision a6f139bf7f2aeceb96792867e30e3de3959bd1f0)
+++ lams_tool_leader/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision b93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98)
@@ -1,13 +1,16 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="commentPanelHeaderKey" required="false" rtexprvalue="true"%>
 
+
 <c:if test="${empty allowCommentsVariableName}">
 	<c:set var="allowCommentsVariableName" value="allowComments" />
 </c:if>
@@ -23,7 +26,11 @@
 <c:if test="${empty likeDislikeLabelKey}">
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
+<c:if test="${empty commentPanelHeaderKey}">
+	<c:set var="commentPanelHeaderKey" value="advanced.comment.header" />
+</c:if>
 
+<lams:SimplePanel titleKey="advanced.comment.header">
 <div class="checkbox">
 	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
@@ -36,6 +43,7 @@
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
+</lams:SimplePanel>
 
 <script>
 jQuery( document ).ready(function( $ ) {
Index: lams_tool_mindmap/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -re05eabde125abc5f2847a169592b3b5e6bd60091 -rb93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98
--- lams_tool_mindmap/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision e05eabde125abc5f2847a169592b3b5e6bd60091)
+++ lams_tool_mindmap/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision b93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98)
@@ -1,13 +1,16 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="commentPanelHeaderKey" required="false" rtexprvalue="true"%>
 
+
 <c:if test="${empty allowCommentsVariableName}">
 	<c:set var="allowCommentsVariableName" value="allowComments" />
 </c:if>
@@ -23,7 +26,11 @@
 <c:if test="${empty likeDislikeLabelKey}">
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
+<c:if test="${empty commentPanelHeaderKey}">
+	<c:set var="commentPanelHeaderKey" value="advanced.comment.header" />
+</c:if>
 
+<lams:SimplePanel titleKey="advanced.comment.header">
 <div class="checkbox">
 	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
@@ -36,6 +43,7 @@
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
+</lams:SimplePanel>
 
 <script>
 jQuery( document ).ready(function( $ ) {
Index: lams_tool_notebook/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -ra0a249e0861e944d080689e4ebb853566cd40f2d -rb93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98
--- lams_tool_notebook/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision a0a249e0861e944d080689e4ebb853566cd40f2d)
+++ lams_tool_notebook/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision b93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98)
@@ -1,13 +1,16 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="commentPanelHeaderKey" required="false" rtexprvalue="true"%>
 
+
 <c:if test="${empty allowCommentsVariableName}">
 	<c:set var="allowCommentsVariableName" value="allowComments" />
 </c:if>
@@ -23,7 +26,11 @@
 <c:if test="${empty likeDislikeLabelKey}">
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
+<c:if test="${empty commentPanelHeaderKey}">
+	<c:set var="commentPanelHeaderKey" value="advanced.comment.header" />
+</c:if>
 
+<lams:SimplePanel titleKey="advanced.comment.header">
 <div class="checkbox">
 	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
@@ -36,6 +43,7 @@
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
+</lams:SimplePanel>
 
 <script>
 jQuery( document ).ready(function( $ ) {
Index: lams_tool_sbmt/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -r6bed0e62245e6c9ce454d4bc54920a0b41dac9bc -rb93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98
--- lams_tool_sbmt/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 6bed0e62245e6c9ce454d4bc54920a0b41dac9bc)
+++ lams_tool_sbmt/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision b93ffc627cf4a6afdd5b2a96c7ff0d1fe79b4b98)
@@ -1,13 +1,16 @@
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
 
 <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeVariableName" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeOnlyCommentLabelKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="likeDislikeLabelKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="commentPanelHeaderKey" required="false" rtexprvalue="true"%>
 
+
 <c:if test="${empty allowCommentsVariableName}">
 	<c:set var="allowCommentsVariableName" value="allowComments" />
 </c:if>
@@ -23,7 +26,11 @@
 <c:if test="${empty likeDislikeLabelKey}">
 	<c:set var="likeDislikeLabelKey" value="advanced.comments.like.and.dislike" />
 </c:if>
+<c:if test="${empty commentPanelHeaderKey}">
+	<c:set var="commentPanelHeaderKey" value="advanced.comment.header" />
+</c:if>
 
+<lams:SimplePanel titleKey="advanced.comment.header">
 <div class="checkbox">
 	<label>
 	<html:checkbox property="${allowCommentsVariableName}" value="1"
@@ -36,6 +43,7 @@
 		<html:radio property="${likeDislikeVariableName}" value="false" />&nbsp;<fmt:message key="${likeOnlyCommentLabelKey}" /> &nbsp;
 		<html:radio property="${likeDislikeVariableName}" value="true" />&nbsp;<fmt:message key="${likeDislikeLabelKey}" /> 
 </div>
+</lams:SimplePanel>
 
 <script>
 jQuery( document ).ready(function( $ ) {