X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fprofile%2Fadresses.address.tpl;h=69dd6d0ee7ea7baaa79ce609b5e601aa94267627;hb=7937d89ecfc74726af9ae64d9211d53e6bbcc4e5;hp=207b1e0bd01027924807b98801e12aa89a9e61ca;hpb=3c2a69dc96bae79936c677be7fb7554a43c555bc;p=platal.git

diff --git a/templates/profile/adresses.address.tpl b/templates/profile/adresses.address.tpl
index 207b1e0..69dd6d0 100644
--- a/templates/profile/adresses.address.tpl
+++ b/templates/profile/adresses.address.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2014 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -40,7 +40,7 @@
 </table>
 <table class="bicol" style="margin-bottom: 1em" id="{$prefid}">
   <tr>
-    <th>
+    <th colspan="2">
       <div style="float: left">
         <label>
           <input name="{$prefname}[current]" type="radio" {if $address.current}checked="checked"{/if}
@@ -57,14 +57,20 @@
     </th>
   </tr>
   <tr {if $hiddenaddr}style="display: none"{/if}>
+    <td colspan="2" class="flags">
+      {include file="include/flags.radio.tpl" name="`$prefname`[pub]" val=$address.pub mainField='addresses' mainId=$i subField='phones' subId=-1}
+    </td>
+  </tr>
+  {include file="geoloc/form.address.tpl" prefname=$prefname prefid=$prefid address=$address id=$i hiddenaddr=$hiddenaddr}
+  <tr {if $hiddenaddr}style="display: none"{/if}>
+  {if !$isMe}
     <td>
-      <div style="margin-bottom: 0.2em" class="flags">
-        {include file="include/flags.radio.tpl" name="`$prefname`[pub]" val=$address.pub}
-      </div>
-      <div style="clear: both"></div>
-      <div style="float: left">
-      {include file="geoloc/form.address.tpl" prefname=$prefname prefid=$prefid address=$address id=$i}
-      </div>
+      <small><strong>Adresse postale&nbsp;:</strong><br />{$address.postalText|nl2br}</small>
+    </td>
+    <td>
+  {else}
+    <td colspan="2">
+  {/if}
       <div style="float: left">
         <div>
           <label>
@@ -117,20 +123,21 @@
     </td>
   </tr>
   <tr class="pair" {if $hiddenaddr}style="display: none"{/if}>
-    <td>
+    <td colspan="2">
       {foreach from=$address.phones key=t item=tel}
-        <div id="{"`$prefid`_tel_`$t`"}" style="clear: both">
-          {include file="profile/phone.tpl" prefname="`$prefname`[phones]"
-                   prefid="`$prefid`_tel" telid=$t tel=$tel}
+        <div id="{"`$prefid`_phones_`$t`"}" style="clear: both">
+          {include file="profile/phone.tpl" prefname="`$prefname`[phones]" prefid="`$prefid`_phones" telid=$t tel=$tel
+                   subField='phones' mainField='addresses' mainId=$i}
         </div>
       {/foreach}
       {if $address.phones|@count eq 0}
-        <div id="{"`$prefid`_tel_0"}" style="clear: both">
-          {include file="profile/phone.tpl" prefname="`$prefname`[phones]" prefid="`$prefid`_tel" telid=0 tel=0}
+        <div id="{"`$prefid`_phones_0"}" style="clear: both">
+          {include file="profile/phone.tpl" prefname="`$prefname`[phones]" prefid="`$prefid`_phones" telid=0 tel=0
+                   subField='phones' mainField='addresses' mainId=$i}
         </div>
       {/if}
-      <div id="{$prefid}_tel_add" class="center" style="clear: both; padding-top: 4px">
-        <a href="javascript:addTel('{$prefid}_tel','{$prefname}[phones]')">
+      <div id="{$prefid}_phones_add" class="center" style="clear: both; padding-top: 4px">
+        <a href="javascript:addTel('{$prefid}_phones','{$prefname}[phones]','phones','addresses','{$i}')">
           {icon name=add title="Ajouter un numéro de téléphone"} Ajouter un numéro de téléphone
         </a>
       </div>
@@ -138,4 +145,4 @@
   </tr>
 </table>
 
-{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}
+{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *}