Navigation links.

Signed-off-by: Florent Bruneau <florent.bruneau@polytechnique.org>

diff --git a/classes/user.php b/classes/user.php
index 0e28f2c..4b84c79 100644 (file)
--- a/classes/user.php
+++ b/classes/user.php
@@ -151,10 +151,8 @@ class User extends PlUser
             $with_pd = false;
             foreach (explode(',', $sorted) as $part) {
                 $desc = ($part[0] == '-');
-                echo $part . '=' . $desc;
                 if ($desc) {
                     $part = substr($part, 1);
-                    echo $part;
                 }
                 switch ($part) {
                   case 'promo':

diff --git a/modules/xnetgrp.php b/modules/xnetgrp.php
index e72013c..27df50b 100644 (file)
--- a/modules/xnetgrp.php
+++ b/modules/xnetgrp.php
@@ -327,6 +327,7 @@ class XnetGrpModule extends PLModule
         $page->changeTpl('xnetgrp/annuaire.tpl');
 
         $sort = Env::s('order', 'directory_name');
+        $ofs  = Env::i('offset');
 
         if (Env::b('admin')) {
             $uids = XDB::fetchColumn('SELECT  uid
@@ -341,6 +342,7 @@ class XnetGrpModule extends PLModule
         $users = User::getBuildUsersWithUIDs($uids, $sort,
                                              NB_PER_PAGE, $ofs * NB_PER_PAGE);
         $page->assign('pages', (count($uids) + NB_PER_PAGE - 1) / NB_PER_PAGE);
+        $page->assign('current', $ofs);
         $page->assign('order', $sort);
         $page->assign('users', $users);
         $page->assign('only_admin', Env::b('admin'));

diff --git a/templates/xnetgrp/annuaire.tpl b/templates/xnetgrp/annuaire.tpl
index 8706e5f..7ed7eb6 100644 (file)
--- a/templates/xnetgrp/annuaire.tpl
+++ b/templates/xnetgrp/annuaire.tpl
@@ -126,11 +126,23 @@ Le groupe {$asso.nom} compte {$nb_tot} membres :
   {/foreach}
 </table>
 
+{if $pages ge 1}
 <p class="descr" style="text-align: center">
-{foreach from=$links item=ofs key=txt}
-<a href="{$platal->ns}annuaire?offset={$ofs}&amp;initiale={$smarty.request.initiale}&amp;order={$sort}"{if $smarty.request.offset eq $ofs} class="erreur"{/if}>{$txt}</a>
-{/foreach}
+{section name="links" loop=$pages min=1}
+{if $smarty.section.links.index eq $current}
+<span class="erreur">{$smarty.section.links.iteration}</span>
+{else}
+{if $smarty.section.links.first}
+<a href="{$platal->ns}annuaire?offset={$current-1}&amp;order={$order}&amp;admin={$only_admin}">précédente</a>
+{/if}
+<a href="{$platal->ns}annuaire?offset={$smarty.section.links.index}&amp;order={$order}&amp;admin={$only_admin}">{$smarty.section.links.iteration}</a>
+{if $smarty.section.links.last}
+<a href="{$platal->ns}annuaire?offset={$current+1}&amp;order={$order}&amp;admin={$only_admin}">suivante</a>
+{/if}
+{/if}
+{/section}
 </p>
+{/if}
 
 {if $broken}
 <p class="smaller">