X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fxnetgrp%2Fasso.tpl;h=9aef3ffa6e9c2c5790a963307ae4d136c18fc5f8;hb=1dc71da137a384e771723b8a893539a7f5cc9fab;hp=4175ea828201922229bb759341ee177668a269c3;hpb=756ff73fbb0cdd01cce2eda27ba18e1cc99bd735;p=platal.git

diff --git a/templates/xnetgrp/asso.tpl b/templates/xnetgrp/asso.tpl
index 4175ea8..9aef3ff 100644
--- a/templates/xnetgrp/asso.tpl
+++ b/templates/xnetgrp/asso.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -26,7 +26,7 @@
   {if $asso.site}
   <tr>
     <td class="titre">
-      Site Web:
+      Site Web&nbsp;:
     </td>
     <td><a href="{$asso.site}">{$asso.site}</a></td>
   </tr>
@@ -35,11 +35,11 @@
   {if $asso.resp || $asso.mail}
   <tr>
     <td class="titre">
-      Contact:
+      Contact&nbsp;:
     </td>
     <td>
       {if $asso.mail}
-      {mailto address=$asso.mail text=$asso.resp|utf8_decode|default:"par mail" encode=javascript}
+      {mailto address=$asso.mail text=$asso.resp|utf8_decode|default:"par email" encode=javascript}
       {else}
       {$asso.resp}
       {/if}
@@ -50,7 +50,7 @@
   {if $asso.forum}
   <tr>
     <td class="titre">
-      Forum:
+      Forum&nbsp;:
     </td>
     <td>
       <a href="{$platal->ns}forum">par le web</a>
@@ -86,16 +86,20 @@
     </td>
   </tr>
   {/if}
+
+  {if $is_admin && $requests}
+  <tr>
+    <td class="titre center" colspan="2">
+      <a href="{$platal->ns}subscribe/valid">{$requests} demande{if $requests gt 1}s{/if} d'inscription en attente</a>
+    </td>
+  </tr>
+  {/if}
 </table>
 
 <br />
 
 <div style="text-align: justify">
-  {if $asso.wiki_desc}
   {$asso.descr|miniwiki:title|smarty:nodefaults}
-  {else}
-  {$asso.descr|smarty:nodefaults}
-  {/if}
 </div>
 
 <br />
@@ -105,7 +109,7 @@
   <tr>
     <th>
       {if $smarty.session.core_rss_hash}
-      <a href='{$platal->ns}rss/{$smarty.session.forlife}/{$smarty.session.core_rss_hash}/rss.xml' style="display:block;float:right">
+      <a href='{$platal->ns}rss/{$smarty.session.hruid}/{$smarty.session.core_rss_hash}/rss.xml' style="display:block;float:right">
         {icon name=feed title='fil rss'}
       </a>
       {else}