revision 3087. Merge from trunk.
This commit is contained in:
anupsawant
commit
be5131e40b
20 changed files with 141 additions and 72 deletions
|
|
@ -1,9 +1,12 @@
|
|||
http://vivoweb.org/ontology/core#email http://vivoweb.org/ontology/core#primaryEmail Yes Map Directly-changed
|
||||
http://vivoweb.org/ontology/core#organizationForTraining No Add not set
|
||||
http://vivoweb.org/ontology/core#teaches No Delete not set
|
||||
http://vivoweb.org/ontology/core#taughtBy No Delete not set
|
||||
http://vivoweb.org/ontology/core#AwardOrHonor http://vivoweb.org/ontology/core#AwardReceipt Yes Map Directly-changed
|
||||
http://vivoweb.org/ontology/core#sponsorsAward No Delete not set
|
||||
http://vivoweb.org/ontology/core#AbstractInformation No Delete Delete
|
||||
http://vivoweb.org/ontology/core#titleOrRole No Delete Prop
|
||||
http://vivoweb.org/ontology/core#startYear No Delete Delete
|
||||
http://vitro.mannlib.cornell.edu/ns/vitro/0.7#Flag1Value1Thing No Delete not set
|
||||
http://vitro.mannlib.cornell.edu/ns/vitro/0.7#DependentResource No Delete not set
|
||||
http://vivoweb.org/ontology/core#DependentResource No Delete not set
|
||||
http://vitro.mannlib.cornell.edu/ns/vitro/0.7#Keyword No Delete Delete
|
||||
http://vitro.mannlib.cornell.edu/ns/vitro/0.7#keyword No Delete not set
|
||||
http://vivoweb.org/ontology/core#v No Delete not set
|
||||
http://vivoweb.org/ontology/core#organizerOf No Delete not set
|
||||
http://purl.org/ontology/bibo/organizer No Delete not set
|
||||
http://vivoweb.org/ontology/core#PrimaryURLLink http://vivoweb.org/ontology/core#URLLink Yes Map Directly-changed
|
||||
http://vivoweb.org/ontology/core#uspc http://vivoweb.org/ontology/core#cclCode Yes Map Directly-changed
|
||||
http://vivoweb.org/ontology/core#wipo-ipc http://vivoweb.org/ontology/core#iclCode Yes Map Directly-changed
|
||||
http://vivoweb.org/ontology/core#email http://vivoweb.org/ontology/core#primaryEmail Yes Map Directly-changed
|
||||
|
|
@ -0,0 +1,22 @@
|
|||
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
|
||||
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
|
||||
PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
|
||||
PREFIX owl: <http://www.w3.org/2002/07/owl#>
|
||||
PREFIX swrl: <http://www.w3.org/2003/11/swrl#>
|
||||
PREFIX swrlb: <http://www.w3.org/2003/11/swrlb#>
|
||||
PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>
|
||||
PREFIX vivo: <http://vivo.library.cornell.edu/ns/0.1#>
|
||||
PREFIX bibo: <http://purl.org/ontology/bibo/>
|
||||
PREFIX dcterms: <http://purl.org/dc/terms/>
|
||||
PREFIX event: <http://purl.org/NET/c4dm/event.owl#>
|
||||
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
|
||||
PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
|
||||
PREFIX core: <http://vivoweb.org/ontology/core#>
|
||||
|
||||
Construct {
|
||||
?something core:freetextKeyword ?textKeyWord .
|
||||
} where {
|
||||
?something vitro:keyword ?keywordIndividual .
|
||||
?keywordIndividual a vitro:Keyword .
|
||||
?keywordIndividual rdfs:label ?textKeyWord .
|
||||
}
|
||||
|
|
@ -0,0 +1,20 @@
|
|||
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
|
||||
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
|
||||
PREFIX xsd: <http://www.w3.org/2001/XMLSchema#>
|
||||
PREFIX owl: <http://www.w3.org/2002/07/owl#>
|
||||
PREFIX swrl: <http://www.w3.org/2003/11/swrl#>
|
||||
PREFIX swrlb: <http://www.w3.org/2003/11/swrlb#>
|
||||
PREFIX vitro: <http://vitro.mannlib.cornell.edu/ns/vitro/0.7#>
|
||||
PREFIX vivo: <http://vivo.library.cornell.edu/ns/0.1#>
|
||||
PREFIX bibo: <http://purl.org/ontology/bibo/>
|
||||
PREFIX dcterms: <http://purl.org/dc/terms/>
|
||||
PREFIX event: <http://purl.org/NET/c4dm/event.owl#>
|
||||
PREFIX foaf: <http://xmlns.com/foaf/0.1/>
|
||||
PREFIX skos: <http://www.w3.org/2004/02/skos/core#>
|
||||
PREFIX core: <http://vivoweb.org/ontology/core#>
|
||||
|
||||
Construct {
|
||||
?link core:rank "1"^^<http://www.w3.org/2001/XMLSchema#int> .
|
||||
} where {
|
||||
?link a core:PrimaryURLLink .
|
||||
}
|
||||
|
|
@ -1,7 +1,8 @@
|
|||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
||||
|
||||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="clinical activity" />
|
||||
<jsp:param name="roleDescriptor" value="clinical activity" />
|
||||
<jsp:param name="typeSelectorLabel" value="clinical activity type" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ClinicalRole" />
|
||||
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
|
||||
<jsp:param name="roleActivityType_objectClassUri" value="" />
|
||||
|
|
|
|||
|
|
@ -1,11 +1,13 @@
|
|||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
||||
|
||||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="editor for" />
|
||||
<jsp:param name="roleDescriptor" value="collection or series editor role" />
|
||||
<jsp:param name="typeSelectorLabel" value="editor role in" />
|
||||
<jsp:param name="showRoleLabelField" value="false" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#EditorRole" />
|
||||
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#forInformationResource" />
|
||||
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#linkedRole" />
|
||||
<jsp:param name="roleActivityType_optionsType" value="CHILD_VCLASSES" />
|
||||
<jsp:param name="roleActivityType_objectClassUri" value="http://purl.org/ontology/bibo/Collection" />
|
||||
<jsp:param name="roleActivityType_literalOptions" value="[ 'Select one' ]" />
|
||||
<jsp:param name="roleActivityType_literalOptions" value="[ 'Select type' ]" />
|
||||
</jsp:include>
|
||||
|
|
@ -1,13 +1,14 @@
|
|||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
||||
|
||||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="head of" />
|
||||
<jsp:param name="roleDescriptor" value="head of" />
|
||||
<jsp:param name="typeSelectorLabel" value="head of" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#LeaderRole" />
|
||||
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
|
||||
<jsp:param name="roleActivityType_objectClassUri" value="" />
|
||||
|
||||
<jsp:param name="roleActivityType_literalOptions"
|
||||
value='["", "Select one"],
|
||||
value='["", "Select type"],
|
||||
[ "http://vivoweb.org/ontology/core#Association", "Association" ],
|
||||
[ "http://vivoweb.org/ontology/core#Center", "Center" ],
|
||||
[ "http://vivoweb.org/ontology/core#ClinicalOrganization", "Clinical Organization" ],
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
||||
|
||||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="membership" />
|
||||
<jsp:param name="roleDescriptor" value="membership" />
|
||||
<jsp:param name="typeSelectorLabel" value="membership in" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#MemberRole" />
|
||||
<jsp:param name="roleActivityType_optionsType" value="VCLASSGROUP" />
|
||||
<jsp:param name="roleActivityType_objectClassUri" value="http://vivoweb.org/ontology#vitroClassGrouporganizations" />
|
||||
<jsp:param name="roleActivityType_literalOptions" value="[ 'Select one' ]" />
|
||||
<jsp:param name="roleActivityType_literalOptions" value="[ 'Select type' ]" />
|
||||
</jsp:include>
|
||||
|
|
@ -1,12 +1,15 @@
|
|||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
||||
|
||||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="organizer of" />
|
||||
<jsp:param name="roleDescriptor" value="organizer of" />
|
||||
<jsp:param name="typeSelectorLabel" value="organizer of" />
|
||||
<jsp:param name="showRoleLabelField" value="false" />
|
||||
<jsp:param name="buttonText" value="organizer role" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#OrganizerRole" />
|
||||
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
|
||||
<jsp:param name="roleActivityType_objectClassUri" value="" />
|
||||
<jsp:param name="roleActivityType_literalOptions"
|
||||
value='["", "Select one"],
|
||||
value='["", "Select type"],
|
||||
[ "http://purl.org/NET/c4dm/event.owl#Event", "Event" ],
|
||||
[ "http://vivoweb.org/ontology/core#Competition", "Competition" ],
|
||||
[ "http://http://purl.org/ontology/bibo/Conference", "Conference" ],
|
||||
|
|
|
|||
|
|
@ -1,12 +1,13 @@
|
|||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
||||
|
||||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="outreach & community service" />
|
||||
<jsp:param name="roleDescriptor" value="outreach & community service" />
|
||||
<jsp:param name="typeSelectorLabel" value="outreach & community service in" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#OutreachProviderRole" />
|
||||
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
|
||||
<jsp:param name="roleActivityType_objectClassUri" value="" />
|
||||
<jsp:param name="roleActivityType_literalOptions"
|
||||
value='["", "Select one"],
|
||||
value='["", "Select type"],
|
||||
[ "http://vivoweb.org/ontology/core#Association", "Association" ],
|
||||
[ "http://vivoweb.org/ontology/core#Center", "Center" ],
|
||||
[ "http://vivoweb.org/ontology/core#ClinicalOrganization", "Clinical Organization" ],
|
||||
|
|
|
|||
|
|
@ -2,8 +2,9 @@
|
|||
|
||||
|
||||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="presentation" />
|
||||
<jsp:param name="buttonLabel" value="presentation role" />
|
||||
<jsp:param name="roleDescriptor" value="presentation" />
|
||||
<jsp:param name="typeSelectorLabel" value="presentation type" />
|
||||
<jsp:param name="buttonText" value="presentation role" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#PresenterRole" />
|
||||
<jsp:param name="numDateFields" value="1" />
|
||||
<jsp:param name="roleExamples" value="Moderator, Speaker, Panelist" />
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
||||
|
||||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="research activity" />
|
||||
<jsp:param name="roleDescriptor" value="research activity" />
|
||||
<jsp:param name="typeSelectorLabel" value="research activity type" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ResearcherRole" />
|
||||
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
|
||||
<jsp:param name="roleActivityType_objectClassUri" value="" />
|
||||
|
|
|
|||
|
|
@ -1,11 +1,14 @@
|
|||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
||||
|
||||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="reviewer of" />
|
||||
<jsp:param name="roleDescriptor" value="reviewer of" />
|
||||
<jsp:param name="typeSelectorLabel" value="reviewer of" />
|
||||
<jsp:param name="buttonText" value="reviewer role" />
|
||||
<jsp:param name="showRoleLabelField" value="false" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ReviewerRole" />
|
||||
<jsp:param name="roleToActivityPredicate" value="http://vivoweb.org/ontology/core#forInformationResource" />
|
||||
<jsp:param name="activityToRolePredicate" value="http://vivoweb.org/ontology/core#linkedRole" />
|
||||
<jsp:param name="roleActivityType_optionsType" value="CHILD_VCLASSES" />
|
||||
<jsp:param name="roleActivityType_objectClassUri" value="http://vivoweb.org/ontology/core#InformationResource" />
|
||||
<jsp:param name="roleActivityType_literalOptions" value="[ 'Select one' ]" />
|
||||
<jsp:param name="roleActivityType_literalOptions" value="[ 'Select type' ]" />
|
||||
</jsp:include>
|
||||
|
|
@ -58,35 +58,42 @@
|
|||
|
||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.Field"%>
|
||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.elements.DateTimeWithPrecision"%>
|
||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.DateTimeIntervalValidation"%><c:set var="vivoOnt" value="http://vivoweb.org/ontology" />
|
||||
<%@ page import="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.validators.DateTimeIntervalValidation"%>
|
||||
|
||||
<%!
|
||||
public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.edit.forms.addRoleToPersonTwoStage.jsp");
|
||||
%>
|
||||
|
||||
<c:set var="vivoCore" value="${vivoOnt}/core#" />
|
||||
|
||||
<%--
|
||||
These are the parameters that MUST be set of this form:
|
||||
role type
|
||||
predicate inverse
|
||||
role activity type label (should be singular)
|
||||
super type of role types for roleActivityType select list generation
|
||||
|
||||
These are optional parameters:
|
||||
roleToActivityPredicate (default value is http://vivoweb.org/ontology/core#roleIn)
|
||||
activityToRolePredicate (default value is http://vivoweb.org/ontology/core#relatedRole)
|
||||
--%>
|
||||
<%-- REQUIRED PARAMETERS --%>
|
||||
|
||||
<c:set var="roleActivityTypeLabel">${param.roleActivityTypeLabel}</c:set>
|
||||
<c:set var="buttonLabel" scope="request">${! empty param.buttonLabel ? param.buttonLabel : param.roleActivityTypeLabel}</c:set>
|
||||
<c:set var="roleType">${param.roleType}</c:set>
|
||||
<c:set var="roleDescriptor">${param.roleDescriptor}</c:set> <%-- Used in textual references to the role --%>
|
||||
<c:set var="roleType">${param.roleType}</c:set> <%-- uri of role individual type --%>
|
||||
|
||||
<%-- For creating the role activity type select list: --%>
|
||||
<c:set var="roleActivityType_optionsType" >${param.roleActivityType_optionsType}</c:set>
|
||||
<c:set var="roleActivityType_objectClassUri" >${param.roleActivityType_objectClassUri}</c:set>
|
||||
<c:set var="roleActivityType_literalOptions" >${param.roleActivityType_literalOptions}</c:set>
|
||||
|
||||
|
||||
<%-- OPTIONAL PARAMETERS --%>
|
||||
|
||||
<c:set var="typeSelectorLabel" scope="request"> <%-- label for type selector field --%>
|
||||
${! empty param.typeSelectorLabel ? param.typeSelectorLabel : param.roleDescriptor}
|
||||
</c:set>
|
||||
<c:set var="buttonText" scope="request">
|
||||
${! empty param.buttonText ? param.buttonText : param.roleDescriptor}
|
||||
</c:set>
|
||||
<c:set var="roleToActivityPredicate" scope="request">
|
||||
${! empty param.roleToActivityPredicate ? param.roleToActivityPredicate : "http://vivoweb.org/ontology/core#roleIn"}
|
||||
</c:set>
|
||||
<c:set var="activityToRolePredicate">
|
||||
${! empty param.activityToRolePredicate ? param.activityToRolePredicate : "http://vivoweb.org/ontology/core#relatedRole"}
|
||||
</c:set>
|
||||
<c:set var="numDateFields">${! empty param.numDateFields ? param.numDateFields : 2 }</c:set>
|
||||
<c:set var="roleToActivityPredicate" scope="request">${! empty param.roleToActivityPredicate ? param.roleToActivityPredicate : "http://vivoweb.org/ontology/core#roleIn"}</c:set>
|
||||
<c:set var="activityToRolePredicate">${! empty param.activityToRolePredicate ? param.activityToRolePredicate : "http://vivoweb.org/ontology/core#relatedRole"}</c:set>
|
||||
<c:set var="showRoleLabelField">
|
||||
${! empty param.showRoleLabelField ? param.showRoleLabelField : true }
|
||||
</c:set>
|
||||
|
||||
<%
|
||||
VitroRequest vreq = new VitroRequest(request);
|
||||
|
|
@ -106,9 +113,10 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
|
|||
|
||||
vreq.setAttribute("gYearDatatypeUriJson", MiscWebUtils.escape(XSD.gYear.toString()));
|
||||
|
||||
vreq.setAttribute("roleActivityTitleCase", TitleCase.toTitleCase(vreq.getParameter("roleActivityTypeLabel")));
|
||||
String buttonLabel = (String) vreq.getAttribute("buttonLabel");
|
||||
vreq.setAttribute("buttonLabel", TitleCase.toTitleCase(buttonLabel));
|
||||
vreq.setAttribute("typeSelectorLabelTitleCase",
|
||||
TitleCase.toTitleCase( (String)vreq.getAttribute("typeSelectorLabel"), false));
|
||||
String buttonText = (String) vreq.getAttribute("buttonText");
|
||||
vreq.setAttribute("buttonText", TitleCase.toTitleCase(buttonText));
|
||||
|
||||
ObjectProperty op = wdf.getObjectPropertyDao().getObjectPropertyByURI( predicateUri );
|
||||
if( op != null && op.getURIInverse() != null ){
|
||||
|
|
@ -162,8 +170,9 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
|
|||
<c:set var="intervalToEnd" value="${vivoCore}end"/>
|
||||
|
||||
<%-- label and type required if we are doing an add or a repair, but not an edit --%>
|
||||
<c:set var="labelRequired" ><%= (mode == EditMode.ADD || mode == EditMode.REPAIR) ?"\"nonempty\"," : "" %></c:set>
|
||||
<c:set var="typeRequired" ><%= (mode == EditMode.ADD || mode == EditMode.REPAIR) ?"\"nonempty\"" : "" %></c:set>
|
||||
<c:set var="labelRequired" ><%= (mode == EditMode.ADD || mode == EditMode.REPAIR) ? "\"nonempty\"," : "" %></c:set>
|
||||
<c:set var="typeRequired" ><%= (mode == EditMode.ADD || mode == EditMode.REPAIR) ? "\"nonempty\"" : "" %></c:set>
|
||||
<c:set var="roleLabelRequired">${showRoleLabelField ? "\"nonempty\"," : "" }</c:set>
|
||||
|
||||
<v:jsonset var="roleLabelAssertion" >
|
||||
?role <${label}> ?roleLabel .
|
||||
|
|
@ -231,15 +240,6 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp.
|
|||
SELECT ?existingRoleLabel WHERE { ?role <${label}> ?existingRoleLabel . }
|
||||
</v:jsonset>
|
||||
|
||||
<%--
|
||||
<v:jsonset var="activityTypeQuery">
|
||||
PREFIX core: <${vivoCore}>
|
||||
SELECT ?existingActivityType WHERE {
|
||||
?role <${roleToActivityPredicate}> ?existingActivity .
|
||||
?existingActivity a ?existingActivityType .
|
||||
}
|
||||
</v:jsonset>
|
||||
--%>
|
||||
<%
|
||||
request.setAttribute("typeQuery", getActivityTypeQuery(vreq));
|
||||
%>
|
||||
|
|
@ -313,8 +313,9 @@ request.setAttribute("typeQuery", getActivityTypeQuery(vreq));
|
|||
"predicate" : ["rolePredicate", "${predicateUriJson}" ],
|
||||
"object" : ["role", "${objectUriJson}", "URI" ],
|
||||
|
||||
"n3required" : [ "${n3ForNewRole}", "${roleLabelAssertion}" ],
|
||||
"n3optional" : [ "${n3ForActivityLabel}", "${n3ForActivityType}", "${n3ForInverse}", "${n3ForStart}", "${n3ForEnd}" ],
|
||||
"n3required" : [ "${n3ForNewRole}" ],
|
||||
"n3optional" : [ "${n3ForActivityLabel}", "${n3ForActivityType}", "${n3ForInverse}",
|
||||
"${n3ForStart}", "${n3ForEnd}", "${roleLabelAssertion}" ],
|
||||
|
||||
"newResources" : { "role" : "${defaultNamespace}",
|
||||
"roleActivity" : "${defaultNamespace}",
|
||||
|
|
@ -380,7 +381,7 @@ request.setAttribute("typeQuery", getActivityTypeQuery(vreq));
|
|||
},
|
||||
"roleLabel" : {
|
||||
"newResource" : "false",
|
||||
"validators" : [ "nonempty","datatype:${stringDatatypeUriJson}" ],
|
||||
"validators" : [ ${roleLabelRequired} "datatype:${stringDatatypeUriJson}" ],
|
||||
"optionsType" : "UNDEFINED",
|
||||
"literalOptions" : [ ],
|
||||
"predicateUri" : "",
|
||||
|
|
@ -421,7 +422,7 @@ request.setAttribute("typeQuery", getActivityTypeQuery(vreq));
|
|||
editConfig = new EditConfiguration((String) request.getAttribute("editjson"));
|
||||
EditConfiguration.putConfigInSession(editConfig,session);
|
||||
|
||||
//setup date time edit elements
|
||||
//set up date time edit elements
|
||||
Field startField = editConfig.getField("startField");
|
||||
startField.setEditElement(
|
||||
new DateTimeWithPrecision(startField,
|
||||
|
|
@ -468,13 +469,13 @@ request.setAttribute("typeQuery", getActivityTypeQuery(vreq));
|
|||
<%-- Includes edit AND repair mode --%>
|
||||
<c:when test="<%= request.getAttribute(\"objectUri\")!=null %>">
|
||||
<c:set var="titleVerb" value="Edit" />
|
||||
<c:set var="submitButtonText" value="Edit ${buttonLabel}" />
|
||||
<c:set var="submitButtonText" value="Edit ${buttonText}" />
|
||||
<c:set var="disabledVal">${editMode == "repair" ? "" : "disabled" }</c:set>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<c:set var="titleVerb" value="Create" />
|
||||
<c:set var="editMode" value="add" />
|
||||
<c:set var="submitButtonText" value="${buttonLabel}" />
|
||||
<c:set var="submitButtonText" value="${buttonText}" />
|
||||
<c:set var="disabledVal" value="" />
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
|
|
@ -487,15 +488,15 @@ request.setAttribute("typeQuery", getActivityTypeQuery(vreq));
|
|||
|
||||
<% if( mode == EditMode.ERROR ){ %>
|
||||
<div>This form is unable to handle the editing of this role because it is associated with
|
||||
multiple ${param.roleActivityTypeLabel} individuals.</div>
|
||||
multiple ${param.roleDescriptor} individuals.</div>
|
||||
<% }else{ %>
|
||||
|
||||
<h2>${titleVerb} ${roleActivityTypeLabel} entry for <%= subjectName %></h2>
|
||||
<h2>${titleVerb} ${roleDescriptor} entry for <%= subjectName %></h2>
|
||||
<%-- DO NOT CHANGE IDS, CLASSES, OR HTML STRUCTURE IN THIS FORM WITHOUT UNDERSTANDING THE IMPACT ON THE JAVASCRIPT! --%>
|
||||
|
||||
<form id="addRoleForm" class="customForm" action="<c:url value="/edit/processRdfForm2.jsp"/>" >
|
||||
|
||||
<p class="inline"><v:input type="select" label="${roleActivityTitleCase} Type ${requiredHint}" name="roleActivityType" disabled="${disabledVal}" id="typeSelector" /></p>
|
||||
<p class="inline"><v:input type="select" label="${typeSelectorLabelTitleCase} ${requiredHint}" name="roleActivityType" disabled="${disabledVal}" id="typeSelector" /></p>
|
||||
|
||||
<div class="fullViewOnly">
|
||||
|
||||
|
|
@ -514,7 +515,9 @@ request.setAttribute("typeQuery", getActivityTypeQuery(vreq));
|
|||
<v:input type="hidden" id="roleActivityUri" name="roleActivity" cssClass="acUriReceiver" /> <!-- Field value populated by JavaScript -->
|
||||
</div>
|
||||
|
||||
<p><v:input type="text" id="roleLabel" label="Role in ### ${requiredHint} ${roleExamples}" size="50" /></p>
|
||||
<c:if test="${showRoleLabelField}">
|
||||
<p><v:input type="text" id="roleLabel" label="Role in ### ${requiredHint} ${roleExamples}" size="50" /></p>
|
||||
</c:if>
|
||||
|
||||
<c:choose>
|
||||
<c:when test="${numDateFields == 1}">
|
||||
|
|
|
|||
|
|
@ -1,13 +1,14 @@
|
|||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
||||
|
||||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="service to the profession" />
|
||||
<jsp:param name="roleDescriptor" value="service to the profession" />
|
||||
<jsp:param name="typeSelectorLabel" value="service to the profession in" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#ServiceProviderRole" />
|
||||
|
||||
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
|
||||
<jsp:param name="roleActivityType_objectClassUri" value="" />
|
||||
<jsp:param name="roleActivityType_literalOptions"
|
||||
value='["", "Select one"],
|
||||
value='["", "Select type"],
|
||||
[ "http://vivoweb.org/ontology/core#Association", "Association" ],
|
||||
[ "http://vivoweb.org/ontology/core#Center", "Center" ],
|
||||
[ "http://vivoweb.org/ontology/core#ClinicalOrganization", "Clinical Organization" ],
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
<%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%>
|
||||
|
||||
<jsp:include page="addRoleToPersonTwoStage.jsp">
|
||||
<jsp:param name="roleActivityTypeLabel" value="teaching activity" />
|
||||
<jsp:param name="roleDescriptor" value="teaching activity" />
|
||||
<jsp:param name="typeSelectorLabel" value="teaching activity type" />
|
||||
<jsp:param name="roleType" value="http://vivoweb.org/ontology/core#TeacherRole" />
|
||||
<jsp:param name="roleExamples" value="Instructor, Facilitator, Assistant" />
|
||||
<jsp:param name="roleActivityType_optionsType" value="HARDCODED_LITERALS" />
|
||||
|
|
|
|||
|
|
@ -456,7 +456,7 @@ var customForm = {
|
|||
getTypeNameForLabels: function() {
|
||||
// If this.acType is empty, we are either in a one-step form with no type yet selected,
|
||||
// or in repair mode in a two-step form with no type selected. Use the default type
|
||||
// name specified in the form data (this.typeName is 'Select one').
|
||||
// name specified in the form data.
|
||||
return this.acType ? this.typeName : this.capitalize(this.defaultTypeName);
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -1620,6 +1620,9 @@ form.customForm p.note{
|
|||
#my-account input#new-password {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
section.account-feedback img {
|
||||
padding-right: 5px;
|
||||
}
|
||||
/* RESET PASSWORD ------> */
|
||||
#reset-password p.note {
|
||||
margin-top: 0;
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 290 B After Width: | Height: | Size: 262 B |
Binary file not shown.
|
Before Width: | Height: | Size: 293 B After Width: | Height: | Size: 264 B |
|
|
@ -18,7 +18,9 @@
|
|||
<ul class="dropdown">
|
||||
<li id="user-menu"><a href="#">${user.loginName}</a>
|
||||
<ul class="sub_menu">
|
||||
<li role="listitem" class="inactive">My profile</li>
|
||||
<#if user.hasProfile>
|
||||
<li role="listitem"><a href="${user.profileUrl}">My profile</a></li>
|
||||
</#if>
|
||||
<li role="listitem"><a href="${urls.myAccount}">My account</a></li>
|
||||
<li role="listitem"><a href="${urls.logout}">Log out</a></li>
|
||||
</ul>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue