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-10-31 14:43:03 -04:00
commit e8b1d667e7
4 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
productMods/WEB-INF/resources/startup_listeners.txt
View file

@ -34,12 +34,11 @@ edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdatePermissionSetUris
edu.cornell.mannlib.vitro.webapp.servlet.setup.FileGraphSetup
edu.cornell.mannlib.vitro.webapp.servlet.setup.SimpleReasonerSetup
# Invokes process to perform updates to align with ontology changes if needed -->
# Needs to run before submodels are attached and Pellet is set up -->
edu.cornell.mannlib.vitro.webapp.servlet.setup.UpdateKnowledgeBase
edu.cornell.mannlib.vitro.webapp.servlet.setup.SimpleReasonerSetup
# Must run after JenaDataSourceSetup
edu.cornell.mannlib.vitro.webapp.servlet.setup.ThemeInfoSetup

3
productMods/templates/freemarker/edit/forms/addOrcidIdToPerson.ftl
View file

@ -58,7 +58,8 @@
<p>
<label for="orcidId">ORCID iD ${requiredHint}</label>
<input size="35" type="text" id="orcidId" name="orcidId" value="${orcidIdValue}" />
<input size="35" type="text" id="orcidIdDisplay" name="orcidIdDisplay" value="${orcidIdValue}" />
<input type="hidden" id="orcidId" name="orcidId" value="" />
</p>
<input type="hidden" id="editKey" name="editKey" value="${editKey}"/>

7
productMods/templates/freemarker/edit/forms/js/addOrcidIdToPersonUtils.js
View file

@ -12,6 +12,7 @@ var addOrcidIdToPersonUtils = {
this.form = $('#personHasOrcidId');
this.orcidId = $('#orcidId');
this.orcidIdDisplay = $('#orcidIdDisplay');
},
@ -25,10 +26,10 @@ var addOrcidIdToPersonUtils = {
buildOrcidIdURL: function() {
var orcidBase = "http://www.orcid.org/";
var orcidBase = "http://orcid.org/";
var orcidIdVal = "";
if ( this.orcidId.val().length > 0 ) {
orcidIdVal = orcidBase + this.orcidId.val();
if ( this.orcidIdDisplay.val().length > 0 ) {
orcidIdVal = orcidBase + this.orcidIdDisplay.val();
this.orcidId.val(orcidIdVal);
}
},

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

@ -432,7 +432,8 @@ local:mailingAddressContext a :ConfigContext ;
:hasConfiguration local:mailingAddressConfig ;
:configContextFor <http://purl.obolibrary.org/obo/ARG_2000028> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedBy <http://www.w3.org/2006/vcard/ns#Address> .
:qualifiedBy <http://www.w3.org/2006/vcard/ns#Address> ;
:qualifiedByRoot <http://www.w3.org/2006/vcard/ns#Kind> .
local:mailingAddressConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-mailingAddress.xml"^^xsd:string ;
@ -447,6 +448,7 @@ local:mailingAddressContext a :ConfigContext ;
:hasConfiguration local:mailingAddressConfig ;
:configContextFor <http://purl.obolibrary.org/obo/ARG_2000028> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Organization> ;
:qualifiedByRoot <http://www.w3.org/2006/vcard/ns#Kind> ;
:qualifiedBy <http://www.w3.org/2006/vcard/ns#Address> .
local:mailingAddressConfig a :ObjectPropertyDisplayConfig ;
@ -462,6 +464,7 @@ local:personTelephoneContext a :ConfigContext ;
:hasConfiguration local:personTelephoneConfig ;
:configContextFor <http://purl.obolibrary.org/obo/ARG_2000028> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedByRoot <http://www.w3.org/2006/vcard/ns#Kind> ;
:qualifiedBy <http://www.w3.org/2006/vcard/ns#Telephone> .
local:personTelephoneConfig a :ObjectPropertyDisplayConfig ;
@ -477,6 +480,7 @@ local:orgTelephoneContext a :ConfigContext ;
:hasConfiguration local:orgTelephoneConfig ;
:configContextFor <http://purl.obolibrary.org/obo/ARG_2000028> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Organization> ;
:qualifiedByRoot <http://www.w3.org/2006/vcard/ns#Kind> ;
:qualifiedBy <http://www.w3.org/2006/vcard/ns#Telephone> .
local:orgTelephoneConfig a :ObjectPropertyDisplayConfig ;
@ -492,6 +496,7 @@ local:personFaxContext a :ConfigContext ;
:hasConfiguration local:personFaxConfig ;
:configContextFor <http://purl.obolibrary.org/obo/ARG_2000028> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedByRoot <http://www.w3.org/2006/vcard/ns#Kind> ;
:qualifiedBy <http://www.w3.org/2006/vcard/ns#Fax> .
local:personFaxConfig a :ObjectPropertyDisplayConfig ;
@ -507,6 +512,7 @@ local:orgFaxContext a :ConfigContext ;
:hasConfiguration local:orgFaxConfig ;
:configContextFor <http://purl.obolibrary.org/obo/ARG_2000028> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Organization> ;
:qualifiedByRoot <http://www.w3.org/2006/vcard/ns#Kind> ;
:qualifiedBy <http://www.w3.org/2006/vcard/ns#Fax> .
local:orgFaxConfig a :ObjectPropertyDisplayConfig ;
@ -522,6 +528,7 @@ local:additionalEmailContext a :ConfigContext ;
:hasConfiguration local:additionalEmailConfig ;
:configContextFor <http://purl.obolibrary.org/obo/ARG_2000028> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedByRoot <http://www.w3.org/2006/vcard/ns#Kind> ;
:qualifiedBy <http://www.w3.org/2006/vcard/ns#Email> .
local:additionalEmailConfig a :ObjectPropertyDisplayConfig ;
@ -537,6 +544,7 @@ local:primaryEmailContext a :ConfigContext ;
:hasConfiguration local:primaryEmailConfig ;
:configContextFor <http://purl.obolibrary.org/obo/ARG_2000028> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedByRoot <http://www.w3.org/2006/vcard/ns#Kind> ;
:qualifiedBy <http://www.w3.org/2006/vcard/ns#Work> .
local:primaryEmailConfig a :ObjectPropertyDisplayConfig ;
@ -552,6 +560,7 @@ local:webpageContext a :ConfigContext ;
:hasConfiguration local:webpageConfig ;
:configContextFor <http://purl.obolibrary.org/obo/ARG_2000028> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedByRoot <http://www.w3.org/2006/vcard/ns#Kind> ;
:qualifiedBy <http://www.w3.org/2006/vcard/ns#URL> .
local:webpageConfig a :ObjectPropertyDisplayConfig ;
@ -567,6 +576,7 @@ local:webpageContext a :ConfigContext ;
:hasConfiguration local:webpageConfig ;
:configContextFor <http://purl.obolibrary.org/obo/ARG_2000028> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Organization> ;
:qualifiedByRoot <http://www.w3.org/2006/vcard/ns#Kind> ;
:qualifiedBy <http://www.w3.org/2006/vcard/ns#URL> .
local:webpageConfig a :ObjectPropertyDisplayConfig ;
@ -582,6 +592,7 @@ local:fullNameContext a :ConfigContext ;
:hasConfiguration local:fullNameConfig ;
:configContextFor <http://purl.obolibrary.org/obo/ARG_2000028> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedByRoot <http://www.w3.org/2006/vcard/ns#Kind> ;
:qualifiedBy <http://www.w3.org/2006/vcard/ns#Name> .
local:fullNameConfig a :ObjectPropertyDisplayConfig ;
@ -597,6 +608,7 @@ local:preferredTitleContext a :ConfigContext ;
:hasConfiguration local:preferredTitleConfig ;
:configContextFor <http://purl.obolibrary.org/obo/ARG_2000028> ;
:qualifiedByDomain <http://xmlns.com/foaf/0.1/Person> ;
:qualifiedByRoot <http://www.w3.org/2006/vcard/ns#Kind> ;
:qualifiedBy <http://www.w3.org/2006/vcard/ns#Title> .
local:preferredTitleConfig a :ObjectPropertyDisplayConfig ;