X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=templates%2Fgeoloc%2Fform.address.tpl;h=63389f77b32b272fd2b34cb9295989a5ca3a506d;hb=c7eac294d59c639f26b21920f7d1827d5854c82f;hp=a84734e05f281e0b2dcf91369ff8539f43165fb4;hpb=7b2413f614dc4deafd18501ba3cbe8db398c05e3;p=platal.git

diff --git a/templates/geoloc/form.address.tpl b/templates/geoloc/form.address.tpl
index a84734e..63389f7 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-2008 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,36 +20,47 @@
 {*                                                                        *}
 {**************************************************************************}
 
-    {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="profile/edit/{$onglet}?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>
+<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}" />
+{* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}