use Caribou's script for fiche_referent as well

git-archimport-id: opensource@polytechnique.org--2005/platal--mainline--0.9--patch-308

diff --git a/htdocs/fiche.php b/htdocs/fiche.php
index acf01d2..67ddca9 100644 (file)
--- a/htdocs/fiche.php
+++ b/htdocs/fiche.php
@@ -86,6 +86,8 @@ $res = $globals->xdb->query(
                AND alias LIKE '%@{$globals->mail->alias_dom}'",
         Session::getInt('uid'), $user['forlife'].'@'.$globals->mail->domain, $user['forlife'].'@'.$globals->mail->domain2);
 $page->assign('virtualalias', $res->fetchOneCell());
+
+$page->addJsLink('javascript/close_on_esc.js');
 $page->run();
 
 ?>

diff --git a/htdocs/fiche_referent.php b/htdocs/fiche_referent.php
index b2d876f..b7107a6 100644 (file)
--- a/htdocs/fiche_referent.php
+++ b/htdocs/fiche_referent.php
@@ -89,6 +89,7 @@ $res = $globals->xdb->query(
       LEFT JOIN  geoloc_pays AS gp ON(m.pid = gp.a2)
           WHERE  uid = {?}", $user_id);
 $page->assign('pays', $res->fetchColumn());
-$page->run();
 
+$page->addJsLink('javascript/close_on_esc.js');
+$page->run();
 ?>

diff --git a/htdocs/javascript/close_on_esc.js b/htdocs/javascript/close_on_esc.js
index 588260d..f4f3d87 100644 (file)
--- a/htdocs/javascript/close_on_esc.js
+++ b/htdocs/javascript/close_on_esc.js
@@ -1,11 +1,31 @@
+/***************************************************************************
+ *  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                *
+ ***************************************************************************/
+
 function closePopup() {
-  window.close();
+    window.close();
 }
 if (navigator.appName=="Microsoft Internet Explorer") {
-  function keyboardIE() { if (event.keyCode == 27) closePopup(); };
-  document.onkeydown = keyboardIE;
+    function keyboardIE() { if (event.keyCode == 27) closePopup(); };
+    document.onkeydown = keyboardIE;
 } else {
-  function keyboardOther(e) { if (e.keyCode == 27) closePopup(); };
-  document.onkeydown = keyboardOther;
+    function keyboardOther(e) { if (e.keyCode == 27) closePopup(); };
+    document.onkeydown = keyboardOther;
 }
 

diff --git a/templates/fiche.tpl b/templates/fiche.tpl
index f9993a5..feefb32 100644 (file)
--- a/templates/fiche.tpl
+++ b/templates/fiche.tpl
@@ -24,8 +24,6 @@ function chgMainWinLoc( strPage ) {
   parent.opener.document.location = strPage;
 }
 </script>
-<script type="text/javascript" src="javascript/close_on_esc.js">
-</script>
 {/literal}
 
 <table id="fiche" cellpadding="0" cellspacing="0">
@@ -38,11 +36,11 @@ function chgMainWinLoc( strPage ) {
           <img src="images/vcard.png" alt="Afficher la carte de visite" title="Afficher la carte de visite"/>
         </a>
         {if !$x.is_contact}
-        <a href="javascript:x()"  onclick="chgMainWinLoc('{"carnet/mescontacts.php"|url}?action=ajouter&amp;user={$x.forlife}')">
+        <a href="javascript:x()"  onclick="chgMainWinLoc('{rel}/carnet/mescontacts.php?action=ajouter&amp;user={$x.forlife}')">
           <img src="images/ajouter.gif" alt="Ajouter à mes contacts" title="Ajouter à mes contacts" />
         </a>
         {else}
-        <a href="javascript:x()"  onclick="chgMainWinLoc('{"carnet/mescontacts.php"|url}?action=retirer&amp;user={$x.forlife}')">
+        <a href="javascript:x()"  onclick="chgMainWinLoc('{rel}/carnet/mescontacts.php?action=retirer&amp;user={$x.forlife}')">
           <img src="images/retirer.gif" alt="Retirer de mes contacts" title="Retirer de mes contacts" />
         </a>
         {/if}

diff --git a/templates/password_prompt.tpl b/templates/password_prompt.tpl
index fe487b6..6a54523 100644 (file)
--- a/templates/password_prompt.tpl
+++ b/templates/password_prompt.tpl
@@ -61,7 +61,7 @@ Si tu n'es pas {insert name="getName"}, change le login ci-dessous, ou rends-toi
 <br />
 
 <form action="{$smarty.server.REQUEST_URI}" method="post" id="login" onsubmit="doChallengeResponse(); return false;">
-  <table class="tinybicol" cellpadding="4" summary="Formulaire de login">
+  <table class="bicol" cellpadding="4" summary="Formulaire de login">
     <tr>
       <th colspan="2">Connexion</th>
     </tr>