NIHVIVO-658 Initial rewrite of freemarker controllers for thread-safety. Some things still not working.
This commit is contained in:
parent
7c83e693cc
commit
148563657f
3 changed files with 4 additions and 4 deletions
|
@ -5,7 +5,7 @@
|
||||||
<div id="footer">
|
<div id="footer">
|
||||||
|
|
||||||
<#if bannerImageUrl??>
|
<#if bannerImageUrl??>
|
||||||
<img class="footerLogo" src="${urls.bannerImage}" alt="${tagline!}" />
|
<img class="footerLogo" src="${urls.bannerImage}" alt="${siteTagline!}" />
|
||||||
</#if>
|
</#if>
|
||||||
|
|
||||||
<div class="footerLinks">
|
<div class="footerLinks">
|
||||||
|
|
|
@ -7,8 +7,8 @@
|
||||||
<h1><a title="Home" href="${urls.home}">${siteName}</a></h1>
|
<h1><a title="Home" href="${urls.home}">${siteName}</a></h1>
|
||||||
|
|
||||||
<#-- RY We will need this in non-NIHVIVO versions
|
<#-- RY We will need this in non-NIHVIVO versions
|
||||||
<#if tagline.has_content>
|
<#if siteTagline>
|
||||||
<em>${tagline}</em>
|
<em>${siteTagline}</em>
|
||||||
</#if>
|
</#if>
|
||||||
-->
|
-->
|
||||||
|
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
<#if showFlag1SearchField??>
|
<#if showFlag1SearchField??>
|
||||||
<select id="search-form-modifier" name="flag1" class="form-item" >
|
<select id="search-form-modifier" name="flag1" class="form-item" >
|
||||||
<option value="nofiltering" selected="selected">entire database (${loginName})</option>
|
<option value="nofiltering" selected="selected">entire database (${loginName})</option>
|
||||||
<option value="${portalId}">${tagline!}</option>
|
<option value="${portalId}">${siteTagline!}</option>
|
||||||
</select>
|
</select>
|
||||||
<#else>
|
<#else>
|
||||||
<input type="hidden" name="flag1" value="${portalId}" />
|
<input type="hidden" name="flag1" value="${portalId}" />
|
||||||
|
|
Loading…
Add table
Reference in a new issue