X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fgeoloc%2Fform.address.tpl;h=033c3c0c8d02d528ece3afd3cff0ba9a30cffb6c;hb=0f5f1b707d93b4dc8c5875c2129bb38fcd186563;hp=63389f77b32b272fd2b34cb9295989a5ca3a506d;hpb=ebd515f95f03f8a87f9b846d65e179b39a535222;p=platal.git

diff --git a/templates/geoloc/form.address.tpl b/templates/geoloc/form.address.tpl
index 63389f7..033c3c0 100644
--- a/templates/geoloc/form.address.tpl
+++ b/templates/geoloc/form.address.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2011 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,47 +20,32 @@
 {*                                                                        *}
 {**************************************************************************}
 
-<input type="hidden" name="{$name}[changed]" value="0"/>
-{if $adr.geoloc}
-<div class="erreur" id="{$id}_geoloc_error">
-  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.
-</div>
-<script type="text/javascript">setTimeout("document.location += '#{$adid}'", 10);</script>
-{/if}
-<div>
-<textarea name="{$name}[text]" cols="30" rows="4"
-          onchange="form['{$name}[changed]'].value=1"
-          {if !$adr.cityid && $adr.datemaj}class="error"{/if}
-          >{$adr.text}</textarea>
-{if $adr.geoloc}
-<span id="{$id}_geoloc">
-<textarea cols="30" rows="4"
-          class="valid"
-          name="{$name}[geoloc]"
-          onclick="blur()"
-          >{$adr.geoloc}</textarea>
-<input type="hidden" name="{$name}[geoloc_cityid]" value="{$adr.geoloc_cityid}" />
-<input type="hidden" name="{$name}[parsevalid]" value="0" />
-</span>
-</div>
-<div class="center" id="{$id}_geoloc_valid">
-  <a href="javascript:validAddress('{$id}', '{$name}')">Valider ta version</a>
-  &bull;
-  <a href="javascript:validGeoloc('{$id}', '{$name}')">Valider la version géolocalisée</a>
-{/if}
-</div>
-<input type="hidden" name="{$name}[cityid]" value="{$adr.cityid}" />
-<input type="hidden" name="{$name}[adr1]" value="{$adr.adr1}" />
-<input type="hidden" name="{$name}[adr2]" value="{$adr.adr2}" />
-<input type="hidden" name="{$name}[adr3]" value="{$adr.adr3}" />
-<input type="hidden" name="{$name}[postcode]" value="{$adr.postcode}"/>
-<input type="hidden" name="{$name}[city]" value="{$adr.city}" />
-<input type="hidden" name="{$name}[country]" value="{$adr.country}" />
-<input type="hidden" name="{$name}[countrytxt]" value="{$adr.countrytxt}" />
-<input type="hidden" name="{$name}[region]" value="{$adr.region}" />
-<input type="hidden" name="{$name}[regiontxt]" value="{$adr.regiontxt}" />
-<input type="hidden" name="{$name}[checked]" value="{$adr.checked}" />
-<input type="hidden" name="{$name}[precise_lat]" value="{$adr.precise_lat}" />
-<input type="hidden" name="{$name}[precise_lon]" value="{$adr.precise_lon}" />
+<tr{if t($class)} class="{$class}"{/if}>
+  <td>
+    <textarea name="{$prefname}[text]" cols="30" rows="4" onkeyup="addressChanged('{$prefid}')">{$address.text}</textarea>
+    <input type="hidden" name="{$prefname}[postalText]" value="{$address.postalText}" />
+    <input type="hidden" name="{$prefname}[types]" value="{$address.types}" />
+    <input type="hidden" name="{$prefname}[formatted_address]" value="{$address.formatted_address}" />
+    <input type="hidden" name="{$prefname}[latitude]" value="{$address.latitude}" />
+    <input type="hidden" name="{$prefname}[longitude]" value="{$address.longitude}" />
+    <input type="hidden" name="{$prefname}[southwest_latitude]" value="{$address.southwest_latitude}" />
+    <input type="hidden" name="{$prefname}[southwest_longitude]" value="{$address.southwest_longitude}" />
+    <input type="hidden" name="{$prefname}[northeast_latitude]" value="{$address.northeast_latitude}" />
+    <input type="hidden" name="{$prefname}[northeast_longitude]" value="{$address.northeast_longitude}" />
+    <input type="hidden" name="{$prefname}[location_type]" value="{$address.location_type}" />
+    <input type="hidden" name="{$prefname}[partial_match]" value="{$address.partial_match}" />
+    <input type="hidden" name="{$prefname}[componentsIds]" value="{$address.componentsIds}" />
+    <input type="hidden" name="{$prefname}[changed]" value="0" />
+    <input type="hidden" name="{$prefname}[removed]" value="0" />
+  </td>
+  <td>
+  {if t($address.latitude)}
+    <img src="https://maps.googleapis.com/maps/api/staticmap?size=300x100&amp;markers=color:{$profile->promoColor()}%7C{$address.latitude},{$address.longitude}&amp;zoom=12&amp;sensor=false"
+         alt="Position de l'adresse" />
+    <br />
+    <small><a href="javascript:deleteGeocoding()">{icon name=cross title="Adresse mal localisée"} Signaler que le repère est mal placé</a></small>
+  {/if}
+  </td>
+</tr>
+
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}