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.

This commit is contained in:
rjy7 2010-10-27 01:27:54 +00:00
parent a78210e137
commit 10c352dbf9
3 changed files with 9 additions and 2 deletions

View file

@ -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>

View file

@ -26,7 +26,8 @@
<div id="contentwrap"> <div id="contentwrap">
<div id="content"> <div id="content">
<h2>Welcome to VIVO!</h2> <h2>Welcome to VIVO!</h2>
${body} <#-- ${body} -->
<#include bodyTemplate>
</div> <!-- content --> </div> <!-- content -->
</div> <!-- contentwrap --> </div> <!-- contentwrap -->

View file

@ -82,7 +82,8 @@ ${headScripts.tags}
</ul> </ul>
</nav> </nav>
<div id="wrapper-content"> <div id="wrapper-content">
${body} <#-- ${body} -->
<#include bodyTemplate>
</div> </div>
<footer> <footer>
<div id="footer-content"> <div id="footer-content">