NIHVIVO-3446 added some explanatory text and an info ico

This commit is contained in:
tworrall 2011-12-07 21:22:45 +00:00
parent e20fff7f66
commit 806e30b48f
3 changed files with 5 additions and 4 deletions

View file

@ -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>"); $('#${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}' var sparksText = ' from <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}'
+ ' to ${sparklineVO.latestRenderedGrantYear?c}</span>'; + ' through ${sparklineVO.latestRenderedGrantYear?c}</span>';
if (totalGrants !== totalGrantCount) { if (totalGrants !== totalGrantCount) {
sparksText += ' (' + totalGrantCount + ' total)'; sparksText += ' (' + totalGrantCount + ' total)';

View file

@ -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>"); $('#${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}' var sparksText = ' from <span class="sparkline_range">${sparklineVO.earliestYearConsidered?c}'
+ ' to ${sparklineVO.latestRenderedGrantYear?c}</span>'; + ' through ${sparklineVO.latestRenderedGrantYear?c}</span>';
if (totalGrants !== totalGrantCount) { if (totalGrants !== totalGrantCount) {
sparksText += ' (' + totalGrantCount + ' total)'; sparksText += ' (' + totalGrantCount + ' total)';
@ -273,7 +273,7 @@
<p> <p>
<#assign tableID = "grant_sparkline_data_table" /> <#assign tableID = "grant_sparkline_data_table" />
<#assign tableCaption = "Grants per year " /> <#assign tableCaption = "Grants per year" />
<#assign tableActivityColumnName = "Grants" /> <#assign tableActivityColumnName = "Grants" />
<#assign tableContent = sparklineVO.yearToActivityCount /> <#assign tableContent = sparklineVO.yearToActivityCount />
<#assign fileDownloadLink = sparklineVO.downloadDataLink /> <#assign fileDownloadLink = sparklineVO.downloadDataLink />

View file

@ -225,13 +225,14 @@ $(document).ready(function(){
<div class="vis_stats"> <div class="vis_stats">
<div class="sub_headings" id="table_heading"><h3>Tables</h3></div> <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"> <div class="vis-tables">
<p id="grants_table_container" class="datatable"> <p id="grants_table_container" class="datatable">
<#assign tableID = "grant_data_table" /> <#assign tableID = "grant_data_table" />
<#assign tableCaption = "Grants per year " /> <#assign tableCaption = "Grants per year" />
<#assign tableActivityColumnName = "Grants" /> <#assign tableActivityColumnName = "Grants" />
<#assign tableContent = egoGrantSparklineVO.yearToActivityCount /> <#assign tableContent = egoGrantSparklineVO.yearToActivityCount />
<#assign fileDownloadLink = egoGrantSparklineVO.downloadDataLink /> <#assign fileDownloadLink = egoGrantSparklineVO.downloadDataLink />