From 349bd4a847bc34e0a8a968970e33554ecf15ade1 Mon Sep 17 00:00:00 2001 From: grahamtriggs Date: Wed, 21 Oct 2015 23:15:12 +0100 Subject: [PATCH] [VIVO-1114] Fix sparkling not rendering problems. --- .../coAuthorshipSparklineContent.ftl | 19 +++++++++++------ .../personPublicationSparklineContent.ftl | 21 ++++++++++++------- 2 files changed, 26 insertions(+), 14 deletions(-) diff --git a/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl b/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl index 9ece0588..78cf21b6 100644 --- a/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl +++ b/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipSparklineContent.ftl @@ -48,11 +48,7 @@ minValue: '${sparklineVO.earliestRenderedPublicationYear?c}', maxValue: '${sparklineVO.latestRenderedPublicationYear?c}' }])); - - <#else> - - var visualizationOptions = { width: 150, height: 60, @@ -60,7 +56,18 @@ chartType: 'ls', chartLabel: 'r' } - + <#else> + + var visualizationOptions = { + width: 250, + height: 75, + color: '3399CC', + chartType: 'ls', + chartLabel: 'r' + } + + + /* This means that all the publications have unknown years & we do not need to display the sparkline. @@ -168,7 +175,7 @@ * Sparks that will be rendered will always be the one's which has * any year associated with it. Hence. * */ - var renderedSparks = ${sparklineVO.renderedSparks}; + var renderedSparks = ${sparklineVO.renderedSparks?c}; /* In case that there are only unknown publications we want the text to mention these counts, diff --git a/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl b/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl index 234cf79f..a5dce9d9 100644 --- a/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl +++ b/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl @@ -49,12 +49,7 @@ minValue: '${sparklineVO.earliestRenderedPublicationYear?c}', maxValue: '${sparklineVO.latestRenderedPublicationYear?c}' }])); - - - <#else> - - - + var visualizationOptions = { width: 150, height: 60, @@ -62,7 +57,17 @@ chartType: 'ls', chartLabel: 'r' } - + <#else> + var visualizationOptions = { + width: 250, + height: 75, + color: '3399CC', + chartType: 'ls', + chartLabel: 'r' + } + + + /* This means that all the publications have unknown years & we do not need to display the sparkline. @@ -171,7 +176,7 @@ * Sparks that will be rendered will always be the one's which has * any year associated with it. Hence. * */ - var renderedSparks = ${sparklineVO.renderedSparks}; + var renderedSparks = ${sparklineVO.renderedSparks?c}; /* In case that there are only unknown publications we want the text to mention these counts,