diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl index 2de768a2..712f5b33 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl @@ -61,7 +61,7 @@ <@p.verboseDisplay title /> <#list title.statements as statement> - ${statement.preferredTitle} + ${statement.preferredTitle} <@p.editingLinks "${title.localName}" "${title.name}" statement editable title.rangeUri /> diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl index 4ac95fce..a5dbae08 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl @@ -69,7 +69,7 @@ <#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 /> - <#else> + <#elseif editable>

${title.name?capitalize!}

<@p.verboseDisplay title /> diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3 index 8c5b81d0..d96824b5 100644 --- a/rdf/display/everytime/PropertyConfig.n3 +++ b/rdf/display/everytime/PropertyConfig.n3 @@ -1323,38 +1323,39 @@ local:facilitySiteOfAgentConfig a :ObjectPropertyDisplayConfig ; vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; vitro:selectFromExistingAnnot "true"^^xsd:boolean ; :propertyGroup . - -local:projectUsesMaterialEntityContext a :ConfigContext ; - :hasConfiguration local:projectUsesMaterialEntityConfig ; - :configContextFor ; - :qualifiedByDomain vivo:Project ; - :qualifiedBy . ## Material Entity -local:projectUsesMaterialEntityConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "uses equipment or instrument" ; - vitro:displayRankAnnot 85; - vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; - vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; - vitro:selectFromExistingAnnot "true"^^xsd:boolean ; - :propertyGroup . - -local:materialEntityUsedByProjectContext a :ConfigContext ; - :hasConfiguration local:MaterialEntityUsedByProjectConfig ; - :configContextFor ; - :qualifiedByDomain ; ## Material Entity - :qualifiedBy vivo:Project . +# uses and used by need work -- apply to continuants and occurrents, and material entities as well as information content entities +#local:projectUsesMaterialEntityContext a :ConfigContext ; +# :hasConfiguration local:projectUsesMaterialEntityConfig ; +# :configContextFor ; +# :qualifiedByDomain vivo:Project ; +# :qualifiedBy . ## Material Entity -local:materialEntityUsedByProjectConfig a :ObjectPropertyDisplayConfig ; - :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; - :displayName "used by project" ; - vitro:displayRankAnnot 85; - vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; - vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; - vitro:selectFromExistingAnnot "true"^^xsd:boolean ; - :propertyGroup . +#local:projectUsesMaterialEntityConfig a :ObjectPropertyDisplayConfig ; +# :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; +# :displayName "uses specimen, equipment, instrument, organism, reagent, or software" ; +# vitro:displayRankAnnot 85; +# vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; +# vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; +# vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; +# vitro:selectFromExistingAnnot "true"^^xsd:boolean ; +# :propertyGroup . + +#local:materialEntityUsedByProjectContext a :ConfigContext ; +# :hasConfiguration local:MaterialEntityUsedByProjectConfig ; +# :configContextFor ; +# :qualifiedByDomain ; ## Material Entity +# :qualifiedBy vivo:Project . + +#local:materialEntityUsedByProjectConfig a :ObjectPropertyDisplayConfig ; +# :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ; +# :displayName "used by project" ; +# vitro:displayRankAnnot 85; +# vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; +# vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; +# vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; +# vitro:selectFromExistingAnnot "true"^^xsd:boolean ; +# :propertyGroup . local:facilityLocationOfEquipmentContext a :ConfigContext ; :hasConfiguration local:facilityLocationOfEquipmentConfig ; diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index 9ce05f6f..9affa1b9 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -1625,7 +1625,7 @@ vivo:Contract "-1"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; - vitro:inClassGroup ; + vitro:inClassGroup ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot . @@ -1845,22 +1845,22 @@ bibo:doi bibo:accepted rdfs:label "accepted"@en-US . -obo:ERO_0000070 +obo:ERO_0000070 ## inverse of ERO_0000031 rdfs:label "used by"@en-US ; - vitro:displayLimitAnnot - "2"^^xsd:int ; - vitro:displayRankAnnot - "15"^^xsd:int ; +# vitro:displayLimitAnnot +# "2"^^xsd:int ; +# vitro:displayRankAnnot +# "15"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; + ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot - ; - vitro:inPropertyGroupAnnot - ; - vitro:selectFromExistingAnnot - "true"^^xsd:boolean ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean . + . +# vitro:inPropertyGroupAnnot +# ; +# vitro:selectFromExistingAnnot +# "true"^^xsd:boolean ; +# vitro:offerCreateNewOptionAnnot +# "true"^^xsd:boolean . vcard:Email rdfs:label "Email"@en-US . @@ -3952,20 +3952,20 @@ obo:ERO_0000572 obo:RO_0001000 rdfs:label "derives from"@en-US ; ## note -- has a "some values from" restriction on Organism - vitro:displayLimitAnnot - "5"^^xsd:int ; - vitro:displayRankAnnot - "50"^^xsd:int ; +# vitro:displayLimitAnnot +# "5"^^xsd:int ; +# vitro:displayRankAnnot +# "50"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; + ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot - ; - vitro:inPropertyGroupAnnot - ; - vitro:selectFromExistingAnnot - "true"^^xsd:boolean ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean . + . +# vitro:inPropertyGroupAnnot +# ; +# vitro:selectFromExistingAnnot +# "true"^^xsd:boolean ; +# vitro:offerCreateNewOptionAnnot +# "true"^^xsd:boolean . bibo:gtin14 @@ -4023,7 +4023,17 @@ vcard:Fax rdfs:label "Fax"@en-US . 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 + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ; + vitro:inPropertyGroupAnnot + . + vivo:nihmsid rdfs:label "NIH Manuscript Submission System ID"@en-US ; @@ -4681,22 +4691,22 @@ vcard:hasLanguage vcard:hasURL rdfs:label "has URL"@en-US . -obo:ERO_0000482 +obo:ERO_0000482 # deprecated rdfs:label "uses software"@en-US ; - vitro:displayLimitAnnot - "5"^^xsd:int ; - vitro:displayRankAnnot - "92"^^xsd:int ; +# vitro:displayLimitAnnot +# "5"^^xsd:int ; +# vitro:displayRankAnnot +# "92"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; + ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot - ; - vitro:selectFromExistingAnnot - "true"^^xsd:boolean ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean ; - vitro:inPropertyGroupAnnot - . + . +# vitro:selectFromExistingAnnot +# "true"^^xsd:boolean ; +# vitro:offerCreateNewOptionAnnot +# "true"^^xsd:boolean ; +# vitro:inPropertyGroupAnnot +# . vivo:ResearchProposal rdfs:label "Research Proposal"@en-US ; @@ -6099,20 +6109,20 @@ vcard:Muse obo:ERO_0000034 rdfs:label "manufacturer"@en-US ; - vitro:displayLimitAnnot - "2"^^xsd:int ; - vitro:displayRankAnnot - "73"^^xsd:int ; +# vitro:displayLimitAnnot +# "2"^^xsd:int ; +# vitro:displayRankAnnot +# "73"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; + ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot - ; - vitro:inPropertyGroupAnnot - ; - vitro:selectFromExistingAnnot - "true"^^xsd:boolean ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean . + . +# vitro:inPropertyGroupAnnot +# ; +# vitro:selectFromExistingAnnot +# "true"^^xsd:boolean ; +# vitro:offerCreateNewOptionAnnot +# "true"^^xsd:boolean . geo:area @@ -6470,7 +6480,21 @@ vcard:hasRelated rdfs:label "has related"@en-US . 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 + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . obo:ARG_2000079 rdfs:label "American Board of Pathology"@en-US .