Merge r1431,1436 from rel-1.1-maint branch (IE6 fix for coathorship visualization page) NIHVIVO-954

productMods/templates/entity/sparklineVisualization.jsp

@@ -9,8 +9,7 @@
 <%@ 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
+    Displays the sparkline visualizations on individual profile pages
-          for administrators and editors.
 
     request.attributes:
     an Entity object with the name "entity" 
@@ -22,13 +21,10 @@
     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;
@@ -39,7 +35,6 @@
                 displayVisualization = true;
                 break;
             }
-            	
         }	
     }
     //System.out.println("visualization is supposed to be displayed? > " + displayVisualization);
@@ -84,21 +79,16 @@
                 position:absolute;*/
                 /*width:380px;*/
             }
-		
         </style>
 	
-
-	
         <script type="text/javascript">
         <!--
 
         $(document).ready(function() {
 
             function renderVisualization(visualizationURL) {
-
                 <%--  
                 $("#vis_container").empty().html('<img src="${loadingImageLink}" />');
-	
                 --%>
                 $.ajax({
                     url: visualizationURL,
@@ -108,21 +98,18 @@
 
                     }
                 });
-	
             }
             
            renderVisualization('${visualizationURL}');
 
         });
 
-	
-	
         //-->
         </script>
+        
         <div id="vis_container">&nbsp;</div>
 
-	
+        <!--[if lte IE 7]>
-		<!--[if IE]>
         <style type="text/css">
 
         #vis_container a{
@@ -130,21 +117,10 @@
         }
 
         .vis_link a{
-		padding: 5px;
+            margin-top: 15px;
+            padding:10px;
             display: block;
         }
-	
-	</style>
-<![endif]-->
-
-<!--[if lt IE 8]>
-	<style type="text/css">
-	
-	.vis_link {
-		padding-top:15px;
-		display: block;
-	}
-
         </style>
         <![endif]-->
 

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>
@@ -154,8 +94,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>
 			<div id="${egoPubSparklineContainerID}">
@@ -254,26 +192,3 @@ table.sparkline_wrapper_table td, th {
 </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>

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;
+}