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

NIHVIVO-1737 Fix missing space in educational training display.

Browse source
This commit is contained in:
rjy7 2011-01-18 03:12:05 +00:00
parent 2fbc6c22ca
commit a9d5241b3a
3 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,6 @@
<#if ! statement.valueStart?? && ! statement.valueEnd??>
<a href="${profileUrl(statement.dateTimeInterval)}">${statement.intervalName}</a> (incomplete date/time interval data)
<#else>
${dt.dateTimeIntervalLong("${statement.dateTimeStart!}", "${statement.precisionStart!}",
"${statement.dateTimeEnd!}", "${statement.precisionEnd!}")}
${dt.dateTimeIntervalLong(statement.dateTimeStart!, statement.precisionStart!,
statement.dateTimeEnd!, statement.precisionEnd!)}
</#if>

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

@ -13,7 +13,12 @@
<#local degree>
<#if statement.degreeName??>
<@s.join [ statement.degreeAbbr!statement.degreeName, statement.majorField! ], " in " />
<#-- RY Giving up on join here. Freemarker insists on removing the space before "in"
and leaving no space between the degree and major field, even though compress
should only delete consecutive spaces. Even &nbsp; doesn't help.
<@s.join [ statement.degreeAbbr!statement.degreeName, statement.majorField! ], " in " /> -->
${statement.degreeAbbr!statement.degreeName}
<#if statement.majorField??> in ${statement.majorField}</#if>
</#if>
</#local>

18
productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
View file

@ -9,16 +9,10 @@
<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the
next statement -->
<#macro showAuthorship statement>
<#local linkedIndividual>
<#if statement.person??>
<a href="${profileUrl(statement.person)}">${statement.personName}</a>
<#else>
<#-- This shouldn't happen, but we must provide for it -->
<a href="${profileUrl(statement.authorship)}">${statement.authorshipName}</a> (no linked author)
</#if>
</#local>
<@s.join [ linkedIndividual ] />
<#if statement.person??>
<a href="${profileUrl(statement.person)}">${statement.personName}</a>
<#else>
<#-- This shouldn't happen, but we must provide for it -->
<a href="${profileUrl(statement.authorship)}">${statement.authorshipName}</a> (no linked author)
</#if>
</#macro>