replace more icons

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

diff --git a/htdocs.net/images/ajouter.gif b/htdocs.net/images/ajouter.gif
deleted file mode 120000 (symlink)
index 17c3617..0000000
--- a/htdocs.net/images/ajouter.gif
+++ /dev/null
@@ -1 +0,0 @@
-../../htdocs/images/ajouter.gif
\ No newline at end of file

diff --git a/htdocs.net/images/icons b/htdocs.net/images/icons
new file mode 120000 (symlink)
index 0000000..1800b20
--- /dev/null
+++ b/htdocs.net/images/icons
@@ -0,0 +1 @@
+../../htdocs/images/icons
\ No newline at end of file

diff --git a/htdocs.net/images/loupe.gif b/htdocs.net/images/loupe.gif
deleted file mode 120000 (symlink)
index 3a262aa..0000000
--- a/htdocs.net/images/loupe.gif
+++ /dev/null
@@ -1 +0,0 @@
-../../htdocs/images/loupe.gif
\ No newline at end of file

diff --git a/htdocs.net/images/retirer.gif b/htdocs.net/images/retirer.gif
deleted file mode 120000 (symlink)
index dea5bf7..0000000
--- a/htdocs.net/images/retirer.gif
+++ /dev/null
@@ -1 +0,0 @@
-../../htdocs/images/retirer.gif
\ No newline at end of file

diff --git a/htdocs.net/images/vcard.png b/htdocs.net/images/vcard.png
deleted file mode 120000 (symlink)
index 2e74156..0000000
--- a/htdocs.net/images/vcard.png
+++ /dev/null
@@ -1 +0,0 @@
-../../htdocs/images/vcard.png
\ No newline at end of file

diff --git a/htdocs/images/icons/group.gif b/htdocs/images/icons/group.gif
new file mode 100644 (file)
index 0000000..85619a2
Binary files /dev/null and b/htdocs/images/icons/group.gif differ

diff --git a/htdocs/images/icons/user_suit.gif b/htdocs/images/icons/user_suit.gif
new file mode 100644 (file)
index 0000000..e0333f1
Binary files /dev/null and b/htdocs/images/icons/user_suit.gif differ

diff --git a/htdocs/images/icons/vcard.gif b/htdocs/images/icons/vcard.gif
new file mode 100644 (file)
index 0000000..fc618e3
Binary files /dev/null and b/htdocs/images/icons/vcard.gif differ

diff --git a/htdocs/images/vcard.png b/htdocs/images/vcard.png
deleted file mode 100644 (file)
index b3efd6b..0000000
Binary files a/htdocs/images/vcard.png and /dev/null differ

diff --git a/modules/banana/banana.inc.php b/modules/banana/banana.inc.php
index ddc4801..2a7ac14 100644 (file)
--- a/modules/banana/banana.inc.php
+++ b/modules/banana/banana.inc.php
@@ -27,7 +27,7 @@ function hook_formatDisplayHeader($_header, $_text) {
         $id = $banana->post->headers['x-org-id'];
         $_text = formatFrom($_text);
         return $_text . ' <a href="profile/' . $id . '" class="popup2" title="' . $id . '">'
-             . '<img src="images/loupe.gif" alt="fiche" title="fiche" /></a>';
+             . '<img src="images/icons/user_suit.gif" title="fiche" /></a>';
     }
 }
 

diff --git a/plugins/function.display_address.php b/plugins/function.display_address.php
index ce7da5f..05268b5 100644 (file)
--- a/plugins/function.display_address.php
+++ b/plugins/function.display_address.php
@@ -31,7 +31,7 @@ function smarty_function_display_address($param, &$smarty) {
 
     $lines = explode("\n",$txtad);
     $txthtml = "";
-    $map = "<a href=\"http://maps.google.com/?q=".urlencode(implode(", ", $lines))."\"><img src=\"images/loupe.gif\" alt=\"Carte\" title=\"Carte\"/></a>";
+    $map = "<a href=\"http://maps.google.com/?q=".urlencode(implode(", ", $lines))."\"><img src=\"images/icons/user_suit.gif\" title=\"Carte\"/></a>";
     if ($param['titre'])
     {
         if ($param['titre_div'])

diff --git a/templates/fiche.tpl b/templates/fiche.tpl
index 9362762..5057fa1 100644 (file)
--- a/templates/fiche.tpl
+++ b/templates/fiche.tpl
@@ -44,9 +44,8 @@ function chgMainWinLoc( strPage ) {
         {$x.prenom} {if $x.nom_usage eq ""}{$x.nom}{else}{$x.nom_usage} ({$x.nom}){/if}
         {if $logged}
         {if $x.nickname} (aka {$x.nickname}){/if} 
-        <a href="vcard/{$x.forlife}.vcf">
-          <img src="images/vcard.png" alt="Afficher la carte de visite" title="Afficher la carte de visite"/>
-        </a>
+        <a href="vcard/{$x.forlife}.vcf">{*
+          *}{icon name=vcard title="Afficher la carte de visite"}</a>
         {if !$x.is_contact}
         <a href="javascript:x()"  onclick="chgMainWinLoc('carnet/contacts?action=ajouter&amp;user={$x.forlife}')">
           {icon name=add title="Ajouter à mes contacts"}</a>

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index 9bf612d..12c7cf1 100644 (file)
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -57,10 +57,10 @@
       {/if}
     {elseif $c.wasinscrit}
         <a href="profile/{$c.forlife}" class="popup2">{*
-        *}<img src="images/loupe.gif" alt="Afficher la fiche" title="Afficher la fiche" /></a>
+        *}{icon name=user_suit title="Afficher la fiche"}</a>
       {if !$c.dcd}
         <a href="vcard/{$c.forlife}.vcf">{*
-        *}<img src="images/vcard.png" alt="Afficher la carte de visite" title="Afficher la carte de visite" /></a>
+        *}{icon name=vcard title="Afficher la carte de visite"}</a>
       {if $show_action eq ajouter}
         <a href="carnet/contacts?action={$show_action}&amp;user={$c.forlife}">{*
         *}{icon name=add title="Ajouter à mes contacts"}</a>

diff --git a/templates/listes/moderate.tpl b/templates/listes/moderate.tpl
index bef65e1..612a111 100644 (file)
--- a/templates/listes/moderate.tpl
+++ b/templates/listes/moderate.tpl
@@ -37,7 +37,7 @@
   <tr class='{cycle values="pair,impair"}'>
     <td>{$s.name}{if $s.login}
       <a href="profile/{$s.login}" class="popup2">{*
-        *}<img src="images/loupe.gif" alt="Afficher la fiche" title="Afficher la fiche" /></a>
+        *}{icon name=user_suit title="Afficher la fiche"}</a>
       {/if}
     </td>
     <td>{$s.addr}</td>

diff --git a/templates/referent.tpl b/templates/referent.tpl
index 1c9f683..2f3c5d5 100644 (file)
--- a/templates/referent.tpl
+++ b/templates/referent.tpl
@@ -55,7 +55,7 @@ d'
     <div class="bits" style="width: 40%;">
       <span class='smaller'>
       <a href="profile/{$p.bestalias}" class="popup2">
-        <img src="images/loupe.gif" alt="voir sa fiche" title="Voir sa fiche" /></a> - 
+        {icon name=user_suit title="Voir sa fiche"}</a> -
         <a href="referent/{$p.bestalias}" class="popup2">Voir sa fiche référent</a>
       </span>
     </div>

diff --git a/templates/xnet/groupe/annuaire.tpl b/templates/xnet/groupe/annuaire.tpl
index 89b6372..2218d9a 100644 (file)
--- a/templates/xnet/groupe/annuaire.tpl
+++ b/templates/xnet/groupe/annuaire.tpl
@@ -63,8 +63,8 @@ Fonctionnalit
     <td>{$m.promo}</td>
     <td>
       {if $m.x}
-      <a href="https://www.polytechnique.org/profile/{$m.email}"><img src="images/loupe.gif" alt="[fiche]" /></a>
-      <a href="https://www.polytechnique.org/vcard/{$m.email}.vcf"><img src="images/vcard.png" alt="[vcard]" /></a>
+      <a href="https://www.polytechnique.org/profile/{$m.email}">{icon name=user_suit title="fiche"}</a>
+      <a href="https://www.polytechnique.org/vcard/{$m.email}.vcf">{icon name=vcard title="[vcard]"}</a>
       <a href="mailto:{$m.email}@polytechnique.org"><img src="images/mail.png" alt="mail" /></a>
       {else}
       <a href="mailto:{$m.email}"><img src="images/mail.png" alt="mail" /></a>

diff --git a/templates/xnet/groupe/membres-edit.tpl b/templates/xnet/groupe/membres-edit.tpl
index a934ad7..64cc26b 100644 (file)
--- a/templates/xnet/groupe/membres-edit.tpl
+++ b/templates/xnet/groupe/membres-edit.tpl
@@ -30,7 +30,7 @@
   Édition du profil de {$user.prenom} {$user.nom}
   {if $user.origine eq 'X'}
   (X{$user.promo})
-  <a href="https://www.polytechnique.org/profile/{$user.alias}"><img src="images/loupe.gif" alt="Voir la fiche" /></a>
+  <a href="https://www.polytechnique.org/profile/{$user.alias}">{icon name=user_suit title="fiche"}</a>
   {/if}
   <a href="{$platal->ns}member/del/{$user.email}"><img src="images/del.png" alt="Suppression du compte" /></a>
   <a href="mailto:{$user.email}"><img src="images/mail.png" alt="Ecrire un mail" /></a>

diff --git a/templates/xnet/groupe/telepaiement.tpl b/templates/xnet/groupe/telepaiement.tpl
index a781b93..0c3c696 100644 (file)
--- a/templates/xnet/groupe/telepaiement.tpl
+++ b/templates/xnet/groupe/telepaiement.tpl
@@ -51,7 +51,7 @@ Voici la liste des paiements en ligne possible pour le groupe {$asso.nom}
         <td class="center">{$p.date|date_format:"%d/%m/%y"}</td>
         <td>
           {$p.prenom} {$p.nom}
-          <a href="https://www.polytechnique.org/profile/{$p.alias}"><img alt="[fiche]" title="Voir sa fiche" src="images/loupe.gif"/></a>
+          <a href="https://www.polytechnique.org/profile/{$p.alias}">{icon name=user_suit title="fiche"}</a>
           <a href="mailto:{$p.alias}@polytechnique.org"><img alt="[mail]" title="Lui envoyer un mail" src="images/mail.png"/></a>
         </td>
         <td class="center">X {$p.promo}</td>

diff --git a/templates/xnetevents/admin.tpl b/templates/xnetevents/admin.tpl
index 9c25c46..4908aad 100644 (file)
--- a/templates/xnetevents/admin.tpl
+++ b/templates/xnetevents/admin.tpl
@@ -84,8 +84,8 @@ Ils ont pay
     </td>
     <td>{$m.promo}</td>
     <td>
-      <a href="https://www.polytechnique.org/profile/{$m.email}"><img src="images/loupe.gif" alt="[fiche]" /></a>
-      <a href="https://www.polytechnique.org/vcard/{$m.email}.vcf"><img src="images/vcard.png" alt="[vcard]" /></a>
+      <a href="https://www.polytechnique.org/profile/{$m.email}">{icon name=user_suit title="fiche"}</a>
+      <a href="https://www.polytechnique.org/vcard/{$m.email}.vcf">{icon name=vcard title="vcard"}</a>
       <a href="mailto:{$m.email}@polytechnique.org"><img src="images/mail.png" alt="mail" /></a>
     </td>
     <td>{$m.montant}</td>
@@ -129,8 +129,8 @@ Ils ont pay
     <td>{$m.promo}</td>
     <td>
       {if $m.x}
-      <a href="https://www.polytechnique.org/profile/{$m.email}"><img src="images/loupe.gif" alt="[fiche]" /></a>
-      <a href="https://www.polytechnique.org/vcard/{$m.email}.vcf"><img src="images/vcard.png" alt="[vcard]" /></a>
+      <a href="https://www.polytechnique.org/profile/{$m.email}">{icon name=user_suit title="fiche"}</a>
+      <a href="https://www.polytechnique.org/vcard/{$m.email}.vcf">{icon name=vcard title="vcard"}</a>
       <a href="mailto:{$m.email}@polytechnique.org"><img src="images/mail.png" alt="mail" /></a>
       {else}
       <a href="mailto:{$m.email}"><img src="images/mail.png" alt="mail"></a>

diff --git a/templates/xnetevents/index.tpl b/templates/xnetevents/index.tpl
index 6dbe8af..c192147 100644 (file)
--- a/templates/xnetevents/index.tpl
+++ b/templates/xnetevents/index.tpl
@@ -30,7 +30,7 @@
 
 {foreach from=$evenements item=e}
 
-<table class="bicol" cellspacing="0" cellpadding="0" {popup caption=$e.intitule text=$e.descriptif}>
+<table class="bicol" cellspacing="0" cellpadding="0">
   <colgroup>
     <col width='25%' />
   </colgroup>
@@ -82,7 +82,7 @@
       {if $admin || $e.show_participants}
       <a href="{$platal->ns}events/admin/{$e.eid}">
         consulter la liste des participants
-        <img src="images/loupe.gif" title="Liste des participants" alt="" />
+        {icon name=group title="Liste des participants"}
       </a><br />
       {/if}
       {if $e.deadline_inscription}

diff --git a/templates/xnetevents/subscribe.tpl b/templates/xnetevents/subscribe.tpl
index 7bb0747..a3df7d5 100644 (file)
--- a/templates/xnetevents/subscribe.tpl
+++ b/templates/xnetevents/subscribe.tpl
@@ -61,8 +61,7 @@
   Tu peux 
   <a href="{$platal->ns}events/admin/{$event.eid}">
     consulster liste des participants
-    <img src="images/loupe.gif" title="Liste des participants" alt="Liste des participants" />
-  </a>
+    {icon name=group title="Liste des participants"}</a>
   déjà inscrits.
 </p>
 {/if}