[Devel] r481 - in branches/generic: . adl-specific adl-specific/css doc

[svn AT agendadulibre.org]

Author: ploc
Date: Thu Aug  5 00:40:32 2010
New Revision: 481

Log:
replacing 'LUG' references by 'localgroup' references, which is more generic

Modified:
   branches/generic/adl-specific/config.inc.php
   branches/generic/adl-specific/css/calendar.css
   branches/generic/doc/INSTALL
   branches/generic/doc/UPGRADE
   branches/generic/doc/schema.sql
   branches/generic/localgroupstextlist.php
   branches/generic/map.php
   branches/generic/showevent.php
   branches/generic/testevent.php

Modified: branches/generic/adl-specific/config.inc.php
==============================================================================
--- branches/generic/adl-specific/config.inc.php        Tue Aug  3 20:37:14 
2010        (r480)
+++ branches/generic/adl-specific/config.inc.php        Thu Aug  5 00:40:32 
2010        (r481)
@@ -22,7 +22,7 @@
                 event submitter addresses. Useful for debugging during 
development. */
 
 /* database related config */
-$db_host = "host";                                                      /* 
mysql server */
+$db_host = "host";                                                      /* 
mysql server hostname */
 $db_user = "user";                                                      /* 
username needed to connect to the database */
 $db_pass = "password";                                                  /* 
password needed to connect to the database */
 $db_name  = "db";                                                       /* 
database name */

Modified: branches/generic/adl-specific/css/calendar.css
==============================================================================
--- branches/generic/adl-specific/css/calendar.css      Tue Aug  3 20:37:14 
2010        (r480)
+++ branches/generic/adl-specific/css/calendar.css      Thu Aug  5 00:40:32 
2010        (r481)
@@ -313,7 +313,7 @@
        color: #000;
 }
 
-/* Carte evenements/lugs */
+/* Carte evenements/localgroups */
 
 #region-map {
        border: 0px;
@@ -413,9 +413,9 @@
   color: #336699;
 }
 /*
- * Lug list (used only by showevent.php)
+ * local group list (used only by showevent.php and testevent.php)
  */
-#lug-list {
+#localgroup-list {
        float: right;
        background: #D6ECFF;/*#C6E5FF;*/
        border : 1px solid #96CFFF;
@@ -426,7 +426,7 @@
        font-size: 0.7em;
 }
 
-#lug-list h1 {
+#localgroup-list h1 {
        border-bottom: 1px black solid;
        padding-bottom: 4px;
        font-size: 1.3em;
@@ -435,7 +435,7 @@
        font-family: Georgia,sans-serif;
 }
 
-#lug-list ul {
+#localgroup-list ul {
        text-align: left;
        line-height: 1.2em;
        margin-left:1em;

Modified: branches/generic/doc/INSTALL
==============================================================================
--- branches/generic/doc/INSTALL        Tue Aug  3 20:37:14 2010        (r480)
+++ branches/generic/doc/INSTALL        Thu Aug  5 00:40:32 2010        (r481)
@@ -91,9 +91,9 @@
 
  (enter previous login and password)
 
-9) Add the list of LUGs (optional)
+9) Add the list of local groups (optional)
 
-The list of LUGs in the Agenda du Libre is generated using a script
+The list of local groups in the Agenda du Libre is generated using a script
 available at
 http://www.agendadulibre.org/svn/scripts/extract-gulls.py. This script
 parses the LUG list of AFUL (at http://www.aful.org/gul/liste) and
@@ -101,5 +101,5 @@
 
 $ svn co http://www.agendadulibre.org/svn/scripts/extract-gulls.py
 $ chmod +x extract-gulls.py
-$ ./extract-gulls.py > lugs.sql
-$ mysql -h localhost -u agendadulibre -p agendadulibre < lugs.sql
+$ ./extract-gulls.py > localgroups.sql
+$ mysql -h localhost -u agendadulibre -p agendadulibre < localgroups.sql

Modified: branches/generic/doc/UPGRADE
==============================================================================
--- branches/generic/doc/UPGRADE        Tue Aug  3 20:37:14 2010        (r480)
+++ branches/generic/doc/UPGRADE        Thu Aug  5 00:40:32 2010        (r481)
@@ -117,4 +117,12 @@
 moderator list and the event submitter.
 
 alter table events add moderator_mail_id varchar(32);
-alter table events add submitter_mail_id varchar(32);
\ No newline at end of file
+alter table events add submitter_mail_id varchar(32);
+
+Revisions lower than 468
+========================
+
+At revision 468 (branch named "generic"), table named "lugs" has been renamed
+to "localgroups" (as this is more generic than "lugs").
+
+rename table lugs to localgroups;

Modified: branches/generic/doc/schema.sql
==============================================================================
--- branches/generic/doc/schema.sql     Tue Aug  3 20:37:14 2010        (r480)
+++ branches/generic/doc/schema.sql     Thu Aug  5 00:40:32 2010        (r481)
@@ -64,7 +64,7 @@
   PRIMARY KEY  (`id`)
 ) TYPE=MyISAM;
 
-CREATE TABLE lugs (
+CREATE TABLE localgroups (
   id int(11) NOT NULL auto_increment,
   region int(11) NOT NULL default '0',
   department int(11) NOT NULL default '0',
@@ -93,4 +93,4 @@
   `event_id` int(11) default NULL,
   `author_id` int(11) default NULL,
   PRIMARY KEY  (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;
\ No newline at end of file
+) ENGINE=MyISAM AUTO_INCREMENT=8 DEFAULT CHARSET=utf8;

Modified: branches/generic/localgroupstextlist.php
==============================================================================
--- branches/generic/localgroupstextlist.php    Tue Aug  3 20:37:14 2010      
  (r480)
+++ branches/generic/localgroupstextlist.php    Thu Aug  5 00:40:32 2010      
  (r481)
@@ -30,7 +30,7 @@
 
 echo "lon\tlat\ttitle\tdescription\ticon\n";
 
-$sql = "select * from lugs";
+$sql = "select * from localgroups";
 
 $localgroups = $db->query($sql);
 while($localgroup = mysql_fetch_object($localgroups))

Modified: branches/generic/map.php
==============================================================================
--- branches/generic/map.php    Tue Aug  3 20:37:14 2010        (r480)
+++ branches/generic/map.php    Thu Aug  5 00:40:32 2010        (r481)
@@ -58,7 +58,7 @@
             var newl = new OpenLayers.Layer.GeoRSS('AdL', '" . 
calendar_absolute_url("rss.php?region=all&map=1&daylimit=0") . "');
             map.addLayer(newl);
 
-            var newl = new OpenLayers.Layer.Text('LUGs', {location: '" . 
calendar_absolute_url("localgroupstextlist.php") . "'});
+            var newl = new OpenLayers.Layer.Text('<?php echo 
${localGroupAcronym}; ?>', {location: '" . 
calendar_absolute_url("localgroupstextlist.php") . "'});
             map.addLayer(newl);
         }
 

Modified: branches/generic/showevent.php
==============================================================================
--- branches/generic/showevent.php      Tue Aug  3 20:37:14 2010        (r480)
+++ branches/generic/showevent.php      Thu Aug  5 00:40:32 2010        (r481)
@@ -42,12 +42,12 @@
   exit;
 }
 
-echo "<div id=\"lug-list\"><h1>" . $localGroupName . " de la région</h1>";
+echo "<div id=\"localgroup-list\"><h1>" . $localGroupName . " de la 
région</h1>";
 
-$lugs = $db->query ("select distinct region, name, url from lugs where 
region = '" .
+$localgroups = $db->query ("select distinct region, name, url from 
localgroups where region = '" .
                    $event->region . "'");
 
-if (mysql_num_rows ($lugs) == 0)
+if (mysql_num_rows ($localgroups) == 0)
 {
   echo "Pas de " . $localGroupName . ".<br/>";
 }
@@ -55,10 +55,10 @@
 {
   echo " <ul>";
 
-  while ($lug = mysql_fetch_object ($lugs))
+  while ($localgroup = mysql_fetch_object ($localgroups))
     {
-      echo "<li><a href=\"" . $lug->url . "\">" . $lug->name . "</a> (";
-      $dpts = $db->query ("select distinct department from lugs where name = 
" . $db->quote_smart($lug->name));
+      echo "<li><a href=\"" . $localgroup->url . "\">" . $localgroup->name . 
"</a> (";
+      $dpts = $db->query ("select distinct department from localgroups where 
name = " . $db->quote_smart($localgroup->name));
       $i = 1;
       while ($dpt = mysql_fetch_object ($dpts))
        {

Modified: branches/generic/testevent.php
==============================================================================
--- branches/generic/testevent.php      Tue Aug  3 20:37:14 2010        (r480)
+++ branches/generic/testevent.php      Thu Aug  5 00:40:32 2010        (r481)
@@ -28,12 +28,12 @@
 
 put_header("informations sur un évènement");
 
-echo "<div id=\"lug-list\"><h1>" . $localGroupName . " de la région</h1>";
+echo "<div id=\"localgroup-list\"><h1>" . $localGroupName . " de la 
région</h1>";
 
-$lugs = $db->query ("select distinct region, name, url from lugs where 
region = '" .
+$localgroups = $db->query ("select distinct region, name, url from 
localgroups where region = '" .
                    $_POST['__event_region'] . "'");
 
-if (mysql_num_rows ($lugs) == 0)
+if (mysql_num_rows ($localgroups) == 0)
 {
   echo "Pas de " . $localGroupName . ".<br/>";
 }
@@ -41,10 +41,10 @@
 {
   echo " <ul>";
 
-  while ($lug = mysql_fetch_object ($lugs))
+  while ($localgroup = mysql_fetch_object ($localgroups))
     {
-      echo "<li><a href=\"" . $lug->url . "\">" . $lug->name . "</a> (";
-      $dpts = $db->query ("select distinct department from lugs where name = 
'" . $lug->name . "'");
+      echo "<li><a href=\"" . $localgroup->url . "\">" . $localgroup->name . 
"</a> (";
+      $dpts = $db->query ("select distinct department from localgroups where 
name = " . $db->quote_smart($localgroup->name));
       $i = 1;
       while ($dpt = mysql_fetch_object ($dpts))
        {