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

merge r5315 r5323:5325 r5333 r5359 r5381 from http://svn.mannlib.cornell.edu/svn/vitro/branches/nihvivo-rel-1.1-maint

Browse source
This commit is contained in:
rjy7 2010-07-22 18:47:44 +00:00
parent fa77c80a91
commit a82411b2f0
13 changed files with 256 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

18
webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
View file

@ -10,19 +10,9 @@ ${scripts.add("/js/imageUpload/imageUploadUtils.js")}
${stylesheets.addFromTheme("/uploadImages.css")}
<noscript>
<div id="javascriptDisableWrapper">
<div id="javascriptDisableContent">
<img src="${urls.siteIcons}/iconAlertBig.png" alt="Alert Icon"/>
<p>In order to upload or edit a photo, you'll need to enable JavaScript.</p>
</div>
</div>
</noscript>
<div id="photoUploadContainer" class="hidden">
<div id="photoUploadContainer">
<h2>Photo Upload</h2>
@ -42,8 +32,10 @@ ${stylesheets.addFromTheme("/uploadImages.css")}
<form action="${formAction}" enctype="multipart/form-data" method="post">
<label>Upload a photo <span> (JPEG, GIF or PNG)</span></label>
<input id="datafile" type="file" name="datafile" size="30">
<input type="submit" value="Upload photo"> or <a class="cancelUpload" href="${cancelUrl}">Cancel</a>
<input id="datafile" type="file" name="datafile" size="30" />
<input type="submit" value="Upload photo"/>
<span class="or"> or
<a class="cancelUpload" href="${cancelUrl}">Cancel</a></span>
</form>
</div>
</div>