diff --git a/config/applicationSetup.n3 b/config/applicationSetup.n3 index 8f7ccf8e..46ee736c 100644 --- a/config/applicationSetup.n3 +++ b/config/applicationSetup.n3 @@ -3,33 +3,38 @@ :application a , ; - :hasSearchEngine :searchEngineWrapper ; - :hasImageProcessor :imageProcessor ; - :hasFileStorage :fileStorage ; - :hasContentTripleSource :contentTripleSource ; - :hasConfigurationTripleSource :configurationTripleSource . + :hasSearchEngine :instrumentedSearchEngineWrapper ; + :hasImageProcessor :jaiImageProcessor ; + :hasFileStorage :ptiFileStorage ; + :hasContentTripleSource :sdbContentTripleSource ; + :hasConfigurationTripleSource :tdbConfigurationTripleSource ; + :hasTBoxReasonerModule :pelletTBoxReasonerModule . -:imageProcessor +:jaiImageProcessor a , . -:fileStorage +:ptiFileStorage a , . -:searchEngineWrapper +:instrumentedSearchEngineWrapper a , ; - :wraps :searchEngine . + :wraps :solrSearchEngine . -:searchEngine +:solrSearchEngine a , . -:contentTripleSource +:sdbContentTripleSource a , . -:configurationTripleSource +:tdbConfigurationTripleSource a , - . \ No newline at end of file + . + +:pelletTBoxReasonerModule + a , + . \ No newline at end of file diff --git a/productMods/WEB-INF/resources/startup_listeners.txt b/productMods/WEB-INF/resources/startup_listeners.txt index 9514f2bf..0e84a98b 100644 --- a/productMods/WEB-INF/resources/startup_listeners.txt +++ b/productMods/WEB-INF/resources/startup_listeners.txt @@ -37,6 +37,7 @@ edu.cornell.mannlib.vitro.webapp.servlet.setup.FileGraphSetup # Invokes process to perform updates to align with ontology changes if needed --> edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase +edu.cornell.mannlib.vitro.webapp.application.ApplicationImpl$ReasonersSetup edu.cornell.mannlib.vitro.webapp.servlet.setup.SimpleReasonerSetup # Must run after JenaDataSourceSetup diff --git a/productMods/js/homePageUtils.js b/productMods/js/homePageUtils.js index e159ed8f..09cad684 100644 --- a/productMods/js/homePageUtils.js +++ b/productMods/js/homePageUtils.js @@ -134,7 +134,7 @@ $(document).ready(function(){ //Check to see if this index hasn't already been employed if(!indexFound) { //if this index hasn't already been employed then utilize it - html += "
  • " + academicDepartments[index].name + "
    • "; //add this index to the set of already used indices @@ -146,7 +146,7 @@ $(document).ready(function(){ } else { for ( var i=0;i" + academicDepartments[i].name + ""; } 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 8767a3d5..38560fa2 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person-2column.ftl @@ -23,7 +23,7 @@ <#assign visRequestingTemplate = "foaf-person-2column"> <#--add the VIVO-ORCID interface --> <#include "individual-orcidInterface.ftl"> -
    +
    <#-- Image --> <#assign individualImage> 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 558d6aa8..b6ef6911 100644 --- a/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl +++ b/productMods/templates/freemarker/body/individual/individual--foaf-person-quickview.ftl @@ -51,7 +51,7 @@ -
    +
    style="width:45%" >
    <#if relatedSubject??> diff --git a/productMods/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl b/productMods/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl index 19540597..8745c0cc 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-contactInfo-2column.ftl @@ -39,7 +39,7 @@
      <#list phone.statements as statement>
    • style="padding-left:10px;"> - ${statement.number!} + ${statement.number!} <@p.editingLinks "${phone.localName}" "${phone.name}" statement editable phone.rangeUri />
      • @@ -65,11 +65,11 @@ <#list email.statements as statement>
    • style="padding-left:10px;"> - + <@p.editingLinks "${email.localName}" "${email.name}" statement editable email.rangeUri />
    - \ No newline at end of file + diff --git a/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl b/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl index 0f990bb2..4399ea5c 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-contactInfo.ftl @@ -24,7 +24,7 @@
      style="list-style:none;margin-left:0;"> <#list phone.statements as statement>
    • - ${statement.number!} + ${statement.number!} <@p.editingLinks "${phone.localName}" "${phone.name}" statement editable phone.rangeUri />
      • @@ -46,7 +46,7 @@
        style="list-style:none;margin-left:0;"> <#list email.statements as statement>
      • - + <@p.editingLinks "${email.localName}" "${email.name}" statement editable email.rangeUri />
        • diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl index e6aebc47..d3ad9014 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl @@ -8,15 +8,21 @@ <#import "lib-sequence.ftl" as s> <#import "lib-datetime.ftl" as dt> + <@showPosition statement /> <#-- Use a macro to keep variable assignments local; otherwise the values carry over to the next statement --> <#macro showPosition statement> + <#local posTitle> + ${statement.positionTitle!statement.hrJobTitle!} + <#local linkedIndividual> <#if statement.org??> - ${statement.orgName} + + ${statement.orgName} + <#else> <#-- This shouldn't happen, but we must provide for it --> ${i18n().missing_organization} @@ -26,10 +32,12 @@ For now, we are only displaying the parent in the list view. --> <#local middleOrganization> <#if statement.middleOrg??> - ${statement.middleOrgName!} + + ${statement.middleOrgName!} + - <@s.join [ statement.positionTitle!statement.hrJobTitle!, linkedIndividual, middleOrganization! ]/> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> + <@s.join [ posTitle, linkedIndividual, middleOrganization! ]/> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" /> - \ No newline at end of file + diff --git a/productMods/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl index e0e97118..4e5a2e0f 100644 --- a/productMods/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl +++ b/productMods/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl @@ -20,7 +20,7 @@ roleExamples--> <#--Variable assignments for Add Clinical Role To Person--> <#assign roleDescriptor = "${i18n().collection_series_editor_role}" /> <#assign typeSelectorLabel = "${i18n().editor_role_in}" /> -<#assign genericLabel = "Collection" /> +<#assign genericLabel = "Collection or Series" /> <#assign acTypes = "{activity: 'http://purl.org/ontology/bibo/Collection'}" /> diff --git a/productMods/templates/freemarker/lib/lib-home-page.ftl b/productMods/templates/freemarker/lib/lib-home-page.ftl index 25e119b4..3d9aef0f 100644 --- a/productMods/templates/freemarker/lib/lib-home-page.ftl +++ b/productMods/templates/freemarker/lib/lib-home-page.ftl @@ -39,7 +39,7 @@ <#if (class.uri?contains("FacultyMember")) > <#assign foundClassGroup = true /> <#if (class.individualCount > 0) > - + <#else> @@ -165,8 +165,7 @@ var academicDepartments = [ <#list academicDeptDG as resultRow> <#assign uri = resultRow["theURI"] /> <#assign label = resultRow["name"] /> - <#assign localName = uri?substring(uri?last_index_of("/")) /> - {"uri": "${localName}", "name": "${label}"}<#if (resultRow_has_next)>, + {"uri": "${uri?url}", "name": "${label}"}<#if (resultRow_has_next)>, ]; diff --git a/rdf/display/firsttime/PropertyConfig.n3 b/rdf/display/firsttime/PropertyConfig.n3 index ad396f7a..7de14ffe 100644 --- a/rdf/display/firsttime/PropertyConfig.n3 +++ b/rdf/display/firsttime/PropertyConfig.n3 @@ -1010,6 +1010,54 @@ local:webpageInfoConfig a :ObjectPropertyDisplayConfig ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator"^^ ; :propertyGroup . +local:webpageSoftwareContext a :ConfigContext ; + :hasConfiguration local:webpageSoftwareConfig ; + :configContextFor ; + :qualifiedByDomain ; + :qualifiedByRoot ; + :qualifiedBy . + +local:webpageSoftwareConfig a :ObjectPropertyDisplayConfig ; + :listViewConfigFile "listViewConfig-webpage.xml"^^xsd:string ; + :displayName "webpage" ; + vitro:displayRankAnnot 40; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator"^^ ; + :propertyGroup . + +local:webpageFacilityContext a :ConfigContext ; + :hasConfiguration local:webpageFacilityConfig ; + :configContextFor ; + :qualifiedByDomain ; + :qualifiedByRoot ; + :qualifiedBy . + +local:webpageFacilityConfig a :ObjectPropertyDisplayConfig ; + :listViewConfigFile "listViewConfig-webpage.xml"^^xsd:string ; + :displayName "webpage" ; + vitro:displayRankAnnot 40; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator"^^ ; + :propertyGroup . + +local:webpageProjectContext a :ConfigContext ; + :hasConfiguration local:webpageProjectConfig ; + :configContextFor ; + :qualifiedByDomain ; + :qualifiedByRoot ; + :qualifiedBy . + +local:webpageProjectConfig a :ObjectPropertyDisplayConfig ; + :listViewConfigFile "listViewConfig-webpage.xml"^^xsd:string ; + :displayName "webpage" ; + vitro:displayRankAnnot 40; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator"^^ ; + :propertyGroup . + local:webpageEventContext a :ConfigContext ; :hasConfiguration local:webpageEventConfig ; :configContextFor ; @@ -1027,6 +1075,22 @@ local:webpageEventConfig a :ObjectPropertyDisplayConfig ; vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator"^^ ; :propertyGroup . +local:webpageEventSeriesContext a :ConfigContext ; + :hasConfiguration local:webpageEventSeriesConfig ; + :configContextFor ; + :qualifiedByDomain ; + :qualifiedByRoot ; + :qualifiedBy . + +local:webpageEventSeriesConfig a :ObjectPropertyDisplayConfig ; + :listViewConfigFile "listViewConfig-webpage.xml"^^xsd:string ; + :displayName "webpage" ; + vitro:displayRankAnnot 40; + vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ; + vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ; + vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator"^^ ; + :propertyGroup . + local:fullNameContext a :ConfigContext ; :hasConfiguration local:fullNameConfig ; :configContextFor ; diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java index f2eb0e3d..36721a5e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java +++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorRoleToPersonGenerator.java @@ -53,7 +53,7 @@ public class AddEditorRoleToPersonGenerator extends AddRoleToPersonTwoStageGener /** Do not show the role label field for the AddEditorRoleToPerson form */ @Override - boolean isShowRoleLabelField() { return false; } + boolean isShowRoleLabelField() { return true; } /* * Use the methods below to change the date/time precision in the diff --git a/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java b/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java index 8c50f025..1332876e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java +++ b/src/edu/cornell/mannlib/vitro/webapp/web/templatemodels/individual/IndividualTemplateModel.java @@ -37,6 +37,7 @@ public class IndividualTemplateModel extends BaseIndividualTemplateModel { private static final String CREDENTIAL_CLASS = "http://vivoweb.org/ontology/core#Credential"; private static final String DTP_CLASS = "http://vivoweb.org/ontology/core#DateTimeValuePrecision"; private static final String ORGANIZATION_CLASS = FOAF + "Organization"; + private static final String EVENT_CLASS = "http://purl.org/NET/c4dm/event.owl#Event"; private static final String BASE_VISUALIZATION_URL = UrlBuilder.getUrl(Route.VISUALIZATION_SHORT.path()); @@ -79,6 +80,10 @@ public class IndividualTemplateModel extends BaseIndividualTemplateModel { return isVClass(ORGANIZATION_CLASS); } + public boolean event() { + return isVClass(EVENT_CLASS); + } + public String coAuthorVisUrl() { String url = BASE_VISUALIZATION_URL + "/" + VisualizationFrameworkConstants.COAUTHORSHIP_VIS_SHORT_URL + "/"; return getVisUrl(url); diff --git a/themes/wilma/templates/individual--foaf-person.ftl b/themes/wilma/templates/individual--foaf-person.ftl index 0799d650..53576623 100644 --- a/themes/wilma/templates/individual--foaf-person.ftl +++ b/themes/wilma/templates/individual--foaf-person.ftl @@ -24,7 +24,7 @@ <#--add the VIVO-ORCID interface --> <#include "individual-orcidInterface.ftl"> -
        +
        @@ -72,7 +72,7 @@ <#else>

        <#-- Label --> - <@p.label individual editable labelCount localesCount/> + <@p.label individual editable labelCount localesCount/> <#-- 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")!> @@ -84,7 +84,7 @@ <@p.verboseDisplay title /> <#list title.statements as statement> - ${statement.preferredTitle} + ${statement.preferredTitle} <@p.editingLinks "${title.localName}" "${title.name}" statement editable title.rangeUri />