closes FS#124 FS#122 : gender + nationalities icons

diff --git a/ChangeLog b/ChangeLog
index f13b1a4..cbb6a36 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,13 @@ VERSION 0.9.2                                                                                                          ~20 Nov 2004
 
 Changes :
 
+       * Lists :
+               - Refusal message is shown on mail moderation page.  (FS#138)           -MC
+
+       * Search+Contacts:
+               - Homeland is now a flag.  (FS#124)                                                                     -MC
+               - Women now have a • (no more dirty gender icons).  (FS#122)       -MC
+
 
 Fixes (from 0.9.1 branch) :
 
@@ -26,7 +33,7 @@ Changes :
                - Convert old archive to new model.                                                                     -FAL
 
        * Search+Contacts :
-               - Added sex icons.                                                                                                      -MC
+               - Added gender icons.                                                                                           -MC
                - Better things done for married women.                                                         -MC
                - Deceased members and non-subscribers special treatments.                      -MC
                - Mobile is now printed too.                                                                            -MC

diff --git a/htdocs/css/default.css b/htdocs/css/default.css
index 6e3b902..fb642c7 100644 (file)
--- a/htdocs/css/default.css
+++ b/htdocs/css/default.css
@@ -30,6 +30,7 @@ body {
 }
 
 a:link, a:visited, a:active, a:hover { color: #003399; background: none; }
+img   { vertical-align: middle; }
 a img { border: 0px; }
 td    { vertical-align: top; }
 li    { padding-left: 3px; padding-right: 3px; text-align: justify; }
@@ -229,7 +230,6 @@ div.contact div.appli {
 
 div.contact div.bits {
     text-align: right;
-    width: 17%;
     float: right;
 }
 
@@ -582,4 +582,4 @@ div.spacer { clear: both; }
 }
 
 /* vim: set et ts=4 sts=4 sw=4: */
-/* $Id: default.css,v 1.54 2004-10-24 14:58:26 x2000habouzit Exp $ */
+/* $Id: default.css,v 1.55 2004-10-28 12:20:59 x2000habouzit Exp $ */

diff --git a/htdocs/mescontacts.php b/htdocs/mescontacts.php
index 0c760af..8e0fa88 100644 (file)
--- a/htdocs/mescontacts.php
+++ b/htdocs/mescontacts.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: mescontacts.php,v 1.17 2004-10-25 12:41:04 x2000habouzit Exp $
+        $Id: mescontacts.php,v 1.18 2004-10-28 12:20:59 x2000habouzit Exp $
  ***************************************************************************/
 
 require("auto.prepend.inc.php");
@@ -61,10 +61,10 @@ $sql = "SELECT contact AS id,
                a.*, l.alias AS forlife,
                i.deces != 0 AS dcd, i.deces, i.matricule_ax, FIND_IN_SET('femme', i.flags) AS sexe,
                e.entreprise, es.label AS secteur, ef.fonction_fr AS fonction,
-               n.text AS nat,
+               n.text AS nat, n.iso3166,
                ad0.text AS app0text, ad0.url AS app0url, ai0.type AS app0type,
                ad1.text AS app1text, ad1.url AS app1url, ai1.type AS app1type,
-               adr.ville, gp.pays, gr.name AS region,
+               adr.ville, gp.a2, gp.pays, gr.name AS region,
               IF(a.epouse<>'',a.epouse,a.nom) AS sortkey
         FROM       contacts       AS c
         INNER JOIN auth_user_md5  AS a   ON (a.user_id = c.contact)

diff --git a/include/search.classes.inc.php b/include/search.classes.inc.php
index c4bdb21..9c5d561 100644 (file)
--- a/include/search.classes.inc.php
+++ b/include/search.classes.inc.php
@@ -18,7 +18,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: search.classes.inc.php,v 1.25 2004-10-25 12:41:05 x2000habouzit Exp $
+        $Id: search.classes.inc.php,v 1.26 2004-10-28 12:20:59 x2000habouzit Exp $
  ***************************************************************************/
 
 require_once("xorg.misc.inc.php");
@@ -33,7 +33,7 @@ $globals->search_result_fields = '
                 ad0.text AS app0text, ad0.url AS app0url, ai0.type AS app0type,
                 ad1.text AS app1text, ad1.url AS app1url, ai1.type AS app1type,
                 e.entreprise, es.label AS secteur, ef.fonction_fr AS fonction,
-                n.text AS nat,
+                n.text AS nat, n.iso3166,
                 adr.ville, gp.pays, gr.name AS region,';
 $globals->search_result_where_statement = '
                 LEFT JOIN  applis_ins     AS ai0 ON (u.user_id = ai0.uid AND ai0.ordre = 0)

diff --git a/scripts/migration/0.9.2/nationalites.sql b/scripts/migration/0.9.2/nationalites.sql
new file mode 100644 (file)
index 0000000..141f84e
--- /dev/null
+++ b/scripts/migration/0.9.2/nationalites.sql
@@ -0,0 +1,108 @@
+-- MySQL dump 9.11
+--
+-- Host: localhost    Database: x4dat
+-- ------------------------------------------------------
+-- Server version      4.0.21-log
+
+--
+-- Table structure for table `nationalites`
+--
+
+DROP TABLE IF EXISTS `nationalites`;
+CREATE TABLE `nationalites` (
+  `id` tinyint(3) unsigned NOT NULL default '0',
+  `text` varchar(50) NOT NULL default '',
+  `iso3166` char(2) NOT NULL default '',
+  PRIMARY KEY  (`id`)
+) TYPE=MyISAM PACK_KEYS=1 COMMENT='liste des nationalits';
+
+--
+-- Dumping data for table `nationalites`
+--
+
+INSERT INTO `nationalites` VALUES (0,'','');
+INSERT INTO `nationalites` VALUES (1,'Albanais','AL');
+INSERT INTO `nationalites` VALUES (2,'Algérien','DZ');
+INSERT INTO `nationalites` VALUES (3,'Allemand','DE');
+INSERT INTO `nationalites` VALUES (4,'Américain','US');
+INSERT INTO `nationalites` VALUES (5,'Argentin','AR');
+INSERT INTO `nationalites` VALUES (6,'Australien','AU');
+INSERT INTO `nationalites` VALUES (7,'Autrichien','AT');
+INSERT INTO `nationalites` VALUES (8,'Belge','BE');
+INSERT INTO `nationalites` VALUES (9,'Benin','BJ');
+INSERT INTO `nationalites` VALUES (10,'Botswanais','BW');
+INSERT INTO `nationalites` VALUES (11,'Bouthan','BT');
+INSERT INTO `nationalites` VALUES (12,'Brésilien','BR');
+INSERT INTO `nationalites` VALUES (13,'Britannique','GB');
+INSERT INTO `nationalites` VALUES (14,'Bulgare','BG');
+INSERT INTO `nationalites` VALUES (15,'Burkina Faso','BF');
+INSERT INTO `nationalites` VALUES (16,'Cambodgien','KH');
+INSERT INTO `nationalites` VALUES (17,'Camerounais','');
+INSERT INTO `nationalites` VALUES (18,'Canadien','');
+INSERT INTO `nationalites` VALUES (19,'Chilien','');
+INSERT INTO `nationalites` VALUES (20,'Chinois','');
+INSERT INTO `nationalites` VALUES (21,'Colombien','');
+INSERT INTO `nationalites` VALUES (22,'Coréen','');
+INSERT INTO `nationalites` VALUES (80,'Croate','');
+INSERT INTO `nationalites` VALUES (23,'Cubain','');
+INSERT INTO `nationalites` VALUES (24,'Danois','');
+INSERT INTO `nationalites` VALUES (25,'Ecossais','');
+INSERT INTO `nationalites` VALUES (26,'Egyptien','');
+INSERT INTO `nationalites` VALUES (81,'Equatorien','');
+INSERT INTO `nationalites` VALUES (27,'Espagnol','');
+INSERT INTO `nationalites` VALUES (28,'Estonien','');
+INSERT INTO `nationalites` VALUES (29,'Finlandais','');
+INSERT INTO `nationalites` VALUES (30,'Français','FR');
+INSERT INTO `nationalites` VALUES (31,'Gabonais','');
+INSERT INTO `nationalites` VALUES (32,'Georgien','');
+INSERT INTO `nationalites` VALUES (33,'Grec','');
+INSERT INTO `nationalites` VALUES (34,'Haïtien','');
+INSERT INTO `nationalites` VALUES (36,'Hong-Kong','');
+INSERT INTO `nationalites` VALUES (37,'Hongrois','');
+INSERT INTO `nationalites` VALUES (38,'Indien','');
+INSERT INTO `nationalites` VALUES (39,'Iranien','');
+INSERT INTO `nationalites` VALUES (40,'Irlandais','');
+INSERT INTO `nationalites` VALUES (41,'Islandais','');
+INSERT INTO `nationalites` VALUES (42,'Israélien','');
+INSERT INTO `nationalites` VALUES (43,'Italien','');
+INSERT INTO `nationalites` VALUES (44,'Ivoirien','');
+INSERT INTO `nationalites` VALUES (45,'Jamaïcain','');
+INSERT INTO `nationalites` VALUES (46,'Japonais','');
+INSERT INTO `nationalites` VALUES (47,'Kazakh','');
+INSERT INTO `nationalites` VALUES (48,'Kurde','');
+INSERT INTO `nationalites` VALUES (49,'Lettonien','');
+INSERT INTO `nationalites` VALUES (50,'Libanais','');
+INSERT INTO `nationalites` VALUES (51,'Lituanien','');
+INSERT INTO `nationalites` VALUES (52,'Luxembourgeois','');
+INSERT INTO `nationalites` VALUES (53,'Macédonien','');
+INSERT INTO `nationalites` VALUES (82,'Malgache','');
+INSERT INTO `nationalites` VALUES (54,'Malien','');
+INSERT INTO `nationalites` VALUES (55,'Marocain','');
+INSERT INTO `nationalites` VALUES (56,'Mexicain','');
+INSERT INTO `nationalites` VALUES (35,'Néerlandais','');
+INSERT INTO `nationalites` VALUES (57,'Néo-Zélandais','');
+INSERT INTO `nationalites` VALUES (58,'Norvégien','');
+INSERT INTO `nationalites` VALUES (59,'Palestinien','');
+INSERT INTO `nationalites` VALUES (60,'Péruvien','');
+INSERT INTO `nationalites` VALUES (61,'Polonais','');
+INSERT INTO `nationalites` VALUES (62,'Portugais','');
+INSERT INTO `nationalites` VALUES (63,'Roumain','');
+INSERT INTO `nationalites` VALUES (64,'Russe','');
+INSERT INTO `nationalites` VALUES (65,'Sénégalais','');
+INSERT INTO `nationalites` VALUES (66,'Serbe','');
+INSERT INTO `nationalites` VALUES (84,'Singapourien','');
+INSERT INTO `nationalites` VALUES (67,'Slovaque','');
+INSERT INTO `nationalites` VALUES (69,'Sud-Africain','');
+INSERT INTO `nationalites` VALUES (70,'Suédois','');
+INSERT INTO `nationalites` VALUES (71,'Suisse','');
+INSERT INTO `nationalites` VALUES (72,'Tadjik','');
+INSERT INTO `nationalites` VALUES (73,'Taïwanais','');
+INSERT INTO `nationalites` VALUES (74,'Tchèque','');
+INSERT INTO `nationalites` VALUES (75,'Tunisien','');
+INSERT INTO `nationalites` VALUES (76,'Turc','');
+INSERT INTO `nationalites` VALUES (83,'Ukrainien','');
+INSERT INTO `nationalites` VALUES (85,'Uruguayen','');
+INSERT INTO `nationalites` VALUES (77,'Vénézuélien','');
+INSERT INTO `nationalites` VALUES (78,'Vietnamien','');
+INSERT INTO `nationalites` VALUES (79,'Yougoslave','');
+

diff --git a/templates/include/minifiche.tpl b/templates/include/minifiche.tpl
index ce63d62..6b661ae 100644 (file)
--- a/templates/include/minifiche.tpl
+++ b/templates/include/minifiche.tpl
@@ -17,17 +17,13 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: minifiche.tpl,v 1.5 2004-10-25 18:29:37 x2000habouzit Exp $
+        $Id: minifiche.tpl,v 1.6 2004-10-28 12:21:00 x2000habouzit Exp $
  ***************************************************************************}
 
 
 <div class="contact" {min_auth level='cookie'}title="fiche mise à jour le {$c.date|date_format:"%d %b %Y"}"{/min_auth}>
   <div class="nom">
-    {if $c.sexe}
-    <img src="{"images/woman.gif"|url}" alt="[femme]" style='margin-right: 4px;' />
-    {else}
-    <img src="{"images/man.gif"|url}" alt="[homme]" style='margin-right: 4px;' />
-    {/if}
+    {if $c.sexe}&bull;{/if}
     {min_auth level="cookie"}
     {if !$c.dcd && $inscrit}
     <a href="javascript:x()" onclick="popWin('fiche.php?user={$c.forlife}','toolbar=0,location=0,directories=0,status=0,menubar=0,scrollbars=1,resizable=1,width=800,height=500')">
@@ -42,6 +38,9 @@
   </div>
   <div class="appli">
     {strip}
+    {if $c.nat}
+    <img src='{"images/"|url}flags/{$c.iso3166}.gif' alt='{$c.nat}' height='14' title='{$c.nat}' />&nbsp;
+    {/if}
     (X {$c.promo}
     {if $c.app0text},
       {applis_fmt type=$c.app0type text=$c.app0text url=$c.app0url}

diff --git a/templates/include/minifiche_pvt.tpl b/templates/include/minifiche_pvt.tpl
index dd88ca3..d461861 100644 (file)
--- a/templates/include/minifiche_pvt.tpl
+++ b/templates/include/minifiche_pvt.tpl
@@ -17,7 +17,7 @@
  *  Foundation, Inc.,                                                      *
  *  59 Temple Place, Suite 330, Boston, MA  02111-1307  USA                *
  ***************************************************************************
-        $Id: minifiche_pvt.tpl,v 1.5 2004-10-25 12:41:05 x2000habouzit Exp $
+        $Id: minifiche_pvt.tpl,v 1.6 2004-10-28 12:21:00 x2000habouzit Exp $
  ***************************************************************************}
 
 
@@ -54,14 +54,8 @@
 {/if}
 {if $inscrit==1}
   <div class="long">
-    {if $c.nat || $c.web || $c.mobile || $c.pays || $c.ville || $c.region || $c.entreprise || $c.libre}
+    {if $c.web || $c.mobile || $c.pays || $c.ville || $c.region || $c.entreprise || $c.libre}
     <table cellspacing="0" cellpadding="0">
-      {if $c.nat}
-      <tr>
-        <td class="lt">Nationalité:</td>
-        <td class="rt">{$c.nat}</td>
-      </tr>
-      {/if}
       {if $c.web}
       <tr>
         <td class="lt">Page web:</td>