Fix some layout issues when browsing through the group list

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

diff --git a/modules/xnet.php b/modules/xnet.php
index f116c68..e5bb296 100644 (file)
--- a/modules/xnet.php
+++ b/modules/xnet.php
@@ -203,21 +203,22 @@ class XnetModule extends PLModule
         $page->assign('dom', $dom);
 
         $res  = XDB::query("SELECT id,nom FROM groupex.dom
-                                       WHERE FIND_IN_SET({?}, cat) ORDER BY nom", $cat);
+                             WHERE FIND_IN_SET({?}, cat)
+                          ORDER BY nom", $cat);
         $doms = $res->fetchAllAssoc();
         $page->assign('doms', $doms);
 
         if (empty($doms)) {
-            $res = XDB::iterator("SELECT diminutif, nom FROM groupex.asso
-                                             WHERE FIND_IN_SET({?}, cat) ORDER BY nom", $cat);
+            $res = XDB::query("SELECT diminutif, nom FROM groupex.asso
+                                   WHERE FIND_IN_SET({?}, cat)
+                                ORDER BY nom", $cat);
+            $page->assign('gps', $res->fetchAllAssoc());
         } elseif (!is_null($dom)) {
-            $res = XDB::iterator("SELECT diminutif, nom FROM groupex.asso
-                                             WHERE FIND_IN_SET({?}, cat) AND dom={?}
-                                          ORDER BY nom", $cat, $dom);
-        } else {
-            $res = null;
+            $res = XDB::query("SELECT diminutif, nom FROM groupex.asso
+                                WHERE FIND_IN_SET({?}, cat) AND dom={?}
+                             ORDER BY nom", $cat, $dom);
+            $page->assign('gps', $res->fetchAllAssoc());
         }
-        $page->assign('gps', $res);
 
         $page->useMenu();
         $page->setType($cat);

diff --git a/templates/xnet/groupes.tpl b/templates/xnet/groupes.tpl
index a039531..49ace1e 100644 (file)
--- a/templates/xnet/groupes.tpl
+++ b/templates/xnet/groupes.tpl
@@ -27,14 +27,12 @@
     </td>
   </tr>
   <tr>
-    {if !$doms || !$gps}
     <td style="vertical-align: top">
       <div class="cat {if $cat eq groupesx}sel{/if}"><a href="groups/groupesx">Groupes X</a></div>
       <div class="cat {if $cat eq binets}sel{/if}"><a href="groups/binets">Binets</a></div>
       <div class="cat {if $cat eq institutions}sel{/if}"><a href="groups/institutions">Institutions</a></div>
       <div class="cat {if $cat eq promotions}sel{/if}"><a href="groups/promotions">Promotions</a></div>
     </td>
-    {/if}
     
     {if $doms}
     <td style="vertical-align: top">
@@ -46,15 +44,24 @@
     </td>
     {/if}
 
-    {if $gps}
-    <td style="text-align:right;">
-      {iterate from=$gps item=g}
-      <table style="float: left;" cellspacing="2" cellpadding="0">
-        <tr><td class="oval{if $doms}2{/if}"><a href="{$g.diminutif}/">{$g.nom}</a></td></tr>
+    <td style="text-align:right;{if $doms} width: 180px{/if}">
+      {if $gps}
+      <table style="width: 100%">
+        {foreach from=$gps item=g name=all key=i}
+        {if $doms || $i is even}
+        <tr>
+        {/if}
+          <td class="oval{if $doms}2{/if}">
+            <a href="{$g.diminutif}/">{$g.nom}</a>
+          </td>
+        {if !$doms && $i is even && $smarty.foreach.all.last}<td></td>{/if}
+        {if $doms || $i is odd || $smarty.foreach.all.last}
+        </tr>
+        {/if}
+      {/foreach}
       </table>
-      {/iterate}
+      {/if}
     </td>
-    {/if}
   </tr>
 </table>