From: x2000habouzit <x2000habouzit>
Date: Sun, 15 Feb 2004 15:45:28 +0000 (+0000)
Subject: pb css avec moz, tant pis pr IE, et ldif export terminé
X-Git-Tag: xorg/old~1863
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=6f7cd13edc979c2e9ace12cdde7cce6954429150;p=platal.git

pb css avec moz, tant pis pr IE, et ldif export terminé
---

diff --git a/htdocs/css/default.css b/htdocs/css/default.css
index e6fa9e3..7491e5a 100644
--- a/htdocs/css/default.css
+++ b/htdocs/css/default.css
@@ -175,6 +175,7 @@ table.tinybicol td.info, table.bicol td.info {
     top     : 32px;
     left    : 14px;
     width   : 128px;
+    z-index : 1;
     
     color: #003399;
     background: #e0ffff;
@@ -207,9 +208,8 @@ table.tinybicol td.info, table.bicol td.info {
 
 #body {
     width: 740px;
-    margin-left: -370px;
-    position: relative;
-    left: 50%;
+    margin-left: auto;
+    margin-right: auto;
 }
 
 #body-logo {
@@ -275,4 +275,4 @@ table.tinybicol td.info, table.bicol td.info {
     vertical-align: top;
 }
 /* vim: set et ts=4 sts=4 sw=4: */
-/* $Id: default.css,v 1.18 2004-02-13 17:11:17 x2000habouzit Exp $ */
+/* $Id: default.css,v 1.19 2004-02-15 15:45:29 x2000habouzit Exp $ */
diff --git a/htdocs/mescontacts_ldif.php b/htdocs/mescontacts_ldif.php
index 6b742d5..e28bb1b 100644
--- a/htdocs/mescontacts_ldif.php
+++ b/htdocs/mescontacts_ldif.php
@@ -36,7 +36,6 @@ $req = mysql_query("SELECT contact AS id, date, prenom, nom, epouse, username, m
                     WHERE c.uid ='{$_SESSION['uid']}'
                     ORDER BY contact");
 while($line = mysql_fetch_assoc($req)) {
-    $line['addr'] = Array();
     $contacts[$line['id']] = ensure_adr($line);
 }
 mysql_free_result($req);
@@ -51,19 +50,20 @@ $req = mysql_query(
         INNER JOIN adresses      AS a  ON (a.uid = c.contact)
         LEFT  JOIN geoloc_pays   AS gp ON (a.pays = gp.a2)
         LEFT  JOIN geoloc_region AS gr ON (a.pays = gr.a2 AND a.region = gr.region)
-        WHERE c.uid = {$_SESSION['uid']} 
-        ORDER BY c.contact, FIND_IN_SET('active', a.statut), NOT FIND_IN_SET('res-secondaire', a.statut)"
+        WHERE c.uid = {$_SESSION['uid']} AND FIND_IN_SET('active', a.statut)
+            AND NOT FIND_IN_SET('res-secondaire', a.statut)
+        ORDER BY c.contact
+        "
 );
+echo mysql_error();
 while($line = mysql_fetch_assoc($req))
-    $contacts[$line['id']]['addr'][] = ensure_adr($line);
+    $contacts[$line['id']]['home'] = ensure_adr($line);
 mysql_free_result($req);
-
 $page->assign_by_ref('contacts',$contacts);
 
 header("Pragma: ");
 header("Cache-Control: ");
-#header("Content-type: text/x-ldif\n");
-header("Content-type: text/plain\n");
+header("Content-type: text/x-ldif\n");
 
 $page->display('mescontacts_ldif.tpl');
 ?>
diff --git a/templates/mescontacts_ldif.tpl b/templates/mescontacts_ldif.tpl
index 959fd46..bc7d7af 100644
--- a/templates/mescontacts_ldif.tpl
+++ b/templates/mescontacts_ldif.tpl
@@ -1,4 +1,4 @@
-{* $Id: mescontacts_ldif.tpl,v 1.1 2004-02-13 17:01:23 x2000habouzit Exp $ *}
+{* $Id: mescontacts_ldif.tpl,v 1.2 2004-02-15 15:45:29 x2000habouzit Exp $ *}
 {* http://developer.kde.org/documentation/library/cvs-api/kabc/html/ldifconverter_8cpp-source.html *}
 {foreach item=c from=$contacts}
 {******************************************************************************}
@@ -25,6 +25,7 @@ cellphone: {$c.mobile|utf8}
 {/if}
 {if $vcard.web}
 homeurl:: {$vcard.web|ldif_format}
+workurl:: {$vcard.web|ldif_format}
 {/if}
 {******************************************************************************}
 {* ENTREPRISE/WORK                                                            *}
@@ -72,37 +73,34 @@ facsimiletelephonenumber: {$c.faxx|utf8}
 {/if}
 {/if}
 {******************************************************************************}
-{* ADDRESSES PERSO                                                            *}
+{* ADDRESSE PERSO                                                             *}
 {******************************************************************************}
-{foreach item=adr from=$c.addr}
-{* adr1, adr2, adr3, cp, ville, gp.pays, gr.name, tel, fax, courrier *}
-{if $adr.adr_fmt}
-streethomeaddress:: {$adr.adr_fmt|ldif_format}
+{if $c.home.adr_fmt}
+streethomeaddress:: {$c.home.adr_fmt|ldif_format}
 {/if}
-{if $adr.courrier}
-{if $adr.adr0}
-homepostaladdress:: {$adr.adr0|ldif_format}
+{if $c.home.courrier}
+{if $c.home.adr0}
+homepostaladdress:: {$c.home.adr0|ldif_format}
 {/if}
-{if $adr.adr1}
-mozillahomepostaladdress2:: {$adr.adr1|ldif_format}
+{if $c.home.adr1}
+mozillahomepostaladdress2:: {$c.home.adr1|ldif_format}
 {/if}
-{if $adr.adr2}
-mozillahomepostaladdress2:: {$adr.adr2|ldif_format}
+{if $c.home.adr2}
+mozillahomepostaladdress2:: {$c.home.adr2|ldif_format}
 {/if}
-{if $adr.cp}
-mozillahomepostalcode: {$adr.cp|utf8}
+{if $c.home.cp}
+mozillahomepostalcode: {$c.home.cp|utf8}
 {/if}
 {/if}
-{if $adr.ville}
-mozillahomelocalityname:: {$adr.ville|ldif_format}
+{if $c.home.ville}
+mozillahomelocalityname:: {$c.home.ville|ldif_format}
 {/if}
-{if $adr.name}
-mozillahomestate:: {$adr.name|ldif_format}
+{if $c.home.name}
+mozillahomestate:: {$c.home.name|ldif_format}
 {/if}
-{if $adr.pays}
-mozillahomecountryname:: {$adr.name|ldif_format}
+{if $c.home.pays}
+mozillahomecountryname:: {$c.home.name|ldif_format}
 {/if}
-{/foreach}
 {******************************************************************************}
 {* ADDRESSES PERSO                                                            *}
 {******************************************************************************}