From c5fa8d4bceb3aac8dacbaaaa960e351d5fdba6c6 Mon Sep 17 00:00:00 2001 From: jeb228 Date: Fri, 14 Jan 2011 22:18:32 +0000 Subject: [PATCH 01/13] Release 1.2 maintenance branch From 7bc67dd0082a1e3adf72ae08b938a12c45ac238d Mon Sep 17 00:00:00 2001 From: jeb228 Date: Fri, 14 Jan 2011 23:11:29 +0000 Subject: [PATCH 02/13] Merge revisions 2194 and 2195 from the trunk. --- utilities/load-testing/build.xml | 7 ++++--- .../tests/SecondTests-rel-1-1-1.jmx | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/utilities/load-testing/build.xml b/utilities/load-testing/build.xml index 12b811aa..f62820fa 100644 --- a/utilities/load-testing/build.xml +++ b/utilities/load-testing/build.xml @@ -32,7 +32,7 @@ report - Just summarize output from previously run tests. target: all ================================= --> + + diff --git a/utilities/load-testing/tests/SecondTests-rel-1-1-1.jmx b/utilities/load-testing/tests/SecondTests-rel-1-1-1.jmx index fdd93ad5..542ffbdc 100644 --- a/utilities/load-testing/tests/SecondTests-rel-1-1-1.jmx +++ b/utilities/load-testing/tests/SecondTests-rel-1-1-1.jmx @@ -9,32 +9,37 @@ WEBAPP_HOST - ${__property(webapp.host, localhost)} + ${__property(webapp.host, , localhost)} = WEBAPP_PORT - ${__property(webapp.port, 8080)} + ${__property(webapp.port, , 8080)} = WEBAPP_NAME - ${__property(webapp.name, vivo)} + ${__property(webapp.name, , vivo)} = PERSON_URI_FILE - ${__property(file.person.uris, PersonUris.csv)} + ${__property(file.person.uris, , PersonUris.csv)} = INFO_RESOURCE_URI_FILE - ${__property(file.infoResource.uris, InfoResourceUris.csv)} + ${__property(file.infoResource.uris, , InfoResourceUris.csv)} = ITERATIONS - ${__property(iterations, 10)} + ${__property(iterations, , 10)} + = + + + THREADS + ${__property(threads, , 1)} = @@ -48,7 +53,7 @@ false ${ITERATIONS} - 1 + ${THREADS} 1 1294759350000 1294759350000 From dd0cb09dd393be069ed4cff814926e858661c777 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Sat, 15 Jan 2011 05:02:07 +0000 Subject: [PATCH 03/13] Merge r2193 from trunk --- .../freemarker/body/individual/individual.ftl | 21 +++++++++---------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/productMods/templates/freemarker/body/individual/individual.ftl b/productMods/templates/freemarker/body/individual/individual.ftl index de60c5fa..f70db5e9 100644 --- a/productMods/templates/freemarker/body/individual/individual.ftl +++ b/productMods/templates/freemarker/body/individual/individual.ftl @@ -54,20 +54,19 @@ -
-
- <#include "individual-sparklineVisualization.ftl"> - - <#-- RY Will we have an individual--foaf-organization.ftl template? If so, move this there and remove from here. - Also remove the method IndividualTemplateModel.isOrganization(). --> - <#if individual.organization > + <#-- RY Will we have an individual--foaf-organization.ftl template? If so, move this there and remove from here. + Also remove the method IndividualTemplateModel.isOrganization(). --> + <#if individual.organization > + <#-- Logically we only need section#temporal-graph, but css may depend on the outer sections. Leaving here for UI + team to check. --> +
+

Temporal Graph

-
- <#--
VISMODE: ${individual.moniker}
--> - +
+
-
+ <#assign nameForOtherGroup = "other"> <#-- used by both individual-propertyGroupMenu.ftl and individual-properties.ftl --> From fbd9dd4c094cce07644d02769aded744dbc1f38d Mon Sep 17 00:00:00 2001 From: rjy7 Date: Sat, 15 Jan 2011 05:08:34 +0000 Subject: [PATCH 04/13] Minor wording fixes --- example.deploy.properties | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/example.deploy.properties b/example.deploy.properties index 1cf08ba9..d8787897 100644 --- a/example.deploy.properties +++ b/example.deploy.properties @@ -126,11 +126,11 @@ selfEditing.idMatchingProperty = http://vivo.mydomain.edu/ns#networkId #externalAuth.netIdHeaderName = remote_userID # -# Temporal Graph Visualization is used to compare different organizations/people +# The temporal graph visualization is used to compare different organizations/people # within an organization on different parameters like number of publications, grants. -# This parameter will be used as a default in case a URI is not provided. It will be -# also used whenever this visualization is to be rendered for top level organization. -# In absence of this parameter a SPARQL query will be fired which will attempt to +# This parameter will be used as a default in case a URI is not provided. It will also +# be used whenever this visualization is to be rendered for the top level organization. +# In the absence of this parameter, a SPARQL query will be fired which will attempt to # provide a top level organization. # visualization.topLevelOrg = http://vivo-trunk.indiana.edu/individual/topLevelOrgURI From 524d75af972ab52be06ea070945843a396b49c78 Mon Sep 17 00:00:00 2001 From: rjy7 Date: Sat, 15 Jan 2011 22:24:16 +0000 Subject: [PATCH 05/13] Merge r2191-2192 from trunk --- ...ityComparisonGrantsStandaloneActivator.ftl | 94 +++++++------------ .../entityComparisonStandaloneActivator.ftl | 3 +- themes/wilma/css/wilma.css | 4 - 3 files changed, 36 insertions(+), 65 deletions(-) diff --git a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl index 8f233de3..e997ace9 100644 --- a/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl +++ b/productMods/templates/freemarker/visualization/entitycomparison/entityComparisonGrantsStandaloneActivator.ftl @@ -16,67 +16,42 @@ <#assign temporalGraphSmallIcon = '${urls.images}/visualization/temporal_vis_small_icon.jpg'> - <#assign TemporalGraphDownloadFile = '${urls.base}${dataVisualizationURLRoot}?vis=entity_grant_count&uri=${organizationURI}&labelField=label'> - <#-- Javascript files --> -<#assign flot = '${urls.base}/js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.js'> <#assign excanvas = '${urls.base}/js/visualization/entitycomparison/jquery_plugins/flot/excanvas.js'> - +<#assign flot = 'js/visualization/entitycomparison/jquery_plugins/flot/jquery.flot.js'> +<#assign fliptext = 'js/visualization/entitycomparison/jquery_plugins/fliptext/jquery.mb.flipText.js'> +<#assign jqueryNotify = 'js/jquery_plugins/jquery.notify.min.js'> +<#assign jqueryUI = 'js/jquery-ui/js/jquery-ui-1.8.4.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'> - -<#assign fliptext = '${urls.base}/js/visualization/entitycomparison/jquery_plugins/fliptext/jquery.mb.flipText.js'> - -<#assign jqueryNotify = '${urls.base}/js/jquery_plugins/jquery.notify.min.js'> -<#assign jqueryUI = '${urls.base}/js/jquery-ui/js/jquery-ui-1.8.4.custom.min.js'> - -<#assign datatable = '${urls.base}/js/visualization/entitycomparison/jquery_plugins/datatable/jquery.dataTables.js'> -<#assign autoellipsis = '${urls.base}/js/visualization/entitycomparison/jquery_plugins/jquery.AutoEllipsis.js'> - -<#assign entityComparisonUtils = '${urls.base}/js/visualization/entitycomparison/util.js'> -<#assign entityComparisonConstants = '${urls.base}/js/visualization/entitycomparison/constants.js'> - - - - - - - - - - - - - - - - +${scripts.add(flot)} +${scripts.add(fliptext)} +${scripts.add(jqueryUI)} +${scripts.add(datatable)} +${scripts.add(entityComparisonUtils)} +${scripts.add(entityComparisonConstants)} +${scripts.add(jqueryNotify)} <#-- CSS files --> - -<#assign demoTable = "${urls.base}/js/visualization/entitycomparison/jquery_plugins/datatable/demo_table.css" /> - -<#assign jqueryUIStyle = "${urls.base}/js/jquery-ui/css/smoothness/jquery-ui-1.8.4.custom.css" /> -<#assign jqueryNotifyStyle = "${urls.base}/css/jquery_plugins/ui.notify.css" /> - -<#assign entityComparisonStyle = "${urls.base}/css/visualization/entitycomparison/layout.css" /> +<#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 jqueryNotifyStyle = "css/jquery_plugins/ui.notify.css" /> +<#assign entityComparisonStyle = "css/visualization/entitycomparison/layout.css" /> <#assign entityComparisonStyleIEHack = "${urls.base}/css/visualization/entitycomparison/layout-ie.css" /> +<#assign vizStyle = "css/visualization/visualization.css" /> -<#assign vizStyle = "${urls.base}/css/visualization/visualization.css" /> - - - - - - - - +${stylesheets.add(jqueryUIStyle)} +${stylesheets.add(demoTable)} +${stylesheets.add(entityComparisonStyle)} +${stylesheets.add(vizStyle)} +${stylesheets.add(jqueryNotifyStyle)} @@ -90,14 +65,14 @@ var subOrganizationVivoProfileURL = "${subOrganizationVivoProfileURL}"; var subOrganizationTemporalGraphURL = "${subOrganizationTemporalGraphURL}"; var subOrganizationTemporalGraphPubURL = "${subOrganizationTemporalGraphPubURL}"; +var jsonString = '${jsonContent}'; +var organizationLabel = '${organizationLabel}'; +