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

Merge branch 'maint-rel-1.6' into develop

Browse source
This commit is contained in:
tworrall 2013-12-06 16:51:33 -05:00
commit fb7015827d
4 changed files with 110 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -61,7 +61,7 @@
<@p.verboseDisplay title /> <@p.verboseDisplay title />
</#if> </#if>
<#list title.statements as statement> <#list title.statements as statement>
<span class="display-title<#if editable>-editable</#if>">${statement.preferredTitle}</span> <span class="display-title<#if editable>-editable<#else>-not-editable</#if>">${statement.preferredTitle}</span>
<@p.editingLinks "${title.localName}" "${title.name}" statement editable title.rangeUri /> <@p.editingLinks "${title.localName}" "${title.name}" statement editable title.rangeUri />
</#list> </#list>
</#if> </#if>

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

@ -69,7 +69,7 @@
<#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) > <#if (title.statements?size < 1) >
<@p.addLinkWithLabel title editable /> <@p.addLinkWithLabel title editable />
<#else> <#elseif editable>
<h2 id="preferredTitle">${title.name?capitalize!}</h2> <h2 id="preferredTitle">${title.name?capitalize!}</h2>
<@p.verboseDisplay title /> <@p.verboseDisplay title />
</#if> </#if>

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

@ -1324,37 +1324,38 @@ local:facilitySiteOfAgentConfig a :ObjectPropertyDisplayConfig ;
vitro:selectFromExistingAnnot "true"^^xsd:boolean ; vitro:selectFromExistingAnnot "true"^^xsd:boolean ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> . :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:projectUsesMaterialEntityContext a :ConfigContext ; # uses and used by need work -- apply to continuants and occurrents, and material entities as well as information content entities
:hasConfiguration local:projectUsesMaterialEntityConfig ; #local:projectUsesMaterialEntityContext a :ConfigContext ;
:configContextFor <http://purl.obolibrary.org/obo/ERO_0000031> ; # :hasConfiguration local:projectUsesMaterialEntityConfig ;
:qualifiedByDomain vivo:Project ; # :configContextFor <http://purl.obolibrary.org/obo/ERO_0000031> ;
:qualifiedBy <http://purl.obolibrary.org/obo/BFO_0000040> . ## Material Entity # :qualifiedByDomain vivo:Project ;
# :qualifiedBy <http://purl.obolibrary.org/obo/BFO_0000040> . ## Material Entity
local:projectUsesMaterialEntityConfig a :ObjectPropertyDisplayConfig ; #local:projectUsesMaterialEntityConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; # :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "uses equipment or instrument" ; # :displayName "uses specimen, equipment, instrument, organism, reagent, or software" ;
vitro:displayRankAnnot 85; # vitro:displayRankAnnot 85;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; # vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; # vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; # vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
vitro:selectFromExistingAnnot "true"^^xsd:boolean ; # vitro:selectFromExistingAnnot "true"^^xsd:boolean ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> . # :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:materialEntityUsedByProjectContext a :ConfigContext ; #local:materialEntityUsedByProjectContext a :ConfigContext ;
:hasConfiguration local:MaterialEntityUsedByProjectConfig ; # :hasConfiguration local:MaterialEntityUsedByProjectConfig ;
:configContextFor <http://purl.obolibrary.org/obo/ERO_0000070> ; # :configContextFor <http://purl.obolibrary.org/obo/ERO_0000070> ;
:qualifiedByDomain <http://purl.obolibrary.org/obo/BFO_0000040> ; ## Material Entity # :qualifiedByDomain <http://purl.obolibrary.org/obo/BFO_0000040> ; ## Material Entity
:qualifiedBy vivo:Project . # :qualifiedBy vivo:Project .
local:materialEntityUsedByProjectConfig a :ObjectPropertyDisplayConfig ; #local:materialEntityUsedByProjectConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; # :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
:displayName "used by project" ; # :displayName "used by project" ;
vitro:displayRankAnnot 85; # vitro:displayRankAnnot 85;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; # vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; # vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; # vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
vitro:selectFromExistingAnnot "true"^^xsd:boolean ; # vitro:selectFromExistingAnnot "true"^^xsd:boolean ;
:propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> . # :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
local:facilityLocationOfEquipmentContext a :ConfigContext ; local:facilityLocationOfEquipmentContext a :ConfigContext ;
:hasConfiguration local:facilityLocationOfEquipmentConfig ; :hasConfiguration local:facilityLocationOfEquipmentConfig ;

130
rdf/tbox/firsttime/initialTBoxAnnotations.n3
View file

@ -1625,7 +1625,7 @@ vivo:Contract
"-1"^^xsd:int ; "-1"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGroupresearch> ; vitro:inClassGroup <http://vivoweb.org/ontology#vitroClassGrouppublications> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> . <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> .
@ -1845,22 +1845,22 @@ bibo:doi
bibo:accepted bibo:accepted
rdfs:label "accepted"@en-US . rdfs:label "accepted"@en-US .
obo:ERO_0000070 obo:ERO_0000070 ## inverse of ERO_0000031
rdfs:label "used by"@en-US ; rdfs:label "used by"@en-US ;
vitro:displayLimitAnnot # vitro:displayLimitAnnot
"2"^^xsd:int ; # "2"^^xsd:int ;
vitro:displayRankAnnot # vitro:displayRankAnnot
"15"^^xsd:int ; # "15"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
vitro:inPropertyGroupAnnot # vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> ; # <http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:selectFromExistingAnnot # vitro:selectFromExistingAnnot
"true"^^xsd:boolean ; # "true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot # vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean . # "true"^^xsd:boolean .
vcard:Email vcard:Email
rdfs:label "Email"@en-US . rdfs:label "Email"@en-US .
@ -3952,20 +3952,20 @@ obo:ERO_0000572
obo:RO_0001000 obo:RO_0001000
rdfs:label "derives from"@en-US ; rdfs:label "derives from"@en-US ;
## note -- has a "some values from" restriction on Organism <http://purl.obolibrary.org/obo/OBI_0100026> ## note -- has a "some values from" restriction on Organism <http://purl.obolibrary.org/obo/OBI_0100026>
vitro:displayLimitAnnot # vitro:displayLimitAnnot
"5"^^xsd:int ; # "5"^^xsd:int ;
vitro:displayRankAnnot # vitro:displayRankAnnot
"50"^^xsd:int ; # "50"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
vitro:inPropertyGroupAnnot # vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> ; # <http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:selectFromExistingAnnot # vitro:selectFromExistingAnnot
"true"^^xsd:boolean ; # "true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot # vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean . # "true"^^xsd:boolean .
bibo:gtin14 bibo:gtin14
@ -4023,7 +4023,17 @@ vcard:Fax
rdfs:label "Fax"@en-US . rdfs:label "Fax"@en-US .
obo:ERO_0001521 obo:ERO_0001521
rdfs:label "human study performed by"@en-US . rdfs:label "performed by organization"@en-US ;
vitro:displayRankAnnot
"20"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
vivo:nihmsid vivo:nihmsid
rdfs:label "NIH Manuscript Submission System ID"@en-US ; rdfs:label "NIH Manuscript Submission System ID"@en-US ;
@ -4681,22 +4691,22 @@ vcard:hasLanguage
vcard:hasURL vcard:hasURL
rdfs:label "has URL"@en-US . rdfs:label "has URL"@en-US .
obo:ERO_0000482 obo:ERO_0000482 # deprecated
rdfs:label "uses software"@en-US ; rdfs:label "uses software"@en-US ;
vitro:displayLimitAnnot # vitro:displayLimitAnnot
"5"^^xsd:int ; # "5"^^xsd:int ;
vitro:displayRankAnnot # vitro:displayRankAnnot
"92"^^xsd:int ; # "92"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
vitro:selectFromExistingAnnot # vitro:selectFromExistingAnnot
"true"^^xsd:boolean ; # "true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot # vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean ; # "true"^^xsd:boolean ;
vitro:inPropertyGroupAnnot # vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> . # <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
vivo:ResearchProposal vivo:ResearchProposal
rdfs:label "Research Proposal"@en-US ; rdfs:label "Research Proposal"@en-US ;
@ -6099,20 +6109,20 @@ vcard:Muse
obo:ERO_0000034 obo:ERO_0000034
rdfs:label "manufacturer"@en-US ; rdfs:label "manufacturer"@en-US ;
vitro:displayLimitAnnot # vitro:displayLimitAnnot
"2"^^xsd:int ; # "2"^^xsd:int ;
vitro:displayRankAnnot # vitro:displayRankAnnot
"73"^^xsd:int ; # "73"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ; <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> .
vitro:inPropertyGroupAnnot # vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> ; # <http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:selectFromExistingAnnot # vitro:selectFromExistingAnnot
"true"^^xsd:boolean ; # "true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot # vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean . # "true"^^xsd:boolean .
geo:area geo:area
@ -6470,7 +6480,21 @@ vcard:hasRelated
rdfs:label "has related"@en-US . rdfs:label "has related"@en-US .
obo:ERO_0000424 obo:ERO_0000424
rdfs:label "has study population"@en-US . rdfs:label "has study population"@en-US ;
vitro:displayLimitAnnot
"5"^^xsd:int ;
vitro:displayRankAnnot
"15"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean .
obo:ARG_2000079 obo:ARG_2000079
rdfs:label "American Board of Pathology"@en-US . rdfs:label "American Board of Pathology"@en-US .