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

Merge r7827 from nihvivo-rel-1.2-maint branch: fix display of classgroups with no public name on index and home pages.

Browse source
This commit is contained in:
ryounes 2011-04-19 16:33:21 +00:00
parent 78c3294102
commit 1e03e2b5a8
5 changed files with 38 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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>