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

Update to google chart library loads

Browse source
This commit is contained in:
gneissone 2021-02-07 22:35:30 -07:00 • committed by Andrew Woods
parent a9ce8c7de8
commit 2122254cdb
11 changed files with 32 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-visualizationFoafPerson.ftl
View file

@ -23,7 +23,7 @@
<#assign coAuthorVisUrl = individual.coAuthorVisUrl()> <#assign coAuthorVisUrl = individual.coAuthorVisUrl()>
<#assign mapOfScienceVisUrl = individual.mapOfScienceUrl()> <#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">
<span id="sparklineHeading">${i18n().publications_in_vivo}</span> <span id="sparklineHeading">${i18n().publications_in_vivo}</span>

8
webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl
View file

@ -271,7 +271,13 @@
} }
drawCoauthorsSparklineVisualization(sparklineImgTD); google.charts.load('current', {
callback: function() {
drawCoauthorsSparklineVisualization(sparklineImgTD)
},
packages: ['bar', 'corechart', 'table', 'imagesparkline']
});
}); });
</script> </script>

2
webapp/src/main/webapp/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl
View file

@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- $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('<script type="text/javascript" src="${googleJSAPI}"></script>')} ${headScripts.add('<script type="text/javascript" src="${googleJSAPI}"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>')} ${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>')}

8
webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl
View file

@ -273,8 +273,12 @@
table.prependTo('#${sparklineContainerID}'); table.prependTo('#${sparklineContainerID}');
} }
google.charts.load('current', {
drawCoInvestigatorsSparklineVisualization(sparklineImgTD); callback: function() {
drawCoInvestigatorsSparklineVisualization(sparklineImgTD)
},
packages: ['bar', 'corechart', 'table', 'imagesparkline']
});
}); });
</script> </script>

2
webapp/src/main/webapp/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl
View file

@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- $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('<script type="text/javascript" src="${googleJSAPI}"></script>')} ${headScripts.add('<script type="text/javascript" src="${googleJSAPI}"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>')} ${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>')}

2
webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl
View file

@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- $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('<script type="text/javascript" src="${googleJSAPI}"></script>')} ${headScripts.add('<script type="text/javascript" src="${googleJSAPI}"></script>')}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>')} ${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>')}

7
webapp/src/main/webapp/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl
View file

@ -267,7 +267,12 @@
table.prependTo('#${sparklineContainerID}'); table.prependTo('#${sparklineContainerID}');
} }
drawGrantCountVisualization(sparklineImgTD); google.charts.load('current', {
callback: function() {
drawGrantCountVisualization(sparklineImgTD)
},
packages: ['bar', 'corechart', 'table', 'imagesparkline']
});
}); });
</script> </script>

2
webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coAuthorPersonLevelD3.ftl
View file

@ -17,7 +17,7 @@
<#assign egoCoAuthorsListDataFileURL = '${urls.base}${dataVisualizationURLRoot}?vis=coauthorship&uri=${egoURI}&vis_mode=coauthors'> <#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 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 coAuthorPersonLevelJavaScript = '${urls.base}/js/visualization/coauthorship/coauthorship-personlevel.js'>
<#assign commonPersonLevelJavaScript = '${urls.base}/js/visualization/personlevel/person-level.js'> <#assign commonPersonLevelJavaScript = '${urls.base}/js/visualization/personlevel/person-level.js'>

2
webapp/src/main/webapp/templates/freemarker/visualization/personlevel/coPIPersonLevelD3.ftl
View file

@ -21,7 +21,7 @@
<#assign coAuthorIcon = '${urls.images}/visualization/coauthorship/co_author_icon.png'> <#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 coInvestigatorPersonLevelJavaScript = '${urls.base}/js/visualization/coPIship/coPIship-person-level.js'>
<#assign commonPersonLevelJavaScript = '${urls.base}/js/visualization/personlevel/person-level.js'> <#assign commonPersonLevelJavaScript = '${urls.base}/js/visualization/personlevel/person-level.js'>

2
webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl
View file

@ -1,6 +1,6 @@
<#-- $This file is distributed under the terms of the license in LICENSE$ --> <#-- $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)} ${headScripts.add(googleJSAPI)}
${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>')} ${scripts.add('<script type="text/javascript" src="${urls.base}/js/visualization/visualization-helper-functions.js"></script>')}

7
webapp/src/main/webapp/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl
View file

@ -272,7 +272,12 @@
} }
drawPubCountVisualization(sparklineImgTD); google.charts.load('current', {
callback: function() {
drawPubCountVisualization(sparklineImgTD)
},
packages: ['bar', 'corechart', 'table', 'imagesparkline']
});
}); });
</script> </script>