diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl index be85d83d..6ec5ed93 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl @@ -50,11 +50,11 @@
- + --> @@ -63,7 +63,7 @@← return to ${relatedSubject.name}
+← return to ${relatedSubject.name}
<#else>You have passed an invalid value for the qrCode display parameter.
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl b/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl index 0611f52b..1692aa95 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl @@ -32,18 +32,18 @@ ${scripts.add('', @@ -66,9 +66,9 @@ - #if> diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl b/productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl index afac047d..1cd665e5 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-visualizationMapOfScience.ftl @@ -3,5 +3,5 @@ <#-- Map Of Science visualization --> - \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualizationTemporalGraph.ftl b/productMods/templates/freemarker/body/partials/individual/individual-visualizationTemporalGraph.ftl index 347b842d..d7c70105 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-visualizationTemporalGraph.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-visualizationTemporalGraph.ftl @@ -3,5 +3,5 @@ <#-- Temporal graph visualization --> \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl index 341f471c..e3cbfb84 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl @@ -15,13 +15,13 @@ an rdfs:label. So check to see if there's an advisee first. If not, just display the label. --> <#local linkedIndividual> <#if statement.advisee??> - ${statement.adviseeLabel!}, + ${statement.adviseeLabel!}, <#if statement.degreeLabel??> ${statement.degreeAbbr!statement.degreeLabel!} <#if statement.dateTimeStart??> candidate,<#else> candidate#if> #if> <#elseif statement.advisoryLabel??> - ${statement.advisoryLabel!statement.localName} + ${statement.advisoryLabel!statement.localName} #if> #local> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl index 8a059a6b..dc7aa4d2 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl @@ -16,10 +16,10 @@ <#macro showAuthorship statement> <#local resourceTitle> <#if statement.infoResource??> - ${statement.infoResourceName}. + ${statement.infoResourceName}. <#else> <#-- This shouldn't happen, but we must provide for it --> - missing information resource. + missing information resource. #if> #local> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl index 281f1336..2e65cd6a 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl @@ -15,7 +15,7 @@ <#local linkedIndividual> <#if statement.award??> - ${statement.awardLabel!statement.localName} + ${statement.awardLabel!statement.localName} #if> #local> @@ -29,7 +29,7 @@ <#local conferredByOrg> <#if statement.conferredBy?has_content && statement.conferredByLabel?has_content> - conferred by ${statement.conferredByLabel} + conferred by ${statement.conferredByLabel} #if> #local> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl index 944bd14c..fd20c952 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl @@ -13,7 +13,7 @@ --> <#if ! statement.valueStart?? && ! statement.valueEnd?? && ! statement.label?? > - incomplete date/time interval + incomplete date/time interval <#else> <#if statement.label??> ${statement.label!} diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl index c6096ac9..9bd4d7bb 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeValue.ftl @@ -10,7 +10,7 @@ <#-- No core:dateTime data property assigned. Display a link to the core:DateTimeValue object --> <#if ! statement.dateTime??> - incomplete date/time + incomplete date/time <#else> ${dt.formatXsdDateTimeLong(statement.dateTime, statement.precision!)} #if> \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-default.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-default.ftl index e648600d..7fde834e 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-default.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-default.ftl @@ -10,7 +10,7 @@ <#macro showStatement statement> <#-- The query retrieves a type only for Persons. Post-processing will remove all but one. --> - ${statement.label!statement.localName!} ${statement.title!statement.type!} + ${statement.label!statement.localName!} ${statement.title!statement.type!} #macro> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl index 7c1b0c1b..f1507be7 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl @@ -29,10 +29,10 @@ <#local linkedIndividual> <#if statement.org??> - ${statement.orgName} + ${statement.orgName} <#elseif editable> <#-- Show the link to the context node only if the user is editing the page. --> - missing organization + missing organization #if> #local> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl index b2cde02b..1ddd5912 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasAssociatedConcept.ftl @@ -12,8 +12,8 @@ next statement --> <#macro showConcept statement> <#if statement.vocabularySourceName??> - ${statement.conceptLabel!statement.conceptName} (${statement.vocabularySourceName}) + ${statement.conceptLabel!statement.conceptName} (${statement.vocabularySourceName}) <#else> - ${statement.conceptLabel!statement.conceptName} + ${statement.conceptLabel!statement.conceptName} #if> #macro> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl index 7c8625e7..0560c06f 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl @@ -16,10 +16,10 @@ <#macro showRole statement> <#local linkedIndividual> <#if statement.event1??> - ${statement.event1Label!statement.event1Name} + ${statement.event1Label!statement.event1Name} <#else> <#-- This shouldn't happen, but we must provide for it --> - missing event + missing event #if> #local> @@ -29,9 +29,9 @@ <#local attendedEvent> <#if statement.event2?has_content && statement.event2Label?has_content> - at ${statement.event2Label} + at ${statement.event2Label} <#elseif statement.series?has_content && statement.seriesLabel?has_content> - at ${statement.seriesLabel} + at ${statement.seriesLabel} #if> #local> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl index 4fb68898..7370a20d 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl @@ -16,7 +16,7 @@ <#macro showRole statement property> <#local linkedIndividual> <#if statement?has_content && statement.activity?has_content> - ${statement.activityLabel!statement.activityName} + ${statement.activityLabel!statement.activityName} #if> #local> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl index 8fe89525..661df469 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl @@ -15,18 +15,18 @@ <#macro showRole statement> <#local linkedIndividual> <#if statement.activity??> - ${statement.activityLabel!statement.activityName!} + ${statement.activityLabel!statement.activityName!} <#else> <#-- This shouldn't happen, but we must provide for it --> - missing activity + missing activity #if> #local> <#local awardOrAdminBy> <#if statement.awardedByLabel??> - awarded by ${statement.awardedByLabel!} + awarded by ${statement.awardedByLabel!} <#elseif statement.adminedByLabel??> - administered by ${statement.adminedByLabel!} + administered by ${statement.adminedByLabel!} #if> #local> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl index 2d8eb6c0..c365f549 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl @@ -16,10 +16,10 @@ <#macro showRole statement> <#local linkedIndividual> <#if statement.presentation??> - ${statement.presentationLabel!statement.presentationName} + ${statement.presentationLabel!statement.presentationName} <#else> <#-- This shouldn't happen, but we must provide for it --> - missing presentation + missing presentation #if> #local> @@ -29,9 +29,9 @@ <#local conference> <#if statement.conference?has_content && statement.conferenceLabel?has_content> - ${statement.conferenceLabel} + ${statement.conferenceLabel} <#elseif statement.series?has_content && statement.seriesLabel?has_content> - ${statement.seriesLabel} + ${statement.seriesLabel} #if> #local> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl index 439cafbc..ff038887 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl @@ -15,10 +15,10 @@ <#macro showRole statement> <#local linkedIndividual> <#if statement.activity??> - ${statement.activityLabel!statement.activityName} + ${statement.activityLabel!statement.activityName} <#else> <#-- This shouldn't happen, but we must provide for it --> - missing activity + missing activity #if> #local> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl index da5af9ec..fad2c364 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl @@ -14,9 +14,9 @@ next statement --> <#macro showAuthorship statement> <#if statement.person??> - ${statement.personName} + ${statement.personName} <#else> <#-- This shouldn't happen, but we must provide for it --> - missing author + missing author #if> #macro> \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl index 6e9eaead..99914acb 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl @@ -64,7 +64,7 @@ <#elseif statement.editable> <#-- This can be removed when the custom form is available. Until then, provide a link to the address profile so the data can be edited. --> - ${statement.label!statement.localName} + ${statement.label!statement.localName} <#else> ${statement.label!} #if> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl index 9bdf6aa6..87439d07 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl @@ -17,10 +17,10 @@ <#local linkedIndividual> <#if statement.person??> - ${statement.personName} + ${statement.personName} <#else> <#-- This shouldn't happen, but we must provide for it --> - missing person in this position + missing person in this position #if> #local> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl index 231810fe..f29bac44 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl @@ -17,10 +17,10 @@ <#local linkedIndividual> <#if statement.person??> - ${statement.personName} + ${statement.personName} <#else> <#-- This shouldn't happen, but we must provide for it --> - missing person in this position + missing person in this position #if> #local> <#local detailedInfo> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl index 1a02c76f..0b95519c 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl @@ -17,17 +17,17 @@ <#local linkedIndividual> <#if statement.org??> - ${statement.orgName} + ${statement.orgName} <#else> <#-- This shouldn't happen, but we must provide for it --> - missing organization + missing organization #if> #local> <#-- The sparql query returns both the org's parent (middleOrg) and grandparent (outerOrg). For now, we are only displaying the parent in the list view. --> <#local middleOrganization> <#if statement.middleOrg??> - ${statement.middleOrgName!} + ${statement.middleOrgName!} #if> #local> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl index a2801127..a3f04891 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl @@ -18,10 +18,10 @@ <#local linkedIndividual> <#if statement.indivInRole??> - ${statement.indivLabel!statement.indivName} + ${statement.indivLabel!statement.indivName} <#else> <#-- This shouldn't happen, but we must provide for it --> - missing person in this role + missing person in this role #if> #local> diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl index 40076dd4..57f486a9 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl @@ -14,7 +14,7 @@ <#if statement.url?has_content> - ${linkText} + ${linkText} <#else> - ${statement.linkName} (no url provided for link) + ${statement.linkName} (no url provided for link) #if> \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/listedIndividual.ftl b/productMods/templates/freemarker/body/partials/listedIndividual.ftl index 4caa8b64..68b25a56 100644 --- a/productMods/templates/freemarker/body/partials/listedIndividual.ftl +++ b/productMods/templates/freemarker/body/partials/listedIndividual.ftl @@ -4,7 +4,7 @@ <#import "lib-vivo-properties.ftl" as p> -${individual.name} +${individual.name} <@p.displayTitle individual />