From 3dd0b5163ffab9a2db328996fd2a5cc0eadbad3a Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Mon, 25 Oct 2010 18:20:32 +0000
Subject: [PATCH] NIHVIVO-1234 Restored version of home page controller and
 templates that uses a pre-generated body string, like other pages, in order
 to support themes that use page.ftl instead of a page-home.ftl.

---
 themes/vivo-basic/templates/home.ftl      | 5 +++++
 themes/vivo-basic/templates/page-home.ftl | 9 ++++-----
 themes/wilma/templates/page.ftl           | 2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 themes/vivo-basic/templates/home.ftl

diff --git a/themes/vivo-basic/templates/home.ftl b/themes/vivo-basic/templates/home.ftl
new file mode 100644
index 00000000..db190fd6
--- /dev/null
+++ b/themes/vivo-basic/templates/home.ftl
@@ -0,0 +1,5 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for home page body contents -->
+
+<p>This is the home page of the VIVO vivo-basic theme.</p>
\ No newline at end of file
diff --git a/themes/vivo-basic/templates/page-home.ftl b/themes/vivo-basic/templates/page-home.ftl
index b84b7f51..b64efaf4 100644
--- a/themes/vivo-basic/templates/page-home.ftl
+++ b/themes/vivo-basic/templates/page-home.ftl
@@ -1,5 +1,7 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
+<#-- Page template for home page -->
+
 <#include "doctype.html">
 
 <#include "head.ftl">
@@ -23,11 +25,8 @@
 
         <div id="contentwrap">      
             <div id="content">
-                <#-- UI team: the home page controller currently does not produce a ${body} string,
-                anticipating that you would put all the markup directly in page-home.ftl. If you want
-                it to work the way other pages do, with a separate template to produce the body,
-                <#-- ${body!}  -->             
-                <p>This is the home page of the VIVO vivo-basic theme.</p>
+                <h2>Welcome to VIVO!</h2>
+                ${body}             
             </div> <!-- content -->
         </div> <!-- contentwrap -->
     
diff --git a/themes/wilma/templates/page.ftl b/themes/wilma/templates/page.ftl
index e4c1bb14..05b15d1d 100644
--- a/themes/wilma/templates/page.ftl
+++ b/themes/wilma/templates/page.ftl
@@ -69,7 +69,7 @@ ${headScripts.tags}
   </nav>
   <div id="wrapper-content">
 	
-    ${body!}
+    ${body}
  
   </div>
   <footer>