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

updates to list view queries and constructs; includes fix for VIVO-399

Browse source
This commit is contained in:
tworrall 2013-10-22 13:14:58 -04:00
parent 55670d67dd
commit 48cf67e98a
20 changed files with 77 additions and 323 deletions
Download patch file Download diff file Expand all files Collapse all files

2
productMods/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl
View file

@ -22,7 +22,7 @@
</#if>
<#if statement.degreeLabel??>
${statement.degreeAbbr!statement.degreeLabel!}
<#if statement.dateTimeStart?? || statement.dateTimeEnd?? >&nbsp;${i18n().candidate},<#else>&nbsp;${i18n().candidate}</#if>
<#if statement.dateTimeStart?? || statement.dateTimeEnd?? >&nbsp;${i18n().candidacy},<#else>&nbsp;${i18n().candidacy}</#if>
</#if>
<#elseif statement.advisingRelLabel??>
<a href="${profileUrl(statement.uri("advisingRel"))}" title="${i18n().advisingRel_label}">${statement.advisingRelLabel!statement.localName}</a>

2
productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl
View file

@ -29,5 +29,5 @@
</#if>
</#local>
${linkedIndividual} <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
${linkedIndividual} <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
</#macro>

4
productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
View file

@ -15,9 +15,9 @@
<#local linkedIndividual>
<#if statement.award??>
<a href="${profileUrl(statement.uri("award"))}" title="${i18n().award_name}">${statement.awardLabel!statement.localName!}</a>
<a href="${profileUrl(statement.uri("award"))}" title="${i18n().award_name}">${statement.awardLabel!}</a>
<#else>
<a href="${profileUrl(statement.uri("awardReceipt"))}" title="${i18n().award_receipt_name}">${statement.receiptLabel!statement.localName!}</a>
<a href="${profileUrl(statement.uri("awardReceipt"))}" title="${i18n().award_receipt_name}">${statement.receiptLabel!}</a>
</#if>
</#local>

4
productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
View file

@ -33,6 +33,6 @@
</#if>
</#local>
<@s.join [ degree, linkedIndividual!, statement.deptOrSchool!, statement.info! ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" false/>
<@s.join [ degree, linkedIndividual!, statement.deptOrSchool!, statement.info! ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" false/>
</#macro>
</#macro>

2
productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
View file

@ -24,5 +24,5 @@
</#local>
<#-- If property is collated, then subclass label is redundant information -->
${linkedIndividual} <#if ! property.collatedBySubclass>&nbsp;(${statement.subclassLabel!})</#if> ${dateTime!}
${linkedIndividual} <#if (! property.collatedBySubclass) && statement.subclassLabel?has_content>&nbsp;(${statement.subclassLabel!})</#if> ${dateTime!}
</#macro>