rework minifiche, should be quite good like this

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

diff --git a/install.d/profile/files b/install.d/profile/files
index 6205783..4e63a13 100644 (file)
--- a/install.d/profile/files
+++ b/install.d/profile/files
@@ -44,7 +44,6 @@ templates/epouse.tpl
 templates/fiche.tpl
 templates/include/form.valid.epouses.tpl
 templates/include/form.valid.photos.tpl
-templates/include/minifiche_pvt.tpl
 templates/include/minifiche.tpl
 templates/profil/adresses.tpl
 templates/profil/emploi.tpl

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index b6702ab..bc5a3f6 100644 (file)
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -21,20 +21,18 @@
 
 {if !$c.inscrit || $c.dcd}<div class='grayed'>{/if}
 <div class="contact" {if $c.inscrit}{min_auth level='cookie'}title="fiche mise à jour le {$c.date|date_format}"{/min_auth}{/if}>
+
   <div class="nom">
     {if $c.sexe}&bull;{/if}
     {min_auth level="cookie"}
-    {if !$c.dcd && $c.inscrit}
-    <a href="{"fiche.php"|url}?user={$c.forlife}" class="popup2">
-    {/if}
+    {if !$c.dcd && $c.inscrit}<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}
     {min_auth level="cookie"}
-    {if !$c.dcd && $c.inscrit}
-    </a>
-    {/if}
+    {if !$c.dcd && $c.inscrit}</a>{/if}
     {/min_auth}
   </div>
+
   <div class="appli">
     {if $c.iso3166}
     <img src='{"images/"|url}flags/{$c.iso3166}.gif' alt='{$c.nat}' height='14' title='{$c.nat}' />&nbsp;
@@ -48,7 +46,83 @@
     {/if}
     {/min_auth}
   </div>
-  {include file="include/minifiche_pvt.tpl"}
+
+  <div class="bits">
+    {min_auth level="cookie"}
+    {if !$c.wasinscrit}
+      {if $show_action eq ajouter}
+        <a href="{rel}/carnet/notifs.php?add_nonins={$c.user_id}">{*
+        *}<img src="{rel}/images/ajouter.gif" alt="Ajouter à la liste de mes surveillances" title="Ajouter à la liste de mes surveillances" /></a>
+      {else}
+        <a href="{rel}/carnet/notifs.php?del_nonins={$c.user_id}">{*
+        *}<img src="{rel}/images/retirer.gif" alt="Retirer de la liste de mes surveillances" title="Retirer de la liste de mes surveillances" /></a>
+      {/if}
+    {elseif !$c.dcd}
+        <a href="{rel}/fiche.php?user={$c.forlife}" class="popup2">{*
+        *}<img src="{rel}/images/loupe.gif" alt="Afficher la fiche" title="Afficher la fiche" /></a>
+        <a href="{rel}/vcard.php/{$c.forlife}.vcf?x={$c.forlife}">{*
+        *}<img src="{rel}/images/vcard.png" alt="Afficher la carte de visite" title="Afficher la carte de visite" /></a>
+        <a href="{rel}/carnet/mescontacts.php?action={$show_action}&amp;user={$c.forlife}">{*
+        *}<img src="{rel}/images/{$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}
+    {/min_auth}
+
+    {perms level='admin'}
+      {if !$c.wasinscrit}
+      <a href="{rel}/marketing/private.php?uid={$c.user_id}">{*
+        *}<img src="{rel}/images/admin.png" alt='admin' title="marketter user" /></a>
+      {elseif !$c.dcd}
+      <a href="{rel}/admin/utilisateurs.php?login={$c.forlife}">{*
+        *}<img src="{rel}/images/admin.png" alt='admin' title="administrer user" /></a>
+      {/if}
+        <a href="http://www.polytechniciens.com/index.php?page=AX_FICHE_ANCIEN&amp;anc_id={$c.matricule_ax}">{*
+        *}<img src="{rel}/images/ax.png" alt='AX' title="fiche AX" /></a>
+    {/perms}
+  </div>
+
+  <div class="long">
+  {if $c.wasinscrit}
+    {if $c.web || $c.mobile || $c.pays || $c.ville || $c.region || $c.entreprise || $c.freetext}
+    <table cellspacing="0" cellpadding="0">
+      {if $c.web}
+      <tr>
+        <td class="lt">Page web:</td>
+        <td class="rt"><a href="{$c.web}">{$c.web}</a></td>
+      </tr>
+      {/if}
+      {if $c.pays || $c.ville}
+      <tr>
+        <td class="lt">Géographie:</td>
+        <td class="rt">{$c.ville}{if $c.ville && $c.pays}, {/if}{$c.pays}</td>
+      </tr>
+      {/if}
+      {if $c.mobile}
+      <tr>
+        <td class="lt">Mobile:</td>
+        <td class="rt">{$c.mobile}</td>
+      </tr>
+      {/if}
+      {if $c.entreprise}
+      <tr>
+        <td class="lt">Profession:</td>
+        <td class="rt">
+          {$c.entreprise} {if $c.secteur}({$c.secteur}){/if}
+          {if $c.fonction}<br />{$c.fonction}{/if}
+        </td>
+      </tr>
+      {/if}
+      {if $c.freetext}
+      <tr>
+        <td class="lt">Commentaire:</td>
+        <td class="rt">{$c.freetext|nl2br}</td>
+      </tr>
+      {/if}
+    </table>
+    {/if}
+  {/if}
+  </div>
+
 </div>
 {if !$c.inscrit || $c.dcd}</div>{/if}
 

diff --git a/templates/include/minifiche_pvt.tpl b/templates/include/minifiche_pvt.tpl
deleted file mode 100644 (file)
index 4008ae9..0000000
--- a/templates/include/minifiche_pvt.tpl
+++ /dev/null
@@ -1,97 +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                *
- ***************************************************************************}
-
-  <div class="bits">
-    {min_auth level="cookie"}
-    {if !$c.wasinscrit}
-      {if $show_action eq ajouter}
-        <a href="{rel}/carnet/notifs.php?add_nonins={$c.user_id}">{*
-        *}<img src="{rel}/images/ajouter.gif" alt="Ajouter à la liste de mes surveillances" title="Ajouter à la liste de mes surveillances" /></a>
-      {else}
-        <a href="{rel}/carnet/notifs.php?del_nonins={$c.user_id}">{*
-        *}<img src="{rel}/images/retirer.gif" alt="Retirer de la liste de mes surveillances" title="Retirer de la liste de mes surveillances" /></a>
-      {/if}
-    {elseif !$c.dcd}
-        <a href="{rel}/fiche.php?user={$c.forlife}" class="popup2">{*
-        *}<img src="{rel}/images/loupe.gif" alt="Afficher la fiche" title="Afficher la fiche" /></a>
-        <a href="{rel}/vcard.php/{$c.forlife}.vcf?x={$c.forlife}">{*
-        *}<img src="{rel}/images/vcard.png" alt="Afficher la carte de visite" title="Afficher la carte de visite" /></a>
-        <a href="{rel}/carnet/mescontacts.php?action={$show_action}&amp;user={$c.forlife}">{*
-        *}<img src="{rel}/images/{$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}
-    {/min_auth}
-
-    {perms level='admin'}
-      {if !$c.wasinscrit}
-      <a href="{rel}/marketing/private.php?uid={$c.user_id}">{*
-        *}<img src="{rel}/images/admin.png" alt='admin' title="marketter user" /></a>
-      {elseif !$c.dcd}
-      <a href="{rel}/admin/utilisateurs.php?login={$c.forlife}">{*
-        *}<img src="{rel}/images/admin.png" alt='admin' title="administrer user" /></a>
-      {/if}
-        <a href="http://www.polytechniciens.com/index.php?page=AX_FICHE_ANCIEN&amp;anc_id={$c.matricule_ax}">{*
-        *}<img src="{rel}/images/ax.png" alt='AX' title="fiche AX" /></a>
-    {/perms}
-  </div>
-
-  <div class="long">
-  {if $c.wasinscrit}
-    {if $c.web || $c.mobile || $c.pays || $c.ville || $c.region || $c.entreprise || $c.freetext}
-    <table cellspacing="0" cellpadding="0">
-      {if $c.web}
-      <tr>
-        <td class="lt">Page web:</td>
-        <td class="rt"><a href="{$c.web}">{$c.web}</a></td>
-      </tr>
-      {/if}
-      {if $c.pays || $c.ville}
-      <tr>
-        <td class="lt">Géographie:</td>
-        <td class="rt">{$c.ville}{if $c.ville && $c.pays}, {/if}{$c.pays}</td>
-      </tr>
-      {/if}
-      {if $c.mobile}
-      <tr>
-        <td class="lt">Mobile:</td>
-        <td class="rt">{$c.mobile}</td>
-      </tr>
-      {/if}
-      {if $c.entreprise}
-      <tr>
-        <td class="lt">Profession:</td>
-        <td class="rt">
-          {$c.entreprise} {if $c.secteur}({$c.secteur}){/if}
-          {if $c.fonction}<br />{$c.fonction}{/if}
-        </td>
-      </tr>
-      {/if}
-      {if $c.freetext}
-      <tr>
-        <td class="lt">Commentaire:</td>
-        <td class="rt">{$c.freetext|nl2br}</td>
-      </tr>
-      {/if}
-    </table>
-    {/if}
-  {/if}
-  </div>
-
-{* vim:set et sw=2 sts=2 sws=2: *}