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

merging r4252 to the trunk

Browse source
This commit is contained in:
tworrall 2012-08-07 19:37:11 +00:00
parent d5624a9669
commit cefee06309
7 changed files with 76 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

13
productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
View file

@ -14,7 +14,16 @@
<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
next statement -->
<#macro showAuthorship statement>
<#if statement.hideThis?has_content>
<span class="hideThis">&nbsp;</span>
<script type="text/javascript" >
$('span.hideThis').parent().parent().addClass("hideThis");
if ( $('h3#authorInAuthorship').attr('class').length == 0 ) {
$('h3#authorInAuthorship').addClass('hiddenPubs');
}
$('span.hideThis').parent().remove();
</script>
<#else>
<#local citationDetails>
<#if statement.subclass??>
<#if statement.subclass?contains("Article")>
@ -103,5 +112,5 @@
</#local>
${resourceTitle} ${citationDetails} <@dt.yearSpan "${statement.dateTime!}" />
</#if>
</#macro>

14
productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl
View file

@ -13,6 +13,16 @@
<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
next statement -->
<#macro showRole statement>
<#if statement.hideThis?has_content>
<span class="hideThis">&nbsp;</span>
<script type="text/javascript" >
$('span.hideThis').parent().parent().addClass("hideThis");
if ( $('h3#hasResearcherRole').attr('class').length == 0 ) {
$('h3#hasResearcherRole').addClass('hiddenGrants');
}
$('span.hideThis').parent().remove();
</script>
<#else>
<#local linkedIndividual>
<#if statement.activity??>
<a href="${profileUrl(statement.uri("activity"))}" title="activity name">${statement.activityLabel!statement.activityName!}</a>
@ -38,6 +48,6 @@
</#if>
</#local>
${linkedIndividual} ${awardOrAdminBy} ${dateTime!}
${linkedIndividual} ${awardOrAdminBy} ${dateTime!} ${statement.subclass!}
</#if>
</#macro>

13
productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
View file

@ -14,7 +14,16 @@
<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
next statement -->
<#macro showPosition statement>
<#if statement.hideThis?has_content>
<span class="hideThis">&nbsp;</span>
<script type="text/javascript" >
$('span.hideThis').parent().parent().addClass("hideThis");
if ( $('h3#organizationForPosition').attr('class').length == 0 ) {
$('h3#organizationForPosition').addClass('hiddenPeople');
}
$('span.hideThis').parent().remove();
</script>
<#else>
<#local linkedIndividual>
<#if statement.person??>
<a href="${profileUrl(statement.uri("person"))}" title="person name">${statement.personName}</a>
@ -25,5 +34,5 @@
</#local>
<@s.join [ linkedIndividual, statement.positionTitle! ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
</#if>
</#macro>