From e78d6923dba71ed87beaabb2e83071c9550fe1f6 Mon Sep 17 00:00:00 2001
From: mb863 <mb863@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 9 Jul 2010 18:55:04 +0000
Subject: [PATCH] made changes for photo upload: new icon alert, created page
 for those with javascript disable, restructure javascript files

---
 webapp/web/js/imageUpload/imageUploadUtils.js | 27 +++++++++++++++++++
 .../body/imageUpload/imageUpload-newImage.ftl | 18 ++++++++++---
 .../imageUpload/imageUpload-replaceImage.ftl  |  8 +++---
 3 files changed, 45 insertions(+), 8 deletions(-)
 create mode 100644 webapp/web/js/imageUpload/imageUploadUtils.js

diff --git a/webapp/web/js/imageUpload/imageUploadUtils.js b/webapp/web/js/imageUpload/imageUploadUtils.js
new file mode 100644
index 000000000..91e37707c
--- /dev/null
+++ b/webapp/web/js/imageUpload/imageUploadUtils.js
@@ -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);
+			}	
+}
diff --git a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
index eb94d1d12..055faf780 100644
--- a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
+++ b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
@@ -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">
diff --git a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
index 719d78609..916a888e1 100644
--- a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
+++ b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
@@ -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>