Index: lams_tool_bbb/web/WEB-INF/tags/FileUpload.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_bbb/web/WEB-INF/tags/Attic/FileUpload.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_bbb/web/WEB-INF/tags/FileUpload.tag	27 Feb 2017 10:15:51 -0000	1.1.2.1
+++ lams_tool_bbb/web/WEB-INF/tags/FileUpload.tag	1 Mar 2017 12:38:32 -0000	1.1.2.2
@@ -3,17 +3,34 @@
 <%@ 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>
@@ -30,25 +47,36 @@
 	<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-default">
+		<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-default">
 			<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
 		</button>
 	</span>
-	<input type="file" id="${fileFieldname}" name="${fileFieldname}" style="display:none" class="fileUpload"> 
+	<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 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>					
-<div id="file-error-msg" class="text-danger" style="display:none"></div>			
+</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('${fileFieldname}').click();
+	document.getElementById('${fileButtonBrowse}').addEventListener('click', function() {
+		document.getElementById('${fileFieldId}').click();
 	});
 	
-	document.getElementById('${fileFieldname}').addEventListener('change', function() {
+	document.getElementById('${fileFieldId}').addEventListener('change', function() {
 		$('#${fileInputNameFieldname}').show();
 		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
 	});
Index: lams_tool_chat/web/WEB-INF/tags/FileUpload.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_chat/web/WEB-INF/tags/Attic/FileUpload.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_chat/web/WEB-INF/tags/FileUpload.tag	27 Feb 2017 10:15:50 -0000	1.1.2.1
+++ lams_tool_chat/web/WEB-INF/tags/FileUpload.tag	1 Mar 2017 12:38:30 -0000	1.1.2.2
@@ -3,17 +3,34 @@
 <%@ 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>
@@ -30,25 +47,36 @@
 	<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-default">
+		<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-default">
 			<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
 		</button>
 	</span>
-	<input type="file" id="${fileFieldname}" name="${fileFieldname}" style="display:none" class="fileUpload"> 
+	<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 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>					
-<div id="file-error-msg" class="text-danger" style="display:none"></div>			
+</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('${fileFieldname}').click();
+	document.getElementById('${fileButtonBrowse}').addEventListener('click', function() {
+		document.getElementById('${fileFieldId}').click();
 	});
 	
-	document.getElementById('${fileFieldname}').addEventListener('change', function() {
+	document.getElementById('${fileFieldId}').addEventListener('change', function() {
 		$('#${fileInputNameFieldname}').show();
 		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
 	});
Index: lams_tool_daco/web/WEB-INF/tags/FileUpload.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_daco/web/WEB-INF/tags/Attic/FileUpload.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_daco/web/WEB-INF/tags/FileUpload.tag	28 Feb 2017 11:21:28 -0000	1.1.2.1
+++ lams_tool_daco/web/WEB-INF/tags/FileUpload.tag	1 Mar 2017 12:38:34 -0000	1.1.2.2
@@ -12,6 +12,8 @@
 
 <%@ 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"%>
@@ -63,7 +65,9 @@
 	<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 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">
Index: lams_tool_forum/web/WEB-INF/tags/FileUpload.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/tags/Attic/FileUpload.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_forum/web/WEB-INF/tags/FileUpload.tag	27 Feb 2017 10:11:07 -0000	1.1.2.1
+++ lams_tool_forum/web/WEB-INF/tags/FileUpload.tag	1 Mar 2017 12:38:31 -0000	1.1.2.2
@@ -3,17 +3,34 @@
 <%@ 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>
@@ -30,25 +47,36 @@
 	<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-default">
+		<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-default">
 			<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
 		</button>
 	</span>
-	<input type="file" id="${fileFieldname}" name="${fileFieldname}" style="display:none" class="fileUpload"> 
+	<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 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>					
-<div id="file-error-msg" class="text-danger" style="display:none"></div>			
+</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('${fileFieldname}').click();
+	document.getElementById('${fileButtonBrowse}').addEventListener('click', function() {
+		document.getElementById('${fileFieldId}').click();
 	});
 	
-	document.getElementById('${fileFieldname}').addEventListener('change', function() {
+	document.getElementById('${fileFieldId}').addEventListener('change', function() {
 		$('#${fileInputNameFieldname}').show();
 		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
 	});
Index: lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.15.2.2 -r1.15.2.3
--- lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	13 Dec 2016 04:21:12 -0000	1.15.2.2
+++ lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag	1 Mar 2017 12:38:33 -0000	1.15.2.3
@@ -123,7 +123,7 @@
     }  				
 </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">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/FileUpload.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_gmap/web/WEB-INF/tags/WaitingSpinner.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.7 -r1.3.2.8
--- lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	25 Nov 2016 17:08:48 -0000	1.3.2.7
+++ lams_tool_gmap/web/WEB-INF/tlds/lams/lams.tld	1 Mar 2017 12:38:33 -0000	1.3.2.8
@@ -529,5 +529,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_kaltura/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.4.2.2 -r1.4.2.3
--- lams_tool_kaltura/web/WEB-INF/tags/AuthoringButton.tag	13 Dec 2016 04:24:18 -0000	1.4.2.2
+++ lams_tool_kaltura/web/WEB-INF/tags/AuthoringButton.tag	1 Mar 2017 12:37:08 -0000	1.4.2.3
@@ -123,7 +123,7 @@
     }  				
 </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">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/FileUpload.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_kaltura/web/WEB-INF/tags/WaitingSpinner.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.7 -r1.3.2.8
--- lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld	25 Nov 2016 17:08:55 -0000	1.3.2.7
+++ lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld	1 Mar 2017 12:37:08 -0000	1.3.2.8
@@ -529,5 +529,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_laqa/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.20.2.2 -r1.20.2.3
--- lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	13 Dec 2016 04:26:36 -0000	1.20.2.2
+++ lams_tool_laqa/web/WEB-INF/tags/AuthoringButton.tag	1 Mar 2017 12:36:19 -0000	1.20.2.3
@@ -123,7 +123,7 @@
     }  				
 </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">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tags/FileUpload.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_laqa/web/WEB-INF/tags/WaitingSpinner.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.9 -r1.3.2.10
--- lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	25 Nov 2016 17:09:05 -0000	1.3.2.9
+++ lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld	1 Mar 2017 12:36:18 -0000	1.3.2.10
@@ -529,5 +529,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_leader/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.1.2.3 -r1.1.2.4
--- lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag	13 Dec 2016 04:28:42 -0000	1.1.2.3
+++ lams_tool_leader/web/WEB-INF/tags/AuthoringButton.tag	1 Mar 2017 12:36:20 -0000	1.1.2.4
@@ -123,7 +123,7 @@
     }  				
 </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">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_leader/web/WEB-INF/tags/FileUpload.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_leader/web/WEB-INF/tags/WaitingSpinner.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.6 -r1.3.2.7
--- lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	25 Nov 2016 17:09:32 -0000	1.3.2.6
+++ lams_tool_leader/web/WEB-INF/tlds/lams/lams.tld	1 Mar 2017 12:36:20 -0000	1.3.2.7
@@ -529,5 +529,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_mindmap/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.9.2.3 -r1.9.2.4
--- lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	13 Dec 2016 03:43:25 -0000	1.9.2.3
+++ lams_tool_mindmap/web/WEB-INF/tags/AuthoringButton.tag	1 Mar 2017 12:35:59 -0000	1.9.2.4
@@ -123,7 +123,7 @@
     }  				
 </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">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_mindmap/web/WEB-INF/tags/FileUpload.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_mindmap/web/WEB-INF/tags/WaitingSpinner.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.7 -r1.3.2.8
--- lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	25 Nov 2016 17:09:22 -0000	1.3.2.7
+++ lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld	1 Mar 2017 12:35:59 -0000	1.3.2.8
@@ -529,5 +529,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_nb/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.20.2.3 -r1.20.2.4
--- lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	13 Dec 2016 04:30:50 -0000	1.20.2.3
+++ lams_tool_nb/web/WEB-INF/tags/AuthoringButton.tag	1 Mar 2017 12:35:56 -0000	1.20.2.4
@@ -123,7 +123,7 @@
     }  				
 </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">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tags/FileUpload.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/tags/WaitingSpinner.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.2.2.8 -r1.2.2.9
--- lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	25 Nov 2016 17:09:16 -0000	1.2.2.8
+++ lams_tool_nb/web/WEB-INF/tlds/lams/lams.tld	1 Mar 2017 12:35:56 -0000	1.2.2.9
@@ -529,5 +529,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_notebook/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.18.2.2 -r1.18.2.3
Binary files differ
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/tags/FileUpload.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_notebook/web/WEB-INF/tags/WaitingSpinner.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.7 -r1.3.2.8
--- lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	25 Nov 2016 17:09:33 -0000	1.3.2.7
+++ lams_tool_notebook/web/WEB-INF/tlds/lams/lams.tld	1 Mar 2017 12:35:58 -0000	1.3.2.8
@@ -529,5 +529,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_pixlr/web/WEB-INF/tags/FileUpload.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_pixlr/web/WEB-INF/tags/Attic/FileUpload.tag,v
diff -u -r1.1.2.1 -r1.1.2.2
--- lams_tool_pixlr/web/WEB-INF/tags/FileUpload.tag	27 Feb 2017 10:01:40 -0000	1.1.2.1
+++ lams_tool_pixlr/web/WEB-INF/tags/FileUpload.tag	1 Mar 2017 12:35:55 -0000	1.1.2.2
@@ -3,17 +3,34 @@
 <%@ 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>
@@ -30,25 +47,36 @@
 	<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-default">
+		<button id="${fileButtonBrowse}" ${tabindexString} type="button" class="btn btn-default">
 			<i class="fa fa-upload"></i> <fmt:message key="${fileInputMessageKey}"/>
 		</button>
 	</span>
-	<input type="file" id="${fileFieldname}" name="${fileFieldname}" style="display:none" class="fileUpload"> 
+	<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 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>					
-<div id="file-error-msg" class="text-danger" style="display:none"></div>			
+</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('${fileFieldname}').click();
+	document.getElementById('${fileButtonBrowse}').addEventListener('click', function() {
+		document.getElementById('${fileFieldId}').click();
 	});
 	
-	document.getElementById('${fileFieldname}').addEventListener('change', function() {
+	document.getElementById('${fileFieldId}').addEventListener('change', function() {
 		$('#${fileInputNameFieldname}').show();
 		document.getElementById('${fileInputNameFieldname}').value = this.value.replace(/^.*\\/, "");
 	});
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.2.2 -r1.1.2.3
--- lams_tool_preview/web/WEB-INF/tags/AuthoringButton.tag	13 Dec 2016 04:33:48 -0000	1.1.2.2
+++ lams_tool_preview/web/WEB-INF/tags/AuthoringButton.tag	1 Mar 2017 12:35:30 -0000	1.1.2.3
@@ -123,7 +123,7 @@
     }  				
 </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">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_preview/web/WEB-INF/tags/FileUpload.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/WaitingSpinner.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
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.8 -r1.1.2.9
--- lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	25 Nov 2016 17:09:14 -0000	1.1.2.8
+++ lams_tool_preview/web/WEB-INF/tlds/lams/lams.tld	1 Mar 2017 12:35:30 -0000	1.1.2.9
@@ -529,5 +529,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_preview/web/pages/learning/star.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_preview/web/pages/learning/Attic/star.jsp,v
diff -u -r1.1.2.9 -r1.1.2.10
--- lams_tool_preview/web/pages/learning/star.jsp	26 Dec 2016 04:06:36 -0000	1.1.2.9
+++ lams_tool_preview/web/pages/learning/star.jsp	1 Mar 2017 12:35:29 -0000	1.1.2.10
@@ -112,7 +112,6 @@
 							
 							var isDisabled = IS_DISABLED || (MAX_RATES > 0) && ( COUNT_RATED_ITEMS >= MAX_RATES) || isMaximumRatesPerUserReached;
 							
-							debugger;
 							var objectId = "${criteriaRatings.ratingCriteria.ratingCriteriaId}-" + itemId;
 							var userRating = userData["userRating"];
 							var isCriteriaNotRatedByUser = userRating == "";
Index: lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.18.2.2 -r1.18.2.3
--- lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	13 Dec 2016 04:36:45 -0000	1.18.2.2
+++ lams_tool_scribe/web/WEB-INF/tags/AuthoringButton.tag	1 Mar 2017 12:34:04 -0000	1.18.2.3
@@ -123,7 +123,7 @@
     }  				
 </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">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_scribe/web/WEB-INF/tags/FileUpload.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_scribe/web/WEB-INF/tags/WaitingSpinner.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.2.2.7 -r1.2.2.8
--- lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	25 Nov 2016 17:09:11 -0000	1.2.2.7
+++ lams_tool_scribe/web/WEB-INF/tlds/lams/lams.tld	1 Mar 2017 12:34:04 -0000	1.2.2.8
@@ -529,5 +529,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_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.12.2.2 -r1.12.2.3
--- lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	13 Dec 2016 04:37:32 -0000	1.12.2.2
+++ lams_tool_spreadsheet/web/WEB-INF/tags/AuthoringButton.tag	1 Mar 2017 12:34:01 -0000	1.12.2.3
@@ -123,7 +123,7 @@
     }  				
 </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">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/WEB-INF/tags/FileUpload.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_spreadsheet/web/WEB-INF/tags/WaitingSpinner.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.7.2.7 -r1.7.2.8
--- lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	25 Nov 2016 17:09:03 -0000	1.7.2.7
+++ lams_tool_spreadsheet/web/WEB-INF/tlds/lams/lams.tld	1 Mar 2017 12:34:01 -0000	1.7.2.8
@@ -529,5 +529,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_survey/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.17.2.2 -r1.17.2.3
--- lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	13 Dec 2016 04:38:27 -0000	1.17.2.2
+++ lams_tool_survey/web/WEB-INF/tags/AuthoringButton.tag	1 Mar 2017 12:34:03 -0000	1.17.2.3
@@ -123,7 +123,7 @@
     }  				
 </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">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_survey/web/WEB-INF/tags/FileUpload.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_survey/web/WEB-INF/tags/WaitingSpinner.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.20.2.7 -r1.20.2.8
--- lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	25 Nov 2016 17:09:35 -0000	1.20.2.7
+++ lams_tool_survey/web/WEB-INF/tlds/lams/lams.tld	1 Mar 2017 12:34:03 -0000	1.20.2.8
@@ -529,5 +529,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_vote/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.20.2.2 -r1.20.2.3
--- lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	13 Dec 2016 04:40:23 -0000	1.20.2.2
+++ lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag	1 Mar 2017 12:33:59 -0000	1.20.2.3
@@ -123,7 +123,7 @@
     }  				
 </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">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/tags/FileUpload.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/tags/WaitingSpinner.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.7 -r1.3.2.8
--- lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	25 Nov 2016 17:09:13 -0000	1.3.2.7
+++ lams_tool_vote/web/WEB-INF/tlds/lams/lams.tld	1 Mar 2017 12:33:59 -0000	1.3.2.8
@@ -529,5 +529,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_wiki/web/WEB-INF/tags/AuthoringButton.tag
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag,v
diff -u -r1.11.2.2 -r1.11.2.3
--- lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	13 Dec 2016 04:41:15 -0000	1.11.2.2
+++ lams_tool_wiki/web/WEB-INF/tags/AuthoringButton.tag	1 Mar 2017 12:34:00 -0000	1.11.2.3
@@ -123,7 +123,7 @@
     }  				
 </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">
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_wiki/web/WEB-INF/tags/FileUpload.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_wiki/web/WEB-INF/tags/WaitingSpinner.tag'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld,v
diff -u -r1.3.2.7 -r1.3.2.8
--- lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	25 Nov 2016 17:09:28 -0000	1.3.2.7
+++ lams_tool_wiki/web/WEB-INF/tlds/lams/lams.tld	1 Mar 2017 12:34:00 -0000	1.3.2.8
@@ -529,5 +529,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>