merging r9990 into the trunk

This commit is contained in:
tworrall 2012-08-01 14:07:08 +00:00
parent cadff5e548
commit 1b75b2a93f
3 changed files with 52 additions and 4 deletions

View file

@ -25,21 +25,39 @@
</#if>
<#-- List the properties in the group -->
<#assign pubCount = 0 >
<#assign researchCount = 0 >
<#assign peepsCount = 0 >
<#if publicationCount?? >
<#assign pubCount = publicationCount >
</#if>
<#if grantCount?? >
<#assign researchCount = grantCount >
</#if>
<#if peopleCount?? >
<#assign peepsCount = peopleCount >
</#if>
<#list group.properties as property>
<article class="property" role="article">
<#-- Property display name -->
<#if property.localName == "authorInAuthorship" && editable && (publicationCount > 0) >
<#if property.localName == "authorInAuthorship" && editable && (pubCount > 0) >
<h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property />
<a id="managePropLink" class="manageLinks" href="${urls.base}/managePublications?subjectUri=${subjectUri[1]!}" title="manage publications" <#if verbose>style="padding-top:10px"</#if> >
manage publications
</a>
</h3>
<#elseif property.localName == "hasResearcherRole" && editable && (grantCount > 0) >
<#elseif property.localName == "hasResearcherRole" && editable && (researchCount! > 0) >
<h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property />
<a id="manageGrantLink" class="manageLinks" href="${urls.base}/manageGrants?subjectUri=${subjectUri[1]!}" title="manage grants & projects" <#if verbose>style="padding-top:10px"</#if> >
manage grants & projects
</a>
</h3>
<#elseif property.localName == "organizationForPosition" && editable && (peepsCount! > 0) >
<h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property />
<a id="managePeopleLink" class="manageLinks" href="${urls.base}/managePeople?subjectUri=${subjectUri[1]!}" title="manage people" <#if verbose>style="padding-top:10px"</#if> >
manage affiliated people
</a>
</h3>
<#else>
<h3 id="${property.localName}">${property.name} <@p.addLink property editable /> <@p.verboseDisplay property /> </h3>
</#if>