litvinovg/vitro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

NIHVIVO-1629 Upgrade jQuery to version 1.5. NIHVIVO-2153 Change datetime fieldnames to use hyphen rather than period, since the latter generates errors in jQuery 1.5 and is not a valid CSS selector.

Browse source
This commit is contained in:
rjy7 2011-02-21 16:09:40 +00:00
parent 8e554c3975
commit dae5369232
8 changed files with 146 additions and 284 deletions
Download patch file Download diff file Expand all files Collapse all files

16
webapp/web/edit/forms/dateTimeIntervalForm.jsp
View file

@ -56,8 +56,8 @@
?intervalNode <${type}> <${intervalType}> .
?intervalNode <${intervalToStart}> ?startNode .
?startNode <${type}> <${dateTimeValueType}> .
?startNode <${dateTimeValue}> ?startField.value .
?startNode <${dateTimePrecision}> ?startField.precision .
?startNode <${dateTimeValue}> ?startField-value .
?startNode <${dateTimePrecision}> ?startField-precision .
</v:jsonset>
<v:jsonset var="n3ForEnd">
@ -65,8 +65,8 @@
?intervalNode <${type}> <${intervalType}> .
?intervalNode <${intervalToEnd}> ?endNode .
?endNode <${type}> <${dateTimeValueType}> .
?endNode <${dateTimeValue}> ?endField.value .
?endNode <${dateTimePrecision}> ?endField.precision .
?endNode <${dateTimeValue}> ?endField-value .
?endNode <${dateTimePrecision}> ?endField-precision .
</v:jsonset>
<%-- Queries for editing an existing role --%>
@ -175,15 +175,15 @@
"sparqlForLiterals" : { },
"sparqlForUris" : { },
"sparqlForExistingLiterals" : {
"startField.value" : "${existingStartDateQuery}",
"endField.value" : "${existingEndDateQuery}"
"startField-value" : "${existingStartDateQuery}",
"endField-value" : "${existingEndDateQuery}"
},
"sparqlForExistingUris" : {
"intervalNode" : "${existingIntervalNodeQuery}",
"startNode" : "${existingStartNodeQuery}",
"endNode" : "${existingEndNodeQuery}",
"startField.precision": "${existingStartPrecisionQuery}",
"endField.precision" : "${existingEndPrecisionQuery}"
"startField-precision": "${existingStartPrecisionQuery}",
"endField-precision" : "${existingEndPrecisionQuery}"
},
"fields" : {
"startField" : {

8
webapp/web/edit/forms/dateTimeValueForm.jsp
View file

@ -51,8 +51,8 @@
<v:jsonset var="n3ForValue">
?subject <${toDateTimeValue}> ?valueNode .
?valueNode <${type}> <${valueType}> .
?valueNode <${dateTimeValue}> ?dateTimeField.value .
?valueNode <${dateTimePrecision}> ?dateTimeField.precision .
?valueNode <${dateTimeValue}> ?dateTimeField-value .
?valueNode <${dateTimePrecision}> ?dateTimeField-precision .
</v:jsonset>
<%-- Queries for editing an existing role --%>
@ -120,11 +120,11 @@
"sparqlForLiterals" : { },
"sparqlForUris" : { },
"sparqlForExistingLiterals" : {
"dateTimeField.value" : "${existingDateTimeValueQuery}",
"dateTimeField-value" : "${existingDateTimeValueQuery}",
},
"sparqlForExistingUris" : {
"valueNode" : "${existingNodeQuery}",
"dateTimeField.precision": "${existingPrecisionQuery}"
"dateTimeField-precision": "${existingPrecisionQuery}"
},
"fields" : {
"dateTimeField" : {

16
webapp/web/edit/forms/test/dateTimePrecTest.jsp
View file

@ -40,21 +40,21 @@ This is a test file for the DateTimeWithPrecision EditElement.
<v:jsonset var="sparqlForDxPrecision" >
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX core: <http://vivoweb.org/ontology/core#>
SELECT ?dtX.precision WHERE {
SELECT ?dtX-precision WHERE {
?subject ?predicate ?object .
?object <core:hasDateTimeValue> ?dtX.
?dtX <rdf:type> <core:DateTimeValue> .
?dtX <core:dateTimePrecision> ?dtX.precision .
?dtX <core:dateTimePrecision> ?dtX-precision .
</v:jsonset>
<v:jsonset var="sparqlForDxValue" >
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX core: <http://vivoweb.org/ontology/core#>
SELECT ?dtX.value WHERE {
SELECT ?dtX-value WHERE {
?subject ?predicate ?object .
?object <core:hasDateTimeValue> ?dtX.
?dtX <rdf:type> <core:DateTimeValue> .
?dtX <core:dateTime> ?dtX.value .
?dtX <core:dateTime> ?dtX-value .
</v:jsonset>
<v:jsonset var="n3ForEdit" >
@ -68,8 +68,8 @@ This is a test file for the DateTimeWithPrecision EditElement.
?object <core:hasDateTimeValue> ?dtX.
?dtX <rdf:type> <core:DateTimeValue> .
?dtX <core:dateTime> ?dtX.value .
?dtX <core:dateTimePrecision> ?dtX.precision .
?dtX <core:dateTime> ?dtX-value .
?dtX <core:dateTimePrecision> ?dtX-precision .
</v:jsonset>
<c:set var="editjson" scope="request">
@ -92,8 +92,8 @@ This is a test file for the DateTimeWithPrecision EditElement.
"filesOnForm" : [ ],
"sparqlForLiterals" : { },
"sparqlForUris" : { },
"sparqlForExistingLiterals" : { "dtX.value": "${sparqlForDxValue}" },
"sparqlForExistingUris" : { "dtX.precision": "${sparqlForDxPrecision}" },
"sparqlForExistingLiterals" : { "dtX-value": "${sparqlForDxValue}" },
"sparqlForExistingUris" : { "dtX-precision": "${sparqlForDxPrecision}" },
"fields" : {
"dtX" : {
"newResource" : "true",

2
webapp/web/js/customFormUtils.js
View file

@ -35,7 +35,7 @@ vitro.customFormUtils = {
// For now we can remove the error elements. Later we may include them in
// the markup, for customized positioning, in which case we will empty them
// but not remove them here. See findValidationErrors().
$('*[id=' + $(this).attr('id') + '_validationError]').remove();
$('[id=' + $(this).attr('id') + '_validationError]').remove();
});
},

148
webapp/web/js/jquery.js vendored
View file

File diff suppressed because one or more lines are too long

24
webapp/web/templates/freemarker/edit/dateTimeWithPrecision.ftl
View file

@ -72,13 +72,13 @@ precisionConstants.second -- URI for precision
<#if precLevel gte 1>
<#-- Only text input field in the mix. We should have some validation to ensure it's a valid year (4 digits, integer, etc) -->
<label for="${fieldName}.year">Year<#if reqLevel gte 1> <span class="requiredHint">*</span></#if></label>
<input class="text-field" name="${fieldName}.year" id="${fieldName}.year" type="text" value="${year!}" size="4" maxlength="4" <#if reqLevel gte 1>required </#if>/>
<label for="${fieldName}-year">Year<#if reqLevel gte 1> <span class="requiredHint">*</span></#if></label>
<input class="text-field" name="${fieldName}-year" id="${fieldName}-year" type="text" value="${year!}" size="4" maxlength="4" <#if reqLevel gte 1>required </#if>/>
</#if>
<#if precLevel gte 2>
<label for="${fieldName}.month">Month<#if reqLevel gte 2> <span class="requiredHint">*</span></#if></label>
<select name="${fieldName}.month" id="${fieldName}.month" <#if reqLevel gte 2>required </#if>>
<label for="${fieldName}-month">Month<#if reqLevel gte 2> <span class="requiredHint">*</span></#if></label>
<select name="${fieldName}-month" id="${fieldName}-month" <#if reqLevel gte 2>required </#if>>
<option value=""<#if !month??> selected="selected"</#if>>month</option>
<#assign numMonths = 12 />
<#list 1..numMonths as currentMonth>
@ -88,8 +88,8 @@ precisionConstants.second -- URI for precision
</#if>
<#if precLevel gte 3>
<label for="${fieldName}.day">Day<#if reqLevel gte 3> <span class="requiredHint">*</span></#if></label>
<select name="${fieldName}.day" id="${fieldName}.day" <#if reqLevel gte 3>required </#if>>
<label for="${fieldName}-day">Day<#if reqLevel gte 3> <span class="requiredHint">*</span></#if></label>
<select name="${fieldName}-day" id="${fieldName}-day" <#if reqLevel gte 3>required </#if>>
<option value=""<#if !day??> selected="selected"</#if>>day</option>
<#assign numDays = 31 />
<#list 1..numDays as currentDay>
@ -100,8 +100,8 @@ precisionConstants.second -- URI for precision
<#if precLevel gte 4>
<#-- We'll need to make this more flexible to support 24 hour display down the road. For now assuming 12h with am/pm -->
<label for="${fieldName}.hour">Hour<#if reqLevel gte 4> <span class="requiredHint">*</span></#if></label>
<select name="${fieldName}.hour" id="${fieldName}.hour" <#if reqLevel gte 3>required </#if>>
<label for="${fieldName}-hour">Hour<#if reqLevel gte 4> <span class="requiredHint">*</span></#if></label>
<select name="${fieldName}-hour" id="${fieldName}-hour" <#if reqLevel gte 3>required </#if>>
<option value=""<#if !hour??> selected="selected"</#if>>hour</option>
<#assign numHours = 23 />
<#list 0..numHours as currentHour>
@ -123,8 +123,8 @@ precisionConstants.second -- URI for precision
</#if>
<#if precLevel gte 5>
<label for="${fieldName}.minute">Minutes<#if reqLevel gte 5> <span class="requiredHint">*</span></#if></label>
<select name="${fieldName}.minute" id="${fieldName}.minute" <#if reqLevel gte 5>required </#if>>
<label for="${fieldName}-minute">Minutes<#if reqLevel gte 5> <span class="requiredHint">*</span></#if></label>
<select name="${fieldName}-minute" id="${fieldName}-minute" <#if reqLevel gte 5>required </#if>>
<option value=""<#if !minute??> selected="selected"</#if>>minutes</option>
<#assign numMinutes = 59 />
<#list 1..numMinutes as currentMinute>
@ -134,8 +134,8 @@ precisionConstants.second -- URI for precision
</#if>
<#if precLevel gte 6>
<label for="${fieldName}.second">Seconds<#if reqLevel gte 6> <span class="requiredHint">*</span></#if></label>
<select name="${fieldName}.second" id="${fieldName}.second" <#if reqLevel gte 6>required </#if>>
<label for="${fieldName}-second">Seconds<#if reqLevel gte 6> <span class="requiredHint">*</span></#if></label>
<select name="${fieldName}-second" id="${fieldName}-second" <#if reqLevel gte 6>required </#if>>
<option value=""<#if !second??> selected="selected"</#if>>seconds</option>
<#assign numMinutes = 59 />
<#list 1..numMinutes as currentSecond>