X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=templates%2Fgeoloc%2Fform.address.tpl;h=544eed034ecc7327efbfcbdd078f889fc3f77eed;hb=ce3e0af3b4e5d28ef40c2107ed4f172766377824;hp=ea8b01a895135e49d5b001be9ce2ef8eafef2bc1;hpb=425684231dd5c496b78399ee07c6d2123b836eeb;p=platal.git

diff --git a/templates/geoloc/form.address.tpl b/templates/geoloc/form.address.tpl
index ea8b01a..544eed0 100644
--- a/templates/geoloc/form.address.tpl
+++ b/templates/geoloc/form.address.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2010 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,48 +20,38 @@
 {*                                                                        *}
 {**************************************************************************}
 
-{if $address.geoloc}
+{if t($address.geocodedText)}
 <div class="erreur center {$prefid}_geoloc">
   Le géocodage n'a pas donné un résultat certain&nbsp;! Tu as le choix entre&nbsp;:
 </div>
 <div class="{$prefid}_geoloc">
   <ul>
-    <li><a href="javascript:validGeoloc('{$id}', 0)" style="color: red">ton adresse (à gauche)</a>&nbsp;;</li>
-    <li><a href="javascript:validGeoloc('{$id}', 1)" style="color: green">notre suggestion (à droite)</a>&nbsp;;</li>
-    <li><a href="javascript:validGeoloc('{$id}', 2)"
+    <li><a href="javascript:validGeoloc('{$prefid}','{$id}',2)"
            title="Garder le texte de l'adresse que tu as renseignée tout en utilisant les informations trouvées par le géocodage pour te localiser sur le planisphère et dans lors d'une recherche dans l'annuaire.">
       le texte de ton adresse localisé à l'endroit que nous te suggérons</a>.</li>
+    <li><a href="javascript:validGeoloc('{$prefid}','{$id}',0)" style="color: red">ton adresse (à gauche)</a>&nbsp;;</li>
+    <li><a href="javascript:validGeoloc('{$prefid}','{$id}',1)" style="color: green">notre suggestion (à droite)</a>&nbsp;;</li>
   </ul>
 </div>
 {/if}
 
 <div>
-  <textarea name="{$prefname}[text]" cols="30" rows="4" onkeyup="addressChanged({$id})"
-            {if $address.geoloc}class="error"{/if}>{$address.text}</textarea>
-{if $address.geoloc}
-  <textarea cols="30" rows="4" class="valid {$prefid}_geoloc"
-            name="{$prefname}[geoloc]">{$address.geoloc}</textarea>
+  <textarea name="{$prefname}[text]" cols="30" rows="4" onkeyup="addressChanged('{$prefid}')"
+            {if t($address.geocodedText)}class="error"{/if}>{$address.text}</textarea>
+{if t($address.geocodedText)}
+  <textarea cols="30" rows="4" class="valid {$prefid}_geoloc">{$address.geocodedText}</textarea>
 {/if}
 </div>
-{if $address.geoloc}
-<input type="hidden" name="{$prefname}[geoloc_choice]" value="1" />
-<input type="hidden" name="{$prefname}[geoloc]" value="{$address.geoloc}" />
-<input type="hidden" name="{$prefname}[geocodedPostalText]" value="{$address.geocodedPostalText}" />
-<input type="hidden" name="{$prefname}[updateTime]" value="{$address.updateTime}" />
+{if !$isMe}<div><small><strong>Adress postale&nbsp;:</strong><br />{$address.postalText|nl2br}</small></div>{/if}
+{if t($address.geocodedText)}
+<input type="hidden" name="{$prefname}[geocodeChosen]" value="1" />
+<input type="hidden" name="{$prefname}[geocodedText]" value="{$address.geocodedText}" />
 {/if}
-<input type="hidden" name="{$prefname}[type]" value="{$address.type}" />
 <input type="hidden" name="{$prefname}[accuracy]" value="{$address.accuracy}" />
-<input type="hidden" name="{$prefname}[postalAddress]" value="{$address.postalAddress}" />
 <input type="hidden" name="{$prefname}[postalText]" value="{$address.postalText}" />
-<input type="hidden" name="{$prefname}[line1]" value="{$address.line1}" />
-<input type="hidden" name="{$prefname}[line2]" value="{$address.line2}" />
-<input type="hidden" name="{$prefname}[line3]" value="{$address.line3}" />
 <input type="hidden" name="{$prefname}[postalCode]" value="{$address.postalCode}" />
 <input type="hidden" name="{$prefname}[administrativeAreaId]" value="{$address.administrativeAreaId}" />
 <input type="hidden" name="{$prefname}[subAdministrativeAreaId]" value="{$address.subAdministrativeAreaId}" />
-<input type="hidden" name="{$prefname}[locality]" value="{$address.locality}" />
-<input type="hidden" name="{$prefname}[administrativeArea]" value="{$address.administrativeArea}" />
-<input type="hidden" name="{$prefname}[subAdministrativeArea]" value="{$address.subAdministrativeArea}" />
 <input type="hidden" name="{$prefname}[localityId]" value="{$address.localityId}" />
 <input type="hidden" name="{$prefname}[countryId]" value="{$address.countryId}" />
 <input type="hidden" name="{$prefname}[latitude]" value="{$address.latitude}" />
@@ -70,8 +60,6 @@
 <input type="hidden" name="{$prefname}[south]" value="{$address.south}" />
 <input type="hidden" name="{$prefname}[east]" value="{$address.east}" />
 <input type="hidden" name="{$prefname}[west]" value="{$address.west}" />
-<input type="hidden" name="{$prefname}[cedex]" value="{$address.cedex}" />
-<input type="hidden" name="{$prefname}[updateTime]" value="{$address.updateTime}" />
 <input type="hidden" name="{$prefname}[changed]" value="0" />
 <input type="hidden" name="{$prefname}[removed]" value="0" />