#554: exit link on all pages

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

diff --git a/ChangeLog b/ChangeLog
index 1507b03..808df72 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -64,6 +64,7 @@ Bug/Wish:
 
     * Xnet:
         - #511: Migrate ML subscription when changing email of a non-X.    -FRU
+        - #554: Move exit link beside "my group" list                      -FRU
 
     * Xnet/Events:
         - #374: Modify ergonomy of inscription to events (again).          -Car

diff --git a/htdocs/css/xnet.css b/htdocs/css/xnet.css
index 1d73ed1..cb4ba7f 100644 (file)
--- a/htdocs/css/xnet.css
+++ b/htdocs/css/xnet.css
@@ -101,7 +101,7 @@ td#perso div {
     padding: 2px 1em;
 }
 
-td#perso a.gp {
+td#perso .gp {
     display: block;
     margin: 2px 1em;
     font-weight: bold;
@@ -128,6 +128,7 @@ td#body {
 td#menu {
     width: 130px;
     padding-right: 0;
+    padding-top: 0.5em;
     font-family: "Trebuchet MS", "Arial",sans-serif;
     font-weight: bold;
 }

diff --git a/include/xnet/page.inc.php b/include/xnet/page.inc.php
index 64185f9..abc1e72 100644 (file)
--- a/include/xnet/page.inc.php
+++ b/include/xnet/page.inc.php
@@ -66,17 +66,11 @@ class XnetPage extends PlatalPage
 
         $menu = array();
 
-        if (S::logged()) {
-            $sub = array();
-            $sub['déconnexion']   = 'exit';
-            $menu['no_title'] = $sub;
-        }
-
         $sub = array();
         $sub['liste des groupes'] = 'plan';
         $sub['documentation']     = 'Xnet';
         $sub['Signaler un bug']   = array('link' => 'send_bug', 'onclick' => 'send_bug();return false'); 
-        $menu["Menu Principal"]   = $sub;
+        $menu["no_title"]   = $sub;
         
         if (S::logged() && $globals->asso()) {
             $sub = array();
@@ -134,9 +128,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;
 }