Index: trunk/apps/main/config/routing.yml
===================================================================
--- trunk/apps/main/config/routing.yml (revision 75)
+++ trunk/apps/main/config/routing.yml (revision 79)
@@ -203,5 +203,5 @@
 job_add:
   url:   /job/add
-  param: { module: jobs, action: add }
+  param: { module: jobs, action: edit }
 
 job_edit:
Index: trunk/apps/main/config/filters.yml
===================================================================
--- trunk/apps/main/config/filters.yml (revision 48)
+++ trunk/apps/main/config/filters.yml (revision 79)
@@ -12,6 +12,6 @@
   class:    conditionalCacheFilter
 
-highlight:
-  class:    sfLuceneHighlightFilter
+#highlight:
+#  class:    sfLuceneHighlightFilter
 
 cache:     ~
Index: trunk/apps/main/lib/myUser.class.php
===================================================================
--- trunk/apps/main/lib/myUser.class.php (revision 66)
+++ trunk/apps/main/lib/myUser.class.php (revision 79)
@@ -27,7 +27,7 @@
     return parent::getGuardUser();
   }
-  
+
   /**
-   * Returns current session storage instance 
+   * Returns current session storage instance
    *
    * @return sfSessionStorage
@@ -36,4 +36,14 @@
   {
     return $this->storage;
+  }
+
+  /**
+   * Retrieves related user companies
+   *
+   * @return array
+   */
+  public function getRelatedCompanies()
+  {
+    return $this->getGuardUser()->getCompaniesArray($this->isAdmin() ? 'all' : 'related');
   }
 
Index: trunk/apps/main/modules/mail/actions/actions.class.php
===================================================================
--- trunk/apps/main/modules/mail/actions/actions.class.php (revision 56)
+++ trunk/apps/main/modules/mail/actions/actions.class.php (revision 79)
@@ -8,15 +8,15 @@
 class mailActions extends myActions
 {
-  
+
   public function executeContact(sfWebRequest $request)
   {
     $this->message = $request->getAttribute('message');
   }
-  
+
   public function executeForgotPassword(sfWebRequest $request)
   {
     $this->password = $request->getAttribute('password');
   }
-  
+
   public function executeRegister(sfWebRequest $request)
   {
@@ -24,10 +24,10 @@
     $this->activation = $request->getAttribute('activation');
   }
-  
+
   public function executeResendActivation(sfWebRequest $request)
   {
     $this->activation = $request->getAttribute('activation');
   }
-  
+
   public function executeCompanyContact(sfWebRequest $request)
   {
@@ -36,5 +36,5 @@
     $this->company = $request->getAttribute('company');
   }
-  
+
   public function executePersonContact(sfWebRequest $request)
   {
@@ -43,5 +43,5 @@
     $this->message = $request->getAttribute('message');
   }
-  
+
   public function executeRecommendationReceived(sfWebRequest $request)
   {
@@ -50,4 +50,9 @@
     $this->recommendation = $request->getAttribute('recommendation');
   }
-  
+
+  public function executeTest()
+  {
+
+  }
+
 }
Index: trunk/apps/main/modules/jobs/actions/actions.class.php
===================================================================
--- trunk/apps/main/modules/jobs/actions/actions.class.php (revision 75)
+++ trunk/apps/main/modules/jobs/actions/actions.class.php (revision 79)
@@ -9,32 +9,31 @@
 {
 
-  public function executeAdd()
-  {
-    $this->job = new Job();
-    if ($this->getRequest()->getMethod() == sfRequest::POST)
-    {
-      $this->updateFromRequest();
+  public function executeEdit($request)
+  {
+    if (!is_null($request->getParameter('slug')))
+    {
+      $this->job = $this->getFromSlug();
+
+      if (!$this->getUser()->isAdmin() && $this->job->getContactId() != $this->getUser()->getId())
+      {
+        $this->getUser()->setFlash('warning', $this->__('You are not allowed to edit this record'));
+        $this->redirect('@job_page?slug='.$this->job->getSlug());
+      }
+    }
+    else
+    {
+      $this->job = new Job();
+      $this->setTemplate('add');
+    }
+
+    $this->job->setContactId($this->getUser()->getId());
+    $this->form = new JobForm($this->job, array('userCompanies' => $this->getUser()->getRelatedCompanies()));
+
+    if ($request->isMethod('post') && $this->form->bindAndSave($request->getParameter('job')))
+    {
       parent::purgeObjectRelatedCache($this->job);
-      $this->getUser()->setFlash('notice', $this->getI18N()->__('Job offer published'));
-      $this->redirect('@job_page?slug='.$this->job->getSlug());
-    }
-  }
-
-  public function executeEdit()
-  {
-    $this->job = $this->getFromSlug();
-
-    if (!$this->getUser()->isAdmin() && $this->job->getContactId() != $this->getUser()->getId())
-    {
-      $this->getUser()->setFlash('warning', $this->getI18N()->__('You are not allowed to edit this record'));
-      $this->redirect('@job_page?slug='.$this->job->getSlug());
-    }
-
-    if ($this->getRequest()->getMethod() == sfRequest::POST)
-    {
-      $this->updateFromRequest();
-      parent::purgeObjectRelatedCache($this->job);
-      $this->getUser()->setFlash('notice', $this->getI18N()->__('Job offer has been updated'));
-      $this->redirect('@job_page?slug='.$this->job->getSlug());
+
+      $this->getUser()->setFlash('notice', $this->__('Job offer has been updated'));
+      $this->redirect('@job_page?slug='.$this->form->getObject()->getSlug());
     }
   }
@@ -48,5 +47,5 @@
     if (!is_null($this->job->getExpiresAt()) && $this->job->getExpiresAt(null) < time())
     {
-      $this->getUser()->setFlash('warning', $this->getI18N()->__('This job offer is perempted'));
+      $this->getUser()->setFlash('warning', $this->__('This job offer is perempted'));
     }
   }
@@ -57,5 +56,5 @@
     if (!$this->getUser()->isAdmin() && $this->getUser()->getId() != $this->job->getContactId())
     {
-      $this->getUser()->setFlash('warning', $this->getI18N()->__('You are not allowed to delete this job offer'));
+      $this->getUser()->setFlash('warning', $this->__('You are not allowed to delete this job offer'));
     }
     else
@@ -63,5 +62,5 @@
       parent::purgeObjectRelatedCache($this->job);
       $this->job->delete();
-      $this->getUser()->setFlash('notice', $this->getI18N()->__('Job offer has been deleted'));
+      $this->getUser()->setFlash('notice', $this->__('Job offer has been deleted'));
     }
     $this->redirect('@jobs_home');
@@ -150,16 +149,4 @@
   }
 
-  public function handleErrorAdd()
-  {
-    $this->job = new Job();
-    return sfView::SUCCESS;
-  }
-
-  public function handleErrorEdit()
-  {
-    $this->job = $this->getFromSlug();
-    return sfView::SUCCESS;
-  }
-
   protected function renderHomeAsFeed(Criteria $c)
   {
@@ -221,31 +208,3 @@
     $this->feed = $feed;
   }
-
-  protected function updateFromRequest()
-  {
-    $job_data = $this->getRequestParameter('job', array());
-    if (!isset($job_data['teleworking']))
-    {
-      $job_data['teleworking'] = false;
-    }
-    if (isset($job_data['expires_at']) && $job_data['expires_at'] == '')
-    {
-      unset($job_data['expires_at']);
-    }
-    try
-    {
-      if (!$this->getUser()->isAdmin() or ($this->getUser()->isAdmin() && $this->job->isNew()))
-      {
-        $this->job->setContactId($this->getUser()->getId());
-      }
-      $this->job->fromArray($job_data, BasePeer::TYPE_FIELDNAME);
-      return $this->job->save();
-    }
-    catch (Exception $e)
-    {
-      $this->getRequest()->setError('errors', $this->getI18N()->__('Unable to save this record'));
-      sfContext::getInstance()->getLogger()->err('Blocking error at job save time: '.$e->getMessage());
-      return sfView::SUCCESS;
-    }
-  }
 }
Index: trunk/apps/main/modules/jobs/templates/editSuccess.php
===================================================================
--- trunk/apps/main/modules/jobs/templates/editSuccess.php (revision 2)
+++ trunk/apps/main/modules/jobs/templates/editSuccess.php (revision 79)
@@ -5,6 +5,7 @@
 
 <?php include_partial('jobs/form',
-                      array('job'          => $job,
+                      array('job'          => $form->getObject(),
+                            'form'         => $form,
                             'title'        => $page_title,
-                            'form_route'   => '@job_edit?slug='.$job->getSlug(),
+                            'form_route'   => '@job_edit?slug='.$form->getObject()->getSlug(),
                             'submit_label' => __('Update this job offer'))) ?>
Index: trunk/apps/main/modules/jobs/templates/addSuccess.php
===================================================================
--- trunk/apps/main/modules/jobs/templates/addSuccess.php (revision 2)
+++ trunk/apps/main/modules/jobs/templates/addSuccess.php (revision 79)
@@ -5,5 +5,6 @@
 
 <?php include_partial('jobs/form',
-                      array('job'          => $job,
+                      array('job'          => $form->getObject(),
+                            'form'         => $form,
                             'title'        => $page_title,
                             'form_route'   => '@job_add',
Index: trunk/apps/main/modules/jobs/templates/_form.php
===================================================================
--- trunk/apps/main/modules/jobs/templates/_form.php (revision 64)
+++ trunk/apps/main/modules/jobs/templates/_form.php (revision 79)
@@ -10,29 +10,27 @@
 </p>
 
-<form action="<?php echo url_for($form_route) ?>" method="post" enctype="multipart/form-data">
+<form action="<?php echo url_for($form_route) ?>" method="post">
   <div class="fiftypercent">
     <fieldset>
       <legend><?php echo __('Basic informations') ?></legend>
       <div class="form-row required">
-        <label for="title"><?php echo __('Job title') ?></label>
-        <?php echo object_input_tag($job, 'getTitle', 'name=job[title]', $sf_params->get('job[title]')) ?>
-        <?php echo form_error('job[title]') ?>
+        <?php echo $form['title']->renderLabel(__('Job title')) ?>
+        <?php echo $form['title']->render() ?>
+        <?php echo $form['title']->renderError() ?>
       </div>
       <div class="form-row required">
-        <label for="summary"><?php echo __('Summary') ?></label>
-        <?php echo object_textarea_tag($job, 'getSummary', 'name=job[summary] rows=13', $sf_params->get('job[summary]')) ?>
-        <?php echo form_error('job[summary]') ?>
+        <?php echo $form['summary']->renderLabel(__('Summary')) ?>
+        <?php echo $form['summary']->render() ?>
+        <?php echo $form['summary']->renderError() ?>
       </div>
       <div class="form-row">
-        <label for="budget"><?php echo __('Budget') ?></label>
-        <?php echo object_input_tag($job, 'getBudget', 'name=job[budget]', $sf_params->get('job[budget]')) ?>
-        <?php echo form_error('job[budget]') ?>
+        <?php echo $form['budget']->renderLabel(__('Budget')) ?>
+        <?php echo $form['budget']->render() ?>
+        <?php echo $form['budget']->renderError() ?>
       </div>
       <div class="form-row">
-        <?php echo object_checkbox_tag($job, 'getTeleworking', 'name=job[teleworking]', $sf_params->get('job[teleworking]')) ?>
-        <label for="teleworking" class="inline">
-          <?php echo __('Possible teleworking?') ?>
-        </label>
-        <?php echo form_error('job[teleworking]') ?>
+        <?php echo $form['teleworking']->render() ?>
+        <?php echo $form['teleworking']->renderLabel(__('Possible teleworking?'), array('class' => 'inline')) ?>
+        <?php echo $form['teleworking']->renderError() ?>
       </div>
     </fieldset>
@@ -42,15 +40,11 @@
       <legend><?php echo __('Contact informations') ?></legend>
       <div class="form-row">
-        <label for="company_id"><?php echo __('Is the job offered by a company you\'re related to?') ?></label>
-      	<?php echo select_tag('job[company_id]',
-                                    options_for_select($sf_user->getGuardUser()->getCompaniesArray($sf_user->isAdmin() ? 'all' : 'related'),
-                                                       $sf_request->getParameter('job[company_id]', $job->getCompanyId()),
-                                                       array('include_custom' => __('No')))) ?>
-      	<?php echo form_error('job[company_id]') ?>
+        <?php echo $form['company_id']->renderLabel(__('Is the job offered by a company you\'re related to?')) ?>
+        <?php echo $form['company_id']->render() ?>
+        <?php echo $form['company_id']->renderError() ?>
         <p class="form-help">
           <?php echo __('If you don\'t select a company you will be directly contacted by applicants.') ?>
           <?php echo __('Your company is not listed above? %add_link%.',
-                        array('%add_link%' => link_to(__('Add it now'),
-                                                      '@company_add'))) ?>
+                        array('%add_link%' => link_to(__('Add it now'), '@company_add'))) ?>
         </p>
       </div>
@@ -61,7 +55,7 @@
       <legend><?php echo __('Localization') ?></legend>
       <div class="form-row">
-        <label for="city"><?php echo __('City') ?></label>
-        <?php echo object_input_tag($job, 'getCity', 'name=job[city]', $sf_params->get('job[city]')) ?>
-        <?php echo form_error('job[city]') ?>
+        <?php echo $form['city']->renderLabel(__('City')) ?>
+        <?php echo $form['city']->render() ?>
+        <?php echo $form['city']->renderError() ?>
         <div class="form_help">
           <?php echo __('Please enter only one city name. If you have job offers on distinct locations, please post one job offer per location.') ?>
@@ -69,17 +63,19 @@
       </div>
       <div class="form-row">
-        <label for="state"><?php echo __('State (if applicable)') ?></label>
-        <?php echo object_input_tag($job, 'getState', 'name=job[state]', $sf_params->get('job[state]')) ?>
-        <?php echo form_error('job[state]') ?>
+        <?php echo $form['state']->renderLabel(__('State (if applicable)')) ?>
+        <?php echo $form['state']->render() ?>
+        <?php echo $form['state']->renderError() ?>
       </div>
       <div class="form-row">
-        <label for="country"><?php echo __('Country') ?></label>
-        <?php echo object_select_country_tag($job, 'getCountry', 'name=job[country] include_custom='.__('Select a country'), $sf_params->getRawValue()->get('job[country]')) ?>
-        <?php echo form_error('job[country]') ?>
+        <?php echo $form['country']->renderLabel(__('Country')) ?>
+        <?php echo $form['country']->render() ?>
+        <?php echo $form['country']->renderError() ?>
       </div>
       <div class="form-row">
-        <label for="expires_at"><?php echo __('Job offer expiration date (yyyy-mm-dd)') ?></label>
-        <?php echo object_input_date_tag($job, 'getExpiresAt', 'name=job[expires_at] format=Y-MM-dd rich=true class=date_select', $sf_params->get('job[expires_at]')) ?>
-        <?php echo form_error('job[expires_at]') ?>
+        <div class="date_select">
+          <?php echo $form['expires_at']->renderLabel(__('Job offer expiration date (yyyy-mm-dd)')) ?>
+          <?php echo $form['expires_at']->render() ?>
+          <?php echo $form['expires_at']->renderError() ?>
+        </div>
       </div>
     </fieldset>
@@ -87,5 +83,7 @@
   <div class="form-row" style="text-align:center;clear:left;">
     <p>
-      <?php echo submit_tag($submit_label) ?>
+      <?php echo $form['_csrf_token'] ?>
+      <?php echo $form['id'] ?>
+      <input type="submit" value="<?php echo $submit_label ?>"/>
     </p>
   </div>
Index: trunk/apps/main/templates/_messages.php
===================================================================
--- trunk/apps/main/templates/_messages.php (revision 75)
+++ trunk/apps/main/templates/_messages.php (revision 79)
@@ -6,5 +6,5 @@
     <?php echo $activeForm->renderGlobalErrors() ?>
   </div>
-  <?php elseif (count($activeForm->getErrorSchema())): ?>
+  <?php elseif (count($activeForm->getErrorSchema()) > 0): ?>
   <div class="global-form-errors">
     <h4><?php echo __('Errors have been encountered') ?></h4>