From 67ce187eac453b8d3ebb6865a06d82976eca6d28 Mon Sep 17 00:00:00 2001
From: Tim Worrall <tlw72@cornell.edu>
Date: Tue, 10 Jun 2014 12:08:41 -0400
Subject: [PATCH] minor design and css changes for person-level visualization
 pages

---
 .../css/visualization/personlevel/page.css    |  8 +++--
 .../personlevel/coAuthorPersonLevel.ftl       | 35 ++++++++-----------
 .../personlevel/coPIPersonLevel.ftl           | 35 +++++++------------
 3 files changed, 32 insertions(+), 46 deletions(-)

diff --git a/productMods/css/visualization/personlevel/page.css b/productMods/css/visualization/personlevel/page.css
index 58f5c127..2ef22e4e 100644
--- a/productMods/css/visualization/personlevel/page.css
+++ b/productMods/css/visualization/personlevel/page.css
@@ -81,9 +81,10 @@ p.datatable {
     margin-right: 10px;
 }
 .toggle_visualization { 
-    max-width: 180px;
+    max-width: 230px;
     float: right;
     display: none;
+	margin-top: -55PX;
 }
 #publication-count-sparkline-include {
     float: left;
@@ -116,7 +117,8 @@ table.sparkline_wrapper_table td, th {
   max-width: 50%;
 }
 #ego_label {
-    font-size: 1.1em;
+    color: inherit;
+	font-size: 1.375em;
 }
 #ego_profile_image {
   float: left;
@@ -236,7 +238,7 @@ table.sparkline_wrapper_table td, th {
     margin-right: 15px;
 }
 .graphml-file-link {
-    padding-top: 20px;
+    padding-top: 59px;
     height: 20px;
     font-size: .9em;
 }
diff --git a/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl b/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl
index 35b0253e..343b5514 100644
--- a/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl
+++ b/productMods/templates/freemarker/visualization/personlevel/coAuthorPersonLevel.ftl
@@ -127,15 +127,20 @@ $(document).ready(function(){
 
 
 <div id="body">
-    <div id="ego_profile">
-    
-        <#-- Label -->
-        <h2><a href="${egoVivoProfileURL}" title="${i18n().author_name}"><span id="ego_label" class="author_name"></span></a></h2>
-    
-        <#-- Moniker-->
-        <em id="ego_moniker" class="moniker"></em>
+	
+	<div  class="sub_headings"><h2><a href="${egoVivoProfileURL}" title="${i18n().author_name}"><span id="ego_label"></span></a><br />${i18n().co_author_network} </h2></div>
+    <#if (numOfCoAuthorShips?? && numOfCoAuthorShips > 0) || (numOfAuthors?? && numOfAuthors > 0) > 
+            <div class = "graphml-file-link">(<a href="${egoCoAuthorshipNetworkDataFileURL}" title="GraphML ${i18n().file}">GraphML ${i18n().file}</a>)</div>
+    <#else>
 
-    </div>
+            <#if numOfAuthors?? && numOfAuthors <= 0 >
+                <#assign authorsText = "multi-author" />
+            </#if>
+            
+            <div id="no_coauthorships">${i18n().currently_no_papers_for(authorsText!)} 
+                <a href="${egoVivoProfileURL}" title="${i18n().co_authorship}"><span id="no_coauthorships_person" class="author_name">${i18n().this_author}</span></a> ${i18n().in_the_vivo_db}
+            </div>                      
+    </#if>
     
     <div class = "toggle_visualization">
         <div id="coinvestigator_link_container" class="collaboratorship-link-container">
@@ -150,20 +155,8 @@ $(document).ready(function(){
     
     <#if (numOfAuthors?? && numOfAuthors > 0) >
     
-        <div  class="sub_headings"><h3>${i18n().co_author_network} </h3></div>
         
-        <#if (numOfCoAuthorShips?? && numOfCoAuthorShips > 0) || (numOfAuthors?? && numOfAuthors > 0) > 
-                <div class = "graphml-file-link"><a href="${egoCoAuthorshipNetworkDataFileURL}" title="GraphML ${i18n().file}">(GraphML ${i18n().file_capitalized})</a></div>
-        <#else>
-
-                <#if numOfAuthors?? && numOfAuthors <= 0 >
-                    <#assign authorsText = "multi-author" />
-                </#if>
-                
-                <div id="no_coauthorships">${i18n().currently_no_papers_for(authorsText!)} 
-                    <a href="${egoVivoProfileURL}" title="${i18n().co_authorship}"><span id="no_coauthorships_person" class="author_name">${i18n().this_author}</span></a> ${i18n().in_the_vivo_db}
-                </div>                      
-        </#if>
+        
     
     <#else>
     
diff --git a/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl b/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl
index 3801f4a5..1102ab68 100644
--- a/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl
+++ b/productMods/templates/freemarker/visualization/personlevel/coPIPersonLevel.ftl
@@ -126,30 +126,9 @@ $(document).ready(function(){
 
 
 <div id="body">
-    <div id="ego_profile">
+    <div  class="sub_headings"><h2><a href="${egoVivoProfileURL}" title="${i18n().investigator_name}"><span id="ego_label"></span></a><br />${i18n().co_investigator_network_capitalized} </h2></div>
             
-        <#-- Label -->
-            <h2><a href="${egoVivoProfileURL}" title="${i18n().investigator_name}"><span id="ego_label" class="investigator_name"></span></a></h2>
-    
-        <#-- Moniker-->
-            <em id="ego_moniker" class="moniker"></em>
-        
-    </div>
-    
-    <div class = "toggle_visualization">
-        <div id="coauthorship_link_container" class="collaboratorship-link-container">
-        	<div class="collaboratorship-icon"><a href="${coauthorshipURL}" title="${i18n().co_author}"><img src="${coAuthorIcon}" alt="${i18n().co_author_icon}"/></a></div>
-            <div class="collaboratorship-link">
-                <h3><a href="${coauthorshipURL}" title="${i18n().co_author_network}">${i18n().co_author_network}</a></h3>
-            </div>
-        </div>
-    </div>
-        
-    <div style="clear:both;"></div>
-    
     <#if (numOfInvestigators?? && numOfInvestigators > 0) >
-    
-        <div class="sub_headings"><h3 >${i18n().co_investigator_network_capitalized} </h3></div>
         
         <#if (numOfCoInvestigations?? && numOfCoInvestigations > 0) || (numOfInvestigators?? && numOfInvestigators > 0) > 
                 <div class = "graphml-file-link"><a href="${egoCoInvestigationNetworkDataFileURL}" title="${i18n().co_investigator}">(GraphML ${i18n().file_capitalized})</a></div>
@@ -171,6 +150,18 @@ $(document).ready(function(){
         </span>
     
     </#if>
+    
+    <div class = "toggle_visualization">
+        <div id="coauthorship_link_container" class="collaboratorship-link-container">
+        	<div class="collaboratorship-icon"><a href="${coauthorshipURL}" title="${i18n().co_author}"><img src="${coAuthorIcon}" alt="${i18n().co_author_icon}"/></a></div>
+            <div class="collaboratorship-link">
+                <h3><a href="${coauthorshipURL}" title="${i18n().co_author_network}">${i18n().co_author_network}</a></h3>
+            </div>
+        </div>
+    </div>
+        
+    <div style="clear:both;"></div>
+    
             
     <#if (numOfCoInvestigations?? && numOfCoInvestigations > 0) || (numOfInvestigators?? && numOfInvestigators > 0) >