X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=templates%2Fgeoloc%2Fform.address.tpl;h=229d1e84cfcdfcd02280f8542f4d821d92e30e7a;hb=96d80a35f4abef2b94d2f2b8f5442230141398d1;hp=0091eaa757e8a1996fe0835da4b8f04d2d51235e;hpb=50a40a33a496131e817df875607ea5542d096a64;p=platal.git

diff --git a/templates/geoloc/form.address.tpl b/templates/geoloc/form.address.tpl
index 0091eaa..229d1e8 100644
--- a/templates/geoloc/form.address.tpl
+++ b/templates/geoloc/form.address.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2006 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2009 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,36 +20,51 @@
 {*                                                                        *}
 {**************************************************************************}
 
-    {if $adr.geoloc}
-    <tr>
-      <td class="cold" colspan="5">
-        <input type="hidden" name="change{$adrid}" value="0"/>
-	<span class="erreur">La geolocalisation n'a pas donné un résultat certain, valide la nouvelle adresse ou modifie l'ancienne pour que ton adresse puisse être prise en compte.</span><br />
-	<script type="text/javascript">setTimeout("document.location += '#adr{$adrid}'", 10);</script>
-        <textarea name="txt[{$adrid}]" cols="30" rows="4" onchange="form.change{$adrid}.value=1"
-	{if !$adr.cityid}style="background:#FAA"{/if}
-	>{$adr.txt}</textarea>
-	  <textarea cols="30" rows="4"
-	  style="border:inherit;background:#AFA"
-	  onclick="blur()"
-	>{$adr.geoloc}</textarea><p class="right">
-	[<a href="{$smarty.server.PHP_SELF}?old_tab={$smarty.request.old_tab}&amp;parsevalid[{$adrid}]=1&amp;modifier=1">Valider</a>]
-	</p>
-    {else}
-    <tr class="center">
-      <td class="cold" colspan="2">
-        <input type="hidden" name="change{$adrid}" />
-        <textarea name="txt[{$adrid}]" cols="43" rows="4" onchange="form.change{$adrid}.value=1"
-	{if $adr.nouvelle != 'new' && !$adr.cityid}style="background:#FAA"{/if}
-	>{$adr.txt}</textarea>
-	{/if}
-        <input type="hidden" name="cityid[{$adrid}]" value="{$adr.cityid}" />
-        <input type="hidden" name="adr1[{$adrid}]" value="{$adr.adr1}" />
-        <input type="hidden" name="adr2[{$adrid}]" value="{$adr.adr2}" />
-        <input type="hidden" name="adr3[{$adrid}]" value="{$adr.adr3}" />
-        <input type="hidden" name="postcode[{$adrid}]" value="{$adr.postcode}"/>
-        <input type="hidden" name="city[{$adrid}]" value="{$adr.city}" />
-        <input type="hidden" name="country[{$adrid}]" value="{$adr.country}" />
-        <input type="hidden" name="region[{$adrid}]" value="{$adr.region}" />
-      </td>
-    </tr>
+{if $address.geoloc}
+<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('{$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>
+    <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>
+  </ul>
+</div>
+{/if}
+
+<div>
+  <textarea name="{$prefname}[text]" cols="30" rows="4" onkeyup="addressChanged('{$prefid}')"
+            {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>
+{/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}
+<input type="hidden" name="{$prefname}[accuracy]" value="{$address.accuracy}" />
+<input type="hidden" name="{$prefname}[postalText]" value="{$address.postalText}" />
+<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}[localityId]" value="{$address.localityId}" />
+<input type="hidden" name="{$prefname}[countryId]" value="{$address.countryId}" />
+<input type="hidden" name="{$prefname}[latitude]" value="{$address.latitude}" />
+<input type="hidden" name="{$prefname}[longitude]" value="{$address.longitude}" />
+<input type="hidden" name="{$prefname}[north]" value="{$address.north}" />
+<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" />
+
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}