Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewSession.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/conf/hibernate/mappings/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.hbm.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/struts-config.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/validation.xml'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tags/AdvancedAccordian.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tags/Arrow.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_preview/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_preview/web/WEB-INF/tags/AuthoringButton.tag	24 Jul 2015 00:34:29 -0000	1.1
+++ lams_tool_preview/web/WEB-INF/tags/AuthoringButton.tag	16 May 2016 13:28:47 -0000	1.1.2.1
@@ -122,12 +122,12 @@
     	window.close();
     }  				
 </script>	
-<p id="saveCancelButtons" >
-		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="button right-buttons space-left">
-			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
-		</html:link>
-		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="button right-buttons space-left">
+<div id="saveCancelButtons" >
+		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleClass="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
-</p>
-<!-- end tab content -->
+		<html:link href="javascript:;" property="cancel" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
+			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
+		</html:link>
+</div>
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/AuthoringRatingCriteria.tag,v
diff -u -r1.2 -r1.2.2.1
--- lams_tool_preview/web/WEB-INF/tags/AuthoringRatingCriteria.tag	21 Oct 2015 12:46:03 -0000	1.2
+++ lams_tool_preview/web/WEB-INF/tags/AuthoringRatingCriteria.tag	16 May 2016 13:28:47 -0000	1.2.2.1
@@ -18,6 +18,7 @@
 <%-- Optional attribute --%>
 <%@ attribute name="hasRatingLimits" required="false" rtexprvalue="true" %>
 <%@ attribute name="formContentPrefix" required="false" rtexprvalue="true" %>
+<%@ attribute name="styleId" required="false" rtexprvalue="true" %>
 <%@ attribute name="headerLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="addLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="deleteLabel" required="false" rtexprvalue="true" %>
@@ -106,16 +107,16 @@
 		jQuery('<tr/>').append(jQuery('<td/>', {
 			'class': 'criteria-info',
 		    html: '<input type="hidden" name="criteriaOrderId' + maxOrderId + '" value="' + maxOrderId + '">' + 
-		    		'<input type="text" name="criteriaTitle' + maxOrderId + '" value="">'
+		    		'<input type="text" name="criteriaTitle' + maxOrderId + '" value="" class="form-control">'
 		    		
 		})).append(jQuery('<td/>', {
 			width: '40px',
-			html: '<div class="up-arrow" title="<fmt:message key="${upLabel}"/>" />' + 
-		    		'<div class="down-arrow-disabled" title="<fmt:message key="${downLabel}"/>" />'
+			html: '<div class="arrow-up fa fa-long-arrow-up fa-pull-left" title="<fmt:message key="${upLabel}"/>" />' + 
+		    		'<div class="arrow-down fa fa-long-arrow-down fa-pull-right" title="<fmt:message key="${downLabel}"/>" />'
 		    		
 		})).append(jQuery('<td/>', {
 			width: '20px',
-			html: '<div class="delete-arrow" title="<fmt:message key="${deleteLabel}"/>" />'
+			html: '<i class="fa fa-times" title="<fmt:message key="${deleteLabel}"/>"></i>'
 		})).appendTo('#criterias-table');
 		
 		reactivateArrows();
@@ -124,30 +125,29 @@
 		addCriteria(); 
 		addCriteria();
 	</c:if>
+	reactivateArrows();
 	
 	function reactivateArrows() {
 		$('#criterias-table tr').each(function() {
 
 		    $this = $(this); // cache $(this)
 		    
 		    if ($this.is(':first-child')) {
-		    	$(".up-arrow", $this).addClass("up-arrow-disabled").removeClass("up-arrow");
-		        
+		    	$(".arrow-up", $this).removeClass("fa fa-long-arrow-up fa-pull-left");
 		    } else {
-		    	$(".up-arrow-disabled", $this).addClass("up-arrow").removeClass("up-arrow-disabled");
+		    	$(".arrow-up", $this).addClass("fa fa-long-arrow-up fa-pull-left");
 		    }
 		    
 		    if ($this.is(':last-child')) {
-		    	$(".down-arrow", $this).addClass("down-arrow-disabled").removeClass("down-arrow");
-		    	
+		    	$(".arrow-down", $this).removeClass("fa fa-long-arrow-down fa-pull-right");
 		    } else {
-		    	$(".down-arrow-disabled", $this).addClass("down-arrow").removeClass("down-arrow-disabled");
+		    	$(".arrow-down", $this).addClass("fa fa-long-arrow-down fa-pull-right");
 		    }
 		});
 	}
 	
 	//upCriteria
-	 $( "body" ).on( "click", ".up-arrow", function() {
+	 $( "body" ).on( "click", ".fa-long-arrow-up", function() {
 		var currentRow = $(this).closest('tr');
 		var currentCriteriaTd = $( ".criteria-info", currentRow);
 		var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
@@ -170,7 +170,7 @@
 	 } );
 	 
 	//downCriteria
-	 $( "body" ).on( "click", ".down-arrow", function() {
+	 $( "body" ).on( "click", ".fa-long-arrow-down", function() {
 		var currentRow = $(this).closest('tr');
 		var currentCriteriaTd = $( ".criteria-info", currentRow);
 		var currentOrderId = $( "input[name^='criteriaOrderId']", currentCriteriaTd);
@@ -193,7 +193,7 @@
 	 });
 	 
 	 //deleteCriteria
-	 $( "body" ).on( "click", ".delete-arrow", function() {
+	 $( "body" ).on( "click", ".fa-times", function() {
 		var currentRow = $(this).closest('tr');
 		currentRow.remove();
 		
@@ -241,112 +241,109 @@
 	}
 </script>
 
-<div class="rating-criteria-tag">
-	<h2>
-		<fmt:message key="${headerLabel}" />
-	</h2>
-	<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+<div class="rating-criteria-tag" style="${styleId}">
 
-	<table class="alternative-color" cellspacing="0" id="criterias-table">
-
-		<c:forEach var="criteria" items="${criterias}" varStatus="status">
-			<c:if test="${!criteria.commentsEnabled}">
-				<tr>
-					
-					<td class="criteria-info">
-						<input type="hidden" name="criteriaOrderId${criteria.orderId}" value="${criteria.orderId}">
-						<input type="text" name="criteriaTitle${criteria.orderId}" value="${fn:escapeXml(criteria.title)}">
-					</td>
-					
-					<td width="40px">
-						<c:if test="${not status.first}">
-							<div class="up-arrow" title="<fmt:message key="${upLabel}"/>"></div>
-							<c:if test="${status.last}">
-								<div class="down-arrow-disabled" title="<fmt:message key="${downLabel}"/>"></div>
-							</c:if>
-						</c:if>
+	<div class="panel panel-default voffset5">
+		<div class="panel-heading panel-title">
+			<label><fmt:message key="${headerLabel}" /></label>
+		</div>
 	
-						<c:if test="${not status.last}">
-							<c:if test="${status.first}">
-								<div class="up-arrow-disabled" title="<fmt:message key="${upLabel}"/>"></div>
-							</c:if>
+		<div class="form-group roffset10 loffset10">
+			<input type="hidden" name="criteriaMaxOrderId" id="criteria-max-order-id" value="${maxOrderId}">
+			<table class="table table-condensed table-no-border" id="criterias-table">
+		
+				<c:forEach var="criteria" items="${criterias}" varStatus="status">
+					<c:if test="${!criteria.commentsEnabled}">
+						<tr>
+							
+							<td class="criteria-info">
+								<input type="hidden" name="criteriaOrderId${criteria.orderId}" value="${criteria.orderId}">
+								<input type="text" name="criteriaTitle${criteria.orderId}" value="${criteria.title}" class="form-control">
+							</td>
+							
+							<td width="40px">
+								<div class="arrow-up" title="<fmt:message key="${upLabel}"/>"></div>
+								<div class="arrow-down" title="<fmt:message key="${downLabel}"/>"></div>
+							</td>
+			                
+							<td width="20px">
+								<i class="fa fa-times" title="<fmt:message key="${deleteLabel}" />"></i>
+							</td>
+						</tr>
+					</c:if>
+				</c:forEach>
+			</table>
 	
-							<div class="down-arrow" title="<fmt:message key="${downLabel}"/>"></div>
-						</c:if>
-					</td>
-	                
-					<td width="20px">
-						<div class="delete-arrow" title="<fmt:message key="${deleteLabel}"/>" ></div>
-					</td>
-				</tr>
+			<div style="height: 25px; margin-top: -10px;">
+				<a href="#nogo" class="btn btn-default btn-xs pull-right" id="add-criteria">
+					<i class="fa fa-plus"></i>&nbsp;<fmt:message key="${addLabel}" /> 
+				</a>
+			</div>
+	
+			<c:if test="${hasRatingLimits}">
+				<div>
+					<label for="minimum-rates">
+						<fmt:message key="${minimumLabel}" />
+					</label>
+					<html:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);" 
+							styleClass="form-control form-control-inline">
+						<html:option value="0">
+							<fmt:message key="${noMinimumLabel}" />
+						</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>
+				
+					<label for="maximum-rates">
+						<fmt:message key="${maximumLabel}" />
+					</label>
+					<html:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);" 
+							styleClass="form-control form-control-inline">
+						<html:option value="0">
+							<fmt:message key="${noMaximumLabel}" />
+						</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>
 			</c:if>
-		</c:forEach>
-	</table>
 	
-	<div style="height: 30px;">
-		<a href="#nogo" class="button-add-item float-right" id="add-criteria">
-			<fmt:message key="${addLabel}" /> 
-		</a>
-	</div>
+			<div class="checkbox">
+				<label for="enable-comments">
+					<input type="checkbox" name="isCommentsEnabled" value="true" class="noBorder" id="enable-comments"
+						<c:if test="${isCommentsEnabled}">checked="checked"</c:if>
+					/>
+					<fmt:message key="${allowCommentsLabel}" />
+				</label>
+			</div>
 	
-	<c:if test="${hasRatingLimits}">
-		<div>
-			<fmt:message key="${minimumLabel}" />
-			<html:select property="${formContentPrefix}minimumRates" styleId="minimum-rates" onmouseup="validateRatingLimits(true);">
-				<html:option value="0">
-					<fmt:message key="${noMinimumLabel}" />
-				</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>
-		
-			<fmt:message key="${maximumLabel}" />
-			<html:select property="${formContentPrefix}maximumRates" styleId="maximum-rates" onmouseup="validateRatingLimits(false);">
-				<html:option value="0">
-					<fmt:message key="${noMaximumLabel}" />
-				</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>
+				<label for="comments-min-words-limit" id="comments-min-words-limit-label"
+					<c:if test="${!isCommentsEnabled}">class="gray-color"</c:if>
+				>
+					<fmt:message key="${minNumberWordsLabel}" >
+						<fmt:param> </fmt:param>
+					</fmt:message>
+				</label>
+				<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}" class="form-control-sm"/>
+			</div>
 		</div>
-	</c:if>
-	
-	<div class="space-top">
-		<input type="checkbox" name="isCommentsEnabled" value="true" class="noBorder" id="enable-comments"
-			<c:if test="${isCommentsEnabled}">checked="checked"</c:if>
-		/>
-		<label for="enable-comments">
-			<fmt:message key="${allowCommentsLabel}" />
-		</label>
-		
-		<div class="small-space-top" >
-			<label for="comments-min-words-limit" id="comments-min-words-limit-label"
-				<c:if test="${!isCommentsEnabled}">class="gray-color"</c:if>
-			>
-				<fmt:message key="${minNumberWordsLabel}" >
-					<fmt:param> </fmt:param>
-				</fmt:message>
-			</label>
-			<input type="text" name="commentsMinWordsLimit" id="comments-min-words-limit" value="${commentsMinWordsLimit}"/>
-		</div>
-		
 	</div>
-	
 </div>
-<!-- end tab content -->
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tags/CKEditor.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/CKEditor.tag,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_preview/web/WEB-INF/tags/CKEditor.tag	24 Jul 2015 00:34:29 -0000	1.1
+++ lams_tool_preview/web/WEB-INF/tags/CKEditor.tag	16 May 2016 13:28:48 -0000	1.1.2.1
@@ -10,7 +10,12 @@
 <%@ attribute name="contentFolderID" required="false" rtexprvalue="true"%>
 <%@ attribute name="displayExpanded" required="false" rtexprvalue="true"%>
 <%@ attribute name="resizeParentFrameName" required="false" rtexprvalue="true"%>
+<%@ attribute name="method" required="false" rtexprvalue="true"%>
 
+<c:if test="${empty method}">
+	<c:set var="method" value="inline" />
+</c:if>
+
 <c:set var="language">
 	<lams:user property="fckLanguageMapping" />
 </c:set>
@@ -19,6 +24,10 @@
 	<c:set var="toolbarSet" value="Default" />
 </c:if>
 
+<c:if test="${fn:containsIgnoreCase(method,'Inline')}">
+	<c:set var="toolbarSet">${toolbarSet}Inline</c:set>
+</c:if>
+
 <c:if test="${empty displayExpanded}">
 	<c:set var="displayExpanded" value="true" />
 </c:if>
@@ -33,10 +42,10 @@
 <c:set var="fixedValue" value="${fn:replace(value,'&lt','&amp;lt')}"/>
 <c:set var="fixedValue" value="${fn:replace(fixedValue,'&gt','&amp;gt')}"/>
 
-<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;">${fixedValue}</textarea>
+<textarea id="${id}" name="${id}" style="display: none; visibility: hidden; height: 0px;" placeholder="${placeholder}">${fixedValue}</textarea>
 
 <c:if test="${empty ckEditorBasePath}">
-	<c:set scope="request" var="ckEditorBasePath"><lams:LAMSURL/>ckeditor/</c:set>
+	<c:set scope="request" var="ckEditorBasePath">/lams/ckeditor/</c:set>
 	<script type="text/javascript" src="${ckEditorBasePath}ckeditor.js"></script>
 </c:if>
 
@@ -59,10 +68,9 @@
 	    var editor = CKEDITOR.instances["${id}"];
 	    if (editor) { editor.destroy(true); }
 	    
-		var instance = CKEDITOR.replace( "${id}", {
+		var instance = CKEDITOR.${method}( "${id}", {
 				width                         : "${width}",
 				height                        : "${height}",
-				autoGrow_minHeight            : "${height}".replace("px", ""),
 				toolbar                       : "${toolbarSet}",
 				language                      : "${language}",
 				defaultLangugage              : "en",
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tags/Comments.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tags/CommentsAuthor.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_preview/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/ImgButtonWrapper.tag,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_preview/web/WEB-INF/tags/ImgButtonWrapper.tag	24 Jul 2015 00:34:29 -0000	1.1
+++ lams_tool_preview/web/WEB-INF/tags/ImgButtonWrapper.tag	16 May 2016 13:28:47 -0000	1.1.2.1
@@ -1,37 +1,37 @@
-<% 
-/****************************************************************
- * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
- * =============================================================
- * License Information: http://lamsfoundation.org/licensing/lams/2.0/
- * 
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2.0
- * as published by the Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
- * USA
- * 
- * http://www.gnu.org/licenses/gpl.txt
- * ****************************************************************
- */
- 
- /**
-  * ImgButtonWrapper.tag
-  *	Author: Mitchell Seaton
-  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
-  */
- 
- %>
-<%@ tag body-content="scriptless" %>
-<div id="button-table" class="space-bottom-top">
-	<div id="button-row">
-		<jsp:doBody />
-	</div>
-</div>
+<% 
+/****************************************************************
+ * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ****************************************************************
+ */
+ 
+ /**
+  * ImgButtonWrapper.tag
+  *	Author: Mitchell Seaton
+  *	Description: Simple wrapper that will display buttons correctly when RTL page rendering is used.
+  */
+ 
+ %>
+<%@ tag body-content="scriptless" %>
+<div id="button-table" class="space-bottom-top">
+	<div id="button-row">
+		<jsp:doBody />
+	</div>
+</div>
Index: lams_tool_preview/web/WEB-INF/tags/Page.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/Attic/Page.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_preview/web/WEB-INF/tags/Page.tag	6 Mar 2016 23:36:32 -0000	1.1.2.1
+++ lams_tool_preview/web/WEB-INF/tags/Page.tag	16 May 2016 13:28:47 -0000	1.1.2.2
@@ -12,25 +12,38 @@
 <div class="row no-gutter">
 	<div class="col-xs-12">
 		<div class="container" id="content">
+		
+		<c:choose>
+		<c:when test='${type == "navbar"}'>
+			<jsp:doBody />
+		</c:when> 
+		<c:otherwise>
 			<div class="panel panel-default panel-${type}-page">
-				<div class="panel-heading">
-					<c:if test="${not empty title}">
+				<c:if test="${not empty title}">
+					<div class="panel-heading">
 						<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>
 							</c:if>
 						</div>
-					</c:if>
-					<c:if test="${not empty headingContent}">
-						<c:out value="${headingContent}" escapeXml="true" />
-					</c:if>
-				</div>
+						<c:if test="${not empty headingContent}">
+							<c:out value="${headingContent}" escapeXml="true" />
+						</c:if>
+					</div>
+				</c:if>
 				<div class="panel-body panel-${type}-body">
 					<jsp:doBody />
 				</div>
 			</div>
+		</c:otherwise>
+		</c:choose>
+			
 		</div>
 		<!-- End content container -->
 	</div>
 </div>
+
+
+		
+			
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tags/RestrictedUsageAccordian.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_preview/web/WEB-INF/tags/Tab.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/Tab.tag,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_preview/web/WEB-INF/tags/Tab.tag	24 Jul 2015 00:34:29 -0000	1.1
+++ lams_tool_preview/web/WEB-INF/tags/Tab.tag	16 May 2016 13:28:47 -0000	1.1.2.1
@@ -24,8 +24,8 @@
 
 	/**
 	 * Tab.tag
-	 *	Author: Mitchell Seaton
-	 *	Description: Creates a tab element.
+	 *	Author: Fiona Malikoff
+	 *	Description: Creates a tab element within the Hybrid Tab Header.
 	 * Wiki: 
 	 */
 %>
@@ -54,6 +54,9 @@
 <%--
 	Usually methodCall is selectTab, but the calling code can override methodCall if desired.
 	this is handy if the page needs different logic on initialisation and user switching tabs
+	
+	-- 			onclick="${methodCall}(${id});return false;">
+	
 --%>
 
 <c:if test="${methodCall == null}">
@@ -73,13 +76,14 @@
 	</c:set>
 </c:if>
 
-<div class="nav-box">
-	<div class="tab-left" id="tab-left-${id}"></div>
-	<div class="tab-middle" id="tab-middle-${id}">
-		<a class="tab-middle-link" id="tab-middle-link-${id}" href="#"
-			onclick="${methodCall}(${id});return false;">
-			${tabTitle}
-		</a>
-	</div>
-	<div class="tab-right" id="tab-right-${id}"></div>
-</div>
+<c:set var="class" value=""/>
+<c:if test="${id == 1}">
+	<c:set var="class">class="active"</c:set>
+</c:if>
+	
+<c:set var="disabled" value=""/>
+<c:if test="${inactive}">
+	<c:set var="class">class="disabled"</c:set>
+</c:if>
+
+<li role="presentation" ${class}><a href="#t${id}" aria-controls="t${id}" role="tab" onclick="${methodCall}(${id});return false;">${tabTitle}</a></li>
Index: lams_tool_preview/web/WEB-INF/tags/TabBody.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/TabBody.tag,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_preview/web/WEB-INF/tags/TabBody.tag	24 Jul 2015 00:34:29 -0000	1.1
+++ lams_tool_preview/web/WEB-INF/tags/TabBody.tag	16 May 2016 13:28:47 -0000	1.1.2.1
@@ -28,25 +28,17 @@
  * Wiki: 
  */
 
-		%>
-<%@ tag body-content="scriptless"%>
+%>
 <%@ attribute name="id" required="true" rtexprvalue="true"%>
 <%@ attribute name="tabTitle" required="false" rtexprvalue="true"%>
 <%@ attribute name="titleKey" required="false" rtexprvalue="true"%>
 <%@ attribute name="page" required="false" rtexprvalue="true"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-bean" prefix="bean"%>
 
-<!-- begin tab content -->
-<div class="box" id="tabbody${id}">
-	<c:choose>
-		<c:when test="${page != null}">
-			<jsp:include page="${page}" />
-		</c:when>
-		<c:otherwise>
-			<jsp:doBody />
-		</c:otherwise>
-	</c:choose>
+<c:set var="class" value=""/>
+<c:if test="${id == 1}">
+	<c:set var="class">active</c:set>
+</c:if>
 
-</div>
-<!-- end tab content -->
+<div role="tabpanel" class="tab-pane ${class}" id="t${id}"><jsp:include page="${page}"/></div>
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tags/TabBodyArea.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tags/TabBodys.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_preview/web/WEB-INF/tags/TabName.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/TabName.tag,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_preview/web/WEB-INF/tags/TabName.tag	24 Jul 2015 00:34:29 -0000	1.1
+++ lams_tool_preview/web/WEB-INF/tags/TabName.tag	16 May 2016 13:28:47 -0000	1.1.2.1
@@ -56,4 +56,4 @@
 
 <a class="tab-middle-link ${classVar}" href="<c:out value='${url}' />" title="<c:out value='${titleValue}'/>" style="border:0;">
 	<c:out value="${tabname}" escapeXml="false"/>	
-</a>
+</a>
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tags/Tabs.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/Tabs.tag,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_preview/web/WEB-INF/tags/Tabs.tag	24 Jul 2015 00:34:29 -0000	1.1
+++ lams_tool_preview/web/WEB-INF/tags/Tabs.tag	16 May 2016 13:28:47 -0000	1.1.2.1
@@ -23,47 +23,70 @@
 
 /**
  * Tabs.tag
- *	Author: Mitchell Seaton
- *	Description: Create a tab list from a input collection or nested Tab tags.
- * Wiki: 
+ *	Author: Fiona Malikoff
+ *	Description: Create a hybrid panel header that contains a nav bar that acts like tabs.
  */
 
-		%>
-<%@ tag body-content="scriptless"%>
-<%@ attribute name="collection" type="java.util.Collection" required="false" rtexprvalue="true"%>
+%>
 <%@ attribute name="control" required="false" rtexprvalue="true"%>
-<%@ attribute name="useKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="title" required="false" rtexprvalue="true"%>
+<%@ attribute name="refreshOnClickAction" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpToolSignature" required="false" rtexprvalue="true"%>
+<%@ attribute name="helpModule" required="false" rtexprvalue="true"%>
+<%@ attribute name="extraControl" required="false" rtexprvalue="true"%>
+
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+
+<c:set var="useActions" value="false" scope="request" />
+<c:if test="${not empty helpToolSignature or not empty helpModule or not empty refreshOnClickAction or not empty extraControl}">
+	<c:set var="useActions" value="true" scope="request" />
+</c:if>
+
 <c:set var="dControl" value="false" scope="request" />
 <c:if test="${control}">
 	<c:set var="dControl" value="${control}" scope="request" />
 </c:if>
 
-<c:set var="dUseKey" value="false" scope="request" />
-<c:if test="${useKey}">
-	<c:set var="dUseKey" value="${useKey}" scope="request" />
-</c:if>
+<!-- navbar combined with tabs -->
+<div class="panel panel-default panel-monitor-page">
+<div class="panel-heading navbar-heading">
 
-<!-- tab holder table -->
-<div id="nav">
-	<c:choose>
-		<c:when test="${collection != null}">
-			<c:set var="count" value="0" />
-			<c:forEach var="tab" begin="0" items="${collection}">
-				<c:set var="count" value="${count+1}" />
-				<c:choose>
-					<c:when test="${dUseKey}">
-						<lams:Tab id="${count}" key="${tab}" />
-					</c:when>
-					<c:otherwise>
-						<lams:Tab id="${count}" value="${tab}" />
-					</c:otherwise>
-				</c:choose>
-			</c:forEach>
-		</c:when>
-		<c:otherwise>
-			<jsp:doBody />
-		</c:otherwise>
-	</c:choose>
+ 	<nav class="navbar navbar-default navbar-heading">
+	<div class="container-fluid">
+    	<!-- Brand and toggle get grouped for better mobile display -->
+		<div class="navbar-header">
+	      <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar-collapse-1" aria-expanded="false">
+	        <span class="sr-only">Toggle navigation</span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	        <span class="icon-bar"></span>
+	      </button>
+	      <span class="navbar-brand">${title}</span>
+		</div>
+		<div class="collapse navbar-collapse" id="navbar-collapse-1" role="navigation">
+         <ul class="nav navbar-nav" id="page-tabs">
+	         <li role="separator" class="divider"></li>
+	          <jsp:doBody />
+         </ul>
+         <c:if test="${useActions}">
+         <ul class="nav navbar-nav navbar-right" id="page-actions">
+		     <li role="separator" class="divider"></li>
+		     <c:if test="${not empty refreshOnClickAction}">
+             <li class="navbar-text" ><span onclick="${refreshOnClickAction}"><i class="fa fa-refresh"></i></span></li>
+             </c:if>
+             <c:if test="${not empty helpToolSignature or not empty helpModule}">
+             <li class="navbar-text" ><lams:help toolSignature="${helpToolSignature}" module="${helpModule}" style="small"/></li>
+             </c:if>
+             <c:if test="${not empty extraControl}">
+             <li class="navbar-text" >${extraControl}</li>
+             </c:if>
+         </ul>
+         </c:if>
+ 	    
+ 		</div>
+	 </div>
+     </nav>
+     <!-- /top nav -->
 </div>
+<!-- panel div closed by TabBodyArea -->
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tags/TextSearch.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/TextSearch.tag,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_preview/web/WEB-INF/tags/TextSearch.tag	24 Jul 2015 00:34:29 -0000	1.1
+++ lams_tool_preview/web/WEB-INF/tags/TextSearch.tag	16 May 2016 13:28:47 -0000	1.1.2.1
@@ -133,4 +133,4 @@
 	</lams:ImgButtonWrapper>
 	</form>
 </c:if>
-<!-- end text search form content -->
+<!-- end text search form content -->
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/tags/headItems.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tags/headItems.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_preview/web/WEB-INF/tags/headItems.tag	10 Feb 2016 10:01:28 -0000	1.1.2.1
+++ lams_tool_preview/web/WEB-INF/tags/headItems.tag	16 May 2016 13:28:47 -0000	1.1.2.2
@@ -41,7 +41,9 @@
 	<lams:WebAppURL />
 </c:set>
 
-<lams:css style="main"/>
+<lams:css/>
 
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>
Index: lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.1.2.4 -r1.1.2.5
--- lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	8 Mar 2016 00:15:20 -0000	1.1.2.4
+++ lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	16 May 2016 13:28:48 -0000	1.1.2.5
@@ -178,7 +178,7 @@
       <name>css</name>
       <tag-class>org.lamsfoundation.lams.web.tag.CssTag</tag-class>
       <body-content>empty</body-content>
-
+      
       <attribute>
          <description>Output stylesheet based on the user preferences.</description>
          <name>style</name>
@@ -408,10 +408,18 @@
        <path>/WEB-INF/tags/TabBody.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>TabBodys</name>
+       <path>/WEB-INF/tags/TabBodys.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>TabName</name>
        <path>/WEB-INF/tags/TabName.tag</path>
    	</tag-file>
    	<tag-file>
+       <name>TabBodyArea</name>
+       <path>/WEB-INF/tags/TabBodyArea.tag</path>
+   	</tag-file>
+   	<tag-file>
        <name>CKEditor</name>
        <path>/WEB-INF/tags/CKEditor.tag</path>
    	</tag-file>
@@ -446,12 +454,24 @@
    	<tag-file>
 	    <name>Page</name>
 		<path>/WEB-INF/tags/Page.tag</path>
-   	</tag-file>  
+   	</tag-file>
    	<tag-file>
 	    <name>TSTable</name>
 		<path>/WEB-INF/tags/TSTable.tag</path>
+   	</tag-file>    
+  	<tag-file>
+	    <name>Arrow</name>
+		<path>/WEB-INF/tags/Arrow.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>AdvancedAccordian</name>
+       <path>/WEB-INF/tags/AdvancedAccordian.tag</path>
    	</tag-file>  
    	<tag-file>
+   		<name>RestrictedUsageAccordian</name>
+   		<path>/WEB-INF/tags/RestrictedUsageAccordian.tag</path>
+   	</tag-file>
+   	<tag-file>
 	    <name>ImgButtonWrapper</name>
 		<path>/WEB-INF/tags/ImgButtonWrapper.tag</path>
    	</tag-file>
@@ -493,5 +513,13 @@
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>
 	</tag-file>
+   	<tag-file>
+       <name>Comments</name>
+       <path>/WEB-INF/tags/Comments.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>CommentsAuthor</name>
+       <path>/WEB-INF/tags/CommentsAuthor.tag</path>
+   	</tag-file>
 
 </taglib>
Index: lams_tool_preview/web/common/header.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/common/header.jsp,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_preview/web/common/header.jsp	24 Jul 2015 00:34:29 -0000	1.1
+++ lams_tool_preview/web/common/header.jsp	16 May 2016 13:28:48 -0000	1.1.2.1
@@ -5,11 +5,12 @@
 
  <!-- ********************  CSS ********************** -->
 <link href="<html:rewrite page='/includes/css/peerreview.css'/>" rel="stylesheet" type="text/css">
-<lams:css />
+<lams:css/>
 
 <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>    
 
 	
Index: lams_tool_preview/web/common/tabbedheader.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/common/tabbedheader.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_preview/web/common/tabbedheader.jsp	10 Feb 2016 10:01:28 -0000	1.1.2.1
+++ lams_tool_preview/web/common/tabbedheader.jsp	16 May 2016 13:28:48 -0000	1.1.2.2
@@ -4,12 +4,13 @@
 <c:set var="ctxPath" value="${pageContext.request.contextPath}" scope="request"/>
 
  <!-- ********************  CSS ********************** -->
-<lams:css style="main"/>
+<lams:css/>
 <link href="<html:rewrite page='/includes/css/peerreview.css'/>" rel="stylesheet" type="text/css">
 
 <!-- ********************  javascript ********************** -->
 <script type="text/javascript" src="${lams}includes/javascript/common.js"></script>
 <script type="text/javascript" src="${lams}includes/javascript/jquery.js"></script>
-<script type="text/javascript" src="${lams}includes/javascript/tabcontroller.js"></script>    
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.min.js"></script>
+<script type="text/javascript" src="${lams}includes/javascript/bootstrap.tabcontroller.js"></script>    
 
 	
Index: lams_tool_preview/web/pages/authoring/advance.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/authoring/advance.jsp,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_preview/web/pages/authoring/advance.jsp	24 Jul 2015 00:34:29 -0000	1.1
+++ lams_tool_preview/web/pages/authoring/advance.jsp	16 May 2016 13:28:47 -0000	1.1.2.1
@@ -3,19 +3,14 @@
 
 <!-- Advance Tab Content -->
 
-<p class="small-space-top">
-	<html:checkbox property="peerreview.lockWhenFinished"
-		styleClass="noBorder" styleId="lockWhenFinished">
-	</html:checkbox>
+<div class="checkbox">
+<label for="lockWhenFinished"><html:checkbox property="peerreview.lockWhenFinished" styleId="lockWhenFinished" />
+<fmt:message key="label.authoring.advance.lock.on.finished" /></label>
+</div>
 
-	<label for="lockWhenFinished">
-		<fmt:message key="label.authoring.advance.lock.on.finished" />
-	</label>
-</p>
-
-<p>
-	<fmt:message key="label.max.number.marks.each.user" />
-	<html:select property="peerreview.maximumRatesPerUser">
+<div class="form-group">
+<label for="maximumRatesPerUser"><fmt:message key="label.max.number.marks.each.user" /></label>
+	<html:select property="peerreview.maximumRatesPerUser" styleClass="form-control form-control-inline">
 		<html:option value="0">
 			<fmt:message key="label.no.maximum" />
 		</html:option>
@@ -30,32 +25,22 @@
 		<html:option value="9">9</html:option>
 		<html:option value="10">10</html:option>
 	</html:select>
-</p>
+</div>
 
-<p class="small-space-top">
-	<html:checkbox property="peerreview.showRatingsLeftForUser"
-		styleClass="noBorder" styleId="show-ratings-left-for-user">
-	</html:checkbox>
+<div class="checkbox">
+<label for="show-ratings-left-for-user"><html:checkbox property="peerreview.showRatingsLeftForUser"styleId="show-ratings-left-for-user"/>
+<fmt:message key="label.show.ratings.left.for.user" />
+</label>
+</div>
 
-	<label for="show-ratings-left-for-user">
-		<fmt:message key="label.show.ratings.left.for.user" />
-	</label>
-</p>
+<div class="checkbox">
+<label for="reflectOn"><html:checkbox property="peerreview.reflectOnActivity" styleId="reflectOn"/>
+<fmt:message key="label.authoring.advanced.reflectOnActivity" /></label>
+</div>
+<div class="form-group">
+<html:textarea property="peerreview.reflectInstructions" styleId="reflectInstructions"  styleClass="form-control" rows="3"/>
+</div>
 
-<p>
-	<html:checkbox property="peerreview.reflectOnActivity"
-		styleClass="noBorder" styleId="reflectOn">
-	</html:checkbox>
-	<label for="reflectOn">
-		<fmt:message key="label.authoring.advanced.reflectOnActivity" />
-	</label>
-</p>
-
-<p>
-	<html:textarea property="peerreview.reflectInstructions"
-		styleId="reflectInstructions" cols="30" rows="3" />
-</p>
-
 <script type="text/javascript">
 //automatically turn on refect option if there are text input in refect instruction area
 	var ra = document.getElementById("reflectInstructions");
Index: lams_tool_preview/web/pages/authoring/authoring.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/authoring/authoring.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_preview/web/pages/authoring/authoring.jsp	26 Feb 2016 07:17:31 -0000	1.1.2.1
+++ lams_tool_preview/web/pages/authoring/authoring.jsp	16 May 2016 13:28:47 -0000	1.1.2.2
@@ -6,14 +6,10 @@
 
 <lams:html>
 <lams:head>
-	<title><fmt:message key="label.author.title" /></title>
+	<title><fmt:message key="activity.title" /></title>
 
 	<%@ include file="/common/tabbedheader.jsp"%>
 	<link href="${lams}css/jquery-ui-redmond-theme.css" rel="stylesheet" type="text/css" >
-	<style media="screen,projection" type="text/css">
-		#criterias-holder {padding-left: 15px;}
-	</style>
-
 	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 	<script>
         function init(){
@@ -36,40 +32,38 @@
     
 </lams:head>
 <body class="stripes" onLoad="init()">
-<div id="page">
-		<h1>
-			<fmt:message key="label.authoring.heading" />
-		</h1>
-<div id="header">
-		<lams:Tabs useKey="true" control="true">
-			<lams:Tab id="1" key="label.authoring.heading.basic" />
-			<lams:Tab id="2" key="label.authoring.heading.advance" />
-		</lams:Tabs></div>
-		<!-- start tabs -->
-<div id="content">
-		<!-- end tab buttons -->
+
+	<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
+		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+		<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" scope="request"/>
 		
-		<%@ include file="/common/messages.jsp"%>
+		<html:hidden property="peerreview.contentId" />
+		<html:hidden property="sessionMapID" />
+		<html:hidden property="contentFolderID" />
+		<html:hidden property="currentTab" styleId="currentTab" />
 
-		<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
-			<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-			<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" scope="request"/>
-			
-			<html:hidden property="peerreview.contentId" />
-			<html:hidden property="sessionMapID" />
-			<html:hidden property="contentFolderID" />
-			<html:hidden property="currentTab" styleId="currentTab" />
+	<c:set var="title"><fmt:message key="activity.title" /></c:set>
+	<lams:Page title="${title}" type="navbar">
+
+		<lams:Tabs control="true" title="${title}" helpToolSignature="<%= PeerreviewConstants.TOOL_SIGNATURE %>" helpModule="authoring">
+			<lams:Tab id="1" key="label.authoring.heading.basic" />
+ 			<lams:Tab id="2" key="label.authoring.heading.advance" />
+ 		</lams:Tabs>
+		
+		<lams:TabBodyArea>
+		
+			<%@ include file="/common/messages.jsp"%>
+		
+			<lams:TabBodys>
+				<!-- tab content 1 (Basic) -->
+				<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+				<!-- end of content (Basic) -->
 	
-			<lams:help toolSignature="<%= PeerreviewConstants.TOOL_SIGNATURE %>" module="authoring"/>
+				<!-- tab content 2 (Advanced) -->
+ 				<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
+ 				<!-- end of content (Advanced) -->
+			</lams:TabBodys>
 
-			<!-- tab content 1 (Basic) -->
-			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
-			<!-- end of content (Basic) -->
-
-			<!-- tab content 2 (Advanced) -->
-			<lams:TabBody id="2" titleKey="label.authoring.heading.advance.desc" page="advance.jsp" />
-			<!-- end of content (Advanced) -->
-
 			<!-- Button Row -->
 			<%--  Default value 
 				cancelButtonLabelKey="label.authoring.cancel.button"
@@ -81,13 +75,13 @@
 				toolSignature="<%=PeerreviewConstants.TOOL_SIGNATURE%>" toolContentID="${formBean.peerreview.contentId}" 
 				 customiseSessionID="${formBean.sessionMapID}"
 				 contentFolderID="${formBean.contentFolderID}" />
+		</lams:TabBodyArea>
+
+		<div id="footer"></div>
+		
+	</lams:Page>
+	
 	</html:form>
 
-</div>
-
-<div id="footer"></div>
-<!-- end page div -->
-</div>
-
 </body>
 </lams:html>
Index: lams_tool_preview/web/pages/authoring/basic.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/authoring/basic.jsp,v
diff -u -r1.1 -r1.1.2.1
--- lams_tool_preview/web/pages/authoring/basic.jsp	24 Jul 2015 00:34:29 -0000	1.1
+++ lams_tool_preview/web/pages/authoring/basic.jsp	16 May 2016 13:28:47 -0000	1.1.2.1
@@ -3,26 +3,14 @@
 <c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 
 <!-- Basic Tab Content -->
-<table>
-	<tr>
-		<td colspan="2">
-			<div class="field-name">
-				<fmt:message key="label.authoring.basic.title"></fmt:message>
-			</div>
-			<html:text property="peerreview.title" style="width: 99%;"></html:text>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="2">
-			<div class="field-name">
-				<fmt:message key="label.authoring.basic.instruction"></fmt:message>
-			</div>
-			<lams:CKEditor id="peerreview.instructions"
-				value="${formBean.peerreview.instructions}"
-				contentFolderID="${formBean.contentFolderID}"></lams:CKEditor>
-		</td>
-	</tr>
-</table>
+<div class="form-group">
+    <label for="peerreview.title"><fmt:message key="label.authoring.basic.title"/></label>
+    <html:text property="peerreview.title" styleClass="form-control"></html:text>
+</div>
+<div class="form-group">
+    <label for="peerreview.instructions"><fmt:message key="label.authoring.basic.instruction" /></label>
+    <lams:CKEditor id="peerreview.instructions" value="${formBean.peerreview.instructions}" contentFolderID="${formBean.contentFolderID}"></lams:CKEditor>
+</div>
 
 <div id="criterias-holder">
 	<lams:AuthoringRatingCriteria criterias="${sessionMap.ratingCriterias}" hasRatingLimits="true"
Index: lams_tool_preview/web/pages/authoring/definelater.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/authoring/definelater.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_preview/web/pages/authoring/definelater.jsp	26 Feb 2016 07:17:31 -0000	1.1.2.1
+++ lams_tool_preview/web/pages/authoring/definelater.jsp	16 May 2016 13:28:47 -0000	1.1.2.2
@@ -4,28 +4,18 @@
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="java.util.HashSet"%>
 <%@ page import="org.lamsfoundation.lams.tool.peerreview.PeerreviewConstants"%>
-<%@ page import="java.util.Set"%>
-<%Set tabs = new HashSet();
-			tabs.add("label.authoring.heading.basic");
-			pageContext.setAttribute("tabs", tabs);
-
-			%>
 <lams:html>
 <lams:head>
 	<title><fmt:message key="label.author.title" /></title>
 
 	<%@ include file="/common/tabbedheader.jsp"%>
+	<link href="${lams}css/jquery-ui-redmond-theme.css" rel="stylesheet" type="text/css" >
+	<script type="text/javascript" src="${lams}includes/javascript/jquery-ui.js"></script>
 
 	<script>
         
         function init(){
-            selectTab(1); //select the default tab;
-            
-            initEditor("Title");
-            initEditor("Instructions");
-            initEditor("OnlineInstruction");
-            initEditor("OfflineInstruction");
-            
+            selectTab(1); //select the default tab;            
         }     
         
         function doSelectTab(tabId) {
@@ -43,43 +33,43 @@
 
 </lams:head>
 <body class="stripes" onLoad="init()">
-<div id="page">
-	<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
-		<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
-		<html:hidden property="peerreview.contentId" />
-		<html:hidden property="mode" value="teacher"/>
-		<html:hidden property="contentFolderID" />
-		<html:hidden property="sessionMapID" />
+
+<html:form action="authoring/update" method="post" styleId="authoringForm" enctype="multipart/form-data">
+	<c:set var="formBean" value="<%= request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY) %>" />
+	<c:set var="sessionMap" value="${sessionScope[formBean.sessionMapID]}" scope="request"/>
+	<html:hidden property="peerreview.contentId" />
+	<html:hidden property="mode" value="teacher"/>
+	<html:hidden property="contentFolderID" />
+	<html:hidden property="sessionMapID" />
 		
-		<h1>
-			<fmt:message key="label.authoring.heading" />
-		</h1>
-<div id="header">
-		<!-- start tabs -->
-		<lams:Tabs collection="${tabs}" useKey="true" control="true" />
-</div>
-<div id="content">
-		<%@ include file="/common/messages.jsp"%>
+	<c:set var="title"><fmt:message key="activity.title" /></c:set>
+	<lams:Page title="${title}" type="navbar">
+
+		<lams:Tabs control="true" title="${title}" helpToolSignature="<%= PeerreviewConstants.TOOL_SIGNATURE %>" helpModule="authoring">
+			<lams:Tab id="1" key="label.authoring.heading.basic" />
+		</lams:Tabs>
 		
-		<lams:help toolSignature="<%= PeerreviewConstants.TOOL_SIGNATURE %>" module="authoring"/>
-		<!-- end tab buttons -->
-		<div class="tabbody">
-			<!-- tab content 1 (Basic) -->
-			<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
-			<!-- end of content (Basic) -->
+		<lams:TabBodyArea>
+		
+			<%@ include file="/common/messages.jsp"%>
+		
+			<lams:TabBodys>
+				<!-- tab content 1 (Basic) -->
+				<lams:TabBody id="1" titleKey="label.authoring.heading.basic.desc" page="basic.jsp" />
+				<!-- end of content (Basic) -->
+			</lams:TabBodys>
 
-
 			<!-- Button Row -->
 			<lams:AuthoringButton formID="authoringForm" clearSessionActionUrl="/clearsession.do" toolSignature="<%=PeerreviewConstants.TOOL_SIGNATURE%>" 
 				toolContentID="${formBean.peerreview.contentId}"  accessMode="teacher" defineLater="yes"  
 				customiseSessionID="${formBean.sessionMapID}" contentFolderID="${formBean.contentFolderID}"/>
-		</div>
+		</lams:TabBodyArea>
 
+		<div id="footer"></div>
+		
+	</lams:Page>
 
-	</html:form>
+</html:form>
 	
-</div>
-<div id="footer"></div>
-</div>
 </body>
 </lams:html>
Index: lams_tool_preview/web/pages/authoring/definelaterforbid.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/authoring/definelaterforbid.jsp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_preview/web/pages/authoring/definelaterforbid.jsp	26 Feb 2016 07:17:31 -0000	1.1.2.1
+++ lams_tool_preview/web/pages/authoring/definelaterforbid.jsp	16 May 2016 13:28:47 -0000	1.1.2.2
@@ -3,19 +3,16 @@
             
 <html:html locale="true">
 <lams:head>
-	<title><fmt:message key="label.author.title" /></title>
-
+	<title><fmt:message key="activity.title" /></title>
 	<%@ include file="/common/header.jsp"%>
 </lams:head>
 <body class="stripes">
-	<div id="content">
-	<div align="center">
-		<h1>
-			<fmt:message key="label.authoring.heading" />
-		</h1>
+	<c:set var="title"><fmt:message key="activity.title" /></c:set>
+	<lams:Page title="${title}" type="learner">
 
-		<B><fmt:message key="message.monitoring.edit.activity.not.editable" /></B>
-	</div>
-	</div>
+		<lams:Alert id="errorMessages" type="danger" close="false">
+		<fmt:message key="message.monitoring.edit.activity.not.editable" />
+		</lams:Alert>
+	</lams:Page>
 </body>
 </html:html>