litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
webapp/web/templates/freemarker/body/contactForm/confirmation.ftl
View file

@ -3,7 +3,7 @@
<#-- Contact form submission confirmation page -->
<h2>Thank you for your feedback</h2>
<img src="${siteIconPath}/mail.gif" alt="mailbox"/><br/>
<img src="${urls.siteIcons}/mail.gif" alt="mailbox"/><br/>
<p>Thank you for contacting our curation and development team. We will respond to your inquiry as soon as possible.</p>
<p>Return to the <a href="${urls.home}">home page</a>.</p>

2
webapp/web/templates/freemarker/body/contactForm/error.ftl
View file

@ -4,7 +4,7 @@
<h2>${title}</h2>
<img src="${siteIconPath}/bomb.gif" alt="email error"/>
<img src="${urls.siteIcons}/bomb.gif" alt="email error"/>
<p class="normal">An error occurred during the processing of your request.<br />
<#if errorMessage?has_content>

4
webapp/web/templates/freemarker/page/partials/footer.ftl
View file

@ -4,8 +4,8 @@
<div id="footer">
<#if bannerImageUrl??>
<img class="footerLogo" src="${urls.bannerImage}" alt="${tagline!}" />
<#if urls.bannerImage??>
<img class="footerLogo" src="${urls.bannerImage}" alt="${siteTagline!}" />
</#if>
<div class="footerLinks">

4
webapp/web/templates/freemarker/page/partials/identity.ftl
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">

2
webapp/web/templates/freemarker/page/partials/search.ftl
View file

@ -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}" />