merging r10004 to the trunk

This commit is contained in:
tworrall 2012-08-07 19:54:50 +00:00
parent 71cdc0ae52
commit 4f56554901
2 changed files with 5 additions and 94 deletions

View file

@ -25,34 +25,22 @@
</#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 && (pubCount > 0) >
<#if property.localName == "authorInAuthorship" && editable >
<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> >
<a id="managePubLink" 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 && (researchCount! > 0) >
<#elseif property.localName == "hasResearcherRole" && editable >
<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) >
<#elseif property.localName == "organizationForPosition" && editable >
<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