From 7e7f5c6bc7eb43b9f2d3d5c5578e40e8c0aa94a8 Mon Sep 17 00:00:00 2001 From: cdtank Date: Thu, 8 Jul 2010 18:32:17 +0000 Subject: [PATCH] 1. Made changes re: how the sparklines are rendered in "Full Spark" mode. 2. Made style changes to the person level front end. --- .../personpubcount/VisualizationCodeGenerator.java | 14 +++++++------- .../web/templates/visualization/person_level.jsp | 4 +++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java index 409a2ef01..9d7fe327e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/visualization/personpubcount/VisualizationCodeGenerator.java @@ -148,9 +148,9 @@ public class VisualizationCodeGenerator { " border-spacing: 0;" + " vertical-align: inherit;" + "}" + - ".sparkline_wrapper_table table{" + + /*".sparkline_wrapper_table table{" + " vertical-align: bottom;" + - "}" + + "}" +*/ "td.sparkline_number { text-align:right; padding-right:5px; }" + "td.sparkline_text {text-align:left;}" + /*"#sparkline_data_table {" + @@ -379,8 +379,6 @@ public class VisualizationCodeGenerator { visualizationCode.append("$('#" + visDivNames.get("FULL_SPARK") + " td.sparkline_number').text('" + renderedFullSparks + "');"); - - visualizationCode.append("var allSparksText = ''" + "+ ' papers with year from '" + "+ ' " + totalPublications + " '" + @@ -388,7 +386,7 @@ public class VisualizationCodeGenerator { "" + "(" + minPubYearConsidered + " - " + currentYear + ")" + " '" + - "+ ' (.CSV File)';" + + "+ ' (.CSV File)';" + "$('#" + visDivNames.get("FULL_SPARK") + " td.sparkline_text').html(allSparksText);"); visualizationCode.append("}\n "); @@ -514,7 +512,7 @@ public class VisualizationCodeGenerator { String downloadURL = contextPath - + "/admin/visQuery" +// + "/admin/visQuery" + "?" + VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE + "=" + URLEncoder.encode(individualURIParam, VisualizationController.URL_ENCODING_SCHEME).toString() @@ -525,7 +523,7 @@ public class VisualizationCodeGenerator { + "&" + VisualizationFrameworkConstants.RENDER_MODE_URL_HANDLE + "=" + URLEncoder.encode(VisualizationFrameworkConstants.DATA_RENDER_MODE_URL_VALUE, VisualizationController.URL_ENCODING_SCHEME).toString(); - + System.out.println(" ----- >>>> " + contextPath + " XX " + individualURIParam + " XX " + downloadURL); return downloadURL; } else { return "#"; @@ -576,6 +574,8 @@ public class VisualizationCodeGenerator { + "=" + URLEncoder.encode(VisualizationFrameworkConstants.STANDALONE_RENDER_MODE_URL_VALUE, VisualizationController.URL_ENCODING_SCHEME).toString(); + System.out.println("context parth full n/w " + contextPath); + fullTimelineLink = "View full timeline and co-author network
"; valueObjectContainer.setFullTimelineNetworkLink(fullTimelineNetworkURL); diff --git a/webapp/web/templates/visualization/person_level.jsp b/webapp/web/templates/visualization/person_level.jsp index 6b7d99161..294ce64d4 100644 --- a/webapp/web/templates/visualization/person_level.jsp +++ b/webapp/web/templates/visualization/person_level.jsp @@ -28,6 +28,8 @@ .sparkline_wrapper_table { display: inline; + vertical-align: bottom; + } .author_name { @@ -46,11 +48,11 @@ .sub_headings a { font-size:0.7em; + font-weight:normal; } .inline_href { - display: inline; } #ego_profile {