Merge updates: better name comparison.

[platal.git] / templates / xnet / skin.tpl

diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index 86a88ec..e0ce81c 100644 (file)
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -112,7 +112,7 @@
           {/foreach}
           {if t($asso)}{assign var=asso_id value=$asso->id}{/if}
           {if t($smarty.session.suid)}{assign var=suid value=true}{else}{assign var=suid value=false}{/if}
-          {if $asso && $is_admin ||
+          {if t($asso) && $is_admin ||
                       ($suid && ($smarty.session.suid.perms->hasFlag('admin') ||
                                                 $smarty.session.suid.may_update[$asso_id]))}
           <h1>Voir le site comme&hellip;</h1>
@@ -168,11 +168,9 @@
             <td id="perso">
               {list_all_my_groups}
               {if !$smarty.session.auth}
-                <div>Me connecter&nbsp;:</div>
-                <a class='gp' href="login/{if $platal->pl_self() eq 'exit'}index{else}{$platal->pl_self()}{/if}">polytechnicien</a>
-                {if $platal->pl_self() neq 'exit'}
-                  <!-- <script type="text/javascript" src="login/autologin/{$platal->pl_self()}?forceXml=1"></script> -->
-                {/if}
+                <div>
+                  <a href="login/{if $platal->pl_self() eq 'exit'}index{else}{$platal->pl_self()}{/if}">Connexion</a>
+                </div>
               {/if}
             </td>
             <td class="right" style="vertical-align: middle">