Fix admin layout on xnet

git-svn-id: svn+ssh://murphy/home/svn/platal/trunk@1584 839d8a87-29fc-0310-9880-83ba4fa771e5

diff --git a/htdocs/css/xnet.css b/htdocs/css/xnet.css
index 6448953..a070124 100644 (file)
--- a/htdocs/css/xnet.css
+++ b/htdocs/css/xnet.css
@@ -170,10 +170,10 @@ td#menu {
  * CLASSES
  ***************************************************************************/
 
-div.breadcrumb {
+.breadcrumb {
     font-weight: bold;
     font-size: 90%;
-    padding: 0.5em 0em;
+    padding: 0.5em 0em 0em 0.2em;
 }
 
 .erreur { color: red !important; }

diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index cacb203..a7e8662 100644 (file)
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -117,7 +117,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}
@@ -129,13 +129,13 @@
             {/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()">
+                <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}
@@ -148,32 +148,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}