diff --git a/languages/es_GO/themes/wilma/i18n/all_es_GO.properties b/languages/es_GO/themes/wilma/i18n/all_es_GO.properties
index d71660c0..d784a516 100644
--- a/languages/es_GO/themes/wilma/i18n/all_es_GO.properties
+++ b/languages/es_GO/themes/wilma/i18n/all_es_GO.properties
@@ -875,4 +875,5 @@ name_suffix = Sufijo de nombre
administering_organization_for = administración de la organización para
missing_credential = falta credencial
grant_administered_by = conceder administrado por
-missing_grant = falta de subvención
\ No newline at end of file
+missing_grant = falta de subvención
+editor_of_entry = editor de para
\ No newline at end of file
diff --git a/productMods/templates/freemarker/edit/forms/addEditorshipToPerson.ftl b/productMods/templates/freemarker/edit/forms/addEditorshipToPerson.ftl
index 8d6deae8..629c483b 100644
--- a/productMods/templates/freemarker/edit/forms/addEditorshipToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addEditorshipToPerson.ftl
@@ -50,7 +50,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
<#assign yearHint = "(${i18n().year_hint_format})" />
-${titleVerb} ${i18n().educational_training_for} ${editConfiguration.subjectName}
+${titleVerb} ${i18n().editor_of_entry} ${editConfiguration.subjectName}
<#--Display error messages if any-->
<#if submissionErrors?has_content>
diff --git a/productMods/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl
index 6d1f8e9f..afdaeabd 100644
--- a/productMods/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl
@@ -22,7 +22,8 @@ roleExamples-->
<#assign typeSelectorLabel = "${i18n().reviewer_of}" />
<#assign genericLabel = "${i18n().item_capitalized}" />
-<#assign acTypes = "{activity: 'http://purl.org/ontology/bibo/Document'}" />
+<#assign acMultipleTypes = "'true'" />
+<#assign acTypes = "{activity: 'http://purl.org/ontology/bibo/Document,http://purl.org/ontology/bibo/Collection'}" />
<#--Each of the two stage forms will include the form below-->
<#include "addRoleToPersonTwoStage.ftl">
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 41599a3c..f2eb0e3d 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
@@ -1,75 +1,75 @@
-/* $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.ChildVClassesOptions;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
-/**
- * Generates the edit configuration for adding a Role to a Person.
-
- Stage one is selecting the type of the non-person thing
- associated with the Role with the intention of reducing the
- number of Individuals that the user has to select from.
- Stage two is selecting the non-person Individual to associate
- with the Role.
-
- This is intended to create a set of statements like:
-
- ?person core:hasResearchActivityRole ?newRole.
- ?newRole rdf:type core:ResearchActivityRole ;
- roleToActivityPredicate ?someActivity .
- ?someActivity rdf:type core:ResearchActivity .
- ?someActivity rdfs:label "activity title" .
-
-
- Each subclass of the abstract two stage Generator class will have the option of overriding certain
- methods, and must always implement the following methods:
- getRoleType
- getRoleActivityTypeOptionsType
- getRoleActivityTypeObjectClassUri
- getRoleActivityTypeLiteralOptions
-
- *
- */
-public class AddEditorRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
- private static String TEMPLATE = "addEditorRoleToPerson.ftl";
- private static String OPTION_CLASS_URI = "http://purl.org/ontology/bibo/Collection";
-
- @Override
- String getTemplate(){ return TEMPLATE; }
-
- @Override
- String getRoleType() {
- return "http://vivoweb.org/ontology/core#EditorRole";
- }
-
- @Override
- FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
- return new
- ChildVClassesOptions(OPTION_CLASS_URI)
- .setDefaultOptionLabel("Select type");
- }
-
- /** Do not show the role label field for the AddEditorRoleToPerson form */
- @Override
- boolean isShowRoleLabelField() { return false; }
-
- /*
- * 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.ChildVClassesOptions;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesWithParent;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
+/**
+ * Generates the edit configuration for adding a Role to a Person.
+
+ Stage one is selecting the type of the non-person thing
+ associated with the Role with the intention of reducing the
+ number of Individuals that the user has to select from.
+ Stage two is selecting the non-person Individual to associate
+ with the Role.
+
+ This is intended to create a set of statements like:
+
+ ?person core:hasResearchActivityRole ?newRole.
+ ?newRole rdf:type core:ResearchActivityRole ;
+ roleToActivityPredicate ?someActivity .
+ ?someActivity rdf:type core:ResearchActivity .
+ ?someActivity rdfs:label "activity title" .
+
+
+ Each subclass of the abstract two stage Generator class will have the option of overriding certain
+ methods, and must always implement the following methods:
+ getRoleType
+ getRoleActivityTypeOptionsType
+ getRoleActivityTypeObjectClassUri
+ getRoleActivityTypeLiteralOptions
+
+ *
+ */
+public class AddEditorRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
+ private static String TEMPLATE = "addEditorRoleToPerson.ftl";
+ private static String OPTION_CLASS_URI = "http://purl.org/ontology/bibo/Collection";
+
+ @Override
+ String getTemplate(){ return TEMPLATE; }
+
+ @Override
+ String getRoleType() {
+ return "http://vivoweb.org/ontology/core#EditorRole";
+ }
+
+ @Override
+ FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
+ return new ChildVClassesOptions(OPTION_CLASS_URI)
+ .setDefaultOptionLabel("Select type");
+ }
+
+ /** Do not show the role label field for the AddEditorRoleToPerson form */
+ @Override
+ boolean isShowRoleLabelField() { return false; }
+
+ /*
+ * 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;
+ }
+*/
+}
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java
index afd47f35..05fb5503 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddEditorshipToPersonGenerator.java
@@ -213,14 +213,12 @@ public class AddEditorshipToPersonGenerator extends VivoBaseGenerator implements
List> literalOptions = new ArrayList>();
literalOptions.add(list("http://purl.org/ontology/bibo/Book", "Book"));
literalOptions.add(list("http://purl.org/ontology/bibo/Chapter", "Chapter"));
- literalOptions.add(list("http://purl.org/ontology/bibo/Collection", "Collection"));
literalOptions.add(list("http://purl.org/ontology/bibo/EditedBook", "Edited Book"));
literalOptions.add(list("http://purl.org/ontology/bibo/Film", "Film"));
literalOptions.add(list("http://purl.org/ontology/bibo/Magazine", "Magazine"));
literalOptions.add(list("http://vivoweb.org/ontology/core#Newsletter", "Newsletter"));
literalOptions.add(list("http://purl.org/ontology/bibo/Newspaper", "Newspaper"));
literalOptions.add(list("http://vivoweb.org/ontology/core#NewsRelease", "News Release"));
- literalOptions.add(list("http://purl.org/ontology/bibo/Periodical", "Periodical"));
literalOptions.add(list("http://purl.org/ontology/bibo/Report", "Report"));
literalOptions.add(list("http://vivoweb.org/ontology/core#Video", "Video"));
literalOptions.add(list("http://purl.org/ontology/bibo/Webpage", "Webpage"));
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java
index 087a4e0d..8a061c36 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddReviewerRoleToPersonGenerator.java
@@ -4,6 +4,7 @@ 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.ChildVClassesOptions;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
public class AddReviewerRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
@@ -34,8 +35,77 @@ public class AddReviewerRoleToPersonGenerator extends AddRoleToPersonTwoStageGen
*/
@Override
FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
- return new ChildVClassesOptions(OBJECT_VCLASS_URI)
- .setDefaultOptionLabel("Select type");
+ return new ConstantFieldOptions(
+ "", "Select type",
+ "http://purl.org/ontology/bibo/AcademicArticle", "Academic Article",
+ "http://purl.org/ontology/bibo/Article", "Article",
+ "http://purl.org/ontology/bibo/AudioDocument", "Audio Document",
+ "http://purl.org/ontology/bibo/AudioVisualDocument", "Audio-Visual Document",
+ "http://purl.org/ontology/bibo/Bill", "Bill",
+ "http://vivoweb.org/ontology/core#Blog", "Blog",
+ "http://vivoweb.org/ontology/core#BlogPosting", "Blog Posting",
+ "http://purl.org/ontology/bibo/Book", "Book",
+ "http://purl.org/ontology/bibo/BookSection", "Book Section",
+ "http://purl.org/ontology/bibo/Brief", "Brief",
+ "http://vivoweb.org/ontology/core#CaseStudy", "Case Study",
+ "http://vivoweb.org/ontology/core#Catalog", "Catalog",
+ "http://purl.org/ontology/bibo/Chapter", "Chapter",
+ "http://purl.org/spar/fabio/ClinicalGuideline", "Clinical Guideline",
+ "http://purl.org/ontology/bibo/Code", "Code",
+ "http://purl.org/ontology/bibo/CollectedDocument", "Collected Document",
+ "http://purl.org/spar/fabio/Comment", "Comment",
+ "http://vivoweb.org/ontology/core#ConferencePaper", "Conference Paper",
+ "http://vivoweb.org/ontology/core#ConferencePoster", "Conference Poster",
+ "http://purl.org/ontology/bibo/CourtReporter", "Court Reporter",
+ "http://vivoweb.org/ontology/core#Database", "Database",
+ "http://purl.org/ontology/bibo/LegalDecision", "Decision",
+ "http://purl.org/ontology/bibo/DocumentPart", "Document Part",
+ "http://purl.org/ontology/bibo/EditedBook", "Edited Book",
+ "http://vivoweb.org/ontology/core#EditorialArticle", "Editorial Article",
+ "http://purl.org/spar/fabio/Erratum", "Erratum",
+ "http://purl.org/ontology/bibo/Excerpt", "Excerpt",
+ "http://purl.org/ontology/bibo/Film", "Film",
+ "http://purl.org/ontology/bibo/Image", "Image",
+ "http://purl.org/ontology/bibo/Issue", "Issue",
+ "http://purl.org/ontology/bibo/Journal", "Journal",
+ "http://purl.obolibrary.org/obo/IAO_0000013", "Journal Article",
+ "http://purl.org/ontology/bibo/LegalCaseDocument", "Legal Case Document",
+ "http://purl.org/ontology/bibo/LegalDocument", "Legal Document",
+ "http://purl.org/ontology/bibo/Legislation", "Legislation",
+ "http://purl.org/ontology/bibo/Letter", "Letter",
+ "http://purl.org/ontology/bibo/Magazine", "Magazine",
+ "http://purl.org/ontology/bibo/Manual", "Manual",
+ "http://purl.org/ontology/bibo/Manuscript", "Manuscript",
+ "http://purl.org/ontology/bibo/Map", "Map",
+ "http://vivoweb.org/ontology/core#Newsletter", "Newsletter",
+ "http://purl.org/ontology/bibo/Newspaper", "Newspaper",
+ "http://vivoweb.org/ontology/core#NewsRelease", "News Release",
+ "http://purl.org/ontology/bibo/Note", "Note",
+ "http://purl.org/ontology/bibo/Patent", "Patent",
+ "http://purl.org/ontology/bibo/Periodical", "Periodical",
+ "http://purl.org/ontology/bibo/PersonalCommunicationDocument", "Personal Communication Document",
+ "http://purl.org/ontology/bibo/Proceedings", "Proceedings",
+ "http://purl.obolibrary.org/obo/OBI_0000272", "protocol",
+ "http://purl.org/ontology/bibo/Quote", "Quote",
+ "http://purl.org/ontology/bibo/ReferenceSource", "Reference Source",
+ "http://purl.org/ontology/bibo/Report", "Report",
+ "http://vivoweb.org/ontology/core#ResearchProposal", "Research Proposal",
+ "http://vivoweb.org/ontology/core#Review", "Review",
+ "http://vivoweb.org/ontology/core#Score", "Score",
+ "http://vivoweb.org/ontology/core#Screenplay", "Screenplay",
+ "http://purl.org/ontology/bibo/Series", "Series",
+ "http://purl.org/ontology/bibo/Slide", "Slide",
+ "http://purl.org/ontology/bibo/Slideshow", "Slideshow",
+ "http://vivoweb.org/ontology/core#Speech", "Speech",
+ "http://purl.org/ontology/bibo/Standard", "Standard",
+ "http://purl.org/ontology/bibo/Statute", "Statute",
+ "http://purl.org/ontology/bibo/Thesis", "Thesis",
+ "http://vivoweb.org/ontology/core#Translation", "Translation",
+ "http://vivoweb.org/ontology/core#Video", "Video",
+ "http://purl.org/ontology/bibo/Webpage", "Webpage",
+ "http://purl.org/ontology/bibo/Website", "Website",
+ "http://vivoweb.org/ontology/core#WorkingPaper", "Working Paper"
+ );
}
//isShowRoleLabelField remains true for this so doesn't need to be overwritten
diff --git a/themes/wilma/i18n/all.properties b/themes/wilma/i18n/all.properties
index acca3b94..8143af61 100644
--- a/themes/wilma/i18n/all.properties
+++ b/themes/wilma/i18n/all.properties
@@ -882,3 +882,4 @@ administering_organization_for = administering organization for
missing_credential = missing credential
grant_administered_by = grant being administered by
missing_grant = missing grant
+editor_of_entry = editor of entry for
\ No newline at end of file