Displays where the address has been geocoded in profile edition.

Signed-off-by: Stéphane Jacob <sj@m4x.org>

diff --git a/classes/profile.php b/classes/profile.php
index e63bfe5..5ecfca7 100644 (file)
--- a/classes/profile.php
+++ b/classes/profile.php
@@ -283,6 +283,25 @@ class Profile implements PlExportable
         return 0;
     }
 
+    // Returns the profile's color.
+    public function promoColor()
+    {
+        switch ($this->mainEducation()) {
+          case 'X':
+            if (($this->yearpromo() % 2) === 0) {
+                return 'red';
+            } else {
+                return 'yellow';
+            }
+          case 'M':
+            return 'green';
+          case 'D':
+            return 'blue';
+          default:
+            return 'gray';
+        }
+    }
+
     /** Print a name with the given formatting:
      * %s = • for women
      * %f = firstname

diff --git a/templates/geoloc/form.address.tpl b/templates/geoloc/form.address.tpl
index 0fb4845..aee9584 100644 (file)
--- a/templates/geoloc/form.address.tpl
+++ b/templates/geoloc/form.address.tpl
@@ -20,21 +20,31 @@
 {*                                                                        *}
 {**************************************************************************}
 
-<div><textarea name="{$prefname}[text]" cols="30" rows="4" onkeyup="addressChanged('{$prefid}')">{$address.text}</textarea></div>
-<input type="hidden" name="{$prefname}[accuracy]" value="{$address.accuracy}" />
-<input type="hidden" name="{$prefname}[postalText]" value="{$address.postalText}" />
-<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}[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}[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}[accuracy]" value="{$address.accuracy}" />
+    <input type="hidden" name="{$prefname}[postalText]" value="{$address.postalText}" />
+    <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}[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}[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=300x80&amp;markers=color:{$profile->promoColor()}%7C{$address.longitude},{$address.latitude}&amp;zoom=10&amp;sensor=false"
+         alt="Position de l'adresse" />
+  {/if}
+  </td>
+</tr>
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}

diff --git a/templates/profile/adresses.address.tpl b/templates/profile/adresses.address.tpl
index e39d426..712212c 100644 (file)
--- a/templates/profile/adresses.address.tpl
+++ b/templates/profile/adresses.address.tpl
@@ -40,7 +40,7 @@
 </table>
 <table class="bicol" style="margin-bottom: 1em" id="{$prefid}">
   <tr>
-    <th>
+    <th colspan="2">
       <div style="float: left">
         <label>
           <input name="{$prefname}[current]" type="radio" {if $address.current}checked="checked"{/if}
@@ -57,14 +57,20 @@
     </th>
   </tr>
   <tr {if $hiddenaddr}style="display: none"{/if}>
+    <td colspan="2" class="flags">
+      {include file="include/flags.radio.tpl" name="`$prefname`[pub]" val=$address.pub mainField='addresses' mainId=$i subField='phones' subId=-1}
+    </td>
+  </tr>
+  {include file="geoloc/form.address.tpl" prefname=$prefname prefid=$prefid address=$address id=$i}
+  <tr {if $hiddenaddr}style="display: none"{/if}>
+  {if !$isMe}
     <td>
-      <div style="margin-bottom: 0.2em" class="flags">
-        {include file="include/flags.radio.tpl" name="`$prefname`[pub]" val=$address.pub mainField='addresses' mainId=$i subField='phones' subId=-1}
-      </div>
-      <div style="clear: both"></div>
-      <div style="float: left">
-      {include file="geoloc/form.address.tpl" prefname=$prefname prefid=$prefid address=$address id=$i}
-      </div>
+      <small><strong>Adress postale&nbsp;:</strong><br />{$address.postalText|nl2br}</small>
+    </td>
+    <td>
+  {else}
+    <td colspan="2">
+  {/if}
       <div style="float: left">
         <div>
           <label>
@@ -117,7 +123,7 @@
     </td>
   </tr>
   <tr class="pair" {if $hiddenaddr}style="display: none"{/if}>
-    <td>
+    <td colspan="2">
       {foreach from=$address.phones key=t item=tel}
         <div id="{"`$prefid`_phones_`$t`"}" style="clear: both">
           {include file="profile/phone.tpl" prefname="`$prefname`[phones]" prefid="`$prefid`_phones" telid=$t tel=$tel

diff --git a/templates/profile/jobs.job.tpl b/templates/profile/jobs.job.tpl
index 8150c41..68958f0 100644 (file)
--- a/templates/profile/jobs.job.tpl
+++ b/templates/profile/jobs.job.tpl
@@ -184,20 +184,14 @@
       </td>
     </tr>
     <tr id="{$jobid}_w_address" class="pair" {if $hiddenjob || $hiddenaddr}style="display: none"{/if}>
-      <td colspan="2">
-        <div style="float: left">
-          <div class="titre">Adresse</div>
-          <div class="flags">
-            {include file="include/flags.radio.tpl" name="`$jobpref`[w_address][pub]" val=$job.w_address.pub
-                     subField='w_address' mainField='jobs' mainId=$i subId=''}
-          </div>
-          <div style="margin-top: 20px; clear: both">
-            {include file="geoloc/form.address.tpl" prefname="`$jobpref`[w_address]"
-                     prefid=$jobid address=$job.w_address}
-          </div>
-        </div>
+      <td class="titre">Adresse</td>
+      <td class="flags">
+        {include file="include/flags.radio.tpl" name="`$jobpref`[w_address][pub]" val=$job.w_address.pub
+                 subField='w_address' mainField='jobs' mainId=$i subId=''}
       </td>
     </tr>
+    {include file="geoloc/form.address.tpl" prefname="`$jobpref`[w_address]"
+                     prefid=$jobid address=$job.w_address class="pair"}
     {if $hiddenaddr}
     <tr class="pair">
       <td class="titre" colspan="2">Adresse (masquée)</td>