Merge remote branch 'origin/xorg/maint' into xorg/1.0.2/master

[platal.git] / templates / profile / adresses.address.tpl

diff --git a/templates/profile/adresses.address.tpl b/templates/profile/adresses.address.tpl
index ecd7128..207b1e0 100644 (file)
--- a/templates/profile/adresses.address.tpl
+++ b/templates/profile/adresses.address.tpl
@@ -22,6 +22,12 @@
 
 {assign var=prefname value="addresses[$i]"}
 {assign var=prefid value="addresses_$i"}
+{if !hasPerm('directory_private') && ($address.pub eq 'private') && !$new}
+{assign var=hiddenaddr value=true}
+{else}
+{assign var=hiddenaddr value=false}
+{/if}
+
 <table class="bicol" style="display: none; margin-bottom: 1em" id="{$prefid}_grayed">
   <tr>
     <th class="grayed">
@@ -47,10 +53,10 @@
           {icon name=cross title="Supprimer l'adresse"}
         </a>
       </div>
-      Adresse n°{$i+1}
+      Adresse n°{$i+1}{if $hiddenaddr} (masquée){/if}
     </th>
   </tr>
-  <tr>
+  <tr {if $hiddenaddr}style="display: none"{/if}>
     <td>
       <div style="margin-bottom: 0.2em" class="flags">
         {include file="include/flags.radio.tpl" name="`$prefname`[pub]" val=$address.pub}
@@ -87,9 +93,19 @@
         <div>
           <label>
             <input type="checkbox" name="{$prefname}[mail]" {if $address.mail}checked="checked"{/if} />
-            on peut m'y envoyer du courrier par la poste
+            on peut {if $isMe}m'{/if}y envoyer du courrier par la poste
+          </label>
+        </div>
+        {if !t($isMe)}
+        <div>
+          <label>
+            <input type="checkbox" name="{$prefname}[deliveryIssue]" {if $address.deliveryIssue}checked="checked"{/if} />
+            n'habite pas à l'adresse indiquée
           </label>
         </div>
+        {else}
+        <div style="display: none"><input type="hidden" name="deliveryIssue" value="{$address.deliveryIssue}" /></div>
+        {/if}
         <div>
           <label>
             Commentaire&nbsp;:
@@ -100,7 +116,7 @@
       </div>
     </td>
   </tr>
-  <tr class="pair">
+  <tr class="pair" {if $hiddenaddr}style="display: none"{/if}>
     <td>
       {foreach from=$address.phones key=t item=tel}
         <div id="{"`$prefid`_tel_`$t`"}" style="clear: both">