diff --git a/productMods/templates/freemarker/body/partials/individual/individual-affiliated-dept-details.ftl b/productMods/templates/freemarker/body/partials/individual/individual-affiliated-dept-details.ftl index 2bf4f7c7..3cb68d26 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-affiliated-dept-details.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-affiliated-dept-details.ftl @@ -2,9 +2,10 @@ <#if deptResearchAreas?has_content>
<#list deptResearchAreas as firstRow> + <#assign raLink = "${urls.base}/individual?uri=${firstRow['raURI']}" />

${firstRow["orgLabel"]}

-

${i18n().individuals_with_dept(firstRow['raLabel'])} ${i18n().view_all_individuals_in_dept}

+

${i18n().individuals_with_dept(firstRow['raLabel'],raLink)} ${i18n().view_all_individuals_in_dept}

<#break> diff --git a/productMods/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl b/productMods/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl index bf62c621..f3c6e1d9 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-affiliated-res-area-details.ftl @@ -3,11 +3,12 @@
<#list affiliatedResearchAreas as firstRow> <#assign firstOrgLabel = firstRow["orgLabel"]?upper_case /> + <#assign deptLink = "${urls.base}/individual?uri=${firstRow['orgURI']}" /> <#assign i18TextString1 = "" /> <#if ( firstOrgLabel?index_of("THE") == 0 ) > - <#assign i18TextString1 = "${i18n().individuals_with_researh_area_one(firstRow['orgLabel'])}" /> + <#assign i18TextString1 = "${i18n().individuals_with_researh_area_one(firstRow['orgLabel'],deptLink)}" /> <#else> - <#assign i18TextString1 = "${i18n().individuals_with_researh_area_two(firstRow['orgLabel'])}" /> + <#assign i18TextString1 = "${i18n().individuals_with_researh_area_two(firstRow['orgLabel'],deptLink)}" />

${firstRow["raLabel"]}

diff --git a/rdf/display/everytime/vivoOrganizationDataGetters.n3 b/rdf/display/everytime/vivoOrganizationDataGetters.n3 index b1ece312..7e3c301f 100644 --- a/rdf/display/everytime/vivoOrganizationDataGetters.n3 +++ b/rdf/display/everytime/vivoOrganizationDataGetters.n3 @@ -69,6 +69,7 @@ display:getResearchAreaDataGetter (str(?researchAreaLabel) AS ?raLabel) (str(?organizationLabel) AS ?orgLabel) ?raURI + ?orgURI WHERE { ?orgURI vivo:organizationForPosition ?posn . ?orgURI rdfs:label ?organizationLabel . @@ -101,6 +102,7 @@ display:getResearchAreaDataGetter (Str(?researchAreaLabel) AS ?raLabel) (str(?departmentLabel) AS ?orgLabel) ?raURI + ?orgURI WHERE { ?orgURI vivo:organizationForPosition ?posn . ?orgURI rdfs:label ?orgLabel . diff --git a/themes/wilma/i18n/all.properties b/themes/wilma/i18n/all.properties index 6cf3c941..09637a11 100644 --- a/themes/wilma/i18n/all.properties +++ b/themes/wilma/i18n/all.properties @@ -61,9 +61,9 @@ view_all_faculty = view all faculty view_all_members_of_org = View all the members of this organization. faculty_memberships = Faculty Memberships -individuals_with_researh_area_one = Here are the individuals in {0} who have an interest in this research area. -individuals_with_researh_area_two = Here are the individuals in the {0} who have an interest in this research area. -individuals_with_dept = Here are the individuals with an interest in {0} who are in this organization. +individuals_with_researh_area_one = Here are the individuals in {0} who have an interest in this research area. +individuals_with_researh_area_two = Here are the individuals in the {0} who have an interest in this research area. +individuals_with_dept = Here are the individuals with an interest in {0} who are in this organization. faculty_with_researh_area = Here are the faculty members in the {0} department who have an interest in this research area. view_all_individuals_in_area = View all individuals with an interest in this area. view_all_individuals_in_dept = View all individuals in this organization.