From 4508106ba1638f14db652fdb91d05487284c5755 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 3 Feb 2011 20:59:12 +0000
Subject: [PATCH] NIHVIVO-1370 Display home tab content on vivo-basic home page
 (and any other theme that still uses tabs)

---
 .../vitro/webapp/controller/TabController.java      |  6 +++---
 .../controller/freemarker/HomePageController.java   | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabController.java
index 91b71fac5..6e4fcff2b 100755
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/TabController.java
@@ -55,13 +55,13 @@ public class TabController extends VitroHttpServlet {
             if (leadingTab.getTabId()==portal.getRootTabId()) {
             	request.setAttribute("homePageRequested", "true");
                 request.setAttribute("title", portal.getAppName());
-                // This will break Datastar, but this may be gone by the time Datastar integrates new Vitro code
                 RequestDispatcher rd = request.getRequestDispatcher("/home");
                 rd.forward(request, response);
                 return;
             }
-            else
-                request.setAttribute("title",leadingTab.getTitle());
+            else {
+                request.setAttribute("title",leadingTab.getTitle());
+            }
 
             String body = leadingTab.getBody();
             if( body != null && body.startsWith("JSPBody:") )                 
diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java
index 88b85f2d6..44fe58239 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/freemarker/HomePageController.java
@@ -9,6 +9,8 @@ import java.util.Map;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
+import edu.cornell.mannlib.vitro.webapp.beans.Portal;
+import edu.cornell.mannlib.vitro.webapp.beans.Tab;
 import edu.cornell.mannlib.vitro.webapp.beans.VClassGroup;
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.controller.freemarker.responsevalues.ResponseValues;
@@ -44,11 +46,20 @@ public class HomePageController extends FreemarkerHttpServlet {
             if(pageData != null)
                 body.putAll(pageData);            
         }
+
+        // Get the home tab content for themes that display deprecated tabs
+        body.put("homeTabContent", getHomeTabContent(vreq));
         
-        // Add home page data to body here         
         return new TemplateResponseValues(BODY_TEMPLATE, body);
     }
 
+    // Get the home tab content for themes that display deprecated tabs
+    private String getHomeTabContent(VitroRequest vreq) {
+        Portal portal = vreq.getPortal();
+        int tabId = portal.getRootTabId();
+        Tab tab = vreq.getWebappDaoFactory().getTabDao().getTab(tabId,0,vreq.getAppBean());
+        return tab.getBody();
+    }
     
     @Override
     protected String getTitle(String siteName, VitroRequest vreq) {