NIHVIVO-650 Some reorganization of template model classes. Fix for link list display on individual profile page.

webapp/web/templates/freemarker/body/individual/individual.ftl

@@ -59,18 +59,23 @@
         <#if individual.links?has_content>
             <div id="dprop-vitro-links" class="propsItem ${editingClass}">
                 <ul class="externalLinks properties">
-                    <#list individual.links as link>
-                        <@l.firstLastList>
-                            <li>                                
+                    <@l.firstLastList>
+                        <#list individual.links as link>                        
+                            <li>
                                 <span class="statementWrap">
                                     <a class="externalLink" href="${link.url}">${link.anchor}</a>
                                 </span>
-                            </li>
-                        </@l.firstLastList>
-                    </#list>
+                            </li>                                                        
+                        </#list>
+                    </@l.firstLastList>
                 </ul>
             </div>
-       </#if>
+        </#if>
+       
+        <#-- Keywords -->
+        <#if individual.keywords?has_content>
+            <p id="keywords">Keywords: ${individual.keywordString}</p>
+        </#if>
     </div> <!-- #contents -->
 
 </div> <!-- #personWrap -->

webapp/web/templates/freemarker/body/individualList.ftl

@@ -25,9 +25,9 @@
                         <a href="${individual.profileUrl}">${individual.name}</a>
                         <ul class="individualData">
                             <@l.firstLastList>
-                                <#if individual.moniker??><li>${individual.moniker}</li>,</#if>
+                                <#if individual.moniker??><li>${individual.moniker}</li></#if>
                                 <#list individual.links as link>
-                                    <li><a class="externalLink" href="${link.url}">${link.anchor}</a></li>,            
+                                    <li><a class="externalLink" href="${link.url}">${link.anchor}</a></li>           
                                 </#list>
                             </@l.firstLastList>
                         </ul>           

webapp/web/templates/freemarker/body/partials/individual/individual-adminPanel.ftl

@@ -5,7 +5,7 @@
 <div class="admin top">
     <h3 class="toggle">Admin Panel</h3>
     <div class="panelContents">
-      <a href="${editStatus.editingUrl}"> edit this individual</a> 
+      <a href="${individual.editUrl}"> edit this individual</a> 
       <p>Resource URI: ${individual.uri}</p>
     </div>
 </div>