VIVO-208: all fields now displayed when custom forms are rendered; customized 2-stage forms will still work as before

productMods/WEB-INF/ontologies/app/loadedAtStartup/vivoOrganizationDataGetters.n3

@@ -6,6 +6,7 @@
 @prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
 @prefix core: <http://vivoweb.org/ontology/core#> .
 @prefix vivoweb: <http://vivoweb.org/ontology#> .
+@prefix afn:  <http://jena.hpl.hp.com/ARQ/function#> .
 
  
 #### n3 for research areas ####
@@ -30,12 +31,20 @@ display:getResearchAreaDataGetter
         """
         PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
         PREFIX vivo: <http://vivoweb.org/ontology/core#>
+        PREFIX afn:  <http://jena.hpl.hp.com/ARQ/function#>
         SELECT DISTINCT (str(?researchAreaLabel) AS ?raLabel) ?ra
         WHERE {
             ?individualURI vivo:organizationForPosition ?posn .
             ?posn  vivo:positionForPerson ?person .
             ?person vivo:hasResearchArea ?ra .
             ?ra rdfs:label ?researchAreaLabel
+            OPTIONAL { ?posn vivo:dateTimeInterval ?dti 
+                     OPTIONAL { ?dti vivo:end ?end .
+                                ?end vivo:dateTime ?endDate
+                     }
+            }
+            FILTER ( !bound(?endDate) ||                        
+                      afn:substring(str(?endDate), 0, 4) >= afn:substring(str(afn:now()), 0, 4) )
         }
         ORDER BY ?raLabel
         """ .

productMods/templates/freemarker/edit/forms/addAttendeeRoleToPerson.ftl

@@ -17,10 +17,12 @@ showRoleLAbelField
 roleExamples-->
 
 
-<#--Variable assignments for Add Clinical Role To Person-->
+<#--Variable assignments-->
 <#assign roleDescriptor = "${i18n().attended}" />
 <#assign typeSelectorLabel = "${i18n().event_type}" />
-<#assign buttonText = "${i18n().attendee_capitalized}" />
+<#assign genericLabel = "${i18n().event_capitalized}" />
+<#assign acMultipleTypes = "'true'" />
+<#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#EventSeries,http://purl.org/NET/c4dm/event.owl#Event'}" />
 
 <#--Each of the two stage forms will include the form below-->
 <#include "addRoleToPersonTwoStage.ftl">

productMods/templates/freemarker/edit/forms/addClinicalRoleToPerson.ftl

@@ -25,6 +25,10 @@ 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-->

productMods/templates/freemarker/edit/forms/addEditorRoleToPerson.ftl

@@ -20,7 +20,9 @@ roleExamples-->
 <#--Variable assignments for Add Clinical Role To Person-->
 <#assign roleDescriptor = "${i18n().collection_series_editor_role}" />
 <#assign typeSelectorLabel = "${i18n().editor_role_in}" />
+<#assign genericLabel = "Collection" />
 
+<#assign acTypes = "{activity: 'http://purl.org/ontology/bibo/Collection'}" />
 
 <#--Each of the two stage forms will include the form below-->
 <#include "addRoleToPersonTwoStage.ftl">

productMods/templates/freemarker/edit/forms/addHeadOfRoleToPerson.ftl

@@ -20,7 +20,9 @@ roleExamples-->
 <#--Variable assignments for Add Clinical Role To Person-->
 <#assign roleDescriptor = "${i18n().leadership}" />
 <#assign typeSelectorLabel = "${i18n().organization_type}" />
-<#assign buttonText = "${i18n().leadership_role}" />
+<#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-->
 <#include "addRoleToPersonTwoStage.ftl">

productMods/templates/freemarker/edit/forms/addMemberRoleToPerson.ftl

@@ -21,6 +21,8 @@ roleExamples-->
 <#assign roleDescriptor = "${i18n().membership}" />
 <#assign typeSelectorLabel = "${i18n().membership_in}" />
 <#assign roleActivityVClass = "${i18n().organizations}" />
+<#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-->
 <#include "addRoleToPersonTwoStage.ftl">

productMods/templates/freemarker/edit/forms/addOrganizerRoleToPerson.ftl

@@ -17,10 +17,12 @@ showRoleLAbelField
 roleExamples-->
 
 
-<#--Variable assignments for Add Clinical Role To Person-->
+<#--Variable assignments-->
 <#assign roleDescriptor = "${i18n().organizer_of}" />
 <#assign typeSelectorLabel = "${i18n().organizer_of}" />
-<#assign buttonText = "${i18n().organizer_role}" />
+<#assign genericLabel = "${i18n().event_capitalized}" />
+<#assign acMultipleTypes = "'true'" />
+<#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#EventSeries,http://purl.org/NET/c4dm/event.owl#Event'}"
 
 <#--Each of the two stage forms will include the form below-->
 <#include "addRoleToPersonTwoStage.ftl">

productMods/templates/freemarker/edit/forms/addOutreachProviderRoleToPerson.ftl

@@ -20,6 +20,9 @@ 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-->

productMods/templates/freemarker/edit/forms/addPresenterRoleToPerson.ftl

@@ -67,6 +67,9 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         <img src="${urls.images}/iconAlert.png" width="24" height="24" alert="${i18n().error_alert_icon}" />
         <p>
         <#--Checking if any required fields are empty-->
+        <#if lvf.submissionErrorExists(editSubmission, "presentationType")>
+ 	        Please select a presentation type.
+        </#if> 
         <#if lvf.submissionErrorExists(editSubmission, "presentationLabel")>
  	        ${i18n().select_or_enter_name}
         </#if> 
@@ -109,23 +112,23 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     </select>
     </p>
 
-    <div class="fullViewOnly">        
     <p>
-        <label for="presentation">### ${i18n().name_capitalized} ${requiredHint}</label>
+        <label for="presentation">${i18n().presentation_capitalized} ${i18n().name_capitalized} ${requiredHint}</label>
             <input class="acSelector" size="50"  type="text" id="presentation" acGroupName="presentation" name="presentationLabel" value="${presentationLabelValue}">
             <input class="display" type="hidden" id="presentationDisplay" acGroupName="presentation" name="presentationLabelDisplay" value="${presentationLabelDisplayValue}">
     </p>
 
     <div class="acSelection" acGroupName="presentation">
         <p class="inline">
-            <label></label>
+            <label>${i18n().selected_presentation}:</label>
             <span class="acSelectionInfo"></span>
             <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>
         <input class="acUriReceiver" type="hidden" id="presentationUri" name="existingPresentation" value="${existingPresentationValue}" ${flagClearLabelForExisting}="true" />
     </div>
-    <p><label for="roleLabel">${i18n().role_in} ### ${requiredHint} <span class="hint">(${i18n().presentation_hint})</span></label>
+     
+    <p><label for="roleLabel">${i18n().role_in} ${i18n().presentation_capitalized} ${requiredHint} <span class="hint">(${i18n().presentation_hint})</span></label>
         <input  size="50"  type="text" id="roleLabel" name="roleLabel" value="${roleLabelValue}" />
     </p>
   <p>
@@ -143,7 +146,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
       <input class="acUriReceiver" type="hidden" id="conferenceUri" name="existingConference" value="${conferenceValue}" ${flagClearLabelForExisting}="true" />
   </div>
     <p>
-        <h4 class="label">${i18n().years_participation_in} ###</h4>
+        <h4 class="label">${i18n().years_participating}</h4>
     </p>
     <#--Need to draw edit elements for dates here-->
     <#assign htmlForElements = editConfiguration.pageData.htmlForElements />
@@ -160,8 +163,6 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 
     <input type="hidden" id="editKey" name="editKey" value="${editKey}"/>
 
-    </div>
-
     <p class="submit">
         <input type="submit" class="submit" value="${submitButtonText}"/><span class="or"> ${i18n().or} </span>
         <a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
@@ -169,13 +170,6 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 
     <p id="requiredLegend" class="requiredHint">* ${i18n().required_fields}</p>
 
-    <#-- hide the html that gets written, and use java script to pass the value between the two -->
-    <div class="hidden">
-        <#if htmlForElements?keys?seq_contains("yearAwarded")>
-		    ${htmlForElements["yearAwarded"]} 
-        </#if>
-    </div>
-
 </form>
 
 </section>
@@ -184,7 +178,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 <script type="text/javascript">
 var customFormData  = {
     acUrl: '${urls.base}/autocomplete?tokenize=true&stem=true',
-    acTypes: {conference: 'http://purl.org/ontology/bibo/Conference'},
+    acTypes: {presentation: 'http://vivoweb.org/ontology/core#Presentation', conference: 'http://purl.org/ontology/bibo/Conference'},
     editMode: '${editMode}',
     defaultTypeName: 'presentation',
     multipleTypeNames: {presentation: 'presentation', conference: 'conference'},
@@ -210,6 +204,3 @@ ${scripts.add('<script type="text/javascript" src="${urls.base}/js/jquery-ui/js/
              '<script type="text/javascript" src="${urls.base}/js/browserUtils.js"></script>',
              '<script type="text/javascript" src="${urls.base}/js/jquery_plugins/jquery.bgiframe.pack.js"></script>',
              '<script type="text/javascript" src="${urls.base}/templates/freemarker/edit/forms/js/customFormWithAutocomplete.js"></script>')}
-
-
-

productMods/templates/freemarker/edit/forms/addPublicationToPerson.ftl

@@ -138,7 +138,6 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
              </#list>
         </select>
     </p>
-    <div class="fullViewOnly">        
         <p>
             <label for="title">${i18n().title_capitalized} ${requiredHint}</label>
             <input class="acSelector" size="60"  type="text" id="title" name="title" acGroupName="publication"  value="${titleValue}" />
@@ -301,7 +300,6 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     </p>
     </div> <!-- end fieldsForNewPub -->
 
-   </div> <!-- end fullViewOnly -->
        <p class="submit">
             <input type="hidden" name = "editKey" value="${editKey}"/>
             <input type="submit" id="submit" value="${submitButtonText}"/><span class="or"> ${i18n().or} </span><a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
@@ -318,7 +316,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         sparqlForAcFilter: '${sparqlForAcFilter}',
         sparqlQueryUrl: '${sparqlQueryUrl}',
         acUrl: '${urls.base}/autocomplete?tokenize=true',
-        acTypes: {collection: 'http://purl.org/ontology/bibo/Periodical', book: 'http://purl.org/ontology/bibo/Book', conference: 'http://purl.org/NET/c4dm/event.owl#Event', event: 'http://purl.org/NET/c4dm/event.owl#Event', editor: 'http://xmlns.com/foaf/0.1/Person', publisher: 'http://xmlns.com/foaf/0.1/Organization'},
+        acTypes: {publication: 'http://purl.org/ontology/bibo/Document', collection: 'http://purl.org/ontology/bibo/Periodical', book: 'http://purl.org/ontology/bibo/Book', conference: 'http://purl.org/NET/c4dm/event.owl#Event', event: 'http://purl.org/NET/c4dm/event.owl#Event', editor: 'http://xmlns.com/foaf/0.1/Person', publisher: 'http://xmlns.com/foaf/0.1/Organization'},
         editMode: '${editMode}',
         defaultTypeName: 'publication', // used in repair mode to generate button text
         multipleTypeNames: {collection: 'publication', book: 'book', conference: 'conference', event: 'event', editor: 'editor', publisher: 'publisher'},

productMods/templates/freemarker/edit/forms/addResearcherRoleToPerson.ftl

@@ -20,7 +20,10 @@ roleExamples-->
 <#--Variable assignments for Add Clinical Role To Person-->
 <#assign roleDescriptor = "${i18n().research_activity}" />
 <#assign typeSelectorLabel = "${i18n().research_activity_type}" />
+<#assign genericLabel = "${i18n().research_activity?capitalize}" />
 
+<#assign acMultipleTypes = "'true'" />
+<#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#Project,http://vivoweb.org/ontology/core#Grant'}" />
 
 <#--Each of the two stage forms will include the form below-->
 <#include "addRoleToPersonTwoStage.ftl">

productMods/templates/freemarker/edit/forms/addReviewerRoleToPerson.ftl

@@ -20,7 +20,10 @@ roleExamples-->
 <#--Variable assignments for Add Clinical Role To Person-->
 <#assign roleDescriptor = "${i18n().reviewer_of}" />
 <#assign typeSelectorLabel = "${i18n().reviewer_of}" />
-<#assign buttonText = "${i18n().reviewer_role}" />
+<#assign genericLabel = "${i18n().item_capitalized}" />
+
+<#assign acTypes = "{activity: 'http://vivoweb.org/ontology/core#InformationResource'}" />
 
 <#--Each of the two stage forms will include the form below-->
 <#include "addRoleToPersonTwoStage.ftl">
+

productMods/templates/freemarker/edit/forms/addRoleToPersonTwoStage.ftl

@@ -153,9 +153,9 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
        </p>
        
        
-   <div class="fullViewOnly">        
+<#--   <div class="fullViewOnly"> -->
             <p>
-                <label for="activity">### ${i18n().name_capitalized} ${requiredHint}</label>
+                <label for="activity">${genericLabel?capitalize} ${i18n().name_capitalized} ${requiredHint}</label>
                 <input class="acSelector" size="50"  type="text" id="activity" name="activityLabel"  acGroupName="activity" value="${activityLabelValue}" />
                 <input class="display" type="hidden" id="activityDisplay" acGroupName="activity" name="activityLabelDisplay" value="${activityLabelDisplayValue}">
             </p>
@@ -176,7 +176,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
             </div>
 
             <#if showRoleLabelField = true>
-            <p><label for="roleLabel">${i18n().role_in} ### ${requiredHint} ${roleExamples}</label>
+            <p><label for="roleLabel">${i18n().role_in} ${genericLabel?capitalize} ${requiredHint} ${roleExamples}</label>
                 <input  size="50"  type="text" id="roleLabel" name="roleLabel" value="${roleLabel}" />
             </p>
         	</#if>
@@ -188,7 +188,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
                		${htmlForElements["startField"]} ${yearHint}
                </#if>
             <#else>
-                <h4 class="label">${i18n().years_participation_in} ### </h4>
+                <h4 class="label">${i18n().years_participating} </h4>
                 <#if htmlForElements?keys?seq_contains("startField")>
                 	    <label class="dateTime" for="startField">${i18n().start_capitalized}</label>
                		    ${htmlForElements["startField"]} ${yearHint}
@@ -199,7 +199,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
                		    ${htmlForElements["endField"]} ${yearHint}
                </#if>
             </#if>
-        </div>
+<#--        </div> -->
         <p class="submit">
             <input type="hidden" id="editKey" name="editKey" value="${editKey}" />
             <input type="submit" id="submit" value="${submitButtonText}"/><span class="or"> ${i18n().or} </span><a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
@@ -214,7 +214,10 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 	var customFormData  = {
 	    acUrl: '${urls.base}/autocomplete?tokenize=true',
 	    editMode: '${editMode}',
-	    defaultTypeName: 'activity', // used in repair mode, to generate button text and org name field label
+	    acTypes: ${acTypes!},
+	    <#if acMultipleTypes??>acMultipleTypes: ${acMultipleTypes!},</#if>
+	    // used in repair mode: button text and org name label
+	    defaultTypeName: <#if genericLabel??>'${genericLabel}'<#else>'activity'</#if>, 
 	    baseHref: '${urls.base}/individual?uri=',
         blankSentinel: '${blankSentinel}',
         flagClearLabelForExisting: '${flagClearLabelForExisting}'

productMods/templates/freemarker/edit/forms/addServiceProviderRoleToPerson.ftl

@@ -20,7 +20,9 @@ roleExamples-->
 <#--Variable assignments for Add Service Provider Role To Person-->
 <#assign roleDescriptor = "${i18n().service_to_profession}" />
 <#assign typeSelectorLabel = "${i18n().service_to_profession_in}" />
-<#assign buttonText = "${i18n().service_provider_role}" />
+<#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-->

productMods/templates/freemarker/edit/forms/addTeacherRoleToPerson.ftl

@@ -22,5 +22,10 @@ roleExamples-->
 <#assign typeSelectorLabel = "${i18n().teaching_activity_type}" />
 <#assign roleExamples = "<span class='hint'>&nbsp;(${i18n().teaching_role_hint})</span>" />
 
+<#assign genericLabel = "${i18n().teaching_activity?capitalize}" />
+
+<#assign acMultipleTypes = "'true'" />
+<#assign acTypes = "{activity: 'http://purl.org/ontology/bibo/Conference,http://vivoweb.org/ontology/core#Course,http://purl.org/ontology/bibo/Workshop'}" />
+
 <#--Each of the two stage forms will include the form below-->
 <#include "addRoleToPersonTwoStage.ftl">

productMods/templates/freemarker/edit/forms/css/autocomplete.css

@@ -5,7 +5,7 @@ that don't load customFormWithAutocomplete.css still have access to these styles
 
 .acSelection {
     display: none;
-    margin-top: 2em;
+    margin-top: 1em;
 }
 .acSelectionInfo {
     background-color: #d9d9d9;

productMods/templates/freemarker/edit/forms/personHasAdvisingRelationship.ftl

@@ -131,7 +131,8 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 
     <div class="acSelection" acGroupName="advisee" id="adviseeAcSelection">
         <p class="inline">
-            <label>${i18n().selected_advisee}/span>
+            <label>${i18n().selected_advisee}
+            <span class="acSelectionInfo"></span>
             <a href="" class="verifyMatch"  title="${i18n().verify_match_capitalized}">(${i18n().verify_match_capitalized}</a> ${i18n().or} 
             <a href="#" class="changeSelection" id="changeSelection">${i18n().change_selection})</a>
         </p>

productMods/templates/freemarker/edit/forms/personHasEducationalTraining.ftl

@@ -111,7 +111,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     <p class="inline">    
         <label for="orgType">${i18n().org_type_capitalized} ${requiredHint}</label>
         <#assign orgTypeOpts = editConfiguration.pageData.orgType />
-        <select id="typeSelector" name="orgType" acGroupName="org">
+        <select id="typeSelector" name="orgType" acGroupName="organization">
             <option value="" selected="selected">${i18n().select_one}</option>                
             <#list orgTypeOpts?keys as key>             
                 <#if orgTypeValue = key>
@@ -123,15 +123,13 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         </select>
     </p>     
     
-  <div class="fullViewOnly">        
-    
     <p>
-        <label for="relatedIndLabel">### ${i18n().name_capitalized} ${requiredHint}</label>
+        <label for="relatedIndLabel">${i18n().organization_capitalized} ${i18n().name_capitalized} ${requiredHint}</label>
-        <input class="acSelector" size="50"  type="text" id="relatedIndLabel" name="orgLabel" acGroupName="org" value="${orgLabelValue}"  />
+        <input class="acSelector" size="50"  type="text" id="relatedIndLabel" name="orgLabel" acGroupName="organization" value="${orgLabelValue}"  />
-        <input class="display" type="hidden" id="orgDisplay" acGroupName="org" name="orgLabelDisplay" value="${orgLabelDisplayValue}">
+        <input class="display" type="hidden" id="orgDisplay" acGroupName="organization" name="orgLabelDisplay" value="${orgLabelDisplayValue}">
     </p>
         
-    <div class="acSelection" acGroupName="org">
+    <div class="acSelection" acGroupName="organization">
         <p class="inline">
             <label>${i18n().selected_organization}:</label>
             <span class="acSelectionInfo"></span>
@@ -150,7 +148,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
         </#list>
     </select>
     <p>
-        <label for="dept">${i18n().dept_or_school_name} ###</label>
+        <label for="dept">${i18n().dept_or_school_name} ${i18n().organization_capitalized}</label>
         <input  size="50"  type="text" id="dept" name="dept" value="${deptValue}" />
     </p>
     
@@ -191,7 +189,6 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
      </#if>
                                     
   	<#--End draw elements-->
-  </div>    
     <input type="hidden" id="editKey" name="editKey" value="${editKey}"/>
     <p class="submit">
          <input type="submit" id="submit" value="${submitButtonText}"/><span class="or"> ${i18n().or} </span>
@@ -207,6 +204,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 var customFormData  = {
     acUrl: '${urls.base}/autocomplete?tokenize=true&stem=true',
     editMode: '${editMode}',
+    acTypes: {organization: 'http://xmlns.com/foaf/0.1/Organization'},
     defaultTypeName: 'organization',
     baseHref: '${urls.base}/individual?uri=',
     blankSentinel: '${blankSentinel}',

productMods/templates/freemarker/edit/forms/personHasPositionHistory.ftl

@@ -103,13 +103,13 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
       <#list orgTypeOpts?keys as key>             
           <#if orgTypeValue = key >
             <span class="readOnly" id="typeSelectorSpan">${orgTypeOpts[key]}</span> 
-            <input type="hidden" id="typeSelectorInput" name="orgType" acGroupName="org" value="${orgTypeValue}" >
+            <input type="hidden" id="typeSelectorInput" name="orgType" acGroupName="organization" value="${orgTypeValue}" >
           </#if>           
       </#list>
     <#else>
     </#if>
 -->
-<select id="typeSelector" name="orgType" acGroupName="org">
+<select id="typeSelector" name="orgType" acGroupName="organization">
     <option value="" selected="selected">${i18n().select_one}</option>                
     <#list orgTypeOpts?keys as key>             
         <option value="${key}"  <#if orgTypeValue = key>selected</#if>>${orgTypeOpts[key]}</option>            
@@ -117,13 +117,12 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 </select>
   </p>
 
-  <div class="fullViewOnly">        
   <p>
-    <label for="relatedIndLabel">### ${i18n().name_capitalized} ${requiredHint}</label>
+    <label for="relatedIndLabel">${i18n().organization_capitalized} ${i18n().name_capitalized} ${requiredHint}</label>
-    <input type="text" name="orgLabel" id="orgLabel" acGroupName="org" size="50" class="acSelector" value="${orgLabelValue}" >
+    <input type="text" name="orgLabel" id="orgLabel" acGroupName="organization" size="50" class="acSelector" value="${orgLabelValue}" >
-    <input class="display" type="hidden" id="orgDisplay" acGroupName="org" name="orgLabelDisplay" value="${orgLabelDisplayValue}">
+    <input class="display" type="hidden" id="orgDisplay" acGroupName="organization" name="orgLabelDisplay" value="${orgLabelDisplayValue}">
   </p>
-    <div class="acSelection" acGroupName="org">
+    <div class="acSelection" acGroupName="organization">
         <p class="inline">
             <label>${i18n().selected_organization}:</label>
             <span class="acSelectionInfo"></span>
@@ -160,7 +159,6 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
     	
       <input type="hidden" name = "editKey" value="${editKey}" role="input"/>
 
-   </div>
       <p class="submit">
         <#if editMode == "edit">  
             <input type="submit" id="submit" name="submit-${formAction}" value="${submitButtonText}" class="submit" /> 
@@ -177,6 +175,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
 <script type="text/javascript">
 var customFormData  = {
     acUrl: '${urls.base}/autocomplete?tokenize=true',
+    acTypes: {organization: 'http://xmlns.com/foaf/0.1/Organization'},
     editMode: '${editMode}',
     defaultTypeName: 'organization', // used in repair mode, to generate button text and org name field label
     baseHref: '${urls.base}/individual?uri=',

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddAttendeeRoleToPersonGenerator.java

@@ -28,7 +28,10 @@ public class AddAttendeeRoleToPersonGenerator extends AddRoleToPersonTwoStageGen
         "http://purl.org/ontology/bibo/Conference", "Conference",
         "http://vivoweb.org/ontology/core#Course", "Course",
         "http://vivoweb.org/ontology/core#Exhibit", "Exhibit",
+        "http://purl.org/ontology/bibo/Hearing", "Hearing",
+        "http://purl.org/ontology/bibo/Interview", "Interview",
         "http://vivoweb.org/ontology/core#Meeting", "Meeting",
+        "http://purl.org/ontology/bibo/Performance", "Performance",
         "http://vivoweb.org/ontology/core#Presentation", "Presentation",
         "http://vivoweb.org/ontology/core#InvitedTalk", "Invited Talk",
         "http://purl.org/ontology/bibo/Workshop", "Workshop",

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddHeadOfRoleToPersonGenerator.java

@@ -4,12 +4,13 @@ package edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators
 
 import edu.cornell.mannlib.vitro.webapp.controller.VitroRequest;
 import edu.cornell.mannlib.vitro.webapp.dao.VitroVocabulary;
-import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ConstantFieldOptions;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
 
 public class AddHeadOfRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
 	
 	private static String template = "addHeadOfRoleToPerson.ftl";
+	private static String OPTION_CLASS_URI = "http://xmlns.com/foaf/0.1/Organization";
 
     //Should this be overridden
 	@Override
@@ -26,37 +27,9 @@ public class AddHeadOfRoleToPersonGenerator extends AddRoleToPersonTwoStageGener
     @Override
     FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
      
-        return new ConstantFieldOptions(
+        return new 
-        "", "Select type",
+        ChildVClassesOptions(OPTION_CLASS_URI)
-        "http://vivoweb.org/ontology/core#Association", "Association",
+            .setDefaultOptionLabel("Select type");
-        "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#Consortium", "Consortium",
-        "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://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://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#Project", "Project",
-        "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#Service", "Service",
-        "http://vivoweb.org/ontology/core#Team", "Team",
-        "http://vivoweb.org/ontology/core#StudentOrganization", "Student Organization",
-        "http://vivoweb.org/ontology/core#University", "University");		
 	}
 
 	@Override

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOrganizerRoleToPersonGenerator.java

@@ -31,7 +31,10 @@ public class AddOrganizerRoleToPersonGenerator extends AddRoleToPersonTwoStageGe
         "http://purl.org/ontology/bibo/Conference", "Conference",
         "http://vivoweb.org/ontology/core#Course", "Course",
         "http://vivoweb.org/ontology/core#Exhibit", "Exhibit",
+        "http://purl.org/ontology/bibo/Hearing", "Hearing",
+        "http://purl.org/ontology/bibo/Interview", "Interview",
         "http://vivoweb.org/ontology/core#Meeting", "Meeting",
+        "http://purl.org/ontology/bibo/Performance", "Performance",
         "http://vivoweb.org/ontology/core#Presentation", "Presentation",
         "http://vivoweb.org/ontology/core#InvitedTalk", "Invited Talk",
         "http://purl.org/ontology/bibo/Workshop", "Workshop",

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddOutreachProviderRoleToPersonGenerator.java

@@ -3,12 +3,13 @@
 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.ConstantFieldOptions;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
 
 public class AddOutreachProviderRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {
 	
 	private static String template = "addOutreachProviderRoleToPerson.ftl";
+	private static String OPTION_CLASS_URI = "http://xmlns.com/foaf/0.1/Organization";
 	
 	@Override
 	String getTemplate() {
@@ -23,38 +24,9 @@ public class AddOutreachProviderRoleToPersonGenerator extends AddRoleToPersonTwo
 	//Outreach Provider role involves hard-coded options for the "right side" of the role or activity
     @Override
     FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
-		return new ConstantFieldOptions(
+        return new 
-        "","Select type",
+        ChildVClassesOptions(OPTION_CLASS_URI)
-        "http://vivoweb.org/ontology/core#Association","Association",
+            .setDefaultOptionLabel("Select type");
-        "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#Consortium","Consortium",
-        "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://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://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#Project","Project",
-        "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#Service","Service",
-        "http://vivoweb.org/ontology/core#StudentOrganization","Student Organization",
-        "http://vivoweb.org/ontology/core#University","University");
-            
 	}
 
 	@Override

src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddServiceProviderRoleToPersonGenerator.java

@@ -3,11 +3,13 @@
 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.ConstantFieldOptions;
+import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.ChildVClassesOptions;
 import edu.cornell.mannlib.vitro.webapp.edit.n3editing.VTwo.fields.FieldOptions;
 
 public class AddServiceProviderRoleToPersonGenerator extends AddRoleToPersonTwoStageGenerator {	
     
+	private static String OPTION_CLASS_URI = "http://xmlns.com/foaf/0.1/Organization";
+
 	@Override
 	String getTemplate() { return "addServiceProviderRoleToPerson.ftl"; }
 
@@ -20,38 +22,9 @@ public class AddServiceProviderRoleToPersonGenerator extends AddRoleToPersonTwoS
 	 * "right side" of the role or activity.	 */
 	@Override
     FieldOptions getRoleActivityFieldOptions(VitroRequest vreq) throws Exception {
-		return new ConstantFieldOptions(
+        return new 
-        "","Select one",
+        ChildVClassesOptions(OPTION_CLASS_URI)
-        "http://purl.org/ontology/bibo/Conference","Conference",
+            .setDefaultOptionLabel("Select type");
-        "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#Consortium","Consortium",
-        "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://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://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#Project","Project",
-        "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#Service","Service",
-        "http://vivoweb.org/ontology/core#StudentOrganization","Student Organization",
-        "http://vivoweb.org/ontology/core#University","University");
 	}
 	
 	@Override

themes/wilma/i18n/all.properties

@@ -114,7 +114,7 @@ missing_info_resource = missing information resource
 award_receipt_name = award receipt name
 award_name = award name
 conferred_by = conferred by
-selected_award = Selected award
+selected_award = Selected Award
 
 incomplete_date_time_interval = incomplete date/time interval
 incomplete_date_time_value = incomplete date/time value
@@ -300,9 +300,9 @@ person_capitalized = Person
 organization_capitalized = Organization
 middle_name = Middle name
 initial_okay = initial okay
-selected_author = Selected author
+selected_author = Selected Author
 organization_name_capitalized = Organization name
-selected_organization = Selected organization
+selected_organization = Selected Organization
 
 clinical_activity = clinical activity
 clinical_activity_type = clinical activity type
@@ -354,7 +354,7 @@ presentation_type = Presentation Type
 role_in = Role in
 presentation_hint = e.g., Moderator, Speaker, Panelist
 presented_at = Presented At
-selected_conference = Selected conference
+selected_conference = Selected Conference
 years_participation_in = Years of Participation in
 
 grant_entry_for = grant entry for
@@ -824,3 +824,7 @@ quickview_tooltip = Click to view the standard profile page.
 global_research = Global Research
 country_wide_research = Country-wide Research
 local_research = Local Research
+selected_presentation = Selected Presentation
+event_capitalized = Event
+collection_capitalized = Collection
+item_capitalized = Item

themes/wilma/i18n/all_es.properties

@@ -110,7 +110,7 @@ missing_info_resource = falta de recursos de información
 award_receipt_name = Nombre del premio recibido
 award_name = Nombre del premio
 conferred_by = conferida por
-selected_award = Premio seleccionado
+selected_award = Premio Seleccionado
 
 incomplete_date_time_interval = intervalo de la fecha / hora incompleta
 incomplete_date_time_value = valor de fecha / hora incompleta
@@ -270,7 +270,7 @@ no_concepts_specified = Actualmente no hay conceptos especificados.
 return_to_profile = Volver a la página de perfil
 external_vocabulary_services = Servicios Vocabulario externos
 create_own_concept = Crea tu propio concepto
-add_selected_concept = Añadir Concept seleccionado
+add_selected_concept = Añadir Concept Seleccionado
 cannot_find_concept = No se puede encontrar el concepto que desea? Crea tu propia cuenta.
 add_concept = Añadir Concept
 
@@ -289,7 +289,7 @@ person_capitalized = Persona
 organization_capitalized = Organización
 middle_name = Segundo nombre
 initial_okay = inicial bien
-selected_author = Autor seleccionado
+selected_author = Autor Seleccionado
 organization_name_capitalized = Nombre de la organización
 selected_organization = Organización seleccionada
 
@@ -343,7 +343,7 @@ presentation_type = Presentación Tipo
 role_in = Papel en la
 presentation_hint = por ejemplo, Moderador, Presidente, Miembros
 presented_at = Presentado en
-selected_conference = Conferencia seleccionado
+selected_conference = Conferencia Seleccionado
 years_participation_in = Años de participación en
 
 grant_entry_for = autorizará la entrada de
@@ -353,16 +353,16 @@ grant_type = concesión de la
 
 publication_entry_for = entrada de la publicación de
 publication_type = Tipo de Publicación
-selected_publication = Publicación seleccionado
+selected_publication = Publicación Seleccionado
 published_in = Publicado en
-selected_journal = Diario seleccionado
+selected_journal = Diario Seleccionado
-selected_event = Evento seleccionado
+selected_event = Evento Seleccionado
 proceedings_of = Actas de
 editor_capitalized = Editor
 required_with_last_name = requerido con nueva Apellidos
-selected_editor = Editor seleccionado
+selected_editor = Editor Seleccionado
 publisher_capitalized = Editor
-selected_publisher = Editorial seleccionado
+selected_publisher = Editorial Seleccionado
 place_of_grant = Lugar de subvención
 volume_capitalized = Volumen
 number_capitalized = Número
@@ -371,7 +371,7 @@ chapter_capitalized = Capítulo
 start_page = Página de inicio
 end_page = Fin Página
 grant_date = Fecha de concesión
-selected_book = Libro seleccionado
+selected_book = Libro Seleccionado
 publication_date = Fecha de publicación
 place_of_publication = Lugar de publicación
 
@@ -395,7 +395,7 @@ teaching_role_hint = por ejemplo, instructor, facilitador, Asistente
 
 create_own_concept_all_caps = Crea uno Concept
 concept_capitalized = Concepto
-selected_concept = Concepto seleccionado
+selected_concept = Concepto Seleccionado
 create_concept = Crear Concept
 return_to_manage_concepts = Regresar a Administrar Conceptos
 
@@ -447,12 +447,12 @@ enter_posn_type_value = Por favor seleccione un valor en el campo Tipo de Posici
 enter_or_select_person_value = Por favor seleccione un valor existente o introduzca un nuevo valor en el campo Persona.
 position_title = Título del Puesto:
 position_type = Tipo de posición
-selected_person = Persona seleccionado
+selected_person = Persona Seleccionado
 
 degree_candidacy = Candidatura Grado
 subject_area = Asignatura
-selected_subject_area = Tema seleccionado Area
+selected_subject_area = Tema Seleccionado Area
-selected_advisee = Aconsejado seleccionado
+selected_advisee = Aconsejado Seleccionado
 advisee_capitalized = Aconsejado
 advising_relationship_type = Asesoramiento Tipo de Relacion
 select_advising_relationship_type = Por favor seleccione una Asesoría Tipo de relación.
@@ -462,7 +462,7 @@ years_participating = Años de Participación
 award_or_honor_for = premio o el honor de
 select_Award_or_enter_name = Por favor seleccione un valor existente o introduzca un nuevo valor en el Premio de Honor o el campo Nombre.
 award_honor_name = Premio de Honor o Nombre
-select_award = Premio seleccionado
+select_award = Premio Seleccionado
 conferred_by_capitalized = Conferidos por
 selected_conferred = Selected conferrer
 description = Descripción
@@ -812,3 +812,7 @@ quickview_tooltip = Pulsa aquí para ver la página de perfil estándar.
 global_research = Investigación Global
 country_wide_research = Investigación Pais
 local_research = Investigación Local
+selected_presentation = Presentación Seleccionado
+event_capitalized = Evento
+collection_capitalized = Colección
+item_capitalized = Artículo