From c62e0efeda09b0a48d3929003925f8bf700fe9f0 Mon Sep 17 00:00:00 2001
From: Pascal Corpet <pascal.corpet@m4x.org>
Date: Wed, 12 Jan 2005 17:30:00 +0000
Subject: [PATCH] separation de l'affichage d'une adresse pour eviter la
 duplication de code

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-303
---
 templates/fiche.tpl          | 74 +++++---------------------------------------
 templates/fiche_referent.tpl | 35 ++-------------------
 2 files changed, 10 insertions(+), 99 deletions(-)

diff --git a/templates/fiche.tpl b/templates/fiche.tpl
index d94715c..64d11f0 100644
--- a/templates/fiche.tpl
+++ b/templates/fiche.tpl
@@ -99,40 +99,14 @@ function chgMainWinLoc( strPage ) {
     <td>
       <h2>Contact : </h2>
       {foreach from=$x.adr item="address" key="i"}
-      <div class="adresse">
-        <div class="titre">
-          {if $address.active}
-          Mon adresse actuelle :
-          {elseif $address.secondaire}
-          Adresse secondaire :
-          {else}
-          Adresse principale :
-          {/if}
-        </div>
-        {if $address.adr1 || $address.pays || $address.ville}
-        <div>
-          {if $address.adr1}<strong>{$address.adr1}</strong><br />{/if}
-          {if $address.adr2}<strong>{$address.adr2}</strong><br />{/if}
-          {if $address.adr3}<strong>{$address.adr3}</strong><br />{/if}
-          {if $address.ville}<strong>{$address.cp} {$address.ville}</strong><br />{/if}
-          {if $address.pays}
-          <strong>{$address.pays}{if $address.region} ({$address.region}){/if}</strong>
-          {/if}
-        </div>
-        {/if}
-
-        {if $address.tel}
-        <div>
-          <em class="small">Tél :</em> <strong class="value">{$address.tel}</strong>
-        </div>
-        {/if}
-
-        {if $address.fax}
-        <div>
-          <em class="small">Fax :</em> <strong class="value">{$address.fax}</strong>
-        </div>
+        {if $address.active}
+          {assign var="address_titre" value="Mon adresse actuelle :"}
+        {elseif $address.secondaire}
+          {assign var="address_titre" value="Adresse secondaire :"}
+        {else}
+          {assign var="address_titre" value="Adresse principale :"}
         {/if}
-      </div>
+        {include file="geoloc/address.tpl" address=$address titre_div=true titre=$address_titre}
       {/foreach}
       <div class="spacer">&nbsp;</div>
     </td>
@@ -168,39 +142,7 @@ function chgMainWinLoc( strPage ) {
         {/if}
       </div>
 
-      <div class="adresse">
-        {if $address.adr1 || $address.pays || $address.ville}
-        <em>Adresse : </em><br />
-        {if $address.adr1}<strong>{$address.adr1}</strong><br />{/if}
-        {if $address.adr2}<strong>{$address.adr2}</strong><br />{/if}
-        {if $address.adr3}<strong>{$address.adr3}</strong><br />{/if}
-        {if $address.ville}<strong>{$address.cp} {$address.ville}</strong><br />{/if}
-        {if $address.pays}
-        <strong>{$address.pays}{if $address.region} ({$address.region}){/if}</strong>
-        {/if}
-        {/if}
-
-        {if $address.tel}
-        <div>
-          <em>Tél : </em>
-          <strong>{$address.tel}</strong>
-        </div>
-        {/if}
-
-        {if $address.fax}
-        <div>
-          <em>Fax : </em>
-          <strong>{$address.fax}</strong>
-        </div>
-        {/if}
-
-        {if $address.mobile}
-        <div>
-          <em>Mobile : </em>
-          <strong>{$address.mobile}</strong>
-        </div>
-        {/if}
-      </div>
+      {include file="geoloc/address.tpl" address=$address titre="Adresse : "}
       <div class="spacer">&nbsp;</div>
       {/foreach}
     </td>
diff --git a/templates/fiche_referent.tpl b/templates/fiche_referent.tpl
index 55ea21f..5e68c8f 100644
--- a/templates/fiche_referent.tpl
+++ b/templates/fiche_referent.tpl
@@ -90,39 +90,8 @@
     {/if}
   </div>
 
-  <div class="adresse">
-    {if $address.adr1 || $address.pays || $address.ville}
-    <em>Adresse : </em><br />
-    {if $address.adr1}<strong>{$address.adr1}</strong><br />{/if}
-    {if $address.adr2}<strong>{$address.adr2}</strong><br />{/if}
-    {if $address.adr3}<strong>{$address.adr3}</strong><br />{/if}
-    {if $address.ville}<strong>{$address.cp} {$address.ville}</strong><br />{/if}
-    {if $address.pays}
-    <strong>{$address.pays}{if $address.region} ({$address.region}){/if}</strong>
-    {/if}
-    {/if}
-
-    {if $address.tel}
-    <div>
-      <em>Tél : </em>
-      <strong>{$address.tel}</strong>
-    </div>
-    {/if}
-
-    {if $address.fax}
-    <div>
-      <em>Fax : </em>
-      <strong>{$address.fax}</strong>
-    </div>
-    {/if}
-
-    {if $address.mobile}
-    <div>
-      <em>Mobile : </em>
-      <strong>{$address.mobile}</strong>
-    </div>
-    {/if}
-  </div>
+  {include file="geoloc/address.tpl" address=$address titre="Adresse : "}
+  
   <div class="spacer">&nbsp;</div>
   {/foreach}
 
-- 
2.1.4