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

Merge branch 'develop' of git+ssh://github.com/vivo-project/VIVO into develop

Browse source
This commit is contained in:
j2blake 2013-10-15 12:16:55 -04:00
commit 06f3e9f843
7 changed files with 45 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
productMods/config/listViewConfig-authorInAuthorship.xml
View file

@ -43,7 +43,7 @@
?publisherObj rdfs:label ?publisher ?publisherObj rdfs:label ?publisher
} }
OPTIONAL { ?infoResource core:relatedBy ?editorship . OPTIONAL { ?infoResource core:relatedBy ?editorship .
?editorObj core:relatedBy ?editorship . ?editorship core:relates ?editorObj .
?editorObj rdfs:label ?editor ?editorObj rdfs:label ?editor
} }
OPTIONAL { ?infoResource core:partOf ?partOfObj . OPTIONAL { ?infoResource core:partOf ?partOfObj .

2
productMods/config/listViewConfig-hasRole.xml
View file

@ -49,7 +49,7 @@
?activity vitro:mostSpecificType ?subclass ?activity vitro:mostSpecificType ?subclass
</collated> </collated>
} }
<!-- for research activities where the activity involves a grant -->
OPTIONAL { ?role core:relatedBy ?activity . OPTIONAL { ?role core:relatedBy ?activity .
LET (?activityName := afn:localname(?activity)) LET (?activityName := afn:localname(?activity))
OPTIONAL { ?activity rdfs:label ?activityLabel } OPTIONAL { ?activity rdfs:label ?activityLabel }

15
productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl
View file

@ -52,16 +52,17 @@
<@p.label individual editable labelCount localesCount/> <@p.label individual editable labelCount localesCount/>
</h1> </h1>
<#-- Display preferredTitle if it exists; otherwise mostSpecificTypes --> <#-- Display preferredTitle if it exists; otherwise mostSpecificTypes -->
<#assign title = propertyGroups.pullProperty("${core}preferredTitle")!> <#assign title = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Title")!>
<#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<#if (title.statements?size < 1) >
<@p.addLinkWithLabel title editable /> <@p.addLinkWithLabel title editable />
<#list title.statements as statement>
<#if !editable >
<div id="titleContainer"><span class="display-title-not-editable">${statement.value}</span></div>
<#else> <#else>
<span class="display-title-editable">${statement.value}</span> <h2>${title.name?capitalize!}</h2>
<@p.editingLinks "${title.name}" "" statement editable /> <@p.verboseDisplay title />
</#if> </#if>
<#list title.statements as statement>
<span class="display-title<#if editable>-editable</#if>">${statement.preferredTitle}</span>
<@p.editingLinks "${title.localName}" "${title.name}" statement editable />
</#list> </#list>
</#if> </#if>
<#-- If preferredTitle is unpopulated, display mostSpecificTypes --> <#-- If preferredTitle is unpopulated, display mostSpecificTypes -->
@ -101,7 +102,7 @@
<#include "individual-contactInfo-2column.ftl"> <#include "individual-contactInfo-2column.ftl">
</div> <!-- contactContainer --> </div> <!-- contactContainer -->
<div id="webpagesContainer"> <div id="webpagesContainer">
<#assign webpage = propertyGroups.pullProperty("${core}webpage")!> <#assign webpage = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#URL")!>
<#if webpage?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#if webpage?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<h2 id="webpage" class="mainPropGroup">${i18n().websites} <@p.addLink webpage editable ""/></h2> <h2 id="webpage" class="mainPropGroup">${i18n().websites} <@p.addLink webpage editable ""/></h2>
<@p.verboseDisplay webpage /> <@p.verboseDisplay webpage />

24
productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl
View file

@ -35,7 +35,8 @@
so set this variable now so set this variable now
--> -->
<#assign hasWebpage = false> <#assign hasWebpage = false>
<#assign web = individual.propertyList.getProperty("${core}webpage")!> <#assign web = individual.propertyList.getProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#URL")!>
<#if web?? >
<#if editable > <#if editable >
<#if web.first()?? > <#if web.first()?? >
<#assign hasWebpage = true> <#assign hasWebpage = true>
@ -49,7 +50,7 @@
<#assign hasWebpage = false> <#assign hasWebpage = false>
</#if> </#if>
</#if> </#if>
</#if>
<section id="individual-intro" class="vcard person" role="region"> <section id="individual-intro" class="vcard person" role="region">
<section id="label-title" <#if editable>style="width:45%"</#if> > <section id="label-title" <#if editable>style="width:45%"</#if> >
<header> <header>
@ -64,15 +65,20 @@
<@p.label individual editable labelCount localesCount/> <@p.label individual editable labelCount localesCount/>
</h1> </h1>
<#-- Display preferredTitle if it exists; otherwise mostSpecificTypes --> <#-- Display preferredTitle if it exists; otherwise mostSpecificTypes -->
<#assign title = propertyGroups.pullProperty("${core}preferredTitle")!> <#assign title = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#Title")!>
<#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<#if (title.statements?size < 1) >
<@p.addLinkWithLabel title editable /> <@p.addLinkWithLabel title editable />
<#else>
<h2 id="preferredTitle">${title.name?capitalize!}</h2>
<@p.verboseDisplay title />
</#if>
<#list title.statements as statement> <#list title.statements as statement>
<#if !editable > <#if !editable >
<div id="titleContainer"><span class="display-title-not-editable">${statement.value}</span></div> <div id="titleContainer"><span class="display-title-not-editable">${statement.preferredTitle}</span></div>
<#else> <#else>
<span class="display-title-editable">${statement.value}</span> <span class="display-title-editable">${statement.preferredTitle}</span>
<@p.editingLinks "${title.name}" "" statement editable /> <@p.editingLinks "${title.localName}" "${title.name}" statement editable />
</#if> </#if>
</#list> </#list>
</#if> </#if>
@ -107,7 +113,7 @@
<section id="qv-share-contact" class="share-contact" role="region" <#if !editable>style="padding-top:12px"</#if>> <section id="qv-share-contact" class="share-contact" role="region" <#if !editable>style="padding-top:12px"</#if>>
<img id="webpage-popout-top" src="${urls.images}/individual/webpage-popout-top.png" alt="${i18n().background_top_image}"/> <img id="webpage-popout-top" src="${urls.images}/individual/webpage-popout-top.png" alt="${i18n().background_top_image}"/>
<div id="webpage-wrapper" > <div id="webpage-wrapper" >
<#assign webpage = propertyGroups.pullProperty("${core}webpage")!> <#assign webpage = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#URL")!>
<#if webpage?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#if webpage?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<#if editable> <#if editable>
<h2 class="websites" >${i18n().websites} <@p.addLink webpage editable ""/></h2> <h2 class="websites" >${i18n().websites} <@p.addLink webpage editable ""/></h2>
@ -119,7 +125,7 @@
</ul> </ul>
</#if> </#if>
</div> </div>
<img id="webpage-popout-bottom" src="${urls.images}/individual/webpage-popout-bottom.png" alt="${i18n().background_top_image}" <#if editable>style="margin-top:16px"</#if>/> <img id="webpage-popout-bottom" src="${urls.images}/individual/webpage-popout-bottom.png" alt="${i18n().background_top_image}" />
</section> <!-- end share-contact --> </section> <!-- end share-contact -->
</#if> </#if>
<section id="individual-info" class="qv-individual-info" role="region" style=" <#if !editable>padding-top:12px;</#if><#if hasWebpage>width:53%<#else>width:100%;clear:left</#if>;"> <section id="individual-info" class="qv-individual-info" role="region" style=" <#if !editable>padding-top:12px;</#if><#if hasWebpage>width:53%<#else>width:100%;clear:left</#if>;">
@ -154,7 +160,7 @@
<#-- If the individual does not have webpages and we're in edit mode, provide the opportunity to add webpages --> <#-- If the individual does not have webpages and we're in edit mode, provide the opportunity to add webpages -->
<#if editable && !hasWebpage > <#if editable && !hasWebpage >
<!-- Webpages --> <!-- Webpages -->
<#assign webpage = propertyGroups.pullProperty("${core}webpage")!> <#assign webpage = propertyGroups.pullProperty("http://purl.obolibrary.org/obo/ARG_2000028","http://www.w3.org/2006/vcard/ns#URL")!>
<#if webpage?has_content> <#if webpage?has_content>
<h2 id="webpage" class="mainPropGroup">${i18n().websites} <@p.addLink webpage editable ""/></h2> <h2 id="webpage" class="mainPropGroup">${i18n().websites} <@p.addLink webpage editable ""/></h2>
<@p.verboseDisplay webpage /> <@p.verboseDisplay webpage />

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

@ -3,12 +3,14 @@
<#-- Template for sparkline visualization on individual profile page --> <#-- Template for sparkline visualization on individual profile page -->
<#-- Determine whether this person is an author --> <#-- Determine whether this person is an author -->
<#assign isAuthor = p.hasStatements(propertyGroups, "${core}authorInAuthorship") /> <#assign isAuthor = p.hasVisualizationStatements(propertyGroups, "${core}relatedBy", "${core}Authorship") />
<#-- Determine whether this person is involved in any grants --> <#-- Determine whether this person is involved in any grants -->
<#assign isInvestigator = ( p.hasStatements(propertyGroups, "${core}hasInvestigatorRole") || <#assign obo_RO53 = "http://purl.obolibrary.org/obo/RO_0000053">
p.hasStatements(propertyGroups, "${core}hasPrincipalInvestigatorRole") ||
p.hasStatements(propertyGroups, "${core}hasCo-PrincipalInvestigatorRole") ) > <#assign isInvestigator = ( p.hasVisualizationStatements(propertyGroups, "${obo_RO53}", "${core}InvestigatorRole") ||
p.hasVisualizationStatements(propertyGroups, "${obo_RO53}", "${core}PrincipalInvestigatorRole") ||
p.hasVisualizationStatements(propertyGroups, "${obo_RO53}", "${core}CoPrincipalInvestigatorRole") ) >
<#if (isAuthor || isInvestigator)> <#if (isAuthor || isInvestigator)>

4
rdf/display/everytime/PropertyConfig.n3
View file

@ -279,6 +279,8 @@ local:hasPresenterRoleContext a :ConfigContext ;
local:hasPresenterRoleConfig a :ObjectPropertyDisplayConfig ; local:hasPresenterRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-hasPresenterRole.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-hasPresenterRole.xml"^^xsd:string ;
:displayName "presentations" ; :displayName "presentations" ;
vitro:collateBySubclassAnnot
"true"^^xsd:boolean;
vitro:displayRankAnnot 30; vitro:displayRankAnnot 30;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
@ -339,6 +341,8 @@ local:advisorRoleContext a :ConfigContext ;
local:advisorRoleConfig a :ObjectPropertyDisplayConfig ; local:advisorRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-advisorIn.xml"^^xsd:string ; :listViewConfigFile "listViewConfig-advisorIn.xml"^^xsd:string ;
:displayName "advisees" ; :displayName "advisees" ;
vitro:collateBySubclassAnnot
"true"^^xsd:boolean;
vitro:displayRankAnnot 40; vitro:displayRankAnnot 40;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;

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

@ -69,9 +69,14 @@
<#-- 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")!>
<#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) --> <#if title?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
<#if (title.statements?size < 1) >
<@p.addLinkWithLabel title editable /> <@p.addLinkWithLabel title editable />
<#else>
<h2>${title.name?capitalize!}</h2>
<@p.verboseDisplay title />
</#if>
<#list title.statements as statement> <#list title.statements as statement>
<span class="display-title">${statement.preferredTitle}</span> <span class="display-title<#if editable>-editable</#if>">${statement.preferredTitle}</span>
<@p.editingLinks "${title.localName}" "${title.name}" statement editable /> <@p.editingLinks "${title.localName}" "${title.name}" statement editable />
</#list> </#list>
</#if> </#if>