oh yeah, begin to work on the "carnet" will distract me of tougher things

diff --git a/configs/menu.conf.php b/configs/menu.conf.php
index 3c925b4..49252a8 100644 (file)
--- a/configs/menu.conf.php
+++ b/configs/menu.conf.php
@@ -6,7 +6,8 @@ if(logged()) {
         'Personnaliser' => Array(
             'Mes emails' => 'emails.php' ,
             'Mon profil' => 'profil.php' ,
-            'Mes contacts' => 'mescontacts.php' ,
+            'Mes contacts' => 'carnet/mescontacts.php' ,
+            'Mon carnet' => 'carnet/' ,
             'Mon mot de passe' => 'motdepassemd5.php' ,
             'Mes préférences' => 'preferences.php' 
         ),

diff --git a/htdocs/carnet/index.php b/htdocs/carnet/index.php
new file mode 100644 (file)
index 0000000..515f9c0
--- /dev/null
+++ b/htdocs/carnet/index.php
@@ -0,0 +1,28 @@
+<?php
+/***************************************************************************
+ *  Copyright (C) 2003-2004 Polytechnique.org                              *
+ *  http://opensource.polytechnique.org/                                   *
+ *                                                                         *
+ *  This program is free software; you can redistribute it and/or modify   *
+ *  it under the terms of the GNU General Public License as published by   *
+ *  the Free Software Foundation; either version 2 of the License, or      *
+ *  (at your option) any later version.                                    *
+ *                                                                         *
+ *  This program is distributed in the hope that it will be useful,        *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *  GNU General Public License for more details.                           *
+ *                                                                         *
+ *  You should have received a copy of the GNU General Public License      *
+ *  along with this program; if not, write to the Free Software            *
+ *  Foundation, Inc.,                                                      *
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
+ ***************************************************************************
+        $Id: index.php,v 1.1 2004-11-04 15:33:27 x2000habouzit Exp $
+ ***************************************************************************/
+
+require("auto.prepend.inc.php");
+new_skinned_page('carnet/index.tpl', AUTH_COOKIE);
+$page->run();
+
+?>

diff --git a/htdocs/mescontacts.php b/htdocs/carnet/mescontacts.php
similarity index 97%
rename from htdocs/mescontacts.php
rename to htdocs/carnet/mescontacts.php
index 69f1cf6..6e7d704 100644 (file)
--- a/htdocs/mescontacts.php
+++ b/htdocs/carnet/mescontacts.php
@@ -18,11 +18,11 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: mescontacts.php,v 1.25 2004-11-02 07:48:40 x2000habouzit Exp $
+        $Id: mescontacts.php,v 1.1 2004-11-04 15:33:27 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
-new_skinned_page("mescontacts.tpl",AUTH_COOKIE,true);
+new_skinned_page("carnet/mescontacts.tpl",AUTH_COOKIE,true);
 require("applis.func.inc.php");
 
 // si l'utilisateur demande le retrait de qqun de sa liste

diff --git a/htdocs/mescontacts_ldif.php b/htdocs/carnet/mescontacts_ldif.php
similarity index 96%
rename from htdocs/mescontacts_ldif.php
rename to htdocs/carnet/mescontacts_ldif.php
index 860edc0..103f161 100644 (file)
--- a/htdocs/mescontacts_ldif.php
+++ b/htdocs/carnet/mescontacts_ldif.php
@@ -18,11 +18,11 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: mescontacts_ldif.php,v 1.11 2004-10-21 12:26:12 x2000habouzit Exp $
+        $Id: mescontacts_ldif.php,v 1.1 2004-11-04 15:33:27 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
-new_nonhtml_page('mescontacts_ldif.tpl', AUTH_COOKIE);
+new_nonhtml_page('carnet/mescontacts_ldif.tpl', AUTH_COOKIE);
 
 function ensure_adr(&$table) {
     $trim = Array();

diff --git a/htdocs/mescontacts_pdf.php b/htdocs/carnet/mescontacts_pdf.php
similarity index 98%
rename from htdocs/mescontacts_pdf.php
rename to htdocs/carnet/mescontacts_pdf.php
index 9a627f8..7261592 100644 (file)
--- a/htdocs/mescontacts_pdf.php
+++ b/htdocs/carnet/mescontacts_pdf.php
@@ -18,11 +18,11 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: mescontacts_pdf.php,v 1.4 2004-11-02 07:13:08 x2000habouzit Exp $
+        $Id: mescontacts_pdf.php,v 1.1 2004-11-04 15:33:27 x2000habouzit Exp $
  ***************************************************************************/
 
 #
-# $Id: mescontacts_pdf.php,v 1.4 2004-11-02 07:13:08 x2000habouzit Exp $
+# $Id: mescontacts_pdf.php,v 1.1 2004-11-04 15:33:27 x2000habouzit Exp $
 #
 
 require("auto.prepend.inc.php");

diff --git a/templates/carnet/index.tpl b/templates/carnet/index.tpl
new file mode 100644 (file)
index 0000000..c896fcd
--- /dev/null
+++ b/templates/carnet/index.tpl
@@ -0,0 +1,75 @@
+{***************************************************************************
+ *  Copyright (C) 2003-2004 Polytechnique.org                              *
+ *  http://opensource.polytechnique.org/                                   *
+ *                                                                         *
+ *  This program is free software; you can redistribute it and/or modify   *
+ *  it under the terms of the GNU General Public License as published by   *
+ *  the Free Software Foundation; either version 2 of the License, or      *
+ *  (at your option) any later version.                                    *
+ *                                                                         *
+ *  This program is distributed in the hope that it will be useful,        *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of         *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
+ *  GNU General Public License for more details.                           *
+ *                                                                         *
+ *  You should have received a copy of the GNU General Public License      *
+ *  along with this program; if not, write to the Free Software            *
+ *  Foundation, Inc.,                                                      *
+ *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
+ ***************************************************************************
+        $Id: index.tpl,v 1.1 2004-11-04 15:33:28 x2000habouzit Exp $
+ ***************************************************************************}
+
+<h1>Carnet polytechnicien</h1>
+
+<table class="bicol">
+  <tr>
+    <th colspan="2">
+      Gestion de tes contacts
+    </th>
+  </tr>
+  <tr class="impair">
+    <td><div class="question">
+        <a href="{"carnet/mescontacts.php"|url}">Page de tes contacts</a>
+      </div>
+      <div class="explication">
+        Tu peux ici lister tes contacts, en ajouter et en retirer.
+      </div>
+    </td>
+    <td><div class="question">
+        <a href="{"carnet/mescontacts.php?trombi=1"|url}">Le trombi de tes contacts</a>
+      </div>
+      <div class="explication">
+        La même chose que la page de tes contacts... <strong>en images !</strong>
+      </div>
+    </td>
+  </tr>
+</table>
+
+<br />
+
+<table class="bicol">
+  <tr>
+    <th colspan="2">
+      Notifications automatiques
+    </th>
+  </tr>
+  <tr class="impair">
+    <td><div class="question">
+        <a href="{""|url}"> ... </a>
+      </div>
+      <div class="explication">
+        ...
+      </div>
+    </td>
+    <td><div class="question">
+        <a href="{""|url}"> ... </a>
+      </div>
+      <div class="explication">
+        ...
+      </div>
+    </td>
+  </tr>
+</table>
+
+{* vim:set et sw=2 sts=2 sws=2: *}

diff --git a/templates/mescontacts.tpl b/templates/carnet/mescontacts.tpl
similarity index 93%
rename from templates/mescontacts.tpl
rename to templates/carnet/mescontacts.tpl
index 8009067..ea182d6 100644 (file)
--- a/templates/mescontacts.tpl
+++ b/templates/carnet/mescontacts.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: mescontacts.tpl,v 1.12 2004-10-29 02:04:23 x2000habouzit Exp $
+        $Id: mescontacts.tpl,v 1.1 2004-11-04 15:33:28 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -38,7 +38,7 @@
 </form>
 <p>
   Tu peux également rajouter des camarades dans tes contacts lors d'une recherche dans l'annuaire : 
-  il te suffit de cliquer sur l'icône <img src="images/ajouter.gif" alt="ajout contact" /> en face de son nom dans les résultats !
+  il te suffit de cliquer sur l'icône <img src="{"images/ajouter.gif"|url}" alt="ajout contact" /> en face de son nom dans les résultats !
 </p>  
 
 {if $nb_contacts || $trombi}

diff --git a/templates/mescontacts_ldif.tpl b/templates/carnet/mescontacts_ldif.tpl
similarity index 98%
rename from templates/mescontacts_ldif.tpl
rename to templates/carnet/mescontacts_ldif.tpl
index b78e51d..d08ea7b 100644 (file)
--- a/templates/mescontacts_ldif.tpl
+++ b/templates/carnet/mescontacts_ldif.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: mescontacts_ldif.tpl,v 1.4 2004-09-02 23:55:57 x2000habouzit Exp $
+        $Id: mescontacts_ldif.tpl,v 1.1 2004-11-04 15:33:28 x2000habouzit Exp $
  ***************************************************************************}
 
 {foreach item=c from=$contacts}

diff --git a/templates/docs/plan.tpl b/templates/docs/plan.tpl
index db79127..887a1f2 100644 (file)
--- a/templates/docs/plan.tpl
+++ b/templates/docs/plan.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: plan.tpl,v 1.3 2004-10-24 14:41:12 x2000habouzit Exp $
+        $Id: plan.tpl,v 1.4 2004-11-04 15:33:28 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -67,13 +67,13 @@
   Cette page permet de modifier les informations publiques te concernant, comme tes coordonnées url=ta formation, etc...
   {/page}
 
-  {page title="Mes contacts" url="mescontacts.php"|url}
+  {page title="Mon carnet" url="carnet/"|url}
   A travers cette page tu peux gérer la liste de tes contacts X.  Cela te permettra d'accéder
   plus facilement à ces personnes sur les pages de ce site. Cette liste est aussi disponible en
   format imprimable.
   {/page}
 
-  {page title="Mes contacts en version imprimable (PDF)" url="mescontacts_pdf.php"|url}
+  {page title="Mes contacts en version imprimable (PDF)" url="carnet/mescontacts_pdf.php"|url}
   Cette page crée un document PDF imprimable avec la liste de tes contacts. Tu dois avoir Acrobat
   sur ton ordinateur pour pouvoir bénéficier de ce service. Si tu n'as pas ce logiciel, tu peux
   le télécharger gratuitement sur le site d'Adobe.

diff --git a/templates/fiche.tpl b/templates/fiche.tpl
index 413ef1e..7c65b23 100644 (file)
--- a/templates/fiche.tpl
+++ b/templates/fiche.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: fiche.tpl,v 1.21 2004-11-04 14:39:44 x2000habouzit Exp $
+        $Id: fiche.tpl,v 1.22 2004-11-04 15:33:28 x2000habouzit Exp $
  ***************************************************************************}
 
 {literal}
@@ -37,11 +37,11 @@ function chgMainWinLoc( strPage ) {
       <img src="images/vcard.png" alt="Afficher la carte de visite" title="Afficher la carte de visite"/>
     </a>
     {if !$is_contact}
-    <a href="javascript:x()"  onclick="chgMainWinLoc('mescontacts.php?action=ajouter&amp;user={$forlife}')">
+    <a href="javascript:x()"  onclick="chgMainWinLoc('{"carnet/mescontacts.php|"url}?action=ajouter&amp;user={$forlife}')">
       <img src="images/ajouter.gif" alt="Ajouter à mes contacts" title="Ajouter à mes contacts" />
     </a>
     {else}
-    <a href="javascript:x()"  onclick="chgMainWinLoc('mescontacts.php?action=retirer&amp;user={$forlife}')">
+    <a href="javascript:x()"  onclick="chgMainWinLoc('{"carnet/mescontacts.php"|url}?action=retirer&amp;user={$forlife}')">
       <img src="images/retirer.gif" alt="Retirer de mes contacts" title="Retirer de mes contacts" />
     </a>
     {/if}

diff --git a/templates/include/minifiche_pvt.tpl b/templates/include/minifiche_pvt.tpl
index 260c097..6495463 100644 (file)
--- a/templates/include/minifiche_pvt.tpl
+++ b/templates/include/minifiche_pvt.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: minifiche_pvt.tpl,v 1.10 2004-11-02 07:01:07 x2000habouzit Exp $
+        $Id: minifiche_pvt.tpl,v 1.11 2004-11-04 15:33:29 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -25,22 +25,22 @@
   <div class="bits">
     <a href="javascript:x()"
     onclick="popupWin('fiche.php?user={$c.forlife}','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=800,height=500')">{*
-      *}<img src="images/loupe.gif" alt="Afficher la fiche" title="Afficher la fiche" />{*
+      *}<img src="{"images/loupe.gif"|url}" alt="Afficher la fiche" title="Afficher la fiche" />{*
     *}</a>
     <a href="vcard.php/{$c.forlife}.vcf?x={$c.forlife}">{*
-      *}<img src="images/vcard.png" alt="Afficher la carte de visite" title="Afficher la carte de visite" />{*
+      *}<img src="{"images/vcard.png"|url}" alt="Afficher la carte de visite" title="Afficher la carte de visite" />{*
     *}</a>
-    <a href="mescontacts.php?action={$show_action}&amp;user={$c.forlife}">{*
-      *}<img src="images/{$show_action}.gif" alt="{if $show_action eq "ajouter"}Ajouter à mes{else}Retirer de mes{/if} contacts"
+    <a href="{"carnet/mescontacts.php"|url}?action={$show_action}&amp;user={$c.forlife}">{*
+      *}<img src="{"images"|url}/{$show_action}.gif" alt="{if $show_action eq "ajouter"}Ajouter à mes{else}Retirer de mes{/if} contacts"
         title="{if $show_action eq "ajouter"}Ajouter à mes{else}Retirer de mes{/if} contacts" />{*
     *}</a>
     {if $c.dcd neq 1}
     {perms level='admin'}
     <a href="{"admin/utilisateurs.php"|url}?login={$c.forlife}">{*
-      *}<img src="images/admin.png" alt='admin' title="administrer user" />{*
+      *}<img src="{"images/admin.png"|url}" alt='admin' title="administrer user" />{*
     *}</a>
     <a href="javascript:x()" onclick="popWin('http://www.polytechniciens.com/index.php?page=AX_FICHE_ANCIEN&amp;anc_id={$c.matricule_ax}')">{*
-      *}<img src="images/ax.png" alt='AX' title="fiche AX" />{*
+      *}<img src="{"images/ax.png"|url}" alt='AX' title="fiche AX" />{*
     *}</a>
     {/perms}
     {/if}
@@ -54,7 +54,7 @@
     {perms level='admin'}
     &nbsp;
     <a href="javascript:x()" onclick="popWin('http://www.polytechniciens.com/index.php?page=AX_FICHE_ANCIEN&amp;anc_id={$c.matricule_ax}')">{*
-      *}<img src="images/ax.png" alt='AX' title="fiche AX" />{*
+      *}<img src="{"images/ax.png"|url}" alt='AX' title="fiche AX" />{*
     *}</a>
     {/perms}
   </div>