diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl
index 2b114448..8bc7b4ad 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl
@@ -23,7 +23,7 @@
<#assign coAuthorVisUrl = individual.coAuthorVisUrl()>
<#assign mapOfScienceVisUrl = individual.mapOfScienceUrl()>
- <#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 googleJSAPI = "https://www.gstatic.com/charts/loader.js">
${i18n().publications_in_vivo}
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl
index f5377d2d..682a6fac 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl
@@ -271,7 +271,13 @@
}
- drawCoauthorsSparklineVisualization(sparklineImgTD);
+ google.charts.load('current', {
+ callback: function() {
+ drawCoauthorsSparklineVisualization(sparklineImgTD)
+ },
+ packages: ['bar', 'corechart', 'table', 'imagesparkline']
+ });
+
});
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl
index fe1d8173..b6a6e1ee 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-<#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'>
+<#assign googleJSAPI = 'https://www.gstatic.com/charts/loader.js'>
${headScripts.add('')}
${scripts.add('')}
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl
index ff98bbdd..762c2f9e 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl
@@ -273,8 +273,12 @@
table.prependTo('#${sparklineContainerID}');
}
-
- drawCoInvestigatorsSparklineVisualization(sparklineImgTD);
+ google.charts.load('current', {
+ callback: function() {
+ drawCoInvestigatorsSparklineVisualization(sparklineImgTD)
+ },
+ packages: ['bar', 'corechart', 'table', 'imagesparkline']
+ });
});
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl
index 7d439417..79d7012d 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-<#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'>
+<#assign googleJSAPI = 'https://www.gstatic.com/charts/loader.js'>
${headScripts.add('')}
${scripts.add('')}
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl
index 72974e52..6a41be45 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-<#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'>
+<#assign googleJSAPI = 'https://www.gstatic.com/charts/loader.js'>
${headScripts.add('')}
${scripts.add('')}
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl
index f7d4d73a..543a68bb 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl
@@ -267,7 +267,12 @@
table.prependTo('#${sparklineContainerID}');
}
- drawGrantCountVisualization(sparklineImgTD);
+ google.charts.load('current', {
+ callback: function() {
+ drawGrantCountVisualization(sparklineImgTD)
+ },
+ packages: ['bar', 'corechart', 'table', 'imagesparkline']
+ });
});
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl
index c3fbebcc..ee785e41 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl
@@ -17,7 +17,7 @@
<#assign egoCoAuthorsListDataFileURL = '${urls.base}${dataVisualizationURLRoot}?vis=coauthorship&uri=${egoURI}&vis_mode=coauthors'>
<#assign egoCoAuthorshipNetworkDataFileURL = '${urls.base}${dataVisualizationURLRoot}?vis=coauthorship&uri=${egoURI}&vis_mode=coauthor_network_download'>
-<#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 googleVisualizationAPI = 'https://www.gstatic.com/charts/loader.js'>
<#assign coAuthorPersonLevelJavaScript = '${urls.base}/js/visualization/coauthorship/coauthorship-personlevel.js'>
<#assign commonPersonLevelJavaScript = '${urls.base}/js/visualization/personlevel/person-level.js'>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl
index 12e7a863..e2845a98 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl
@@ -21,7 +21,7 @@
<#assign coAuthorIcon = '${urls.images}/visualization/coauthorship/co_author_icon.png'>
-<#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 googleVisualizationAPI = 'https://www.gstatic.com/charts/loader.js'>
<#assign coInvestigatorPersonLevelJavaScript = '${urls.base}/js/visualization/coPIship/coPIship-person-level.js'>
<#assign commonPersonLevelJavaScript = '${urls.base}/js/visualization/personlevel/person-level.js'>
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl
index c9c772c2..294fc29e 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl
@@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in LICENSE$ -->
-<#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'>
+<#assign googleJSAPI = 'https://www.gstatic.com/charts/loader.js'>
${headScripts.add(googleJSAPI)}
${scripts.add('')}
diff --git a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl
index bf7e7519..b8c88e6a 100644
--- a/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl
@@ -272,7 +272,12 @@
}
- drawPubCountVisualization(sparklineImgTD);
+ google.charts.load('current', {
+ callback: function() {
+ drawPubCountVisualization(sparklineImgTD)
+ },
+ packages: ['bar', 'corechart', 'table', 'imagesparkline']
+ });
});