From: x2000habouzit <x2000habouzit>
Date: Fri, 22 Oct 2004 12:00:30 +0000 (+0000)
Subject: married women
X-Git-Tag: xorg/old~1208
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=8f5a0f32dac7e6ee370eaa5e280255cf30b179ab;p=platal.git

married women
---

diff --git a/ChangeLog b/ChangeLog
index e5bc3ae..15ae55d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,7 @@ Changes :
 
 	* Search :
 		- dead members and non subsribed people are grayed.					-MC
+		- better things done for married women.								-MC
 
 Fixes (from 0.9.0 branch) :
 
diff --git a/templates/include/x_inscrit.tpl b/templates/include/x_inscrit.tpl
index 5cdb83c..fa92e9b 100644
--- a/templates/include/x_inscrit.tpl
+++ b/templates/include/x_inscrit.tpl
@@ -17,13 +17,13 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: x_inscrit.tpl,v 1.15 2004-10-21 12:24:21 x2000habouzit Exp $
+        $Id: x_inscrit.tpl,v 1.16 2004-10-22 12:00:31 x2000habouzit Exp $
  ***************************************************************************}
 
 
 <div class="contact" title="fiche mise à jour le {$c.date|date_format:"%d %b %Y"}">
   <div class="nom">
-    {if $c.epouse}{$c.epouse} {$c.prenom}<br />({$c.nom} {$c.prenom}){else}{$c.nom} {$c.prenom}{/if}
+    {if $c.epouse}{$c.epouse} {$c.prenom}<br />(née {$c.nom}){else}{$c.nom} {$c.prenom}{/if}
     {if $c.dcd}(décédé){/if}
   </div>
   <div class="appli">
diff --git a/templates/search.result.public.tpl b/templates/search.result.public.tpl
index 418941b..b94cf3f 100644
--- a/templates/search.result.public.tpl
+++ b/templates/search.result.public.tpl
@@ -17,11 +17,11 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.result.public.tpl,v 1.7 2004-10-12 20:55:47 x2000bedo Exp $
+        $Id: search.result.public.tpl,v 1.8 2004-10-22 12:00:31 x2000habouzit Exp $
  ***************************************************************************}
 
 <div class="nom">
-  {if $result.epouse}{$result.epouse} {$result.prenom} <br />({$result.nom} {$result.prenom}){else}{$result.nom} {$result.prenom}{/if}
+  {if $result.epouse}{$result.epouse} {$result.prenom} <br />(née {$result.nom}){else}{$result.nom} {$result.prenom}{/if}
   {if $result.decede == 1}(décédé){/if}
 </div>
 <div class="appli">