Change menu layout

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

diff --git a/htdocs.net/css/xnet.css b/htdocs.net/css/xnet.css
index 50f12dd..17446e5 100644 (file)
--- a/htdocs.net/css/xnet.css
+++ b/htdocs.net/css/xnet.css
@@ -120,19 +120,26 @@ td#search {
     width: 100%;
 }
 
+td#body {
+    padding-left: 1em;
+}
+
 td#menu {
     width: 130px;
-    padding-right: 1em;
+    padding-right: 0;
     font-family: "Trebuchet MS", "Arial",sans-serif;
     font-weight: bold;
 }
 
 #menu h1 {
-    padding: 0.5em 0em 0.8em 0em;
+    padding: 0.3em 0em 0.4em 0em;
+    margin-top: 0.7em;
+    margin-bottom: 0.3em;
     font-size: 85%;
     text-align: center;
     width: 130px;
-    background: url('../images/barre.png') bottom left no-repeat;
+    background: url('../images/barre_small.png') bottom left no-repeat;
+    background-color: #d0c198;
 }
 
 #menu a {

diff --git a/include/xnet/page.inc.php b/include/xnet/page.inc.php
index 8d84f63..7bb8971 100644 (file)
--- a/include/xnet/page.inc.php
+++ b/include/xnet/page.inc.php
@@ -63,15 +63,15 @@ class XnetPage extends PlatalPage
 
         $menu = array();
 
-        $sub = array();
-        $sub['accueil']           = '';
-        $sub['liste des groupes'] = 'plan';
         if (S::logged()) {
-            if (S::has_perms()) {
-                $sub['admin X.net'] = 'admin';
-            }
+            $sub = array();
             $sub['déconnexion']   = 'exit';
+            $menu['no_title'] = $sub;
         }
+
+        $sub = array();
+        $sub['accueil']           = '';
+        $sub['liste des groupes'] = 'plan';
         $menu["Menu Principal"]   = $sub;
 
         if (S::logged() && (is_member() || may_update())) {
@@ -85,11 +85,9 @@ class XnetPage extends PlatalPage
             }
             if ($globals->asso('mail_domain')) {
                 $sub['listes de diffusion'] = "$dim/lists";
+                $sub['envoyer un mail']     = "$dim/mail";
             }
             $sub['événement'] = "$dim/events";
-            if (false) {
-                $sub['carnet'] = "$dim/carnet.php";
-            }
             $sub['télépaiement'] = "$dim/paiement";
 
             $menu[$globals->asso('nom')] = $sub;
@@ -99,11 +97,13 @@ class XnetPage extends PlatalPage
             $sub = array();
             $sub['modifier l\'accueil'] = "$dim/edit";
             if ($globals->asso('mail_domain')) {
-                $sub['envoyer un mail']     = "$dim/mail";
                 $sub['créer une liste']     = "$dim/lists/create";
                 $sub['créer un alias']      = "$dim/alias/create";
             }
-            $menu['Administrer Groupe'] = $sub;
+            if (S::has_perms()) {
+                $sub['gérer les groupes'] = 'admin';
+            }
+            $menu['Administrer'] = $sub;
         }
 
         $this->assign('menu', $menu);

diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index c585a48..b8d11d0 100644 (file)
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -108,13 +108,13 @@
       <tr>
         <td id="menu">
           {foreach from=$menu key=title item=submenu}
-          <h1>{$title}</h1>
+          {if $title neq 'no_title'}<h1>{$title}</h1>{/if}
           {foreach from=$submenu key=tit item=url}
           <a href="{$url}">{$tit}</a>
           {/foreach}
           {/foreach}
         </td>
-        <td>
+        <td id="body">
           <div class="breadcrumb">
             {if $asso}
             <a href="groups/{$asso.cat}">{$asso.cat|cat_pp}</a> »