Merge branch 'maint-rel-1.6' into develop

This commit is contained in:
tworrall 2013-11-18 11:07:17 -05:00
commit 1b3817afb2

View file

@ -122,10 +122,10 @@
<h4>${i18n().research_capitalized}</h4>
<ul>
<#list classGroups as group>
<#if (group.individualCount > 0) && group.displayName == "research" >
<#if (group.individualCount > 0) && group.uri?contains("publications") >
<#assign foundClassGroup = true />
<#list group.classes as class>
<#if (class.individualCount > 0) && (class.uri?contains("AcademicArticle") || class.uri?contains("Book") || class.uri?contains("Chapter") ||class.uri?contains("ConferencePaper") || class.uri?contains("Proceedings") || class.uri?contains("Report")) >
<#if (class.individualCount > 0) && (class.uri?contains("AcademicArticle") || class.uri?contains("Book") || class.uri?contains("Chapter") ||class.uri?contains("ConferencePaper") || class.uri?contains("Grant") || class.uri?contains("Report")) >
<li role="listitem">
<span>${class.individualCount!}</span>&nbsp;
<a href='${urls.base}/individuallist?vclassId=${class.uri?replace("#","%23")!}'>