litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.

Browse source
This commit is contained in:
rjy7 2010-04-08 21:12:27 +00:00
parent 59f9edc53f
commit a4497d1fa5
2 changed files with 22 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

9
webapp/web/templates/edit/specific/uploadimages_body.jsp
View file

@ -50,15 +50,20 @@
</c:choose> </c:choose>
</td> </td>
</tr> </tr>
<%-- RY Disabling large image upload
<tr> <tr>
<td bgcolor="#C8D8F8" valign="middle" colspan="1" align="right"> <td bgcolor="#C8D8F8" valign="middle" colspan="1" align="right">
<b>Select Image Type</b><br/> <b>Select Image Type</b><br/>
</td> </td>
<td colspan="2" bgcolor="#C8D8F8" align="left"> <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="thumb" checked="checked" onclick="refreshModeValue();" /> thumbnail (150px x 150px only)
<input type="radio" name="type" value="larger" onclick="refreshModeValue();" /> optional larger image <input type="radio" name="type" value="larger" onclick="refreshModeValue();" /> optional larger image
</td> </td>
</tr> </tr>
--%>
<tr> <tr>
<td bgcolor="#C8D8F8" valign="middle" colspan="1" align="right"> <td bgcolor="#C8D8F8" valign="middle" colspan="1" align="right">
<b>Select Image File</b> <b>Select Image File</b>
@ -67,6 +72,7 @@
</c:if> </c:if>
</td> </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"/> <input type="file" size="55" name="file1"/>
</td> </td>
</tr> </tr>
@ -76,7 +82,7 @@
</td> </td>
<td colspan="2" bgcolor="#C8D8F8" align="left"> <td colspan="2" bgcolor="#C8D8F8" align="left">
<div id="thumbnailExtra" class="dropdownExtra"> <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://"/> <input type="text" size="55" name="remoteURL" value="http://"/>
</div> </div>
</td> </td>
@ -106,6 +112,7 @@
</tr> </tr>
<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> <p>
<input type="submit" name="submitMode" class="yellowbutton" value="Upload Selected Image"/> <input type="submit" name="submitMode" class="yellowbutton" value="Upload Selected Image"/>
<input type="reset" name="reset" class="plainbutton" value="Reset" onclick="document.refreshForm.submit();"/> <input type="reset" name="reset" class="plainbutton" value="Reset" onclick="document.refreshForm.submit();"/>

6
webapp/web/templates/edit/specific/uploadimages_head.jsp
View file

@ -1,6 +1,7 @@
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> <%-- $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"> <script type="text/javascript" language="JavaScript">
/**************************************************** MODE OPTIONS ***********************************************************/ /**************************************************** MODE OPTIONS ***********************************************************/
@ -18,9 +19,12 @@ function refreshModeValue() {
switchElementDisplay('thumbnailExtra'); switchElementDisplay('thumbnailExtra');
} }
</script> </script>
--%>
<style type="text/css"> <style type="text/css">
.dropdownExtra { display: none; } .dropdownExtra { display: none; }
.comment {
color: #6a5acd;
}
</style> </style>