X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=templates%2Fgeoloc%2Fform.address.tpl;h=63389f77b32b272fd2b34cb9295989a5ca3a506d;hb=6f77cedb7ede2f3559b036e5f9c552bbe8ad125a;hp=ab94e5bab562faad4d24ec8aa0fb9b472c90f5cd;hpb=c24a06aa5a3bc925da5c94518cfcfacbf5615d8a;p=platal.git

diff --git a/templates/geoloc/form.address.tpl b/templates/geoloc/form.address.tpl
index ab94e5b..63389f7 100644
--- a/templates/geoloc/form.address.tpl
+++ b/templates/geoloc/form.address.tpl
@@ -1,6 +1,6 @@
 {**************************************************************************}
 {*                                                                        *}
-{*  Copyright (C) 2003-2007 Polytechnique.org                             *}
+{*  Copyright (C) 2003-2008 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -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}" />
@@ -51,4 +60,7 @@
 <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: *}