X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fgeoloc%2Fform.address.tpl;h=666f779efa1fa0f3e1ce140a649da14ca5be4a9c;hb=bba75eda287510a87b7af689e02aef421bfaab90;hp=ef72a4cae207b65a749f9866c2dba4915475abbc;hpb=0b14f91d0a35ef3228101b9740164582a266ce04;p=platal.git

diff --git a/templates/geoloc/form.address.tpl b/templates/geoloc/form.address.tpl
index ef72a4c..666f779 100644
--- a/templates/geoloc/form.address.tpl
+++ b/templates/geoloc/form.address.tpl
@@ -22,25 +22,34 @@
 
 <input type="hidden" name="{$name}[changed]" value="0"/>
 {if $adr.geoloc}
-<div class="erreur">
+<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}class="error"{/if}
+          {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>
-<p class="center">
-  <input type="submit" name="{$name}[parsevalid]" value="Valider l'adresse" />
-</p>
+<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}" />
@@ -48,5 +57,10 @@
 <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}" />
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}