Index: lams_tool_images/web/pages/authoring/parts/addimage.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/authoring/parts/addimage.jsp,v
diff -u -r1.3.2.9 -r1.3.2.10
--- lams_tool_images/web/pages/authoring/parts/addimage.jsp	13 Nov 2016 10:08:45 -0000	1.3.2.9
+++ lams_tool_images/web/pages/authoring/parts/addimage.jsp	14 Nov 2016 17:20:13 -0000	1.3.2.10
@@ -2,27 +2,24 @@
 <html:form action="/authoring/saveOrUpdateImage" method="post" styleId="imageGalleryItemForm" 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]}" />
-		
-
 	
-<div class="panel panel-default">
-	<div class="panel-heading">
-		<div class="panel-title">
-			<fmt:message key="label.authoring.basic.add.image" />
-			<div class="pull-right">
-				<c:if test="${empty formBean.imageIndex}">
-					<a href="javascript:showMessage('<html:rewrite page="/authoring/initMultipleImages.do?sessionMapID=${formBean.sessionMapID}"/>');" 
-							class="btn btn-default btn-xs">
-						<fmt:message key="label.authoring.basic.upload.multiple.images" />
-					</a>
-				</c:if>		
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			<div class="panel-title">
+				<fmt:message key="label.authoring.basic.add.image" />
+				<div class="pull-right">
+					<c:if test="${empty formBean.imageIndex}">
+						<a href="javascript:showMessage('<html:rewrite page="/authoring/initMultipleImages.do?sessionMapID=${formBean.sessionMapID}"/>');" 
+								class="btn btn-default btn-xs">
+							<fmt:message key="label.authoring.basic.upload.multiple.images" />
+						</a>
+					</c:if>		
+				</div>
 			</div>
 		</div>
-	</div>
-		
-	<div class="panel-body">
-
-		<%@ include file="/common/messages.jsp"%>
+			
+		<div class="panel-body">
+			<%@ include file="/common/messages.jsp"%>
 			<html:hidden property="sessionMapID" />
 			<html:hidden property="imageIndex" />
 	
@@ -44,29 +41,28 @@
 			</div>
 				
 			<div class="form-group">
-				    
 				<c:set var="itemAttachment" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 				<div id="itemAttachmentArea">
 					<%@ include file="/pages/authoring/parts/imagefile.jsp"%>
 				</div>
 			</div>
-					
-		</html:form>
 	
-		<div class="panel-body text-center" style="display:none" id="itemAttachmentArea_Busy">
-			<i class="fa fa-refresh fa-spin fa-2x fa-fw text-primary"></i>
-		</div>
-	
-	
-		<div id="uploadButtons" class="voffset10 pull-right">
-		    <a href="#nogo" onclick="javascript:cancelImageGalleryItem()" class="btn btn-sm btn-default loffset5">
-				<fmt:message key="label.cancel" /> 
-			</a>
-			<a href="#nogo" id="addImageBtn" onclick="javascript:submitImageGalleryItem()" class="btn btn-sm btn-default button-add-item">
-				<fmt:message key="label.authoring.basic.add.image" /> 
-			</a>
+			<div class="panel-body text-center" style="display:none" id="itemAttachmentArea_Busy">
+				<i class="fa fa-refresh fa-spin fa-2x fa-fw text-primary"></i>
+			</div>
+		
+		
+			<div id="uploadButtons" class="voffset10 pull-right">
+			    <a href="#nogo" onclick="javascript:cancelImageGalleryItem()" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.cancel" /> 
+				</a>
+				<a href="#nogo" id="addImageBtn" onclick="javascript:submitImageGalleryItem()" class="btn btn-sm btn-default button-add-item">
+					<fmt:message key="label.authoring.basic.add.image" /> 
+				</a>
+				
+			</div>
 			
 		</div>
-		
 	</div>
-</div>
+
+</html:form>
\ No newline at end of file
Index: lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp,v
diff -u -r1.1.10.6 -r1.1.10.7
--- lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp	13 Nov 2016 10:08:45 -0000	1.1.10.6
+++ lams_tool_images/web/pages/authoring/parts/addmultipleimages.jsp	14 Nov 2016 17:20:13 -0000	1.1.10.7
@@ -1,22 +1,22 @@
 <%@ include file="/common/taglibs.jsp"%>
+<html:form action="/authoring/saveMultipleImages" method="post" styleId="imageGalleryItemsForm" enctype="multipart/form-data">
+	<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />
 	
-<div class="panel panel-default">
-	<div class="panel-heading">
-		<div class="panel-title">
-			<fmt:message key="label.authoring.basic.add.multiple.images" />
-			<a href="javascript:showMessage('<html:rewrite page="/authoring/newImageInit.do?sessionMapID=${formBean.sessionMapID}"/>');" 
-					class="btn btn-default btn-xs pull-right">
-				<fmt:message key="label.authoring.basic.upload.single.image" />
-			</a>			
+	<div class="panel panel-default">
+		<div class="panel-heading">
+			<div class="panel-title">
+				<fmt:message key="label.authoring.basic.add.multiple.images" />
+				<a href="javascript:showMessage('<html:rewrite page="/authoring/newImageInit.do?sessionMapID=${formBean.sessionMapID}"/>');" 
+						class="btn btn-default btn-xs pull-right">
+					<fmt:message key="label.authoring.basic.upload.single.image" />
+				</a>			
+				
+			</div>		
+		</div>
 			
-		</div>		
-	</div>
-		
-	<div class="panel-body">
-
-		<%@ include file="/common/messages.jsp"%>
-		<html:form action="/authoring/saveMultipleImages" method="post" styleId="imageGalleryItemsForm" enctype="multipart/form-data">
-			<c:set var="formBean" value="<%=request.getAttribute(org.apache.struts.taglib.html.Constants.BEAN_KEY)%>" />	
+		<div class="panel-body">
+	
+			<%@ include file="/common/messages.jsp"%>	
 			<html:hidden property="sessionMapID" styleId="sessionMapID"/>
 	
 			<div class="form-group">
@@ -132,25 +132,24 @@
 						document.getElementById('fileInputName5').value = this.value.replace(/^.*\\/, "");
 						
 					});
-				</script>    			
+				</script>
 									
 			</div>
-		
-		</html:form>
-		
-		<div class="panel-body text-center" style="display:none" id="itemAttachmentArea_Busy">
-			<i class="fa fa-refresh fa-spin fa-2x fa-fw text-primary"></i>
-		</div>
-		
 			
-		<div id="uploadButtons" class="voffset10 pull-right">
-		    <a href="#nogo" onclick="javascript:cancelImageGalleryItem()" class="btn btn-sm btn-default loffset5">
-				<fmt:message key="label.cancel" /> 
-			</a>
-			<a href="#nogo" onclick="javascript:submitMultipleImageGalleryItems()" class="btn btn-sm btn-default button-add-item">
-				<fmt:message key="label.authoring.basic.add.images" /> 
-			</a>
+			<div class="panel-body text-center" style="display:none" id="itemAttachmentArea_Busy">
+				<i class="fa fa-refresh fa-spin fa-2x fa-fw text-primary"></i>
+			</div>
+				
+			<div id="uploadButtons" class="voffset10 pull-right">
+			    <a href="#nogo" onclick="javascript:cancelImageGalleryItem()" class="btn btn-sm btn-default loffset5">
+					<fmt:message key="label.cancel" /> 
+				</a>
+				<a href="#nogo" onclick="javascript:submitMultipleImageGalleryItems()" class="btn btn-sm btn-default button-add-item">
+					<fmt:message key="label.authoring.basic.add.images" /> 
+				</a>
+			</div>
+			
 		</div>
-		
 	</div>
-</div>
+	
+</html:form>