From 96c91a9195dcb715d4a7a752877f36e4d53b5c26 Mon Sep 17 00:00:00 2001
From: nac26 <nac26@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Fri, 1 Oct 2010 20:01:46 +0000
Subject: [PATCH] Merge r1431,1436 from rel-1.1-maint branch (IE6 fix for
 coathorship visualization page) NIHVIVO-954

---
 .../entity/sparklineVisualization.jsp         | 260 ++++++++----------
 .../templates/visualization/person_level.jsp  | 135 ++-------
 .../css/visualization/personlevel/page.css    |  81 ++++++
 3 files changed, 224 insertions(+), 252 deletions(-)

diff --git a/productMods/templates/entity/sparklineVisualization.jsp b/productMods/templates/entity/sparklineVisualization.jsp
index 4c0301da..ef58dfd6 100644
--- a/productMods/templates/entity/sparklineVisualization.jsp
+++ b/productMods/templates/entity/sparklineVisualization.jsp
@@ -9,159 +9,135 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ page errorPage="/error.jsp"%>
 <%  /***********************************************
-          Displays the little group of things at the bottom of the page
-          for administrators and editors.
-         
-         request.attributes:
-         an Entity object with the name "entity" 
-         
-         
-         request.parameters:
-         None, should only work with requestScope attributes for security reasons.
-         
-          Consider sticking < % = MiscWebUtils.getReqInfo(request) % > in the html output
-          for debugging info.
-                 
-         bdc34 2006-01-22 created        
-        **********************************************/ 
-        Individual entity = (Individual)request.getAttribute("entity");
-		boolean displayVisualization = false;
-		
-		
-          
-        if (entity == null){
-            String e = "sparklineVisuzalition.jsp expects that request attribute 'entity' be set to the Entity object to display.";
-            displayVisualization = false;
-            throw new JspException(e);
-        } else {
-        	for (VClass currClass : entity.getVClasses()) {
-        		if ("http://xmlns.com/foaf/0.1/Person".equalsIgnoreCase(currClass.getURI())) {
-            		displayVisualization = true;
-            		break;
-            	}
-            	
-            }	
-        }
-		//System.out.println("visualization is supposed to be displayed? > " + displayVisualization);
-        if (displayVisualization) {
-        	
+    Displays the sparkline visualizations on individual profile pages
+
+    request.attributes:
+    an Entity object with the name "entity" 
+
+
+    request.parameters:
+    None, should only work with requestScope attributes for security reasons.
+
+    Consider sticking < % = MiscWebUtils.getReqInfo(request) % > in the html output
+    for debugging info.
+            
+    **********************************************/ 
+    Individual entity = (Individual)request.getAttribute("entity");
+    boolean displayVisualization = false;
+
+    if (entity == null){
+        String e = "sparklineVisuzalition.jsp expects that request attribute 'entity' be set to the Entity object to display.";
+        displayVisualization = false;
+        throw new JspException(e);
+    } else {
+        for (VClass currClass : entity.getVClasses()) {
+            if ("http://xmlns.com/foaf/0.1/Person".equalsIgnoreCase(currClass.getURI())) {
+                displayVisualization = true;
+                break;
+            }
+        }	
+    }
+    //System.out.println("visualization is supposed to be displayed? > " + displayVisualization);
+    if (displayVisualization) {
+
 %>
 
 
-<c:set var='portalBean' value='${currentPortal}'/>
-<c:set var="themeDir"><c:out value="${portalBean.themeDir}" /></c:set>
-<c:url var="loadingImageLink" value="/${themeDir}site_icons/visualization/ajax-loader.gif"></c:url>
+        <c:set var='portalBean' value='${currentPortal}'/>
+        <c:set var="themeDir"><c:out value="${portalBean.themeDir}" /></c:set>
+        <c:url var="loadingImageLink" value="/${themeDir}site_icons/visualization/ajax-loader.gif"></c:url>
 
-	<!-- START Visualization Code -->            
-	<c:url var="visualizationURL" value="/visualization">
-		<c:param name="render_mode" value="dynamic"/>
-		<c:param name="container" value="vis_container"/>
-		<c:param name="vis" value="person_pub_count"/>
-		<c:param name="vis_mode" value="short"/>
-		<c:param name="uri" value="${entity.URI}"/>
-	</c:url>
-	
-	<%-- PDF Visualization URL
-	
-	For now we have disabled this.
-	             
-	<c:url var="pdfURL" value="/visualization">
-		<c:param name="render_mode" value="pdf"/>
-		<c:param name="container" value="vis_container"/>
-		<c:param name="vis" value="person_pub_count"/>
-		<c:param name="vis_mode" value="full"/>
-		<c:param name="uri" value="${entity.URI}"/>
-	</c:url>
-	
-	--%>
-	
-	<style type="text/css">
-		#vis_container {
-			cursor:pointer;
-			/*height:36px;
-			margin-left:24%;
-			margin-top:-2%;
-			position:absolute;*/
-			/*width:380px;*/
-		}
-		
-	</style>
+        <!-- START Visualization Code -->            
+        <c:url var="visualizationURL" value="/visualization">
+            <c:param name="render_mode" value="dynamic"/>
+            <c:param name="container" value="vis_container"/>
+            <c:param name="vis" value="person_pub_count"/>
+            <c:param name="vis_mode" value="short"/>
+            <c:param name="uri" value="${entity.URI}"/>
+        </c:url>
 	
+        <%-- PDF Visualization URL
 
-	
-	<script type="text/javascript">
-	<!--
-	
-	$(document).ready(function() {
-	
-		function renderVisualization(visualizationURL) {
+        For now we have disabled this.
+       
+        <c:url var="pdfURL" value="/visualization">
+            <c:param name="render_mode" value="pdf"/>
+            <c:param name="container" value="vis_container"/>
+            <c:param name="vis" value="person_pub_count"/>
+            <c:param name="vis_mode" value="full"/>
+            <c:param name="uri" value="${entity.URI}"/>
+        </c:url>
 
-			<%--  
-			$("#vis_container").empty().html('<img src="${loadingImageLink}" />');
-	
-	--%>
-			   $.ajax({
-				   url: visualizationURL,
-				   dataType: "html",
-				   success:function(data){
-				     $("#vis_container").html(data);
-	
-				   }
-				 });
-	
-		}
-	
-	   renderVisualization('${visualizationURL}');
-	
-	});
-	
-	
-	
-	//-->
-	</script>
-	<div id="vis_container">&nbsp;</div>
-	
-	
-		<!--[if IE]>
-	<style type="text/css">
-	
-	#vis_container a{
-		padding-bottom:5px;
-	}
-	
-	.vis_link a{
-		padding: 5px;
-		display: block;
-	}
-	
-	</style>
-<![endif]-->
+        --%>
 
-<!--[if lt IE 8]>
-	<style type="text/css">
+        <style type="text/css">
+            #vis_container {
+                cursor:pointer;
+                /*height:36px;
+                margin-left:24%;
+                margin-top:-2%;
+                position:absolute;*/
+                /*width:380px;*/
+            }
+        </style>
 	
-	.vis_link {
-		padding-top:15px;
-		display: block;
-	}
+        <script type="text/javascript">
+        <!--
 
-	</style>
-<![endif]-->
-	
-	<%--  
-	
-	For now we have disabled PDF report vis.
-	
-	<div id="pdf_url">
-		This is the <a href="${pdfURL}">link</a> to PDF report.
-	</div>
-	
-	--%>
-	
-	<!-- END Visualization Code -->
+        $(document).ready(function() {
+
+            function renderVisualization(visualizationURL) {
+                <%--  
+                $("#vis_container").empty().html('<img src="${loadingImageLink}" />');
+                --%>
+                $.ajax({
+                    url: visualizationURL,
+                    dataType: "html",
+                    success:function(data){
+                     $("#vis_container").html(data);
+
+                    }
+                });
+            }
+            
+           renderVisualization('${visualizationURL}');
+
+        });
+
+        //-->
+        </script>
+        
+        <div id="vis_container">&nbsp;</div>
+
+        <!--[if lte IE 7]>
+        <style type="text/css">
+
+        #vis_container a{
+            padding-bottom:5px;
+        }
+
+        .vis_link a{
+            margin-top: 15px;
+            padding:10px;
+            display: block;
+        }
+        </style>
+        <![endif]-->
+
+        <%-- 
+
+        For now we have disabled PDF report vis.
+
+        <div id="pdf_url">
+            This is the <a href="${pdfURL}">link</a> to PDF report.
+        </div>
+
+        --%>
+
+        <!-- END Visualization Code -->
 
 <%
 
-        }
+    }
 
-%>
+%>
\ No newline at end of file
diff --git a/productMods/templates/visualization/person_level.jsp b/productMods/templates/visualization/person_level.jsp
index 2d6c5e50..c3e4d086 100644
--- a/productMods/templates/visualization/person_level.jsp
+++ b/productMods/templates/visualization/person_level.jsp
@@ -34,91 +34,31 @@
 	<c:param name="uri" value="${requestScope.egoURIParam}" />
 </c:url>
 
+<script language="JavaScript" type="text/javascript">
+$(document).ready(function(){
+
+		<c:if test='${numOfCoAuthorShips > 0}'>
+	    	$("#coauth_table_container").empty().html('<img id="loadingData" with="auto" src="${loadingImageLink}" />');
+	    </c:if>
+	    	
+	processProfileInformation("ego_label", 
+							  "ego_moniker",
+							  "ego_profile_image",
+							  jQuery.parseJSON(getWellFormedURLs("${requestScope.egoURIParam}", "profile_info")));
+
+	<c:if test='${empty numOfCoAuthorShips || empty numOfAuthors}'>
+
+		if ($('#ego_label').text().length > 0) {
+			setProfileName('no_coauthorships_person', $('#ego_label').text());
+		}
+		
+	</c:if>	
+
+});
+</script>
+
 <div id="body">
 
-
-<style type="text/css">
-
-#profileImage img{
-	width: 90px;
-	height: auto;
-}
-
-#body h1 {
-	margin:0.0em;
-} 
-
-.sparkline_wrapper_table {
-	display: inline;
-	vertical-align: bottom;
-}
-
-.author_name {
-	color: #13968c;
-	font-weight: bold;
-}
-
-.neutral_author_name {
-	color: black;
-	font-weight: bold;
-}
-
-.author_moniker {
-	color: #9C9C9C;
-}
-
-.sub_headings {
-	color: #121b3c;
-	padding-top: 10px;
-	margin-bottom: 0.3em;
-}
-
-.sub_headings a {
-	font-size:0.7em;
-	font-weight:normal;
-}
-
-table.sparkline_wrapper_table td, th {
-	vertical-align: bottom;
-}
-
-.inline_href {
-}
-
-
-#ego_profile {
-	padding-left:10px;
-	padding-top:10px;
-	min-height: 100px;
-}
-
-#ego_label {
-	font-size:1.1em;
-}
-
-#ego_profile_image {
-	float:left;
-	padding-right: 5px;
-}
-
-#ego_profile_image img{
-	width: 90px;
-	height: auto;
-}
-
-#ego_sparkline {
-	cursor:pointer;
-	height:36px;
-	width:471px;
-}
-
-
-#coauthorships_table th {
-	vertical-align: top;
-}
-
-</style>
-
 <!--[if IE]>
 	<style type="text/css">
 	
@@ -140,7 +80,7 @@ table.sparkline_wrapper_table td, th {
 			<div id="ego_profile_image" class="thumbnail"></div>
 			
 	<%-- Label --%>
-			<a href="${egoVivoProfileURL}"><h1><span id="ego_label" class="author_name"></span></h1></a>
+			<h1><a href="${egoVivoProfileURL}"><span id="ego_label" class="author_name"></span></a></h1>
 	
 	<%-- Moniker--%>
 			<span id="ego_moniker" class="author_moniker"></span>
@@ -153,8 +93,6 @@ table.sparkline_wrapper_table td, th {
 	
 	<div id="incomplete-data">This information is based solely on publications which have been loaded into the VIVO system. 
 	This may only be a small sample of the person's total work. </div>
-	
-
 
 	<%-- Sparkline --%>
 		<h2 class="sub_headings">General Statistics</h2>
@@ -253,27 +191,4 @@ table.sparkline_wrapper_table td, th {
 	</div>
 </c:if>
 
-</div>
-
-<script language="JavaScript" type="text/javascript">
-$(document).ready(function(){
-
-		<c:if test='${numOfCoAuthorShips > 0}'>
-	    	$("#coauth_table_container").empty().html('<img id="loadingData" with="auto" src="${loadingImageLink}" />');
-	    </c:if>
-	    	
-	processProfileInformation("ego_label", 
-							  "ego_moniker",
-							  "ego_profile_image",
-							  jQuery.parseJSON(getWellFormedURLs("${requestScope.egoURIParam}", "profile_info")));
-
-	<c:if test='${empty numOfCoAuthorShips || empty numOfAuthors}'>
-
-		if ($('#ego_label').text().length > 0) {
-			setProfileName('no_coauthorships_person', $('#ego_label').text());
-		}
-		
-	</c:if>	
-
-});
-</script>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/themes/vivo-basic/css/visualization/personlevel/page.css b/themes/vivo-basic/css/visualization/personlevel/page.css
index 7e9285b8..6c0e1a47 100644
--- a/themes/vivo-basic/css/visualization/personlevel/page.css
+++ b/themes/vivo-basic/css/visualization/personlevel/page.css
@@ -13,6 +13,7 @@ a.no_href_styles {
 	margin: 0;
 	padding-left:10px;
 	padding-top:10px;
+	background: #fff;
 }
 
 .vis-tables {
@@ -56,3 +57,83 @@ p.datatable {
 }
 
 */
+
+
+#profileImage img{
+	width: 90px;
+	height: auto;
+}
+
+#body h1 {
+	margin:0.0em;
+} 
+
+#ego_profile h1 a {
+  text-decoration: none;
+}
+
+.sparkline_wrapper_table {
+	display: inline;
+	vertical-align: bottom;
+}
+
+.author_name {
+	color: #13968c;
+	font-weight: bold;
+}
+
+.neutral_author_name {
+	color: black;
+	font-weight: bold;
+}
+
+.author_moniker {
+	color: #9C9C9C;
+}
+
+.sub_headings {
+	color: #121b3c;
+	padding-top: 10px;
+	margin-bottom: 0.3em;
+}
+
+.sub_headings a {
+	font-size:0.7em;
+	font-weight:normal;
+}
+
+table.sparkline_wrapper_table td, th {
+	vertical-align: bottom;
+}
+
+#ego_profile {
+  height: 1%; /* this was the key to killing the IE6 bug (no upper photo and sparklines jump on hover). Solution? Give the parent layout */
+  background: #fff;
+  padding-left:10px;
+  padding-top:10px;
+  min-height: 100px;
+}
+
+#ego_label {
+	font-size:1.1em;
+}
+
+#ego_profile_image {
+  float:left;
+  padding-right: 5px;
+}
+
+#ego_profile_image img {
+  width: 90px;
+  height: auto;
+}
+
+#ego_sparkline {
+	cursor:pointer;
+	height:36px;
+	width:471px;
+}
+
+#coauthorships_table th {
+	vertical-align: top;
+}
\ No newline at end of file