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

Changing VClassGroupCache to not filter out groups and classes with no individuals as part of NIHVIVO-1666 Fixing URLs in browse widget as part of NIHVIVO-592

Browse source
This commit is contained in:
bdc34 2011-01-12 20:00:42 +00:00
parent dea0385806
commit b024863f42
8 changed files with 277 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,41 +16,41 @@
<ul id="browse-classgroups" role="list">
<#list vclassGroupList as group>
<li role="listitem"><a href="${urls.base}/${currentPage}?classgroupUri=${group.publicName?url}">${group.publicName} <span class="count-classes">(n)</span></a></li>
<li role="listitem"><a href="${urls.base}/${currentPage}?classgroupUri=${group.uri?url}">${group.publicName} <span class="count-classes">(n)</span></a></li>
</#list>
</ul>
</section>
</#macro>
<#macro classGroup>
<section>
<#--<h2>Macro classGroup from widget-browse.ftl</h2>
<section id="browse" role="region">
<h4>Browse</h4>
<div>
There are ${classes?size} classes in classGroup ${classGroup.publicName}.
Only classes with instances are included.
</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.publicName?url}&vclassUri=${class.uri?url}">${class.name}<span class="count-classes"> ${class.individualCount}</span></a></li>
<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>
<#--<ul>
<#list classes as class>
<li><a href="${urls.base}/${currentPage}?classgroupUri=${classGroup.publicName?url}&vclassUri=${class.uri?url}">${class.name}</a> ${class.individualCount}</li>
</#list>
</ul>-->
</section>
</#macro>
<#macro vclass>
<section>
<h2>vclass ${class.name} from ${classGroup.publicName}</h2>
This has classGroup, classes, individualsInClass and class.
<section id="browse" role="region">
<h4>Browse</h4>
<div>
vclass ${class.name} from ${classGroup.publicName}
This has classGroup, classes, individualsInClass and class.
</div>
<ul>
<#list individualsInClass as ind>
@ -60,7 +60,8 @@
</#macro>
<#macro vclassAlpha>
<section role="region">
<h2>vclassAlpha</h2>
<section id="browse" role="region">
<h4>Browse</h4>
<div>vclassAlpha is not yet implemented.</div>
</section>
</#macro>