From f92ef300daf564b8d454cb29dbc91f8395992e36 Mon Sep 17 00:00:00 2001 From: j2blake Date: Thu, 1 Dec 2011 15:50:59 +0000 Subject: [PATCH] NIHVIVO-3311 convert all templates that fetch a URL from the ObjectPropertyStatementTemplateModel. --- .../body/partials/individual/propStatement-advisorIn.ftl | 4 ++-- .../individual/propStatement-authorInAuthorship.ftl | 4 ++-- .../partials/individual/propStatement-awardOrHonor.ftl | 4 ++-- .../individual/propStatement-dateTimeInterval.ftl | 2 +- .../partials/individual/propStatement-dateTimeValue.ftl | 2 +- .../body/partials/individual/propStatement-default.ftl | 2 +- .../individual/propStatement-educationalTraining.ftl | 4 ++-- .../partials/individual/propStatement-hasAttendeeRole.ftl | 8 ++++---- .../individual/propStatement-hasEditReviewRole.ftl | 2 +- .../individual/propStatement-hasInvestigatorRole.ftl | 8 ++++---- .../individual/propStatement-hasPresenterRole.ftl | 8 ++++---- .../body/partials/individual/propStatement-hasRole.ftl | 4 ++-- .../propStatement-informationResourceInAuthorship.ftl | 4 ++-- .../partials/individual/propStatement-mailingAddress.ftl | 8 ++++---- .../individual/propStatement-organizationForPosition.ftl | 4 ++-- .../individual/propStatement-organizationForTraining.ftl | 4 ++-- .../individual/propStatement-personInPosition.ftl | 6 +++--- .../partials/individual/propStatement-relatedRole.ftl | 4 ++-- .../body/partials/individual/propStatement-webpage.ftl | 2 +- 19 files changed, 42 insertions(+), 42 deletions(-) diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl index e3cbfb84..b2324fc5 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 <#elseif statement.advisoryLabel??> - ${statement.advisoryLabel!statement.localName} + ${statement.advisoryLabel!statement.localName} diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl index dc7aa4d2..1498a97e 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 diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl index 2e65cd6a..602209c8 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} @@ -29,7 +29,7 @@ <#local conferredByOrg> <#if statement.conferredBy?has_content && statement.conferredByLabel?has_content> - conferred by ${statement.conferredByLabel} + conferred by ${statement.conferredByLabel} diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-dateTimeInterval.ftl index fd20c952..658dbe52 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 9bd4d7bb..54813b47 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!)} \ 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 7fde834e..569b8521 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!} diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl index f1507be7..9ea8e181 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 diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl index 0560c06f..8ffc351e 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 @@ -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} diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl index 7370a20d..9f15b7b4 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} diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl index 661df469..c0693586 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 <#local awardOrAdminBy> <#if statement.awardedByLabel??> -  awarded by ${statement.awardedByLabel!} +  awarded by ${statement.awardedByLabel!} <#elseif statement.adminedByLabel??> -  administered by ${statement.adminedByLabel!} +  administered by ${statement.adminedByLabel!} diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl index c365f549..41fa39ba 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 @@ -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} diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl index ff038887..0e83d573 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 diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl index fad2c364..ac280fda 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 \ 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 99914acb..f0273306 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl @@ -17,12 +17,12 @@ <#-- until the custom form is ready, provide a link to the address profile for editing -->
<#if statement.street1?has_content> - + <#if statement.street2?has_content> <#if !statement.street1?has_content> - + <#else>
${statement.street2}
@@ -30,7 +30,7 @@ <#if statement.street3?has_content> <#if !statement.street1?has_content && !statement.street2?has_content> - + <#else>
${statement.street3}
@@ -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!} diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl index 87439d07..bec9ec01 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 diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl index f29bac44..e26bcf57 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 <#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 0b95519c..43594c5d 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 <#-- 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!} diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl index a3f04891..c9c946e1 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 diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl index 57f486a9..b1515f73 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-webpage.ftl @@ -16,5 +16,5 @@ <#if statement.url?has_content> ${linkText} <#else> - ${statement.linkName} (no url provided for link) + ${statement.linkName} (no url provided for link) \ No newline at end of file