From 79da8d30ed2dec323112ddb14b1c83cb65f3a6f2 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Mon, 30 Aug 2010 19:58:12 +0000
Subject: [PATCH] Remove icon definitions and error message markup from login
 controller and handle in templates instead.

---
 .../edit/FreemarkerSiteAdminController.java   |  4 +--
 .../controller/login/LoginTemplateHelper.java | 28 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FreemarkerSiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FreemarkerSiteAdminController.java
index 22a8a4971..28f6e5349 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FreemarkerSiteAdminController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/edit/FreemarkerSiteAdminController.java
@@ -40,10 +40,8 @@ public class FreemarkerSiteAdminController extends FreemarkerHttpServlet {
         
         // Not logged in: just show login form
         if (loginHandler == null || !"authenticated".equals(loginStatus)) {
-            //return new LoginTemplateHelper(vreq).showLoginPage(vreq, body, config);
             body.put("loginPanel", new LoginTemplateHelper(vreq).showLoginPage(vreq, body, config));
-            return mergeBodyToTemplate("siteAdmin-main.ftl", body, config);
-            
+            return mergeBodyToTemplate("siteAdmin-main.ftl", body, config);           
         } 
         
         int securityLevel = Integer.parseInt( loginHandler.getLoginRole() );
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java
index a1074a42b..8885eb597 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java
@@ -37,20 +37,16 @@ public class LoginTemplateHelper extends LoginTemplateHelperBase {
 
 	/** If they are changing their password on first login, show them this form. */
 	public static final String TEMPLATE_FORCE_PASSWORD_CHANGE = "login-forcedPasswordChange.ftl";
+	
+    /** Show error message */
+    public static final String TEMPLATE_SERVER_ERROR = "errorMessage.ftl";
 
 	public static final String BODY_LOGIN_NAME = "loginName";
 	public static final String BODY_FORM_ACTION = "formAction";
 	public static final String BODY_INFO_MESSAGE = "infoMessage";
 	public static final String BODY_ERROR_MESSAGE = "errorMessage";
-	public static final String BODY_ALERT_ICON_URL = "alertImageUrl";
 	public static final String BODY_CANCEL_URL = "cancelUrl";
 
-	/** Use this icon for an info message. */
-	public static final String URL_INFO_ICON = "/images/iconAlert.png";
-
-	/** Use this icon for an error message. */
-	public static final String URL_ERROR_ICON = "/images/iconAlert.png";
-
 	/** If no portal is specified in the request, use this one. */
 	private static final int DEFAULT_PORTAL_ID = 1;
 
@@ -60,9 +56,9 @@ public class LoginTemplateHelper extends LoginTemplateHelperBase {
 
 	/** Version for JSP page */
 	public String showLoginPage(HttpServletRequest request) {
+	    VitroRequest vreq = new VitroRequest(request);
 		try {
-			VitroRequest vreq = new VitroRequest(request);
-
+			
 			State state = getCurrentLoginState(vreq);
 			log.debug("State on exit: " + state);
 
@@ -76,7 +72,7 @@ public class LoginTemplateHelper extends LoginTemplateHelperBase {
 			}
 		} catch (Exception e) {
 			log.error(e);
-			return "<h2>Internal server error:<br/>" + e + "</h2>";
+			return doTemplate(vreq, showError(request, e));
 		}
 	}
 
@@ -97,7 +93,7 @@ public class LoginTemplateHelper extends LoginTemplateHelperBase {
             }
         } catch (Exception e) {
             log.error(e);
-            return "<h2>Internal server error:<br/>" + e + "</h2>";
+            return doTemplate(vreq, showError(vreq, e), body, config);
         }
     }
 
@@ -120,12 +116,10 @@ public class LoginTemplateHelper extends LoginTemplateHelperBase {
 		String infoMessage = bean.getInfoMessage();
 		if (!infoMessage.isEmpty()) {
 			trv.put(BODY_INFO_MESSAGE, infoMessage);
-			trv.put(BODY_ALERT_ICON_URL, UrlBuilder.getUrl(URL_INFO_ICON));
 		}
 		String errorMessage = bean.getErrorMessage();
 		if (!errorMessage.isEmpty()) {
 			trv.put(BODY_ERROR_MESSAGE, errorMessage);
-			trv.put(BODY_ALERT_ICON_URL, UrlBuilder.getUrl(URL_ERROR_ICON));
 		}
 		return trv;
 	}
@@ -147,10 +141,16 @@ public class LoginTemplateHelper extends LoginTemplateHelperBase {
 		String errorMessage = bean.getErrorMessage();
 		if (!errorMessage.isEmpty()) {
 			trv.put(BODY_ERROR_MESSAGE, errorMessage);
-			trv.put(BODY_ALERT_ICON_URL, UrlBuilder.getUrl(URL_ERROR_ICON));
 		}
 		return trv;
 	}
+	
+	private TemplateResponseValues showError(HttpServletRequest request, Exception e) {
+        TemplateResponseValues trv = new TemplateResponseValues(
+                TEMPLATE_SERVER_ERROR);	    
+        trv.put(BODY_ERROR_MESSAGE, "Internal server error:<br /> " + e);
+        return trv;
+	}
 
 	/**
 	 * We processed a response, and want to show a template.