From 4f06d57b6aa8d9eb04c1d18a081549aa8fb8dc8d Mon Sep 17 00:00:00 2001
From: =?utf8?q?St=C3=A9phane=20Jacob?= <jacou@melix.net>
Date: Wed, 10 Dec 2008 22:56:57 +0100
Subject: [PATCH 1/1] Improves display the job edition interface.

---
 templates/emails/redirect.tpl         |  2 +-
 templates/include/emails.combobox.tpl | 41 ++++++++++++++++++++++++++++-------
 templates/profile/general.tpl         |  4 ++--
 templates/profile/jobs.job.tpl        | 37 ++++++++++++-------------------
 4 files changed, 50 insertions(+), 34 deletions(-)

diff --git a/templates/emails/redirect.tpl b/templates/emails/redirect.tpl
index 512eee9..24dfa0c 100644
--- a/templates/emails/redirect.tpl
+++ b/templates/emails/redirect.tpl
@@ -179,7 +179,7 @@
       {/foreach}
       <form action="emails/redirect" method="post">
         {cycle values="pair,impair" assign=class_combobox}
-        {include file="include/emails.combobox.tpl" name="email" val=$email class=$class_combobox error=$error_email}
+        {include file="include/emails.combobox.tpl" name="email" val=$email class=$class_combobox error=$error_email i="0"}
         <tr class=$class_combobox><td colspan="4"><div>
           <input type="submit" value="ajouter" name="emailop" />
           {xsrf_token_field}
diff --git a/templates/include/emails.combobox.tpl b/templates/include/emails.combobox.tpl
index 628d33a..e24d782 100644
--- a/templates/include/emails.combobox.tpl
+++ b/templates/include/emails.combobox.tpl
@@ -20,15 +20,27 @@
 {*                                                                        *}
 {**************************************************************************}
 
+{assign var=new value="new"|cat:$i}
+{assign var=combobox value="combobox"|cat:$i}
+{if !$isjob}
 <tr {if $class}class="{$class}"{/if}>
   <td>
+{/if}
     <span class="titre">{if $name eq "email_directory"}Email annuaire AX
     {elseif $name eq "email"}Ajouter une adresse email{else}
     Email professionnel{/if}</span>
+{if !$isjob}
   </td>
   {if $name eq "email"}<td></td>{/if}
   <td>
-    <select name="{$name}" id="combobox">
+{else}
+  <br />
+  <span class="flags">
+    {include file="include/flags.radio.tpl" name="`$jobpref`[`$prefix`email_pub]" val=$pub}
+  </span>
+  <br />
+{/if}
+    <select name="{$name}" id="{$combobox}">
       {if $email_type eq "directory"}
         <optgroup label="Email annuaire AX">
           <option value="{$email_directory}" {if
@@ -79,41 +91,54 @@
     {if $name eq "email_directory"}
       <input type="checkbox" disabled="disabled" checked="checked"/>
       {icon name="flag_orange" title="Visible sur l'annuaire"}
-    {elseif $name neq "email"}
+    {elseif ($name neq "email") && (!$isjob)}
       <span class="flags">
         {include file="include/flags.radio.tpl" name="`$jobpref`[`$prefix`email_pub]" val=$pub}
       </span>
     {/if}
     <br />
-    <span class="new" style="display: none">
+    <span class="{$new}" style="display: none">
       <input type="text" maxlength="60" {if $error}class="error" value="{$val}"{/if} name="{if (($name neq "email_directory")
       && ($name neq "email"))}jobs[{$i}][{$prefix}email_new]{else}{$name}_new{/if}"/>
     </span>
     <script type="text/javascript">//<![CDATA[
       {literal}
       $(function() {
-        $("select#combobox").change(function() {
-          $(".new").hide();
-          if ($("select#combobox").val() == "new@example.org") {
-            $(".new").show();
+        var i = {/literal}{$i}{literal};
+        $('select#combobox' + i).change(function() {
+          $('.new' + i).hide();
+          if ($('select#combobox' + i).val() == "new@example.org") {
+            $('.new' + i).show();
           }
         }).change();
       });
       {/literal}
     // ]]></script>
+{if !$isjob}
   </td>
   {if $name eq "email"}<td></td>{/if}
 </tr>
+{else}
+<br />
+{/if}
 {if $name neq "email"}
-  <tr {if $class}class="{$class}"{/if} class="new" style="display: none">
+{if !$isjob}
+  <tr {if $class}class="{$class} {$new}"{else}class="{$new}"{/if} style="display: none">
     <td colspan="2">
+{else}
+  <div class="{$new}" style="display: none">
+{/if}
       <p><small><strong><em>Attention :</em></strong> cette adresse email figurera dans
       {if $name eq "email_directory"}l'annuaire papier{else}tes informations professionnelles
       {/if} mais n'est pas ajoutée à la liste de tes redirections. Nous te conseillons fortement de
       <strong><a href="emails/redirect">l'ajouter là</a></strong>, surtout
       si tu n'en as plus de valide.</small></p>
+{if !$isjob}
     </td>
   </tr>
+{else}
+  </div>
+{/if}
 {/if}
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}
diff --git a/templates/profile/general.tpl b/templates/profile/general.tpl
index ca61ca1..2fb7661 100644
--- a/templates/profile/general.tpl
+++ b/templates/profile/general.tpl
@@ -324,8 +324,8 @@
     </td>
   </tr>
   {if $email_error}
-    {include file="include/emails.combobox.tpl" name="email_directory" val=$email_directory_error error=$email_error}
-  {else}{include file="include/emails.combobox.tpl" name="email_directory" val=$email_directory error=$email_error}{/if}
+    {include file="include/emails.combobox.tpl" name="email_directory" val=$email_directory_error error=$email_error i="0"}
+  {else}{include file="include/emails.combobox.tpl" name="email_directory" val=$email_directory error=$email_error i="0"}{/if}
   <tr>
     <td colspan="2">
       <span class="titre">Messageries, networking et sites web</span>
diff --git a/templates/profile/jobs.job.tpl b/templates/profile/jobs.job.tpl
index 84ce1d1..efa2ae9 100644
--- a/templates/profile/jobs.job.tpl
+++ b/templates/profile/jobs.job.tpl
@@ -44,23 +44,15 @@
         <div class="flags" style="float: left; text-align: left">
           {include file="include/flags.radio.tpl" name="`$jobpref`[pub]" val=$job.pub}
         </div>
-        Entreprise n°{$i+1}
-        <a href="javascript:removeJob('{$jobid}', '{$jobpref}')">
-          {icon name=cross title="Supprimer cet emploi"}
-        </a>
-      </th>
-    </tr>
-    <tr>
-      <td colspan="2" class="center" style="font-style: italic">Ton entreprise</td>
-    </tr>
-    <tr>
-      <td class="titre">Nom de l'entreprise</td>
-      <td>
+        Entreprise n°{$i+1}&nbsp;:
         {if $job.tmp_name}{$job.tmp_name} <small>(en cours de validation)</small>{else}
         <input type="text" class="enterprise_name {if $job.name_error}error{/if}" size="35" maxlength="100"
                name="{$jobpref}[name]" value="{$job.name}" />
         {/if}
-      </td>
+        <a href="javascript:removeJob('{$jobid}', '{$jobpref}')">
+          {icon name=cross title="Supprimer cet emploi"}
+        </a>
+      </th>
     </tr>
     {if !$job.tmp_name}
     <tr class="{$entreprise}">
@@ -78,7 +70,7 @@
       </td>
     </tr>
     <tr class="{$entreprise}" style="display: none">
-      <td class="titre">Page Web</td>
+      <td class="titre">Page web</td>
       <td>
         <input type="text" size="35" maxlength="255" {if $job.hq_web_error}class="error"{/if}
                name="{$jobpref}[hq_web]" value="{$job.hq_web}" />
@@ -174,17 +166,9 @@
       <td class="titre">Description</td>
       <td>
         <input type="text" size="35" maxlength="120" {if $job.description_error}class="error"{/if}
-               name="{$jobpref}[description]" value="{$job.description}" />
-      </td>
-    </tr>
-    <tr class="pair">
-      <td class="titre">Page Web</td>
-      <td>
-        <input type="text" size="35" maxlength="255" {if $job.w_web_error}class="error"{/if}
-               name="{$jobpref}[w_web]" value="{$job.w_web}" />
+           name="{$jobpref}[description]" value="{$job.description}" /><br /><br />
       </td>
     </tr>
-    {include file="include/emails.combobox.tpl" name=$jobpref|cat:'[w_email]' val=$job.w_email class="pair" i=$i error=$job.w_email_error prefix="w_" pub=$job.w_email_pub}
     <tr class="pair">
       <td colspan="2">
         <div style="float: left">
@@ -196,6 +180,13 @@
             {include file="geoloc/form.address.tpl" name="`$jobpref`[w_adr]" id="`$jobid`_adr" adr=$job.w_adr}
           </div>
         </div>
+        <div style="float: right; width: 50%">
+          {include file="include/emails.combobox.tpl" name=$jobpref|cat:'[w_email]' val=$job.w_email
+          class="pair" i=$i error=$job.w_email_error prefix="w_" pub=$job.w_email_pub isjob="1" id=$i}
+          <div class="titre">Page perso</div>
+          <input type="text" size="25" maxlength="255" {if $job.w_web_error}class="error"{/if}
+               name="{$jobpref}[w_web]" value="{$job.w_web}" />
+        </div>
       </td>
     </tr>
     <tr class="pair">
-- 
2.1.4