From 8d5e7a2dc06d34fdbeddce1bb37078363bac237e Mon Sep 17 00:00:00 2001
From: nac26 <nac26@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 12 Jul 2010 15:59:37 +0000
Subject: [PATCH] JS tweaks for form validation (file upload) and delete
 confirmation NIHVIVO-577

---
 webapp/web/js/imageUpload/imageUploadUtils.js | 35 ++++++++-----------
 .../body/imageUpload/imageUpload-newImage.ftl |  4 +--
 .../imageUpload/imageUpload-replaceImage.ftl  |  6 ++--
 3 files changed, 19 insertions(+), 26 deletions(-)

diff --git a/webapp/web/js/imageUpload/imageUploadUtils.js b/webapp/web/js/imageUpload/imageUploadUtils.js
index 91e37707c..ead868254 100644
--- a/webapp/web/js/imageUpload/imageUploadUtils.js
+++ b/webapp/web/js/imageUpload/imageUploadUtils.js
@@ -1,27 +1,20 @@
 /* $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;
-	  }
-	});
-	
-	
-});
+  $("#photoUploadContainer").removeClass("hidden");
 
+  $('#photoUploadForm form').submit(function() {
+    if ($("#datafile").val() == '') {
+      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);
-			}	
-}
+  $('a.delete').click(function(){
+    var answer = confirm('Are you sure you want to '+ jQuery(this).attr('title') +'?' );
+    // jQuery(this).attr('title') gets anchor title attribute
+    return answer;
+  });
+
+});
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
index 055faf780..b015cc6a4 100644
--- a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
+++ b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
@@ -38,8 +38,8 @@ ${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 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"> or <a class="cancelUpload"  href="${cancelUrl}">Cancel</a>
               </form>
        </div>
 </div>
diff --git a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
index 4f70ee030..f9fbf5ad2 100644
--- a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
+++ b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
@@ -23,12 +23,12 @@ ${stylesheets.addFromTheme("/uploadImages.css")}
        <div id="photoUploadDefaultImageContainer">
               <h6>Current Photo</h6>
               <img src="${thumbnailUrl}" width="115" />
-       <a href='javascript:delete_photo("${deleteUrl}");'>Delete photo</a></div>
+       <a class="delete" href="${deleteUrl}" title="delete the current photo">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>