From 3c76cdcc937e8871e090808c31353187ffa53eb2 Mon Sep 17 00:00:00 2001
From: rjy7 <rjy7@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 14 Jul 2010 17:42:01 +0000
Subject: [PATCH] Changing id fullViewOnly to class, since we may need more
 than one per form

---
 productMods/edit/forms/addClinicalRoleToPerson.jsp          | 4 +---
 productMods/edit/forms/addGrantRoleToPerson.jsp             | 2 +-
 productMods/edit/forms/addMemberRoleToPerson.jsp            | 4 +---
 productMods/edit/forms/addPresentationRoleToPerson.jsp      | 4 +---
 productMods/edit/forms/addPublicationToPerson.jsp           | 2 +-
 productMods/edit/forms/addResearchActivityRoleToPerson.jsp  | 4 +---
 productMods/edit/forms/addRoleToPersonTwoStage.jsp          | 4 ++--
 productMods/edit/forms/addTeachingActivityRoleToPerson.jsp  | 4 +---
 .../edit/forms/css/customFormWithAdvanceTypeSelection.css   | 2 +-
 .../edit/forms/js/customFormWithAdvanceTypeSelection.js     | 6 +++---
 10 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/productMods/edit/forms/addClinicalRoleToPerson.jsp b/productMods/edit/forms/addClinicalRoleToPerson.jsp
index a16d104b..c73906c2 100644
--- a/productMods/edit/forms/addClinicalRoleToPerson.jsp
+++ b/productMods/edit/forms/addClinicalRoleToPerson.jsp
@@ -1,12 +1,10 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%-- sparqlForAcFilter must be all one line for JavaScript. --%>
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="sparqlForAcFilter" value="PREFIX core: <http://vivoweb.org/ontology/core#> SELECT ?pubUri WHERE {<${subjectUri}> core:authorInAuthorship ?authorshipUri .?authorshipUri core:linkedInformationResource ?pubUri .}" />	
 	<jsp:param name="roleActivityTypeLabel" value="clinical activity" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ClinicalRole" />
 	
 	<jsp:param name="roleActivityType_optionsType" value="LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
-	<jsp:param name="roleActivityType_literalOptions" value='["http://vivoweb.org/ontology/core#Project", "Project" ], [ "http://vivoweb.org/ontology/core#Service","Service"] ' />
+	<jsp:param name="roleActivityType_literalOptions" value='["", "Select one" ], ["http://vivoweb.org/ontology/core#Project", "Project" ], [ "http://vivoweb.org/ontology/core#Service","Service"] ' />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addGrantRoleToPerson.jsp b/productMods/edit/forms/addGrantRoleToPerson.jsp
index dbf7a06d..67732b59 100644
--- a/productMods/edit/forms/addGrantRoleToPerson.jsp
+++ b/productMods/edit/forms/addGrantRoleToPerson.jsp
@@ -205,7 +205,7 @@ if ( ((String)request.getAttribute("predicateUri")).endsWith("hasPrincipalInvest
 
 <%-- Must be all one line for JavaScript. --%>
 <c:set var="sparqlForAcFilter">
-PREFIX core: <${vivoCore}> SELECT ?grantUri WHERE {<${subjectUri}> core:hasPrincipalInvestigatorRole ?grantRole .?grantRole core:relatedRole ?grantUri .}
+PREFIX core: <${vivoCore}> SELECT ?grantUri WHERE {<${subjectUri}> core:hasPrincipalInvestigatorRole ?grantRole . ?grantRole core:roleIn ?grantUri .}
 </c:set>
 
 <script type="text/javascript">
diff --git a/productMods/edit/forms/addMemberRoleToPerson.jsp b/productMods/edit/forms/addMemberRoleToPerson.jsp
index 512c1ff1..442382e2 100644
--- a/productMods/edit/forms/addMemberRoleToPerson.jsp
+++ b/productMods/edit/forms/addMemberRoleToPerson.jsp
@@ -1,12 +1,10 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%-- sparqlForAcFilter must be all one line for JavaScript. --%>
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="sparqlForAcFilter" value="PREFIX core: <http://vivoweb.org/ontology/core#> SELECT ?pubUri WHERE {<${subjectUri}> core:authorInAuthorship ?authorshipUri .?authorshipUri core:linkedInformationResource ?pubUri .}" />	
 	<jsp:param name="roleActivityTypeLabel" value="membership" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#MemberRole" />
 	
 	<jsp:param name="roleActivityType_optionsType" value="CHILD_VCLASSES" />
 	<jsp:param name="roleActivityType_objectClassUri" value="http://xmlns.com/foaf/0.1/Organization" /> 
-	<jsp:param name="roleActivityType_literalOptions" value="" />
+	<jsp:param name="roleActivityType_literalOptions" value="[ 'Select one' ]" />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addPresentationRoleToPerson.jsp b/productMods/edit/forms/addPresentationRoleToPerson.jsp
index e08e1864..d338e06d 100644
--- a/productMods/edit/forms/addPresentationRoleToPerson.jsp
+++ b/productMods/edit/forms/addPresentationRoleToPerson.jsp
@@ -1,13 +1,11 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
 
-<%-- sparqlForAcFilter must be all one line for JavaScript. --%>
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="sparqlForAcFilter" value="PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; SELECT ?pubUri WHERE {&lt;${subjectUri}&gt; core:authorInAuthorship ?authorshipUri .?authorshipUri core:linkedInformationResource ?pubUri .}" />	
 	<jsp:param name="roleActivityTypeLabel" value="presentation" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#PresenterRole" />	
 	
 	<jsp:param name="roleActivityType_optionsType" value="LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
-	<jsp:param name="roleActivityType_literalOptions" value='["http://vivoweb.org/ontology/core#Presentation", "Presentation" ], [ "http://vivoweb.org/ontology/core#InvitedTalk","Invited Talk"] ' />
+	<jsp:param name="roleActivityType_literalOptions" value='["", "Select one" ], ["http://vivoweb.org/ontology/core#Presentation", "Presentation" ], [ "http://vivoweb.org/ontology/core#InvitedTalk","Invited Talk"] ' />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addPublicationToPerson.jsp b/productMods/edit/forms/addPublicationToPerson.jsp
index 9ed6a9c4..f50d6a72 100644
--- a/productMods/edit/forms/addPublicationToPerson.jsp
+++ b/productMods/edit/forms/addPublicationToPerson.jsp
@@ -210,7 +210,7 @@ SPARQL queries for existing values. --%>
 
     <p class="inline"><v:input type="select" label="Publication Type ${requiredHint}" name="pubType" id="typeSelector" /></p>
     
-    <div id="fullViewOnly">
+    <div class="fullViewOnly">
         
 	   <p><v:input type="text" id="label" name="title" label="Title" cssClass="acSelector" size="50" /></p>
 
diff --git a/productMods/edit/forms/addResearchActivityRoleToPerson.jsp b/productMods/edit/forms/addResearchActivityRoleToPerson.jsp
index aba8ea6e..33e2f708 100644
--- a/productMods/edit/forms/addResearchActivityRoleToPerson.jsp
+++ b/productMods/edit/forms/addResearchActivityRoleToPerson.jsp
@@ -1,12 +1,10 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%-- sparqlForAcFilter must be all one line for JavaScript. --%>
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="sparqlForAcFilter" value="PREFIX core: <http://vivoweb.org/ontology/core#> SELECT ?pubUri WHERE {<${subjectUri}> core:authorInAuthorship ?authorshipUri .?authorshipUri core:linkedInformationResource ?pubUri .}" />	
 	<jsp:param name="roleActivityTypeLabel" value="research activity" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ResearcherRole" />
 	
 	<jsp:param name="roleActivityType_optionsType" value="LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
-	<jsp:param name="roleActivityType_literalOptions" value='["http://vivoweb.org/ontology/core#Grant", "Grant" ], [ "http://vivoweb.org/ontology/core#Project","Project"] ' />
+	<jsp:param name="roleActivityType_literalOptions" value='["", "Select one" ], ["http://vivoweb.org/ontology/core#Grant", "Grant" ], [ "http://vivoweb.org/ontology/core#Project","Project"] ' />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
index e4fa1094..866496d4 100644
--- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp
+++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp
@@ -218,7 +218,7 @@
 
     <p class="inline"><v:input type="select" label="${roleActivityTypeLabel} Type ${requiredHint}" name="roleActivityType" id="typeSelector" /></p>
     
-    <div id="fullViewOnly">
+    <div class="fullViewOnly">
         
 	    <p><v:input type="text" id="label" name="title" label="Title" cssClass="acSelector" size="50" /></p>
 
@@ -239,7 +239,7 @@
 
 <%-- Must be all one line for JavaScript. --%>
 <c:set var="sparqlForAcFilter">
-SELECT ?indUri WHERE {<${subjectUri}> <${predicateUri}> ?role .?role <...> ?indUri .}
+SELECT ?indUri WHERE {<${subjectUri}> <${predicateUri}> ?role . ?role <${vivoCore}relatedRole> ?indUri .}
 </c:set>
 
 <script type="text/javascript">
diff --git a/productMods/edit/forms/addTeachingActivityRoleToPerson.jsp b/productMods/edit/forms/addTeachingActivityRoleToPerson.jsp
index 036ebdd6..11e594f6 100644
--- a/productMods/edit/forms/addTeachingActivityRoleToPerson.jsp
+++ b/productMods/edit/forms/addTeachingActivityRoleToPerson.jsp
@@ -1,12 +1,10 @@
 <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
 
-<%-- sparqlForAcFilter must be all one line for JavaScript. --%>
 <jsp:include page="addRoleToPersonTwoStage.jsp">    
-	<jsp:param name="sparqlForAcFilter" value="PREFIX core: &lt;http://vivoweb.org/ontology/core#&gt; SELECT ?pubUri WHERE {&lt;${subjectUri}&gt; core:authorInAuthorship ?authorshipUri .?authorshipUri core:linkedInformationResource ?pubUri .}" />	
 	<jsp:param name="roleActivityTypeLabel" value="teaching activity" />
 	<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#TeacherRole" />
 	
 	<jsp:param name="roleActivityType_optionsType" value="LITERALS" />
 	<jsp:param name="roleActivityType_objectClassUri" value="" /> 
-	<jsp:param name="roleActivityType_literalOptions" value='["http://purl.org/ontology/bibo/Conference", "Conference" ], [ "http://vivoweb.org/ontology/core#Course","Course"], [ "http://purl.org/ontology/bibo/Workshop","Workshop"] ' />
+	<jsp:param name="roleActivityType_literalOptions" value='["", "Select one" ], ["http://purl.org/ontology/bibo/Conference", "Conference" ], [ "http://vivoweb.org/ontology/core#Course","Course"], [ "http://purl.org/ontology/bibo/Workshop","Workshop"] ' />
 </jsp:include>
\ No newline at end of file
diff --git a/productMods/edit/forms/css/customFormWithAdvanceTypeSelection.css b/productMods/edit/forms/css/customFormWithAdvanceTypeSelection.css
index 1d4495bd..8692614b 100644
--- a/productMods/edit/forms/css/customFormWithAdvanceTypeSelection.css
+++ b/productMods/edit/forms/css/customFormWithAdvanceTypeSelection.css
@@ -2,7 +2,7 @@
 
 /* Although Javascript hides these on page load, hide here as well to avoid the flash on page load.
    This needs to be removed to support a non-JS version of the form. */
-#fullViewOnly, 
+.fullViewOnly, 
 #submit, 
 .or,
 #requiredLegend {
diff --git a/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js b/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
index 927f25c3..4931428a 100644
--- a/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
+++ b/productMods/edit/forms/js/customFormWithAdvanceTypeSelection.js
@@ -23,7 +23,7 @@ var customForm = {
     initObjects: function(){
         
         this.form = $('#content form');
-        this.fullViewOnly = $('#fullViewOnly');
+        this.fullViewOnly = $('.fullViewOnly');
         this.button = $('#submit');
         this.baseButtonText = this.button.val();
         this.requiredLegend = $('#requiredLegend');
@@ -223,11 +223,11 @@ var customForm = {
         filteredResults = [];
         $.each(results, function() {
             if ($.inArray(this.uri, customForm.acFilter) == -1) {
-                // console.log("adding " + this.label + " to filtered results");
+                console.log("adding " + this.label + " to filtered results");
                 filteredResults.push(this);
             }
             else {
-                // console.log("filtering out " + this.label);
+                console.log("filtering out " + this.label);
             }
         });
         return filteredResults;