nettoyage geoloc

[platal.git] / include / xnet / page.inc.php

diff --git a/include/xnet/page.inc.php b/include/xnet/page.inc.php
index 8d84f63..5258903 100644 (file)
--- a/include/xnet/page.inc.php
+++ b/include/xnet/page.inc.php
@@ -63,15 +63,16 @@ 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';
+        $sub['documentation']     = 'Xnet';
         $menu["Menu Principal"]   = $sub;
 
         if (S::logged() && (is_member() || may_update())) {
@@ -80,16 +81,13 @@ class XnetPage extends PlatalPage
             $sub['présentation'] = "$dim/";
             if (may_update() || $globals->asso('pub') == 'public') {
                 $sub['annuaire du groupe'] = "$dim/annuaire";
-                if ($globals->xnet->geoloc)
-                    $sub['carte'] = "$dim/geoloc.php";
+                $sub['carte'] = "$dim/geoloc";
             }
             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,17 @@ 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;
+        } elseif (S::has_perms()) {
+            $sub = array();
+            $sub['gérer les groupes'] = 'admin';
+            $menu['Administrer'] = $sub;
         }
 
         $this->assign('menu', $menu);