From: x2000habouzit <x2000habouzit@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Thu, 13 Jul 2006 22:41:48 +0000 (+0000)
Subject: merge about.php in xnet module.
X-Git-Tag: xorg/0.9.11~427
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=045a152265abdde0a9b7e28d24c24ed116817cda;p=platal.git

merge about.php in xnet module.
remove all index.php references

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

diff --git a/hooks/newsletter.inc.php b/hooks/newsletter.inc.php
index 2381b50..bdaaec5 100644
--- a/hooks/newsletter.inc.php
+++ b/hooks/newsletter.inc.php
@@ -43,7 +43,7 @@ function newsletter_config() {
 function newsletter_menu()
 {
     global $globals;
-    $globals->menu->addPrivateEntry(XOM_INFOS, 0, 'Lettres mensuelles', 'newsletter/');
+    $globals->menu->addPrivateEntry(XOM_INFOS, 0, 'Lettres mensuelles', 'nl');
 }
 
 // }}}
diff --git a/htdocs.net/apropos.php b/htdocs.net/apropos.php
deleted file mode 100644
index 785863f..0000000
--- a/htdocs.net/apropos.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-    require 'xnet.inc.php';
-
-    new_page('xnet/apropos.tpl', AUTH_PUBLIC);
-    $page->useMenu();
-    $page->run();
-?>
diff --git a/include/xnet/page.inc.php b/include/xnet/page.inc.php
index 7b43294..6b91e9e 100644
--- a/include/xnet/page.inc.php
+++ b/include/xnet/page.inc.php
@@ -59,7 +59,7 @@ class XnetPage extends PlatalPage
         $menu = array();
 
         $sub = array();
-        $sub['accueil']           = 'index.php';
+        $sub['accueil']           = '';
         $sub['liste des groupes'] = 'plan.php';
         if (logged()) {
             if (has_perms()) {
diff --git a/modules/xnet.php b/modules/xnet.php
index 5314c59..aa81ac7 100644
--- a/modules/xnet.php
+++ b/modules/xnet.php
@@ -24,7 +24,8 @@ class XnetModule extends PLModule
     function handlers()
     {
         return array(
-            'index' => $this->make_hook('index', AUTH_PUBLIC),
+            'index'   => $this->make_hook('index', AUTH_PUBLIC),
+            'about'   => $this->make_hook('about', AUTH_PUBLIC),
         );
     }
 
@@ -33,6 +34,12 @@ class XnetModule extends PLModule
         $page->changeTpl('xnet/index.tpl');
         return PL_OK;
     }
+
+    function handler_about(&$page)
+    {
+        $page->changeTpl('xnet/apropos.tpl');
+        $page->useMenu();
+    }
 }
 
 ?>
diff --git a/templates/newsletter/show.tpl b/templates/newsletter/show.tpl
index 4e08d1c..bec5358 100644
--- a/templates/newsletter/show.tpl
+++ b/templates/newsletter/show.tpl
@@ -25,7 +25,7 @@
 </h1>
 
 <p>
-[<a href='index.php'>liste des lettres</a>]
+[<a href='{rel}/nl'>liste des lettres</a>]
 {if $smarty.get.text}
 [<a href='?nid={$nl->_id}'>version HTML</a>]
 {else}
diff --git a/templates/xnet/apropos.tpl b/templates/xnet/apropos.tpl
index f5a72a6..9d1990b 100644
--- a/templates/xnet/apropos.tpl
+++ b/templates/xnet/apropos.tpl
@@ -28,7 +28,7 @@
   l'extérieur de la communauté polytechnicienne.
   </p>
   <p class="descr">
-  <a href="https://www.polytechnique.org/apropos.php">L'équipe</a> tient à remercier
+  <a href="https://www.polytechnique.org/Docs/APropos">L'équipe</a> tient à remercier
   <strong>David Bachelart (X99) et Sylvain Joyeux (X2000)</strong> qui ont participé à l'élaboration de
   la charte graphique du site, ainsi que <strong>Laurent El Kaim (X1984)</strong>, qui a protégé le
   domaine Polytechnique.net durant plusieurs années, avant d'en faire don début 2004 à
diff --git a/templates/xnet/manuel-public.tpl b/templates/xnet/manuel-public.tpl
index e4e86fc..1ca671f 100644
--- a/templates/xnet/manuel-public.tpl
+++ b/templates/xnet/manuel-public.tpl
@@ -45,7 +45,7 @@ objectif la pr
 
 <h3><a name="accueil">Accueil</a></h3>
 
-<a href="http://www.polytechnique.net/index.php">Voir l'accueil du site</a>
+<a href="http://www.polytechnique.net/">Voir l'accueil du site</a>
 
 
 Depuis la page d'accueil, les visiteurs choisissent un des 4 types d'associations
diff --git a/templates/xnet/skin.tpl b/templates/xnet/skin.tpl
index 1bbb4c7..4336106 100644
--- a/templates/xnet/skin.tpl
+++ b/templates/xnet/skin.tpl
@@ -60,7 +60,7 @@
       {if $xnet_type}
       <tr id="top">
         <td>
-          <a href="{rel}/index.php"><img src="{rel}/images/asso-montants.png" alt="Logo Assos" /></a>
+          <a href="{rel}/"><img src="{rel}/images/asso-montants.png" alt="Logo Assos" /></a>
         </td>
         <td>
           <img src="{rel}/images/logo_{$xnet_type}.png" alt="Logo {$xnet_type}" width="106" height="96" />
@@ -165,10 +165,10 @@
 
       <tr>
         <td colspan="4" id="credits">
-          <a href="{rel}/index.php">page d'accueil</a> -
+          <a href="{rel}/">page d'accueil</a> -
           <a href="{rel}/plan.php">liste des associations</a> -
           <a href="{rel}/services.php">services proposés</a> -
-          <a href="{rel}/apropos.php">à propos de ce site</a> -
+          <a href="{rel}/about">à propos de ce site</a> -
           <a href="https://www.polytechnique.org/">polytechnique.org</a> -
           {mailto address="contact@polytechnique.org" text="nous contacter" encode="javascript"}
           <br />