From 148563657f068699f5d00fcbf46662ade32ab95c Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Thu, 24 Jun 2010 19:42:35 +0000
Subject: [PATCH] NIHVIVO-658 Initial rewrite of freemarker controllers for
 thread-safety. Some things still not working.

---
 themes/vivo-basic/templates/page/partials/footer.ftl   | 2 +-
 themes/vivo-basic/templates/page/partials/identity.ftl | 4 ++--
 themes/vivo-basic/templates/page/partials/search.ftl   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/themes/vivo-basic/templates/page/partials/footer.ftl b/themes/vivo-basic/templates/page/partials/footer.ftl
index d3b2ffd3..0ab33002 100644
--- a/themes/vivo-basic/templates/page/partials/footer.ftl
+++ b/themes/vivo-basic/templates/page/partials/footer.ftl
@@ -5,7 +5,7 @@
 <div id="footer">
 
     <#if bannerImageUrl??>
-        <img class="footerLogo" src="${urls.bannerImage}" alt="${tagline!}" />
+        <img class="footerLogo" src="${urls.bannerImage}" alt="${siteTagline!}" />
     </#if>
     
     <div class="footerLinks">
diff --git a/themes/vivo-basic/templates/page/partials/identity.ftl b/themes/vivo-basic/templates/page/partials/identity.ftl
index 0bd86625..4348a7e2 100644
--- a/themes/vivo-basic/templates/page/partials/identity.ftl
+++ b/themes/vivo-basic/templates/page/partials/identity.ftl
@@ -7,8 +7,8 @@
     <h1><a title="Home" href="${urls.home}">${siteName}</a></h1>
     
     <#-- RY We will need this in non-NIHVIVO versions
-    <#if tagline.has_content>
-        <em>${tagline}</em>
+    <#if siteTagline>
+        <em>${siteTagline}</em>
     </#if>
     -->
     
diff --git a/themes/vivo-basic/templates/page/partials/search.ftl b/themes/vivo-basic/templates/page/partials/search.ftl
index 76b204e2..f61d64c3 100644
--- a/themes/vivo-basic/templates/page/partials/search.ftl
+++ b/themes/vivo-basic/templates/page/partials/search.ftl
@@ -7,7 +7,7 @@
         <#if showFlag1SearchField??>
             <select id="search-form-modifier" name="flag1" class="form-item" >
                 <option value="nofiltering" selected="selected">entire database (${loginName})</option>
-                <option value="${portalId}">${tagline!}</option>
+                <option value="${portalId}">${siteTagline!}</option>
             </select>
         <#else>
             <input type="hidden" name="flag1" value="${portalId}" />