X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fxnetgrp%2Fasso.tpl;h=12dc248f52bb5e6d05d1b0bc2cbbfc94eba72ede;hb=76362eeb011de4f2cd7825f557643a72494475f9;hp=4ec01b0f15459ebf1cd4a50702119a7b5096aa61;hpb=be638e733bce413df4324d985297d9a4d94dcbca;p=platal.git

diff --git a/templates/xnetgrp/asso.tpl b/templates/xnetgrp/asso.tpl
index 4ec01b0..12dc248 100644
--- a/templates/xnetgrp/asso.tpl
+++ b/templates/xnetgrp/asso.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2011 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,52 +20,65 @@
 {*                                                                        *}
 {**************************************************************************}
 
-<h1>{$asso.nom}&nbsp;: Accueil</h1>
+<h1>{$asso->nom}&nbsp;: Accueil</h1>
 
 <table cellpadding="0" cellspacing="0" class='tiny'>
-  {if $asso.site}
+  {if $asso->site}
   <tr>
     <td class="titre">
       Site Web&nbsp;:
     </td>
-    <td><a href="{$asso.site}">{$asso.site}</a></td>
+    <td><a href="{$asso->site}">{$asso->site}</a></td>
   </tr>
   {/if}
 
-  {if $asso.resp || $asso.mail}
+  {if $asso->resp || $asso->mail}
   <tr>
     <td class="titre">
       Contact&nbsp;:
     </td>
     <td>
-      {if $asso.mail}
-      {mailto address=$asso.mail text=$asso.resp|utf8_decode|default:"par email" encode=javascript}
+      {if $asso->mail}
+      {mailto address=$asso->mail text=$asso->resp|utf8_decode|default:"par email" encode=javascript}
       {else}
-      {$asso.resp}
+      {$asso->resp}
       {/if}
     </td>
   </tr>
   {/if}
 
-  {if $asso.forum}
+  {if $asso->positions|count}
+  <tr>
+    <td class="titre">
+      Bureau&nbsp;:
+    </td>
+    <td>
+      {foreach from=$asso->positions item=position}
+      <em>&bull;&nbsp;{$position.position}&nbsp;:</em> {profile user=$position.uid promo=true}<br />
+      {/foreach}
+    </td>
+  </tr>
+  {/if}
+
+  {if $asso->forum}
   <tr>
     <td class="titre">
       Forum&nbsp;:
     </td>
     <td>
       <a href="{$platal->ns}forum">par le web</a>
-      ou <a href="news://ssl.polytechnique.org/{$asso.forum}">par nntp</a>
+      ou <a href="news://ssl.polytechnique.org/{$asso->forum}">par nntp</a>
     </td>
   </tr>
   {/if}
 
-  {if !$is_member && $is_logged && $asso.inscriptible && $xnet_type != 'promotions'}
+  {if !$is_member && $is_logged && $asso->inscriptible && $xnet_type != 'promotions'}
   <tr>
     <td class="titre">
       M'inscrire&nbsp;:
     </td>
     <td>
-      <a href="{if $asso.sub_url}{$asso.sub_url}{else}{$platal->ns}subscribe{/if}">m'inscrire</a>
+      <a href="{if $asso->sub_url}{$asso->sub_url}{else}{$platal->ns}subscribe{/if}">m'inscrire</a>
     </td>
   </tr>
   {elseif $is_member}
@@ -74,15 +87,15 @@
       Me désinscrire&nbsp;:
     </td>
     <td>
-      <a href="{if $asso.unsub_url}{$asso.unsub_url}{else}{$platal->ns}unsubscribe{/if}">me désinscrire</a>
+      <a href="{if $asso->unsub_url}{$asso->unsub_url}{else}{$platal->ns}unsubscribe{/if}">me désinscrire</a>
     </td>
   </tr>
   {/if}
 
-  {if $asso.ax}
+  {if $asso->ax}
   <tr>
     <td class="titre center" colspan="2">
-      groupe agréé par l'AX
+      groupe agréé par l'AX {if $asso->axDate}le {$asso->axDate}{/if}
     </td>
   </tr>
   {/if}
@@ -99,21 +112,17 @@
 <br />
 
 <div style="text-align: justify">
-  {if $asso.wiki_desc}
-  {$asso.descr|miniwiki:title|smarty:nodefaults}
-  {else}
-  {$asso.descr|smarty:nodefaults}
-  {/if}
+  {$asso->descr|miniwiki:title|smarty:nodefaults}
 </div>
 
 <br />
 
-{if $article_index && $article_index->total()}
+{if t($article_index) && $article_index->total()}
 <table class="tinybicol">
   <tr>
     <th>
-      {if $smarty.session.token}
-      <a href='{$platal->ns}rss/{$smarty.session.hruid}/{$smarty.session.token}/rss.xml' style="display:block;float:right">
+      {if $smarty.session.user->token}
+      <a href='{$platal->ns}rss/{$smarty.session.hruid}/{$smarty.session.user->token}/rss.xml' style="display:block;float:right">
         {icon name=feed title='fil rss'}
       </a>
       {else}
@@ -126,7 +135,7 @@
   </tr>
   {iterate item=art from=$article_index}
   <tr>
-    <td>&bull; 
+    <td>&bull;
     {if $art.nonlu}
       <a href="{$platal->ns}#art{$art.id}"><strong>
     {else}