From 96ff5c99b5eb54cf1656cb75b6fd039ac1d3a1cd Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 28 Oct 2010 15:09:20 +0000
Subject: [PATCH] NIHVIVO-1234 Handle routing of a request for the home page to
 the HomePageController by forwarding from TabController

---
 productMods/WEB-INF/web.xml      | 4 ++--
 themes/wilma/templates/login.ftl | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/productMods/WEB-INF/web.xml b/productMods/WEB-INF/web.xml
index 5d905377..25164e65 100644
--- a/productMods/WEB-INF/web.xml
+++ b/productMods/WEB-INF/web.xml
@@ -883,6 +883,7 @@
     <servlet-name>SearchController</servlet-name>
     <url-pattern>/search</url-pattern>
   </servlet-mapping>
+  
   <!-- for now, need to make sure the links on CALS' site doesn't break -->
   <servlet-mapping>
     <servlet-name>SearchController</servlet-name>
@@ -976,7 +977,6 @@
       <url-pattern>/index.jsp</url-pattern>
     </servlet-mapping>
 
-<!--
     <servlet>
       <servlet-name>HomePageController</servlet-name>
       <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.freemarker.HomePageController</servlet-class>
@@ -985,7 +985,7 @@
       <servlet-name>HomePageController</servlet-name>
       <url-pattern>/home</url-pattern>
     </servlet-mapping>
--->   
+      
   <!-- <servlet>
        <servlet-name>EntityPropertyListController</servlet-name>     
        <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.EntityPropertyListController</servlet-class>
diff --git a/themes/wilma/templates/login.ftl b/themes/wilma/templates/login.ftl
index 6a1ddf09..68a74443 100644
--- a/themes/wilma/templates/login.ftl
+++ b/themes/wilma/templates/login.ftl
@@ -2,9 +2,7 @@
 <#-- This is a temporary file and will be removed once we have completed the transition to freemarker -->
 
 
-<#if loginName??>
-    <#-- nothing to see here -->
-<#else>
+<#if ! loginName??>
 
 <section id="log-in">
     <h3>Log in</h3>