From a127d6337d742b8d7a006dea95619d4625cd435c Mon Sep 17 00:00:00 2001 From: cdtank Date: Tue, 4 Jan 2011 18:08:21 +0000 Subject: [PATCH] 1. Made style changes for the indivudal page in the sparkline visualization section. 2. Moved co-author n/w link from publication sparkline template to indiv*-sparkline*.ftl --- .../css/visualization/visualization.css | 30 +++++++++++++ productMods/js/visualization/sparkline.js | 19 ++++---- .../individual-sparklineVisualization.ftl | 45 +++++-------------- .../personPublicationSparklineContent.ftl | 34 ++++---------- 4 files changed, 60 insertions(+), 68 deletions(-) diff --git a/productMods/css/visualization/visualization.css b/productMods/css/visualization/visualization.css index 1d0a041b..905dc030 100644 --- a/productMods/css/visualization/visualization.css +++ b/productMods/css/visualization/visualization.css @@ -26,4 +26,34 @@ span.incomplete-data-holder, margin-top:-2%; position:absolute; width:380px;*/ +} + +.collaboratorship-icon { + float: left; + padding-right: 5px; +} + +.collaboratorship-link a { + font-size: 0.9em; +} + +.collaboratorship-link h3 { + line-height: 1em; + font-size: 1em !important; + margin-bottom: 0px !important; + padding-top: 0px !important; + padding-right: 0px !important; + padding-left: 0px !important; + padding-bottom: 0px !important; +} + +#coauthorship_link_container, +#coinvestigator_link_container { + margin-top: 10px; +} + +.sparkline_text { + font-size: 0.8em; + font-weight: bold; + text-align: left; } \ No newline at end of file diff --git a/productMods/js/visualization/sparkline.js b/productMods/js/visualization/sparkline.js index 6c8011ee..f5033a41 100644 --- a/productMods/js/visualization/sparkline.js +++ b/productMods/js/visualization/sparkline.js @@ -8,8 +8,6 @@ var visualization = { var containerIdCoAuthor = 'vis_container_coauthor', containerCoAuthor = $('#' + containerIdCoAuthor); - //container.empty().html(''); - $.ajax({ url: url, data: { @@ -20,17 +18,20 @@ var visualization = { }, dataType: 'html', success:function(data){ - containerCoAuthor.html(data); - containerCoAuthor.children("#pub_count_short_sparkline_vis").append(coAuthorIcon); - /* containerCoAuthor.find("").css("float", "left"); */ + if ($.trim(data) != "") { + containerCoAuthor.html(data); + containerCoAuthor.children("#pub_count_short_sparkline_vis"); + + /* Since there are publications there are chances that there will be co-authors as well, so show the + * co-author network icon.*/ + $("#coauthorship_link_container").show(); + } + } }); } }; $(document).ready(function() { - - visualizationUrl = visualizationUrl.replace("/visualization", "/visualizationAjax"); - visualization.renderCoAuthor(visualizationUrl); -}); +}); \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl b/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl index 6a5cb8f2..2e030dad 100644 --- a/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl +++ b/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl @@ -8,50 +8,29 @@ <#assign coInvestigatorIcon = '${urls.images}/visualization/co_investigator_icon.png'> <#assign standardVisualizationURLRoot ="/visualizationfm"> <#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'> -<#assign CoInvestigatorURL = '${urls.base}${standardVisualizationURLRoot}?vis=person_level&uri=${individual.uri}&vis_mode=copi'> +<#assign coAuthorURL = '${urls.base}${standardVisualizationURLRoot}?vis=person_level&uri=${individual.uri}&vis_mode=coauthor'> +<#assign coInvestigatorURL = '${urls.base}${standardVisualizationURLRoot}?vis=person_level&uri=${individual.uri}&vis_mode=copi'> - -
 
-
-
-

Co-Investigator Network

View 4 + - ${stylesheets.addFromTheme("/visualization/visualization.css")} + + + ${stylesheets.add("css/visualization/visualization.css")} ${scripts.add(googleJSAPI)} ${scripts.add("/js/visualization/sparkline.js")} \ No newline at end of file diff --git a/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl b/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl index 266ee714..b5abda74 100644 --- a/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl +++ b/productMods/templates/freemarker/visualization/publication/personPublicationSparklineContent.ftl @@ -68,16 +68,8 @@ $.each(shortSparkRows, function(index, value) { renderedShortSparks += data.getValue(value, 1); }); - - var totalPubs = parseInt(renderedShortSparks) + parseInt(${sparklineVO.unknownYearPublications}); - - if ( totalPubs > 1 ) { - var pubDisplay = "publications"; - } else { - var pubDisplay = "publication"; - } - - $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).css("font-weight", "bold").attr("class", "grey").append(" "+ pubDisplay +"
"); + + $('#${sparklineContainerID} td.sparkline_number').text(parseInt(renderedShortSparks) + parseInt(${sparklineVO.unknownYearPublications})).css("font-weight", "bold").attr("class", "grey").append(" publication(s)
"); var sparksText = ' within the last 10 years'; @@ -87,23 +79,15 @@ * Sparks that will be rendered will always be the one's which has * any year associated with it. Hence. * */ - var renderedSparks = ${sparklineVO.renderedSparks}; - var totalPubs = parseInt(renderedSparks) + parseInt(${sparklineVO.unkownYearPublications}); - - if ( totalPubs > 1 ) { - var pubDisplay = "publications"; - } else { - var pubDisplay = "publication"; - } - - $('#${sparklineContainerID} td.sparkline_number').text(totalPubs).css("font-weight", "bold").attr("class", "grey").append(" "+ pubDisplay +"
"); + var renderedSparks = ${sparklineVO.renderedSparks}; + $('#${sparklineContainerID} td.sparkline_number').text(parseInt(renderedSparks) + parseInt(${sparklineVO.unknownYearPublications})).css("font-weight", "bold").attr("class", "grey").append(" publication(s)
"); var sparksText = ' from ${sparklineVO.earliestYearConsidered?c}' + ' to ${sparklineVO.latestRenderedPublicationYear?c} ' + ' (.CSV File) '; - $('#${sparklineContainerID} td.sparkline_text').html(sparksText).css("font-weight", "bold"); + $('#${sparklineContainerID} td.sparkline_text').html(sparksText); } @@ -155,7 +139,6 @@ var sparklineTextTD = $(''); sparklineTextTD.attr('class', 'sparkline_text'); - sparklineTextTD.css('text-align', 'left'); row3.append(sparklineTextTD); table.append(row); table.append(row2); @@ -171,10 +154,9 @@
<#if sparklineVO.shortVisMode> - <#----> -

Co-Author Network - View 4

- <#----> + + <#-- Shifted the link to co-author to the individual-sparkline.ftl instead. --> + <#else>