diff --git a/doc/install.html b/doc/install.html
index 00c033cd..c30b768e 100644
--- a/doc/install.html
+++ b/doc/install.html
@@ -339,6 +339,25 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com
es_MX
+
+
+ These values are used when deploying VIVO as an OpenSocial container
+ and integrating with OpenSocial gadgets
+ (see Step 13, below). If you are creating
+ a VIVO installation that does not use OpenSocial gadgets, these values are omitted.
+
@@ -938,26 +957,6 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com
-
-
- These values are used when deploying VIVO as an OpenSocial container
- and integrating with OpenSocial gadgets
- (see Step 13, below). If you are creating
- a VIVO installation that does not use OpenSocial gadgets, these values are omitted.
-
-
diff --git a/doc/setting_up_orng.html b/doc/setting_up_orng.html
index 9f7e59a6..9eb99459 100644
--- a/doc/setting_up_orng.html
+++ b/doc/setting_up_orng.html
@@ -188,7 +188,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
I.iv Configure VIVO
- In the VIVO home directory, the file called runtime.properties
+ In the VIVO distribution directory, the file called build.properties
contains configuration options for the VIVO application.
You must set some additional parameters so VIVO will be able to communicate with Shindig-ORNG.
@@ -333,7 +333,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
VIVO was not re-deployed with ant deploy after the OpenSocial
- values were set in runtime.properties
+ values were set in build.properties
@@ -405,7 +405,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
- OpenSocial.tokenKeyFile is not set in runtime.properties,
+ OpenSocial.tokenKeyFile is not set in build.properties,
or the file does not exist at the specified location.
@@ -449,7 +449,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
- In runtime.properties, OpenSocial.tokenService is not set correctly.
+ In build.properties, OpenSocial.tokenService is not set correctly.
@@ -692,11 +692,11 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
III.i. Re-running the deployment script
- The OpenSocial framework relies on several of the settings in the runtime.properties file,
+ The OpenSocial framework relies on several of the settings in the build.properties and runtime.properties files,
in addition to the ones that are explicitly linked to it.
- Each time you change the settings in runtime.properties, you should re-deploy
+ Each time you change the settings in build.properties or runtime.properties, you should re-deploy
the framework with
ant orng
@@ -750,12 +750,12 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
Disabling the gadgets, as above, will remove essentially all of the OpenSocial processing
within VIVO. To remove the remainder of it, you can disable the connection between
VIVO and the OpenSocial service. Do this by removing or commenting
- the OpenSocial properties in runtime.properties
+ the OpenSocial properties in build.properties
(see section I.iv. Configure VIVO).
- Restart Tomcat to make this change take effect.
+ To make this change take effect, re-deploy VIVO and restart Tomcat.
diff --git a/productMods/js/homePageMaps.js b/productMods/js/homePageMaps.js
index 06283d1e..c41b6fbc 100644
--- a/productMods/js/homePageMaps.js
+++ b/productMods/js/homePageMaps.js
@@ -6,11 +6,12 @@ $(document).ready(function(){
var countryMapBuilt = false;
var localMapBuilt = false;
var researchAreas = { "type": "FeatureCollection", "features": []};
+ var geoResearcherCount = "0";
$.extend(this, urlsBase);
$.extend(this, i18nStrings);
- $.extend(this, geoResearcherCount);
+ getGeoFocusResearcherCount();
getGeoJsonForMaps();
$('a#globalLink').click(function() {
@@ -367,9 +368,26 @@ $(document).ready(function(){
});
}
+ function getGeoFocusResearcherCount() {
+ $.ajax({
+ url: urlsBase + "/homePageAjax",
+ dataType: "json",
+ data: {
+ action: "getGeoFocusResearcherCount",
+ },
+ complete: function(xhr, status) {
+
+ var results = $.parseJSON(xhr.responseText);
+ // there will only ever be one key/value pair
+ if ( results != null ) {
+ geoResearcherCount = results.count;
+ }
+ }
+ });
+ }
+
function getResearcherCount(area) {
- var researcherCount = this.geoResearcherCount;
var areaCount = 0;
var text = "";
if ( area == "global" ) {
@@ -391,7 +409,7 @@ $(document).ready(function(){
if ( areaCount == 1 && text == " states.") {
text = " " + i18nStrings.stateString;
}
- if ( researcherCount == 1 ) {
+ if ( geoResearcherCount == 1 ) {
researcherText = " " + i18nStrings.researcherString + " " + i18nStrings.inString;
}
else {
@@ -399,7 +417,7 @@ $(document).ready(function(){
}
$('div#researcherTotal').html(""
- + researcherCount
+ + geoResearcherCount
+ " " + researcherText + " "
+ areaCount + "" + text);
}
diff --git a/themes/wilma/templates/individual-openSocial.ftl b/productMods/templates/freemarker/body/individual/individual-openSocial.ftl
similarity index 100%
rename from themes/wilma/templates/individual-openSocial.ftl
rename to productMods/templates/freemarker/body/individual/individual-openSocial.ftl
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl
index 780765d4..f0fc41b8 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-adviseeIn.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#mailingAddress.
+<#-- Custom object property statement view for faux property "advisee of". See the PropertyConfig.3 file for details.
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl
index 341c3299..88e310c0 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-advisorIn.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#mailingAddress.
+<#-- Custom object property statement view for faux property "advisees". See the PropertyConfig.3 file for details.
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
index b8cd6c1c..52638212 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-authorInAuthorship.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#authorInAuthorship.
+<#-- Custom object property statement view for faux property "selected publications". See the PropertyConfig.3 file for details.
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
index 9c61e94a..6f4943e9 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-awardOrHonor.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#awardOrHonor.
+<#-- Custom object property statement view for faux property "awards and honors". See the PropertyConfig.3 file for details.
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-editorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-editorship.ftl
index 2f2f4bda..1e04bde5 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-editorship.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-editorship.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#authorInEditorship.
+<#-- Custom object property statement view for faux property "editor of". See the PropertyConfig.3 file for details.
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
index 3521a717..d81062bd 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-educationalTraining.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#educationalTraining.
+<#-- Custom object property statement view for faux property "education and training". See the PropertyConfig.3 file for details.
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl
index 0c948b3e..9035f684 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasAttendeeRole.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#hasAttendeeRole.
+<#-- Custom object property statement view for faux property "attended". See the PropertyConfig.3 file for details..
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
index 6ead71df..74ef1621 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasEditReviewRole.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for core:hasEditorRole and core:hasReviewerRole.
+<#-- Custom object property statement view for faux property "reviewer of". See the PropertyConfig.3 file for details.
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl
index d458c4dd..84de10ae 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasInvestigatorRole.ftl
@@ -1,6 +1,7 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#hasRole and its child properties.
+<#-- Custom object property statement view for faux property "investigator on," "principal investigator on" and
+ "co-principal investigator on." See the PropertyConfig.3 file for details.
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl
index bfc1e92d..c1068d2d 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#hasPresenterRole.
+<#-- Custom object property statement view for faux property "presentations". See the PropertyConfig.3 file for details.
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
index fca3b9dd..c89de407 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasRole.ftl
@@ -1,6 +1,7 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#hasRole and its child properties.
+<#-- Custom object property statement view for the roleRealizedIn, roleContributesTo, researchActivities, hasRole
+ and hasClinicalActivities custom list views. See those list view and the PropertyConfig.3 file for details.
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
index 06978922..df612dfe 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInAuthorship.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#informationResourceInAuthorship.
+<#-- Custom object property statement view for faux property "authors". See the PropertyConfig.3 file for details.
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInEditorship.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInEditorship.ftl
index 3d6c16e3..93bb908d 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInEditorship.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-informationResourceInEditorship.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#informationResourceInAuthorship.
+<#-- Custom object property statement view for faux property "editors". See the PropertyConfig.3 file for details.
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl
index 5b18d090..6375a22f 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#mailingAddress.
+<#-- Custom object property statement view for faux property "mailing address". See the PropertyConfig.3 file for details.
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
index d5719b82..3d877560 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForPosition.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#organizationForPosition.
+<#-- Custom object property statement view for faux property "people". See the PropertyConfig.3 file for details.
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
index 4ad826c2..711d2ee7 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-organizationForTraining.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#organizationForPosition.
+<#-- Custom object property statement view for faux property "organization for training". See the PropertyConfig.3 file for details.
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
@@ -19,18 +19,20 @@
${statement.personName}
<#else>
<#-- This shouldn't happen, but we must provide for it -->
- ${i18n().missing_person_in_posn}
+ ${i18n().missing_person_in_posn}
<#local detailedInfo>
<#if statement.degree??>
- ${statement.degreeAbbr!} ${i18n().in} ${statement.field!}
- <#elseif statement.field??>
- ${statement.field!}, ${statement.suppInfo!}
+ ${statement.degreeAbbr!} <#if statement.majorField??> ${i18n().in} ${statement.majorField!}
+ <#elseif statement.majorField??>
+ ${statement.majorField!}, ${statement.info!}
<#else>
- ${statement.suppInfo!}
+ ${statement.info!}
- <@s.join [ linkedIndividual, detailedInfo ] /> <@dt.yearIntervalSpan "${statement.dateTimeStart!}" "${statement.dateTimeEnd!}" />
+ <@s.join [ linkedIndividual, detailedInfo ] />
+
+
+
-
\ No newline at end of file
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
index fa0afb41..e6aebc47 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-personInPosition.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#personInPosition.
+<#-- Custom object property statement view for faux property "positions". See the PropertyConfig.3 file for details.
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
index e11838f0..21187494 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-relatedRole.ftl
@@ -1,8 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#relatedRole and
- http://vivoweb.org/ontology/core#linkedRole.
-
+<#--
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
-->
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl
index 9e589c10..3059fd1b 100644
--- a/productMods/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl
@@ -1,7 +1,6 @@
<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#-- Custom object property statement view for http://vivoweb.org/ontology/core#organizationForPosition.
-
+<#--
This template must be self-contained and not rely on other variables set for the individual page, because it
is also used to generate the property statement during a deletion.
-->
diff --git a/productMods/templates/freemarker/edit/forms/addClinicalRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addClinicalRoleToPerson.ftl
index affa452e..0599c096 100644
--- a/productMods/templates/freemarker/edit/forms/addClinicalRoleToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addClinicalRoleToPerson.ftl
@@ -1,35 +1,35 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#--Two stage form for clinical role-->
-
-<#--
-Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are:
-roleDescriptor.
-The other required values (roleType, optionsType, objectClassUri, and literalOptions are
-set in the JAVA class corresponding to the form, e.g. AddClinicalRoleToPersonGenerator.java.
-
-Optional values can be set in Freemarker, but each of these has default values
-set in addRoleToPersonTwoStage.ftl:
-
-buttonText
-typeSelectorLabel
-numDateFields
-roleExamples
-
-Optional values set in JAVA include
-ShowRoleLabelField
-ActivityToRolePredicate
-RoleToActivityPredicate
--->
-
-
-<#--Variable assignments for Add Clinical Role To Person-->
-<#assign roleDescriptor = "${i18n().clinical_activity}" />
-<#assign typeSelectorLabel = "${i18n().clinical_activity_type}" />
-<#assign genericLabel = "${i18n().clinical_activity?capitalize}" />
-
-<#assign acMultipleTypes = "'true'" />
-<#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#Project,http://vivoweb.org/ontology/core#Service'}" />
-
-
-<#--Each of the two stage forms will include the form below-->
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+<#--Two stage form for clinical role-->
+
+<#--
+Required Values to be set for each form that includes addRoleToPersonTwoStage.ftl are:
+roleDescriptor.
+The other required values (roleType, optionsType, objectClassUri, and literalOptions are
+set in the JAVA class corresponding to the form, e.g. AddClinicalRoleToPersonGenerator.java.
+
+Optional values can be set in Freemarker, but each of these has default values
+set in addRoleToPersonTwoStage.ftl:
+
+buttonText
+typeSelectorLabel
+numDateFields
+roleExamples
+
+Optional values set in JAVA include
+ShowRoleLabelField
+ActivityToRolePredicate
+RoleToActivityPredicate
+-->
+
+
+<#--Variable assignments for Add Clinical Role To Person-->
+<#assign roleDescriptor = "${i18n().clinical_activity}" />
+<#assign typeSelectorLabel = "${i18n().clinical_activity_type}" />
+<#assign genericLabel = "${i18n().clinical_activity?capitalize}" />
+
+<#assign acMultipleTypes = "'true'" />
+<#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#Project,http://purl.obolibrary.org/obo/ERO_0000005'}" />
+
+
+<#--Each of the two stage forms will include the form below-->
<#include "addRoleToPersonTwoStage.ftl">
\ No newline at end of file
diff --git a/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
index 1fe602ef..7d65a5fa 100644
--- a/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addGrantRoleToPerson.ftl
@@ -180,4 +180,4 @@ ${scripts.add('')}
${scripts.add('')}
${scripts.add('')}
-
\ No newline at end of file
+
diff --git a/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js b/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js
index d2104330..43648028 100644
--- a/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js
+++ b/productMods/templates/freemarker/edit/forms/js/mailingAddressUtils.js
@@ -10,6 +10,8 @@ var mailingAddressUtils = {
if ( editMode != "add" ) {
this.setStreetAddressDisplayFields();
}
+
+ this.setAddressFieldsIfErrors();
},
initObjectReferences: function() {
@@ -18,9 +20,16 @@ var mailingAddressUtils = {
this.street1 = $('#streetAddressOne');
this.street2 = $('#streetAddressTwo');
this.streetAddress = $('#streetAddress');
+ this.errorSection = $('section#error-alert');
},
+ setAddressFieldsIfErrors: function() {
+ if ( this.errorSection.length ) {
+ mailingAddressUtils.setStreetAddressDisplayFields();
+ }
+ },
+
bindEventListeners: function() {
this.idCache = {};
diff --git a/productMods/templates/freemarker/edit/forms/js/organizationForTrainingUtils.js b/productMods/templates/freemarker/edit/forms/js/organizationForTrainingUtils.js
new file mode 100644
index 00000000..963ffd14
--- /dev/null
+++ b/productMods/templates/freemarker/edit/forms/js/organizationForTrainingUtils.js
@@ -0,0 +1,95 @@
+/* $This file is distributed under the terms of the license in /doc/license.txt$ */
+
+var orgForTrainingUtils = {
+
+ onLoad: function(blankSentinel) {
+
+ this.sentinel = '';
+ if ( blankSentinel ) { this.sentinel = blankSentinel; }
+
+ this.initObjectReferences();
+ this.bindEventListeners();
+
+ $.extend(this, vitro.customFormUtils);
+ $.extend(this, i18nStrings);
+
+ if ( this.findValidationErrors() ) {
+ this.resetLastNameLabel();
+ }
+ },
+
+ initObjectReferences: function() {
+
+ this.form = $('#organizationForTraining');
+ this.person = $('#person');
+ this.fauxLabel = $('#maskLabelBuilding');
+ this.firstName = $('#firstName');
+ this.lastName = $('#lastName');
+ this.personUri = $('#personUri');
+ this.aDLabel = $('#awardedDegreeLabel');
+ this.degreeSelector = $('#degreeUri');
+
+ // may not need this
+ this.firstName.attr('disabled', '');
+
+ },
+
+ bindEventListeners: function() {
+ this.idCache = {};
+
+ this.form.submit(function() {
+ orgForTrainingUtils.resolveFirstLastNames();
+
+ });
+ },
+
+ resolveFirstLastNames: function() {
+ var firstName,
+ lastName,
+ name;
+
+ // If selecting an existing person, don't submit name fields
+ if (this.personUri.val() == '' || this.personUri.val() == this.sentinel ) {
+ firstName = this.firstName.val();
+ lastName = this.person.val();
+
+ name = lastName;
+
+ if (firstName) {
+ name += ', ' + firstName;
+ }
+
+ // we don't want the user to see the label getting built, so hide the acSelector
+ // field and display a bogus field that just has the last name in it.
+ this.fauxLabel.val(lastName);
+ this.person.hide();
+ this.fauxLabel.show();
+ this.person.val(name);
+ this.lastName.val(lastName);
+ }
+ else {
+ this.firstName.attr('disabled', 'disabled');
+ this.lastName.attr('disabled', 'disabled');
+ }
+ orgForTrainingUtils.setAwardedDegreeLabel(this.person.val());
+ },
+
+ resetLastNameLabel: function() {
+ var indx = this.person.val().indexOf(", ");
+ if ( indx != -1 ) {
+ var temp = this.person.val().substr(0,indx);
+ this.person.val(temp);
+ }
+ },
+
+ setAwardedDegreeLabel: function(name) {
+ var degreeLabel = "";
+ if ( name == '' || name == null ) {
+ degreeLabel = $('span.acSelectionInfo').text() + ": " + this.degreeSelector.find(":selected").text();
+ }
+ else {
+ degreeLabel = name + ": " + this.degreeSelector.find(":selected").text();
+ }
+ this.aDLabel.val(degreeLabel);
+ }
+}
diff --git a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
index c4f0b1d0..81f38396 100644
--- a/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
+++ b/productMods/templates/freemarker/edit/forms/manageWebpagesForIndividual.ftl
@@ -11,6 +11,7 @@
<#assign deleteWebpageUrl=editConfiguration.pageData.deleteWebpageUrl!"deleteWebpageUrl is undefined">
<#assign showAddFormUrl=editConfiguration.pageData.showAddFormUrl!"showAddFormUrl is undefined">
<#assign predicateUri=editConfiguration.predicateUri!"undefined">
+<#assign domainUri = editConfiguration.predicateProperty.domainVClassURI!"">
<#if (editConfiguration.pageData.subjectName??) >
${editConfiguration.pageData.subjectName}
@@ -56,7 +57,7 @@
<#-- There is no editConfig at this stage, so we don't need to go through postEditCleanup.jsp on cancel.
These can just be ordinary links, rather than a v:input element, as in
addAuthorsToInformationResource.jsp. -->
- ${i18n().add_new_web_page}
+ ${i18n().add_new_web_page}${i18n().return_to_profile}
diff --git a/productMods/templates/freemarker/edit/forms/organizationForTraining.ftl b/productMods/templates/freemarker/edit/forms/organizationForTraining.ftl
new file mode 100644
index 00000000..b3d6561b
--- /dev/null
+++ b/productMods/templates/freemarker/edit/forms/organizationForTraining.ftl
@@ -0,0 +1,229 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- this is in request.subject.name -->
+
+<#-- leaving this edit/add mode code in for reference in case we decide we need it -->
+
+<#import "lib-vivo-form.ftl" as lvf>
+
+<#assign subjectName=""/>
+<#assign roleActivityUri="mysteryRoleActivityURI"/>
+<#assign personLabel="mysteryPersonLabel"/>
+
+<#--Retrieve certain edit configuration information-->
+<#assign editMode = editConfiguration.pageData.editMode />
+<#assign htmlForElements = editConfiguration.pageData.htmlForElements />
+
+<#--The blank sentinel indicates what value should be put in a URI when no autocomplete result has been selected.
+If the blank value is non-null or non-empty, n3 editing for an existing object will remove the original relationship
+if nothing is selected for that object-->
+<#assign blankSentinel = "" />
+<#if editConfigurationConstants?has_content && editConfigurationConstants?keys?seq_contains("BLANK_SENTINEL")>
+ <#assign blankSentinel = editConfigurationConstants["BLANK_SENTINEL"] />
+
+
+<#--This flag is for clearing the label field on submission for an existing object being selected from autocomplete.
+Set this flag on the input acUriReceiver where you would like this behavior to occur. -->
+<#assign flagClearLabelForExisting = "flagClearLabelForExisting" />
+
+<#--Retrieve variables needed-->
+<#assign firstNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "firstName")/>
+<#assign lastNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "lastName") />
+<#assign personLabelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "personLabel") />
+<#assign personLabelDisplayValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "personLabelDisplay") />
+<#assign deptValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "dept") />
+<#assign infoValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "info") />
+<#assign majorFieldValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "majorField") />
+<#assign degreeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "degreeType") />
+<#assign awardedDegreeLabelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "awardedDegreeLabel") />
+<#assign existingPersonValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "existingPerson") />
+<#assign trainingTypeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "trainingType")/>
+
+<#-- If edit submission exists, then retrieve validation errors if they exist-->
+<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content>
+ <#assign submissionErrors = editSubmission.validationErrors/>
+
+
+<#if editMode == "edit" || editMode == "repair">
+ <#assign titleVerb="${i18n().edit_capitalized}">
+ <#assign submitButtonText="${i18n().save_changes}">
+ <#assign disabledVal="disabled">
+<#else>
+ <#assign titleVerb="${i18n().create_capitalized}">
+ <#assign submitButtonText="${i18n().create_entry}">
+ <#assign disabledVal=""/>
+
+
+<#assign requiredHint = " *" />
+<#assign yearHint = "(${i18n().year_hint_format})" />
+
+
+
+ <#--below shows examples of both printing out all error messages and checking the error message for a specific field-->
+ <#list submissionErrors?keys as errorFieldName>
+ <#if errorFieldName == "startField">
+ <#if submissionErrors[errorFieldName]?contains("before")>
+ ${i18n().start_year_must_precede_end}
+ <#else>
+ ${submissionErrors[errorFieldName]}
+
+
+ <#elseif errorFieldName == "endField">
+ <#if submissionErrors[errorFieldName]?contains("after")>
+ ${i18n().end_year_must_be_later}
+ <#else>
+ ${submissionErrors[errorFieldName]}
+
+
+
+ <#--Checking if Person Type field is empty-->
+ <#if lvf.submissionErrorExists(editSubmission, "personType")>
+ ${i18n().select_person_type}
+
+ <#--Checking if Person Name field is empty-->
+ <#if lvf.submissionErrorExists(editSubmission, "personLabel")>
+ ${i18n().select_an_person_name}
+
+ <#--Checking if Training Type field is empty-->
+ <#if lvf.submissionErrorExists(editSubmission, "trainingType")>
+ ${i18n().select_educational_training_value}
+
+
+
+
+
+
+
+<@lvf.unsupportedBrowser urls.base />
+
+
+
+
+
+
+
+
+
+
+${stylesheets.add('')}
+${stylesheets.add('')}
+${stylesheets.add('')}
+
+
+${scripts.add('',
+ '',
+ '',
+ '',
+ '',
+ '',
+ '')}
+
+
diff --git a/productMods/templates/freemarker/lib/lib-home-page.ftl b/productMods/templates/freemarker/lib/lib-home-page.ftl
index f105863c..7235a394 100644
--- a/productMods/templates/freemarker/lib/lib-home-page.ftl
+++ b/productMods/templates/freemarker/lib/lib-home-page.ftl
@@ -204,17 +204,3 @@ var urlsBase = "${urls.base}";
-->
-
-<#-- retrieves a count, the number of researchers with a geographic focus, -->
-<#-- and saves it as a js variable to be used by the homePageMaps.js file -->
-<#macro getGeoResearcherCount>
-
-
diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3
index f92b8f4e..7d9d5363 100644
--- a/rdf/display/everytime/PropertyConfig.n3
+++ b/rdf/display/everytime/PropertyConfig.n3
@@ -28,6 +28,7 @@ local:personInPositionConfig a :ObjectPropertyDisplayConfig ;
vitro:displayRankAnnot 40;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasPositionHistoryGenerator"^^xsd:string .
local:organizationForPositionContext a :ConfigContext ;
@@ -74,6 +75,7 @@ local:hasServiceProviderRoleConfig a :ObjectPropertyDisplayConfig ;
vitro:displayRankAnnot 20;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddServiceProviderRoleToPersonGenerator"^^ ;
:propertyGroup .
@@ -89,6 +91,7 @@ local:hasClinicalRoleConfig a :ObjectPropertyDisplayConfig ;
vitro:displayRankAnnot 70;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddClinicalRoleToPersonGenerator"^^ ;
:propertyGroup .
@@ -104,6 +107,7 @@ local:hasLeaderRoleConfig a :ObjectPropertyDisplayConfig ;
vitro:displayRankAnnot 30;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddHeadOfRoleToPersonGenerator"^^ ;
:propertyGroup .
@@ -119,6 +123,7 @@ local:hasMemberRoleConfig a :ObjectPropertyDisplayConfig ;
vitro:displayRankAnnot 50;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddMemberRoleToPersonGenerator"^^ ;
:propertyGroup .
@@ -134,6 +139,7 @@ local:hasTeacherRoleConfig a :ObjectPropertyDisplayConfig ;
vitro:displayRankAnnot 20;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddTeacherRoleToPersonGenerator"^^ ;
:propertyGroup .
@@ -149,6 +155,7 @@ local:hasEditorRoleConfig a :ObjectPropertyDisplayConfig ;
vitro:displayRankAnnot 2;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddEditorRoleToPersonGenerator"^^ ;
:propertyGroup .
@@ -164,6 +171,7 @@ local:hasReviewerRoleConfig a :ObjectPropertyDisplayConfig ;
vitro:displayRankAnnot 3;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddReviewerRoleToPersonGenerator"^^ ;
:propertyGroup .
@@ -179,6 +187,7 @@ local:hasOrganizerRoleConfig a :ObjectPropertyDisplayConfig ;
vitro:displayRankAnnot 4;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOrganizerRoleToPersonGenerator"^^ ;
:propertyGroup .
@@ -194,6 +203,7 @@ local:hasOutreachProviderRoleConfig a :ObjectPropertyDisplayConfig ;
vitro:displayRankAnnot 50;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddOutreachProviderRoleToPersonGenerator"^^ ;
:propertyGroup .
@@ -209,6 +219,7 @@ local:hasAttendeeRoleConfig a :ObjectPropertyDisplayConfig ;
vitro:displayRankAnnot 1;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddAttendeeRoleToPersonGenerator"^^ ;
:propertyGroup .
@@ -220,10 +231,11 @@ local:hasResearcherRoleContext a :ConfigContext ;
local:hasResearcherRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-researchActivities.xml"^^xsd:string ;
- :displayName "research activities" ;
- vitro:displayRankAnnot 15;
+ :displayName "other research activities" ;
+ vitro:displayRankAnnot 35;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddResearcherRoleToPersonGenerator"^^ ;
:propertyGroup .
@@ -293,7 +305,7 @@ local:awardOrHonorContext a :ConfigContext ;
:hasConfiguration local:awardOrHonorConfig ;
:configContextFor ;
:qualifiedByDomain ;
- :qualifiedBy .
+ :qualifiedBy .
local:awardOrHonorConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-awardOrHonor.xml"^^xsd:string ;
@@ -316,9 +328,25 @@ local:educationalTrainingConfig a :ObjectPropertyDisplayConfig ;
vitro:displayRankAnnot 10;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:stubObjectPropertyAnnot "true"^^xsd:boolean ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasEducationalTraining"^^ ;
:propertyGroup .
+local:organizationForTrainingContext a :ConfigContext ;
+ :hasConfiguration local:organizationForTrainingConfig ;
+ :configContextFor ;
+ :qualifiedByDomain ;
+ :qualifiedBy .
+
+local:organizationForTrainingConfig a :ObjectPropertyDisplayConfig ;
+ :listViewConfigFile "listViewConfig-organizationForTraining.xml"^^xsd:string ;
+ :displayName "organization for training" ;
+ vitro:displayRankAnnot 1;
+ vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+ vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.OrganizationForTrainingGenerator"^^ ;
+ :propertyGroup .
+
local:adviseeRoleContext a :ConfigContext ;
:hasConfiguration local:adviseeRoleConfig ;
:configContextFor ;
@@ -556,14 +584,14 @@ local:primaryEmailConfig a :ObjectPropertyDisplayConfig ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.PersonHasEmailGenerator"^^ ;
:propertyGroup .
-local:webpageContext a :ConfigContext ;
- :hasConfiguration local:webpageConfig ;
+local:webpagePersonContext a :ConfigContext ;
+ :hasConfiguration local:webpagePersonConfig ;
:configContextFor ;
:qualifiedByDomain ;
:qualifiedByRoot ;
:qualifiedBy .
-local:webpageConfig a :ObjectPropertyDisplayConfig ;
+local:webpagePersonConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-webpage.xml"^^xsd:string ;
:displayName "webpage" ;
vitro:displayRankAnnot 40;
@@ -572,14 +600,46 @@ local:webpageConfig a :ObjectPropertyDisplayConfig ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManageWebpagesForIndividualGenerator"^^ ;
:propertyGroup .
-local:webpageContext a :ConfigContext ;
- :hasConfiguration local:webpageConfig ;
+local:webpageOrgContext a :ConfigContext ;
+ :hasConfiguration local:webpageOrgConfig ;
:configContextFor ;
:qualifiedByDomain ;
:qualifiedByRoot ;
:qualifiedBy .
-local:webpageConfig a :ObjectPropertyDisplayConfig ;
+local:webpageOrgConfig 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:webpageInfoContext a :ConfigContext ;
+ :hasConfiguration local:webpageInfoConfig ;
+ :configContextFor ;
+ :qualifiedByDomain ;
+ :qualifiedByRoot ;
+ :qualifiedBy .
+
+local:webpageInfoConfig 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 ;
+ :qualifiedByDomain ;
+ :qualifiedByRoot ;
+ :qualifiedBy .
+
+local:webpageEventConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-webpage.xml"^^xsd:string ;
:displayName "webpage" ;
vitro:displayRankAnnot 40;
@@ -630,7 +690,7 @@ local:eventWithinContext a :ConfigContext ;
local:eventWithinConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
- :displayName "event within" ;
+ :displayName "occurs within (parent event)" ;
vitro:displayRankAnnot 1;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
@@ -678,6 +738,20 @@ local:eventLocationConfig a :ObjectPropertyDisplayConfig ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup .
+local:hasRoomContext a :ConfigContext ;
+ :hasConfiguration local:hasRoomConfig ;
+ :configContextFor ;
+ :qualifiedByDomain vivo:Building ;
+ :qualifiedBy vivo:Room .
+
+local:hasRoomConfig a :ObjectPropertyDisplayConfig ;
+ :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
+ :displayName "has room" ;
+ vitro:displayRankAnnot 2;
+ vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+ vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ :propertyGroup .
+
local:courseOfferedByContext a :ConfigContext ;
:hasConfiguration local:courseOfferedByConfig ;
:configContextFor vivo:offeredBy ;
@@ -721,7 +795,7 @@ local:collegeOffersDegreeConfig a :ObjectPropertyDisplayConfig ;
:propertyGroup .
local:deptOffersDegreeContext a :ConfigContext ;
- :hasConfiguration local:debtOffersDegreeConfig ;
+ :hasConfiguration local:deptOffersDegreeConfig ;
:configContextFor vivo:offers ;
:qualifiedByDomain vivo:AcademicDepartment ;
:qualifiedBy vivo:AcademicDegree .
@@ -748,6 +822,21 @@ local:uniOffersDegreeConfig a :ObjectPropertyDisplayConfig ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup .
+local:labOffersServiceContext a :ConfigContext ;
+ :hasConfiguration local:labOffersServiceConfig ;
+ :configContextFor vivo:offers ;
+ :qualifiedByDomain vivo:Laboratory ;
+ :qualifiedBy .
+
+local:labOffersServiceConfig a :ObjectPropertyDisplayConfig ;
+ :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
+ :displayName "offers service" ;
+ vitro:displayRankAnnot 2;
+ vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+ vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ vitro:offerCreateNewOptionAnnot "true"^^xsd:boolean ;
+ :propertyGroup .
+
local:grantAwardedByContext a :ConfigContext ;
:hasConfiguration local:grantAwardedByConfig ;
:configContextFor vivo:assignedBy ;
@@ -804,6 +893,20 @@ local:awardReceiptsAwardForConfig a :ObjectPropertyDisplayConfig ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
:propertyGroup .
+local:addressLocationContext a :ConfigContext ;
+ :hasConfiguration local:addressLocationConfig ;
+ :configContextFor ;
+ :qualifiedByDomain ;
+ :qualifiedBy vivo:GeographicLocation .
+
+local:addressLocationConfig a :ObjectPropertyDisplayConfig ;
+ :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
+ :displayName "has geographic location" ;
+ vitro:displayRankAnnot 2;
+ vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+ vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+ :propertyGroup .
+
### roles using the BFO_0000055 property ###
local:bfo_0000055Context a :ConfigContext ;
diff --git a/rdf/display/everytime/homePageDataGetters.n3 b/rdf/display/everytime/homePageDataGetters.n3
index 48bbcd1c..02184a68 100644
--- a/rdf/display/everytime/homePageDataGetters.n3
+++ b/rdf/display/everytime/homePageDataGetters.n3
@@ -17,35 +17,14 @@ display:academicDeptsDataGetter
display:saveToVar "academicDeptDG" ;
display:query """
PREFIX rdfs:
- PREFIX rdf:
PREFIX vivo:
SELECT DISTINCT ?theURI (str(?label) as ?name)
WHERE
{
- ?theURI rdf:type vivo:AcademicDepartment .
+ ?theURI a vivo:AcademicDepartment .
?theURI rdfs:label ?label
}
""" .
- display:hasDataGetter display:researcherCountDataGetter .
-
-display:researcherCountDataGetter
- a ;
- display:saveToVar "researcherCountDG" ;
- display:query """
- PREFIX geo:
- PREFIX rdfs:
- PREFIX rdf:
- PREFIX core:
- PREFIX foaf:
- PREFIX vivoc:
-
- SELECT DISTINCT (COUNT(DISTINCT ?person) AS ?count)
- WHERE {
- ?person rdf:type foaf:Person .
- ?person core:geographicFocus ?focus
- }
-
- """ .
diff --git a/rdf/display/everytime/vivoListViewConfig.rdf b/rdf/display/everytime/vivoListViewConfig.rdf
index 5edf3469..d085c9b2 100644
--- a/rdf/display/everytime/vivoListViewConfig.rdf
+++ b/rdf/display/everytime/vivoListViewConfig.rdf
@@ -15,45 +15,6 @@
xmlns:rdfs="&rdfs;"
xmlns:vitro="&vitro;">
-
- listViewConfig-authorInAuthorship.xml
-
-
-
- listViewConfig-educationalTraining.xml
-
-
-
- listViewConfig-informationResourceInAuthorship.xml
-
-
-
- listViewConfig-personInPosition.xml
-
-
-
- listViewConfig-organizationForPosition.xml
-
-
-
- listViewConfig-organizationForTraining.xml
-
-
-
- listViewConfig-mailingAddress.xml
-
-
-
- listViewConfig-awardOrHonor.xml
-
-
- listViewConfig-advisorIn.xml
-
-
-
- listViewConfig-hasRole.xml
-
-
listViewConfig-researchAreaOf.xml
diff --git a/rdf/display/everytime/vivoSearchProhibited.n3 b/rdf/display/everytime/vivoSearchProhibited.n3
index 17985305..8e7b7063 100644
--- a/rdf/display/everytime/vivoSearchProhibited.n3
+++ b/rdf/display/everytime/vivoSearchProhibited.n3
@@ -27,7 +27,7 @@
vitroDisplay:excludeClass core:DateTimeValuePrecision ;
vitroDisplay:excludeClass core:DateTimeInterval ;
vitroDisplay:excludeClass core:AcademicDegree ;
- vitroDisplay:excludeClass core:URLLink ;
+ vitroDisplay:excludeClass vcard:URL ;
vitroDisplay:excludeClass vcard:Communication ;
vitroDisplay:excludeClass vcard:Code ;
vitroDisplay:excludeClass vcard:Explanatory ;
diff --git a/rdf/tbox/filegraph/classes-additional.owl b/rdf/tbox/filegraph/classes-additional.owl
index 4e57d6f7..8bc74eed 100644
--- a/rdf/tbox/filegraph/classes-additional.owl
+++ b/rdf/tbox/filegraph/classes-additional.owl
@@ -559,27 +559,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -687,23 +666,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -773,7 +735,7 @@
-
+
@@ -947,21 +909,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1040,19 +987,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/rdf/tbox/filegraph/data-properties.owl b/rdf/tbox/filegraph/data-properties.owl
index 771b3128..5799c1e7 100644
--- a/rdf/tbox/filegraph/data-properties.owl
+++ b/rdf/tbox/filegraph/data-properties.owl
@@ -1833,16 +1833,13 @@ use one freetextKeyword assertion for each keyword or phrase.
-
-
-
diff --git a/rdf/tbox/filegraph/object-properties.owl b/rdf/tbox/filegraph/object-properties.owl
index 176c40e7..f61d226f 100644
--- a/rdf/tbox/filegraph/object-properties.owl
+++ b/rdf/tbox/filegraph/object-properties.owl
@@ -201,7 +201,6 @@
-
@@ -317,7 +316,6 @@
-
@@ -497,7 +495,6 @@
-
@@ -561,25 +558,6 @@
related technique
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -593,8 +571,6 @@
PERSON: Melissa HaendelPERSON: Melissa Haendelused to study
-
-
@@ -698,7 +674,6 @@
-
@@ -915,14 +890,7 @@ there is a measurement process p that has specified output m, a measurement datu
http://www.affymetrix.com/products/arrays/specific/hgu133.affx is_manufactered_by http://www.affymetrix.com/ (if we decide to use these URIs for the actual entities)is_manufactured_by
-
-
-
-
-
-
-
-
+
@@ -1145,22 +1113,6 @@ there is a measurement process p that has specified output m, a measurement datu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1508,14 +1460,6 @@ there is a measurement process p that has specified output m, a measurement datu
-
-
-
-
-
-
-
-
@@ -1534,15 +1478,6 @@ there is a measurement process p that has specified output m, a measurement datu
-
-
-
-
- Currently being used by a restriction on organization.
-
-
-
-
@@ -1705,7 +1640,8 @@ there is a measurement process p that has specified output m, a measurement datu
-
+
+
@@ -1713,7 +1649,21 @@ there is a measurement process p that has specified output m, a measurement datu
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -1721,7 +1671,16 @@ there is a measurement process p that has specified output m, a measurement datu
-
+
+
+
+
+
+
+
+
+
+
@@ -1738,7 +1697,6 @@ there is a measurement process p that has specified output m, a measurement datu
-
@@ -1751,22 +1709,6 @@ there is a measurement process p that has specified output m, a measurement datu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/rdf/tbox/filegraph/objectDomains.rdf b/rdf/tbox/filegraph/objectDomains.rdf
index cec51c19..d50bbf34 100644
--- a/rdf/tbox/filegraph/objectDomains.rdf
+++ b/rdf/tbox/filegraph/objectDomains.rdf
@@ -29,9 +29,6 @@
-
-
-
diff --git a/rdf/tbox/filegraph/research-resource.owl b/rdf/tbox/filegraph/research-resource.owl
index dccf8f43..5d90bd3a 100644
--- a/rdf/tbox/filegraph/research-resource.owl
+++ b/rdf/tbox/filegraph/research-resource.owl
@@ -296,36 +296,6 @@
-
-
-
-
-
-
-
-
- A technique used for identification, assessment, and prioritization of risks followed by coordinated and economical application of resources to minimize, monitor, and control the probability and/or impact of unfortunate events or to maximize the realization of opportunities.
- PERSON: Nicole Vasilevsky
- http://en.wikipedia.org/wiki/Risk_management
-
-
-
-
-
-
-
-
-
-
-
-
- A technique designed for the collection of clinical data in electronic format for use mainly in human clinical trials.
- Electronic health records.
- PERSON: Nicole Vasilevsky
- clinical database development
- http://en.wikipedia.org/wiki/Electronic_data_capture
-
-
@@ -507,5 +477,18 @@
+
+
+
+
+ OBI branch derived + wikipedia (http://en.wikipedia.org/wiki/Protocol_%28natural_sciences%29)
+ PMID: 18388943.Nat Protoc. 2008;3(4):612-8.Protocol for the induction of arthritis in C57BL/6 mice.
+ PlanAndPlannedProcess Branch
+ Protocol
+ a protocol is a plan specification which has sufficient level of detail and quantitative information to communicate it between domain experts, so that different domain experts will reliably be able to independently reproduce the process.
+ protocol
+
+
+
diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3
index 1f0823bf..32f22456 100644
--- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3
+++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3
@@ -65,13 +65,13 @@ vivo:dateTimeValue
vitro:displayRankAnnot
"5"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
- ;
+ ;
vitro:inPropertyGroupAnnot
;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
- ;
+ ;
vitro:selectFromExistingAnnot
"false"^^xsd:boolean .
@@ -407,6 +407,9 @@ foaf:Person
obo:OBI_0000643
rdfs:label "has grain"@en-US .
+obo:OBI_0000272
+ rdfs:label "protocol"@en-US .
+
vcard:Identification
rdfs:label "Identification"@en-US .
@@ -660,6 +663,8 @@ vivo:reproduces
diff --git a/productMods/templates/freemarker/edit/forms/organizationForTraining.ftl b/productMods/templates/freemarker/edit/forms/organizationForTraining.ftl
new file mode 100644
index 00000000..b3d6561b
--- /dev/null
+++ b/productMods/templates/freemarker/edit/forms/organizationForTraining.ftl
@@ -0,0 +1,229 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#-- this is in request.subject.name -->
+
+<#-- leaving this edit/add mode code in for reference in case we decide we need it -->
+
+<#import "lib-vivo-form.ftl" as lvf>
+
+<#assign subjectName=""/>
+<#assign roleActivityUri="mysteryRoleActivityURI"/>
+<#assign personLabel="mysteryPersonLabel"/>
+
+<#--Retrieve certain edit configuration information-->
+<#assign editMode = editConfiguration.pageData.editMode />
+<#assign htmlForElements = editConfiguration.pageData.htmlForElements />
+
+<#--The blank sentinel indicates what value should be put in a URI when no autocomplete result has been selected.
+If the blank value is non-null or non-empty, n3 editing for an existing object will remove the original relationship
+if nothing is selected for that object-->
+<#assign blankSentinel = "" />
+<#if editConfigurationConstants?has_content && editConfigurationConstants?keys?seq_contains("BLANK_SENTINEL")>
+ <#assign blankSentinel = editConfigurationConstants["BLANK_SENTINEL"] />
+
+
+<#--This flag is for clearing the label field on submission for an existing object being selected from autocomplete.
+Set this flag on the input acUriReceiver where you would like this behavior to occur. -->
+<#assign flagClearLabelForExisting = "flagClearLabelForExisting" />
+
+<#--Retrieve variables needed-->
+<#assign firstNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "firstName")/>
+<#assign lastNameValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "lastName") />
+<#assign personLabelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "personLabel") />
+<#assign personLabelDisplayValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "personLabelDisplay") />
+<#assign deptValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "dept") />
+<#assign infoValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "info") />
+<#assign majorFieldValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "majorField") />
+<#assign degreeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "degreeType") />
+<#assign awardedDegreeLabelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "awardedDegreeLabel") />
+<#assign existingPersonValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "existingPerson") />
+<#assign trainingTypeValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "trainingType")/>
+
+<#-- If edit submission exists, then retrieve validation errors if they exist-->
+<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content>
+ <#assign submissionErrors = editSubmission.validationErrors/>
+
+
+<#if editMode == "edit" || editMode == "repair">
+ <#assign titleVerb="${i18n().edit_capitalized}">
+ <#assign submitButtonText="${i18n().save_changes}">
+ <#assign disabledVal="disabled">
+<#else>
+ <#assign titleVerb="${i18n().create_capitalized}">
+ <#assign submitButtonText="${i18n().create_entry}">
+ <#assign disabledVal=""/>
+
+
+<#assign requiredHint = "
+