Fix notices, restore "see site as..."

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index 73a9a98..73d879b 100644 (file)
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -64,10 +64,10 @@
               <a href="{if $is_logged}login{/if}"><img src="images/asso-montants.png" alt="Logo Assos" /></a>
             </td>
             <td style="width: 106px">
-              {if $xnet_type}
+              {if t($xnet_type)}
               <img src="images/logo_{$xnet_type}.png" alt="Logo {$xnet_type}" width="106" height="96" />
               {else}
-              <img src="images/logo_institutions.png" alt="Logo {$xnet_type}" width="106" height="96" />
+              <img src="images/logo_institutions.png" alt="Logo institutions" width="106" height="96" />
               {/if}
             </td>
             <td style="width: 44px">
@@ -76,7 +76,7 @@
             <td style="width: auto;">
               <img src="images/bandeau.jpg" alt="bandeau" height="96" width="100%" />
             </td>
-            {if $xnet_type}
+            {if t($xnet_type)}
             <td style="width: 280px">
               <a href="{if $xnet_type eq 'plan'}plan{else}groups/{$xnet_type}{/if}"><img src="images/texte_{$xnet_type}.jpg" alt="{$xnet_type}" width="280" height="96" /></a>
             </td>
@@ -116,9 +116,10 @@
               {/if}
             {/foreach}
           {/foreach}
-          {if $asso && $is_admin} {* WARN: this breaks "see the site as"  || 
+          {assign var=asso_id value=$asso->id}
+          {if $asso && $is_admin ||
                       ($smarty.session.suid && ($smarty.session.suid.perms->hasFlag('admin') ||
-                                                $smarty.session.suid.may_update[$asso->id])))} *}
+                                                $smarty.session.suid.may_update[$asso_id]))}
           <h1>Voir le site comme...</h1>
           <form method="post" action="{$platal->ns}change_rights">
             <div>