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

made changes for photo upload: new icon alert, created page for those with javascript disable, restructure javascript files

Browse source
This commit is contained in:
mb863 2010-07-09 18:55:04 +00:00
parent b98db24a65
commit e78d6923db
3 changed files with 45 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
webapp/web/js/imageUpload/imageUploadUtils.js Normal file
View file

@ -0,0 +1,27 @@
/* $This file is distributed under the terms of the license in /doc/license.txt$ */
/* comments */
$(document).ready(function(){
$("#photoUploadContainer").removeClass("hidden");
$('#photoUploadForm form').submit(function() {
if (form_passed.datafile.value == "") {
alert ("Please browse and select a photo");
return false;
}
});
});
function delete_photo(passUrl) {
var delete_photo_answer = confirm ("Are you sure you want to delete your photo?");
if (delete_photo_answer){
window.open(passUrl);
}
}

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

@ -2,12 +2,24 @@
<#-- Upload a replacement main image for an Individual. -->
${scripts.add("/js/jquery.js")}
${scripts.add("/js/imageUpload/imageUploadUtils.js")}
${scripts.add("/js/imageUpload/validateUpload.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>
<#if errorMessage??>
<script type="text/javascript">
window.onload = load;
@ -17,13 +29,13 @@ ${stylesheets.addFromTheme("/uploadImages.css")}
</script>
</#if>
<div id="photoUploadContainer">
<div id="photoUploadContainer" class="hidden">
<h2>Photo Upload</h2>
<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" onSubmit="return validate_upload_file(this)">
<form action="${formAction}" enctype="multipart/form-data" method="post">
<label>Upload a photo <span> (JPEG, GIF or PNG)</span></label>
<input type="file" name="datafile" size="30">

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

@ -2,10 +2,8 @@
<#-- Upload a replacement main image for an Individual. -->
${scripts.add("/js/imageUpload/validateUpload.js")}
${scripts.add("/js/imageUpload/confirmPhotoDeletion.js")}
${scripts.add("/js/jquery.js")}
${scripts.add("/js/imageUpload/imageUploadUtils.js")}
@ -27,7 +25,7 @@ ${stylesheets.addFromTheme("/uploadImages.css")}
<img src="${thumbnailUrl}" width="115" height="115" />
<a href='javascript:delete_photo("${deleteUrl}");'>Delete photo</a></div>
<div id="photoUploadForm">
<form action="${formAction}" enctype="multipart/form-data" method="post" onSubmit="return validate_upload_file(this)">
<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>