From a4497d1fa525cf35e5059a2c4d2b2a0590b16068 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 8 Apr 2010 21:12:27 +0000
Subject: [PATCH] NIHVIVO-333 Merge revisions from rel-1.0-maint: Removed
 choice between image sizes on image upload page. Also added a note explaining
 that images smaller than 150x150px will not display well.

---
 .../edit/specific/uploadimages_body.jsp       | 23 ++++++++++++-------
 .../edit/specific/uploadimages_head.jsp       | 10 +++++---
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/webapp/web/templates/edit/specific/uploadimages_body.jsp b/webapp/web/templates/edit/specific/uploadimages_body.jsp
index abebc6738..95fe8efd9 100644
--- a/webapp/web/templates/edit/specific/uploadimages_body.jsp
+++ b/webapp/web/templates/edit/specific/uploadimages_body.jsp
@@ -49,16 +49,21 @@
 						</c:otherwise>
 					</c:choose>
 				</td>
-			</tr>
-			<tr>
+			</tr>
+			 <%-- RY Disabling large image upload
+			<tr>
+			    
 				<td bgcolor="#C8D8F8"  valign="middle" colspan="1" align="right">
 					<b>Select Image Type</b><br/>
-				</td>
+				</td>
+
 				<td colspan="2" bgcolor="#C8D8F8" align="left">
 					<input type="radio" name="type" value="thumb" checked="checked" onclick="refreshModeValue();" /> thumbnail (150px x 150px only)
 					<input type="radio" name="type" value="larger" onclick="refreshModeValue();" /> optional larger image
-				</td>
-			</tr>
+				</td>
+				
+			</tr>
+			--%>
 			<tr>
 				<td bgcolor="#C8D8F8"  valign="middle" colspan="1" align="right">
 					<b>Select Image File</b>
@@ -66,7 +71,8 @@
 						<br/>${inputLink}
 					</c:if>
 				</td>
-				<td colspan="2" bgcolor="#C8D8F8" align="left">
+				<td colspan="2" bgcolor="#C8D8F8" align="left">
+				    <span class="comment">Please note: images are displayed at approximately 150x150px. Smaller images may not display optimally.</span><br />
 					<input type="file" size="55" name="file1"/>
 				</td>
 			</tr>
@@ -76,7 +82,7 @@
 				</td>
 				<td colspan="2" bgcolor="#C8D8F8" align="left">
 					<div id="thumbnailExtra" class="dropdownExtra">
-						(instead of uploading larger image -- use only when uploading thumbnail)<br/>
+						<%--  (instead of uploading larger image -- use only when uploading thumbnail)<br/> --%>
 						<input type="text" size="55" name="remoteURL" value="http://"/>
 					</div>
 				</td>
@@ -105,7 +111,8 @@
 				</td>
 			</tr>
 			<tr>
-				<td colspan="3" bgcolor="#C8D8F8" align="center">
+				<td colspan="3" bgcolor="#C8D8F8" align="center">
+				    <input type="hidden" name="type" value="thumb" /> <%-- RY Disabling large image upload --%>
 					<p>
 					<input type="submit" name="submitMode" class="yellowbutton" value="Upload Selected Image"/>
 					<input type="reset" name="reset" class="plainbutton" value="Reset" onclick="document.refreshForm.submit();"/>
diff --git a/webapp/web/templates/edit/specific/uploadimages_head.jsp b/webapp/web/templates/edit/specific/uploadimages_head.jsp
index 0f090ddc7..987d33254 100644
--- a/webapp/web/templates/edit/specific/uploadimages_head.jsp
+++ b/webapp/web/templates/edit/specific/uploadimages_head.jsp
@@ -1,6 +1,7 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<script type="text/javascript" language="JavaScript" src="js/toggle.js"></script>
+<script type="text/javascript" language="JavaScript" src="js/toggle.js"></script>
+<%-- 
 <script type="text/javascript" language="JavaScript">
 /**************************************************** MODE OPTIONS  ***********************************************************/
 
@@ -18,9 +19,12 @@ function refreshModeValue() {
 	switchElementDisplay('thumbnailExtra');
 }
 </script>
-
+--%>
 <style type="text/css">
-.dropdownExtra { display: none; }
+.dropdownExtra { display: none; }
+.comment {
+    color: #6a5acd;
+}   
 </style>