From dcad4e0d3f98288370110cdc62c30ccad615932f Mon Sep 17 00:00:00 2001
From: mb863 <mb863@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 12 Jan 2011 18:24:41 +0000
Subject: [PATCH] NIHVIVO-1675: Removing pictos fonts and adding our own ones.

---
 .../individual/individual--foaf-person.ftl     | 10 +++++-----
 themes/wilma/css/wilma.css                     | 18 ++++++------------
 themes/wilma/templates/identity.ftl            |  2 +-
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
index a74f5693..5d8d7326 100644
--- a/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
+++ b/productMods/templates/freemarker/body/individual/individual--foaf-person.ftl
@@ -21,9 +21,9 @@
         
         <nav role="navigation">
             <ul id ="individual-tools-people" role="list">
-                <li role="listitem"><a class="picto-font picto-uri" href="#">j</a></li>
-                <#--<li role="listitem"><a class="picto-font picto-pdf" href="#">F</a></li>-->
-                <li role="listitem"><a class="picto-font picto-share" href="#">R</a></li>
+                <#--<li role="listitem"><a class="picto-font picto-uri" href="#">j</a></li>
+                <li role="listitem"><a class="picto-font picto-pdf" href="#">F</a></li>
+                <li role="listitem"><a class="picto-font picto-share" href="#">R</a></li>-->
                 <#assign rdfUrl = individual.rdfUrl>
                 <#if rdfUrl??>
                     <li role="listitem"><a class="icon-rdf" href="${rdfUrl}">RDF</a></li>
@@ -39,7 +39,7 @@
                 <ul id="individual-email" role="list">
                     <#list email.statements as statement>
                         <li role="listitem">
-                            <a class="email" href="#"><span class ="picto-font picto-email">M</span> ${statement.value}</a>
+                            <img class ="icon-email middle" src="${urls.images}/individual/emailIcon.gif" alt="email icon" /><a class="email" href="mailto:${statement.value}">${statement.value}</a>
                             <@p.editingLinks statement editing />
                         </li>
                     </#list>
@@ -55,7 +55,7 @@
                 <ul id="individual-phone" role="list">
                     <#list phone.statements as statement>
                         <li role="listitem">                           
-                            <a class="tel" href="#"><img class ="icon-phone" src="${urls.images}/individual/phone-icon.gif" alt="phone icon" />${statement.value}</a>
+                           <img class ="icon-phone  middle" src="${urls.images}/individual/phoneIcon.gif" alt="phone icon" />${statement.value}
                             <@p.editingLinks statement editing />
                         </li>
                     </#list>
diff --git a/themes/wilma/css/wilma.css b/themes/wilma/css/wilma.css
index e1c97c26..d2ac1f22 100644
--- a/themes/wilma/css/wilma.css
+++ b/themes/wilma/css/wilma.css
@@ -122,12 +122,6 @@ ul#header-nav  a:active {
     text-decoration: none;
     color: #999;
 }
-.loginIcon {
-    font-family: 'Pictos';
-    font-size: 1.8em;
-    line-height: .2em;
-    color: #fff;
-}
 /* SEARCH ------>  */
 #search {
     position: absolute;
@@ -1160,9 +1154,6 @@ ul#individual-tools{
 ul#individual-tools li a{
     color: #b2d15a; 
 }
-.picto-email{
-    color: #aeb1b1;
-}
 #share-contact a.email{
     color: #5f6464;
 }
@@ -1178,14 +1169,14 @@ ul#individual-phone{
 }
 ul#individual-email li, 
 ul#individual-phone li{
-    line-height: 1em;
+    line-height: 1.6em;
 }
 ul#individual-email li:last-child{
     margin-bottom: 15px;
 }
 ul#individual-urls li{
     font-size: .875em;
-    line-height: 1.2em;
+    line-height: 1.6em;
 }
 ul#individual-urls li a{
     color: #2485ae;
@@ -1218,7 +1209,7 @@ ul#individual-positions{
     list-style: url(../../../images/individual/arrow-green.gif);
 }
 ul#individual-positions li{
-    line-height: 1.2em;
+    line-height: 1.4em;
 }
 ul#individual-positions li a{
     color: #2485ae;
@@ -1343,4 +1334,7 @@ article.property ul.property-list li a{
 }
 .green{
     color: #b2d15a;
+}
+.middle{
+    vertical-align: middle;
 }
\ No newline at end of file
diff --git a/themes/wilma/templates/identity.ftl b/themes/wilma/templates/identity.ftl
index 2df5ae20..94058fc1 100644
--- a/themes/wilma/templates/identity.ftl
+++ b/themes/wilma/templates/identity.ftl
@@ -10,7 +10,7 @@
     <nav role="navigation">
         <ul id="header-nav" role="list">
             <#if user.loggedIn>
-                <li role="listitem"><span class="loginIcon">U</span> ${user.loginName}</li>
+                <li role="listitem"><img class ="middle" src="${urls.images}/userIcon.png" alt="user icon" />${user.loginName}</li>
                 <li role="listitem"><a href="${urls.logout}">Log out</a></li>
                 <#if user.hasSiteAdminAccess>
                     <li role="listitem"><a href="${urls.siteAdmin}">Site Admin</a></li>