From 5a115960b6a65c4af7618f47520a4f2b6b982ce3 Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Thu, 21 Nov 2013 10:06:46 -0500
Subject: [PATCH 1/4] VIVO-554: hiding add, update, delete links on the
 activity side of roles

---
 rdf/display/everytime/PropertyConfig.n3      | 22 ++++++++++++++++----
 rdf/tbox/firsttime/initialTBoxAnnotations.n3 |  4 ++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/rdf/display/everytime/PropertyConfig.n3 b/rdf/display/everytime/PropertyConfig.n3
index 3f11b701..fb7003ee 100644
--- a/rdf/display/everytime/PropertyConfig.n3
+++ b/rdf/display/everytime/PropertyConfig.n3
@@ -860,6 +860,20 @@ local:preferredTitleConfig a :ObjectPropertyDisplayConfig ;
 
 ### properties using default editing form ##
 
+local:credentialOfContext a :ConfigContext ;
+    :hasConfiguration local:credentialOfConfig ;
+    :configContextFor vivo:relatedBy ;
+    :qualifiedByDomain      vivo:Credential ;
+    :qualifiedBy      vivo:IssuedCredential .
+
+local:credentialOfConfig a :ObjectPropertyDisplayConfig ;
+    :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
+    :displayName "credential of" ;
+    vitro:displayRankAnnot 6;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody ;
+    :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupoverview> .
+
 local:documentHasPartContext a :ConfigContext ;
     :hasConfiguration local:documentHasPartConfig ;
     :configContextFor <http://purl.obolibrary.org/obo/BFO_0000051> ;
@@ -1236,8 +1250,8 @@ local:awardOrHonorReceiptsConfig a :ObjectPropertyDisplayConfig ;
     :listViewConfigFile "listViewConfig-default.xml"^^xsd:string ;
     :displayName "receipts" ;
     vitro:displayRankAnnot 3;
-    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
-    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    vitro:hiddenFromDisplayBelowRoleLevelAnnot role:nobody ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupother> .
 
 local:awardReceiptsContext a :ConfigContext ;
@@ -1337,7 +1351,7 @@ local:bfo_0000055Config a :ObjectPropertyDisplayConfig ;
     :displayName "participant" ;
     vitro:displayRankAnnot 1;
     vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
-    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupother> .
 
 ### grant roles using the core:relates property ###
@@ -1353,7 +1367,7 @@ local:grantRelatesConfig a :ObjectPropertyDisplayConfig ;
     :displayName "contributor" ;
     vitro:displayRankAnnot 1;
     vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
-    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
+    vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:nobody ;
     :propertyGroup <http://vivoweb.org/ontology#vitroPropertyGroupbiography> .
 
 ### faux properties for dateTimeValue ###
diff --git a/rdf/tbox/firsttime/initialTBoxAnnotations.n3 b/rdf/tbox/firsttime/initialTBoxAnnotations.n3
index 62726266..7ad08561 100644
--- a/rdf/tbox/firsttime/initialTBoxAnnotations.n3
+++ b/rdf/tbox/firsttime/initialTBoxAnnotations.n3
@@ -2654,11 +2654,11 @@ vivo:contributingRole
       vitro:displayLimitAnnot
               "5"^^xsd:int ;
       vitro:hiddenFromDisplayBelowRoleLevelAnnot
-              <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
+              <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
       vitro:inPropertyGroupAnnot
               <http://vivoweb.org/ontology#vitroPropertyGroupbiography> ;
       vitro:prohibitedFromUpdateBelowRoleLevelAnnot
-              <http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
+              <http://vitro.mannlib.cornell.edu/ns/vitro/role#nobody> ;
       vitro:selectFromExistingAnnot
               "true"^^xsd:boolean .
 

From ef4a628b1a75be860353a81e93b972070b2ddd64 Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Thu, 21 Nov 2013 12:39:15 -0500
Subject: [PATCH 2/4] VIVO-560: hide skos:Concept specific properties from the
 subclass pages

---
 .../freemarker/body/individual/individual.ftl       |  6 ++++++
 .../individual/IndividualTemplateModel.java         | 13 +++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/productMods/templates/freemarker/body/individual/individual.ftl b/productMods/templates/freemarker/body/individual/individual.ftl
index 290c49a5..5914ca06 100644
--- a/productMods/templates/freemarker/body/individual/individual.ftl
+++ b/productMods/templates/freemarker/body/individual/individual.ftl
@@ -18,6 +18,12 @@
     <!--postindividual overiew ftl-->
 </#assign>
 
+<#if individual.conceptSubclass() >
+    <#assign overview = propertyGroups.pullProperty("http://www.w3.org/2004/02/skos/core#broader")!> 
+    <#assign overview = propertyGroups.pullProperty("http://www.w3.org/2004/02/skos/core#narrower")!> 
+    <#assign overview = propertyGroups.pullProperty("http://www.w3.org/2004/02/skos/core#related")!> 
+</#if>
+
 <#include "individual-vitro.ftl">
 <script>
 var i18nStrings = {
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 1222df79..b1673748 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
@@ -31,6 +31,11 @@ public class IndividualTemplateModel extends BaseIndividualTemplateModel {
     
     private static final String FOAF = "http://xmlns.com/foaf/0.1/";
     private static final String PERSON_CLASS = FOAF + "Person";
+    private static final String AWARD_CLASS = "http://vivoweb.org/ontology/core#Award";
+    private static final String DEGREE_CLASS = "http://vivoweb.org/ontology/core#AcademicDegree";
+    private static final String CONTACT_CLASS = "http://purl.obolibrary.org/obo/ARG_2000376";
+    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 BASE_VISUALIZATION_URL = 
         UrlBuilder.getUrl(Route.VISUALIZATION_SHORT.path());
@@ -147,6 +152,14 @@ public class IndividualTemplateModel extends BaseIndividualTemplateModel {
     }
     
     /* Template methods (for efficiency, not pre-computed) */
+    public boolean conceptSubclass() {
+        if ( isVClass(AWARD_CLASS) || isVClass(DEGREE_CLASS) ||isVClass(CONTACT_CLASS) || isVClass(CREDENTIAL_CLASS) || isVClass(DTP_CLASS) ) {
+            return true;
+        }
+        else {
+            return false;
+        }
+    }
 
     public boolean person() {
         return isVClass(PERSON_CLASS);

From c90fa71bb1dbf64108b45c28b3a55d8b08626682 Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Thu, 21 Nov 2013 13:43:41 -0500
Subject: [PATCH 3/4] VIVO-563

---
 .../themes/wilma/i18n/all_es_GO.properties    |   3 +-
 .../edit/forms/addEditorshipToPerson.ftl      |   2 +-
 .../edit/forms/addReviewerRoleToPerson.ftl    |   3 +-
 .../AddEditorRoleToPersonGenerator.java       | 150 +++++++++---------
 .../AddEditorshipToPersonGenerator.java       |   2 -
 .../AddReviewerRoleToPersonGenerator.java     |  74 ++++++++-
 themes/wilma/i18n/all.properties              |   1 +
 7 files changed, 153 insertions(+), 82 deletions(-)

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     = "<span class='hint'>(${i18n().year_hint_format})</span>" />
 
 
-<h2>${titleVerb}&nbsp;${i18n().educational_training_for} ${editConfiguration.subjectName}</h2>
+<h2>${titleVerb}&nbsp;${i18n().editor_of_entry} ${editConfiguration.subjectName}</h2>
 
 <#--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<List<String>> literalOptions = new ArrayList<List<String>>();
         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

From 6f41e5c8b1f0eba1aac4af7f1a9e369a1170c8ea Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Thu, 21 Nov 2013 15:06:47 -0500
Subject: [PATCH 4/4] add group, team, et all to drop down lists for service
 roles

---
 .../forms/addOutreachProviderRoleToPerson.ftl | 57 ++++++++++---------
 .../forms/addServiceProviderRoleToPerson.ftl  | 57 ++++++++++---------
 ...OutreachProviderRoleToPersonGenerator.java |  6 +-
 ...dServiceProviderRoleToPersonGenerator.java | 45 +++++++++++++--
 4 files changed, 102 insertions(+), 63 deletions(-)

diff --git a/productMods/templates/freemarker/edit/forms/addOutreachProviderRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addOutreachProviderRoleToPerson.ftl
index 074605aa..f9362afb 100644
--- a/productMods/templates/freemarker/edit/forms/addOutreachProviderRoleToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addOutreachProviderRoleToPerson.ftl
@@ -1,29 +1,30 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#--Two stage form for service provider 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. AddOutreachProviderRoleToPersonGenerator.java.
-
-Optional values can be set, but each of these has default values
-set in addRoleToPersonTwoStage.ftl:
-
-buttonText
-typeSelectorLabel
-numDateFields
-showRoleLAbelField
-roleExamples-->
-
-
-<#--Variable assignments for Add Clinical Role To Person-->
-<#assign roleDescriptor = "${i18n().outreach_comm_service}" />
-<#assign typeSelectorLabel = "${i18n().outreach_comm_service_in}" />
-<#assign genericLabel = "${i18n().organization_capitalized}" />
-
-<#assign acTypes = "{activity: 'http://xmlns.com/foaf/0.1/Organization'}" />
-
-
-<#--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 service provider 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. AddOutreachProviderRoleToPersonGenerator.java.
+
+Optional values can be set, but each of these has default values
+set in addRoleToPersonTwoStage.ftl:
+
+buttonText
+typeSelectorLabel
+numDateFields
+showRoleLAbelField
+roleExamples-->
+
+
+<#--Variable assignments for Add Clinical Role To Person-->
+<#assign roleDescriptor = "${i18n().outreach_comm_service}" />
+<#assign typeSelectorLabel = "${i18n().outreach_comm_service_in}" />
+<#assign genericLabel = "${i18n().organization_capitalized}" />
+
+<#assign acMultipleTypes = "'true'" />
+<#assign acTypes = "{activity: 'http://xmlns.com/foaf/0.1/Organization,http://xmlns.com/foaf/0.1/Group,http://purl.obolibrary.org/obo/OBI_0000835,http://purl.org/NET/c4dm/event.owl#Event'}" />
+
+
+<#--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/addServiceProviderRoleToPerson.ftl b/productMods/templates/freemarker/edit/forms/addServiceProviderRoleToPerson.ftl
index 59775e5a..61f73913 100644
--- a/productMods/templates/freemarker/edit/forms/addServiceProviderRoleToPerson.ftl
+++ b/productMods/templates/freemarker/edit/forms/addServiceProviderRoleToPerson.ftl
@@ -1,29 +1,30 @@
-<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
-<#--Two stage form for service provider 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. AddServiceProviderRoleToPersonGenerator.java.
-
-Optional values can be set, but each of these has default values
-set in addRoleToPersonTwoStage.ftl:
-
-buttonText
-typeSelectorLabel
-numDateFields
-showRoleLAbelField
-roleExamples-->
-
-
-<#--Variable assignments for Add Service Provider Role To Person-->
-<#assign roleDescriptor = "${i18n().service_to_profession}" />
-<#assign typeSelectorLabel = "${i18n().service_to_profession_in}" />
-<#assign genericLabel = "${i18n().organization_capitalized}" />
-
-<#assign acTypes = "{activity: 'http://xmlns.com/foaf/0.1/Organization'}" />
-
-
-<#--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 service provider 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. AddServiceProviderRoleToPersonGenerator.java.
+
+Optional values can be set, but each of these has default values
+set in addRoleToPersonTwoStage.ftl:
+
+buttonText
+typeSelectorLabel
+numDateFields
+showRoleLAbelField
+roleExamples-->
+
+
+<#--Variable assignments for Add Service Provider Role To Person-->
+<#assign roleDescriptor = "${i18n().service_to_profession}" />
+<#assign typeSelectorLabel = "${i18n().service_to_profession_in}" />
+<#assign genericLabel = "${i18n().organization_capitalized}" />
+
+<#assign acMultipleTypes = "'true'" />
+<#assign acTypes = "{activity: 'http://xmlns.com/foaf/0.1/Organization,http://xmlns.com/foaf/0.1/Group,http://purl.obolibrary.org/obo/OBI_0000835,http://purl.org/NET/c4dm/event.owl#Event'}" />
+
+
+<#--Each of the two stage forms will include the form below-->
 <#include "addRoleToPersonTwoStage.ftl">
\ No newline at end of file
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java
index 5caa2647..55daf34d 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java
@@ -26,11 +26,13 @@ public class AddOutreachProviderRoleToPersonGenerator extends AddRoleToPersonTwo
     FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
                     return new ConstantFieldOptions(
             "","Select type",
+            "http://vivoweb.org/ontology/core#AcademicDepartment","Academic Department",
             "http://vivoweb.org/ontology/core#Association","Association",
             "http://vivoweb.org/ontology/core#Center","Center",
             "http://vivoweb.org/ontology/core#ClinicalOrganization","Clinical Organization",
             "http://vivoweb.org/ontology/core#College","College",
             "http://vivoweb.org/ontology/core#Committee","Committee",
+            "http://vivoweb.org/ontology/core#Company","Company",
             "http://vivoweb.org/ontology/core#Consortium","Consortium",
             "http://vivoweb.org/ontology/core#CoreLaboratory","Core Laboratory",
             "http://vivoweb.org/ontology/core#Department","Department",
@@ -40,18 +42,20 @@ public class AddOutreachProviderRoleToPersonGenerator extends AddRoleToPersonTwo
             "http://vivoweb.org/ontology/core#Foundation","Foundation",
             "http://vivoweb.org/ontology/core#FundingOrganization","Funding Organization",
             "http://vivoweb.org/ontology/core#GovernmentAgency","Government Agency",
+            "http://xmlns.com/foaf/0.1/Group","Group",
             "http://vivoweb.org/ontology/core#Hospital","Hospital",
             "http://vivoweb.org/ontology/core#Institute","Institute",
             "http://vivoweb.org/ontology/core#Laboratory","Laboratory",
             "http://vivoweb.org/ontology/core#Library","Library",
+            "http://purl.obolibrary.org/obo/OBI_0000835","Manufacturer",
             "http://vivoweb.org/ontology/core#Museum","Museum",
             "http://xmlns.com/foaf/0.1/Organization","Organization",
             "http://vivoweb.org/ontology/core#PrivateCompany","Private Company",
             "http://vivoweb.org/ontology/core#Program","Program",
             "http://vivoweb.org/ontology/core#Publisher","Publisher",
             "http://vivoweb.org/ontology/core#ResearchOrganization","Research Organization",
-            "http://vivoweb.org/ontology/core#Team","Team",
             "http://vivoweb.org/ontology/core#School","School",
+            "http://vivoweb.org/ontology/core#Team","Team",
             "http://vivoweb.org/ontology/core#ServiceProvidingLaboratory","Service Providing Lab",
             "http://vivoweb.org/ontology/core#StudentOrganization","Student Organization",
             "http://purl.obolibrary.org/obo/ERO_0000565","Technology Transfer Office",
diff --git a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
index b7d61b77..3e3d80a2 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java
@@ -3,7 +3,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 AddServiceProviderRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {	
@@ -21,11 +21,44 @@ public class AddServiceProviderRoleToPersonGenerator extends AddRoleToPersonTwoS
 	/** Service Provider role involves hard-coded options for the 
 	 * "right side" of the role or activity.	 */
 	@Override
-    FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
-        return new 
-        ChildVClassesOptions(OPTION_CLASS_URI)
-            .setDefaultOptionLabel("Select type");
-	}
+FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
+                return new ConstantFieldOptions(
+        "","Select type",
+        "http://vivoweb.org/ontology/core#AcademicDepartment","Academic Department",
+        "http://vivoweb.org/ontology/core#Association","Association",
+        "http://vivoweb.org/ontology/core#Center","Center",
+        "http://vivoweb.org/ontology/core#ClinicalOrganization","Clinical Organization",
+        "http://vivoweb.org/ontology/core#College","College",
+        "http://vivoweb.org/ontology/core#Committee","Committee",
+        "http://vivoweb.org/ontology/core#Company","Company",
+        "http://vivoweb.org/ontology/core#Consortium","Consortium",
+        "http://vivoweb.org/ontology/core#CoreLaboratory","Core Laboratory",
+        "http://vivoweb.org/ontology/core#Department","Department",
+        "http://vivoweb.org/ontology/core#Division","Division",
+        "http://purl.org/NET/c4dm/event.owl#Event","Event",
+        "http://vivoweb.org/ontology/core#ExtensionUnit","Extension Unit",
+        "http://vivoweb.org/ontology/core#Foundation","Foundation",
+        "http://vivoweb.org/ontology/core#FundingOrganization","Funding Organization",
+        "http://vivoweb.org/ontology/core#GovernmentAgency","Government Agency",
+        "http://xmlns.com/foaf/0.1/Group","Group",
+        "http://vivoweb.org/ontology/core#Hospital","Hospital",
+        "http://vivoweb.org/ontology/core#Institute","Institute",
+        "http://vivoweb.org/ontology/core#Laboratory","Laboratory",
+        "http://vivoweb.org/ontology/core#Library","Library",
+        "http://purl.obolibrary.org/obo/OBI_0000835","Manufacturer",
+        "http://vivoweb.org/ontology/core#Museum","Museum",
+        "http://xmlns.com/foaf/0.1/Organization","Organization",
+        "http://vivoweb.org/ontology/core#PrivateCompany","Private Company",
+        "http://vivoweb.org/ontology/core#Program","Program",
+        "http://vivoweb.org/ontology/core#Publisher","Publisher",
+        "http://vivoweb.org/ontology/core#ResearchOrganization","Research Organization",
+        "http://vivoweb.org/ontology/core#School","School",
+        "http://vivoweb.org/ontology/core#Team","Team",
+        "http://vivoweb.org/ontology/core#ServiceProvidingLaboratory","Service Providing Lab",
+        "http://vivoweb.org/ontology/core#StudentOrganization","Student Organization",
+        "http://purl.obolibrary.org/obo/ERO_0000565","Technology Transfer Office",
+        "http://vivoweb.org/ontology/core#University","University");
+}
 	
 	@Override
 	boolean isShowRoleLabelField(){return true;}