X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fxnet%2Fskin.tpl;h=237876681dfbb942394425cef5bbb5696c36f948;hb=962ce33ec0f0b5b645d9fd294df17f279cc84ad3;hp=d49604657569deff6d45f92b693695cafa04538e;hpb=7903a47a0bbf5496eb7d764008b399246d2a1843;p=platal.git

diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index d496046..2378766 100644
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -19,12 +19,9 @@
 {*  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA               *}
 {*                                                                        *}
 {**************************************************************************}
-<?xml version="1.0" encoding="iso-8859-15"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <base href="{$globals->baseurl}/" />
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-15" />
+
+{include file="skin/common.doctype.tpl"}
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <meta name="description" content="Les associations polytechniciennes" />
     <meta name="keywords" content="Ecole polytechnique, associations polytechniciennes, groupes X, binets" />
 
@@ -33,20 +30,30 @@
 
     <link rel="stylesheet" type="text/css" href="css/xnet.css" media="screen" />
 
-    <link rel="bookmark" href="http://www.polytechnique.fr/"        title="| École polytechnique" />
+    <link rel="bookmark" href="http://www.polytechnique.fr/"        title="| Ãcole polytechnique" />
     <link rel="bookmark" href="http://www.polytechnique.edu/"       title="| Institutionnal site" />
     <link rel="bookmark" href="http://www.fondationx.org/"          title="| FX" />
     <link rel="bookmark" href="http://www.polytechniciens.com/"     title="| AX" />
     <link rel="bookmark" href="http://www.polytechnique.org/"       title="| Polytechnique.org" />
-    <link rel="bookmark" href="http://www.polytechnique.fr/eleves/" title="| Site d'élèves" />
+    <link rel="bookmark" href="http://www.polytechnique.fr/eleves/" title="| Site d'Ã©lÃ¨ves" />
 
     {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}" />
@@ -72,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}
@@ -102,7 +109,7 @@
             {/if}
             {else}
             <td class="logo">
-              <img src="images/asso.png" alt="Le serveur des activés associative des X" />
+              <img src="images/asso.png" alt="Le serveur des activÃ©s associative des X" />
               <a href="http://www.polytechnique.org">
                 <img src="images/logo-xorg.png" alt="Polytechnique.org" height="80" />
               </a>
@@ -116,7 +123,7 @@
 
       {if $menu && !$simple}
       <tr>
-        <td id="menu">
+        <td id="menu" rowspan="2">
           {foreach from=$menu key=title item=submenu}
             {if $title neq 'no_title'}<h1>{$title}</h1>{/if}
             {foreach from=$submenu key=tit item=url}
@@ -128,17 +135,17 @@
             {/foreach}
           {/foreach}
         </td>
-        <td id="body">
+        <td class="breadcrumb">
           {if $asso && ($is_admin || $smarty.session.suid.perms eq 'admin' || $smarty.session.suid.may_update[$asso.id])}
-          <div style="float: right" class="breadcrumb">
+          <div style="float: right">
             <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 eq 'admin' || $smarty.session.suid.perms eq 'admin'}
-                  <option value="admin" {if $smarty.session.perms eq 'admin'}selected="selected"{/if}>Administrateur</option>
+                <select name="right" onchange="this.form.submit()" style="margin: 0; padding: 0">
+                  {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 neq 'admin'}selected="selected"{/if}>Animateur</option>
+                  <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>
@@ -147,32 +154,32 @@
             </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}
+          <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 du domaine
+                Choix de l'Asso
               {/if}
-            {elseif $wikipage}
-              <a href="Xnet">Documentation</a>
+            {else}
+              Choix du domaine
             {/if}
-          </div>
-          <div style="clear: both">
+          {elseif $wikipage}
+            <a href="Xnet">Documentation</a>
+          {/if}
+        </td>
+      </tr>
+      <tr>
+        <td id="body">
           {include file="skin/common.content.tpl"}
-          </div>
         </td>
       </tr>
       {else}
@@ -182,9 +189,9 @@
         </td>
       </tr>
       {if !$simple}
-      <tr><td colspan="2"><img src="images/barre.png" alt="----------" width="100%" /></td></tr>
+      <tr class="hideable"><td colspan="2"><img src="images/barre.png" alt="----------" width="100%" /></td></tr>
 
-      <tr>
+      <tr class="hideable">
         <td colspan="2">
           <table class="links" summary="liens" cellspacing="0" cellpadding="0">
             <tr>
@@ -200,23 +207,27 @@
       {/if}
       {/if}
     {if !$simple}
-      <tr><td colspan="2"><img src="images/barre.png" alt="----------" width="100%" /></td></tr>
+      <tr class="hideable"><td colspan="2"><img src="images/barre.png" alt="----------" width="100%" /></td></tr>
 
-      <tr>
+      <tr class="hideable">
         <td colspan="2">
         <table style="width: 100%">
           <tr>
             <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 eq admin}
+              {if $smarty.session.perms->hasFlag('admin')}
               <a href="admin" title="Administration des groupes">
-                Gérer les groupes
+                GÃ©rer les groupes
                 {icon name=wrench title="Administration"}
               </a><br />
               {/if}
@@ -230,23 +241,23 @@
         </td>
       </tr>
 
-      <tr><td colspan="2"><img src="images/barre.png" alt="----------" width="100%" /></td></tr>
+      <tr class="hideable"><td colspan="2"><img src="images/barre.png" alt="----------" width="100%" /></td></tr>
 
-      <tr>
+      <tr class="hideable">
         <td colspan="2" id="credits">
           <a href="plan">plan du site</a> -
-          <a href="Xnet/Services">services proposés</a> -
-          <a href="Xnet/APropos">à propos de ce 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"}
           {if $smarty.session.auth}
             - <a href="send_bug" class="popup_840x600">signaler un bug</a>
           {/if}
           <br />
-          © Copyright 2000-2007 <a href="http://x-org.polytechnique.org/">Association Polytechnique.org</a>
+          Â© Copyright 2000-2007 <a href="http://x-org.polytechnique.org/">Association Polytechnique.org</a>
         </td>
       </tr>
     {/if}
     </table>
   </body>
 </html>
-{* vim:set et sw=2 sts=2 sws=2: *}
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}
