From eae82a00b4224245d7716fd535ad481db36803be Mon Sep 17 00:00:00 2001
From: cdtank <cdtank@440791e1-c2bf-4c1e-ad7c-caf3f8b0ebe8>
Date: Fri, 9 Jul 2010 16:49:36 +0000
Subject: [PATCH] 1. Added fix for inappropriate display of tables. 2. Minor
 styling changes. 3. Code cleanup

---
 .../VisualizationCodeGenerator.java           | 25 ++++++-------------
 .../entity/sparklineVisualization.jsp         | 12 +++++++++
 .../templates/visualization/person_level.jsp  | 17 +++++++------
 3 files changed, 29 insertions(+), 25 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 51f0e1464..1e8473da6 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
@@ -149,9 +149,12 @@ public class VisualizationCodeGenerator {
 										"    	border-spacing: 0;" +
 										"    	vertical-align: inherit;" +
 										"}" +
-										/*".sparkline_wrapper_table table{" +
-										"    	vertical-align: bottom;" +
-										"}" +*/
+										"table.sparkline_wrapper_table td, th {" +
+										"	vertical-align: bottom;" +
+										"}" +
+										".vis_link {" +
+										"	padding-top: 5px;" +
+										"}" +
 										"td.sparkline_number { text-align:right; padding-right:5px; }" +
 										"td.sparkline_text   {text-align:left;}" +
 										/*"#sparkline_data_table {" +
@@ -557,20 +560,6 @@ public class VisualizationCodeGenerator {
 		
 		String fullTimelineLink;
 		if (yearToPublicationCount.size() > 0) {
-//			String fullTimelineNetworkURL = uri.toString() + "?" + 
-//										VisualizationFrameworkConstants.INDIVIDUAL_URI_URL_HANDLE + 
-//										 "=" + URLEncoder.encode(individualURI, 
-//												 				 VisualizationController.URL_ENCODING_SCHEME).toString() +
-//										 "&" +
-//										 "vis" +
-//										 "=" + URLEncoder.encode(VisualizationController
-//												 						.PERSON_PUBLICATION_COUNT_VIS_URL_VALUE, 
-//												 				 VisualizationController.URL_ENCODING_SCHEME).toString() +
-//										 "&" +
-//										 VisualizationFrameworkConstants.RENDER_MODE_URL_HANDLE + 
-//										 "=" + URLEncoder.encode(VisualizationFrameworkConstants.STANDALONE_RENDER_MODE_URL_VALUE, 
-//								 				 				 VisualizationController.URL_ENCODING_SCHEME).toString();
-			
 			
 			String fullTimelineNetworkURL = contextPath
 							+ "/admin/visQuery"
@@ -599,7 +588,7 @@ public class VisualizationCodeGenerator {
 		
 		}
 		
-		divContextCode.append("<p>" + fullTimelineLink + "</p>");
+		divContextCode.append("<p class=\"vis_link\">" + fullTimelineLink + "</p>");
 		
 		} catch (UnsupportedEncodingException e) {
 		e.printStackTrace();
diff --git a/webapp/web/templates/entity/sparklineVisualization.jsp b/webapp/web/templates/entity/sparklineVisualization.jsp
index f32b460fc..a7e1c25ee 100644
--- a/webapp/web/templates/entity/sparklineVisualization.jsp
+++ b/webapp/web/templates/entity/sparklineVisualization.jsp
@@ -83,8 +83,20 @@
 			position:absolute;
 			/*width:380px;*/
 		}
+		
 	</style>
 	
+	<!--[if IE]>
+	<style type="text/css">
+	
+	#vis_container {
+		padding-bottom:15px;
+	}
+	
+	
+	</style>
+<![endif]-->
+	
 	<script type="text/javascript">
 	<!--
 	
diff --git a/webapp/web/templates/visualization/person_level.jsp b/webapp/web/templates/visualization/person_level.jsp
index 13ff543ec..87ee1fcf3 100644
--- a/webapp/web/templates/visualization/person_level.jsp
+++ b/webapp/web/templates/visualization/person_level.jsp
@@ -59,7 +59,8 @@
 
 .sub_headings {
 	color: #121b3c;
-	padding-top: 5px;
+	padding-top: 10px;
+	margin-bottom: 0.3em;
 }
 
 .sub_headings a {
@@ -67,6 +68,9 @@
 	font-weight:normal;
 }
 
+table.sparkline_wrapper_table td, th {
+	vertical-align: bottom;
+}
 
 .inline_href {
 }
@@ -167,7 +171,8 @@
 		        	<c:set var='authorsText' value='multi-author' />
 		        </c:if>
 		        
-		        <span id="no_coauthorships">Currently there are no ${authorsText} papers for <span id="no_coauthorships_person" class="author_name">this author</span> in the VIVO database.</span>
+		        <span id="no_coauthorships">Currently there are no ${authorsText} papers for 
+		        	<span id="no_coauthorships_person" class="author_name">this author</span> in the VIVO database.</span>
 		    </c:otherwise>
 		</c:choose>
 		
@@ -195,6 +200,7 @@
 		<div class="bold"><strong><span id="authorName" class="neutral_author_name">&nbsp;</span></strong></div>
 		
 		<div class="italicize"><span id="profileMoniker" class="author_moniker"></span></div>
+		<div><a href="#" id="profileUrl">VIVO profile</a> | <a href="#" id="coAuthorshipVisUrl">Co-author network</a></div> 
 		<br />
 		<div class="works"><span class="numbers" style="width: 40px;" id="works"></span>&nbsp;&nbsp;<span class="title">Works</span></div>
 		<div class="works"><span class="numbers" style="width: 40px;" id="coAuthors"></span>&nbsp;&nbsp;<span>Co-author(s)</span></div>
@@ -202,11 +208,6 @@
 		<div class="works" id="fPub" style="visibility:hidden"><span class="numbers" style="width:40px;" id="firstPublication"></span>&nbsp;&nbsp;<span>First Publication</span></div>
 		<div class="works" id="lPub" style="visibility:hidden"><span class="numbers" style="width:40px;" id="lastPublication"></span>&nbsp;&nbsp;<span>Last Publication</span></div>
 		
-		<br /><br />
-		   
-		<div><a href="#" id="profileUrl">VIVO profile</a></div>
-		<br />
-		<div><a href="#" id="coAuthorshipVisUrl">Co-author network of <span id="coAuthorName"></span></a></div>
 	</div>
 
 </div>
@@ -232,6 +233,8 @@
 			</div>
 		
 		</c:if>
+		
+		<div style="clear:both;"></div>
 	
 	</div>
 </c:if>