From 806e30b48fa0ec94e995744cdf920d0427da2833 Mon Sep 17 00:00:00 2001
From: tworrall <tworrall@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 7 Dec 2011 21:22:45 +0000
Subject: [PATCH] NIHVIVO-3446 added some explanatory text and an info ico

---
 .../visualization/copi/coInvestigationSparklineContent.ftl    | 2 +-
 .../visualization/grant/personGrantSparklineContent.ftl       | 4 ++--
 .../freemarker/visualization/personlevel/coPIPersonLevel.ftl  | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/productMods/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl b/productMods/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl
index a71155a9..d177dc56 100644
--- a/productMods/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl
+++ b/productMods/templates/freemarker/visualization/copi/coInvestigationSparklineContent.ftl
@@ -189,7 +189,7 @@
                     $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append("<span style='color: #2485AE;'> " + grantDisplay + " <br/></span>");
             
                     var sparksText = '  from <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}' 
-                                        + ' to ${sparklineVO.latestRenderedGrantYear?c}</span>';
+                                        + ' through ${sparklineVO.latestRenderedGrantYear?c}</span>';
                                         
                     if (totalGrants !== totalGrantCount) {
                         sparksText += ' (' + totalGrantCount + ' total)';
diff --git a/productMods/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl b/productMods/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl
index 6a1806af..4206360c 100644
--- a/productMods/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl
+++ b/productMods/templates/freemarker/visualization/grant/personGrantSparklineContent.ftl
@@ -183,7 +183,7 @@
                     $('#${sparklineContainerID} td.sparkline_number').text(totalGrants).css("font-weight", "bold").attr("class", "grey").append("<span style='color: #2485AE;'> " + grantDisplay + " <br/></span>");
             
                     var sparksText = '  from <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}' 
-                                        + ' to ${sparklineVO.latestRenderedGrantYear?c}</span>';
+                                        + ' through ${sparklineVO.latestRenderedGrantYear?c}</span>';
                                         
                     if (totalGrants !== totalGrantCount) {
                         sparksText += ' (' + totalGrantCount + ' total)';
@@ -273,7 +273,7 @@
         
             <p> 
                 <#assign tableID = "grant_sparkline_data_table" />
-                <#assign tableCaption = "Grants per year " />
+                <#assign tableCaption = "Grants per year" />
                 <#assign tableActivityColumnName = "Grants" />
                 <#assign tableContent = sparklineVO.yearToActivityCount />
                 <#assign fileDownloadLink = sparklineVO.downloadDataLink />
diff --git a/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl b/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl
index 790ed4dc..61ba28a7 100644
--- a/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl
+++ b/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl
@@ -225,13 +225,14 @@ $(document).ready(function(){
         <div class="vis_stats">
         
         <div class="sub_headings" id="table_heading"><h3>Tables</h3></div>
+            <p style="float:left;font-size:.9em">The information in the following tables is for all years.&nbsp;<img class="filterInfoIcon" width="16px" height="16px" id="imageIconThree" src="${urls.images}/iconInfo.png" alt="information icon" title="The spark lines shown above reflect grants through the last complete calendar year. These tables, however, show the grant information for all years, based on the information loaded in the VIVO system." /></p>
         
             <div class="vis-tables">
 
                 <p id="grants_table_container" class="datatable">
 
                 <#assign tableID = "grant_data_table" />
-                <#assign tableCaption = "Grants per year " />
+                <#assign tableCaption = "Grants per year" />
                 <#assign tableActivityColumnName = "Grants" />
                 <#assign tableContent = egoGrantSparklineVO.yearToActivityCount />
                 <#assign fileDownloadLink = egoGrantSparklineVO.downloadDataLink />