From 00d144196a7862a44f844c3ad1be3e7e335e558d Mon Sep 17 00:00:00 2001
From: mb863 <mb863@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 7 Jan 2011 22:11:49 +0000
Subject: [PATCH] NIHVIVO-641: Changed markup <article> for <li> in individual
 display list on browse by section.

---
 webapp/web/css/menupage/menupage.css          | 25 +++++++++++++------
 webapp/web/js/menupage/browseByVClass.js      |  6 +++--
 .../partials/menupage/menupage-browse.ftl     |  4 ++-
 .../menupage-vClassesInClassgroup.ftl         |  4 +--
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/webapp/web/css/menupage/menupage.css b/webapp/web/css/menupage/menupage.css
index 2544ac25a..fcff34b7d 100644
--- a/webapp/web/css/menupage/menupage.css
+++ b/webapp/web/css/menupage/menupage.css
@@ -271,28 +271,39 @@ ul#alpha-browse-childClass a{
 #individuals-in-childClass h3{
     padding: 10px 0 10px 30px;
 }
-article.individual-foaf-person{
+#individuals-in-childClass ul{
+    list-style: none;
+}
+#individuals-in-childClass li.individual-foaf-person{
     width: 39%;
     padding-bottom: 30px;
     padding-top: 20px;
     margin-left: 30px;
     margin-right: 30px;
 }
-article.individual-foaf-person img{
+#individuals-in-childClass li.individual-foaf-person img{
     float: left;
 }
-article.individual-foaf-person h1{
-    padding: 30px 0 30px 110px;
+#individuals-in-childClass  li.individual-foaf-person h1{
+    font-weight: bold;
+    padding: 30px 0 10px 110px;
     line-height: 1.2em;
 }
-article.individual{
+#individuals-in-childClass  p{
+    padding-left: 110px;
+    line-height: 1.2em;
+}
+#individuals-in-childClass span.org{
+    display: block;
+}
+#individuals-in-childClass li.individual{
     width: 440px;
     margin-left: 30px;
     margin-right: 30px;
 }
-article.individual h1{
+#individuals-in-childClass li.individual h1{
     margin: 0;
-    paddin: 0;
+    padding: 0;
     color: #5e6363;
     line-height: 1.2em;
     padding-bottom: 20px;
diff --git a/webapp/web/js/menupage/browseByVClass.js b/webapp/web/js/menupage/browseByVClass.js
index 7557ec157..18dbd9dcf 100644
--- a/webapp/web/js/menupage/browseByVClass.js
+++ b/webapp/web/js/menupage/browseByVClass.js
@@ -23,7 +23,7 @@ var browseByVClass = {
         this.alphaIndex = $('#alpha-browse-childClass');
         this.alphaIndexLinks = $('#alpha-browse-childClass li a');
         this.selectedAlphaIndex = $('#alpha-browse-childClass li a.selected');
-        this.individualsInVClass = $('#individuals-in-childClass');
+        this.individualsInVClass = $('#individuals-in-childClass ul');
     },
     
     // Event listeners. Called on page load
@@ -67,6 +67,8 @@ var browseByVClass = {
         $.getJSON(url, function(results) {
             $.each(results.individuals, function(i, item) {
                 indivLabel = results.individuals[i].label;
+                firstName = results.individuals[i].firstName;
+                lastName = results.individuals[i].lastName;
                 indivUri = results.individuals[i].URI;
                 indivProfileUrl = results.individuals[i].profileUrl;
                 if ( !results.individuals[i].thumbUrl ) {
@@ -74,7 +76,7 @@ var browseByVClass = {
                 } else {
                     indivImage = browseByVClass.baseUrl + results.individuals[i].thumbUrl;
                 }
-                browseByVClass.individualsInVClass.append('<article class="vcard individual-foaf-person" role="navigation"> <img src="'+ indivImage +'" width="90" height="90" alt="'+ indivLabel +'" /><h1 class="fn"><a href="'+ indivProfileUrl +'" title="View the profile page for '+ indivLabel +'">'+ indivLabel + '</a></h1><p>core:preferredTitle <span class="org">org from preferredTitle??</span></p></article>');
+                browseByVClass.individualsInVClass.append('<li role="listitem" class="vcard individual-foaf-person" role="navigation"> <img src="'+ indivImage +'" width="90" height="90" alt="'+ firstName + ' ' + lastName +'" /><h1 class="fn"><a href="'+ indivProfileUrl +'" title="View the profile page for '+ firstName + ' ' + lastName +'">'+ firstName + ' ' + lastName + '</a></h1><p>core:preferredTitle <span class="org">org from preferredTitle??</span></p></li>');
             })
             // set selected class and alpha
             browseByVClass.selectedVClass(results.vclass.URI);
diff --git a/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl b/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl
index 75618e4f8..f9fb03f96 100644
--- a/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl
+++ b/webapp/web/templates/freemarker/body/partials/menupage/menupage-browse.ftl
@@ -51,6 +51,8 @@
     </nav>
     
     <section id="individuals-in-childClass" role="region">
-        
+        <ul role="list">
+            
+        </ul>
     </section>
 </section>
\ No newline at end of file
diff --git a/webapp/web/templates/freemarker/body/partials/menupage/menupage-vClassesInClassgroup.ftl b/webapp/web/templates/freemarker/body/partials/menupage/menupage-vClassesInClassgroup.ftl
index 212587dcb..3a01432e8 100644
--- a/webapp/web/templates/freemarker/body/partials/menupage/menupage-vClassesInClassgroup.ftl
+++ b/webapp/web/templates/freemarker/body/partials/menupage/menupage-vClassesInClassgroup.ftl
@@ -3,9 +3,9 @@
 <#-- Template for rendering the classes in a class group for menupages -->
 
 <nav role="navigation">
-    <ul id="vgraph-childClasses">
+    <ul id="vgraph-childClasses" role="list">
     <#list vClassGroup as vClass>
-        <li><a href="#browse-by" title="Browse all people in this class" data-uri="${vClass.URI}">${vClass.name} <span class="count-classes">(${vClass.entityCount})</span></a></li>
+        <li role="listitem"><a href="#browse-by" title="Browse all people in this class" data-uri="${vClass.URI}">${vClass.name} <span class="count-classes">(${vClass.entityCount})</span></a></li>
     </#list>
     </ul>
 </nav>
\ No newline at end of file