skin and typos

diff --git a/htdocs/css/sharky.css b/htdocs/css/sharky.css
index 6e35ce5..29bf2ad 100644 (file)
--- a/htdocs/css/sharky.css
+++ b/htdocs/css/sharky.css
@@ -66,6 +66,16 @@ table.bicol th {
         [ Styles liés à l'affichage de contacts ]
 *******************************************************************************/
 
+div.contact-list div.contact {
+    border-top: 1px solid #305070;
+    background: #80a0c0;
+    color: inherit;
+}
+
+div.contact div.long {
+    background: #99b9d0;
+    color: inherit;
+}
 
 /*******************************************************************************
     6   Profil
@@ -100,7 +110,7 @@ table.bicol th {
 #body-menu {
     border-left: 1px solid #305070;
     border-right: 1px solid #305070;
-    background-image: url("images/sk_sharky_bubbles.png");
+    background-image: url("/images/sk_sharky_bubbles.png");
     background-position: 0px 100px;
     background-repeat: repeat-y;
 }
@@ -118,4 +128,4 @@ table.bicol th {
 }
 
 /* vim: set et ts=4 sts=4 sw=4: */
-/* $Id: sharky.css,v 1.1 2004-08-29 15:46:53 x2000habouzit Exp $ */
+/* $Id: sharky.css,v 1.2 2004-08-29 16:02:39 x2000habouzit Exp $ */

diff --git a/templates/include/form.valid.aliases.tpl b/templates/include/form.valid.aliases.tpl
index 900c023..b2e93f5 100644 (file)
--- a/templates/include/form.valid.aliases.tpl
+++ b/templates/include/form.valid.aliases.tpl
@@ -1,4 +1,4 @@
-{* $Id: form.valid.aliases.tpl,v 1.6 2004-08-25 09:43:59 x2000habouzit Exp $ *}
+{* $Id: form.valid.aliases.tpl,v 1.7 2004-08-29 16:02:40 x2000habouzit Exp $ *}
 
 <form action="{$smarty.server.PHP_SELF}" method="post">
 <table class="bicol" cellpadding="4" summary="Demande d'alias">
@@ -6,7 +6,7 @@
   <td>Demandeur&nbsp;:
   </td>
   <td>
-    <a href="javascript:x()" onclick="popWin('{"x.php?x=$valid->username"|url}')">
+    <a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$valid->username}')">
     {$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 1318a0e..130c973 100644 (file)
--- a/templates/include/form.valid.epouses.tpl
+++ b/templates/include/form.valid.epouses.tpl
@@ -1,11 +1,11 @@
-{* $Id: form.valid.epouses.tpl,v 1.4 2004-08-25 09:43:59 x2000habouzit Exp $ *}
+{* $Id: form.valid.epouses.tpl,v 1.5 2004-08-29 16:02:40 x2000habouzit Exp $ *}
 
 <form action="{$smarty.server.PHP_SELF}" method="post">
   <table class="bicol" cellpadding="4" summary="Demande d'alias d'épouse">
     <tr>
       <td>Demandeur&nbsp;:</td>
       <td>
-        <a href="javascript:x()" onclick="popWin('/x.php?x={$valid->username}')">
+        <a href="javascript:x()" onclick="popWin('/fiche.php?user={$valid->username}')">
           {$valid->prenom} {$valid->nom}
         </a>
         {if $valid->oldepouse}({$valid->oldepouse} - {$valid->oldalias}){/if}

diff --git a/templates/include/form.valid.evts.tpl b/templates/include/form.valid.evts.tpl
index d68eb96..ab7a6de 100644 (file)
--- a/templates/include/form.valid.evts.tpl
+++ b/templates/include/form.valid.evts.tpl
@@ -1,4 +1,4 @@
-{* $Id: form.valid.evts.tpl,v 1.4 2004-08-25 09:43:59 x2000habouzit Exp $ *}
+{* $Id: form.valid.evts.tpl,v 1.5 2004-08-29 16:02:40 x2000habouzit Exp $ *}
 
 <form action="{$smarty.server.PHP_SELF}" method="post" name="modif">
   <table class="bicol">
@@ -7,7 +7,7 @@
     </tr>
     <tr>
       <td>
-        Posté par <a href="javascript:x()"  onclick="popWin('{"x.php?x=$valid->username"|url}">
+        Posté par <a href="javascript:x()"  onclick="popWin('{"fiche.php"|url}?user={$valid->username}">
           {$valid->prenom} {$valid->nom} (X{$valid->promo})
         </a>
         [<a href="mailto:{$valid->username}@polytechnique.org">lui écrire</a>]

diff --git a/templates/include/form.valid.ml.tpl b/templates/include/form.valid.ml.tpl
index f57d6e9..48383c9 100644 (file)
--- a/templates/include/form.valid.ml.tpl
+++ b/templates/include/form.valid.ml.tpl
@@ -1,11 +1,11 @@
-{* $Id: form.valid.ml.tpl,v 1.5 2004-08-25 09:43:59 x2000habouzit Exp $ *}
+{* $Id: form.valid.ml.tpl,v 1.6 2004-08-29 16:02:40 x2000habouzit Exp $ *}
 
 <form action="{$smarty.server.PHP_SELF}" method="post">
   <table class="bicol">
     <tr>
       <td>Demandeur&nbsp;:</td>
       <td>
-        <a href="javascript:x()" onclick="popWin('/x.php?x={$valid->username}')">
+        <a href="javascript:x()" onclick="popWin('/fiche.php?user={$valid->username}')">
           {$valid->prenom} {$valid->nom}
         </a>
       </td>

diff --git a/templates/include/form.valid.photos.tpl b/templates/include/form.valid.photos.tpl
index 901fb08..d01d724 100644 (file)
--- a/templates/include/form.valid.photos.tpl
+++ b/templates/include/form.valid.photos.tpl
@@ -1,10 +1,10 @@
-{* $Id: form.valid.photos.tpl,v 1.5 2004-08-25 09:43:59 x2000habouzit Exp $ *}
+{* $Id: form.valid.photos.tpl,v 1.6 2004-08-29 16:02:40 x2000habouzit Exp $ *}
 
 <form action="{$smarty.server.PHP_SELF}" method="post">
 <table class="bicol" summary="Demande d'alias">
 <tr>
   <td>Demandeur&nbsp;:</td>
-  <td><a href="javascript:x()" onclick="popWin('{"x.php?x=$valid->username"|url}')">
+  <td><a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$valid->username}')">
       {$valid->prenom} {$valid->nom}
       </a>
   </td>

diff --git a/templates/include/form.valid.sondages.tpl b/templates/include/form.valid.sondages.tpl
index 6c91596..be72ad4 100644 (file)
--- a/templates/include/form.valid.sondages.tpl
+++ b/templates/include/form.valid.sondages.tpl
@@ -1,11 +1,11 @@
-{* $Id: form.valid.sondages.tpl,v 1.5 2004-08-25 09:43:59 x2000habouzit Exp $ *}
+{* $Id: form.valid.sondages.tpl,v 1.6 2004-08-29 16:02:40 x2000habouzit Exp $ *}
 
 <form action="{$smarty.server.PHP_SELF}" method="post">
 <table class="bicol" cellpadding="4" summary="Sondage">
 <tr>
   <td>Demandeur&nbsp;:
   </td>
-  <td><a href="javascript:x()" onclick="popWin('{"x.php?x=$valid->username"|url}')">
+  <td><a href="javascript:x()" onclick="popWin('{"fiche.php"|url}?user={$valid->username}')">
       {$valid->prenom} {$valid->nom}</a>
     {if $valid->old}({$valid->old}){/if}
   </td>

diff --git a/templates/include/x_inscrit.tpl b/templates/include/x_inscrit.tpl
index add212c..c3ab669 100644 (file)
--- a/templates/include/x_inscrit.tpl
+++ b/templates/include/x_inscrit.tpl
@@ -1,4 +1,4 @@
-{* $Id: x_inscrit.tpl,v 1.4 2004-08-24 12:23:41 x2000habouzit Exp $ *}
+{* $Id: x_inscrit.tpl,v 1.5 2004-08-29 16:02:40 x2000habouzit Exp $ *}
 
 <div class="contact">
   <div class="nom">
@@ -18,7 +18,7 @@
     {/strip}
   </div>
   <div class="bits">
-    <a href="javascript:x()" onclick="popWin('x.php?x={$c.username}')">
+    <a href="javascript:x()" onclick="popWin('fiche.php?user={$c.username}')">
       <img src="images/loupe.gif" alt="Afficher les détails" />
     </a>
     <a href="vcard.php/{$c.username}.vcf?x={$c.username}">

diff --git a/templates/login.tpl b/templates/login.tpl
index 24ccd70..afb5b41 100644 (file)
--- a/templates/login.tpl
+++ b/templates/login.tpl
@@ -1,4 +1,4 @@
-{* $Id: login.tpl,v 1.6 2004-08-26 14:44:43 x2000habouzit Exp $ *}
+{* $Id: login.tpl,v 1.7 2004-08-29 16:02:39 x2000habouzit Exp $ *}
 
 {if $date}
   <div class="rubrique">
@@ -28,7 +28,7 @@
   
 {dynamic on="0$fiche_incitation"}
   <p>La dernière mise à jour de ta
-  <a href="javascript:x()" onclick="popWin('x.php?x={$smarty.session.username}">fiche</a>
+  <a href="javascript:x()" onclick="popWin('fiche.php?user={$smarty.session.username}">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>
@@ -70,7 +70,7 @@
         {$ev.texte|nl2br}
         <br />
         <p class="smaller">Annonce proposée par
-        <a href="javascript:x()" onclick="popWin('x.php?x={$ev.username}')">
+        <a href="javascript:x()" onclick="popWin('fiche.php?user={$ev.username}')">
           {$ev.prenom} {$ev.nom} X{$ev.promo}
         </a>
         </p>

diff --git a/templates/marketing/ins_confirmees.tpl b/templates/marketing/ins_confirmees.tpl
index 62fd05a..b4127cb 100644 (file)
--- a/templates/marketing/ins_confirmees.tpl
+++ b/templates/marketing/ins_confirmees.tpl
@@ -1,4 +1,4 @@
-{* $Id: ins_confirmees.tpl,v 1.3 2004-08-26 14:44:45 x2000habouzit Exp $ *}
+{* $Id: ins_confirmees.tpl,v 1.4 2004-08-29 16:02:40 x2000habouzit Exp $ *}
 
 {dynamic}
 
@@ -15,7 +15,7 @@
       <a href="promo.php?promo={$in.promo}">{$in.promo}</a>
     </td>
     <td>
-      <a href="javascript:x()"  onclick="popWin('{"x.php"|url}?x={$in.username}')">
+      <a href="javascript:x()"  onclick="popWin('{"fiche.php"|url}?user={$in.username}')">
         {$in.nom} {$in.prenom}</a>
     </td>
   </tr>

diff --git a/templates/sendmail.tpl b/templates/sendmail.tpl
index 4a0c9f2..30c3493 100644 (file)
--- a/templates/sendmail.tpl
+++ b/templates/sendmail.tpl
@@ -1,4 +1,4 @@
-{* $Id: sendmail.tpl,v 1.5 2004-08-26 14:44:43 x2000habouzit Exp $ *}
+{* $Id: sendmail.tpl,v 1.6 2004-08-29 16:02:39 x2000habouzit Exp $ *}
 
 {dynamic}
 
@@ -81,7 +81,7 @@
       <input type="checkbox" name="contacts[{$contact.username}]"
       value="{"`$contact.prenom` `$contact.nom` &lt;`$contact.username`@polytechnique.org&gt;"}"
         {if $smarty.request.contacts && $smarty.request.contacts.username}checked="checked"{/if} />
-      <a href="javascript:x()" onclick="popWin('x.php?x={$contact.username}')">{$contact.prenom} {$contact.nom}</a> (X{$contact.promo})
+        <a href="javascript:x()" onclick="popWin('fiche.php?user={$contact.username}')">{$contact.prenom} {$contact.nom}</a> (X{$contact.promo})
     </td>
 {if $key is odd}
   </tr>

diff --git a/templates/trombipromo.tpl b/templates/trombipromo.tpl
index 3b34b2c..499384b 100644 (file)
--- a/templates/trombipromo.tpl
+++ b/templates/trombipromo.tpl
@@ -1,4 +1,4 @@
-{* $Id: trombipromo.tpl,v 1.3 2004-08-26 14:44:43 x2000habouzit Exp $ *}
+{* $Id: trombipromo.tpl,v 1.4 2004-08-29 16:02:39 x2000habouzit Exp $ *}
 
 {dynamic}
 
@@ -61,7 +61,7 @@ chaque page affiche au plus {$limit} photos.
   <tr>
   {/if}
     <td class="center">
-      <a href="javascript:x()" onclick="popWin('x.php?x={$p.username}')">
+      <a href="javascript:x()" onclick="popWin('fiche.php?user={$p.username}')">
         <img src="getphoto.php?x={$p.user_id}" width="110" alt=" [ PHOTO ] " />
       </a>
       {mailto address="`$p.username`@polytechnique.org" text="`$p.prenom`&nbsp;`$p.nom`"}