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

NIHVIVO-577. Improved photo upload: error messages, photo thumbnail placeholder, and cleaned javascript files

Browse source
This commit is contained in:
mb863 2010-07-13 14:37:27 +00:00
parent d653cc8744
commit ecd92ad5d6
3 changed files with 25 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
webapp/web/images/dummyImages/person.thumbnail.jpg
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

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

@ -20,23 +20,27 @@ ${stylesheets.addFromTheme("/uploadImages.css")}
</noscript>
<#if errorMessage??>
<script type="text/javascript">
window.onload = load;
function load(){
alert("${errorMessage}");
}
</script>
</#if>
<div id="photoUploadContainer" class="hidden">
<h2>Photo Upload</h2>
<#if errorMessage??>
<div id="errorAlert"><img src="${urls.siteIcons}/iconAlert.png"/>
<p>${errorMessage}</p>
</div>
</#if>
<div id="photoUploadDefaultImageContainer">
<h6>Current Photo</h6>
<img src="${thumbnailUrl}" width="115" height="115" /> </div>
<div id="photoUploadForm">
<form action="${formAction}" enctype="multipart/form-data" method="post">
<div id="photoUploadForm">
<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>

22
webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
View file

@ -9,26 +9,26 @@ ${scripts.add("/js/imageUpload/imageUploadUtils.js")}
${stylesheets.addFromTheme("/uploadImages.css")}
<#if errorMessage??>
<script type="text/javascript">
window.onload = load;
function load(){
alert("${errorMessage}");
}
</script>
</#if>
<div id="photoUploadContainer">
<h2>Photo Upload</h2>
<#if errorMessage??>
<div id="errorAlert"><img src="${urls.siteIcons}/iconAlert.png"/>
<p>${errorMessage}</p>
</div>
</#if>
<div id="photoUploadDefaultImageContainer">
<h6>Current Photo</h6>
<img src="${thumbnailUrl}" width="115" />
<a class="delete" href="${deleteUrl}" title="delete the current photo">Delete photo</a></div>
<a class="delete" href="${deleteUrl}">Delete photo</a></div>
<div id="photoUploadForm">
<form action="${formAction}" enctype="multipart/form-data" method="post">
<label>Replace Photo <span> (JPEG, GIF or PNG)</span></label>
<input type="file" name="datafile" size="30">
<input type="submit" value="Upload photo"> or <a class="cancelUpload" href="${cancelUrl}">Cancel</a>
<input type="file" name="datafile" size="30">
<input type="submit" value="Upload photo"> or <a class="cancelUpload" href="${cancelUrl}">Cancel</a>
</form>
</div>
</div>