diff --git a/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl b/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl index d8a556c1..31b4fca9 100644 --- a/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl +++ b/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipDynamicActivator.ftl @@ -1,5 +1,5 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#if shouldVIVOrenderVis> - <#include "/visualization/coauthorship/coAuthorshipSparklineContent.ftl"> + <#include "coAuthorshipSparklineContent.ftl"> diff --git a/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl index fae5834c..4a69f5c4 100644 --- a/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl +++ b/productMods/templates/freemarker/visualization/coauthorship/coAuthorshipStandaloneActivator.ftl @@ -4,4 +4,4 @@ ${headScripts.add(googleJSAPI)} -<#include "/visualization/coauthorship/coAuthorshipSparklineContent.ftl"> \ No newline at end of file +<#include "coAuthorshipSparklineContent.ftl"> \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/copi/coInvestigation.ftl b/productMods/templates/freemarker/visualization/copi/coInvestigation.ftl deleted file mode 100644 index 54fbceca..00000000 --- a/productMods/templates/freemarker/visualization/copi/coInvestigation.ftl +++ /dev/null @@ -1,241 +0,0 @@ -<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> - -<#assign visImageContextPath = "${urls.images}/visualization/" > -<#assign loadingImageLink = "${visImageContextPath}ajax-loader.gif"> - -<#assign egoVivoProfileURL = "${urls.base}/individual?uri=${egoURI}"> - -<#assign egoSparklineDataURL = '${urls.base}${dataVisualizationURLRoot}?vis=person_grant_count&uri=${egoURI}&labelField=label'> -<#assign coInvestigationDownloadFile = '${urls.base}${dataVisualizationURLRoot}?vis=person_level&uri=${egoURI}&labelField=label'> - -
- - -<#-- - -Support for this has ended. Only created for the VIVO Conf Demo. - - - - - - -
- - - <%-- Image --%> -
- - <%-- Label --%> -

- - <%-- Moniker--%> - - - -
- - - - -
This information is based solely on grants which have been loaded into the VIVO system. - This may only be a small sample of the person's total work.
- -

Co-Investigator Network - - - (GraphML File)

-
- - - - - - - - Currently there are no ${investigatorsText} grants for - this investigator in the VIVO database. - -
- - - - Currently there are no grants for - this investigator in the VIVO database. - - - -
- - - - -
- -
- -
- -
- -
-
-
- -
 
- -
-
VIVO profile | Co-Investigator network
-
-
  Grant(s)
-
  Co-Investigator(s)
- - - - -
- -
- -
- - - - -
- -

Table

- - - -
-

-
- -
- -
- -
-
- -
- - - ---> \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/copi/coInvestigationDynamicActivator.ftl b/productMods/templates/freemarker/visualization/copi/coInvestigationDynamicActivator.ftl new file mode 100644 index 00000000..445ced9c --- /dev/null +++ b/productMods/templates/freemarker/visualization/copi/coInvestigationDynamicActivator.ftl @@ -0,0 +1,5 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#if shouldVIVOrenderVis> + <#include "coInvestigationSparklineContent.ftl"> + diff --git a/productMods/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl b/productMods/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl new file mode 100644 index 00000000..91f45c77 --- /dev/null +++ b/productMods/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl @@ -0,0 +1,197 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#assign visContainerID = '${sparklineVO.visContainerDivID}'> + +<#if sparklineVO.shortVisMode> + <#assign sparklineContainerID = 'unique_coinvestigators_short_sparkline_vis'> +<#else> + <#assign sparklineContainerID = 'unique_coinvestigators_full_sparkline_vis'> + + +<#-- This is used to prevent collision between sparkline & visualization conatiner div ids. --> +<#if visContainerID?upper_case == sparklineContainerID?upper_case> + <#assign sparklineContainerID = visContainerID + "_spark"> + + +
+
+ + +
+ + <#if sparklineVO.shortVisMode> + <#----> +

View full timeline and co-investigator network.

+ <#--
--> + <#else> + +

+ + + + + + + + + + + <#list sparklineVO.yearToActivityCount?keys as year> + + + + + + + +
+ Unique Co-Investigators per year (.CSV File) +
+ Year + + Count +
+ ${year} + + ${sparklineVO.yearToActivityCount[year]} +
+ Download data as .csv file. +
+

+ +
+ \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl new file mode 100644 index 00000000..26327eef --- /dev/null +++ b/productMods/templates/freemarker/visualization/copi/coInvestigationStandaloneActivator.ftl @@ -0,0 +1,7 @@ +<#-- $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'> + +${headScripts.add(googleJSAPI)} + +<#include "coInvestigationSparklineContent.ftl"> \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/grant/personGrantCountDynamicActivator.ftl b/productMods/templates/freemarker/visualization/grant/personGrantCountDynamicActivator.ftl new file mode 100644 index 00000000..2e542736 --- /dev/null +++ b/productMods/templates/freemarker/visualization/grant/personGrantCountDynamicActivator.ftl @@ -0,0 +1,5 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#if shouldVIVOrenderVis> + <#include "personGrantSparklineContent.ftl"> + diff --git a/productMods/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl new file mode 100644 index 00000000..a6a9d64f --- /dev/null +++ b/productMods/templates/freemarker/visualization/grant/personGrantCountStandaloneActivator.ftl @@ -0,0 +1,7 @@ +<#-- $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'> + +${headScripts.add(googleJSAPI)} + +<#include "personGrantSparklineContent.ftl"> \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl b/productMods/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl new file mode 100644 index 00000000..ad4ce3ca --- /dev/null +++ b/productMods/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl @@ -0,0 +1,200 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> +<#assign visContainerID = '${sparklineVO.visContainerDivID}'> + +<#if sparklineVO.shortVisMode> + <#assign sparklineContainerID = 'grant_count_short_sparkline_vis'> +<#else> + <#assign sparklineContainerID = 'grant_count_full_sparkline_vis'> + + +<#-- This is used to prevent collision between sparkline & visualization conatiner div ids. --> +<#if visContainerID?upper_case == sparklineContainerID?upper_case> + <#assign sparklineContainerID = visContainerID + "_spark"> + + +
+
+ + +
+ + <#if sparklineVO.shortVisMode> + <#----> +

View all VIVO grants and corresponding co-investigator network.

+ <#--
--> + <#else> + +

+ + + + + + + + + + + <#list sparklineVO.yearToActivityCount?keys as year> + + + + + + + +
+ Grants per year (.CSV File) +
+ Year + + Grants +
+ ${year} + + ${sparklineVO.yearToActivityCount[year]} +
+ Download data as .csv file. +
+

+ +
+ + + \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl b/productMods/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl index 2075785c..b462f957 100644 --- a/productMods/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl +++ b/productMods/templates/freemarker/visualization/publication/personPublicationCountDynamicActivator.ftl @@ -1,5 +1,5 @@ <#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> <#if shouldVIVOrenderVis> - <#include "/visualization/publication/personPublicationSparklineContent.ftl"> + <#include "personPublicationSparklineContent.ftl"> diff --git a/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl b/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl index 2de2615e..a1e8a049 100644 --- a/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl +++ b/productMods/templates/freemarker/visualization/publication/personPublicationCountStandaloneActivator.ftl @@ -4,4 +4,4 @@ ${headScripts.add(googleJSAPI)} -<#include "/visualization/publication/personPublicationSparklineContent.ftl"> \ No newline at end of file +<#include "personPublicationSparklineContent.ftl"> \ No newline at end of file diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java index 5868f7ea..f2f9687e 100644 --- a/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java +++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/freemarker/persongrantcount/PersonGrantCountRequestHandler.java @@ -240,7 +240,7 @@ public class PersonGrantCountRequestHandler implements VisualizationRequestHandl Portal portal = vreq.getPortal(); - String standaloneTemplate = "/visualization/grantCount.ftl"; + String standaloneTemplate = "personGrantCountStandaloneActivator.ftl"; Map body = new HashMap(); body.put("portalBean", portal); @@ -267,7 +267,7 @@ public class PersonGrantCountRequestHandler implements VisualizationRequestHandl Portal portal = vreq.getPortal(); - String dynamicTemplate = "/visualization/sparklineAjaxVisContent.ftl"; + String dynamicTemplate = "personGrantCountDynamicActivator.ftl"; Map body = new HashMap(); body.put("portalBean", portal);