From b3b8ef7f6e9f1e67f1d98d743c5dbf1ba87658e4 Mon Sep 17 00:00:00 2001
From: nac26 <nac26@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Thu, 13 Jan 2011 13:48:40 +0000
Subject: [PATCH] NIHVIVO-1677 Updated browse widget to handle VClasses with
 zero individuals. Also applied changes to classGroups.ftl for index.

---
 .../VClassGroupTemplateModel.java             |  6 +--
 .../templates/freemarker/body/classGroups.ftl | 18 ++++++---
 .../freemarker/widgets/widget-browse.ftl      | 38 +++++++++----------
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassGroupTemplateModel.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassGroupTemplateModel.java
index 0d858735b..1ba6a2950 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassGroupTemplateModel.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassGroupTemplateModel.java
@@ -55,11 +55,11 @@ public class VClassGroupTemplateModel extends BaseTemplateModel {
         return classes;
     }
     
-    public String getIndividualCount(){
+    public int getIndividualCount(){
         if( vClassGroup.isIndividualCountSet() )
-            return Integer.toString(vClassGroup.getIndividualCount());
+            return vClassGroup.getIndividualCount();
         else
-            return "";
+            return 0;
     }
     
     public boolean isIndividualCountSet(){
diff --git a/webapp/web/templates/freemarker/body/classGroups.ftl b/webapp/web/templates/freemarker/body/classGroups.ftl
index 41a6dacb6..b32ba68f4 100644
--- a/webapp/web/templates/freemarker/body/classGroups.ftl
+++ b/webapp/web/templates/freemarker/body/classGroups.ftl
@@ -4,11 +4,17 @@
 
 <div class="siteMap">
     <#list classGroups as classGroup>
-        <h2>${classGroup.publicName}</h2>
-        <ul>
-            <#list classGroup.classes as class> 
-                <li><a href="${class.url}">${class.name}</a> (${class.individualCount})</li>
-            </#list>
-        </ul>
+        <#-- Only render classgroups that have at least one class with individuals -->
+        <#if (classGroup.individualCount > 0)>
+            <h2>${classGroup.publicName}</h2>
+            <ul>
+                <#list classGroup.classes as class> 
+                    <#-- Only render classes with individuals -->
+                    <#if (class.individualCount > 0)>
+                        <li><a href="${class.url}">${class.name}</a> (${class.individualCount})</li>
+                    </#if>
+                </#list>
+            </ul>
+        </#if>
     </#list>
 </div>
diff --git a/webapp/web/templates/freemarker/widgets/widget-browse.ftl b/webapp/web/templates/freemarker/widgets/widget-browse.ftl
index 9055f1054..ef9170d81 100644
--- a/webapp/web/templates/freemarker/widgets/widget-browse.ftl
+++ b/webapp/web/templates/freemarker/widgets/widget-browse.ftl
@@ -16,32 +16,32 @@
         
         <ul id="browse-classgroups" role="list">
         <#list vclassGroupList as group>
-            <li role="listitem"><a href="${urls.base}/${currentPage}?classgroupUri=${group.uri?url}">${group.publicName} <span class="count-classes">(n)</span></a></li>
+            <#if (group.individualCount > 0)>
+                <li role="listitem"><a href="${urls.base}/${currentPage}?classgroupUri=${group.uri?url}">${group.publicName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
+            </#if>
         </#list>
         </ul>
     </section>
+    
+    <#-- <@classGroup /> -->
 </#macro>
 
 <#macro classGroup>
     <section id="browse" role="region">
-    <h4>Browse</h4>
-          
-     <div>
-       There are ${classes?size} classes in classGroup ${classGroup.publicName}.
-       There are ${classGroup.individualCount} individuals in the class group.  
-       Classes with and without instances are included.
-     </div>-
- 
-    <nav role="navigation">
-        <ul id="foaf-person-childClasses">
-            <#list classes as class>
-            <li><a href="${urls.base}/${currentPage}?classgroupUri=${classGroup.uri?url}&vclassUri=${class.uri?url}">${class.name}<span class="count-classes"> ${class.individualCount}</span></a></li>
-            </#list>
-        </ul>
-    </nav>
- 
-</section>
-
+        <h4>Browse</h4>
+        
+         <section id="browse-classes" role="navigation">
+             <nav>
+                 <ul id="classgroup-list" role="list">
+                     <#list classes as class>
+                        <#if (class.individualCount > 0)>
+                            <li role="listitem"><a href="${urls.base}/${currentPage}?classgroupUri=${classGroup.uri?url}&vclassUri=${class.uri?url}">${class.name} <span class="count-individuals"> (${class.individualCount})</span></a></li>
+                        </#if>
+                     </#list>
+                 </ul>
+             </nav>
+        </section>
+    </section>
 </#macro>
 
 <#macro vclass>