projects / platal.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Adds a postal formated address to the addresses data.
[platal.git] / templates / geoloc / form.address.tpl
diff --git a/templates/geoloc/form.address.tpl b/templates/geoloc/form.address.tpl
index 63389f7..cf589af 100644 (file)
--- 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-2009 Polytechnique.org                             *}
 {*  http://opensource.polytechnique.org/                                  *}
 {*                                                                        *}
 {*  This program is free software; you can redistribute it and/or modify  *}
@@ -20,47 +20,55 @@
 {*                                                                        *}
 {**************************************************************************}
 
-<input type="hidden" name="{$name}[changed]" value="0"/>
-{if $adr.geoloc}
-<div class="erreur" id="{$id}_geoloc_error">
+{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>
-<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>
+  <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" id="{$id}_geoloc_valid">
-  <a href="javascript:validAddress('{$id}', '{$name}')">Valider ta version</a>
+<div class="center {$prefid}_geoloc">
+  <a href="javascript:validGeoloc('{$id}', 0)">Valider ta version</a>
   &bull;
-  <a href="javascript:validGeoloc('{$id}', '{$name}')">Valider la version géolocalisée</a>
+  <a href="javascript:validGeoloc('{$id}', 1)">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}" />
+{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" />
+
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}
plat/al