From df9b1cb99d4cf87b87b8d74e7670d88fb135495e Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 4 Feb 2011 16:21:09 +0000
Subject: [PATCH] Don't show moniker span if there's no moniker

---
 .../web/templates/freemarker/body/individualList.ftl   | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/individualList.ftl b/webapp/web/templates/freemarker/body/individualList.ftl
index 9bebae9f4..1603c7656 100644
--- a/webapp/web/templates/freemarker/body/individualList.ftl
+++ b/webapp/web/templates/freemarker/body/individualList.ftl
@@ -35,18 +35,14 @@ ${stylesheets.add("/css/browseIndex.css")}
         <ul>
             <#list individuals as individual>
                 <li>
-                    <#-- The old JSP version uses a custom search view if one is defined, but it doesn't make sense
-                    to do that in the current system, because we don't use the default search view. We could define
-                    a custom list or use the custom short view, but for now just hard-code the view here; it will not be
-                    customizable.
-                    <#include "${individual.searchView}"> -->
-                    <a href="${individual.profileUrl}">${individual.name}</a><#if individual.moniker??> <span class="moniker">${individual.moniker}</span></#if>
+                    <#assign moniker = individual.moniker!"">
+                    <a href="${individual.profileUrl}">${individual.name}</a><#if moniker?has_content> <span class="moniker">${moniker}</span></#if>
                     <#if individual.links?has_content>
                         <ul class="individualData">
                             <@l.firstLastList>
                                 <#list individual.links as link>
                                     <#if link?? && link.url?? && link.anchor?? >
-                                    <li><a class="externalLink" href="${link.url}">${link.anchor}</a></li>
+                                        <li><a class="externalLink" href="${link.url}">${link.anchor}</a></li>
                                     </#if>
                                 </#list>
                             </@l.firstLastList>