From bcd595ba5fd40905d6018a6f76ba4cfafb45848c Mon Sep 17 00:00:00 2001
From: mb863 <mb863@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 2 Jul 2010 20:55:47 +0000
Subject: [PATCH] Created js error alerts for newImage.ftl and replaceImage.ftl
 These two links below generated error alerts
 http://localhost:8080/vivo/uploadImages?action=edit
 http://localhost:8080/vivo/uploadImages?entityUri=http%3A%2F%2Fvivo.mydomain.edu%2Findividual%2FXXX&action=edit

---
 .../freemarker/body/imageUpload/newImage.ftl        | 13 +++++++++++--
 .../freemarker/body/imageUpload/replaceImage.ftl    | 10 ++++++++--
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/imageUpload/newImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/newImage.ftl
index 8bffeddb0..9dc07d838 100644
--- a/webapp/web/templates/freemarker/body/imageUpload/newImage.ftl
+++ b/webapp/web/templates/freemarker/body/imageUpload/newImage.ftl
@@ -2,12 +2,19 @@
 
 <#-- Upload a replacement main image for an Individual. -->
 
+
 ${scripts.add("/js/imageUpload/validateUpload.js")}
 
+
 ${stylesheets.addFromTheme("/uploadImages.css")}
 
 <#if errorMessage??>
-    <h2>${errorMessage}</h2>
+   <script type="text/javascript">  
+    window.onload = load;  
+	function load(){  
+ 		alert("${errorMessage}");
+ 		}
+ 	</script>
 </#if>
 
 <div id="photoUploadContainer">
@@ -17,9 +24,11 @@ ${stylesheets.addFromTheme("/uploadImages.css")}
               <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)">
+              
                      <label>Upload a photo <span> (JPEG, GIF or PNG. Max Size: 50 MB)</span></label>
                      <input type="file" name="datafile" size="30">
                      <input type="submit" value="Upload photo"> or <a href="${cancelUrl}">Cancel</a>
               </form>
        </div>
-</div>
\ No newline at end of file
+</div>
+
diff --git a/webapp/web/templates/freemarker/body/imageUpload/replaceImage.ftl b/webapp/web/templates/freemarker/body/imageUpload/replaceImage.ftl
index 465df93b4..4206a5ba4 100644
--- a/webapp/web/templates/freemarker/body/imageUpload/replaceImage.ftl
+++ b/webapp/web/templates/freemarker/body/imageUpload/replaceImage.ftl
@@ -8,10 +8,16 @@ ${scripts.add("/js/imageUpload/validateUpload.js")}
 ${scripts.add("/js/imageUpload/confirmPhotoDeletion.js")}
 
 
+
 ${stylesheets.addFromTheme("/uploadImages.css")}
 
 <#if errorMessage??>
-    <h2>${errorMessage}</h2>
+   <script type="text/javascript">  
+    window.onload = load;  
+	function load(){  
+ 		alert("${errorMessage}");
+ 		}
+ 	</script>
 </#if>
 
 <div id="photoUploadContainer">
@@ -27,4 +33,4 @@ ${stylesheets.addFromTheme("/uploadImages.css")}
                      <input type="submit" value="Upload photo"> or <a href="${cancelUrl}">Cancel</a>
               </form>
        </div>
-</div>
\ No newline at end of file
+</div>