Add the logo of the groups in "My groups" page

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

diff --git a/modules/profile.php b/modules/profile.php
index 66d5c31..fe2aa43 100644 (file)
--- a/modules/profile.php
+++ b/modules/profile.php
@@ -675,11 +675,12 @@ class ProfileModule extends PLModule
         $page->assign('xorg_title', 'Polytechnique.org - Promo, Groupes X, Binets');
         
         $req = XDB::query('
-            SELECT m.asso_id, a.nom, diminutif, COUNT(e.eid) AS events, mail_domain AS lists
-            FROM groupex.membres AS m 
-            INNER JOIN groupex.asso AS a ON(m.asso_id = a.id)
-            LEFT JOIN groupex.evenements AS e ON(e.asso_id = m.asso_id)
-            WHERE uid = {?} GROUP BY m.asso_id ORDER BY a.nom', S::i('uid'));
+            SELECT m.asso_id, a.nom, diminutif, a.logo IS NOT NULL AS has_logo, 
+                   COUNT(e.eid) AS events, mail_domain AS lists
+              FROM groupex.membres AS m 
+        INNER JOIN groupex.asso AS a ON(m.asso_id = a.id)
+         LEFT JOIN groupex.evenements AS e ON(e.asso_id = m.asso_id AND e.archive = 0)
+             WHERE uid = {?} GROUP BY m.asso_id ORDER BY a.nom', S::i('uid'));
         $page->assign('assos', $req->fetchAllAssoc());
     }
     

diff --git a/templates/groupesx.tpl b/templates/groupesx.tpl
index aeced6e..1f17951 100644 (file)
--- a/templates/groupesx.tpl
+++ b/templates/groupesx.tpl
@@ -26,6 +26,10 @@
 <div style="width:48%;float:left" >\r
 <fieldset style="margin:0.6em">\r
     <legend style="padding:4px"><strong><a href="http://www.polytechnique.net/login/{$asso.diminutif}">{$asso.nom}</a></strong></legend>\r
+    {if $asso.has_logo}\r
+    <img alt="[ LOGO ]" src="http://www.polytechnique.net/{$asso.diminutif}/logo"\r
+         style="width: 30%; display: block; float: right;" />\r
+    {/if}\r
     <ul style="padding-top:0px;padding-bottom:0px">\r
         <li><a href="http://www.polytechnique.net/{$asso.diminutif}/annuaire">annuaire</a></li>\r
         <li><a href="http://www.polytechnique.net/{$asso.diminutif}/trombi">trombino</a></li>\r