Implement hidden permission in profile editor

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

diff --git a/templates/profile/adresses.address.tpl b/templates/profile/adresses.address.tpl
index 69ebf09..223629b 100644 (file)
--- 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  *}
@@ -22,10 +22,14 @@
 
 {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}
+{if $isMe || hasPerm('admin') || $new}
+  {assign var=hiddenaddr value=false}
+{elseif hasPerm('directory_hidden') || (($address.pub neq 'hidden') && ($address.pub neq 'private'))}
+  {assign var=hiddenaddr value=false}
+{elseif hasPerm('directory_private') && ($address.pub neq 'hidden')}
+  {assign var=hiddenaddr value=false}
 {else}
-{assign var=hiddenaddr value=false}
+  {assign var=hiddenaddr value=true}
 {/if}
 
 <table class="bicol" style="display: none; margin-bottom: 1em" id="{$prefid}_grayed">
@@ -40,7 +44,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 +61,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 mainField='addresses' mainId=$i subField='phones' subId=-1}
-      </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,7 +127,7 @@
     </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`_phones_`$t`"}" style="clear: both">
           {include file="profile/phone.tpl" prefname="`$prefname`[phones]" prefid="`$prefid`_phones" telid=$t tel=$tel
@@ -139,4 +149,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: *}