Group base URL does not anymore need the trailing slash.

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

diff --git a/include/xnet/page.inc.php b/include/xnet/page.inc.php
index bb975f3..d716ee3 100644 (file)
--- a/include/xnet/page.inc.php
+++ b/include/xnet/page.inc.php
@@ -21,6 +21,8 @@
 
 class XnetPage extends PlatalPage
 {
+    var $nomenu = false;
+
     // {{{ function XnetPage()
 
     function XnetPage($tpl, $type=SKINNED)
@@ -41,6 +43,9 @@ class XnetPage extends PlatalPage
 
     function run()
     {
+        if (!$this->nomenu) {
+            $this->useMenu();
+        }
         $this->_run('xnet/skin.tpl');
     }
 
@@ -61,24 +66,19 @@ class XnetPage extends PlatalPage
 
         $menu = array();
 
-        if (S::logged()) {
-            $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;
+        $sub['Signaler un bug']   = array('link' => 'send_bug', 'onclick' => 'send_bug();return false'); 
+        $menu["no_title"]   = $sub;
         
-        if (S::logged()) {
+        if (S::logged() && $globals->asso()) {
             $sub = array();
             $dim = $globals->asso('diminutif');
-            $sub['présentation'] = "$dim/";
+            $sub['présentation'] = "login/$dim/";
             if (may_update() || (is_member()  && $globals->asso('pub') == 'public')) {
                 $sub['annuaire du groupe'] = "$dim/annuaire";
+                $sub['trombinoscope'] = "$dim/trombi";
                 $sub['carte'] = "$dim/geoloc";
             }
             if ((is_member() || may_update()) && $globals->asso('mail_domain')) {
@@ -95,6 +95,7 @@ class XnetPage extends PlatalPage
         if (S::logged() && may_update()) {
             $sub = array();
             $sub['modifier l\'accueil'] = "$dim/edit";
+            $sub['gérer les annonces'] = "$dim/admin/announces";
             if ($globals->asso('mail_domain')) {
                 $sub['envoyer un mail']     = "$dim/mail";
                 $sub['créer une liste']     = "$dim/lists/create";
@@ -128,9 +129,9 @@ function list_all_my_groups($params)
                FROM  groupex.asso    AS a
          INNER JOIN  groupex.membres AS m ON m.asso_id = a.id
               WHERE  m.uid={?}", S::v('uid'));
-    $html = '<div>Mes groupes :</div>';
+    $html = '<div>Mes groupes (<a href="exit">déconnexion</a>) :</div>';
     while (list($nom, $mini) = $res->next()) {
-        $html .= "<a class='gp' href='$mini/'>&bull; $nom</a>";
+        $html .= "<span class='gp'>&bull; <a href='$mini/'>$nom</a></span>";
     }
     return $html;
 }