diff --git a/productMods/js/homePageUtils.js b/productMods/js/homePageUtils.js index 1341292b..7c5410ba 100644 --- a/productMods/js/homePageUtils.js +++ b/productMods/js/homePageUtils.js @@ -60,7 +60,7 @@ $(document).ready(function(){ getFacultyMembers(); } else { - individualList = "

  • " + i18nStrings.noFacultyFound + "

    • "; + individualList = "

  • " + i18nStrings.noFacultyFound + "

    • "; $('div#tempSpacing').hide(); $('div#research-faculty-mbrs ul#facultyThumbs').append(individualList); } @@ -95,7 +95,7 @@ $(document).ready(function(){ }); } else { - individualList = "

  • " + i18nStrings.noFacultyFound + "

    • "; + individualList = "

  • " + i18nStrings.noFacultyFound + "

    • "; $('div#tempSpacing').hide(); $('div#research-faculty-mbrs ul#facultyThumbs').append(individualList); $('div#research-faculty-mbrs ul#facultyThumbs').css("padding", "1.0em 0 0.825em 0.75em"); diff --git a/productMods/templates/freemarker/lib/lib-home-page.ftl b/productMods/templates/freemarker/lib/lib-home-page.ftl index 9d46e731..61fddcb0 100644 --- a/productMods/templates/freemarker/lib/lib-home-page.ftl +++ b/productMods/templates/freemarker/lib/lib-home-page.ftl @@ -141,7 +141,7 @@ <#if !foundClassGroup> -

  • ${i18n().no_research_content_found}

    • +

  • ${i18n().no_research_content_found}

    • 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/filegraph/object-properties.owl b/rdf/tbox/filegraph/object-properties.owl index 6820cc96..f9037fbf 100644 --- a/rdf/tbox/filegraph/object-properties.owl +++ b/rdf/tbox/filegraph/object-properties.owl @@ -351,61 +351,6 @@ - - - - - Imaging processing software that requires .jpg format files for analysis. - PERSON: Carlo Torniai - PERSON: Melissa Haendel - Software data input format. - has input format - - - - - - - - - - - - - - - - - - - Microsoft Excel arranges and saves data in .xlsx format. - PERSON: Carlo Torniai - PERSON: Melissa Haendel - Software data output type. - has output format - - - - - - - - - - - - ImageJ software measures characteristics of digital images. - PERSON: Carlo Torniai - PERSON: Melissa Haendel - Transformation objective of the software. - achieves objective - - - - - - - @@ -631,24 +576,6 @@ - - - - - PERSON: Melissa Haendel - PERSON: Melissa Haendel - Paraffin embedding of tissue. - Technique used to prepare the biological specimen. - has preparation technique - - - - - - - - - @@ -699,48 +626,6 @@ - - - - - - - - - - - - - - - - Is a legal instrument (usually by way of contract law) governing the usage or redistribution of software. - PERSON: Scott Hoffmann - http://en.wikipedia.org/wiki/Software_license - - - - - - - - - - - - Links an objective to a software operation whise execution achieves the objective. Is different from OBI:objective_achieved_by which links an objective to the process that achieves it. - PERSON:Matthew Brush - PERSON:Matthew Brush - a relation between a software objective (data transformation objective) and an operation whose execution in a software tool achieves the objective - software relation expanding to something like: - -objective_achieved_by some ('software/algorithm execution' and (specified_by some 'data processing operation')) - - - - - - @@ -1935,14 +1820,6 @@ there is a measurement process p that has specified output m, a measurement datu - - - - - - - - diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index 558ff364..9affa1b9 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -556,13 +556,6 @@ geo:territory vcard:OrganizationName rdfs:label "Organization Name"@en-US . -obo:ERO_0000076 - rdfs:label "has input type"@en-US ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . - vivo:researchAreaOf rdfs:label "research area of"@en-US ; vitro:displayLimitAnnot @@ -705,13 +698,6 @@ obo:IAO_0000142 vivo:submitted rdfs:label "submitted"@en-US . -obo:ERO_0000077 - rdfs:label "has output type"@en-US ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . - bibo:Issue rdfs:label "Issue"@en-US ; vitro:displayLimitAnnot @@ -797,9 +783,6 @@ vitro:moniker vitro:prohibitedFromUpdateBelowRoleLevelAnnot . -obo:ERO_0000078 - rdfs:label "achieves objective"@en-US . - geo:codeFAOSTAT rdfs:label "codeFAOSTAT"@en-US ; vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -1008,9 +991,6 @@ vivo:Continent vitro:prohibitedFromUpdateBelowRoleLevelAnnot . -obo:ERO_0001908 - rdfs:label "objective achieved by operation"@en-US . - geo:nameOfficialRU rdfs:label "nameOfficialRU"@en-US ; vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -1372,9 +1352,6 @@ vivo:PopulatedPlace vitro:prohibitedFromUpdateBelowRoleLevelAnnot . -obo:ERO_0001811 - rdfs:label "has format"@en-US . - vivo:FacultyAdministrativePosition rdfs:label "Faculty Administrative Position"@en-US ; vitro:displayLimitAnnot @@ -1648,7 +1625,7 @@ vivo:Contract "-1"^^xsd:int ; vitro:hiddenFromDisplayBelowRoleLevelAnnot ; - vitro:inClassGroup ; + vitro:inClassGroup ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot . @@ -1868,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 . @@ -2658,23 +2635,6 @@ bibo:Website vitro:prohibitedFromUpdateBelowRoleLevelAnnot . -obo:ERO_0001057 - rdfs:label "has preparation technique"@en-US ; - vitro:displayLimitAnnot - "2"^^xsd:int ; - vitro:displayRankAnnot - "53"^^xsd:int ; - vitro:hiddenFromDisplayBelowRoleLevelAnnot - ; - vitro:prohibitedFromUpdateBelowRoleLevelAnnot - ; - vitro:inPropertyGroupAnnot - ; - vitro:selectFromExistingAnnot - "true"^^xsd:boolean ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean . - obo:BFO_0000003 rdfs:label "Occurrent" . @@ -3992,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 @@ -4063,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 ; @@ -4225,9 +4195,6 @@ vivo:Screenplay vitro:prohibitedFromUpdateBelowRoleLevelAnnot . -obo:ERO_0001824 - rdfs:label "has software license"@en-US . - geo:nameOfficialAR rdfs:label "nameOfficialAR"@en-US ; vitro:hiddenFromDisplayBelowRoleLevelAnnot @@ -4724,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 ; @@ -6142,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 @@ -6513,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 .