Rewrote IndividualListController to handle error conditions from within FreeMarker. Reorganized controller control flow to account for interdependencies between body and title.
This commit is contained in:
parent
f40e2d1af7
commit
fbdba79833
11 changed files with 307 additions and 280 deletions
|
@ -11,9 +11,9 @@
|
|||
<ul>
|
||||
<#list classGroup.classes as class>
|
||||
<li><a href="${class.url}">${class.name}</a> (${class.individualCount})</li>
|
||||
|
||||
|
||||
</#list>
|
||||
</ul>
|
||||
</#list>
|
||||
</div>
|
||||
</#if>
|
||||
</#if>
|
|
@ -1,6 +1,6 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
<#-- Comment form -->
|
||||
<#-- Contact form -->
|
||||
|
||||
<div class="staticPageBackground feedbackForm">
|
||||
|
||||
|
|
7
webapp/web/templates/freemarker/body/error.ftl
Normal file
7
webapp/web/templates/freemarker/body/error.ftl
Normal file
|
@ -0,0 +1,7 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
<#-- Template for general system error. -->
|
||||
|
||||
<p>There was an error in the system.</p>
|
||||
|
||||
<p>Return to the <a href="${urls.home}">home page</a>.</p>
|
7
webapp/web/templates/freemarker/body/errorMessage.ftl
Normal file
7
webapp/web/templates/freemarker/body/errorMessage.ftl
Normal file
|
@ -0,0 +1,7 @@
|
|||
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
|
||||
|
||||
<#-- Standard template to display an error message generated from any controller. Keeps this out of individual templates. -->
|
||||
|
||||
<#if errorMessage??>
|
||||
<p>${errorMessage}</p>
|
||||
</#if>
|
|
@ -7,16 +7,21 @@
|
|||
<div class="individualList">
|
||||
<h2>${title}</h2>
|
||||
<#if subtitle??>
|
||||
<h4>${subTitle}"</h4>
|
||||
<h4>${subtitle}</h4>
|
||||
</#if>
|
||||
|
||||
<#-- RY NEED TO ACCOUNT FOR p:process stuff -->
|
||||
<ul>
|
||||
<#list individuals as individual>
|
||||
<li>
|
||||
<a href="${individual.profileUrl}">${individual.name}</a> ${individual.tagline}
|
||||
</li>
|
||||
</#list>
|
||||
</ul>
|
||||
</div>
|
||||
<#if message??>
|
||||
<p>${message}</p>
|
||||
<#else>
|
||||
<#-- RY NEED TO ACCOUNT FOR p:process stuff -->
|
||||
<ul>
|
||||
<#list individuals as individual>
|
||||
<li>
|
||||
<a href="${individual.profileUrl}">${individual.name}</a> ${individual.tagline}
|
||||
</li>
|
||||
</#list>
|
||||
</ul>
|
||||
</#if>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue