From 581c33411f7125543dddbbe9ce77b277663aa7a6 Mon Sep 17 00:00:00 2001
From: Florent Bruneau <florent.bruneau@polytechnique.org>
Date: Thu, 15 Nov 2007 19:50:47 +0100
Subject: [PATCH] I hate having a profile looking like a draft.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>
---
 htdocs/images/icons/world_go.gif | Bin 0 -> 1783 bytes
 templates/profile/profile.tpl    |  25 ++++++++++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 htdocs/images/icons/world_go.gif

diff --git a/htdocs/images/icons/world_go.gif b/htdocs/images/icons/world_go.gif
new file mode 100644
index 0000000000000000000000000000000000000000..9fad760158067cc3366993c62212af446a88735f
GIT binary patch
literal 1783
zcmeHHUuYaf9RB5x>BXe+s!1CQDHj{sQ_{L^Eo`vJB^Q%RQgl<QUHc$=xl6N^_PSiI
z?G{uvZGx+UZmqP7=3!z>*as=|P-Gr_n1Bx>1RQD6L4sUM3yTkOP_&9I=WI?Xh(!b+
z9hlkg_xGFmX4v78A+;|XhdA5;=(NEOw3OSKu)!3TPqF4x0B{9S?4;_dCN(_fSj4ob
z<5OZ&;$XwUrp0|L$Y_X}+;fD3IY!KNiRn?>r>;jG2kQ>Dh(H1NEMceIxZ=hXTS44$
z8FwiQnCDZ+;|>xoqOOKA8E%+_xm0e$_lRY4%O)0Pp6(|NqU(s7m?@58pp+pjottJL
z^QnQEj?|1W3_?syv>;<5RSz^1rA(q{yv~#>O_`H2d|9g-D5DWw^OIOmEKk9h$3ze^
z8U{SXxXf9INtp&583JYel&BCE5)l#_@_-Y>ITff}p{yM63KbHB++o<^0pgzOD1MpP
zJa9ul;1tV-!ncH@OMwLUh48q*vX2lb#6blk&R7}qkfE~g3l9kvR#+ey4>=OtK#GZ}
z?yIUBcbP1tBIG7g97YYKI@H#@1Sumd5RNt$UEKfUUn$W2YhxY2N6=lpJCaWC8y*<m
zq3qZRP`{kDtRwZZ*U>_$DE$fjm4k^j-$DyKQX|ObrmcQW+xuX;pT7aw8{q1;sMmw@
z{x;HDl!O3v?K0XvRl~^$Pt@?92%jujC7Gi|IA><_63Yp_#r^xz5_=N2P1P`p@I(#c
z2%pGJMYU97rBKZuE=Z#y4K+VGos$AYWTl){lu7mT5^swHkY71UV*t-}0W>V%_Z^%D
z_;e9q!<PHLWG6t!0RXb=zVG(<swj2qm!}Wyl0wT-*E#_3(D&8q?JWRn&H>!>s@2~<
zsaEe@lpHGnw2(VqJh7T9v+Mf+{>iQ#uGYPF2@%g9Gjjh0uM}1Vh$5f>EMx!<JPa^4
zC*Q_(fUTDS9{UVHTMMwi59-yMf6kg%t92XG*&~N1irLa+J`p{b^sytyiqlp$H@O=A
z@0QY}EiVNieat#lJUnHV68-XhO-jO}*74G0u{SYN$ZhXU>{OK9tE|1z8vXDgb_aGh
zw-bbxW@5WLuJkOnbnJcg!*Yf=bKRNKZMSwbxNQwR4I6y@V$-^h2j93npBg`OrscHx
z!`)L?p8sl7*Sp`vM;nF~y0*WGao_c1>}>PN!Oy>>`I+<m)4zB#>%JI$zx(Oeuc;S}
ze!r#hM*C~^jY}6czj*0xtZ{0obL09OH)#&s`H@YFspkCy%@;aiJuj)n!LQH3lgSvI
zg<*HBZRMt$-#mBg@ogV?8Pxpt`KGn+>={|;PtRU`YPOZ<dxknj<AqC%pFT6&HvV!;
s<L&OT#nG{$XC|)Ay!GSE-gcI(l<S%vec`>WE8|bh{8R_=rbc-7cNa78#{d8T

literal 0
HcmV?d00001

diff --git a/templates/profile/profile.tpl b/templates/profile/profile.tpl
index 1a2e897..7cb6cec 100644
--- a/templates/profile/profile.tpl
+++ b/templates/profile/profile.tpl
@@ -39,28 +39,30 @@ function chgMainWinLoc(strPage)
 //]]></script>
 {/literal}
 
-{if $logged and $x.forlife eq $smarty.session.forlife}
-[<a href="javascript:chgMainWinLoc('profile/edit')">Modifier ma fiche</a>]
-{/if}
-
 <div id="fiche">
   <div id="photo" class="part">
     {if $photo_url}<img alt="Photo de {$x.forlife}" src="{$photo_url}" width="{$x.x}"/>{/if}
-    {if $logged}
+    {if $logged && ( $x.section|smarty:nodefaults || $x.binets_join|smarty:nodefaults || $x.gpxs_join|smarty:nodefaults)}
+      <h2>A l'X...</h2>
       {if $x.section}<div><em class="intitule">Section : </em><span>{$x.section}</span></div>{/if}
       {if $x.binets_join}<div><em class="intitule">Binet(s) : </em><span>{$x.binets_join}</span></div>{/if}
       {if $x.gpxs_join}<div><em class="intitule">Groupe(s) et institution(s) X : </em><span><br/>{$x.gpxs_join|smarty:nodefaults}</span></div>{/if}
     {/if}
-    {if $x.web}<div><em class="intitule">Site Web : </em><br /><a href="{$x.web}" class='popup'>{$x.web}</a></div>{/if}
-    {if $x.freetext}<div><em class="intitule">Commentaires : </em><br /><span>{$x.freetext|miniwiki|smarty:nodefaults}</span></div>{/if}
+    {if $x.freetext}
+    <h2>Commentaires&nbsp;:</h2>
+    <span>{$x.freetext|miniwiki|smarty:nodefaults}</span>
+    {/if}
   </div>
   <div id="fiche_identite" class="part">
     <div class="civilite">
       {if $x.sexe}&bull;{/if}
       {$x.prenom} {if $x.nom_usage eq ""}{$x.nom}{else}{$x.nom_usage} ({$x.nom}){/if}
       {if $logged}
-      {if $x.nickname} (alias {$x.nickname}){/if}&nbsp;
-      <a href="vcard/{$x.forlife}.vcf">{*
+      {if $x.nickname} (alias {$x.nickname}){/if}
+      {/if}
+      {if $x.web}&nbsp;<a href="{$x.web}">{icon name="world_go" title="Site Web"}</a>{/if}
+      {if $logged}
+      &nbsp;<a href="vcard/{$x.forlife}.vcf">{*
         *}{icon name=vcard title="Afficher la carte de visite"}</a>
       {if !$x.is_contact}
       <a href="javascript:chgMainWinLoc('carnet/contacts?action=ajouter&amp;user={$x.forlife}')">
@@ -73,6 +75,9 @@ function chgMainWinLoc(strPage)
       <a href="javascript:chgMainWinLoc('admin/user/{$x.forlife}')">
         {icon name=wrench title="administrer user"}</a>
       {/if}
+      {if $x.forlife eq $smarty.session.forlife}
+      <a href="javascript:chgMainWinLoc('profile/edit')">{icon name="user_edit" title="Modifier ma fiche"}</a>
+      {/if}
       {/if}
     </div>
     {if $logged}
@@ -184,8 +189,10 @@ function chgMainWinLoc(strPage)
   {/if}
   {if !$logged}
   <div class="part">
+    <small>
     Cette fiche est publique et visible par tout internaute,<br />
     vous pouvez aussi voir <a href="profile/private/{$x.forlife}?display=light">celle&nbsp;réservée&nbsp;aux&nbsp;X</a>.
+    </small>
   </div>
   {/if}
   <div class="spacer"></div>
-- 
2.1.4