diff --git a/productMods/WEB-INF/ontologies/update/diff.tab.txt b/productMods/WEB-INF/ontologies/update/diff.tab.txt index 4a507007..97463a07 100644 --- a/productMods/WEB-INF/ontologies/update/diff.tab.txt +++ b/productMods/WEB-INF/ontologies/update/diff.tab.txt @@ -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 \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/Keyword.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/Keyword.sparql new file mode 100644 index 00000000..95ab878e --- /dev/null +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/Keyword.sparql @@ -0,0 +1,22 @@ +PREFIX rdf: +PREFIX rdfs: +PREFIX xsd: +PREFIX owl: +PREFIX swrl: +PREFIX swrlb: +PREFIX vitro: +PREFIX vivo: +PREFIX bibo: +PREFIX dcterms: +PREFIX event: +PREFIX foaf: +PREFIX skos: +PREFIX core: + +Construct { + ?something core:freetextKeyword ?textKeyWord . +} where { + ?something vitro:keyword ?keywordIndividual . + ?keywordIndividual a vitro:Keyword . + ?keywordIndividual rdfs:label ?textKeyWord . +} \ No newline at end of file diff --git a/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/PrimaryURLLink.sparql b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/PrimaryURLLink.sparql new file mode 100644 index 00000000..b3bfa7ed --- /dev/null +++ b/productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/PrimaryURLLink.sparql @@ -0,0 +1,20 @@ +PREFIX rdf: +PREFIX rdfs: +PREFIX xsd: +PREFIX owl: +PREFIX swrl: +PREFIX swrlb: +PREFIX vitro: +PREFIX vivo: +PREFIX bibo: +PREFIX dcterms: +PREFIX event: +PREFIX foaf: +PREFIX skos: +PREFIX core: + +Construct { + ?link core:rank "1"^^ . +} where { + ?link a core:PrimaryURLLink . +} \ No newline at end of file diff --git a/productMods/edit/forms/addClinicalRoleToPerson.jsp b/productMods/edit/forms/addClinicalRoleToPerson.jsp index 2390270d..5eb41709 100644 --- a/productMods/edit/forms/addClinicalRoleToPerson.jsp +++ b/productMods/edit/forms/addClinicalRoleToPerson.jsp @@ -1,7 +1,8 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> - + + diff --git a/productMods/edit/forms/addEditorRoleToPerson.jsp b/productMods/edit/forms/addEditorRoleToPerson.jsp index d5c7842a..c982d386 100644 --- a/productMods/edit/forms/addEditorRoleToPerson.jsp +++ b/productMods/edit/forms/addEditorRoleToPerson.jsp @@ -1,11 +1,13 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> - + + + - + \ No newline at end of file diff --git a/productMods/edit/forms/addHeadOfRoleToPerson.jsp b/productMods/edit/forms/addHeadOfRoleToPerson.jsp index 89b67b13..db3cb930 100644 --- a/productMods/edit/forms/addHeadOfRoleToPerson.jsp +++ b/productMods/edit/forms/addHeadOfRoleToPerson.jsp @@ -1,13 +1,14 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> - + + - + + - + \ No newline at end of file diff --git a/productMods/edit/forms/addOrganizerRoleToPerson.jsp b/productMods/edit/forms/addOrganizerRoleToPerson.jsp index c9beec5c..cf23023a 100644 --- a/productMods/edit/forms/addOrganizerRoleToPerson.jsp +++ b/productMods/edit/forms/addOrganizerRoleToPerson.jsp @@ -1,12 +1,15 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> - + + + + - + + - - + + + diff --git a/productMods/edit/forms/addResearcherRoleToPerson.jsp b/productMods/edit/forms/addResearcherRoleToPerson.jsp index 00096a0f..141b1805 100644 --- a/productMods/edit/forms/addResearcherRoleToPerson.jsp +++ b/productMods/edit/forms/addResearcherRoleToPerson.jsp @@ -1,7 +1,8 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> - + + diff --git a/productMods/edit/forms/addReviewerRoleToPerson.jsp b/productMods/edit/forms/addReviewerRoleToPerson.jsp index 302f9c66..d181e77a 100644 --- a/productMods/edit/forms/addReviewerRoleToPerson.jsp +++ b/productMods/edit/forms/addReviewerRoleToPerson.jsp @@ -1,11 +1,14 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> - + + + + - + \ No newline at end of file diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp index 32738bf4..1b88d875 100644 --- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp +++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp @@ -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"%> +<%@ 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"); %> - -<%-- - 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 --%> -${param.roleActivityTypeLabel} -${! empty param.buttonLabel ? param.buttonLabel : param.roleActivityTypeLabel} -${param.roleType} +${param.roleDescriptor} <%-- Used in textual references to the role --%> +${param.roleType} <%-- uri of role individual type --%> + +<%-- For creating the role activity type select list: --%> ${param.roleActivityType_optionsType} ${param.roleActivityType_objectClassUri} ${param.roleActivityType_literalOptions} + + +<%-- OPTIONAL PARAMETERS --%> + + <%-- label for type selector field --%> + ${! empty param.typeSelectorLabel ? param.typeSelectorLabel : param.roleDescriptor} + + + ${! empty param.buttonText ? param.buttonText : param.roleDescriptor} + + + ${! empty param.roleToActivityPredicate ? param.roleToActivityPredicate : "http://vivoweb.org/ontology/core#roleIn"} + + + ${! empty param.activityToRolePredicate ? param.activityToRolePredicate : "http://vivoweb.org/ontology/core#relatedRole"} + ${! empty param.numDateFields ? param.numDateFields : 2 } -${! empty param.roleToActivityPredicate ? param.roleToActivityPredicate : "http://vivoweb.org/ontology/core#roleIn"} -${! empty param.activityToRolePredicate ? param.activityToRolePredicate : "http://vivoweb.org/ontology/core#relatedRole"} + + ${! empty param.showRoleLabelField ? param.showRoleLabelField : true } + <% 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. <%-- label and type required if we are doing an add or a repair, but not an edit --%> -<%= (mode == EditMode.ADD || mode == EditMode.REPAIR) ?"\"nonempty\"," : "" %> -<%= (mode == EditMode.ADD || mode == EditMode.REPAIR) ?"\"nonempty\"" : "" %> +<%= (mode == EditMode.ADD || mode == EditMode.REPAIR) ? "\"nonempty\"," : "" %> +<%= (mode == EditMode.ADD || mode == EditMode.REPAIR) ? "\"nonempty\"" : "" %> +${showRoleLabelField ? "\"nonempty\"," : "" } ?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 . } -<%-- - - PREFIX core: <${vivoCore}> - SELECT ?existingActivityType WHERE { - ?role <${roleToActivityPredicate}> ?existingActivity . - ?existingActivity a ?existingActivityType . - } - ---%> <% 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 --%> "> - + ${editMode == "repair" ? "" : "disabled" } - + @@ -487,15 +488,15 @@ request.setAttribute("typeQuery", getActivityTypeQuery(vreq)); <% if( mode == EditMode.ERROR ){ %>
This form is unable to handle the editing of this role because it is associated with - multiple ${param.roleActivityTypeLabel} individuals.
+ multiple ${param.roleDescriptor} individuals. <% }else{ %> -

${titleVerb} ${roleActivityTypeLabel} entry for <%= subjectName %>

+

${titleVerb} ${roleDescriptor} entry for <%= subjectName %>

<%-- DO NOT CHANGE IDS, CLASSES, OR HTML STRUCTURE IN THIS FORM WITHOUT UNDERSTANDING THE IMPACT ON THE JAVASCRIPT! --%>
" > -

+

@@ -514,7 +515,9 @@ request.setAttribute("typeQuery", getActivityTypeQuery(vreq));
-

+ +

+ diff --git a/productMods/edit/forms/addServiceProviderRoleToPerson.jsp b/productMods/edit/forms/addServiceProviderRoleToPerson.jsp index ccab85c6..f39a975a 100644 --- a/productMods/edit/forms/addServiceProviderRoleToPerson.jsp +++ b/productMods/edit/forms/addServiceProviderRoleToPerson.jsp @@ -1,13 +1,14 @@ <%-- $This file is distributed under the terms of the license in /doc/license.txt$ --%> - + + - + + diff --git a/productMods/edit/forms/js/customFormWithAutocomplete.js b/productMods/edit/forms/js/customFormWithAutocomplete.js index 91ae75c1..597388b0 100644 --- a/productMods/edit/forms/js/customFormWithAutocomplete.js +++ b/productMods/edit/forms/js/customFormWithAutocomplete.js @@ -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); }, diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css index ee0227c8..14b2c959 100644 --- a/themes/wilma/css/wilma.css +++ b/themes/wilma/css/wilma.css @@ -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; diff --git a/themes/wilma/images/sort-asc.gif b/themes/wilma/images/sort-asc.gif index ede12619..906b7573 100644 Binary files a/themes/wilma/images/sort-asc.gif and b/themes/wilma/images/sort-asc.gif differ diff --git a/themes/wilma/images/sort-desc.gif b/themes/wilma/images/sort-desc.gif index cf69164b..dcc043eb 100644 Binary files a/themes/wilma/images/sort-desc.gif and b/themes/wilma/images/sort-desc.gif differ diff --git a/themes/wilma/templates/identity.ftl b/themes/wilma/templates/identity.ftl index 5be3fe37..50630c05 100644 --- a/themes/wilma/templates/identity.ftl +++ b/themes/wilma/templates/identity.ftl @@ -18,7 +18,9 @@