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

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

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