From 10c352dbf94c402abcb427e60cda85b4174790c2 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 27 Oct 2010 01:27:54 +0000
Subject: [PATCH] NIHVIVO-1234 Removed separation of body and root maps in
 Freemarker controllers. Combine everything into one map, which includes the
 name of the body template also, to be invoked from the page template.
 Simplifies the logic considerably, in both controllers and templates, and
 allows the template author to dump the name of the body template rather than
 having to inspect the controller code.

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

diff --git a/themes/vivo-basic/templates/individual-person.ftl b/themes/vivo-basic/templates/individual-person.ftl
new file mode 100644
index 00000000..939b919e
--- /dev/null
+++ b/themes/vivo-basic/templates/individual-person.ftl
@@ -0,0 +1,5 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- Template for profile page for individuals of class Person -->
+
+<p>This is the person profile page.</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 b64efaf4..3208bab2 100644
--- a/themes/vivo-basic/templates/page-home.ftl
+++ b/themes/vivo-basic/templates/page-home.ftl
@@ -26,7 +26,8 @@
         <div id="contentwrap">      
             <div id="content">
                 <h2>Welcome to VIVO!</h2>
-                ${body}             
+                <#-- ${body} -->                          
+                <#include bodyTemplate>             
             </div> <!-- content -->
         </div> <!-- contentwrap -->
     
diff --git a/themes/wilma/templates/page.ftl b/themes/wilma/templates/page.ftl
index 070fbfcb..b8565b50 100644
--- a/themes/wilma/templates/page.ftl
+++ b/themes/wilma/templates/page.ftl
@@ -82,7 +82,8 @@ ${headScripts.tags}
 	    </ul>
   </nav>
   <div id="wrapper-content">
-    ${body}
+    <#-- ${body} -->                          
+    <#include bodyTemplate>
   </div>
   <footer>
     <div id="footer-content">