litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1677 Updated browse widget to handle VClasses with zero individuals. Also applied changes to classGroups.ftl for index.

Browse source
This commit is contained in:
nac26 2011-01-13 13:48:40 +00:00
parent daedd8a961
commit b3b8ef7f6e
3 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
webapp/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/VClassGroupTemplateModel.java
View file

@ -55,11 +55,11 @@ public class VClassGroupTemplateModel extends BaseTemplateModel {
return classes; return classes;
} }
public String getIndividualCount(){ public int getIndividualCount(){
if( vClassGroup.isIndividualCountSet() ) if( vClassGroup.isIndividualCountSet() )
return Integer.toString(vClassGroup.getIndividualCount()); return vClassGroup.getIndividualCount();
else else
return ""; return 0;
} }
public boolean isIndividualCountSet(){ public boolean isIndividualCountSet(){

6
webapp/web/templates/freemarker/body/classGroups.ftl
View file

@ -4,11 +4,17 @@
<div class="siteMap"> <div class="siteMap">
<#list classGroups as classGroup> <#list classGroups as classGroup>
<#-- Only render classgroups that have at least one class with individuals -->
<#if (classGroup.individualCount > 0)>
<h2>${classGroup.publicName}</h2> <h2>${classGroup.publicName}</h2>
<ul> <ul>
<#list classGroup.classes as class> <#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> <li><a href="${class.url}">${class.name}</a> (${class.individualCount})</li>
</#if>
</#list> </#list>
</ul> </ul>
</#if>
</#list> </#list>
</div> </div>

26
webapp/web/templates/freemarker/widgets/widget-browse.ftl
View file

@ -16,32 +16,32 @@
<ul id="browse-classgroups" role="list"> <ul id="browse-classgroups" role="list">
<#list vclassGroupList as group> <#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> </#list>
</ul> </ul>
</section> </section>
<#-- <@classGroup /> -->
</#macro> </#macro>
<#macro classGroup> <#macro classGroup>
<section id="browse" role="region"> <section id="browse" role="region">
<h4>Browse</h4> <h4>Browse</h4>
<div> <section id="browse-classes" role="navigation">
There are ${classes?size} classes in classGroup ${classGroup.publicName}. <nav>
There are ${classGroup.individualCount} individuals in the class group. <ul id="classgroup-list" role="list">
Classes with and without instances are included.
</div>-
<nav role="navigation">
<ul id="foaf-person-childClasses">
<#list classes as class> <#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> <#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> </#list>
</ul> </ul>
</nav> </nav>
</section>
</section> </section>
</#macro> </#macro>
<#macro vclass> <#macro vclass>