NIHVIVO-658 Reintegrate changes from dev-freemarker-new. Most necessary updates to freemarker controllers for thread-safety are complete. A couple of details remain.

This commit is contained in:
rjy7 2010-06-24 21:51:46 +00:00
parent 7bf1bffd21
commit fb0377134b
18 changed files with 370 additions and 357 deletions

View file

@ -6,8 +6,8 @@
<h1><a title="Home" href="${urls.home}">${siteName}</a></h1>
<#if tagline.has_content>
<em>${tagline}</em>
<#if siteTagline.has_content>
<em>${siteTagline}</em>
</#if>
<ul id="otherMenu">