From: Stéphane Jacob <jacou@melix.net>
Date: Mon, 1 Sep 2008 12:52:59 +0000 (+0200)
Subject: Improves slightly the Minifiche and updates default skin accordingly (Closes #874).
X-Git-Tag: xorg/0.10.0~103
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=fd9a8382e300f2e5c6ed2c8d5ea1d09578718ef9;p=platal.git

Improves slightly the Minifiche and updates default skin accordingly (Closes #874).
---

diff --git a/htdocs/css/default.css b/htdocs/css/default.css
index 8a379b2..9a526ff 100644
--- a/htdocs/css/default.css
+++ b/htdocs/css/default.css
@@ -286,7 +286,7 @@ div.contact-list div.grayed {
 
 div.contact div.identity {
     float: left;
-    width: 89%;
+    width: 85%;
 }
 
 div.contact div.nom {
@@ -296,7 +296,7 @@ div.contact div.nom {
 div.contact div.bits {
     text-align: right;
     float: right;
-    width: 10%;
+    width: 14%;
 }
 
 div.contact div.long {
diff --git a/include/userset.inc.php b/include/userset.inc.php
index 49c0e02..c05f5ac 100644
--- a/include/userset.inc.php
+++ b/include/userset.inc.php
@@ -178,7 +178,7 @@ class MinificheView extends MultipageView
                 u.perms != 'pending' AS wasinscrit,
                 u.deces != 0 AS dcd, u.deces, u.matricule_ax,
                 FIND_IN_SET('femme', u.flags) AS sexe,
-                e.entreprise, es.label AS secteur, ef.fonction_fr AS fonction,
+                e.entreprise, e.web AS job_web, es.label AS secteur, ef.fonction_fr AS fonction,
                 IF(n.nat='',n.pays,n.nat) AS nat, n.a2 AS iso3166,
                 ad0.text AS app0text, ad0.url AS app0url, ai0.type AS app0type,
                 ad1.text AS app1text, ad1.url AS app1url, ai1.type AS app1type,
diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 862b22b..50ca5f4 100644
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -64,6 +64,8 @@
         {if !$c.dcd}
     <a href="vcard/{$c.forlife}.vcf">{*
     *}{icon name=vcard title="Afficher la carte de visite"}</a>
+    <a href="mailto:{$c.forlife}@{#globals.mail.domain#}">{*
+    *}{icon name=email title="Envoyer un email"}</a>
           {if $show_action eq ajouter}
     <a href="carnet/contacts?action={$show_action}&amp;user={$c.forlife}&amp;token={xsrf_token}">{*
     *}{icon name=add title="Ajouter à mes contacts"}</a>
@@ -116,8 +118,8 @@
       <tr>
         <td class="lt">Profession&nbsp;:</td>
         <td class="rt">
-          {$c.entreprise} {if $c.secteur}({$c.secteur}){/if}
-          {if $c.fonction}<br />{$c.fonction}{/if}
+          {if $c.job_web}<a href="{$c.job_web}">{$c.entreprise}</a>{else}{$c.entreprise}{/if}
+          {if $c.secteur}({$c.secteur}){/if} {if $c.fonction}<br />{$c.fonction}{/if}
         </td>
       </tr>
       {/if}