forgot the old popup mechanism

diff --git a/htdocs/javascript/popups.js b/htdocs/javascript/popups.js
index 0a2e5d4..8f81696 100644 (file)
--- a/htdocs/javascript/popups.js
+++ b/htdocs/javascript/popups.js
@@ -18,6 +18,11 @@
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************/
 
+function popWin2(theNode) {
+    window.open(theNode.href, '_blank',
+       'toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=900,height=700');
+}
+
 function auto_links() {
     nodes = document.getElementsByTagName('a');
     fqdn = document.URL;
@@ -26,8 +31,11 @@ function auto_links() {
        node = nodes[i];
        if(!node.href || node.className == 'xdx') continue;
        if(node.href.indexOf(fqdn)<0 || node.className == 'popup') {
-           node.title='foo';
            node.onclick = function () { window.open(this.href); return false; };
        }
+       if(node.className == 'popup2') {
+           node.onclick = function () { popWin2(this); return false; };
+       }
     }
 }
+

diff --git a/htdocs/javascript/popwin.js.php b/htdocs/javascript/popwin.js.php
deleted file mode 100644 (file)
index 2cd4092..0000000
--- a/htdocs/javascript/popwin.js.php
+++ /dev/null
@@ -1,46 +0,0 @@
-/***************************************************************************
- *  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                *
- ***************************************************************************/
-
-var popup=null;
-function popupWin(theURL,theSize) {
-    if (theURL.indexOf('?')==-1)
-        a = '?';
-    else
-        a = '&';
-    theURL += <?php echo (isset($_COOKIE[session_name()]) ? "\"\"" : "a +\"".SID."\"");?>;
-    window.open(theURL,'_blank',theSize);
-    window.name="main";
-    if(popup != null) {
-        popup.location=popupURL;
-        if(navigator.appName.substring(0,8)=="Netscape") {
-            popup.location=popupURL;
-            popup.opener=self;
-        }
-        if(navigator.appName=="Netscape" ) {
-            popup.window.focus();
-        }
-        self.name="main";
-    }
-}
-function popWin(theURL) {
-    popupWin(theURL,'toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=900,height=700');
-}
-function x() { return; }
-

diff --git a/templates/admin/evenements.tpl b/templates/admin/evenements.tpl
index f0d7511..aa56f56 100644 (file)
--- a/templates/admin/evenements.tpl
+++ b/templates/admin/evenements.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: evenements.tpl,v 1.7 2004-10-24 14:41:12 x2000habouzit Exp $
+        $Id: evenements.tpl,v 1.8 2004-11-13 15:56:35 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -42,7 +42,7 @@
 <table class="bicol">
   <tr>
     <th>
-      Posté par <a href="javascript:x()"  onclick="popWin('../fiche.php?user={$ev.forlife}')">{$ev.prenom} {$ev.nom} (X{$ev.promo})</a>
+      Posté par <a href="{"fiche.php"|url}?user={$ev.forlife}" class='popup2'>{$ev.prenom} {$ev.nom} (X{$ev.promo})</a>
       <a href="mailto:{$ev.forlife}@m4x.org">lui écrire</a>
     </th>
   </tr>

diff --git a/templates/admin/homonymes.tpl b/templates/admin/homonymes.tpl
index 51bab74..8c73486 100644 (file)
--- a/templates/admin/homonymes.tpl
+++ b/templates/admin/homonymes.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: homonymes.tpl,v 1.7 2004-10-24 14:41:12 x2000habouzit Exp $
+        $Id: homonymes.tpl,v 1.8 2004-11-13 15:56:35 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -63,7 +63,7 @@
     </td>
     <td>{$user.expire|date_format:"%d %b %Y"}</td>
     <td>
-      <a href="javascript:x()" onclick="popWin('../fiche.php?user={$user.forlife}')">fiche</a>
+      <a href="{"fiche.php"|url}?user={$user.forlife}" class='popup2'>fiche</a>
       <a href="utilisateurs.php?login={$user.forlife}">edit</a>
       {if $user.type eq 'alias'}
       <a href="?op=mail-conf&amp;target={$user.user_id}">mailer</a>

diff --git a/templates/admin/utilisateurs.tpl b/templates/admin/utilisateurs.tpl
index f8f5fd6..5500b5f 100644 (file)
--- a/templates/admin/utilisateurs.tpl
+++ b/templates/admin/utilisateurs.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: utilisateurs.tpl,v 1.18 2004-10-24 14:41:12 x2000habouzit Exp $
+        $Id: utilisateurs.tpl,v 1.19 2004-11-13 15:56:35 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -165,7 +165,7 @@ function del_fwd(fwd) {
     </tr>
     <tr class="center">
       <td>
-        <a href="javascript:x()" onclick="popWin('{"fiche.php?user=`$mr.forlife`"|url}')">[Voir fiche]</a>
+        <a href="{"fiche.php?user=`$mr.forlife`"|url}" class="popup2">[Voir fiche]</a>
       </td>
       <td>
         <input onclick="doEditUser(); return true;" type="submit" name="u_edit" value="UPDATE" />

diff --git a/templates/carnet/panel.tpl b/templates/carnet/panel.tpl
index 0f5d006..ed7bf65 100644 (file)
--- a/templates/carnet/panel.tpl
+++ b/templates/carnet/panel.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: panel.tpl,v 1.4 2004-11-13 08:39:34 x2000habouzit Exp $
+        $Id: panel.tpl,v 1.5 2004-11-13 15:56:36 x2000habouzit Exp $
  ***************************************************************************}
 
 <h1>Bilan des Notifications</h1>
@@ -51,7 +51,7 @@ Il faut pour cel
     <td class='titre' style="width:15%">{if $smarty.section.row.first}{$p}{/if}</td>
     <td>
       {if $promo[row].inscrit}
-      <a href="javascript:x()" onclick="popupWin('{"fiche.php"|url}?user={$promo[row].forlife}','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=800,height=500')">
+      <a href="{"fiche.php"|url}?user={$promo[row].forlife}" class="popup2">
         {$promo[row].prenom} {$promo[row].nom}
       </a>
       {if !$promo[row].contact}

diff --git a/templates/docs/doc_carva.tpl b/templates/docs/doc_carva.tpl
index 9996716..14cdd36 100644 (file)
--- a/templates/docs/doc_carva.tpl
+++ b/templates/docs/doc_carva.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: doc_carva.tpl,v 1.11 2004-10-24 14:58:27 x2000habouzit Exp $
+        $Id: doc_carva.tpl,v 1.12 2004-11-13 15:56:36 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -44,7 +44,7 @@
 <h2>Pourquoi le nom de domaine carva.org ?</h2>
 <p>
   Dans le jargon de l'école, un 'carva' signifiait un 'X' lorsque celle-ci était 
-  située sur la montagne Ste Geneviève (<a href="javascript:x()" onclick="popWin('{"docs/index.php#carva"|url}','remplissage','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=400,height=500')">
+  située sur la montagne Ste Geneviève (<a href="{"docs/index.php#carva"|url}" class="popup2">
     voir la FAQ à ce sujet</a>). 
 </p>
 <br />

diff --git a/templates/fiche.tpl b/templates/fiche.tpl
index f810099..d3a45b0 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.24 2004-11-13 15:24:59 x2000habouzit Exp $
+        $Id: fiche.tpl,v 1.25 2004-11-13 15:56:35 x2000habouzit Exp $
  ***************************************************************************}
 
 {literal}
@@ -59,7 +59,7 @@ function chgMainWinLoc( strPage ) {
   <div>{if $nationalite}<em>{$nationalite}</em> - {/if}X {$promo}&nbsp;-&nbsp;Formation&nbsp;: {$applis|smarty:nodefaults}</div>
   {if $mobile}<div><em class="intitule">Mobile : </em>{$mobile}</div>{/if}
   {if $is_referent}
-    <div><a href="javascript:x()"  onclick="popWin('fiche_referent.php?user={$forlife}')">Ma fiche référent</a></div>
+    <div><a href="fiche_referent.php?user={$forlife}" class='popup'>Ma fiche référent</a></div>
   {/if}
 </div>
 

diff --git a/templates/include/form.valid.aliases.tpl b/templates/include/form.valid.aliases.tpl
index a4d338b..9dde6c0 100644 (file)
--- a/templates/include/form.valid.aliases.tpl
+++ b/templates/include/form.valid.aliases.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: form.valid.aliases.tpl,v 1.9 2004-09-02 20:11:23 x2000habouzit Exp $
+        $Id: form.valid.aliases.tpl,v 1.10 2004-11-13 15:56:36 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -27,7 +27,7 @@
       <td>Demandeur&nbsp;:
       </td>
       <td>
-        <a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$valid->forlife}')">
+        <a href="{"fiche.php"|url}?user={$valid->forlife}" class='popup2'>
           {$valid->prenom} {$valid->nom}</a> {$valid->old}
       </td>
     </tr>

diff --git a/templates/include/form.valid.epouses.tpl b/templates/include/form.valid.epouses.tpl
index fea0a2b..efd6c43 100644 (file)
--- a/templates/include/form.valid.epouses.tpl
+++ b/templates/include/form.valid.epouses.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: form.valid.epouses.tpl,v 1.10 2004-10-20 07:21:02 x2000habouzit Exp $
+        $Id: form.valid.epouses.tpl,v 1.11 2004-11-13 15:56:37 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -26,7 +26,7 @@
     <tr>
       <td>Demandeur&nbsp;:</td>
       <td>
-        <a href="javascript:x()" onclick="popWin('/fiche.php?user={$valid->forlife}')">
+        <a href="{"fiche.php"|url}?user={$valid->forlife}" class="popup2">
           {$valid->prenom} {$valid->nom}
         </a>
         {if $valid->oldepouse}({$valid->oldepouse} - {$valid->oldalias}){/if}
@@ -44,7 +44,7 @@
     <tr>
       <td colspan="2">
         <span class="erreur">Probleme d'homonymie !
-          <a href="javascript:x()"  onclick="popWin('{"x.php?x=$valid->homonyme"|url}"> {$valid->homonyme}</a>
+          <a href="{"fiche.php"|url}?user=$valid->homonyme" class="popup2">{$valid->homonyme}</a>
         </span>
       </td>
     </tr>

diff --git a/templates/include/form.valid.evts.tpl b/templates/include/form.valid.evts.tpl
index 887e916..bdc597e 100644 (file)
--- a/templates/include/form.valid.evts.tpl
+++ b/templates/include/form.valid.evts.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: form.valid.evts.tpl,v 1.7 2004-09-02 21:09:32 x2000habouzit Exp $
+        $Id: form.valid.evts.tpl,v 1.8 2004-11-13 15:56:37 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -28,7 +28,7 @@
     </tr>
     <tr>
       <td  colspan="2">
-        Posté par <a href="javascript:x()"  onclick="popWin('{"fiche.php"|url}?user={$valid->forlife}')">
+        Posté par <a href="{"fiche.php"|url}?user={$valid->forlife}" class="popup2">
           {$valid->prenom} {$valid->nom} (X{$valid->promo})
         </a>
         [<a href="mailto:{$valid->forlife}@polytechnique.org">lui écrire</a>]

diff --git a/templates/include/form.valid.listes.tpl b/templates/include/form.valid.listes.tpl
index 0a081d0..1ade650 100644 (file)
--- a/templates/include/form.valid.listes.tpl
+++ b/templates/include/form.valid.listes.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: form.valid.listes.tpl,v 1.1 2004-09-25 20:11:35 x2000habouzit Exp $
+        $Id: form.valid.listes.tpl,v 1.2 2004-11-13 15:56:37 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -27,7 +27,7 @@
       <td>Demandeur&nbsp;:
       </td>
       <td>
-        <a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$valid->forlife}')">
+        <a href="{"fiche.php"|url}?user={$valid->forlife}" class="popup2">
           {$valid->forlife}</a>
       </td>
     </tr>
@@ -64,7 +64,7 @@
       <td>Getionnaires&nbsp;:</td>
       <td>
         {foreach from=$valid->owners item=o}
-        <a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$o}')">{$o}</a>
+        <a href="{"fiche.php"|url}?user={$o}" class="popup2">{$o}</a>
         {/foreach}
       </td>
     </tr>
@@ -72,7 +72,7 @@
       <td>Membres&nbsp;:</td>
       <td>
         {foreach from=$valid->members item=o}
-        <a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$o}')">{$o}</a>
+        <a href="{"fiche.php"|url}?user={$o}" class="popup2">{$o}</a>
         {/foreach}
       </td>
     </tr>

diff --git a/templates/include/form.valid.ml.tpl b/templates/include/form.valid.ml.tpl
index aad24db..5fc6f7c 100644 (file)
--- a/templates/include/form.valid.ml.tpl
+++ b/templates/include/form.valid.ml.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: form.valid.ml.tpl,v 1.8 2004-09-03 00:00:22 x2000habouzit Exp $
+        $Id: form.valid.ml.tpl,v 1.9 2004-11-13 15:56:37 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -26,7 +26,7 @@
     <tr>
       <td>Demandeur&nbsp;:</td>
       <td>
-        <a href="javascript:x()" onclick="popWin('/fiche.php?user={$valid->forlife}')">
+        <a href="{"fiche.php"|url}?user={$valid->forlife}" class="popup2">
           {$valid->prenom} {$valid->nom}
         </a>
       </td>

diff --git a/templates/include/form.valid.photos.tpl b/templates/include/form.valid.photos.tpl
index 702d65b..75210cc 100644 (file)
--- a/templates/include/form.valid.photos.tpl
+++ b/templates/include/form.valid.photos.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: form.valid.photos.tpl,v 1.8 2004-09-02 21:09:32 x2000habouzit Exp $
+        $Id: form.valid.photos.tpl,v 1.9 2004-11-13 15:56:37 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -25,7 +25,7 @@
 <table class="bicol" summary="Demande d'alias">
 <tr>
   <td>Demandeur&nbsp;:</td>
-  <td><a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$valid->forlife}')">
+  <td><a href="{"fiche.php"|url}?user={$valid->forlife}" class="popup2">
       {$valid->prenom} {$valid->nom}
       </a>
   </td>

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 842c19d..59ccef7 100644 (file)
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: minifiche.tpl,v 1.15 2004-11-13 15:17:56 x2000habouzit Exp $
+        $Id: minifiche.tpl,v 1.16 2004-11-13 15:56:37 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -26,7 +26,7 @@
     {if $c.sexe}•{/if}
     {min_auth level="cookie"}
     {if !$c.dcd && $inscrit}
-    <a href="javascript:x()" onclick="popupWin('{"fiche.php"|url}?user={$c.forlife}','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=800,height=500')">
+    <a href="{"fiche.php"|url}?user={$c.forlife}" class="popup2">
     {/if}
     {/min_auth}
     {if $c.epouse}{$c.epouse} {$c.prenom}<br />(née {$c.nom}){else}{$c.nom} {$c.prenom}{/if}
@@ -48,7 +48,7 @@
     {if $c.dcd}décédé{if $c.sexe}e{/if} le {$c.deces|date_format:"%d %B %Y"}{/if}
     {min_auth level="cookie"}
     {if !$c.dcd && !$inscrit}
-    <a href="javascript:x()" onclick="popWin('{"marketing/public.php"|url}?num={$c.matricule}')">clique ici si tu connais son adresse email !
+    <a href="{"marketing/public.php"|url}?num={$c.matricule}" class='popup'>clique ici si tu connais son adresse email !
     </a>
     {/if}
     {/min_auth}

diff --git a/templates/include/minifiche_pvt.tpl b/templates/include/minifiche_pvt.tpl
index 3a10c6a..25fa2f1 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.14 2004-11-13 15:22:06 x2000habouzit Exp $
+        $Id: minifiche_pvt.tpl,v 1.15 2004-11-13 15:56:37 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -34,7 +34,7 @@
     *}</a>
     {/if}
     {perms level='admin'}
-    <a href="javascript:x()" onclick="popWin('http://www.polytechniciens.com/index.php?page=AX_FICHE_ANCIEN&amp;anc_id={$c.matricule_ax}')">{*
+    <a href="http://www.polytechniciens.com/index.php?page=AX_FICHE_ANCIEN&amp;anc_id={$c.matricule_ax}">{*
       *}<img src="{"images/ax.png"|url}" alt='AX' title="fiche AX" />{*
     *}</a>
     {/perms}
@@ -43,8 +43,7 @@
   <div class="long"></div>
 {else}
   <div class="bits">
-    <a href="javascript:x()"
-      onclick="popupWin('{"fiche.php"|url}?user={$c.forlife}','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=800,height=500')">{*
+    <a href="{"fiche.php"|url}?user={$c.forlife}" class="popup2">{*
       *}<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}">{*
@@ -59,7 +58,7 @@
     <a href="{"admin/utilisateurs.php"|url}?login={$c.forlife}">{*
       *}<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}')">{*
+    <a href="http://www.polytechniciens.com/index.php?page=AX_FICHE_ANCIEN&amp;anc_id={$c.matricule_ax}">{*
       *}<img src="{"images/ax.png"|url}" alt='AX' title="fiche AX" />{*
     *}</a>
     {/perms}

diff --git a/templates/include/trombi.tpl b/templates/include/trombi.tpl
index d07978f..6fccb7f 100644 (file)
--- a/templates/include/trombi.tpl
+++ b/templates/include/trombi.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: trombi.tpl,v 1.4 2004-11-02 06:46:50 x2000habouzit Exp $
+        $Id: trombi.tpl,v 1.5 2004-11-13 15:56:37 x2000habouzit Exp $
  ***************************************************************************}
 
 {dynamic}
@@ -29,7 +29,7 @@
   <tr>
   {/if}
     <td class="center">
-      <a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$p.forlife}')">
+      <a href="{"fiche.php"|url}?user={$p.forlife}" class="popup2">
         <img src="{"getphoto.php"|url}?x={$p.forlife}" width="110" alt=" [ PHOTO ] " />
       </a>
       {if $trombi_admin && $smarty.session.perms eq 'admin'}
@@ -38,8 +38,8 @@
       </a>
       {/if}
       <br />
-      <a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$p.forlife}')">
-        {$p.prenom} {$p.nom}{if $trombi_show_promo}({$p.promo}){/if}
+      <a href="{"fiche.php"|url}?user={$p.forlife}" class="popup2">
+        {$p.prenom} {$p.nom}{if $trombi_show_promo} ({$p.promo}){/if}
       </a>
     </td>
   {if $loop eq "3"}

diff --git a/templates/listes/admin.tpl b/templates/listes/admin.tpl
index 1d79071..aade1ea 100644 (file)
--- a/templates/listes/admin.tpl
+++ b/templates/listes/admin.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: admin.tpl,v 1.19 2004-11-07 14:58:35 x2000habouzit Exp $
+        $Id: admin.tpl,v 1.20 2004-11-13 15:56:37 x2000habouzit Exp $
  ***************************************************************************}
 
 {dynamic}
@@ -59,7 +59,7 @@ qui y 
       <td>
         {foreach from=$xs item=x}
         {if $promo}
-        <a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$x.l}')">{$x.n}</a>
+        <a href="{"fiche.php"|url}?user={$x.l}" class="popup2">{$x.n}</a>
         {else}
         {$x.l}
         {/if}
@@ -93,7 +93,7 @@ qui y 
       <td>
         {foreach from=$xs item=x}
         {if $promo}
-        <a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$x.l}')">{$x.n}</a>
+        <a href="{"fiche.php"|url}?user={$x.l}" class="popup2">{$x.n}</a>
         {else}
         {$x.l}
         {/if}

diff --git a/templates/listes/members.tpl b/templates/listes/members.tpl
index 2f23959..ddf5757 100644 (file)
--- a/templates/listes/members.tpl
+++ b/templates/listes/members.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: members.tpl,v 1.12 2004-11-07 14:58:35 x2000habouzit Exp $
+        $Id: members.tpl,v 1.13 2004-11-13 15:56:37 x2000habouzit Exp $
  ***************************************************************************}
 
 {dynamic}
@@ -82,7 +82,7 @@
     <td>
       {foreach from=$xs item=x}
       {if $promo}
-      <a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$x.l}')">{$x.n}</a><br />
+      <a href="{"fiche.php"|url}?user={$x.l}" class="popup2">{$x.n}</a><br />
       {else}
       {$x.l}<br />
       {/if}
@@ -110,7 +110,7 @@
     <td>
       {foreach from=$xs item=x}
       {if $promo}
-      <a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$x.l}')">{$x.n}</a><br />
+      <a href="{"fiche.php"|url}?user={$x.l}" class="popup2">{$x.n}</a><br />
       {else}
       {$x.l}<br />
       {/if}

diff --git a/templates/listes/trombi.tpl b/templates/listes/trombi.tpl
index 26efc17..8d41c6a 100644 (file)
--- a/templates/listes/trombi.tpl
+++ b/templates/listes/trombi.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: trombi.tpl,v 1.12 2004-11-07 14:58:35 x2000habouzit Exp $
+        $Id: trombi.tpl,v 1.13 2004-11-13 15:56:37 x2000habouzit Exp $
  ***************************************************************************}
 
 {dynamic}
@@ -70,7 +70,7 @@
         <td class='center'>
           <img src="{"getphoto.php"|url}?x={$x.l}" width="110" alt=" [ PHOTO ] " />
           <br />
-          <a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$x.l}')">
+          <a href="{"fiche.php"|url}?user={$x.l}" class="popup2">
             {$x.n} ({$promo})
           </a>
         </td>

diff --git a/templates/login.tpl b/templates/login.tpl
index 9f43376..c9fcfd5 100644 (file)
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: login.tpl,v 1.13 2004-10-24 14:41:11 x2000habouzit Exp $
+        $Id: login.tpl,v 1.14 2004-11-13 15:56:35 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -50,7 +50,7 @@
   
 {dynamic on="0$fiche_incitation"}
   <p>La dernière mise à jour de ta
-  <a href="javascript:x()" onclick="popWin('fiche.php?user={$smarty.session.forlife}">fiche</a>
+  <a href="{"fiche.php"|url}?user={$smarty.session.forlife}" class="popup2">fiche</a>
   date du {$fiche_incitation|date_format:"%x"}.
   Il est possible qu'elle ne soit pas à jour.
   Si tu souhaites la modifier, <a href="profil.php">clique ici !</a>
@@ -60,7 +60,7 @@
 {dynamic on="0$photo_incitation"}
   <p>
     Tu n'as pas mis de photo de toi sur ta fiche, c'est dommage.
-    Clique <a href="javascript:x()" onclick="popWin('trombino.php','trmb','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=750,height=480')">ici</a>
+    Clique <a href="{"trombino.php"|url}">ici</a>
     si tu souhaites en ajouter une.
   </p>
 {/dynamic}
@@ -92,7 +92,7 @@
         {$ev.texte|smarty:nodefaults|nl2br}
         <br />
         <p class="smaller">Annonce proposée par
-        <a href="javascript:x()" onclick="popWin('fiche.php?user={$ev.forlife}')">
+        <a href="{"fiche.php"|url}?user={$ev.forlife}" class="popup2">
           {$ev.prenom} {$ev.nom} X{$ev.promo}
         </a>
         </p>

diff --git a/templates/marketing/ins_confirmees.tpl b/templates/marketing/ins_confirmees.tpl
index a2a5607..8db7863 100644 (file)
--- a/templates/marketing/ins_confirmees.tpl
+++ b/templates/marketing/ins_confirmees.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: ins_confirmees.tpl,v 1.6 2004-09-02 23:57:53 x2000bedo Exp $
+        $Id: ins_confirmees.tpl,v 1.7 2004-11-13 15:56:40 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -36,7 +36,7 @@
       <a href="promo.php?promo={$in.promo}">{$in.promo}</a>
     </td>
     <td>
-      <a href="javascript:x()"  onclick="popWin('{"fiche.php"|url}?user={$in.forlife}')">
+      <a href="{"fiche.php"|url}?user={$in.forlife}" class="popup2">
         {$in.nom} {$in.prenom}</a>
     </td>
   </tr>

diff --git a/templates/profil.tpl b/templates/profil.tpl
index c00af8d..b019dca 100644 (file)
--- a/templates/profil.tpl
+++ b/templates/profil.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: profil.tpl,v 1.11 2004-09-02 23:25:31 x2000habouzit Exp $
+        $Id: profil.tpl,v 1.12 2004-11-13 15:56:35 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -32,7 +32,8 @@
 <p class="erreur">{$e}</p>
 {/foreach}
 
-<p>Tu peux consulter <a href="javascript:x()" onclick="popWin('fiche.php?user={$smarty.session.forlife}','_blank','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=620,height=370')">l'état actuel de ta fiche</a> tel qu'elle apparaîtra pour un camarade.</p>
+<p>Tu peux consulter <a href="{"fiche.php"|url}?user={$smarty.session.forlife}" class="popup2">l'état actuel de ta fiche</a>
+tel qu'elle apparaîtra pour un camarade.</p>
 
 <form action="{$smarty.server.PHP_SELF}" method="post" id="prof_annu">
   <table class="cadre_a_onglet" cellpadding="0" cellspacing="0">

diff --git a/templates/profil/adresses.tpl b/templates/profil/adresses.tpl
index e35505b..43a8534 100644 (file)
--- a/templates/profil/adresses.tpl
+++ b/templates/profil/adresses.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: adresses.tpl,v 1.7 2004-10-09 05:57:48 x2000habouzit Exp $
+        $Id: adresses.tpl,v 1.8 2004-11-13 15:56:43 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -76,8 +76,7 @@
               transmis à l'AX
             </td>
             <td class="texte">
-              <a href="javascript:x()" onclick="popWin('{"docs/faq.php"|url}#flags','remplissage','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=400,height=500')">
-                Quelle couleur ??</a>
+              <a href="{"docs/faq.php"|url}#flags" class="popup2">Quelle couleur ??</a>
             </td>
           </tr>
         </table>
@@ -185,7 +184,7 @@
               transmis à l'AX
             </td>
             <td class="texte">
-              <a href="javascript:x()" onclick="popWin('{"docs/faq.php"|url}#flags','remplissage','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=400,height=500')">Quelle couleur ??</a>
+              <a href="{"docs/faq.php"|url}#flags" class="popup2">Quelle couleur ??</a>
             </td>
           </tr>
         </table>

diff --git a/templates/profil/emploi.tpl b/templates/profil/emploi.tpl
index 4c558f5..6711af7 100644 (file)
--- a/templates/profil/emploi.tpl
+++ b/templates/profil/emploi.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: emploi.tpl,v 1.7 2004-10-09 05:57:48 x2000habouzit Exp $
+        $Id: emploi.tpl,v 1.8 2004-11-13 15:56:43 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -49,8 +49,7 @@
               transmis à l'AX
             </td>
             <td class="texte">
-              <a href="javascript:x()" onclick="popWin('{"docs/faq.php"|url}#flags','remplissage','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=400,height=500')">
-                Quelle couleur ??</a>
+              <a href="{"docs/faq.php"|url}#flags" class="popup2">Quelle couleur ??</a>
             </td>
           </tr>
         </table>
@@ -121,8 +120,7 @@
               transmis à l'AX
             </td>
             <td class="texte">
-              <a href="javascript:x()" onclick="popWin('{"docs/faq.php"|url}#flags','remplissage','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=400,height=500')">
-                Quelle couleur ??</a>
+              <a href="{"docs/faq.php"|url}#flags" class="popup2">Quelle couleur ??</a>
             </td>
           </tr>
         </table>
@@ -206,8 +204,7 @@
               transmis à l'AX
             </td>
             <td class="texte">
-              <a href="javascript:x()" onclick="popWin('{"docs/faq.php"|url}#flags','remplissage','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=400,height=500')">
-                Quelle couleur ??</a>
+              <a href="{"docs/faq.php"|url}#flags" class="popup2">Quelle couleur ??</a>
             </td>
           </tr>
         </table>
@@ -261,8 +258,7 @@
       <td class="dcolg">
         <span class="titre">Curriculum vitae</span><br />
         <span class="comm">Le CV n'est <strong>jamais</strong> public.<br />
-          <a href="javascript:x()" onclick="popWin('{"docs/faq.php"|url}#cv','aide_cv','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=400,height=500')">
-            Comment remplir mon CV ?</a></span>
+          <a href="{"docs/faq.php"|url}#cv" class="popup2">Comment remplir mon CV ?</a></span>
       </td>
       <td class="dcold">
         <textarea name="cv" rows="15" cols="33">{$cv}</textarea>

diff --git a/templates/profil/general.tpl b/templates/profil/general.tpl
index 7b6b856..3032ea5 100644 (file)
--- a/templates/profil/general.tpl
+++ b/templates/profil/general.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: general.tpl,v 1.15 2004-10-29 01:24:22 x2000habouzit Exp $
+        $Id: general.tpl,v 1.16 2004-11-13 15:56:43 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -146,7 +146,7 @@
               Voilà la photo qui apparaîtra sur la fiche de ton profil (si tu viens
               de changer ta photo, la photo affichée peut correspondre à ton ancien
               profil : c'est le cas si elle n'a pas encore été validée par un administrateur du site !
-              <a href="javascript:x()" onclick="popWin('fiche.php?user={$smarty.session.forlife}&amp;modif=new','_blank','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=620,height=370')">nouvelle photo</a>).
+              <a href="{"fiche.php"|url}?user={$smarty.session.forlife}&amp;modif=new" class="popup2">nouvelle photo</a>).
             </td>
             <td class="dcolg">
               <img src="getphoto.php?x={$smarty.session.uid}{*{if $smarty.cookies|@count == 0}&amp;{php}echo SID;{/php}{/if}*}" alt=" [ PHOTO ] " />
@@ -182,7 +182,7 @@
               transmis à l'AX
             </td>
             <td class="texte">
-              <a href="javascript:x()" onclick="popWin('{"docs/faq.php"|url}#flags','remplissage','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=400,height=500')">Quelle couleur ??</a>
+              <a href="{"docs/faq.php"|url}#flags" class="popup2">Quelle couleur ??</a>
             </td>
           </tr>
         </table>
@@ -208,7 +208,7 @@
               site public
             </td>
             <td class="texte">
-              <a href="javascript:x()" onclick="popWin('{"docs/faq.php"|url}#flags','remplissage','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=400,height=500')">Quelle couleur ??</a>
+              <a href="{"docs/faq.php"|url}#flags" class="popup2">Quelle couleur ??</a>
             </td>
           </tr>
         </table>
@@ -234,7 +234,7 @@
               site public
             </td>
             <td class="texte">
-              <a href="javascript:x()" onclick="popWin('{"docs/faq.php"|url}#flags','remplissage','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=400,height=500')">Quelle couleur ??</a>
+              <a href="{"docs/faq.php"|url}#flags" class="popup2">Quelle couleur ??</a>
             </td>
           </tr>
         </table>

diff --git a/templates/profil/skill.tpl b/templates/profil/skill.tpl
index 036f3f1..6b2b2e3 100644 (file)
--- a/templates/profil/skill.tpl
+++ b/templates/profil/skill.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: skill.tpl,v 1.7 2004-10-09 05:57:48 x2000habouzit Exp $
+        $Id: skill.tpl,v 1.8 2004-11-13 15:56:43 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -169,7 +169,7 @@
         <span class="titre">Niveau</span>
       </td>
       <td class="cold" style="width:15%">
-        <span class="lien"><a href="javascript:x()" onclick="popWin('{"docs/faq.php"|url}#niveau_langue','remplissage','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=400,height=500')">Quel niveau ?</a></span>
+        <span class="lien"><a href="{"docs/faq.php"|url}#niveau_langue" class="popup2">Quel niveau ?</a></span>
       </td>
     </tr>
     {foreach from=$langue_name item=name key=i}

diff --git a/templates/referent.tpl b/templates/referent.tpl
index cffdeb3..f17e4f1 100644 (file)
--- a/templates/referent.tpl
+++ b/templates/referent.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: referent.tpl,v 1.11 2004-10-24 15:24:02 x2000coic Exp $
+        $Id: referent.tpl,v 1.12 2004-11-13 15:56:35 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -61,9 +61,11 @@ d'
         X{$personnes[resultat].promo}
       </div>
       <div class="bits" style="width: 40%;">
-        <a class="smaller" href="javascript:x()"  onclick="popWin('fiche.php?user={$personnes[resultat].forlife}')">
-        <img src="images/loupe.gif" alt="voir sa fiche" title="Voir sa fiche" /></a> - 
-        <a class="smaller" href="javascript:x()"  onclick="popWin('fiche_referent.php?user={$personnes[resultat].forlife}')">Voir sa fiche référent</a>
+        <span class='smaller'>
+        <a href="{"fiche.php"|url}?user={$personnes[resultat].forlife}" class="popup2">
+          <img src="images/loupe.gif" alt="voir sa fiche" title="Voir sa fiche" /></a> - 
+          <a href="{"fiche_referent.php"|url}?user={$personnes[resultat].forlife}" class="popup2">Voir sa fiche référent</a>
+        </span>
       </div>
       <div class="long">
        <table cellspacing="0" cellpadding="0">

diff --git a/templates/sendmail.tpl b/templates/sendmail.tpl
index 769c90e..b5e6b46 100644 (file)
--- a/templates/sendmail.tpl
+++ b/templates/sendmail.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: sendmail.tpl,v 1.12 2004-10-24 14:41:11 x2000habouzit Exp $
+        $Id: sendmail.tpl,v 1.13 2004-11-13 15:56:35 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -114,7 +114,7 @@
       <input type="checkbox" name="contacts[{$contact.forlife}]"
         value="{$contact.prenom} {$contact.nom} &lt;{$contact.forlife}@polytechnique.org&gt;"
         {if $smarty.request.contacts && $smarty.request.contacts.forlife}checked="checked"{/if} />
-      <a href="javascript:x()" onclick="popWin('fiche.php?user={$contact.forlife}')">{$contact.prenom} {$contact.nom}</a> (X{$contact.promo})
+      <a href="{"fiche.php"|url}?user={$contact.forlife}" class="popup2">{$contact.prenom} {$contact.nom}</a> (X{$contact.promo})
     </td>
 {if $key is odd}
   </tr>

diff --git a/templates/skin/common.header.tpl b/templates/skin/common.header.tpl
index 5f47ee3..98cf8ec 100644 (file)
--- a/templates/skin/common.header.tpl
+++ b/templates/skin/common.header.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: common.header.tpl,v 1.15 2004-11-13 15:25:01 x2000habouzit Exp $
+        $Id: common.header.tpl,v 1.16 2004-11-13 15:56:47 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -48,6 +48,5 @@
     </title>
     <script type="text/javascript" src="{"javascript/misc.js"|url}"></script>
     <script type="text/javascript" src="{"javascript/popups.js"|url}"></script>
-    <script type="text/javascript" src="{"javascript/popwin.js.php"|url}"> </script>
 
 {* vim:set et sw=2 sts=2 sws=2: *}