From: x2003bruneau <x2003bruneau@839d8a87-29fc-0310-9880-83ba4fa771e5>
Date: Thu, 30 Nov 2006 18:33:17 +0000 (+0000)
Subject: Backport
X-Git-Tag: xorg/0.9.13~246
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;ds=sidebyside;h=cbdc323db7013347fa034adee91b38c7dee52634;p=platal.git

Backport


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

diff --git a/ChangeLog b/ChangeLog
index 5bf48a8..920450c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,9 @@ From 0.9.12 branch:
     * Search:
         - #566: Fix accent detection                                       -FRU
 
+    * Xnet:
+        - #574: Fix subscription link customization                        -FRU
+
 ================================================================================
 VERSION 0.9.12                                                        25 11 2006
 
diff --git a/htdocs/images/icons/resultset_next.gif b/htdocs/images/icons/resultset_next.gif
new file mode 100644
index 0000000..b71a4f7
Binary files /dev/null and b/htdocs/images/icons/resultset_next.gif differ
diff --git a/templates/xnet/groupe/asso.tpl b/templates/xnet/groupe/asso.tpl
index ac9f43a..187000d 100644
--- a/templates/xnet/groupe/asso.tpl
+++ b/templates/xnet/groupe/asso.tpl
@@ -65,7 +65,7 @@
       M'inscrire :
     </td>
     <td>
-      <a href="{$platal->ns}subscribe">m'inscrire</a>
+      <a href="{if $asso.sub_url}{$asso.sub_url}{else}{$platal->ns}subscribe{/if}">m'inscrire</a>
     </td>
   </tr>
   {/if}