From 1e03e2b5a8fdeb8829deabfd84efce34f3ac10e6 Mon Sep 17 00:00:00 2001
From: ryounes <ryounes@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Tue, 19 Apr 2011 16:33:21 +0000
Subject: [PATCH] Merge r7827 from nihvivo-rel-1.2-maint branch: fix display of
 classgroups with no public name on index and home pages.

---
 .../pageDataGetter/BrowseDataGetter.java      |  1 -
 .../VClassGroupTemplateModel.java             | 11 +++-
 .../templates/freemarker/body/classGroups.ftl | 53 +++++++++----------
 .../body/partials/browse-classgroups.ftl      |  2 +-
 .../freemarker/widgets/widget-browse.ftl      |  4 +-
 5 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java
index 7f6516009..261ca4b6c 100644
--- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java
+++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/pageDataGetter/BrowseDataGetter.java
@@ -174,7 +174,6 @@ public class BrowseDataGetter implements PageDataGetter {
         map.put("classes", classes);
         
         map.put("classGroup", new VClassGroupTemplateModel(vcg));
-        map.put("classGroupName", vcg.getPublicName());
         map.put("classGroupUri", vcg.getURI());
         
         return map;
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 1ba6a2950..40ebe9489 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
@@ -3,9 +3,9 @@
 package edu.cornell.mannlib.vitro.webapp.web.templatemodels;
 
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -43,6 +43,15 @@ public class VClassGroupTemplateModel extends BaseTemplateModel {
     	return vClassGroup.getPublicName();
     }
     
+    // Protect the template against a group without a name.
+    public String getDisplayName() {
+        String displayName = getPublicName();
+        if (StringUtils.isBlank(displayName)) {
+            displayName = getLocalName().replaceFirst("vitroClassGroup", "");
+        }
+        return displayName;
+    }
+    
     public List<VClassTemplateModel> getClasses() {
         if (classes == null) {
             List<VClass> classList = vClassGroup.getVitroClassList();
diff --git a/webapp/web/templates/freemarker/body/classGroups.ftl b/webapp/web/templates/freemarker/body/classGroups.ftl
index 71763e193..694cc5685 100644
--- a/webapp/web/templates/freemarker/body/classGroups.ftl
+++ b/webapp/web/templates/freemarker/body/classGroups.ftl
@@ -6,37 +6,34 @@
 
 <#if (!noData)>
     <section class="siteMap" role="region">
-    <div id="isotope-container">
-        <#list classGroups as classGroup>
-            <#-- Only render classgroups that have at least one class with individuals -->
-            <#if (classGroup.individualCount > 0)>
-                <#if classGroup.publicName?has_content>               
-                  <div class="class-group">
-                    <h2>${classGroup.publicName}</h2>
+        <div id="isotope-container">
+            <#list classGroups as classGroup>
+                <#-- Only render classgroups that have at least one populated class -->
+                <#if (classGroup.individualCount > 0)> 
+                	<div class="class-group">             
+                        <h2>${classGroup.displayName}</h2>
+                        <ul role="list">
+                            <#list classGroup.classes as class> 
+                                <#-- Only render populated classes -->
+                                <#if (class.individualCount > 0)>
+                                    <li role="listitem"><a href="${class.url}">${class.name}</a> (${class.individualCount})</li>
+                                </#if>
+                            </#list>
+                        </ul>
+                    </div> <!-- end class-group -->
                 </#if>
-                <ul role="list">
-                    <#list classGroup.classes as class> 
-                        <#-- Only render classes with individuals -->
-                        <#if (class.individualCount > 0)>
-                            <li role="listitem"><a href="${class.url}">${class.name}</a> (${class.individualCount})</li>
-                        </#if>
-                    </#list>
-                </ul>
-                </div>
-            </#if>
-        </#list>
-      </div> <!-- end isotope-container -->
+            </#list>
+          </div> <!-- end isotope-container -->
     </section>
 
-
-${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/isotope/jquery.isotope.min.js"></script>')}
-<script>
-    $('#isotope-container').isotope({
-      // options
-      itemSelector : '.class-group',
-      layoutMode : 'fitColumns'
-    });
-</script>
+    ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/jquery_plugins/isotope/jquery.isotope.min.js"></script>')}
+    <script>
+        $('#isotope-container').isotope({
+          // options
+          itemSelector : '.class-group',
+          layoutMode : 'fitColumns'
+        });
+    </script>
     
 <#else>
     ${noDataNotification}
diff --git a/webapp/web/templates/freemarker/body/partials/browse-classgroups.ftl b/webapp/web/templates/freemarker/body/partials/browse-classgroups.ftl
index fb91778b5..da15cc8ed 100644
--- a/webapp/web/templates/freemarker/body/partials/browse-classgroups.ftl
+++ b/webapp/web/templates/freemarker/body/partials/browse-classgroups.ftl
@@ -24,7 +24,7 @@ ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/browseClassGrou
                 <#elseif classGroup.uri == group.uri>
                     <#assign activeGroup = selected />
                 </#if>
-                <li role="listitem"><a ${activeGroup}href="${urls.currentPage}?classgroupUri=${group.uri?url}#browse" title="Browse ${group.publicName?capitalize}" data-uri="${group.uri}" data-count="${group.individualCount}">${group.publicName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
+                <li role="listitem"><a ${activeGroup}href="${urls.currentPage}?classgroupUri=${group.uri?url}#browse" title="Browse ${group.displayName?capitalize}" data-uri="${group.uri}" data-count="${group.individualCount}">${group.displayName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
             </#if>
         </#list>
     </#assign>
diff --git a/webapp/web/templates/freemarker/widgets/widget-browse.ftl b/webapp/web/templates/freemarker/widgets/widget-browse.ftl
index 2f741baee..57e0fb0f1 100644
--- a/webapp/web/templates/freemarker/widgets/widget-browse.ftl
+++ b/webapp/web/templates/freemarker/widgets/widget-browse.ftl
@@ -17,7 +17,7 @@
         <ul id="browse-classgroups" role="list">
         <#list vclassGroupList as group>
             <#if (group.individualCount > 0)>
-                <li role="listitem"><a href="${urls.currentPage}?classgroupUri=${group.uri?url}">${group.publicName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
+                <li role="listitem"><a href="${urls.currentPage}?classgroupUri=${group.uri?url}">${group.displayName?capitalize} <span class="count-classes">(${group.individualCount})</span></a></li>
             </#if>
         </#list>
         </ul>
@@ -48,7 +48,7 @@
     <section id="browse" role="region">
     <h4>Browse</h4>    
         <div>
-            vclass ${class.name} from ${classGroup.publicName}
+            vclass ${class.name} from ${classGroup.displayName}
             This has classGroup, classes, individualsInClass and class.
         </div>