Add user photo to the "minifiche".

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/htdocs/css/keynote.css b/htdocs/css/keynote.css
index a9d35bb..7461091 100644 (file)
--- a/htdocs/css/keynote.css
+++ b/htdocs/css/keynote.css
@@ -263,27 +263,44 @@ div.contact-list {
 }
 div.contact-list div.contact {
     border-top: 1px solid #fff;
-    background: url('../images/skins/keynote_bg_verylighter.png') #bbbbca top left repeat-x fixed;
+    background: url('../images/skins/keynote_bg_lighter.png') #848495 top left repeat-x fixed;
     color: #000;
 }
 
-div.grayed {
+div.contact-list div.grayed {
     font-style: italic;
-}
-div.grayed div.contact {
     color: #444;
+    background: url('../images/skins/keynote_bg_lighter.png') #848495 top left repeat-x fixed;
+}
+
+div.contact-list div.contact:hover {
     background: url('../images/skins/keynote_bg_verylighter.png') #bbbbca top left repeat-x fixed;
 }
 
+.contact .photo {
+    float: left;
+}
+
+.contact .photo img {
+    width: 40px;
+    margin-right: 4px;
+}
+
+.contact .profile_content {
+    float: left;
+}
+
+div.contact div.identity {
+    float: left;
+    width: 70%;
+}
+
 div.contact div.nom {
     font-weight: bold;
-    width: 35%;
-    float: left;
     padding-left: 2px;
 }
 
 div.contact div.appli {
-    float: left;
 }
 
 div.contact div.bits {
@@ -300,8 +317,8 @@ div.contact div.long {
 }
 
 div.long table { width: 100%; }
-div.long td.lt { width: 35%; }
-div.long td.rt { width: 65%; }
+div.long td.lt { width: 25%; font-style: italic; }
+div.long td.rt { width: 75%; }
 
 /*******************************************************************************
     6   Profil

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 66ecc64..04f6803 100644 (file)
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -20,69 +20,77 @@
 {*                                                                        *}
 {**************************************************************************}
 
-{if (!$c.inscrit && $smarty.session.auth ge AUTH_COOKIE) || $c.dcd}<div class='grayed'>{/if}
-<div class="contact" {if $c.inscrit}{if $smarty.session.auth ge AUTH_COOKIE}title="fiche mise à jour le {$c.date|date_format}"{/if}{/if}>
+<div class="contact {if (!$c.inscrit && $smarty.session.auth ge AUTH_COOKIE) || $c.dcd}grayed{/if}"
+     {if $c.inscrit}{if $smarty.session.auth ge AUTH_COOKIE}title="fiche mise à jour le {$c.date|date_format}"{/if}{/if}>
+  <div class="identity">
+    <div class="photo">
+      <img src="photo/{if $c.inscrit}{$c.forlife}{else}{make_forlife nom=$c.nom prenom=$c.prenom promo=$c.promo}{/if}"
+           alt="{$c.prenom} {$c.nom}" />
+    </div>
 
-  <div class="nom">
-    {if $c.sexe}&bull;{/if}
-    {if !$c.dcd && ($c.inscrit || $smarty.session.auth eq AUTH_PUBLIC)}<a href="profile/{if $c.inscrit}{$c.forlife}{else}{make_forlife nom=$c.nom prenom=$c.prenom promo=$c.promo}{/if}" class="popup2">{/if}
-    {if $c.nom_usage}{$c.nom_usage} {$c.prenom}<br />({$c.nom}){else}{$c.nom} {$c.prenom}{/if}
-    {if !$c.dcd && ($c.inscrit || $smarty.session.auth eq AUTH_PUBLIC)}</a>{/if}
-  </div>
+    <div class="nom">
+      {if $c.sexe}&bull;{/if}
+      {if !$c.dcd && ($c.inscrit || $smarty.session.auth eq AUTH_PUBLIC)}<a href="profile/{if $c.inscrit}{$c.forlife}{else}{make_forlife nom=$c.nom prenom=$c.prenom promo=$c.promo}{/if}" class="popup2">{/if}
+      {if $c.nom_usage}{$c.nom_usage} {$c.prenom}<br />({$c.nom}){else}{$c.nom} {$c.prenom}{/if}
+      {if !$c.dcd && ($c.inscrit || $smarty.session.auth eq AUTH_PUBLIC)}</a>{/if}
+    </div>
 
-  <div class="appli">
-    {if $c.iso3166}
-    <img src='images/flags/{$c.iso3166}.gif' alt='{$c.nat}' height='11' title='{$c.nat}' />&nbsp;
-    {/if}
-    (X {$c.promo}{if $c.app0text}, {applis_fmt type=$c.app0type text=$c.app0text url=$c.app0url}{*
-    *}{/if}{if $c.app1text}, {applis_fmt type=$c.app1type text=$c.app1text url=$c.app1url}{/if})
-    {if $c.dcd}décédé{if $c.sexe}e{/if} le {$c.deces|date_format}{/if}
-    {if $smarty.session.auth ge AUTH_COOKIE}
-    {if !$c.dcd && !$c.wasinscrit}
-    <a href="marketing/public/{$c.user_id}" class='popup'>clique ici si tu connais son adresse email !</a>
-    {/if}
-    {/if}
+    <div class="appli">
+      {if $c.iso3166}
+      <img src='images/flags/{$c.iso3166}.gif' alt='{$c.nat}' height='11' title='{$c.nat}' />&nbsp;
+      {/if}
+      (X {$c.promo}{if $c.app0text}, {applis_fmt type=$c.app0type text=$c.app0text url=$c.app0url}{*
+      *}{/if}{if $c.app1text}, {applis_fmt type=$c.app1type text=$c.app1text url=$c.app1url}{/if})
+      {if $c.dcd}décédé{if $c.sexe}e{/if} le {$c.deces|date_format}{/if}
+      {if $smarty.session.auth ge AUTH_COOKIE}
+      {if !$c.dcd && !$c.wasinscrit}
+      <a href="marketing/public/{$c.user_id}" class='popup'>clique ici si tu connais son adresse email !</a>
+      {/if}
+      {/if}
+    </div>
   </div>
 
-  <div class="noprint">
-  <div class="bits">
+  <div class="noprint bits">
+    <div>
     {if $smarty.session.auth ge AUTH_COOKIE}
-    {if !$c.wasinscrit && !$c.dcd}
-      {if $show_action eq ajouter}
-        <a href="carnet/notifs/add_nonins/{$c.user_id}">{*
-        *}{icon name=add title="Ajouter à la liste de mes surveillances"}</a>
-      {else}
-        <a href="carnet/notifs/del_nonins/{$c.user_id}">{*
-        *}{icon name=cross title="Retirer de la liste de mes surveillances"}</a>
-      {/if}
-    {elseif $c.wasinscrit}
-        <a href="profile/{$c.forlife}" class="popup2">{*
-        *}{icon name=user_suit title="Afficher la fiche"}</a>
-      {if !$c.dcd}
-        <a href="vcard/{$c.forlife}.vcf">{*
-        *}{icon name=vcard title="Afficher la carte de visite"}</a>
-      {if $show_action eq ajouter}
-        <a href="carnet/contacts?action={$show_action}&amp;user={$c.forlife}">{*
-        *}{icon name=add title="Ajouter à mes contacts"}</a>
-      {else}
-        <a href="carnet/contacts?action={$show_action}&amp;user={$c.forlife}">{*
-        *}{icon name=cross title="Retirer de mes contacts"}</a>
-      {/if}
+      {if !$c.wasinscrit && !$c.dcd}
+        {if $show_action eq ajouter}
+    <a href="carnet/notifs/add_nonins/{$c.user_id}">{*
+    *}{icon name=add title="Ajouter à la liste de mes surveillances"}</a>
+        {else}
+    <a href="carnet/notifs/del_nonins/{$c.user_id}">{*
+    *}{icon name=cross title="Retirer de la liste de mes surveillances"}</a>
+        {/if}
+      {elseif $c.wasinscrit}
+    <a href="profile/{$c.forlife}" class="popup2">{*
+    *}{icon name=user_suit title="Afficher la fiche"}</a>
+        {if !$c.dcd}
+    <a href="vcard/{$c.forlife}.vcf">{*
+    *}{icon name=vcard title="Afficher la carte de visite"}</a>
+          {if $show_action eq ajouter}
+    <a href="carnet/contacts?action={$show_action}&amp;user={$c.forlife}">{*
+    *}{icon name=add title="Ajouter à mes contacts"}</a>
+          {else}
+    <a href="carnet/contacts?action={$show_action}&amp;user={$c.forlife}">{*
+    *}{icon name=cross title="Retirer de mes contacts"}</a>
+          {/if}
+        {/if}
       {/if}
     {/if}
-    {/if}
+    </div>
 
     {if hasPerm('admin')}
-      [{if !$c.wasinscrit && !$c.dcd}
-        <a href="marketing/private/{$c.user_id}">{*
-          *}{icon name=email title="marketter user"}</a>
-      {/if}
-      <a href="admin/user/{if $c.wasinscrit}{$c.forlife}{else}{$c.user_id}{/if}">{*
-        *}{icon name=wrench title="administrer user"}</a>
-      <a href="http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&amp;anc_id={$c.matricule_ax}">{*
-      *}{icon name=user_gray title="fiche AX"}</a>]
+    <div>
+    {if !$c.wasinscrit && !$c.dcd}
+    <a href="marketing/private/{$c.user_id}">{*
+      *}{icon name=email title="marketter user"}</a>
     {/if}
-  </div>
+    <a href="admin/user/{if $c.wasinscrit}{$c.forlife}{else}{$c.user_id}{/if}">{*
+    *}{icon name=wrench title="administrer user"}</a>
+    <a href="http://www.polytechniciens.com/?page=AX_FICHE_ANCIEN&amp;anc_id={$c.matricule_ax}">{*
+    *}{icon name=user_gray title="fiche AX"}</a>
+    {/if}
+    </div>
   </div>
 
   <div class="long">
@@ -136,8 +144,6 @@
     {/if}
   {/if}
   </div>
-
 </div>
-{if (!$c.inscrit && $smarty.session.auth ge AUTH_COOKIE) || $c.dcd}</div>{/if}
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}