Skin layout improvements.

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

diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index cacb203..cd78540 100644 (file)
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -40,15 +40,21 @@
     {foreach from=$xorg_css item=css}
     <link rel="stylesheet" type="text/css" href="css/{$css}" />
     {/foreach}
+    {foreach from=$xorg_inline_css item=css} 
+    <style type="text/css"> 
+    {$css|smarty:nodefaults} 
+    </style> 
+    {/foreach} 
     <script type="text/javascript">
+    var platal_baseurl = "{$globals->baseurl}/"
     if (window.top != window)
       document.write('<link rel="stylesheet" type="text/css" href="css/onlycontent.css" media="all"/>');
     </script>
     {foreach from=$xorg_js item=js}
     <script type="text/javascript" src="javascript/{$js}"></script>
     {/foreach}
-    <script type="text/javascript" src="javascript/overlib.js"></script>
-    
+    {javascript name=overlib}
+
     {if $xorg_rss}
     <link rel="alternate" type="application/rss+xml" title="{$xorg_rss.title}" href="{$xorg_rss.href}" />
     {/if}
@@ -73,7 +79,7 @@
         <table cellspacing="0" cellpadding="0" id="top">
           <tr>
             <td style="width: 150px">
-              <a href=""><img src="images/asso-montants.png" alt="Logo Assos" /></a>
+              <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}
@@ -128,52 +134,24 @@
               {/if}
             {/foreach}
           {/foreach}
+          {if $asso && ($is_admin ||
+                      ($smarty.session.suid && ($smarty.session.suid.perms->hasFlag('admin') ||
+                                                $smarty.session.suid.may_update[$asso.id])))}
+          <h1>Voir le site comme...</h1>
+          <form method="post" action="{$platal->ns}change_rights">
+            <select name="right" onchange="this.form.submit()" style="margin: 0; padding: 0">
+              {if hasPerm('admin') || ($smarty.session.suid && $smarty.session.suid.perms->hasFlag('admin'))}
+              <option value="admin" {if hasPerm('admin')}selected="selected"{/if}>Administrateur</option>
+              {/if}
+              <option value="anim" {if $is_admin && !hasPerm('admin')}selected="selected"{/if}>Animateur</option>
+              <option value="member" {if !$is_admin && $is_member}selected="selected"{/if}>Membre</option>
+              <option value="logged" {if !$is_admin && !$is_member}selected="selected"{/if}>Non-membre</option>
+            </select>
+          </form>
+          {/if}
         </td>
         <td id="body">
-          {if $asso && ($is_admin || $smarty.session.suid.perms eq 'admin' || $smarty.session.suid.may_update[$asso.id])}
-          <div style="float: right" class="breadcrumb">
-            <form method="post" action="{$platal->ns}change_rights">
-              <div style="display: inline">
-                <small>voir le site en tant que...
-                <select name="right" onchange="this.form.submit()">
-                  {if $smarty.session.perms->hasFlag('admin') || $smarty.session.suid.perms->hasFlag('admin')}
-                  <option value="admin" {if $smarty.session.perms->hasFlag('admin')}selected="selected"{/if}>Administrateur</option>
-                  {/if}
-                  <option value="anim" {if $is_admin && !$smarty.session.perms->hasFlag('admin')}selected="selected"{/if}>Animateur</option>
-                  <option value="member" {if !$is_admin && $is_member}selected="selected"{/if}>Membre</option>
-                  <option value="logged" {if !$is_admin && !$is_member}selected="selected"{/if}>Non-membre</option>
-                </select>
-                </small>
-              </div>
-            </form>
-          </div>
-          {/if}
-          <div class="breadcrumb">
-            <a href=".">X.net</a> »
-            {if $asso}
-              <a href="groups/{$asso.cat}">{$asso.cat|cat_pp}</a> »
-              {if $asso.dom}
-                <a href="groups/{$asso.cat}/{$asso.dom}">{$asso.domnom}</a> »
-              {/if}
-              {$asso.nom}
-            {elseif $cat}
-              <a href="groups/{$cat}">{$cat|cat_pp}</a> »
-              {if $dom || !$doms}
-                {if $cat eq 'promotions'}
-                  Choix de la promotion
-                {else}
-                  Choix de l'Asso
-                {/if}
-              {else}
-                Choix du domaine
-              {/if}
-            {elseif $wikipage}
-              <a href="Xnet">Documentation</a>
-            {/if}
-          </div>
-          <div style="clear: both">
           {include file="skin/common.content.tpl"}
-          </div>
         </td>
       </tr>
       {else}
@@ -210,12 +188,16 @@
             <td id="perso">
               {list_all_my_groups}
               {if !$smarty.session.auth}
-              <div>Me connecter :</div>
-              <a class='gp' href="login/{$platal->pl_self()}">polytechnicien</a>
+                <div>Me connecter :</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'}
+                  {javascript name=jquery}
+                  <!-- <script type="text/javascript" src="login/autologin/{$platal->pl_self()}?forceXml=1"></script> -->
+                {/if}
               {/if}
             </td>
             <td class="right" style="vertical-align: middle">
-              {if $smarty.session.perms->hasFlag('admin')}
+              {if hasPerm('admin')}
               <a href="admin" title="Administration des groupes">
                 Gérer les groupes
                 {icon name=wrench title="Administration"}
@@ -238,7 +220,7 @@
           <a href="plan">plan du site</a> -
           <a href="Xnet/Services">services proposés</a> -
           <a href="Xnet/APropos">à propos de ce site</a> -
-          {mailto address="contact@polytechnique.org" text="nous contacter" encode="javascript"}
+          <a href="mailto:contact@polytechnique.org">nous contacter</a>
           {if $smarty.session.auth}
             - <a href="send_bug" class="popup_840x600">signaler un bug</a>
           {/if}
@@ -248,6 +230,6 @@
       </tr>
     {/if}
     </table>
-  </body>
+ </body>
 </html>
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}