projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/fusionax' into account
[platal.git]
/
templates
/
xnetgrp
/
asso.tpl
diff --git
a/templates/xnetgrp/asso.tpl
b/templates/xnetgrp/asso.tpl
index
4175ea8
..
41b468f
100644
(file)
--- a/
templates/xnetgrp/asso.tpl
+++ b/
templates/xnetgrp/asso.tpl
@@
-1,6
+1,6
@@
{**************************************************************************}
{* *}
{**************************************************************************}
{* *}
-{* Copyright (C) 2003-200
8
Polytechnique.org *}
+{* Copyright (C) 2003-200
9
Polytechnique.org *}
{* http://opensource.polytechnique.org/ *}
{* *}
{* This program is free software; you can redistribute it and/or modify *}
{* http://opensource.polytechnique.org/ *}
{* *}
{* This program is free software; you can redistribute it and/or modify *}
@@
-20,52
+20,52
@@
{* *}
{**************************************************************************}
{* *}
{**************************************************************************}
-<h1>{$asso
.
nom} : Accueil</h1>
+<h1>{$asso
->
nom} : Accueil</h1>
<table cellpadding="0" cellspacing="0" class='tiny'>
<table cellpadding="0" cellspacing="0" class='tiny'>
- {if $asso
.
site}
+ {if $asso
->
site}
<tr>
<td class="titre">
<tr>
<td class="titre">
- Site Web:
+ Site Web
:
</td>
</td>
- <td><a href="{$asso
.site}">{$asso.
site}</a></td>
+ <td><a href="{$asso
->site}">{$asso->
site}</a></td>
</tr>
{/if}
</tr>
{/if}
- {if $asso
.resp || $asso.
mail}
+ {if $asso
->resp || $asso->
mail}
<tr>
<td class="titre">
<tr>
<td class="titre">
- Contact:
+ Contact
:
</td>
<td>
</td>
<td>
- {if $asso
.
mail}
- {mailto address=$asso
.mail text=$asso.resp|utf8_decode|default:"par
mail" encode=javascript}
+ {if $asso
->
mail}
+ {mailto address=$asso
->mail text=$asso->resp|utf8_decode|default:"par e
mail" encode=javascript}
{else}
{else}
- {$asso
.
resp}
+ {$asso
->
resp}
{/if}
</td>
</tr>
{/if}
{/if}
</td>
</tr>
{/if}
- {if $asso
.
forum}
+ {if $asso
->
forum}
<tr>
<td class="titre">
<tr>
<td class="titre">
- Forum:
+ Forum
:
</td>
<td>
<a href="{$platal->ns}forum">par le web</a>
</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}
</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 :
</td>
<td>
<tr>
<td class="titre">
M'inscrire :
</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}
</td>
</tr>
{elseif $is_member}
@@
-74,38
+74,46
@@
Me désinscrire :
</td>
<td>
Me désinscrire :
</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}
</td>
</tr>
{/if}
- {if $asso
.
ax}
+ {if $asso
->
ax}
<tr>
<td class="titre center" colspan="2">
groupe agréé par l'AX
</td>
</tr>
{/if}
<tr>
<td class="titre center" colspan="2">
groupe agréé par l'AX
</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">
</table>
<br />
<div style="text-align: justify">
- {if $asso
.
wiki_desc}
- {$asso
.
descr|miniwiki:title|smarty:nodefaults}
+ {if $asso
->
wiki_desc}
+ {$asso
->
descr|miniwiki:title|smarty:nodefaults}
{else}
{else}
- {$asso
.
descr|smarty:nodefaults}
+ {$asso
->
descr|smarty:nodefaults}
{/if}
</div>
<br />
{/if}
</div>
<br />
-{if
$article_index
&& $article_index->total()}
+{if
t($article_index)
&& $article_index->total()}
<table class="tinybicol">
<tr>
<th>
<table class="tinybicol">
<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">
+ {if $smarty.session.
token
}
+ <a href='{$platal->ns}rss/{$smarty.session.
hruid}/{$smarty.session.token
}/rss.xml' style="display:block;float:right">
{icon name=feed title='fil rss'}
</a>
{else}
{icon name=feed title='fil rss'}
</a>
{else}