From ecd92ad5d6f9eea7af7b06288fd764d44f843453 Mon Sep 17 00:00:00 2001
From: mb863 <mb863@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 13 Jul 2010 14:37:27 +0000
Subject: [PATCH] NIHVIVO-577. Improved photo upload: error messages, photo
 thumbnail placeholder, and cleaned javascript files

---
 .../images/dummyImages/person.thumbnail.jpg   | Bin 2327 -> 2537 bytes
 .../body/imageUpload/imageUpload-newImage.ftl |  24 ++++++++++--------
 .../imageUpload/imageUpload-replaceImage.ftl  |  22 ++++++++--------
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/webapp/web/images/dummyImages/person.thumbnail.jpg b/webapp/web/images/dummyImages/person.thumbnail.jpg
index 3d5abe1e637f3421b9a0ab76d4a9ea3f022b21f5..008b7449f3af3793b006760b02ecd7a1797100d9 100644
GIT binary patch
delta 2351
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

delta 2139
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
Z5!ZTRYh!doNoprS<8o{rJZtsUzX2GDvo-(#

diff --git a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
index b015cc6a4..c9be46884 100644
--- a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
+++ b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-newImage.ftl
@@ -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>
diff --git a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
index f9fbf5ad2..b0f0475e1 100644
--- a/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
+++ b/webapp/web/templates/freemarker/body/imageUpload/imageUpload-replaceImage.ftl
@@ -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>