From c6f8a50de6cc5521b2dba37f808c0b07b14ecf6e Mon Sep 17 00:00:00 2001
From: j2blake <j2blake@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 27 Sep 2011 14:38:33 +0000
Subject: [PATCH] NIHVIVO-336 Add the alert icon to the site admin page, if
 there were warnings at startup.

---
 .../freemarker/BaseSiteAdminController.java    | 18 ++++++++++--------
 .../siteAdmin/siteAdmin-siteConfiguration.ftl  |  7 ++++++-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
index a405b046b..3e5e4fd19 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/BaseSiteAdminController.java
@@ -33,6 +33,7 @@ import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.Tem
 import edu.cornell.mannlib.vitro.webapp.dao.WebappDaoFactory;
 import edu.cornell.mannlib.vitro.webapp.dao.jena.pellet.PelletListener;
 import edu.cornell.mannlib.vitro.webapp.search.controller.IndexController;
+import edu.cornell.mannlib.vitro.webapp.startup.StartupStatus;
 
 public class BaseSiteAdminController extends FreemarkerHttpServlet {
 	
@@ -58,7 +59,7 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
         Map<String, Object> body = new HashMap<String, Object>();        
 
         body.put("dataInput", getDataInputData(vreq));
-        body.put("siteConfig", getSiteConfigUrls(vreq));        
+        body.put("siteConfig", getSiteConfigData(vreq));        
         body.put("indexCacheRebuild", getIndexCacheRebuildUrls(vreq));     
         body.put("ontologyEditor", getOntologyEditorData(vreq));
         body.put("dataTools", getDataToolsUrls(vreq));
@@ -120,29 +121,30 @@ public class BaseSiteAdminController extends FreemarkerHttpServlet {
         return map;
     }
     
-    protected Map<String, String> getSiteConfigUrls(VitroRequest vreq) {
+    protected Map<String, Object> getSiteConfigData(VitroRequest vreq) {
 
-        Map<String, String> urls = new HashMap<String, String>();
+        Map<String, Object> data = new HashMap<String, Object>();
         
         if (PolicyHelper.isAuthorizedForActions(vreq, new ManageUserAccounts())) {
-        	urls.put("userAccounts", UrlBuilder.getUrl("/accountsAdmin"));
+        	data.put("userAccounts", UrlBuilder.getUrl("/accountsAdmin"));
         }
  
         if (PolicyHelper.isAuthorizedForActions(vreq, new EditSiteInformation())) {
-            urls.put("siteInfo", UrlBuilder.getUrl("/editForm", "controller", "ApplicationBean"));
+            data.put("siteInfo", UrlBuilder.getUrl("/editForm", "controller", "ApplicationBean"));
         }
         
         if (PolicyHelper.isAuthorizedForActions(vreq, new ManageMenus())) {
-            urls.put("menuManagement", UrlBuilder.getUrl("/individual",
+            data.put("menuManagement", UrlBuilder.getUrl("/individual",
                     "uri", "http://vitro.mannlib.cornell.edu/ontologies/display/1.1#DefaultMenu",
                     "switchToDisplayModel", "true"));
         }
         
         if (PolicyHelper.isAuthorizedForActions(vreq, new SeeStartupStatus())) {
-        	urls.put("startupStatus", UrlBuilder.getUrl("/startupStatus"));
+        	data.put("startupStatus", UrlBuilder.getUrl("/startupStatus"));
+        	data.put("startupStatusAlert", !StartupStatus.getBean(getServletContext()).allClear());
         }
         
-        return urls;
+        return data;
     }
     
     protected Map<String, Object> getOntologyEditorData(VitroRequest vreq) {
diff --git a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
index d744eaaed..c317aeafa 100644
--- a/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
+++ b/webapp/web/templates/freemarker/body/siteAdmin/siteAdmin-siteConfiguration.ftl
@@ -24,7 +24,12 @@
             </#if>           
             
             <#if siteConfig.startupStatus?has_content>
-                <li><a href="${siteConfig.startupStatus}">Startup Status</a></li>
+                <li>
+                    <a href="${siteConfig.startupStatus}">Startup Status</a>
+                    <#if siteConfig.startupStatusAlert>
+                        <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="Error alert icon" />
+                    </#if>
+                </li>
             </#if>           
         </ul>
     </section>