From f7e126cf50766101b1819fb89a3cad58a5616f74 Mon Sep 17 00:00:00 2001
From: nac26 <nac26@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Wed, 26 Jan 2011 14:14:32 +0000
Subject: [PATCH] Style and markup tweaks for browse index

---
 webapp/web/css/browseIndex.css                |  10 +-
 .../freemarker/body/individualList.ftl        | 100 ++++++++----------
 2 files changed, 53 insertions(+), 57 deletions(-)

diff --git a/webapp/web/css/browseIndex.css b/webapp/web/css/browseIndex.css
index 17e554c88..8ad331b0f 100644
--- a/webapp/web/css/browseIndex.css
+++ b/webapp/web/css/browseIndex.css
@@ -2,7 +2,7 @@
 /* browseIndex.css contains styles used in the Index pages.  */
 
 /* INDIVIDUAL LIST ------>  */
-.individualList ul.individualData li{
+.individualList ul.individualData li {
     padding-bottom: 0;
     display: inline;
     padding-right: .3em;
@@ -10,15 +10,17 @@
 .pagination {
     display: inline-block;
 }
-.pagination li{
+.pagination li {
     display: inline-block;
     padding-right: 2px;
 }
-.pagination li.selectedNavPage{
+.pagination li.selectedNavPage {
     font-size: 1em;
 }
 .rdfLink {
+    padding-left: 0.5em;
     font-size: 0.8em;
+    border-left: 1px solid #a6b1b0;
 }
 .individualList a.externalLink {
     text-decoration: none;
@@ -36,7 +38,7 @@
 .individualList li { 
     list-style-type: none;
     margin-bottom: .5em;
- }
+}
 .individualList li a { 
     font-weight: normal; 
 }
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/individualList.ftl b/webapp/web/templates/freemarker/body/individualList.ftl
index 042d9b635..3333afa3e 100644
--- a/webapp/web/templates/freemarker/body/individualList.ftl
+++ b/webapp/web/templates/freemarker/body/individualList.ftl
@@ -1,67 +1,61 @@
 <#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
 
-<#-- List individual members of a class. -->
+<#-- List individuals in the requested class. -->
 
 <#import "lib-list.ftl" as l>
 ${stylesheets.add("/css/browseIndex.css")}
-<div class="contents">   
-    <div class="individualList">
-       <h2>${title} 
-         &nbsp;<span class="rdfLink">&nbsp; 
-           <a class="icon-rdf" href="${redirecturl}" title="View the ${title} list in RDF format">RDF</a>
-         </span>
-        </h2>
-        <#if subtitle??>
-            <h4>${subtitle}</h4>
-        </#if>
-        
-        <#if message??>
-            <p>${message}</p>
-        <#else>
-       
-            <#assign pagination>
-                <#if (pages?size > 1) >           
-                    pages:&nbsp; 
-                    <ul class="pagination">
-                        <#list pages as page>                                                            
-                            <#if page.selected><li class="selectedNavPage">${page.text}</li>
+
+<section class="individualList">
+   <h2>${title} <span class="rdfLink"><a class="icon-rdf" href="${redirecturl}" title="View the ${title} list in RDF format">RDF</a></span></h2>
+    <#if subtitle??>
+        <h4>${subtitle}</h4>
+    </#if>
+    
+    <#if message??>
+        <p>${message}</p>
+    <#else>
+        <#assign pagination>
+            <#if (pages?size > 1) >
+                pages:
+                <ul class="pagination">
+                    <#list pages as page>
+                        <#if page.selected>
+                            <li class="selectedNavPage">${page.text}</li>
+                        <#else>
                             <#-- RY Ideally the urls would be generated by the controller; see search-pagedResults.ftl -->
-                            <#else><li><a href="${urls.base}/individuallist?${page.param}&vclassId=${vclassId?url}">${page.text}</a></li>
-                            </#if>                                                                                     
-                        </#list>
-                    </ul>               
-                </#if>            
-            </#assign>
+                            <li><a href="${urls.base}/individuallist?${page.param}&vclassId=${vclassId?url}">${page.text}</a></li>
+                        </#if>
+                    </#list>
+                </ul>
+            </#if>
+        </#assign>
         
-            ${pagination} 
-            
-            <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>
+        ${pagination} \
+        
+        <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>
+                    <#if individual.links?has_content>
                         <ul class="individualData">
                             <@l.firstLastList>
-                                <#if individual.moniker??><li>${individual.moniker}</li></#if>
-                                
                                 <#list individual.links as link>
                                     <#if link?? && link.url?? && link.anchor?? >
                                     <li><a class="externalLink" href="${link.url}">${link.anchor}</a></li>
-                                    </#if>           
+                                    </#if>
                                 </#list>
                             </@l.firstLastList>
-                        </ul>           
-                    </li>
-                </#list>
-            </ul>
-
-            ${pagination}  
-
-        </#if>              
-    </div>       
-</div>
-
+                        </ul>
+                    </#if>
+                </li>
+            </#list>
+        </ul>
+        
+        ${pagination}
+    </#if>
+</section> <!-- .individualList -->
\ No newline at end of file