diff --git a/productMods/WEB-INF/resources/reasoner_plugins.txt b/productMods/WEB-INF/resources/reasoner_plugins.txt index e69de29b..2eb81e36 100644 --- a/productMods/WEB-INF/resources/reasoner_plugins.txt +++ b/productMods/WEB-INF/resources/reasoner_plugins.txt @@ -0,0 +1 @@ +edu.cornell.mannlib.vitro.webapp.reasoner.plugin.DisableSameAs diff --git a/productMods/css/individual/individual-2column-view.css b/productMods/css/individual/individual-2column-view.css index 71f2b279..081991d6 100644 --- a/productMods/css/individual/individual-2column-view.css +++ b/productMods/css/individual/individual-2column-view.css @@ -290,6 +290,7 @@ a#manageLabels { border-bottom: 1px solid #DDE4E3; padding-bottom:1px; margin-bottom:8px; + padding-top:18px; } #individual-info div#contactContainer h3{ color:#8aa149; diff --git a/productMods/js/homePageMaps.js b/productMods/js/homePageMaps.js index 05885095..01908fd3 100644 --- a/productMods/js/homePageMaps.js +++ b/productMods/js/homePageMaps.js @@ -18,14 +18,14 @@ $(document).ready(function(){ buildGlobalMap(); $(this).addClass("selected"); $('a#countryLink').removeClass("selected"); - $('a#nyLink').removeClass("selected"); + $('a#localLink').removeClass("selected"); }); $('a#countryLink').click(function() { buildCountryMap(); $(this).addClass("selected"); $('a#globalLink').removeClass("selected"); - $('a#nyLink').removeClass("selected"); + $('a#localLink').removeClass("selected"); }); $('a#localLink').click(function() { @@ -369,10 +369,11 @@ $(document).ready(function(){ var html = i18nStrings.currentlyNoResearchers; $('section#home-geo-focus div#timeIndicatorGeo span').html(html); $('section#home-geo-focus').css("height","175px"); - $('section#home-geo-focus div#timeIndicator').css("margin-top","50px"); + $('section#home-geo-focus div#timeIndicatorGeo').css("margin-top","50px"); $('section#home-geo-focus div#mapGlobal').hide(); $('section#home-geo-focus div#mapCountry').hide(); $('section#home-geo-focus div#mapLocal').hide(); + $('section#home-geo-focus div#mapControls').hide(); } else { $.each(results, function() { 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 783105ff..2de768a2 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl @@ -96,6 +96,9 @@ <#include "individual-researchAreas.ftl"> + + <#include "individual-geographicFocus.ftl"> +
diff --git a/productMods/templates/freemarker/body/menupage/testMenuEdit.ftl b/productMods/templates/freemarker/body/menupage/testMenuEdit.ftl deleted file mode 100644 index e4a24d6a..00000000 --- a/productMods/templates/freemarker/body/menupage/testMenuEdit.ftl +++ /dev/null @@ -1,27 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -<#-- -Menu Edit Form -Associated with generator: -edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.MenuEditingFormGenerator ---> - - - -

${editConfiguration.formTitle}

-<#assign pageTitle = editConfiguration.literalValues["title"].getString() /> -
- - - - - - -
- -
- -
- - -<@dumpAll/> \ No newline at end of file diff --git a/rdf/tbox/filegraph/data-properties.owl b/rdf/tbox/filegraph/data-properties.owl index 5799c1e7..b7eaf46e 100644 --- a/rdf/tbox/filegraph/data-properties.owl +++ b/rdf/tbox/filegraph/data-properties.owl @@ -1132,17 +1132,8 @@ - - - - - - - - - @@ -1259,30 +1250,6 @@ - - - - - PERSON: Melissa Haendel - PERSON: Melissa Haendel - The accession number for a gene. - Unique identifier of a biological polymer sequence (DNA, RNA, protein) when it is submitted to a sequence database. - accession number - - - - - - - - - - - - - - - diff --git a/rdf/tbox/filegraph/research-resource.owl b/rdf/tbox/filegraph/research-resource.owl index 5d90bd3a..997bd64d 100644 --- a/rdf/tbox/filegraph/research-resource.owl +++ b/rdf/tbox/filegraph/research-resource.owl @@ -153,6 +153,7 @@ + @@ -491,4 +492,21 @@ + + + + + + GROUP: OBI Biomaterial Branch + A material entity that is an individual living system, such as animal, plant, bacteria or virus, that is capable of replicating or reproducing, growth and maintenance in the right environment. An organism may be unicellular or made up, like humans, of many billions of cells divided into specialized tissues and organs. + WEB: http://en.wikipedia.org/wiki/Organism + animal + fungus + organism + plant + virus + + + + diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 index 139583c1..5121948c 100644 --- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 +++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3 @@ -1774,7 +1774,18 @@ vivo:Librarian . obo:ERO_0000050 - rdfs:label "model number"@en-US . + rdfs:label "model number"@en-US ; + vitro:displayLimitAnnot + "2"^^xsd:int ; + vitro:displayRankAnnot + "76"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + . + geo:nameCurrencyFR rdfs:label "nameCurrencyFR"@en-US ; @@ -1858,7 +1869,21 @@ bibo:accepted rdfs:label "accepted"@en-US . obo:ERO_0000070 - rdfs:label "used by"@en-US . + rdfs:label "used by"@en-US ; + 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 . vcard:Email rdfs:label "Email"@en-US . @@ -2517,8 +2542,18 @@ bibo:identifier "Unique identifier of a document or collection. This data property is not seen or updated by anyone."^^xsd:string . obo:ERO_0000044 - rdfs:label "has inventory number"@en-US . - + rdfs:label "inventory number"@en-US ; + vitro:displayLimitAnnot + "2"^^xsd:int ; + vitro:displayRankAnnot + "70"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + . + obo:ERO_0001261 rdfs:label "Analysis Service"@en-US ; vitro:inClassGroup . @@ -2624,7 +2659,21 @@ bibo:Website . obo:ERO_0001057 - rdfs:label "has preparation technique"@en-US . + 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" . @@ -2693,10 +2742,6 @@ obo:ERO_0000045 ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot ; - vitro:selectFromExistingAnnot - "true"^^xsd:boolean ; - vitro:offerCreateNewOptionAnnot - "true"^^xsd:boolean ; vitro:inPropertyGroupAnnot . @@ -3945,7 +3990,23 @@ obo:ERO_0000572 rdfs:label "used to study"@en-US . obo:RO_0001000 - rdfs:label "derives from"@en-US . + 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:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . + bibo:gtin14 rdfs:label "Global Trade Item Number (GTIN-14)"@en-US ; @@ -5673,7 +5734,22 @@ geo:nameShortEN . obo:RO_0003001 - rdfs:label "produced by"@en-US . + rdfs:label "produced by"@en-US ; + vitro:displayLimitAnnot + "2"^^xsd:int ; + vitro:displayRankAnnot + "60"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . + rdfs:label "has global count source"@en-US ; @@ -5779,7 +5855,22 @@ vivo:hasSuccessorOrganization "true"^^xsd:boolean . obo:RO_0003000 - rdfs:label "produces"@en-US . + rdfs:label "produces"@en-US ; + vitro:displayLimitAnnot + "2"^^xsd:int ; + vitro:displayRankAnnot + "63"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . + vivo:prerequisiteFor rdfs:label "prerequisite for"@en-US ; @@ -6050,7 +6141,22 @@ vcard:Muse rdfs:label "Muse"@en-US . obo:ERO_0000034 - rdfs:label "has manufacturer"@en-US . + rdfs:label "manufacturer"@en-US ; + 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 . + geo:area rdfs:label "Area"@en-US ; @@ -6461,7 +6567,22 @@ vivo:distributes "true"^^xsd:boolean . obo:OBI_0000304 - rdfs:label "is manufactured by"@en-US . + rdfs:label "manufactured by"@en-US ; + 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 . + vcard:hasFormattedName rdfs:label "has formatted name"@en-US . @@ -7160,7 +7281,22 @@ bibo:Statute . obo:ERO_0000405 - rdfs:label "has accession number"@en-US . + rdfs:label "has accession number"@en-US ; + vitro:displayLimitAnnot + "2"^^xsd:int ; + vitro:displayRankAnnot + "10"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . + vivo:fundingVehicleFor rdfs:label "provides funding for"@en-US ; @@ -7241,7 +7377,21 @@ vivo:PostdoctoralTraining . obo:ERO_0000918 - rdfs:label "related research project"@en-US . + rdfs:label "related research project"@en-US ; + vitro:displayLimitAnnot + "2"^^xsd:int ; + vitro:displayRankAnnot + "20"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . obo:OBI_0000417 rdfs:label "achieves planned objective"@en-US ; @@ -7303,7 +7453,21 @@ vcard:sound rdfs:label "sound"@en-US . obo:ERO_0000543 - rdfs:label "related technique"@en-US . + rdfs:label "related technique"@en-US ; + vitro:displayLimitAnnot + "5"^^xsd:int ; + vitro:displayRankAnnot + "80"^^xsd:int ; + vitro:hiddenFromDisplayBelowRoleLevelAnnot + ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot + ; + vitro:inPropertyGroupAnnot + ; + vitro:selectFromExistingAnnot + "true"^^xsd:boolean ; + vitro:offerCreateNewOptionAnnot + "true"^^xsd:boolean . bibo:numPages rdfs:label "number of pages"@en-US ; @@ -7435,7 +7599,7 @@ geo:GDPUnit vitro:hiddenFromDisplayBelowRoleLevelAnnot ; vitro:prohibitedFromUpdateBelowRoleLevelAnnot - . + . bibo:edition rdfs:label "edition"@en-US ; @@ -7640,3 +7804,11 @@ vivo:hasEquipment ; vitro:selectFromExistingAnnot "true"^^xsd:boolean . + + + rdfs:label "Organism"@en-US ; + vitro:inClassGroup ; ## classgroup label is research + vitro:displayRankAnnot + "1"^^xsd:int . + + diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java index 79eb741f..8a70e00e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddResearcherRoleToPersonGenerator.java @@ -1,51 +1,53 @@ -/* $This file is distributed under the terms of the license in /doc/license.txt$ */ - -package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; - -import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions; -import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions; - -public class AddResearcherRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator { - - private static String template = "addResearcherRoleToPerson.ftl"; - - @Override - String getTemplate() { - return template; - } - - @Override - public String getRoleType() { - return "http://vivoweb.org/ontology/core#ResearcherRole"; - } - - /** Researcher role involves hard-coded options for the "right side" of the role or activity. */ - @Override - FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception { - return new ConstantFieldOptions( - "", "Select one", - "http://vivoweb.org/ontology/core#Grant", "Grant", - "http://vivoweb.org/ontology/core#Project", "Project"); - } - - @Override - boolean isShowRoleLabelField() { return true; } - /* - * Use the methods below to change the date/time precision in the - * custom form associated with this generator. When not used, the - * precision will be YEAR. The other precisons are MONTH, DAY, HOUR, - * MINUTE, TIME and NONE. - */ -/* - public String getStartDatePrecision() { - String precision = VitroVocabulary.Precision.MONTH.uri(); - return precision; - } - - public String getEndDatePrecision() { - String precision = VitroVocabulary.Precision.DAY.uri(); - return precision; - } -*/ -} +/* $This file is distributed under the terms of the license in /doc/license.txt$ */ + +package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators; + +import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions; +import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions; + +public class AddResearcherRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator { + + private static String template = "addResearcherRoleToPerson.ftl"; + + @Override + String getTemplate() { + return template; + } + + @Override + public String getRoleType() { + return "http://vivoweb.org/ontology/core#ResearcherRole"; + } + + /** Researcher role involves hard-coded options for the "right side" of the role or activity. */ + @Override + FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception { + return new ConstantFieldOptions( + "", "Select one", + "http://vivoweb.org/ontology/core#Grant", "Grant", + "http://purl.obolibrary.org/obo/ERO_0000015", "Human Study", + "http://vivoweb.org/ontology/core#Project", "Project", + "http://purl.obolibrary.org/obo/ERO_0000014", "Research Project"); + } + + @Override + boolean isShowRoleLabelField() { return true; } + /* + * Use the methods below to change the date/time precision in the + * custom form associated with this generator. When not used, the + * precision will be YEAR. The other precisons are MONTH, DAY, HOUR, + * MINUTE, TIME and NONE. + */ +/* + public String getStartDatePrecision() { + String precision = VitroVocabulary.Precision.MONTH.uri(); + return precision; + } + + public String getEndDatePrecision() { + String precision = VitroVocabulary.Precision.DAY.uri(); + return precision; + } +*/ +}