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

fixed required 'name' itemprop for Person and made position organizations more descriptive; JIRA VIVO-882

Browse source
This commit is contained in:
Nate Prewitt 2014-10-15 10:06:54 -06:00
parent acef06450d
commit 4dec645dd8
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
View file

@ -20,17 +20,21 @@
</#local> </#local>
<#local linkedIndividual> <#local linkedIndividual>
<#if statement.org??> <#if statement.org??>
<a itemprop="worksFor" itemscope itemtype="http://schema.org/Organization" href="${profileUrl(statement.uri("org"))}" title="${i18n().organization_name}">${statement.orgName}</a> <span itemprop="worksFor" itemscope itemtype="http://schema.org/Organization">
<a itemprop="name" href="${profileUrl(statement.uri("org"))}" title="${i18n().organization_name}">${statement.orgName}</a>
</span>
<#else> <#else>
<#-- This shouldn't happen, but we must provide for it --> <#-- This shouldn't happen, but we must provide for it -->
<a itemprop="worksFor" itemscope itemtype="http://schema.org/Organization" href="${profileUrl(statement.uri("position"))}" title="${i18n().missing_organization}">${i18n().missing_organization}</a> <a href="${profileUrl(statement.uri("position"))}" title="${i18n().missing_organization}">${i18n().missing_organization}</a>
</#if> </#if>
</#local> </#local>
<#-- The sparql query returns both the org's parent (middleOrg) and grandparent (outerOrg). <#-- 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. --> For now, we are only displaying the parent in the list view. -->
<#local middleOrganization> <#local middleOrganization>
<#if statement.middleOrg??> <#if statement.middleOrg??>
<a itemprop="worksFor" itemscope itemtype="http://schema.org/Organization" href="${profileUrl(statement.uri("middleOrg"))}" title="${i18n().middle_organization}">${statement.middleOrgName!}</a> <span itemprop="worksFor" itemscope itemtype="http://schema.org/Organization">
<a itemprop="name" href="${profileUrl(statement.uri("middleOrg"))}" title="${i18n().middle_organization}">${statement.middleOrgName!}</a>
</span>
</#if> </#if>
</#local> </#local>

2
themes/wilma/templates/individual--foaf-person.ftl
View file

@ -72,7 +72,7 @@
<#else> <#else>
<h1 class="vcard foaf-person"> <h1 class="vcard foaf-person">
<#-- Label --> <#-- Label -->
<span itemprop="alternateName" class="fn"><@p.label individual editable labelCount localesCount/></span> <span itemprop="name" class="fn"><@p.label individual editable labelCount localesCount/></span>
<#-- Display preferredTitle if it exists; otherwise mostSpecificTypes --> <#-- Display preferredTitle if it exists; otherwise mostSpecificTypes -->
<#assign title = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Title")!> <#assign title = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Title")!>