Merge commit 'origin/master' into fusionax

[platal.git] / templates / profile / jobs.tpl

diff --git a/templates/profile/jobs.tpl b/templates/profile/jobs.tpl
index 69022ff..7e1a227 100644 (file)
--- a/templates/profile/jobs.tpl
+++ b/templates/profile/jobs.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  *}
@@ -20,39 +20,75 @@
 {*                                                                        *}
 {**************************************************************************}
 
-
-{foreach from=$entreprises item=job key=i}
-<div id="{"job_`$i`_cont"}">
-{include file="profile/jobs.job.tpl" i=$i job=$job}
-</div>
+{foreach from=$jobs item=job key=i}
+{include file="profile/jobs.job.tpl" i=$i job=$job new=false}
 {/foreach}
 {if $jobs|@count eq 0}
-<div id="job_0_cont">
-{include file="profile/jobs.job.tpl" i=0 job=0}
-</div>
+{include file="profile/jobs.job.tpl" i=0 job=0 new=true}
 {/if}
 
 <div id="add_job" class="center">
   <a href="javascript:addJob()">
     {icon name=add title="Ajouter un emploi"} Ajouter un emploi
   </a>
+  <br/><br/>
 </div>
 
-<table class="bicol" summary="CV">
+<table class="bicol" style="margin-bottom: 1em" summary="Corps">
+  <tr>
+    <th colspan="2">
+      <div class="flags" style="float: left; text-align: left">
+        {include file="include/flags.radio.tpl" name="corps[pub]" val=$corps.pub}
+      </div>
+      Corps
+    </th>
+  </tr>
+  <tr>
+    <td class="titre">Corps d'origine</td>
+    <td>
+      <select name="corps[original]">
+        {foreach from=$original_corps item=o_corps}
+        <option value="{$o_corps.id}" {if $o_corps.id eq $corps.original}selected="selected"{/if}>{$o_corps.name}</option>
+        {/foreach}
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td class="titre">Corps actuel</td>
+    <td>
+      <select name="corps[current]">
+        {foreach from=$current_corps item=c_corps}
+        <option value="{$c_corps.id}" {if $c_corps.id eq $corps.current}selected="selected"{/if}>{$c_corps.name}</option>
+        {/foreach}
+      </select>
+    </td>
+  </tr>
+  <tr>
+    <td class="titre">Grade</td>
+    <td>
+      <select name="corps[rank]">
+        {foreach from=$corps_rank item=rank}
+        <option value="{$rank.id}" {if $rank.id eq $corps.rank}selected="selected"{/if}>{$rank.name}</option>
+        {/foreach}
+      </select>
+    </td>
+  </tr>
+</table>
+
+<table class="bicol" summary="CV" style="margin-top: 1.5em">
   <tr>
     <th>
-      Informations professionnelles - CV
+      <div class="flags" style="float: left">
+        <input type="checkbox" name="accesCV" checked="checked" disabled="disabled" />
+        {icon name="flag_red" title="privé"}
+      </div>
+      Curriculum vitae
     </th>
   </tr>
   <tr>
     <td>
       <div style="float: left; width: 25%">
-        <div class="titre">Curriculum vitae&nbsp;:</div>
-        <div class="flags">
-          <span class="rouge"><input type="checkbox" name="accesCV" checked="checked" disabled="disabled" /></span>
-          <span class="texte">privé</span>
-        </div>
-        <div class="smaller" style="margin-top: 30px">
+        <div class="smaller" style="margin-top: 40px">
           <a href="Xorg/FAQ?display=light#cv" class="popup_800x480">
             {icon name="lightbulb" title="Astuce"}Comment remplir mon CV&nbsp;?
           </a><br />
@@ -67,7 +103,7 @@
       </div>
       <div style="float: right">
         <div id="cv_preview" style="display: none"></div>
-        <textarea name="cv" id="cv" rows="15" cols="55">{$cv}</textarea>
+        <textarea name="cv" {if $errors.cv}class="error"{/if} id="cv" rows="15" cols="55">{$cv}</textarea>
       </div>
     </td>
   </tr>