X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fxnet%2Fskin.tpl;h=54974af3e0d4ea6dd0d2574419bc43be0a5d8896;hb=bba75eda287510a87b7af689e02aef421bfaab90;hp=21f62e7f1238af49c874dd4db4b5d4e3e91da747;hpb=1b0cd4abce8cff5d88f6876caeb8be824a9c0635;p=platal.git

diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index 21f62e7..54974af 100644
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -40,33 +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>
-    <script type="text/javascript" src="http://jquery.com/src/jquery-latest.pack.js"></script>
-    {literal}
-    <script type="text/javascript">
-$(document).ready(function() {
- $("td.center > a").click(function() {
-   $.ajax({
-    type: "GET",
-    url: $(this).attr("href"),
-    dataType: "xml",
-    success: function (msg) {
-      alert("Data Saved :"+msg);
-    }
-  });
-   return false;
- });
-});
-    </script>
-    {/literal}
-    
+    {javascript name=overlib}
+
     {if $xorg_rss}
     <link rel="alternate" type="application/rss+xml" title="{$xorg_rss.title}" href="{$xorg_rss.href}" />
     {/if}
@@ -91,7 +79,7 @@ $(document).ready(function() {
         <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}
@@ -135,7 +123,7 @@ $(document).ready(function() {
 
       {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}
@@ -147,17 +135,19 @@ $(document).ready(function() {
             {/foreach}
           {/foreach}
         </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">
+        <td class="breadcrumb">
+          {if $asso && ($is_admin ||
+                        ($smarty.session.suid && ($smarty.session.suid.perms->hasFlag('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()">
-                  {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>
+                <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 && !$smarty.session.perms->hasFlag('admin')}selected="selected"{/if}>Animateur</option>
+                  <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>
@@ -166,32 +156,32 @@ $(document).ready(function() {
             </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}
@@ -228,12 +218,16 @@ $(document).ready(function() {
             <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"}
@@ -256,7 +250,7 @@ $(document).ready(function() {
           <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}