X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fxnet%2Fskin.tpl;h=a602df090d307881e71d90e0e08d5f78ec720ec6;hb=2925df1bd6cb08c1f29822019fcb82e59f63f8a3;hp=5bd2db189d11e0793490e55c489714416097b492;hpb=9807a8ee0ed53cfa49e8f71a4f483a1904532ac4;p=platal.git

diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index 5bd2db1..a602df0 100644
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -27,6 +27,7 @@
 
     <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
     <link rel="icon" href="images/favicon.png" type="image/png" />
+    <link rel="apple-touch-icon" href="images/logo-xnet.png" type="image/png" />
 
     <link rel="stylesheet" type="text/css" href="css/xnet.css" media="screen" />
 
@@ -37,25 +38,30 @@
     <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" />
 
-    {foreach from=$xorg_css item=css}
+    {foreach from=$pl_css item=css}
     <link rel="stylesheet" type="text/css" href="css/{$css}" />
     {/foreach}
+    {foreach from=$pl_inline_css item=css} 
+    <style type="text/css"> 
+    {$css|smarty:nodefaults} 
+    </style> 
+    {/foreach} 
     <script type="text/javascript">
-    var platal_baseurl = "{#globals.baseurl#}/"
+    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}
+    {foreach from=$pl_js item=js}
     <script type="text/javascript" src="javascript/{$js}"></script>
     {/foreach}
     {javascript name=overlib}
 
-    {if $xorg_rss}
-    <link rel="alternate" type="application/rss+xml" title="{$xorg_rss.title}" href="{$xorg_rss.href}" />
+    {if $pl_rss}
+    <link rel="alternate" type="application/rss+xml" title="{$pl_rss.title}" href="{$pl_rss.href}" />
     {/if}
 
-    {if $xorg_extra_header}
-    {$xorg_extra_header|smarty:nodefaults}
+    {if $pl_extra_header}
+    {$pl_extra_header|smarty:nodefaults}
     {/if}
 
     <title>Les associations polytechniciennes</title>
@@ -91,7 +97,7 @@
             </td>
             {if $xnet_type}
             <td style="width: 280px">
-              <img src="images/texte_{$xnet_type}.jpg" alt="{$xnet_type}" width="280" height="96" />
+              <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>
             {if $asso}
             <td class="logo">
@@ -118,7 +124,7 @@
 
       {if $menu && !$simple}
       <tr>
-        <td id="menu" rowspan="2">
+        <td id="menu">
           {foreach from=$menu key=title item=submenu}
             {if $title neq 'no_title'}<h1>{$title}</h1>{/if}
             {foreach from=$submenu key=tit item=url}
@@ -129,50 +135,24 @@
               {/if}
             {/foreach}
           {/foreach}
-        </td>
-        <td class="breadcrumb">
-          {if $asso && ($is_admin || $smarty.session.suid.perms eq 'admin' || $smarty.session.suid.may_update[$asso.id])}
-          <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()" 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->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}
-          <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 $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">
+            <div>
+              <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>
+            </div>
+          </form>
           {/if}
         </td>
-      </tr>
-      <tr>
         <td id="body">
           {include file="skin/common.content.tpl"}
         </td>
@@ -211,16 +191,15 @@
             <td id="perso">
               {list_all_my_groups}
               {if !$smarty.session.auth}
-                <div>Me connecter :</div>
+                <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'}
-                  {javascript name=jquery}
-                  <script type="text/javascript" src="login/autologin/{$platal->pl_self()}?forceXml=1"></script>
+                  <!-- <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"}
@@ -243,16 +222,16 @@
           <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>
+            - <a href="send_bug/{ $smarty.server.REQUEST_URI }" class="popup_840x600">signaler un bug</a>
           {/if}
           <br />
-          © Copyright 2000-2007 <a href="http://x-org.polytechnique.org/">Association Polytechnique.org</a>
+          Plat/al {#globals.version#} - © Copyright 2000-2008 <a href="http://x-org.polytechnique.org/">Association Polytechnique.org</a>
         </td>
       </tr>
     {/if}
     </table>
-  </body>
+ </body>
 </html>
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}