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

diff --git a/templates/geoloc/form.address.tpl b/templates/geoloc/form.address.tpl
index cf589af..033c3c0 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-2011 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,55 +20,32 @@
 {*                                                                        *}
 {**************************************************************************}
 
-{if $address.geoloc}
-<div class="erreur {$prefid}_geoloc">
-  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>
-{/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>
-</div>
-<div class="center {$prefid}_geoloc">
-  <a href="javascript:validGeoloc('{$id}', 0)">Valider ta version</a>
-  &bull;
-  <a href="javascript:validGeoloc('{$id}', 1)">Valider la version géolocalisée</a>
-{/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}[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}[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}" />
-<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" />
+<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: *}