From ce61bcb1cf0a7f3086d229155b52d34adfd4949c Mon Sep 17 00:00:00 2001 From: cdtank Date: Wed, 5 Jan 2011 19:17:10 +0000 Subject: [PATCH] 1. Changed url for google vis api to the secure version so that warnings thrown when serving content from https:// are not thrown. (see issue NIHVIVO-1595 for more info) --- .../partials/individual/individual-sparklineVisualization.ftl | 2 +- .../coauthorship/coAuthorshipStandaloneActivator.ftl | 2 +- .../visualization/copi/coInvestigationStandaloneActivator.ftl | 2 +- .../templates/freemarker/visualization/dummyVisClient.ftl | 2 +- .../visualization/grant/personGrantCountStandaloneActivator.ftl | 2 +- productMods/templates/freemarker/visualization/grantCount.ftl | 2 +- .../visualization/personlevel/coAuthorPersonLevel.ftl | 2 +- .../freemarker/visualization/personlevel/coPIPersonLevel.ftl | 2 +- .../visualization/personlevel/personLevelInjectHead.ftl | 2 +- .../publication/personPublicationCountStandaloneActivator.ftl | 2 +- .../templates/visualization/person_level_inject_head.jsp | 2 +- productMods/templates/visualization/visualization_scripts.jsp | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl b/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl index 96432bcb..6709ccf4 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl @@ -7,7 +7,7 @@ <#assign coAuthorIcon = '${urls.images}/visualization/co_author_icon.png'> <#assign coInvestigatorIcon = '${urls.images}/visualization/co_investigator_icon.png'> <#assign standardVisualizationURLRoot ="/visualizationfm"> -<#assign googleJSAPI = 'http://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> +<#assign googleJSAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22imagesparkline%22%5D%7D%5D%7D'> <#assign coAuthorURL = '${urls.base}${standardVisualizationURLRoot}?vis=person_level&uri=${individual.uri}&vis_mode=coauthor'> <#assign coInvestigatorURL = '${urls.base}${standardVisualizationURLRoot}?vis=person_level&uri=${individual.uri}&vis_mode=copi'> diff --git a/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl index 4a69f5c4..8e03926a 100644 --- a/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl +++ b/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl @@ -1,6 +1,6 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -<#assign googleJSAPI = 'http://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> +<#assign googleJSAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> ${headScripts.add(googleJSAPI)} diff --git a/productMods/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl index 26327eef..c658dbdc 100644 --- a/productMods/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl +++ b/productMods/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl @@ -1,6 +1,6 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -<#assign googleJSAPI = 'http://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> +<#assign googleJSAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> ${headScripts.add(googleJSAPI)} diff --git a/productMods/templates/freemarker/visualization/dummyVisClient.ftl b/productMods/templates/freemarker/visualization/dummyVisClient.ftl index d17ecc1c..ba8925ee 100644 --- a/productMods/templates/freemarker/visualization/dummyVisClient.ftl +++ b/productMods/templates/freemarker/visualization/dummyVisClient.ftl @@ -1,6 +1,6 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> ${headScripts.add("http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js")} -${headScripts.add("http://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D")} +${headScripts.add("https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D")} This is Dummy Vis Client. For Real! Really Re! diff --git a/productMods/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl index a6a9d64f..8f10ef46 100644 --- a/productMods/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl +++ b/productMods/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl @@ -1,6 +1,6 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -<#assign googleJSAPI = 'http://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> +<#assign googleJSAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> ${headScripts.add(googleJSAPI)} diff --git a/productMods/templates/freemarker/visualization/grantCount.ftl b/productMods/templates/freemarker/visualization/grantCount.ftl index 83c58c93..0fe4e354 100644 --- a/productMods/templates/freemarker/visualization/grantCount.ftl +++ b/productMods/templates/freemarker/visualization/grantCount.ftl @@ -1,6 +1,6 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -<#assign googleJSAPI = 'http://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> +<#assign googleJSAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> ${headScripts.add(googleJSAPI)} diff --git a/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl b/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl index 44ce358b..47d38d29 100644 --- a/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl +++ b/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl @@ -14,7 +14,7 @@ <#assign swfLink = '${urls.images}/visualization/coauthorship/EgoCentric.swf'> <#assign adobeFlashDetector = '${urls.base}/js/visualization/coauthorship/AC_OETags.js'> -<#assign googleVisualizationAPI = 'http://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> +<#assign googleVisualizationAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> <#assign coAuthorPersonLevelJavaScript = '${urls.base}/js/visualization/coauthorship/coauthorship-personlevel.js'> <#assign commonPersonLevelJavaScript = '${urls.base}/js/visualization/personlevel/person-level.js'> diff --git a/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl b/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl index 6782951c..df93b6d3 100644 --- a/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl +++ b/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl @@ -16,7 +16,7 @@ <#assign swfLink = '${urls.images}/visualization/coauthorship/EgoCentric.swf'> <#assign adobeFlashDetector = '${urls.base}/js/visualization/coauthorship/AC_OETags.js'> -<#assign googleVisualizationAPI = 'http://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> +<#assign googleVisualizationAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> <#assign coInvestigatorPersonLevelJavaScript = '${urls.base}/js/visualization/coPIship/coPIship-person-level.js'> <#assign commonPersonLevelJavaScript = '${urls.base}/js/visualization/personlevel/person-level.js'> diff --git a/productMods/templates/freemarker/visualization/personlevel/personLevelInjectHead.ftl b/productMods/templates/freemarker/visualization/personlevel/personLevelInjectHead.ftl index 8a81cce3..d033a7a6 100644 --- a/productMods/templates/freemarker/visualization/personlevel/personLevelInjectHead.ftl +++ b/productMods/templates/freemarker/visualization/personlevel/personLevelInjectHead.ftl @@ -9,7 +9,7 @@ <#assign egoCoAuthorsListDataFileURL = '${urls.base}${dataVisualizationURLRoot}?vis=person_level&uri=${egoURI}&vis_mode=coauthors'> <#assign swfLink = '${urls.images}/visualization/coauthorship/EgoCentric.swf'> <#assign adobeFlashDetector = '${urls.base}/js/visualization/coauthorship/AC_OETags.js'> -<#assign googleVisualizationAPI = 'http://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> +<#assign googleVisualizationAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> <#assign coAuthorShipJavaScript = '${urls.base}/js/visualization/personlevel/person_level.js'> diff --git a/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl index a1e8a049..8bb9745e 100644 --- a/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl +++ b/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl @@ -1,6 +1,6 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> -<#assign googleJSAPI = 'http://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> +<#assign googleJSAPI = 'https://www.google.com/jsapi?autoload=%7B%22modules%22%3A%5B%7B%22name%22%3A%22visualization%22%2C%22version%22%3A%221%22%2C%22packages%22%3A%5B%22areachart%22%2C%22imagesparkline%22%5D%7D%5D%7D'> ${headScripts.add(googleJSAPI)} diff --git a/productMods/templates/visualization/person_level_inject_head.jsp b/productMods/templates/visualization/person_level_inject_head.jsp index 7a6a2a8b..41c5c71b 100644 --- a/productMods/templates/visualization/person_level_inject_head.jsp +++ b/productMods/templates/visualization/person_level_inject_head.jsp @@ -32,7 +32,7 @@ - + diff --git a/productMods/templates/visualization/visualization_scripts.jsp b/productMods/templates/visualization/visualization_scripts.jsp index 4bbecb74..5cb7eef3 100644 --- a/productMods/templates/visualization/visualization_scripts.jsp +++ b/productMods/templates/visualization/visualization_scripts.jsp @@ -20,7 +20,7 @@ ****************************************************/ %> - +