Index: lams_central/web/includes/javascript/ckconfig_custom.js
===================================================================
diff -u -r6a28a3cd969047f7ef1f1e8b3a273ebcfe9c6d45 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_central/web/includes/javascript/ckconfig_custom.js	(.../ckconfig_custom.js)	(revision 6a28a3cd969047f7ef1f1e8b3a273ebcfe9c6d45)
+++ lams_central/web/includes/javascript/ckconfig_custom.js	(.../ckconfig_custom.js)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -11,9 +11,10 @@
     ['Paint_Button','oembed','Image','Link','Iframe','Table','HorizontalRule','Smiley','SpecialChar','Templates','Format','Font','FontSize','About']
 ];
 
-CKEDITOR.config.toolbar_DefaultDoku = [
-                                   	['Bold','Italic','Underline','StrikeThrough','NumberedList','BulletedList','Indent','Outdent','Undo','Redo']
+CKEDITOR.config.toolbar_DefaultDokuInline = [
+                                  	['Bold','Italic','Underline','StrikeThrough','NumberedList','BulletedList','Indent','Outdent','Undo','Redo']
 ];
+
 // removing Video Recorder from default tool bar LDEV-2961
 // To include it back, just add 'VideoRecorder' in between the MoviePlayer and Kaltura
 
Index: lams_tool_doku/web/WEB-INF/tags/AdvancedAccordian.tag
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tags/AdvancedAccordian.tag	(.../AdvancedAccordian.tag)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -50,4 +50,4 @@
 		</div>
 	</div>
 </div>
-		
+		
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tags/AuthoringButton.tag	(.../AuthoringButton.tag)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -123,11 +123,11 @@
     }  				
 </script>	
 <div id="saveCancelButtons" >
-		<html:link href="javascript:doSubmit_Form_Only();" property="submit" styleId="saveButton" styleClass="btn btn-primary pull-right">
+		<html:link href="javascript:doSubmit_Form_Only();" styleId="saveButton" property="submit" styleClass="btn btn-primary pull-right">
 			<span class="okIcon"><fmt:message key="${saveButtonLabelKey}" /></span>
 		</html:link>
 		<html:link href="javascript:;" property="cancel" styleId="cancelButton" onclick="javascript:doCancel()" styleClass="btn btn-default roffset5 pull-right">
 			<span class="cancelIcon"><fmt:message key="${cancelButtonLabelKey}" /></span>
 		</html:link>
 </div>
-<!-- end tab content -->
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag	(.../AuthoringRatingAllStyleCriteria.tag)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -417,4 +417,4 @@
 		</div>
 		
 </div>
-<!-- end rating -->
+<!-- end rating -->
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/AuthoringRatingCriteria.tag
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tags/AuthoringRatingCriteria.tag	(.../AuthoringRatingCriteria.tag)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -345,4 +345,4 @@
 		</div>
 	</div>
 </div>
-<!-- end tab content -->
+<!-- end tab content -->
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/CKEditor.tag
===================================================================
diff -u -r1564385272b790fb39e14dd2215a2dbe98b2e416 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 1564385272b790fb39e14dd2215a2dbe98b2e416)
+++ lams_tool_doku/web/WEB-INF/tags/CKEditor.tag	(.../CKEditor.tag)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -21,11 +21,11 @@
 </c:set>
 
 <c:if test="${empty toolbarSet}">
-	<c:set var="toolbarSet" value="DefaultDoku" />
+	<c:set var="toolbarSet" value="Default" />
 </c:if>
 
-<c:if test="${fn:containsIgnoreCase(method,'DefaultDoku')}">
-	<c:set var="toolbarSet">${toolbarSet}DefaultDoku</c:set>
+<c:if test="${fn:containsIgnoreCase(method,'Inline')}">
+	<c:set var="toolbarSet">${toolbarSet}Inline</c:set>
 </c:if>
 
 <c:if test="${empty displayExpanded}">
Index: lams_tool_doku/web/WEB-INF/tags/Comments.tag
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tags/Comments.tag	(.../Comments.tag)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -45,4 +45,4 @@
 	$.ajaxSetup({ cache: true });
 	$('#commentFrame').load(url);
 });
-</script>
+</script>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/Date.tag
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tags/Date.tag	(.../Date.tag)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -61,4 +61,4 @@
 
 <c:if test="${not empty timeago}">
 	</time>
-</c:if>
+</c:if>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/DefineLater.tag
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tags/DefineLater.tag	(.../DefineLater.tag)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -63,4 +63,4 @@
 			class="btn btn-primary pull-right voffset5"><fmt:message
 				key="${buttonTryAgainKey}" /></a>
 	</div>
-</div>
+</div>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/FileUpload.tag
===================================================================
diff -u
--- lams_tool_doku/web/WEB-INF/tags/FileUpload.tag	(revision 0)
+++ lams_tool_doku/web/WEB-INF/tags/FileUpload.tag	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -0,0 +1,84 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+<%@ taglib uri="tags-function" prefix="fn" %>
+<%@ taglib uri="tags-fmt" prefix="fmt" %>
+
+<%-- Usually fileFieldname and fileFieldId are the same, but DACO needs them to be different.
+ If they can be the same, set  fileFieldname and  fileFieldId will be set to the same. 
+ If you need them different, then define both. 
+ If you define neither, fileFieldname = fileFieldId = "fileSelector" --%>
+<%@ attribute name="fileFieldname" required="false" rtexprvalue="true"%>
+<%@ attribute name="fileFieldId" required="false" rtexprvalue="true"%>
+
+<%@ attribute name="fileInputNameFieldname" required="false" rtexprvalue="true"%>
+<%@ attribute name="fileInputMessageKey" required="false" rtexprvalue="true"%>
+
+<%-- Set uploadInfoMessageKey to '-' to NOT show the "not exe and max file size" type message. Leave it blank for the default key  label.upload.info --%>
+<%@ attribute name="uploadInfoMessageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="maxFileSize" required="true" rtexprvalue="true"%> 
+<%@ attribute name="tabindex" required="false" rtexprvalue="true"%>
+
+<%-- Only set if you have more than one file field on the screen (such as DACO) --%>			
+<%@ attribute name="errorMsgDiv" required="false" rtexprvalue="true"%>
+<%@ attribute name="fileButtonBrowse" required="false" rtexprvalue="true"%>
+
+			
+<c:if test="${empty fileFieldname}">
+	<c:set var="fileFieldname" value="fileSelector" />
+</c:if>
+
+<c:if test="${empty fileFieldId}">
+	<c:set var="fileFieldId" value="${fileFieldname}" />
+</c:if>
+
+<c:if test="${empty fileInputNameFieldname}">
+	<c:set var="fileInputNameFieldname" value="fileInputName" />
+</c:if>
+
+<c:if test="${empty fileInputMessageKey}">
+	<c:set var="fileInputMessageKey" value="label.authoring.basic.resource.file.input" />
+</c:if>
+
+<c:if test="${empty uploadInfoMessageKey}">
+	<c:set var="uploadInfoMessageKey" value="label.upload.info" />
+</c:if>
+
+<c:if test="${not empty tabindex}">
+	<c:set var="tabindexString" value="tabindex='${tabindex}'" />
+</c:if>
+
+<c:if test="${empty errorMsgDiv}">
+	<c:set var="errorMsgDiv" value="file-error-msg" />
+</c:if>
+
+<c:if test="${empty fileButtonBrowse}">
+	<c:set var="fileButtonBrowse" value="fileButtonBrowse" />
+</c:if>
+
+
+<div class="input-group" id="addfile">
+	<span class="input-group-btn" style="font-size:inherit"> <%-- font-size:inherit needed for Share Resources authoring or the button is too small --%>
+		<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-sm btn-default">
+			<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
+		</button>
+	</span>
+	<input type="file" id="${fileFieldId}" name="${fileFieldname}" style="display:none" class="fileUpload"> 
+	<input type="text" id="${fileInputNameFieldname}" style="display:none" disabled="disabled" placeholder="File not selected" class="form-control input-sm file-input-name">
+</div>
+<c:if test="${uploadInfoMessageKey ne '-'}">
+<p class="help-block"><fmt:message key="${uploadInfoMessageKey}"><fmt:param>${maxFileSize}</fmt:param></fmt:message></p>					
+</c:if>
+<div id="${errorMsgDiv}" class="text-danger" style="display:none"></div>			
+
+<script type="text/javascript">
+	// Fake file upload
+	document.getElementById('${fileButtonBrowse}').addEventListener('click', function() {
+		document.getElementById('${fileFieldId}').click();
+	});
+	
+	document.getElementById('${fileFieldId}').addEventListener('change', function() {
+		$('#${fileInputNameFieldname}').show();
+		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
+	});
+</script>  
+
Index: lams_tool_doku/web/WEB-INF/tags/ImgButtonWrapper.tag
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tags/ImgButtonWrapper.tag	(.../ImgButtonWrapper.tag)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -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_doku/web/WEB-INF/tags/LeaderDisplay.tag
===================================================================
diff -u
--- lams_tool_doku/web/WEB-INF/tags/LeaderDisplay.tag	(revision 0)
+++ lams_tool_doku/web/WEB-INF/tags/LeaderDisplay.tag	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -0,0 +1,28 @@
+<%@ tag body-content="scriptless"%>
+<%@ taglib uri="tags-core" prefix="c"%>
+<%@ taglib uri="tags-fmt" prefix="fmt"%>
+<%@ taglib uri="tags-lams" prefix="lams"%>
+
+<%@ attribute name="idName" required="false" rtexprvalue="true"%>
+<%@ attribute name="messageKey" required="false" rtexprvalue="true"%>
+<%@ attribute name="username" required="false" rtexprvalue="true"%>
+<%@ attribute name="userId" required="true" rtexprvalue="true"%>
+
+<c:if test="${empty idName}">
+	<c:set var="idName" value="alert-leader${userId}" />
+</c:if>
+
+<c:if test="${empty messageKey}">
+	<c:set var="messageKey" value="label.group.leader" />
+</c:if>
+
+<div class="row no-gutter">
+	<div class="col-xs-12 col-sm-offset-2 col-sm-8">
+		<div id="${idName}" class="alert alert-info leader-display">
+			<h4><fmt:message key="${messageKey}">
+				<fmt:param>${username}</fmt:param>
+			</fmt:message>&nbsp;
+			<lams:Portrait userId="${userId}"/></h4>
+		</div>
+	</div>
+</div>
Index: lams_tool_doku/web/WEB-INF/tags/Rating.tag
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tags/Rating.tag	(.../Rating.tag)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -24,6 +24,7 @@
 <%@ attribute name="averageRatingLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="minNumberWordsLabel" required="false" rtexprvalue="true" %>
 <%@ attribute name="showComments" required="false" rtexprvalue="true" %>
+<%@ attribute name="allowRetries" required="false" rtexprvalue="true" %>
 
 <%-- Default value for message key --%>
 <c:if test="${empty disabled}">
@@ -61,6 +62,10 @@
 	</c:forEach>
 </c:if>
 
+<c:if test="${empty allowRetries}">
+	<c:set var="allowRetries" value="false" scope="request"/>
+</c:if>
+
 <%--Rating stars area---------------------------------------%>
 
 <div class="extra-controls-inner">
@@ -77,7 +82,7 @@
 		<c:set var="isCriteriaNotRatedByUser" value='${criteriaDto.userRating == ""}'/>
 	
 		<c:choose>
-			<c:when test='${disabled || isItemAuthoredByUser || (maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating || !isCriteriaNotRatedByUser}'>
+			<c:when test='${disabled || isItemAuthoredByUser || ((maxRates > 0) && (countRatedItems >= maxRates)  && !hasStartedRating) || !(isCriteriaNotRatedByUser || allowRetries)}'>
 				<c:set var="ratingStarsClass" value="rating-stars-disabled"/>
 			</c:when>
 			<c:otherwise>
@@ -191,4 +196,4 @@
 		</c:choose>
 			
 	</div>	
-</c:if>
+</c:if>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/RestrictedUsageAccordian.tag
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tags/RestrictedUsageAccordian.tag	(.../RestrictedUsageAccordian.tag)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -51,4 +51,4 @@
 		</div>
 	</div>
 </div>
-		
+		
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/StyledRating.tag
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tags/StyledRating.tag	(.../StyledRating.tag)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -198,4 +198,4 @@
 </c:when> 
 
 
-</c:choose>
+</c:choose>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/TSTable.tag
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tags/TSTable.tag	(.../TSTable.tag)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tags/TSTable.tag	(.../TSTable.tag)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -50,4 +50,4 @@
 	</tbody>
 </table>
 
-	
+	
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/TabBody.tag
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tags/TabBody.tag	(.../TabBody.tag)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -50,4 +50,4 @@
 		<jsp:doBody />
 	</c:otherwise>
 </c:choose>
-</div>
+</div>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/TabBodyArea.tag
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tags/TabBodyArea.tag	(.../TabBodyArea.tag)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -36,4 +36,4 @@
 	 <jsp:doBody />
 </div>
 
-</div> <!--  close tab opened in TabHeader -->
+</div> <!--  close tab opened in TabHeader -->
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/Tabs.tag
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tags/Tabs.tag	(.../Tabs.tag)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -97,4 +97,4 @@
      </nav>
      <!-- /top nav -->
 </div>
-<!-- panel div closed by TabBodyArea -->
+<!-- panel div closed by TabBodyArea -->
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tags/TextSearch.tag
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tags/TextSearch.tag	(.../TextSearch.tag)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -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_doku/web/WEB-INF/tags/WaitingSpinner.tag
===================================================================
diff -u
--- lams_tool_doku/web/WEB-INF/tags/WaitingSpinner.tag	(revision 0)
+++ lams_tool_doku/web/WEB-INF/tags/WaitingSpinner.tag	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -0,0 +1,17 @@
+<%@ taglib uri="tags-core" prefix="c"%>
+
+<%@ attribute name="id" required="false" rtexprvalue="true"%>
+<%@ attribute name="showInline" required="false" rtexprvalue="true"%>
+			
+<c:if test="${not empty id}">
+	<c:set var="idString">id="${id}"</c:set>
+</c:if>
+
+<c:choose>
+<c:when test="${showInline}">
+<i class="fa fa-refresh fa-spin fa-fw text-primary" style="display:none" ${idString} /></i>
+</c:when>
+<c:otherwise>
+<div class="text-center" style="display:none" ${idString} ><i class="fa fa-refresh fa-spin fa-2x fa-fw text-primary" /></i></div>
+</c:otherwise>
+</c:choose>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/tlds/jstl/c.tld
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tlds/jstl/c.tld	(.../c.tld)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tlds/jstl/c.tld	(.../c.tld)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -101,7 +101,7 @@
     <body-content>JSP</body-content>
     <attribute>
         <description>
-The URL of the dokumaran to import.
+The URL of the resource to import.
         </description>
         <name>url</name>
         <required>true</required>
@@ -110,7 +110,7 @@
     <attribute>
         <description>
 Name of the exported scoped variable for the
-dokumaran's content. The type of the scoped
+resource's content. The type of the scoped
 variable is String.
         </description>
         <name>var</name>
@@ -128,7 +128,7 @@
     <attribute>
         <description>
 Name of the exported scoped variable for the
-dokumaran's content. The type of the scoped
+resource's content. The type of the scoped
 variable is Reader.
         </description>
         <name>varReader</name>
@@ -138,7 +138,7 @@
     <attribute>
         <description>
 Name of the context when accessing a relative
-URL dokumaran that belongs to a foreign
+URL resource that belongs to a foreign
 context.
         </description>
         <name>context</name>
@@ -148,7 +148,7 @@
     <attribute>
         <description>
 Character encoding of the content at the input
-dokumaran.
+resource.
         </description>
         <name>charEncoding</name>
         <required>false</required>
@@ -401,7 +401,7 @@
     <body-content>JSP</body-content>
     <attribute>
         <description>
-The URL of the dokumaran to redirect to.
+The URL of the resource to redirect to.
         </description>
         <name>url</name>
         <required>false</required>
@@ -410,7 +410,7 @@
     <attribute>
         <description>
 Name of the context when redirecting to a relative URL
-dokumaran that belongs to a foreign context.
+resource that belongs to a foreign context.
         </description>
         <name>context</name>
         <required>false</required>
@@ -532,7 +532,7 @@
     <attribute>
         <description>
 Name of the context when specifying a relative URL
-dokumaran that belongs to a foreign context.
+resource that belongs to a foreign context.
         </description>
         <name>context</name>
         <required>false</required>
Index: lams_tool_doku/web/WEB-INF/tlds/jstl/fmt.tld
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tlds/jstl/fmt.tld	(.../fmt.tld)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tlds/jstl/fmt.tld	(.../fmt.tld)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -149,15 +149,15 @@
 
   <tag>
     <description>
-        Loads a dokumaran bundle to be used by its tag body
+        Loads a resource bundle to be used by its tag body
     </description>
     <name>bundle</name>
     <tag-class>org.apache.taglibs.standard.tag.rt.fmt.BundleTag</tag-class>
     <body-content>JSP</body-content>
     <attribute>
         <description>
-Dokumaran bundle base name. This is the bundle's
-fully-qualified dokumaran name, which has the same
+Resource bundle base name. This is the bundle's
+fully-qualified resource name, which has the same
 form as a fully-qualified class name, that is, it uses
 "." as the package component separator and does not
 have any file type (such as ".class" or ".properties")
@@ -180,16 +180,16 @@
 
   <tag>
     <description>
-        Loads a dokumaran bundle and stores it in the named scoped variable or
+        Loads a resource bundle and stores it in the named scoped variable or
         the bundle configuration variable
     </description>
     <name>setBundle</name>
     <tag-class>org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag</tag-class>
     <body-content>empty</body-content>
     <attribute>
         <description>
-Dokumaran bundle base name. This is the bundle's
-fully-qualified dokumaran name, which has the same
+Resource bundle base name. This is the bundle's
+fully-qualified resource name, which has the same
 form as a fully-qualified class name, that is, it uses
 "." as the package component separator and does not
 have any file type (such as ".class" or ".properties")
@@ -238,7 +238,7 @@
     </attribute>
     <attribute>
         <description>
-Localization context in whose dokumaran
+Localization context in whose resource
 bundle the message key is looked up.
         </description>
         <name>bundle</name>
Index: lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -151,16 +151,16 @@
    </tag>
    <tag>
 
-      <description>Converts role name into form usable as message dokumaran key</description>
-      <display-name>Converts role name into form usable as message dokumaran key</display-name>
+      <description>Converts role name into form usable as message resources key</description>
+      <display-name>Converts role name into form usable as message resources key</display-name>
       <icon>    
       </icon>
       <name>role</name>
       <tag-class>org.lamsfoundation.lams.web.tag.RoleTag</tag-class>
       <body-content>empty</body-content>
 
       <attribute>
-         <description>Converts role name into form usable as message dokumaran key</description>
+         <description>Converts role name into form usable as message resources key</description>
          <name>role</name>
          <required>true</required>
 
@@ -178,16 +178,18 @@
       <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>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
+  	  <attribute>
+ 	      <description>Override the name to use a different suffix than "learner"</description>
+	      <name>suffix</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
+ 	  <attribute>
+ 	      <description>Include this webapp in the path</description>
+	      <name>webapp</name>
+ 	      <required>false</required>
+ 	      <rtexprvalue>true</rtexprvalue>
+ 	  </attribute>
    </tag>
    <tag>
 
@@ -395,6 +397,32 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 	</tag>
+	
+	<tag>
+      <description>Small portrait of a user</description>
+      <display-name>User Portrait</display-name>
+      <icon></icon>
+      <name>Portrait</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.PortraitTag</tag-class>
+      <body-content>empty</body-content>
+      <attribute>
+         <name>userId</name>
+         <required>true</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      <attribute>
+         <name>size</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+      </attribute>
+      <attribute>
+         <name>round</name>
+         <required>false</required>
+         <rtexprvalue>true</rtexprvalue>
+         <description>If true shows the portrait as a round dot. Defaults to true.</description>
+      </attribute>
+   </tag>
+	
 	<tag-file>
        <name>Tab</name>
        <path>/WEB-INF/tags/Tab.tag</path>
@@ -487,6 +515,10 @@
 	    <name>TextSearch</name>
 		<path>/WEB-INF/tags/TextSearch.tag</path>
    	</tag-file>  
+   	<tag-file>
+	    <name>LeaderDisplay</name>
+		<path>/WEB-INF/tags/LeaderDisplay.tag</path>
+   	</tag-file>  
    	<tag>
     <name>textarea</name>
     <tag-class>org.lamsfoundation.lams.web.tag.LAMSMultiLinesTextareaTag</tag-class>
@@ -529,5 +561,13 @@
        <name>CommentsAuthor</name>
        <path>/WEB-INF/tags/CommentsAuthor.tag</path>
    	</tag-file>
+   	<tag-file>
+       <name>FileUpload</name>
+       <path>/WEB-INF/tags/FileUpload.tag</path>
+   	</tag-file>
+   	<tag-file>
+       <name>WaitingSpinner</name>
+       <path>/WEB-INF/tags/WaitingSpinner.tag</path>
+   	</tag-file>
 
 </taglib>
Index: lams_tool_doku/web/WEB-INF/tlds/struts/struts-bean-el.tld
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/WEB-INF/tlds/struts/struts-bean-el.tld	(.../struts-bean-el.tld)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/WEB-INF/tlds/struts/struts-bean-el.tld	(.../struts-bean-el.tld)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -130,7 +130,7 @@
 </tag>
 <tag>
 <name>resource</name>
-<tagclass>org.apache.strutsel.taglib.bean.ELDokumaranTag</tagclass>
+<tagclass>org.apache.strutsel.taglib.bean.ELResourceTag</tagclass>
 <teiclass>org.apache.struts.taglib.bean.ResourceTei</teiclass>
 <bodycontent>empty</bodycontent>
 <attribute>
Index: lams_tool_doku/web/pages/authoring/basic.jsp
===================================================================
diff -u -rb15a3b889da23ac048a689fc2d661df42571b229 -r2fc3c196b706f247820267da4439c301a1a77805
--- lams_tool_doku/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision b15a3b889da23ac048a689fc2d661df42571b229)
+++ lams_tool_doku/web/pages/authoring/basic.jsp	(.../basic.jsp)	(revision 2fc3c196b706f247820267da4439c301a1a77805)
@@ -13,5 +13,5 @@
     <label for="dokumaran.instructions">
     	<fmt:message key="label.authoring.basic.instruction" />
     </label>
-    <lams:CKEditor id="dokumaran.instructions" value="${formBean.dokumaran.instructions}" contentFolderID="${formBean.contentFolderID}" height="400"/>
+    <lams:CKEditor id="dokumaran.instructions" value="${formBean.dokumaran.instructions}" contentFolderID="${formBean.contentFolderID}" height="400" toolbarSet="DefaultDoku" method="inline"/>
 </div>