From 4ca22496f3aa90d9cf7a59dfea3fc933c64976f0 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Mon, 21 Feb 2011 17:53:13 +0000 Subject: [PATCH] NIHVIVO-1629 Upgrade to jquery-ui version 1.8.9 --- productMods/edit/forms/addGrantRoleToPerson.jsp | 16 ++++++++-------- .../edit/forms/addRoleToPersonTwoStage.jsp | 16 ++++++++-------- .../forms/organizationHasPositionHistory.jsp | 16 ++++++++-------- .../edit/forms/personHasEducationalTraining.jsp | 16 ++++++++-------- .../edit/forms/personHasPositionHistory.jsp | 16 ++++++++-------- .../entitycomparison/entityComparisonSetup.ftl | 4 ++-- 6 files changed, 42 insertions(+), 42 deletions(-) diff --git a/productMods/edit/forms/addGrantRoleToPerson.jsp b/productMods/edit/forms/addGrantRoleToPerson.jsp index 6e36d87d..bcf5fbfb 100644 --- a/productMods/edit/forms/addGrantRoleToPerson.jsp +++ b/productMods/edit/forms/addGrantRoleToPerson.jsp @@ -163,8 +163,8 @@ if ( ((String)request.getAttribute("predicateUri")).endsWith("hasPrincipalInvest ?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 . @@ -172,8 +172,8 @@ if ( ((String)request.getAttribute("predicateUri")).endsWith("hasPrincipalInvest ?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 . @@ -284,16 +284,16 @@ if ( ((String)request.getAttribute("predicateUri")).endsWith("hasPrincipalInvest "sparqlForUris" : { }, "sparqlForExistingLiterals" : { "grantLabel":"${grantLabelQuery}" , - "startField.value" : "${existingStartDateQuery}", - "endField.value" : "${existingEndDateQuery}" + "startField-value" : "${existingStartDateQuery}", + "endField-value" : "${existingEndDateQuery}" }, "sparqlForExistingUris" : { "grant":"${grantQuery}", "intervalNode" : "${existingIntervalNodeQuery}", "startNode" : "${existingStartNodeQuery}", "endNode" : "${existingEndNodeQuery}", - "startField.precision": "${existingStartPrecisionQuery}", - "endField.precision" : "${existingEndPrecisionQuery}" + "startField-precision": "${existingStartPrecisionQuery}", + "endField-precision" : "${existingEndPrecisionQuery}" }, "fields" : { "grant" : { diff --git a/productMods/edit/forms/addRoleToPersonTwoStage.jsp b/productMods/edit/forms/addRoleToPersonTwoStage.jsp index 12cb02d8..f5b94a87 100644 --- a/productMods/edit/forms/addRoleToPersonTwoStage.jsp +++ b/productMods/edit/forms/addRoleToPersonTwoStage.jsp @@ -195,8 +195,8 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. ?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 . @@ -204,8 +204,8 @@ public static Log log = LogFactory.getLog("edu.cornell.mannlib.vitro.webapp.jsp. ?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 . @@ -326,8 +326,8 @@ request.setAttribute("typeQuery", getActivityTypeQuery(vreq)); "sparqlForExistingLiterals" : { "activityLabel":"${activityLabelQuery}", "roleLabel":"${roleLabelQuery}", - "startField.value" : "${existingStartDateQuery}", - "endField.value" : "${existingEndDateQuery}" + "startField-value" : "${existingStartDateQuery}", + "endField-value" : "${existingEndDateQuery}" }, "sparqlForExistingUris" : { "roleActivity":"${activityQuery}" , @@ -335,8 +335,8 @@ request.setAttribute("typeQuery", getActivityTypeQuery(vreq)); "intervalNode" : "${existingIntervalNodeQuery}", "startNode" : "${existingStartNodeQuery}", "endNode" : "${existingEndNodeQuery}", - "startField.precision": "${existingStartPrecisionQuery}", - "endField.precision" : "${existingEndPrecisionQuery}" + "startField-precision": "${existingStartPrecisionQuery}", + "endField-precision" : "${existingEndPrecisionQuery}" }, "fields" : { "activityLabel" : { diff --git a/productMods/edit/forms/organizationHasPositionHistory.jsp b/productMods/edit/forms/organizationHasPositionHistory.jsp index 76bb3e00..73b84141 100644 --- a/productMods/edit/forms/organizationHasPositionHistory.jsp +++ b/productMods/edit/forms/organizationHasPositionHistory.jsp @@ -95,8 +95,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 . @@ -104,8 +104,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 . @@ -191,16 +191,16 @@ "sparqlForUris" : { }, "sparqlForExistingLiterals" : { "title" : "${titleExisting}", - "startField.value" : "${existingStartDateQuery}", - "endField.value" : "${existingEndDateQuery}" + "startField-value" : "${existingStartDateQuery}", + "endField-value" : "${existingEndDateQuery}" }, "sparqlForExistingUris" : { "personUri" : "${personUriExisting}", "intervalNode" : "${existingIntervalNodeQuery}", "startNode" : "${existingStartNodeQuery}", "endNode" : "${existingEndNodeQuery}", - "startField.precision": "${existingStartPrecisionQuery}", - "endField.precision" : "${existingEndPrecisionQuery}" + "startField-precision": "${existingStartPrecisionQuery}", + "endField-precision" : "${existingEndPrecisionQuery}" }, "fields" : { "title" : { diff --git a/productMods/edit/forms/personHasEducationalTraining.jsp b/productMods/edit/forms/personHasEducationalTraining.jsp index 37b5075c..7a5a91b1 100644 --- a/productMods/edit/forms/personHasEducationalTraining.jsp +++ b/productMods/edit/forms/personHasEducationalTraining.jsp @@ -142,8 +142,8 @@ core:dateTimePrecision (DateTimeValue : DateTimeValuePrecision) ?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 . @@ -151,8 +151,8 @@ core:dateTimePrecision (DateTimeValue : DateTimeValuePrecision) ?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 . @@ -319,8 +319,8 @@ type is returned and we don't get a match to the select element options. --%> "majorField" : "${majorFieldQuery}", "dept" : "${deptQuery}", "info" : "${infoQuery}", - "startField.value" : "${existingStartDateQuery}", - "endField.value" : "${existingEndDateQuery}" + "startField-value" : "${existingStartDateQuery}", + "endField-value" : "${existingEndDateQuery}" }, "sparqlForExistingUris" : { "org" : "${orgQuery}", @@ -329,8 +329,8 @@ type is returned and we don't get a match to the select element options. --%> "intervalNode" : "${existingIntervalNodeQuery}", "startNode" : "${existingStartNodeQuery}", "endNode" : "${existingEndNodeQuery}", - "startField.precision": "${existingStartPrecisionQuery}", - "endField.precision" : "${existingEndPrecisionQuery}" + "startField-precision": "${existingStartPrecisionQuery}", + "endField-precision" : "${existingEndPrecisionQuery}" }, "fields" : { "degree" : { diff --git a/productMods/edit/forms/personHasPositionHistory.jsp b/productMods/edit/forms/personHasPositionHistory.jsp index ed9e22c7..6cbf35dc 100644 --- a/productMods/edit/forms/personHasPositionHistory.jsp +++ b/productMods/edit/forms/personHasPositionHistory.jsp @@ -125,8 +125,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 . @@ -134,8 +134,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 . <%-- Queries for editing an existing role --%> @@ -284,8 +284,8 @@ type is returned and we don't get a match to the select element options. --%> "sparqlForExistingLiterals" : { "orgLabel" : "${orgLabelQuery}", "positionTitle" : "${positionTitleQuery}", - "startField.value" : "${existingStartDateQuery}", - "endField.value" : "${existingEndDateQuery}" + "startField-value" : "${existingStartDateQuery}", + "endField-value" : "${existingEndDateQuery}" }, "sparqlForExistingUris" : { "org" : "${orgQuery}", @@ -294,8 +294,8 @@ type is returned and we don't get a match to the select element options. --%> "intervalNode" : "${existingIntervalNodeQuery}", "startNode" : "${existingStartNodeQuery}", "endNode" : "${existingEndNodeQuery}", - "startField.precision": "${existingStartPrecisionQuery}", - "endField.precision" : "${existingEndPrecisionQuery}" + "startField-precision": "${existingStartPrecisionQuery}", + "endField-precision" : "${existingEndPrecisionQuery}" }, "fields" : { "positionTitle" : { diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl index 0d9735ec..2b25320e 100644 --- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonSetup.ftl @@ -48,7 +48,7 @@ we will use rev 293 (dev build version) of the flot & excanvas files. <#assign fliptext = 'js/visualization/entitycomparison/jquery_plugins/fliptext/jquery.mb.flipText.js'> <#assign jqueryNotify = 'js/jquery_plugins/jquery.notify.min.js'> <#assign jqueryBlockUI = 'js/jquery_plugins/jquery.blockUI.min.js'> -<#assign jqueryUI = 'js/jquery-ui/js/jquery-ui-1.8.4.custom.min.js'> +<#assign jqueryUI = 'js/jquery-ui/js/jquery-ui-1.8.9.custom.min.js'> <#assign datatable = 'js/jquery_plugins/jquery.dataTables.min.js'> <#assign entityComparisonUtils = 'js/visualization/entitycomparison/util.js'> <#assign entityComparisonConstants = 'js/visualization/entitycomparison/constants.js'> @@ -69,7 +69,7 @@ ${scripts.add(jqueryNotify)} <#-- CSS files --> <#assign demoTable = "js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css" /> -<#assign jqueryUIStyle = "js/jquery-ui/css/smoothness/jquery-ui-1.8.4.custom.css" /> +<#assign jqueryUIStyle = "js/jquery-ui/css/smoothness/jquery-ui-1.8.9.custom.css" /> <#assign jqueryNotifyStyle = "css/jquery_plugins/ui.notify.css" /> <#assign entityComparisonStyle = "css/visualization/entitycomparison/layout.css" /> <#assign entityComparisonStyleIEHack = "${urls.base}/css/visualization/entitycomparison/layout-ie.css" />