From a4ee6680b911daf62828587bf51c0e382f7df83d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Tue, 30 Oct 2012 14:04:32 +0100
Subject: [PATCH] use displayName

---
 PcfAnnuaire.py                          |  1 +
 skins/pcfannuaire/pcfannuaire_phones.pt |  3 +--
 skins/pcfannuaire/pcfannuaire_photos.pt |  3 +--
 skins/pcfannuaire/pcfannuaire_view.pt   | 19 +++++++------------
 4 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/PcfAnnuaire.py b/PcfAnnuaire.py
index 91e0763..c2eb0ac 100644
--- a/PcfAnnuaire.py
+++ b/PcfAnnuaire.py
@@ -37,6 +37,7 @@ class PcfAnnuaireEntry:
         else:
             self.shortTelephoneNumber = None
         self.givenName = get_attr('givenName')
+        self.displayName = get_attr('displayName')
         self.mobile = get_attr('mobile')
         self.service = get_attr('department')
         self.building = get_attr('destinationIndicator')
diff --git a/skins/pcfannuaire/pcfannuaire_phones.pt b/skins/pcfannuaire/pcfannuaire_phones.pt
index 0e89b0b..a8d0651 100644
--- a/skins/pcfannuaire/pcfannuaire_phones.pt
+++ b/skins/pcfannuaire/pcfannuaire_phones.pt
@@ -38,8 +38,7 @@
         <table id="phone-numbers">
           <tr tal:repeat="entry python: context.getEntriesWithPhone()">
            <td>
-             <span tal:replace="entry/sn">sn</span>
-             <span tal:replace="entry/givenName">givenName</span>
+             <span tal:replace="entry/displayName">displayName</span>
            </td>
            <td class="col-phone">
              <span tal:replace="entry/shortTelephoneNumber">000</span>
diff --git a/skins/pcfannuaire/pcfannuaire_photos.pt b/skins/pcfannuaire/pcfannuaire_photos.pt
index d092451..9d940a3 100644
--- a/skins/pcfannuaire/pcfannuaire_photos.pt
+++ b/skins/pcfannuaire/pcfannuaire_photos.pt
@@ -38,8 +38,7 @@
         <div id="photos">
           <div tal:repeat="entry python: context.getEntries()" class="photo">
             <img src="pcfannuaire_icon.gif" width="130" height="117" />
-            <span><span tal:replace="entry/givenName">givenName</span>
-                  <span tal:replace="entry/sn">sn</span></span>
+            <span><span tal:replace="entry/displayName">displayName</span></span>
           </div>
         </div>
 
diff --git a/skins/pcfannuaire/pcfannuaire_view.pt b/skins/pcfannuaire/pcfannuaire_view.pt
index 77daea6..8f47e41 100644
--- a/skins/pcfannuaire/pcfannuaire_view.pt
+++ b/skins/pcfannuaire/pcfannuaire_view.pt
@@ -43,8 +43,7 @@
           <ul>
            <li tal:repeat="entry python: [context.getSecretaireGeneral()]">
              <a tal:attributes="href string:?person=${entry}">
-             <span tal:replace="entry/givenName">givenName</span>
-             <span tal:replace="entry/sn">sn</span>
+             <span tal:replace="entry/displayName">displayName</span>
              </a>
            </li>
           </ul>
@@ -62,8 +61,7 @@
           <ul>
            <li tal:repeat="entry python: [context.getServiceManager(service)]">
              <a tal:attributes="href string:?person=${entry}">
-             <span tal:replace="entry/givenName">givenName</span>
-             <span tal:replace="entry/sn">sn</span>
+             <span tal:replace="entry/displayName">displayName</span>
              </a>
            </li>
           </ul>
@@ -75,8 +73,7 @@
           <ul>
            <li tal:repeat="entry python: context.getServiceNonManagers(service)">
              <a tal:attributes="href string:?person=${entry}">
-             <span tal:replace="entry/givenName">givenName</span>
-             <span tal:replace="entry/sn">sn</span>
+             <span tal:replace="entry/displayName">displayName</span>
              </a>
            </li>
           </ul>
@@ -88,8 +85,7 @@
           <ul>
            <li tal:repeat="entry python: context.getCelluleManagers(service, cellule)">
              <a tal:attributes="href string:?person=${entry}">
-             <span tal:replace="entry/givenName">givenName</span>
-             <span tal:replace="entry/sn">sn</span>
+             <span tal:replace="entry/displayName">displayName</span>
              </a>
            </li>
           </ul>
@@ -97,8 +93,7 @@
           <ul>
            <li tal:repeat="entry python: context.getCellulePeople(service, cellule)">
              <a tal:attributes="href string:?person=${entry}">
-             <span tal:replace="entry/givenName">givenName</span>
-             <span tal:replace="entry/sn">sn</span>
+             <span tal:replace="entry/displayName">displayName</span>
              </a>
            </li>
           </ul>
@@ -106,8 +101,8 @@
 
         <div tal:condition="python: person">
 	 <div tal:define="entry python: context.getPerson(person)">
-         <h2><span tal:replace="entry/givenName">givenName</span>
-	     <span tal:replace="entry/sn">sn</span></h2>
+         <h2><span tal:replace="entry/displayName">displayName</span></h2>
+         <img tal:attributes="src string:/intranet/static/photos/${entry/givenName}.${entry/sn}.jpg"/>
 	 <ul>
 	  <li>Téléphone(s) : <span tal:repeat="telephoneNumber entry/telephoneNumbers">
 	        <span tal:replace="telephoneNumber">phoneNumber</span>