wiki changes and xhtml fixes

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

diff --git a/ChangeLog b/ChangeLog
index 907c6ec..6256829 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,8 +3,12 @@ VERSION 0.9.9                                                        ?? Oct 2005
 
 New :
 
+    * Documentation :
+        - Documentation now use Wiki                                        -Car
+
     * Profile :
         - User can now accept synchronisatio from AX by admin.              -Car
+        - Address will try to display as the country standard.              -Car
 
     * Xnet :
         - Groups can be non subscribable.                                   -Car
@@ -24,6 +28,7 @@ Bug/Wish :
 
     * Paiments :
         - #336 : Micro -> Tele(payments).                                   -MC
+        - #356 : Payments use usage name instead of last name.              -Car
         - Fixed little text mistake in Payments menu.                       -CAT
         - Direct link from and to events.                                   -Car
 

diff --git a/Makefile b/Makefile
index 0a8a763..4371c43 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -42,6 +42,8 @@ spool/wiki.d:
        chmod o+w $@
        cd $@ && ln -sf ../../install.d/wiki/wiki.d/* .
 
+wiki/cookbook/e-protect.php:
+       cd wiki/cookbook && ln -sf ../../install.d/wiki/e-protect.php
 
 htdocs/valid.html:
        touch spool/templates_c/valid.html
@@ -71,7 +73,7 @@ get-wiki:
 
 build-wiki: wiki/local/farmconfig.php wiki/pub/skins/empty spool/wiki.d
 
-wiki: get-wiki build-wiki spool/uploads htdocs/uploads htdocs/wiki
+wiki: get-wiki build-wiki spool/uploads htdocs/uploads htdocs/wiki wiki/cookbook/e-protect.php
 
 ################################################################################
 

diff --git a/hooks/tmp.inc.php b/hooks/tmp.inc.php
index 96d3999..8cd82e1 100644 (file)
--- a/hooks/tmp.inc.php
+++ b/hooks/tmp.inc.php
@@ -15,8 +15,8 @@ function tmp_menu()
     $globals->menu->addPrivateEntry(XOM_GROUPS,   30, 'Groupes X',             'http://www.polytechnique.net/plan.php');
     $globals->menu->addPrivateEntry(XOM_GROUPS,   40, 'Web Polytechnicien',    'http://www.polytechnique.net/');
 
-    $globals->menu->addPrivateEntry(XOM_INFOS,    10, 'Documentations',        'docs/');
-    $globals->menu->addPrivateEntry(XOM_INFOS,    20, 'Nous contacter',        'docs/contacts.php');
+    $globals->menu->addPrivateEntry(XOM_INFOS,    10, 'Documentations',        'Docs/');
+    $globals->menu->addPrivateEntry(XOM_INFOS,    20, 'Nous contacter',        'Docs/NousContacter');
     $globals->menu->addPrivateEntry(XOM_INFOS,    30, 'Emploi',                'http://www.manageurs.com/');
 
     $globals->menu->addPrivateEntry(XOM_ADMIN,    00, 'Marketing',           'marketing/');
@@ -27,14 +27,14 @@ function tmp_menu()
 
     $globals->menu->addPublicEntry(XOM_US,    00, 'Me connecter !',         'login.php');
     $globals->menu->addPublicEntry(XOM_US,    10, 'M\'inscrire',            'register/');
-    $globals->menu->addPublicEntry(XOM_US,    20, 'Pourquoi m\'inscrire ?', 'docs/services.php');
+    $globals->menu->addPublicEntry(XOM_US,    20, 'Pourquoi m\'inscrire ?', 'Docs/PourquoiM\'Inscrire');
 
     $globals->menu->addPublicEntry(XOM_EXT,   10, 'Associations X',         'http://www.polytechnique.net/');
     $globals->menu->addPublicEntry(XOM_EXT,   20, 'Recrutement',            'http://www.manageurs.com/');
 
-    $globals->menu->addPublicEntry(XOM_INFOS, 00, 'A propos du site',       'docs/apropos.php');
-    $globals->menu->addPublicEntry(XOM_INFOS, 10, 'Nous contacter',         'docs/contacts.php');
-    $globals->menu->addPublicEntry(XOM_INFOS, 20, 'FAQ',                    'docs/faq.php');
+    $globals->menu->addPublicEntry(XOM_INFOS, 00, 'A propos du site',       'Docs/APropos');
+    $globals->menu->addPublicEntry(XOM_INFOS, 10, 'Nous contacter',         'Docs/NousContacter');
+    $globals->menu->addPublicEntry(XOM_INFOS, 20, 'FAQ',                    'Docs/FAQ');
 }
 
 // {{{ subscribe HOOK

diff --git a/plugins/pmwiki.intermap.txt b/plugins/pmwiki.intermap.txt
index 0cbc917..7394f48 100644 (file)
--- a/plugins/pmwiki.intermap.txt
+++ b/plugins/pmwiki.intermap.txt
@@ -1 +1,2 @@
 Xorg           http://www.polytechnique.org/
+Xnet           http://www.polytechnique.net/

diff --git a/templates/deconnexion.tpl b/templates/deconnexion.tpl
index cab5446..10e9f13 100644 (file)
--- a/templates/deconnexion.tpl
+++ b/templates/deconnexion.tpl
@@ -40,7 +40,7 @@ Tu peux donc aussi te <a href='?forget=1'>deconnecter compl
 <p>
 De plus, ton adresse e-mail est toujours en mémoire dans ton navigateur afin de faciliter ta
 prochaine connexion. Si tu utilises un ordinateur public ou que tu désires l'effacer, tu peux
-<a href='?forgetUid=1&forget=1'>supprimer cette information et te déconnecter complètement</a>.
+<a href='?forgetUid=1&amp;forget=1'>supprimer cette information et te déconnecter complètement</a>.
 </p>
 
 {elseif $smarty.cookies.ORGuid}

diff --git a/templates/skin/common.footer.tpl b/templates/skin/common.footer.tpl
index 183cc07..70ee3d5 100644 (file)
--- a/templates/skin/common.footer.tpl
+++ b/templates/skin/common.footer.tpl
@@ -24,12 +24,12 @@
 <div>
   Copyright © 1999-2005 <a href="http://x-org.polytechnique.org/">Polytechnique.org</a>
   &nbsp;-&nbsp;
-  <a href="{rel}/docs/convention_ax.php">Lien avec l'AX</a>
+  <a href="{rel}/Docs/ConventionAX">Lien avec l'AX</a>
   &nbsp;-&nbsp;
-  <a href="{rel}/docs/apropos.php">A propos de ce site</a>
+  <a href="{rel}/Docs/APropos">A propos de ce site</a>
 <br />
-  <a href="{rel}/docs/ethique.php">Services et Ethique</a>
-  | <a href="{rel}/docs/charte.php">Charte</a>
+  <a href="{rel}/Docs/Ethique">Services et Ethique</a>
+  | <a href="{rel}/Docs/Charte">Charte</a>
 {min_auth level=cookie}
   | <a href="{rel}/stats/coupure.php">Disponibilité</a>
   | <a href="{rel}/stats/">Statistiques</a>