[Devel] r128 - trunk

[thomas AT lolut.utbm.info]

Author: thomas
Date: 2006-01-14 15:20:32 +0100 (Sat, 14 Jan 2006)
New Revision: 128

Modified:
   trunk/calendar.css
   trunk/map.php
Log:
Ajout de l'affichage des LUGs par region dans la carte.

Modified: trunk/calendar.css
===================================================================
--- trunk/calendar.css  2006-01-13 09:29:54 UTC (rev 127)
+++ trunk/calendar.css  2006-01-14 14:20:32 UTC (rev 128)
@@ -188,12 +188,9 @@
 
 #region-map
 {
-  text-align: center;
+/*  text-align: center;*/
   border: 0;
-/*
- * Alternative solution
- * margin-left: 8em;
- */
+  padding-left: 8em;
 }
 
 dl.region-map-event
@@ -217,6 +214,7 @@
   padding: 0;
   margin: 0;
   margin-bottom: 0.2em;
+  border-bottom: 1px solid black;
 }
 
 dl.region-map-event dd
@@ -229,6 +227,11 @@
   font-size: 12px;
 }
 
+dl.region-map-event ul
+{
+  line-height: 1.2em;
+}
+
 #advises
 {
   background-color: #dfedff;

Modified: trunk/map.php
===================================================================
--- trunk/map.php       2006-01-13 09:29:54 UTC (rev 127)
+++ trunk/map.php       2006-01-14 14:20:32 UTC (rev 128)
@@ -44,28 +44,67 @@
 
       echo "<dt>";
 
-      echo "<b>" . $region->name . "</b><br/>";
+      echo "<b>" . $region->name . "</b><br/> ";
 
       echo "<a href=\"" . calendar_absolute_url ("rss.php?region=" . 
$region->id) . "\"><i>rss</i></a> - \n";
       echo "<a href=\"" . calendar_absolute_url ("ical.php?region=" . 
$region->id) . "\"><i>ical</i></a>\n";
 
       echo "</dt>\n";
 
-      echo " <dd>\n <ul>\n";
-
       $events = $db->query ("select * from events where " .
                            "(start_time <= '" . date_timestamp2mysql($end)   
. "') AND " .
                            "(end_time   >= '" . date_timestamp2mysql($start) 
. "') AND " .
                            "((region=" . $region->id . ")) AND (moderated=1) 
order by start_time");
 
-      while ($event = mysql_fetch_object ($events))
+      echo "<dd>";
+
+      if (mysql_num_rows ($events) == 0)
        {
-         echo "<li><i>" . strftime ("%A %d %B", date_mysql2timestamp 
($event->start_time)) . "</i> <a href=\"" . 
calendar_absolute_url("showevent.php?id=" . $event->id) . "\">" . 
$event->title . "</a> � " . $event->city . "</li>";
+         echo "Pas d'�v�nements pr�vus ce mois.<br/>";
        }
+      else
+       {
+         echo "�v�nements du mois: <ul>\n";
 
-      echo " </ul>\n";
+         while ($event = mysql_fetch_object ($events))
+           {
+             echo "<li><i>" . strftime ("%A %d %B", date_mysql2timestamp 
($event->start_time)) . "</i> <a href=\"" . 
calendar_absolute_url("showevent.php?id=" . $event->id) . "\">" . 
$event->title . "</a> � " . $event->city . "</li>";
+           }
 
+         echo " </ul>\n";
+       }
 
+      $lugs = $db->query ("select distinct region, name, url from lugs where 
region = '" .
+                         $region->id . "'");
+
+      if (mysql_num_rows ($lugs) == 0)
+       {
+         echo "Pas de groupes d'utilisateur.<br/>";
+       }
+      else
+       {
+         echo "Groupes d'utilisateurs:\n";
+
+         echo " <ul>";
+
+         while ($lug = mysql_fetch_object ($lugs))
+           {
+             echo "<li><a href=\"" . $lug->url . "\">" . $lug->name . "</a> 
(";
+             $dpts = $db->query ("select distinct department from lugs where 
name = '" . $lug->name . "'");
+             $i = 1;
+             while ($dpt = mysql_fetch_object ($dpts))
+               {
+                 echo $dpt->department;
+                 if ($i != mysql_num_rows($dpts))
+                   echo ", ";
+                 $i++;
+               }
+             echo ")</li>";
+           }
+
+         echo " </ul>";
+       }
+
       echo "</dd>\n</dl>\n";
     }
 }