From 73338f1453cda5513fb0f824bf0e8b3f6f3dc06f Mon Sep 17 00:00:00 2001
From: mb863 <mb863@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Tue, 25 Jan 2011 15:54:38 +0000
Subject: [PATCH] NIHVIVO-1315: Done more refactoring work on individual pages.

---
 .../body/partials/individual/individual-overview.ftl       | 7 +++----
 .../individual/individual-sparklineVisualization.ftl       | 3 ++-
 .../body/partials/individual/individual-visualization.ftl  | 6 ++----
 themes/wilma/css/wilma.css                                 | 6 +++++-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl b/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl
index 3db9b1f1..962573ad 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-overview.ftl
@@ -6,9 +6,8 @@
 <#if overview?has_content> <#-- true when the property is in the list, even if not populated (when editing) -->
     <@p.addLinkWithLabel overview editable />
     <#list overview.statements as statement>
-        <p class="individual-overview">                   
-            ${statement.value}
-            <@p.editingLinks "${overview.localName}" statement editable />
-        </p>
+        <p class="individual-overview">${statement.value}</p>
+        
+        <@p.editingLinks "${overview.localName}" statement editable />
     </#list>
 </#if>
\ No newline at end of file
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl b/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl
index a3471b24..a5a78909 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-sparklineVisualization.ftl
@@ -3,7 +3,7 @@
 <#-- Template for sparkline visualization on individual profile page -->
 
 <#if individual.visualizationUrl??>
-<section id="sparklines-publications" role="region">
+
 
 <#assign coAuthorIcon = '${urls.images}/visualization/co_author_icon.png'>
 <#assign coInvestigatorIcon = '${urls.images}/visualization/co_investigator_icon.png'>
@@ -13,6 +13,7 @@
 <#assign coInvestigatorURL = '${urls.base}${standardVisualizationURLRoot}?vis=person_level&uri=${individual.uri}&vis_mode=copi'>
 <#assign visualizationHelperJavaScript = 'js/visualization/visualization-helper-functions.js'>
 
+<section id="sparklines-publications" role="region">
     <div id="vis_container_coauthor">&nbsp;</div>
     
     <div id="coauthorship_link_container" class="collaboratorship-link-container">
diff --git a/productMods/templates/freemarker/body/partials/individual/individual-visualization.ftl b/productMods/templates/freemarker/body/partials/individual/individual-visualization.ftl
index 30f78956..da655a14 100644
--- a/productMods/templates/freemarker/body/partials/individual/individual-visualization.ftl
+++ b/productMods/templates/freemarker/body/partials/individual/individual-visualization.ftl
@@ -2,11 +2,9 @@
 
 <#-- Individual visualization template -->
 
- <#if individual.organization >
-    <#-- Logically we only need section#temporal-graph, but css may depend on the outer sections. Leaving here for UI
-    team to check. -->
+<#if individual.organization >
+    <#-- Logically we only need section#temporal-graph, but css may depend on the outer sections. Leaving here for UI team to check. -->
     <section id="temporal-graph" role="region">
         <h3><img src="${urls.images}/visualization/temporal_vis_icon.jpg" width="25px" height="25px" /><a href="${urls.base}/visualization?vis=entity_comparison&uri=${individual.uri}">Temporal Graph</a></h3>
     </section>          
-
 </#if>
\ No newline at end of file
diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css
index e73c1248..38dd1d6b 100644
--- a/themes/wilma/css/wilma.css
+++ b/themes/wilma/css/wilma.css
@@ -31,6 +31,9 @@ body{
 a:hover{
     text-decoration: none;
 }
+a{
+    color: #2485AE;
+}
 /* h1,h2,h3,h4,h5,h6 ------>  */
 h2{
     padding: 10px 0 12px 0;
@@ -696,6 +699,7 @@ p{
  }
 .individualList li a { 
     font-weight: normal; 
+    color: #2485AE;
 }
 
 /* ------------------------------------------------->  */
@@ -1102,7 +1106,7 @@ ul#individual-positions li a{
     font-size: 1em;
     padding-right: 10px;
     padding-top: 10px;
-    width: 75%;
+    width: 100%;
 }
 ul#individual-areas{
     padding-bottom: 24px;