Fisheye: Tag 731fcdae94ff4e5e1a052eee8fe74f5896f1da4d refers to a dead (removed) revision in file `lams_tool_wiki/conf/language/ApplicationResources.properties'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wiki/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r2f725f8ef2aa09a2663b2335bf67213074426d11 -r731fcdae94ff4e5e1a052eee8fe74f5896f1da4d
--- lams_tool_wiki/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 2f725f8ef2aa09a2663b2335bf67213074426d11)
+++ lams_tool_wiki/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 731fcdae94ff4e5e1a052eee8fe74f5896f1da4d)
@@ -153,6 +153,8 @@
 label.wiki.removed  =This page has been removed.
 button.submit  =Finish
 error.title.invalid.characters  =Title cannot contain any of these characters ^, <, >, #, (, ), \, |, ', ", {, }, `
+label.wiki.options=Wiki Options
+label.activity.completion=End of Activity
+label.notifications=Notifications
 
-
 #======= End labels: Exported 148 labels for en AU =====
Index: lams_tool_wiki/web/WEB-INF/tags/Arrow.tag
===================================================================
diff -u -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d -r731fcdae94ff4e5e1a052eee8fe74f5896f1da4d
--- lams_tool_wiki/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
+++ lams_tool_wiki/web/WEB-INF/tags/Arrow.tag	(.../Arrow.tag)	(revision 731fcdae94ff4e5e1a052eee8fe74f5896f1da4d)
@@ -6,6 +6,8 @@
 <%@ attribute name="state" required="true" rtexprvalue="true"%>
 <%@ attribute name="title" required="false" rtexprvalue="true"%>
 <%@ attribute name="onclick" required="false" rtexprvalue="true"%>
+<%@ attribute name="id" required="false" rtexprvalue="true"%>
+<%@ attribute name="display" required="false"  rtexprvalue="true"%>
 
 <c:choose>
 	<c:when test="${not empty title}">
@@ -26,10 +28,28 @@
 </c:choose>
 
 <c:choose>
+	<c:when test="${not empty id}">
+		<c:set var="fullId">id="${id}"</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullId" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
+	<c:when test="${not empty display}">
+	<c:set var="fullDisplay">style='display:${display}'</c:set>
+	</c:when>
+	<c:otherwise>
+		<c:set var="fullDisplay" value=""/>
+	</c:otherwise>
+</c:choose>
+
+<c:choose>
 	<c:when test="${fn:containsIgnoreCase(state, 'up')}">
-		<i class="fa fa-long-arrow-up fa-pull-left" ${fullTitle} ${fullOnclick}></i>
+		<i class="fa fa-long-arrow-up fa-pull-left" ${fullId} ${fullTitle} ${fullOnclick} ${fullDisplay}></i>
 	</c:when>
 	<c:otherwise>
-		<i class="fa fa-long-arrow-down fa-pull-right"  ${fullTitle} ${fullOnclick}></i>
+		<i class="fa fa-long-arrow-down fa-pull-right"  ${fullId} ${fullTitle} ${fullOnclick} ${fullDisplay}></i>
 	</c:otherwise>
 </c:choose>
Index: lams_tool_wiki/web/WEB-INF/tags/CommentsAuthor.tag
===================================================================
diff -u -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d -r731fcdae94ff4e5e1a052eee8fe74f5896f1da4d
--- lams_tool_wiki/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
+++ lams_tool_wiki/web/WEB-INF/tags/CommentsAuthor.tag	(.../CommentsAuthor.tag)	(revision 731fcdae94ff4e5e1a052eee8fe74f5896f1da4d)
@@ -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_wiki/web/WEB-INF/tags/Page.tag
===================================================================
diff -u -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d -r731fcdae94ff4e5e1a052eee8fe74f5896f1da4d
--- lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
+++ lams_tool_wiki/web/WEB-INF/tags/Page.tag	(.../Page.tag)	(revision 731fcdae94ff4e5e1a052eee8fe74f5896f1da4d)
@@ -24,7 +24,7 @@
 						<div class="panel-title panel-${type}-title">
 							<c:out value="${title}" escapeXml="true" />
 							<c:if test="${not empty titleHelpURL}">
-								<a style="float: right" href="${titleHelpURL}" target="_new"><span class="help" style="margin: 0px"></span></a>
+								<span class="pull-right">${titleHelpURL}</span>
 							</c:if>
 						</div>
 						<c:if test="${not empty headingContent}">
Index: lams_tool_wiki/web/WEB-INF/tags/SimplePanel.tag
===================================================================
diff -u
--- lams_tool_wiki/web/WEB-INF/tags/SimplePanel.tag	(revision 0)
+++ lams_tool_wiki/web/WEB-INF/tags/SimplePanel.tag	(revision 731fcdae94ff4e5e1a052eee8fe74f5896f1da4d)
@@ -0,0 +1,32 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="titleHelpURL" required="false" rtexprvalue="true"%>
+<%@ attribute name="panelBodyClass" required="false"  rtexprvalue="true"%>
+
+<c:if test="${not empty titleKey}">
+	<c:set var="title"><fmt:message key="${titleKey}" /></c:set>
+</c:if>
+
+<div class="panel panel-default">
+	<c:if test="${not empty title or not empty titleHelpURL}">
+	<div class="panel-heading">
+		<div class="panel-title">
+		<c:out value="${title}" escapeXml="true" />
+		<c:if test="${not empty titleHelpURL}">
+			<a style="float: right" href="${titleHelpURL}" target="_new"><span class="help" style="margin: 0px"></span></a>
+		</c:if>
+		</div>
+	</div>
+	</c:if>
+	<div class="panel-body ${panelBodyClass}">
+		<jsp:doBody />
+	</div>
+</div>
+
+
+		
+			
Index: lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d -r731fcdae94ff4e5e1a052eee8fe74f5896f1da4d
--- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
+++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 731fcdae94ff4e5e1a052eee8fe74f5896f1da4d)
@@ -471,6 +471,10 @@
    		<name>RestrictedUsageAccordian</name>
    		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
    	</tag-file>
+  	<tag-file>
+	    <name>SimplePanel</name>
+		<path>/WEB-INF/tags/SimplePanel.tag</path>
+   	</tag-file>
    	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
Index: lams_tool_wiki/web/pages/authoring/advanced.jsp
===================================================================
diff -u -rceae3062bc6d9ad73937168fc0fb12e4fdaa172d -r731fcdae94ff4e5e1a052eee8fe74f5896f1da4d
--- lams_tool_wiki/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision ceae3062bc6d9ad73937168fc0fb12e4fdaa172d)
+++ lams_tool_wiki/web/pages/authoring/advanced.jsp	(.../advanced.jsp)	(revision 731fcdae94ff4e5e1a052eee8fe74f5896f1da4d)
@@ -2,84 +2,92 @@
 
 <!-- ========== Advanced Tab ========== -->
 
-<div class="checkbox">
-	<label for="lockOnFinished">
-	<html:checkbox property="lockOnFinished" value="1" styleId="lockOnFinished"></html:checkbox>
-	<fmt:message key="advanced.lockOnFinished" /></label>
-</div>
+<lams:SimplePanel titleKey="label.wiki.options">
 
-<div class="checkbox">
-	<label for="allowLearnerCreatePages"> 
-	<html:checkbox	property="allowLearnerCreatePages" value="1" styleId="allowLearnerCreatePages"></html:checkbox> 
-	<fmt:message key="advanced.allowLearnerCreatePages" /></label>
-</div>
-
-<div class="checkbox">
-	<label	for="allowLearnerInsertLinks">
-	<html:checkbox property="allowLearnerInsertLinks" value="1" styleId="allowLearnerInsertLinks"></html:checkbox>  
-	<fmt:message key="advanced.allowLearnerInsertLinks" /></label>
-</div>
-
-<div class="checkbox">
-	<label for="allowLearnerAttachImages"> 
-	<html:checkbox	property="allowLearnerAttachImages" value="1" styleId="allowLearnerAttachImages"></html:checkbox> 
-	<fmt:message key="advanced.allowLearnerAttachImages" /> </label>
-</div>
+	<div class="checkbox">
+		<label for="allowLearnerCreatePages"> 
+		<html:checkbox	property="allowLearnerCreatePages" value="1" styleId="allowLearnerCreatePages"></html:checkbox> 
+		<fmt:message key="advanced.allowLearnerCreatePages" /></label>
+	</div>
 	
-<div class="checkbox">
-	<label	for="notifyUpdates">
-	<html:checkbox property="notifyUpdates" value="1" styleId="notifyUpdates"></html:checkbox>
-	<fmt:message key="advanced.notifyChange" /> </label>
-</div>
+	<div class="checkbox">
+		<label	for="allowLearnerInsertLinks">
+		<html:checkbox property="allowLearnerInsertLinks" value="1" styleId="allowLearnerInsertLinks"></html:checkbox>  
+		<fmt:message key="advanced.allowLearnerInsertLinks" /></label>
+	</div>
+	
+	<div class="checkbox">
+		<label for="allowLearnerAttachImages"> 
+		<html:checkbox	property="allowLearnerAttachImages" value="1" styleId="allowLearnerAttachImages"></html:checkbox> 
+		<fmt:message key="advanced.allowLearnerAttachImages" /> </label>
+	</div>
+		
+	<div><fmt:message key="advanced.editingLimits.prompt" /></div>
+	
+	<div><fmt:message key="advanced.editingLimits.minimum" />&nbsp;<html:select
+		property="minimumEdits" styleId="minimumEdits" styleClass="form-control form-control-inline input-sm" onchange="validateEditCount(true);">
+		<html:option value="0">
+			<fmt:message key="advanced.editingLimits.nominimum" />
+		</html:option>
+		<html:option value="1">1</html:option>
+		<html:option value="2">2</html:option>
+		<html:option value="3">3</html:option>
+		<html:option value="4">4</html:option>
+		<html:option value="5">5</html:option>
+		<html:option value="6">6</html:option>
+		<html:option value="7">7</html:option>
+		<html:option value="8">8</html:option>
+		<html:option value="9">9</html:option>
+		<html:option value="10">10</html:option>
+	</html:select>&nbsp;<fmt:message key="advanced.editingLimits.maximum" />&nbsp;<html:select
+		property="maximumEdits" styleId="maximumEdits" styleClass="form-control form-control-inline input-sm" onchange="validateEditCount(true);">
+		<html:option value="0">
+			<fmt:message key="advanced.editingLimits.nomaximum" />
+		</html:option>
+		<html:option value="1">1</html:option>
+		<html:option value="2">2</html:option>
+		<html:option value="3">3</html:option>
+		<html:option value="4">4</html:option>
+		<html:option value="5">5</html:option>
+		<html:option value="6">6</html:option>
+		<html:option value="7">7</html:option>
+		<html:option value="8">8</html:option>
+		<html:option value="9">9</html:option>
+		<html:option value="10">10</html:option>
+	</html:select></div>
 
-<div class="checkbox">
-	<label for="reflectOnActivity">
-	<html:checkbox property="reflectOnActivity" value="1"
-	styleId="reflectOnActivity"></html:checkbox>
-	<fmt:message key="advanced.reflectOnActivity" /> </label>
-</div>
-<div class="form-group">
-	<html:textarea property="reflectInstructions" rows="3" styleClass="form-control" styleId="reflectInstructions" />
-</div>
+</lams:SimplePanel>
 
+<lams:SimplePanel titleKey="label.notifications">
 
-<h4><fmt:message key="advanced.editingLimits" /></h4>
+	<div class="checkbox">
+		<label	for="notifyUpdates">
+		<html:checkbox property="notifyUpdates" value="1" styleId="notifyUpdates"></html:checkbox>
+		<fmt:message key="advanced.notifyChange" /> </label>
+	</div>
+	
+</lams:SimplePanel>
 
-<div><fmt:message key="advanced.editingLimits.prompt" /></div>
+<lams:SimplePanel titleKey="label.activity.completion">
 
-<div><fmt:message key="advanced.editingLimits.minimum" />&nbsp;<html:select
-	property="minimumEdits" styleId="minimumEdits" styleClass="form-control form-control-inline input-sm">
-	<html:option value="0">
-		<fmt:message key="advanced.editingLimits.nominimum" />
-	</html:option>
-	<html:option value="1">1</html:option>
-	<html:option value="2">2</html:option>
-	<html:option value="3">3</html:option>
-	<html:option value="4">4</html:option>
-	<html:option value="5">5</html:option>
-	<html:option value="6">6</html:option>
-	<html:option value="7">7</html:option>
-	<html:option value="8">8</html:option>
-	<html:option value="9">9</html:option>
-	<html:option value="10">10</html:option>
-</html:select>&nbsp;<fmt:message key="advanced.editingLimits.maximum" />&nbsp;<html:select
-	property="maximumEdits" styleId="maximumEdits" styleClass="form-control form-control-inline input-sm">
-	<html:option value="0">
-		<fmt:message key="advanced.editingLimits.nomaximum" />
-	</html:option>
-	<html:option value="1">1</html:option>
-	<html:option value="2">2</html:option>
-	<html:option value="3">3</html:option>
-	<html:option value="4">4</html:option>
-	<html:option value="5">5</html:option>
-	<html:option value="6">6</html:option>
-	<html:option value="7">7</html:option>
-	<html:option value="8">8</html:option>
-	<html:option value="9">9</html:option>
-	<html:option value="10">10</html:option>
-</html:select></div>
+	<div class="checkbox">
+		<label for="lockOnFinished">
+		<html:checkbox property="lockOnFinished" value="1" styleId="lockOnFinished"></html:checkbox>
+		<fmt:message key="advanced.lockOnFinished" /></label>
+	</div>
+	
+	<div class="checkbox">
+		<label for="reflectOnActivity">
+		<html:checkbox property="reflectOnActivity" value="1"
+		styleId="reflectOnActivity"></html:checkbox>
+		<fmt:message key="advanced.reflectOnActivity" /> </label>
+	</div>
+	<div class="form-group">
+		<html:textarea property="reflectInstructions" rows="3" styleClass="form-control" styleId="reflectInstructions" />
+	</div>
+	
+</lams:SimplePanel>	
 
-
 <script type="text/javascript">
 <!--
 //automatically turn on refect option if there are text input in refect instruction area
@@ -97,21 +105,22 @@
 
 	ra.onkeyup=turnOnRefect;
 	
-	var minMenu = document.getElementById("minimumEdits");
-	var maxMenu = document.getElementById("maximumEdits");
-	minMenu.onchange = updateMinimumField
-	
-	function updateMinimumField()
-	{
-		var min = document.getElementById("minimumEdits").value;
-		var max = document.getElementById("maximumEdits").value;
-		
-		if (max > 0 && min > max)
-		{
-			alert("<fmt:message key='advanced.editingLimits.error' />");
-			minMenu.selectedIndex = max;
+	function validateEditCount(isMinimunDropdownUsed) {
+		var minDropDown = document.getElementById("minimumEdits");
+		var min = parseInt(minimumEdits.options[minimumEdits.selectedIndex].value);
+		var maxDropDown = document.getElementById("maximumEdits");
+		var max = parseInt(maximumEdits.options[maximumEdits.selectedIndex].value);
+
+		if (min > max && max > 0) {
+			if (isMinimunDropdownUsed) {
+				maxDropDown.selectedIndex = minDropDown.selectedIndex;
+			} else {
+				minDropDown.selectedIndex = maxDropDown.selectedIndex;
+			} 
+			alert('<fmt:message key="advanced.editingLimits.error" />');
 		}
 	}
+
 //-->
 </script>