there were duplicate freemarker variables being used; resolved this by changing the name of the variable used for the application or site name
This commit is contained in:
Tim Worrall
parent
90cec22e9d
commit
59ddbe15ec
21 changed files with 36 additions and 39 deletions
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<#-- Template for the body of the About page -->
|
||||
|
||||
<h2>${title}</h2>
|
||||
<h2>${siteName!}</h2>
|
||||
|
||||
<#if aboutText?has_content>
|
||||
<div class="pageGroupBody" id="aboutText">${aboutText}</div>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<#-- Contact form processing errors -->
|
||||
|
||||
<h2>${title}</h2>
|
||||
<h2>${title!}</h2>
|
||||
|
||||
<#if errorMessage?has_content>
|
||||
<section id="error-alert"><img src="${urls.images}/iconAlert.png" role="error alert"/>
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<#-- Contact form -->
|
||||
|
||||
<section class="staticPageBackground feedbackForm" role="region">
|
||||
<h2>${title}</h2>
|
||||
<h2>${title!}</h2>
|
||||
|
||||
<#if errorMessage?has_content>
|
||||
<section id="error-alert"><img src="${urls.images}/iconAlert.png" role="error alert"/>
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
</#if>
|
||||
<#if adminErrorData.stackTrace?has_content>
|
||||
<p>
|
||||
<strong>${i18n().stack_trace}</strong> (${i18n().trace_available}): ${adminErrorData.stackTrace?html}
|
||||
<strong>${i18n().stack_trace}</strong> (${i18n().trace_available(siteName!)}): ${adminErrorData.stackTrace?html}
|
||||
</p>
|
||||
|
||||
<#if adminErrorData.cause?has_content>
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
<#-- Template for email message sent to site administrator when an error occurs on the site. -->
|
||||
|
||||
<#assign subject = "${i18n().error_occurred}" />
|
||||
<#assign subject = "${i18n().error_occurred(siteName!)}" />
|
||||
|
||||
<#assign datetime = datetime?string("yyyy-MM-dd HH:mm:ss zzz")>
|
||||
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
</head>
|
||||
<body>
|
||||
<p>
|
||||
${i18n().error_occurred_at(datetime!)}
|
||||
${i18n().error_occurred_at(siteName!,datetime!)}
|
||||
</p>
|
||||
|
||||
<p>
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
</p>
|
||||
|
||||
<p>
|
||||
<strong>${i18n().stack_trace}</strong> (${i18n().trace_available}):
|
||||
<strong>${i18n().stack_trace}</strong> (${i18n().trace_available(siteName!)}):
|
||||
<pre>${stackTrace!}</pre>
|
||||
</p>
|
||||
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
</#assign>
|
||||
|
||||
<#assign text>
|
||||
${i18n().error_occurred_at(datetime!)}
|
||||
${i18n().error_occurred_at(siteName!,datetime!)}
|
||||
|
||||
${i18n().requested_url}: ${requestedUrl!}
|
||||
|
||||
|
|
@ -50,7 +50,7 @@ ${i18n().requested_url}: ${requestedUrl!}
|
|||
${i18n().error_message}: ${errorMessage!}
|
||||
</#if>
|
||||
|
||||
${i18n().stack_trace} (${i18n().trace_available}):
|
||||
${i18n().stack_trace} (${i18n().trace_available(siteName!)}):
|
||||
${stackTrace!}
|
||||
|
||||
<#if cause?has_content>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
|
||||
<#-- Standard template to display an error message with a title, generated from any controller. Keeps this out of individual templates. -->
|
||||
|
||||
<h2>${title}</h2>
|
||||
<h2>${title!}</h2>
|
||||
|
||||
<#include "error-message.ftl">
|
||||
|
|
@ -4,4 +4,3 @@
|
|||
|
||||
<h2>${i18n().individual_not_found}</h2>
|
||||
|
||||
<p>${i18n().entity_to_query_for}</p>
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css" />')}
|
||||
|
||||
<section class="individualList">
|
||||
<h2>${title}
|
||||
<h2>${title!}
|
||||
<#if rdfUrl?has_content>
|
||||
<span class="rdfLink"><a class="icon-rdf" href="${rdfUrl}" title="${i18n().view_list_in_rdf(title)}">${i18n().rdf}</a></span>
|
||||
</#if>
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
</section>
|
||||
|
||||
<section class="proxy-profile">
|
||||
<h4>${i18n().relate_editors_profiles} <img src="${urls.images}/iconInfo.png" alt="${i18n().info_icon}" title="${i18n().profile_editing_title}" /></h4>
|
||||
<h4>${i18n().relate_editors_profiles} <img src="${urls.images}/iconInfo.png" alt="${i18n().info_icon}" title="${i18n().profile_editing_title(siteName!)}" /></h4>
|
||||
|
||||
<form id="add-relation" action="${formUrls.create}" method="POST">
|
||||
<fieldset class="proxy">
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css" />')}
|
||||
|
||||
<section class="individualList">
|
||||
<h2>${title}
|
||||
<h2>${title!}
|
||||
</h2>
|
||||
<#if subtitle?has_content>
|
||||
<h4>${subtitle}</h4>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ variableName is used below.-->
|
|||
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseIndex.css" />')}
|
||||
|
||||
<section class="individualList">
|
||||
<h2>${title}
|
||||
<h2>${title!}
|
||||
</h2>
|
||||
<#if subtitle?has_content>
|
||||
<h4>${subtitle}</h4>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,6 @@
|
|||
|
||||
<#-- Standard template to display a message with a title generated from any controller. Keeps this out of individual templates. -->
|
||||
|
||||
<h2>${title}</h2>
|
||||
<h2>${title!}</h2>
|
||||
|
||||
<#include "message.ftl">
|
||||
|
|
@ -5,7 +5,7 @@
|
|||
${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/dump.css" />')}
|
||||
|
||||
<div class="dump">
|
||||
<h3>${title}</h3>
|
||||
<h3>${title!}</h3>
|
||||
|
||||
<#-- dump has been changed to dumpValue to avoid confusion
|
||||
with the dump directive which is stored in the DataModel as 'dump' -->
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<#import "lib-datetime.ftl" as dt>
|
||||
<#import "lib-string.ftl" as str>
|
||||
|
||||
<h2>${title}</h2>
|
||||
<h2>${title!}</h2>
|
||||
|
||||
<@widget name="test" />
|
||||
|
||||
|
|
@ -57,8 +57,8 @@
|
|||
<p>${year?number?c}</p>
|
||||
|
||||
<h3>${i18n().raw_string_literals}</h3>
|
||||
<p>${r"#{title}"}</p>
|
||||
<p>${r"${title}"}</p>
|
||||
<p>${r"#{title!}"}</p>
|
||||
<p>${r"${title!}"}</p>
|
||||
|
||||
<h2>${i18n().containers_do_not_pick_up_changes}</h2>
|
||||
<#assign
|
||||
|
|
|
|||
|
|
@ -2,4 +2,4 @@
|
|||
|
||||
<#-- FreeMarker test cases -->
|
||||
|
||||
<h2>${title}</h2>
|
||||
<h2>${title!}</h2>
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
<h2>${i18n().unrecognized_user}</h2>
|
||||
|
||||
<p>
|
||||
${i18n().no_individual_associated_with_id}
|
||||
${i18n().no_individual_associated_with_id(siteName!)}
|
||||
</p>
|
||||
|
||||
<br/>
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
<title>${title}</title>
|
||||
<title>${siteName!}</title>
|
||||
Loading…
Add table
Add a link
Reference in a new issue