Merge branch '3.6' of github.com:alchemy-fr/Phraseanet into 3.6

lib/Alchemy/Phrasea/Application/Lightbox.php

@@ -15,6 +15,7 @@ use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\HttpException;
 use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
+use Alchemy\Phrasea\Controller\Exception as ControllerException;
 
 /**
  *
@@ -237,6 +238,7 @@ return call_user_func(
           $basket = $repository->findUserBasket(
             $ssel_id
             , $app['Core']->getAuthenticatedUser()
+            , false
           );
 
           /* @var $twig \Twig_Environment */
@@ -279,6 +281,7 @@ return call_user_func(
           $basket = $repository->findUserBasket(
             $ssel_id
             , $app['Core']->getAuthenticatedUser()
+            , false
           );
 
           /* @var $twig \Twig_Environment */
@@ -353,6 +356,7 @@ return call_user_func(
           $basket = $repository->findUserBasket(
             $ssel_id
             , $app['Core']->getAuthenticatedUser()
+            , false
           );
 
           $response = new Response($twig->render($template, array('basket' => $basket)));
@@ -431,46 +435,61 @@ return call_user_func(
 
           $agreement = $agreement > 0;
 
-          $ret = array(
-            'error'      => true,
-            'releasable' => false,
-            'datas'      => _('Erreur lors de la mise a jour des donnes ')
-          );
-
-          $user       = $app['Core']->getAuthenticatedUser();
-          $em         = $app['Core']->getEntityManager();
-          $repository = $em->getRepository('\Entities\BasketElement');
-
-          /* @var $repository \Repositories\BasketElementRepository */
-          $basket_element = $repository->findUserElement(
-            $sselcont_id
-            , $user
-          );
-          /* @var $basket_element \Entities\BasketElement */
-          $validationDatas = $basket_element->getUserValidationDatas($user);
-
-          $validationDatas->setAgreement($agreement);
-
-          $participant = $basket_element->getBasket()
-            ->getValidation()
-            ->getParticipant($user);
-
-          $em->merge($basket_element);
-
-          $em->flush();
-
           $releasable = false;
-          if($participant->isReleasable() === true)
+          try
           {
-            $releasable = _('Do you want to send your report ?');
+            $ret = array(
+              'error'      => true,
+              'releasable' => false,
+              'datas'      => _('Erreur lors de la mise a jour des donnes ')
+            );
+
+            $user       = $app['Core']->getAuthenticatedUser();
+            $em         = $app['Core']->getEntityManager();
+            $repository = $em->getRepository('\Entities\BasketElement');
+
+            /* @var $repository \Repositories\BasketElementRepository */
+            $basket_element = $repository->findUserElement(
+              $sselcont_id
+              , $user
+            );
+            /* @var $basket_element \Entities\BasketElement */
+            $validationDatas = $basket_element->getUserValidationDatas($user);
+
+            if(!$basket_element->getBasket()
+              ->getValidation()
+              ->getParticipant($user)->getCanAgree())
+            {
+              throw new ControllerException('You can not agree on this');
+            }
+
+            $validationDatas->setAgreement($agreement);
+
+            $participant = $basket_element->getBasket()
+              ->getValidation()
+              ->getParticipant($user);
+
+            $em->merge($basket_element);
+
+            $em->flush();
+
+            $releasable = false;
+            if($participant->isReleasable() === true)
+            {
+              $releasable = _('Do you want to send your report ?');
+            }
+
+            $ret = array(
+              'error'      => false
+              , 'datas'      => ''
+              , 'releasable' => $releasable
+            );
+
+          }
+          catch(ControllerException $e)
+          {
+            $ret['datas'] = $e->getMessage();
           }
-
-          $ret = array(
-            'error'      => false
-            , 'datas'      => ''
-            , 'releasable' => $releasable
-          );
-
           $Serializer = $app['Core']['Serializer'];
 
           return new Response(
@@ -491,25 +510,41 @@ return call_user_func(
 
           $repository = $em->getRepository('\Entities\Basket');
 
-          /* @var $repository \Repositories\BasketRepository */
+          $datas = array('error' => true, 'datas' => '');
-          $basket = $repository->findUserBasket(
-            $ssel_id
-            , $user
-          );
 
-          if (!$basket->getValidation())
+          try
           {
-            Return new Response('There is no validation session attached to this basket', 400);
+            /* @var $repository \Repositories\BasketRepository */
+            $basket = $repository->findUserBasket(
+              $ssel_id
+              , $user
+              , false
+            );
+
+            if (!$basket->getValidation())
+            {
+              throw new ControllerException('There is no validation session attached to this basket');
+            }
+
+            if (!$basket->getValidation()->getParticipant($user)->getCanAgree())
+            {
+              throw new ControllerException('You have not right to agree');
+            }
+
+            /* @var $basket \Entities\Basket */
+            $participant = $basket->getValidation()->getParticipant($user);
+            $participant->setIsConfirmed(true);
+
+            $em->merge($participant);
+
+            $em->flush();
+
+            $datas = array('error' => false, 'datas' => _('Envoie avec succes'));
+          }
+          catch(ControllerException $e)
+          {
+            $datas = array('error' => true, 'datas' => $e->getMessage());
           }
-          /* @var $basket \Entities\Basket */
-          $participant = $basket->getValidation()->getParticipant($user);
-          $participant->setIsConfirmed(true);
-
-          $em->merge($participant);
-
-          $em->flush();
-
-          $datas = array('error' => false, 'datas' => _('Envoie avec succes'));
 
           $Serializer = $app['Core']['Serializer'];
 

lib/Alchemy/Phrasea/Controller/Prod/Basket.php

@@ -128,7 +128,7 @@ class Basket implements ControllerProviderInterface
               $em = $app['Core']->getEntityManager();
 
               $basket = $em->getRepository('\Entities\Basket')
-                      ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
+                      ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), true);
 
               $em->remove($basket);
               $em->flush();
@@ -162,7 +162,7 @@ class Basket implements ControllerProviderInterface
               $em = $app['Core']->getEntityManager();
 
               $basket = $em->getRepository('\Entities\Basket')
-                      ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
+                      ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), true);
 
               foreach ($basket->getElements() as $basket_element)
               {
@@ -204,7 +204,7 @@ class Basket implements ControllerProviderInterface
               $em = $app['Core']->getEntityManager();
 
               $basket = $em->getRepository('\Entities\Basket')
-                      ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
+                      ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), true);
 
               $basket->setName($request->get('name', ''));
               $basket->setDescription($request->get('description'));
@@ -240,7 +240,7 @@ class Basket implements ControllerProviderInterface
               $em = $app['Core']->getEntityManager();
 
               $basket = $em->getRepository('\Entities\Basket')
-                      ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
+                      ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), true);
 
               /* @var $twig \Twig_Environment */
               $twig = $app['Core']->getTwig();
@@ -265,7 +265,7 @@ class Basket implements ControllerProviderInterface
               $em = $app['Core']->getEntityManager();
 
               $basket = $em->getRepository('\Entities\Basket')
-                      ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
+                      ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), true);
 
               /* @var $twig \Twig_Environment */
               $twig = $app['Core']->getTwig();
@@ -290,7 +290,7 @@ class Basket implements ControllerProviderInterface
               $em = $app['Core']->getEntityManager();
 
               $basket = $em->getRepository('\Entities\Basket')
-                      ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
+                      ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), true);
 
               $archive_status = !!$request->get('archive');
 
@@ -337,7 +337,7 @@ class Basket implements ControllerProviderInterface
               $em = $app['Core']->getEntityManager();
 
               $basket = $em->getRepository('\Entities\Basket')
-                      ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
+                      ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), true);
 
               $user = $app['Core']->getAuthenticatedUser();
               /* @var $user \User_Adapter */
@@ -413,7 +413,7 @@ class Basket implements ControllerProviderInterface
 
               /* @var $em \Doctrine\ORM\EntityManager */
               $basket = $em->getRepository('\Entities\Basket')
-                      ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
+                      ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), true);
 
               $user = $app['Core']->getAuthenticatedUser();
               /* @var $user \User_Adapter */
@@ -475,9 +475,9 @@ class Basket implements ControllerProviderInterface
     $controllers->get('/{basket_id}/', function(Application $app, Request $request, $basket_id)
             {
         $em = $app['Core']->getEntityManager();
-              
+
               $basket = $em->getRepository('\Entities\Basket')
-          ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
+          ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), false);
 
               if ($basket->getIsRead() === false)
               {
@@ -495,7 +495,7 @@ class Basket implements ControllerProviderInterface
               );
 
               $html = $twig->render('prod/WorkZone/Basket.html.twig', $params);
-              
+
               return new Response($html);
             })->assert('basket_id', '\d+');
 

lib/Alchemy/Phrasea/Controller/Prod/Language.php

@@ -95,6 +95,7 @@ class Language implements ControllerProviderInterface
               $out['FeedBackDuration'] = _('Time for feedback (days)');
               $out['send'] = _('Send');
               $out['Recept'] = _('Accuse de reception');
+              $out['nFieldsChanged'] = _('%d fields have been updated');
               $out['FeedBackNoUsersSelected'] = _('No users selected');
 
               $Serializer = $app['Core']['Serializer'];

lib/Alchemy/Phrasea/Controller/Prod/Push.php

@@ -226,7 +226,7 @@ class Push implements ControllerProviderInterface
 
             foreach ($pusher->get_elements() as $element)
             {
-              $BasketElement = new \Entities\BasketELement();
+              $BasketElement = new \Entities\BasketElement();
               $BasketElement->setRecord($element);
               $BasketElement->setBasket($Basket);
 
@@ -373,7 +373,7 @@ class Push implements ControllerProviderInterface
             $Validation->setBasket($Basket);
 
             $duration = (int) $request->get('duration');
-            
+
             if ($duration > 0)
             {
               $date = new \DateTime('+' . $duration . ' day' . ($duration > 1 ? 's' : ''));

lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php

@@ -40,7 +40,7 @@ class Tooltip implements ControllerProviderInterface
               $em = $app['Core']->getEntityManager();
 
               $basket = $em->getRepository('\Entities\Basket')
-                      ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
+                      ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), false);
 
               /* @var $twig \Twig_Environment */
               $twig = $app['Core']->getTwig();
@@ -103,10 +103,13 @@ class Tooltip implements ControllerProviderInterface
 
               $search_engine = null;
 
-              if (($search_engine_options = unserialize($app['request']->get('options_serial'))) !== false)
+              if($view == 'answer')
               {
-                $search_engine = new \searchEngine_adapter($app['appbox']->get_registry());
+                if (($search_engine_options = unserialize($app['request']->get('options_serial'))) !== false)
-                $search_engine->set_options($search_engine_options);
+                {
+                  $search_engine = new \searchEngine_adapter($app['appbox']->get_registry());
+                  $search_engine->set_options($search_engine_options);
+                }
               }
 
                 /* @var $twig \Twig_Environment */

lib/Alchemy/Phrasea/Controller/Prod/WorkZone.php

@@ -113,7 +113,7 @@ class WorkZone implements ControllerProviderInterface
         $em = $app['Core']->getEntityManager();
 
         $basket = $em->getRepository('\Entities\Basket')
-          ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser());
+          ->findUserBasket($basket_id, $app['Core']->getAuthenticatedUser(), false);
 
         $params = array(
           'Basket' => $basket

lib/Alchemy/Phrasea/Helper/Record/Helper.php

@@ -116,7 +116,7 @@ class Helper extends \Alchemy\Phrasea\Helper\Helper
       $repository = $em->getRepository('\Entities\Basket');
 
       /* @var $$repository \Repositories\BasketRepository */
-      $Basket = $repository->findUserBasket($Request->get('ssel'), $this->getCore()->getAuthenticatedUser());
+      $Basket = $repository->findUserBasket($Request->get('ssel'), $this->getCore()->getAuthenticatedUser(), false);
 
       $this->selection->load_basket($Basket);
 

lib/Doctrine/Entities/ValidationSession.php

@@ -340,7 +340,7 @@ class ValidationSession
       return null;
     }
 
-    $date_obj = new DateTime();
+    $date_obj = new \DateTime();
 
     return $date_obj > $this->getExpires();
   }

lib/Doctrine/Repositories/BasketElementRepository.php

@@ -23,10 +23,12 @@ class BasketElementRepository extends EntityRepository
             LEFT JOIN e.validation_datas vd
             LEFT JOIN b.validation s
             LEFT JOIN s.participants p
-            WHERE b.usr_id = :usr_id AND e.id = :element_id';
+            WHERE (b.usr_id = :usr_id OR p.usr_id = :same_usr_id)
+              AND e.id = :element_id';
 
     $params = array(
         'usr_id' => $user->get_id(),
+        'same_usr_id' => $user->get_id(),
         'element_id' => $element_id
     );
 
@@ -38,6 +40,12 @@ class BasketElementRepository extends EntityRepository
 
     $element = $query->getOneOrNullResult();
 
+    /* @var $element \Entities\BasketElement */
+    if (null === $element)
+    {
+      throw new \Exception_NotFound(_('Element is not found'));
+    }
+
     return $element;
   }
 
@@ -121,41 +129,4 @@ class BasketElementRepository extends EntityRepository
     return $query->getResult();
   }
 
-  /**
-   *
-   * @param type $element_id
-   * @param \User_Adapter $user
-   * @return \Entities\BasketELement
-   */
-  public function findElement($element_id, \User_Adapter $user)
-  {
-    $dql = 'SELECT e, b, s, p
-            FROM Entities\BasketElement e
-            JOIN e.basket b
-            LEFT JOIN b.validation s
-            LEFT JOIN s.participants p
-            WHERE e.id = :element_id';
-
-    $query = $this->_em->createQuery($dql);
-
-    $query->setParameters(array('element_id' => $element_id));
-    $cacheId = "_validation_element" . $element_id . Entities\BasketElement::CACHE_SUFFIX;
-    $query->useResultCache(true, 1800, $cacheId);
-
-    $element = $query->getOneOrNullResult();
-
-    /* @var $element \Entities\BasketElement */
-    if (null === $element)
-    {
-      throw new \Exception_NotFound(_('Element is not found'));
-    }
-
-    if ($element->getBasket()->getowner()->get_id() != $user->get_id())
-    {
-      throw new \Exception_Forbidden(_('You have not access to this basket element'));
-    }
-
-    return $element;
-  }
-
 }

lib/Doctrine/Repositories/BasketRepository.php

@@ -24,8 +24,8 @@ use Entities;
 class BasketRepository extends EntityRepository
 {
 
-  const MYBASKETS = 'my baskets';
+  const MYBASKETS       = 'my baskets';
-  const RECEIVED = 'received';
+  const RECEIVED        = 'received';
   const VALIDATION_SENT = 'validation_sent';
   const VALIDATION_DONE = 'validation_done';
 
@@ -56,8 +56,8 @@ class BasketRepository extends EntityRepository
 
     $query = $this->_em->createQuery($dql);
     $query->setParameters(array('usr_id' => $user->get_id()));
-    $idCache = "_active_by_user_" . ($sort === null ? "" : $sort ) . "_" . $user->get_id(). Entities\Basket::CACHE_SUFFIX;
+    $idCache = "_active_by_user_" . ($sort === null ? "" : $sort ) . "_" . $user->get_id() . Entities\Basket::CACHE_SUFFIX;
-    
+
     $query->useResultCache(true, 1800, $idCache);
 
     return $query->getResult();
@@ -81,9 +81,9 @@ class BasketRepository extends EntityRepository
 
     $query = $this->_em->createQuery($dql);
     $query->setParameters(array('usr_id' => $user->get_id()));
-    
+
     $idCache = "findUnreadActiveByUser" . $user->get_id() . Entities\Basket::CACHE_SUFFIX;
-    
+
     $query->useResultCache(true, 1800, $idCache);
 
     return $query->getResult();
@@ -106,7 +106,7 @@ class BasketRepository extends EntityRepository
             JOIN s.participants p
             WHERE b.usr_id != ?1 AND p.usr_id = ?2
              AND (s.expires IS NULL OR s.expires > CURRENT_TIMESTAMP()) ';
-    
+
     if ($sort == 'date')
     {
       $dql .= ' ORDER BY b.created DESC';
@@ -117,7 +117,7 @@ class BasketRepository extends EntityRepository
     }
 
     $query = $this->_em->createQuery($dql);
-    $query->setParameters(array(1 => $user->get_id(), 2 => $user->get_id()));
+    $query->setParameters(array(1        => $user->get_id(), 2        => $user->get_id()));
     $idCache = "_active_validation_by_user_" . $user->get_id() . "_" . $sort . Entities\Basket::CACHE_SUFFIX;
     $query->useResultCache(true, 1800, $idCache);
 
@@ -133,7 +133,7 @@ class BasketRepository extends EntityRepository
    * @param \User_Adapter $user
    * @return \Entities\Basket
    */
-  public function findUserBasket($basket_id, \User_Adapter $user)
+  public function findUserBasket($basket_id, \User_Adapter $user, $requireOwner)
   {
     $dql = 'SELECT b, e, s, p, v
             FROM Entities\Basket b
@@ -145,7 +145,7 @@ class BasketRepository extends EntityRepository
 
     $query = $this->_em->createQuery($dql);
     $query->setParameters(array('basket_id' => $basket_id));
-    $cacheId = "_find_user_" . $basket_id . Entities\Basket::CACHE_SUFFIX;
+    $cacheId    = "_find_user_" . $basket_id . Entities\Basket::CACHE_SUFFIX;
     $query->useResultCache(true, 1800, $cacheId);
 
     $basket = $query->getOneOrNullResult();
@@ -158,25 +158,44 @@ class BasketRepository extends EntityRepository
 
     if ($basket->getOwner()->get_id() != $user->get_id())
     {
-      throw new \Exception_Forbidden(_('You have not access to this basket'));
+      $participant = false;
+
+      if ($basket->getValidation() && !$requireOwner)
+      {
+        try
+        {
+          $basket->getValidation()->getParticipant($user);
+          $participant = true;
+        }
+        catch (\Exception $e)
+        {
+
+        }
+      }
+      if (!$participant)
+      {
+        throw new \Exception_Forbidden(_('You have not access to this basket'));
+      }
     }
 
     return $basket;
   }
 
-  public function findContainingRecord(\record_adapter $record)
+  public function findContainingRecordForUser(\record_adapter $record, \User_Adapter $user)
   {
 
     $dql = 'SELECT b, e
             FROM Entities\Basket b
             JOIN b.elements e
-            WHERE e.record_id = :record_id AND e.sbas_id = e.sbas_id';
+            WHERE e.record_id = :record_id AND e.sbas_id = e.sbas_id
+              AND b.usr_id = :usr_id';
 
     $params = array(
-        'record_id' => $record->get_record_id()
+      'record_id' => $record->get_record_id(),
+      'usr_id' => $user->get_id()
     );
 
-    $query = $this->_em->createQuery($dql);
+    $query   = $this->_em->createQuery($dql);
     $query->setParameters($params);
     $idCache = "_containing_record_" . $record->get_serialize_key() . Entities\Basket::CACHE_SUFFIX;
     $query->useResultCache(true, 1800, $idCache);
@@ -191,47 +210,47 @@ class BasketRepository extends EntityRepository
     switch ($type)
     {
       case self::RECEIVED:
-        $dql = 'SELECT b, e
+        $dql    = 'SELECT b, e
                 FROM Entities\Basket b
                 JOIN b.elements e
                 WHERE b.usr_id = :usr_id AND b.pusher_id IS NOT NULL';
         $params = array(
-            'usr_id' => $user->get_id()
+          'usr_id' => $user->get_id()
         );
         break;
       case self::VALIDATION_DONE:
-        $dql = 'SELECT b, e, s
+        $dql     = 'SELECT b, e, s
                 FROM Entities\Basket b
                 JOIN b.elements e
                 JOIN b.validation s
                 JOIN s.participants p
                 WHERE b.usr_id != ?1 AND p.usr_id = ?2';
-        $params = array(
+        $params  = array(
-            1 => $user->get_id()
+          1       => $user->get_id()
-            , 2 => $user->get_id()
+          , 2       => $user->get_id()
         );
         break;
       case self::VALIDATION_SENT:
-        $dql = 'SELECT b, v, e
+        $dql    = 'SELECT b, v, e
                 FROM Entities\Basket b
                 JOIN b.elements e
                 JOIN b.validation v
                 WHERE b.usr_id = :usr_id';
         $params = array(
-            'usr_id' => $user->get_id()
+          'usr_id' => $user->get_id()
         );
         break;
       default:
-        $type = 'default';
+        $type    = 'default';
-        $dql = 'SELECT b, e, s, p
+        $dql     = 'SELECT b, e, s, p
                 FROM Entities\Basket b
                 JOIN b.elements e
                 LEFT JOIN b.validation s
                 LEFT JOIN s.participants p
                 WHERE (b.usr_id = :usr_id OR p.usr_id = :validating_usr_id)';
-        $params = array(
+        $params  = array(
-            'usr_id' => $user->get_id(),
+          'usr_id'            => $user->get_id(),
-            'validating_usr_id' => $user->get_id()
+          'validating_usr_id' => $user->get_id()
         );
         break;
     }
@@ -248,22 +267,22 @@ class BasketRepository extends EntityRepository
     {
       $dql .= ' AND (b.name LIKE :name OR b.description LIKE :description) ';
 
-      $params['name'] = '%' . $query . '%';
+      $params['name']        = '%' . $query . '%';
       $params['description'] = '%' . $query . '%';
     }
 
     $query = $this->_em->createQuery($dql);
     $query->setParameters($params);
 
-    $count = Paginate::getTotalQueryResults($query);
+    $count         = Paginate::getTotalQueryResults($query);
     $paginateQuery = Paginate::getPaginateQuery($query, $offset, $perPage);
-    
+
     $idCache = "_" . $type . "_workzone_basket_" . $user->get_id() . Entities\Basket::CACHE_SUFFIX;
-    
+
     $paginateQuery->useResultCache(true, 1800, $idCache);
     $result = $paginateQuery->getResult();
 
-    return array('count' => $count, 'result' => $result);
+    return array('count'  => $count, 'result' => $result);
   }
 
 }

lib/classes/API/V1/adapter.class.php

@@ -660,7 +660,7 @@ class API_V1_adapter extends API_V1_Abstract
 
     /* @var $repository \Repositories\BasketRepository */
 
-    $Basket = $repository->findUserBasket($basket_id, $this->core->getAuthenticatedUser());
+    $Basket = $repository->findUserBasket($basket_id, $this->core->getAuthenticatedUser(), true);
     $em->remove($Basket);
     $em->flush();
 
@@ -683,7 +683,7 @@ class API_V1_adapter extends API_V1_Abstract
 
     /* @var $repository \Repositories\BasketRepository */
 
-    $Basket = $repository->findUserBasket($basket_id, $this->core->getAuthenticatedUser());
+    $Basket = $repository->findUserBasket($basket_id, $this->core->getAuthenticatedUser(), false);
 
     $result->set_datas(
       array("basket_elements" =>
@@ -783,7 +783,7 @@ class API_V1_adapter extends API_V1_Abstract
 
     /* @var $repository \Repositories\BasketRepository */
 
-    $Basket = $repository->findUserBasket($basket_id, $this->core->getAuthenticatedUser());
+    $Basket = $repository->findUserBasket($basket_id, $this->core->getAuthenticatedUser(), true);
     $Basket->setName($name);
 
     $em->merge($Basket);
@@ -819,7 +819,7 @@ class API_V1_adapter extends API_V1_Abstract
 
     /* @var $repository \Repositories\BasketRepository */
 
-    $Basket = $repository->findUserBasket($basket_id, $this->core->getAuthenticatedUser());
+    $Basket = $repository->findUserBasket($basket_id, $this->core->getAuthenticatedUser(), true);
     $Basket->setDescription($desc);
 
     $em->merge($Basket);

lib/classes/eventsmanager/notify/orderdeliver.class.php

@@ -150,7 +150,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
       $em = $this->core->getEntityManager();
       $repository = $em->getRepository('\Entities\Basket');
 
-      $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser());
+      $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser(), false);
     }
     catch (Exception $e)
     {
@@ -202,7 +202,7 @@ class eventsmanager_notify_orderdeliver extends eventsmanager_notifyAbstract
       $em = $this->core->getEntityManager();
       $repository = $em->getRepository('\Entities\Basket');
 
-      $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser());
+      $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser(), false);
     }
     catch (Exception $e)
     {

lib/classes/eventsmanager/notify/validate.class.php

@@ -143,7 +143,7 @@ class eventsmanager_notify_validate extends eventsmanager_notifyAbstract
       $em = $this->core->getEntityManager();
       $repository = $em->getRepository('\Entities\Basket');
 
-      $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser());
+      $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser(), false);
 
       $basket_name = trim($basket->getName()) ?: _('Une selection');
     }

lib/classes/eventsmanager/notify/validationdone.class.php

@@ -146,7 +146,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
       $em = $this->core->getEntityManager();
       $repository = $em->getRepository('\Entities\Basket');
 
-      $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser());
+      $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser(), false);
     }
     catch (Exception $e)
     {
@@ -199,7 +199,7 @@ class eventsmanager_notify_validationdone extends eventsmanager_notifyAbstract
       $em = $this->core->getEntityManager();
       $repository = $em->getRepository('\Entities\Basket');
 
-      $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser());
+      $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser(), false);
     }
     catch (Exception $e)
     {

lib/classes/eventsmanager/notify/validationreminder.class.php

@@ -159,7 +159,7 @@ class eventsmanager_notify_validationreminder extends eventsmanager_notifyAbstra
       $em = $this->core->getEntityManager();
       $repository = $em->getRepository('\Entities\Basket');
 
-      $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser());
+      $basket = $repository->findUserBasket($ssel_id, $this->core->getAuthenticatedUser(), false);
 
       $basket_name = trim($basket->getName()) ? : _('Une selection');
     }

lib/classes/record/adapter.class.php

@@ -2073,7 +2073,7 @@ class record_adapter implements record_Interface, cache_cacheableInterface
 
     /* @var $$repo \Repositories\BasketRepository */
 
-    return $repo->findContainingRecord($this);
+    return $repo->findContainingRecordForUser($this, $Core->getAuthenticatedUser());
   }
 
   /**

lib/classes/record/preview.class.php

@@ -143,7 +143,7 @@ class record_preview extends record_adapter
         $repository = $em->getRepository('\Entities\Basket');
 
         /* @var $repository \Repositories\BasketRepository */
-        $Basket = $repository->findUserBasket($contId, $Core->getAuthenticatedUser());
+        $Basket = $repository->findUserBasket($contId, $Core->getAuthenticatedUser(), false);
 
         /* @var $Basket \Entities\Basket */
         $this->container = $Basket;

lib/classes/set/export.class.php

@@ -63,7 +63,7 @@ class set_export extends set_abstract
       $repository = $em->getRepository('\Entities\Basket');
 
       /* @var $repository \Repositories\BasketRepository */
-      $Basket = $repository->findUserBasket($sstid, $user);
+      $Basket = $repository->findUserBasket($sstid, $user, false);
 
       foreach ($Basket->getElements() as $basket_element)
       {
@@ -977,11 +977,13 @@ class set_export extends set_abstract
 
     if (is_file($file))
     {
-      $testPath = strpos($file, $registry->get('GV_RootPath').'tmp/download/') !== false
+      $testPath = function($file, $registry){
+        return strpos($file, $registry->get('GV_RootPath').'tmp/download/') !== false
             || strpos($file, $registry->get('GV_RootPath').'tmp/lazaret/') !== false
             || strpos($file, $registry->get('GV_X_Accel_Redirect')) !== false;
+      };
 
-      if ($registry->get('GV_modxsendfile') && $testPath)
+      if ($registry->get('GV_modxsendfile') && $testPath($file, $registry))
       {
         $file_xaccel = str_replace(
           array(

lib/classes/set/order.class.php

@@ -225,7 +225,7 @@ class set_order extends set_abstract
     $repository = $em->getRepository('\Entities\Basket');
 
     /* @var $repository \Repositories\BasketRepository */
-    $Basket = $repository->findUserBasket($this->ssel_id, $core->getAuthenticatedUser());
+    $Basket = $repository->findUserBasket($this->ssel_id, $core->getAuthenticatedUser(), false);
 
     if(!$Basket)
     {

lib/conf.d/data_templates/en-simple.xml

@@ -86,6 +86,50 @@
         <label lang="en">Thumbnail</label>
       </subdef>
     </subdefgroup>
+    <subdefgroup name="document">
+      <subdef class="preview" name="preview" downloadable="false">
+        <path>{{datapathnoweb}}{{basename}}/subdefs</path>
+        <mediatype>flexpaper</mediatype>
+        <writeDatas>no</writeDatas>
+        <baseurl></baseurl>
+        <label lang="fr">Prévisualisation</label>
+        <label lang="en">Preview</label>
+      </subdef>
+      <subdef class="thumbnail" name="thumbnail" downloadable="false">
+        <path>{{datapathweb}}{{basename}}/subdefs</path>
+        <mediatype>image</mediatype>
+        <method>resample</method>
+        <dpi>72</dpi>
+        <size>200</size>
+        <writeDatas>no</writeDatas>
+        <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
+        <label lang="fr">Imagette</label>
+        <label lang="en">Thumbnail</label>
+      </subdef>
+    </subdefgroup>
+    <subdefgroup name="flash">
+      <subdef class="preview" name="preview" downloadable="false">
+        <path>{{datapathnoweb}}{{basename}}/subdefs</path>
+        <mediatype>image</mediatype>
+        <size>200</size>
+        <writeDatas>no</writeDatas>
+        <method>resample</method>
+        <dpi>72</dpi>
+        <baseurl></baseurl>
+        <label lang="fr">Prévisualisation</label>
+        <label lang="en">Preview</label>
+      </subdef>
+      <subdef class="thumbnail" name="thumbnail" downloadable="false">
+        <path>{{datapathweb}}{{basename}}/subdefs</path>
+        <mediatype>image</mediatype>
+        <writeDatas>no</writeDatas>
+        <method>resample</method>
+        <dpi>72</dpi>
+        <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
+        <label lang="fr">Imagette</label>
+        <label lang="en">Thumbnail</label>
+      </subdef>
+    </subdefgroup>
   </subdefs>
 
   <description>

lib/conf.d/data_templates/fr-simple.xml

@@ -77,12 +77,57 @@
       <subdef class="thumbnail" name="thumbnail" downloadable="true">
         <path>{{datapathweb}}{{basename}}/subdefs</path>
         <mediatype>image</mediatype>
+        <size>200</size>
         <writeDatas>no</writeDatas>
         <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
         <label lang="fr">Imagette</label>
         <label lang="en">Thumbnail</label>
       </subdef>
     </subdefgroup>
+    <subdefgroup name="document">
+      <subdef class="preview" name="preview" downloadable="false">
+        <path>{{datapathnoweb}}{{basename}}/subdefs</path>
+        <mediatype>flexpaper</mediatype>
+        <writeDatas>no</writeDatas>
+        <baseurl></baseurl>
+        <label lang="fr">Prévisualisation</label>
+        <label lang="en">Preview</label>
+      </subdef>
+      <subdef class="thumbnail" name="thumbnail" downloadable="false">
+        <path>{{datapathweb}}{{basename}}/subdefs</path>
+        <mediatype>image</mediatype>
+        <method>resample</method>
+        <dpi>72</dpi>
+        <size>200</size>
+        <writeDatas>no</writeDatas>
+        <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
+        <label lang="fr">Imagette</label>
+        <label lang="en">Thumbnail</label>
+      </subdef>
+    </subdefgroup>
+    <subdefgroup name="flash">
+      <subdef class="preview" name="preview" downloadable="false">
+        <path>{{datapathnoweb}}{{basename}}/subdefs</path>
+        <mediatype>image</mediatype>
+        <size>200</size>
+        <writeDatas>no</writeDatas>
+        <method>resample</method>
+        <dpi>72</dpi>
+        <baseurl></baseurl>
+        <label lang="fr">Prévisualisation</label>
+        <label lang="en">Preview</label>
+      </subdef>
+      <subdef class="thumbnail" name="thumbnail" downloadable="false">
+        <path>{{datapathweb}}{{basename}}/subdefs</path>
+        <mediatype>image</mediatype>
+        <writeDatas>no</writeDatas>
+        <method>resample</method>
+        <dpi>72</dpi>
+        <baseurl>{{dataurl}}/{{basename}}/subdefs</baseurl>
+        <label lang="fr">Imagette</label>
+        <label lang="en">Thumbnail</label>
+      </subdef>
+    </subdefgroup>
   </subdefs>
 
 

lib/unitTest/api/v1/api_v1_adapterTest.php

@@ -390,7 +390,7 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
     $repo = $em->getRepository('\Entities\Basket');
 
     /* @var $repo \Repositories\BasketRepository */
-    $basket = $repo->findUserBasket($ssel_id, self::$core->getAuthenticatedUser());
+    $basket = $repo->findUserBasket($ssel_id, self::$core->getAuthenticatedUser(), true);
 
     $this->assertTrue($basket instanceof \Entities\Basket);
     $em->remove($basket);
@@ -424,7 +424,7 @@ class API_V1_adapterTest extends PhraseanetPHPUnitAuthenticatedAbstract
 
     try
     {
-      $repo->findUserBasket($ssel_id, $user);
+      $repo->findUserBasket($ssel_id, $user, true);
       $this->fail('An exception should have been raised');
     }
     catch (Exception_NotFound $e)

templates/web/common/caption.html

@@ -15,4 +15,6 @@
   {{cap_bas.format_caption(record, highlight|default(''), searchEngine|default(null))}}
 {% elseif view == 'overview' %}
   {{cap_ovr.format_caption(record, highlight|default(''), searchEngine|default(null))}}
+{% elseif view == 'publi' %}
+  {{cap_pub.format_caption(record, '', null)}}
 {% endif %}

templates/web/lightbox/IE6/agreement_box.twig

@@ -18,6 +18,7 @@
         </div>
         <ul style="margin:10px 0 0 20px;width:200px;">
             {% for validation_data in basket_element.getValidationDatas() %}
+              {% if basket.getValidation().getParticipant(user).getCanSeeOthers() or validation_data.getParticipant().getUser() == core.getAuthenticatedUser() %}
                 {% if validation_data.getAgreement() == true %}
                     {% set classuser = 'agree' %}
                 {% elseif validation_data.getAgreement() is null %}
@@ -25,11 +26,14 @@
                 {% else %}
                     {% set classuser = 'disagree' %}
                 {% endif %}
+                {% set participant = validation_data.getParticipant().getUser() %}
+                <li class="{% if participant.get_id() == user.get_id() %}me{% endif %} {{classuser}} userchoice">{{participant.get_display_name()}}</li>
+              {% endif %}
             {% endfor %}
         </ul>
     {% endif %}
 
-    {% if basket_element and basket_element.getBasket().getValidation() %}
+    {% if basket_element and basket_element.getBasket().getValidation() and basket.getValidation().getParticipant(user).getCanAgree() %}
         <div class="left choices">
             <div style="height:60px;margin-top:15px;">
                 <table cellspacing="0" cellpadding="0" style="width:230px;">

templates/web/lightbox/IE6/basket_options.twig

@@ -1,4 +1,4 @@
-{% if basket.getValidation() %}
+{% if basket.getValidation() and basket.getValidation().getParticipant(user).getCanAgree() %}
     <button class="confirm_report" title="{% trans 'validation::envoyer mon rapport'%}">
         <img src="/skins/lightbox/envoyerie6.gif"/>
     {% trans 'validation::envoyer mon rapport'%}

templates/web/lightbox/agreement_box.twig

@@ -4,7 +4,11 @@
         <tbody>
             <tr>
                 <td class="title title15">{% trans 'VALIDATION' %}</td>
-                <td class="report_wrapper;"><a class="report" href="#">{% trans 'lightbox::recaptitulatif' %}</a></td>
+                <td class="report_wrapper">
+                  <a class="report" href="#">
+                    {% trans 'lightbox::recaptitulatif' %}
+                  </a>
+                </td>
             </tr>
         </tbody>
     </table>
@@ -12,6 +16,7 @@
         <div>{{ basket.getValidation().getValidationString(user) }}</div>
         <ul>
             {% for choice in basket_element.getValidationDatas() %}
+              {% if basket.getValidation().getParticipant(user).getCanSeeOthers() or choice.getParticipant().getUser() == core.getAuthenticatedUser() %}
                 {% if choice.getAgreement() == true %}
                     {% set classuser = 'agree' %}
                 {% elseif choice.getAgreement() is null %}
@@ -21,12 +26,13 @@
                 {% endif %}
                 {% set participant = choice.getParticipant().getUser() %}
                 <li class="{% if participant.get_id() == user.get_id() %}me{% endif %} {{classuser}} userchoice">{{participant.get_display_name()}}</li>
+              {% endif %}
             {% endfor %}
         </ul>
     {% endif %}
 </div>
 <div class="PNB user_infos">
-{% if basket_element and basket_element.getBasket().getValidation() %}
+{% if basket_element and basket_element.getBasket().getValidation() and basket.getValidation().getParticipant(user).getCanAgree() %}
     <div class="PNB choices">
         <div style="height:60px;">
           {% set agreement = basket_element.getUserValidationDatas(user).getAgreement() %}

templates/web/lightbox/basket_options.twig

@@ -1,4 +1,4 @@
-{% if basket.getValidation() %}
+{% if basket.getValidation() and basket.getValidation().getParticipant(user).getCanAgree() %}
     <button class="confirm_report" title="{% trans 'validation::envoyer mon rapport'%}">
     <img src="/skins/lightbox/envoyer.png"/>
     {% trans 'validation::envoyer mon rapport'%}

templates/web/prod/Tooltip/Basket.html.twig

@@ -1,5 +1,5 @@
 {% import 'common/thumbnail.html' as thumbnail %}
-<div style="margin:5px;width:280px;height:300px;position:relative;">
+<div class="noToolTipResize" style="margin:5px;width:280px;height:300px;position:relative;">
   <div>
     <span style="font-weight:bold;font-size:14px;">
       {{ basket.getName() }}
@@ -15,13 +15,15 @@
       {{ nb_records }} records
     {% endtrans %}
      - {{ date }}
-  <hr/>
+    <hr/>
-  <div style="position:relative;float:left;width:270px;">
+    <div style="position:relative;float:left;width:270px;">
-    {% for element in basket.getElements() %}
+      {% for element in basket.getElements() %}
-      {% if loop.index <= 9 %}
+        {% if loop.index <= 9 %}
-        <div style="margin:5px;position:relative;float:left;width:80px;height:80px;overflow:hidden;">
+          <div style="margin:5px;position:relative;float:left;width:80px;height:80px;overflow:hidden;">
-          {{ thumbnail.format(element.getRecord().get_thumbnail(), 80, 80 , '', session) }}
+            {{ thumbnail.format(element.getRecord().get_thumbnail(), 80, 80 , '', session) }}
-        </div>
+          </div>
-      {% endif %}
+        {% endif %}
-    {% endfor %}
+      {% endfor %}
+    </div>
   </div>
+</div>

templates/web/prod/Tooltip/Story.html.twig

@@ -1,5 +1,5 @@
 {% import 'common/thumbnail.html' as thumbnail %}
-<div style="margin:5px;width:280px;height:300px;position:relative;">
+<div class="noToolTipResize" style="margin:5px;width:280px;height:300px;position:relative;">
   <div>
     <span style="font-weight:bold;font-size:14px;">
       {{ Story.get_title() }}
@@ -15,13 +15,15 @@
       {{ nb_records }} records
     {% endtrans %}
      - {{ date }}
-  <hr/>
+    <hr/>
-  <div style="position:relative;float:left;width:270px;">
+    <div style="position:relative;float:left;width:270px;">
-    {% for element in Story.get_children().get_elements() %}
+      {% for element in Story.get_children().get_elements() %}
-      {% if loop.index <= 9 %}
+        {% if loop.index <= 9 %}
-        <div style="margin:5px;position:relative;float:left;width:80px;height:80px;overflow:hidden;">
+          <div style="margin:5px;position:relative;float:left;width:80px;height:80px;overflow:hidden;">
-          {{ thumbnail.format(element.get_thumbnail(), 80, 80 , '', session) }}
+            {{ thumbnail.format(element.get_thumbnail(), 80, 80 , '', session) }}
-        </div>
+          </div>
-      {% endif %}
+        {% endif %}
-    {% endfor %}
+      {% endfor %}
+    </div>
   </div>
+</div>

templates/web/prod/WorkZone/Basket.html.twig

@@ -61,7 +61,7 @@
 
 {% import 'prod/WorkZone/Macros.twig' as Macros %}
 
-{% if basket.getValidation() and basket.getValidation().getInitiator() == core.getAuthenticatedUser() %}
+{% if basket.getValidation() %}
     {{ Macros.display_validation(basket, ordre, user, session) }}
 {% else %}
     {{ Macros.display_basket(basket, user, session) }}

templates/web/prod/WorkZone/Browser/Browser.html.twig

@@ -3,13 +3,13 @@
   <div class="PNB10 Browser">
     <div class="PNB10" style="width:190px;right:auto;">
       <form name="BasketBrowser" method="GET" action="/prod/WorkZone/Browse/Search/">
-        <input name="Query" class="Query" placeholder="{% trans 'Search baskets' %}" type="text"/>
+        <input name="Query" class="Query search" placeholder="{% trans 'Search baskets' %}" type="text"/>
 
         <h1>{% trans 'See' %}</h1>
         <ul>
           <li class="first">
             <input id="basket_browse_all" type="radio" name="Type" value="" checked="checked" />
-            <label for="basket_browse_all">
+            <label class="selected" for="basket_browse_all">
               {% trans 'All' %}
             </label>
           </li>
@@ -242,7 +242,14 @@
       loadResults($this.serializeArray(), $this.attr('action'));
 
       return false;
-    }).trigger('submit').find('input').bind('change', function(){
+    }).trigger('submit').find('label').bind('click', function(){
+      var input = $(this).prev('input'),
+      name = input.attr('name');
+
+      var inputs = $('input[name="' + $(this).prev('input').attr('name') + '"]', $container);
+      inputs.removeAttr('checked').next('label').removeClass('selected');
+
+      input.attr('checked', 'checked').next('label').addClass('selected');
       $('form[name="BasketBrowser"]', $container).trigger('submit')
     });
 

templates/web/prod/WorkZone/Macros.twig

@@ -4,6 +4,85 @@
   <div class="insidebloc">
     {% set content = WorkZone.getContent(srt) %}
 
+    {% for basket in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::VALIDATIONS')) %}
+
+
+        <div tooltipsrc="/prod/tooltip/basket/{{basket.getId()}}/"
+             id="SSTT_{{basket.getId()}}"
+             class="basketTips ui-accordion-header ui-state-default
+                    ui-corner-all header SSTT basket {% if not basket.getIsRead() %}unread{% endif %}
+                    {% if basket.getId() == selected_id and selected_type == 'basket' %}active{% endif %}">
+          <a href="/prod/baskets/{{ basket.getId() }}/">
+            <span>
+              <img src='/skins/icons/basket.gif' title=''/>
+              {{basket.getName()}}
+            </span>
+          </a>
+          <div class="menu">
+          {% if basket.getValidation() %}
+            <img title="{% trans 'Vous avez envoye une demande de validation de document sur ce panier' %}"
+                 class="basketTips" src="/skins/icons/valid.png"/>
+          {% endif %}
+          {% if basket.getPusher() %}
+            {% set pusher = basket.getPusher().get_display_name() %}
+            <img class="basketTips" title="{% trans %}paniers:: panier recu de {{pusher}}{% endtrans %}"
+                 src="/skins/icons/push16.png"/>
+          {% endif %}
+            <a style="cursor:pointer;display:inline;padding:0;margin:0;" class="contextMenuTrigger">&#9660;</a>
+
+            <table cellspacing="0" cellpadding="0" style="display:none;" class="contextMenu basketcontextmenu">
+              <tbody>
+                <tr>
+                  <td>
+                    <div class="context-menu context-menu-theme-vista">
+                      <div title="" class="context-menu-item">
+                        <div class="context-menu-item-inner"
+                             onclick="downloadThis('SSTTID={{basket.getId()}}');">{% trans 'action::exporter' %}
+                        </div>
+                      </div>
+                      <div title="" class="context-menu-item menu3-custom-item">
+                        <div onclick="editThis('SSTT','{{basket.getId()}}');" style=""
+                             class="context-menu-item-inner">{% trans 'action::editer' %}
+                        </div>
+                      </div>
+                      <div title="" class="context-menu-item">
+                        <div class="context-menu-item-inner">
+                          <a href="/lightbox/compare/{{basket.getId()}}/" target="_blank">Lightbox</a>
+                        </div>
+                      </div>
+
+                      {% if basket.getValidation() %}
+                        <div title="" class="context-menu-item">
+                          <a target="_blank" href="/lightbox/validate/{{basket.getId()}}/">
+                            <div class="context-menu-item-inner">
+                              {% trans 'action::Valider' %}
+                            </div>
+                          </a>
+                        </div>
+                      {% endif %}
+
+                      <div title="" class="context-menu-item">
+                        <div class="context-menu-item-inner"
+                             onclick="archiveBasket({{ basket.getId() }});return false;">
+                          {% trans 'Archive' %}
+                        </div>
+                      </div>
+
+                      </div>
+                  </td>
+                </tr>
+              </tbody>
+            </table>
+          </div>
+        </div>
+        <div id="SSTT_content_{{basket.getId()}}" class="content basket" style="overflow:hidden;">
+
+        </div>
+
+    {% endfor %}
+
+
+
     {% for basket in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::BASKETS')) %}
 
 
@@ -103,6 +182,8 @@
 
     {% endfor %}
 
+
+
     {% for story in content.get(constant('\\Alchemy\\Phrasea\\Helper\\WorkZone::STORIES')) %}
 
 
@@ -254,6 +335,7 @@
                   <td style="width:100%;">
                       <table style=width:100%>
                           {% for choice in basket_element.getValidationDatas() %}
+                              {% if basket.getValidation().getParticipant(user).getCanSeeOthers() or choice.getParticipant().getUser() == core.getAuthenticatedUser() %}
                               <tr>
                                   <td> {{ choice.getParticipant().getUser().get_display_name() }} </td>
                                   <td>
@@ -271,6 +353,7 @@
                                   {% endif %}
                                   </td>
                               </tr>
+                              {% endif %}
                           {% endfor %}
                       </table>
                   </td>

templates/web/prod/actions/Feedback/list.html.twig

@@ -27,7 +27,7 @@
         </td>
         {% if list.getOwner(user).getRole() >= constant('\\Entities\\UsrListOwner::ROLE_ADMIN') %}
         <td style="text-align:right;width:150px;">
-          <button>
+          <button class="deleter">
             {% trans 'Delete' %}
             <input type="hidden" name="list_id" value="{{ list.getId() }}"/>
           </button>
@@ -61,7 +61,7 @@
     <form name="list-editor-search" method="POST" action="/prod/push/edit-list/{{ list.getId() }}/">
       <div class="PNB10" style="height:160px;">
         <div class="PNB" style="height:40px;bottom:auto;">
-          <button class="Refresher">&lt;{% trans 'View' %}</button>
+          <button class="Refresher" type="button">&lt;{% trans 'View' %}</button>
           <select name="like_field">
             <option value="usr_login">
               {% trans 'Push::filter on login' %}

templates/web/prod/feeds/feeds.html

@@ -45,13 +45,13 @@
 
 {% set offset_start = ((page - 1) * 5 )%}
 {% set entries = feed.get_entries(offset_start,5).get_entries() %}
-  
+
 {% for entry in entries %}
   {{ _entry.format(feed, entry, user, session) }}
 {% endfor %}
 {% if entries|length == 0 %}
   <p>{% trans 'Aucune entree pour le moment' %}</p>
-    
+
 {% endif %}
 
 {% if feed.get_count_total_entries() > (page*5) %}
@@ -73,4 +73,4 @@
     $('.menu_feeds').buttonsetv();
   });
 </script>
-</div>
+s</div>

templates/web/prod/index.html.twig

@@ -380,7 +380,7 @@
   <div class="PNB" id="rightFrame" style="left:auto;width:{{w2}}%;">
 
     <div id="headBlock" class="PNB" style="height:90px;bottom:auto;">
-      <div style="margin:15px auto;width:580px;">
+      <div style="margin:15px auto;line-height:30px;width:580px;">
 
 
 
@@ -711,11 +711,20 @@
           </div>
         </span>
         {% elseif user.ACL().has_right('push') %}
-        <span class="buttonset">
+        <span class="verticalbuttonset">
-          <button class="TOOL_pushdoc_btn results_window">
+          <span>
-            <img src="/skins/icons/push16.png"/>
+            <button class="TOOL_pushdoc_btn default_action results_window">
-            {% trans 'action : push' %}
+              <img src="/skins/icons/push16.png"/>
-          </button>
+              {% trans 'action : push' %}
+            </button>
+            <button class="trigger">{% trans 'Select an action' %}</button>
+          </span>
+          <div class="submenu">
+            <button class="TOOL_feedback_btn results_window">
+              <img src="/skins/icons/feedback16.png"/>
+              {% trans 'Feedback' %}
+            </button>
+          </div>
         </span>
         {% elseif user.ACL().has_right('bas_chupub') %}
         <span class="verticalbuttonset">

templates/web/prod/preview/appears_in.html

@@ -4,9 +4,9 @@
   <li class="title">{% trans 'Apparait aussi dans ces reportages' %}</li>
   {% for par in parents %}
     <li onclick="openPreview('REG',0,'{{par.get_serialize_key()}}'); return(false);"
-        class="otherRegToolTip" {% if show_tooltips %}tooltipsrc="/prod/tooltip/caption/{{par.get_sbas_id()}}/{{par.get_record_id()}}/basket/" {% endif %}>
+        class="otherRegToolTip" {% if registry.get('GV_rollover_reg_preview') %}tooltipsrc="/prod/tooltip/caption/{{par.get_sbas_id()}}/{{par.get_record_id()}}/basket/" {% endif %}>
       <img src="{{par.get_thumbnail().get_url()}}" style="width:25px;height:25px;"/>
-      <span class="title"> {{par.get_reg_name()|raw}}</span>
+      <span class="title"> {{ par.get_title() }} </span>
     </li>
   {% endfor %}
   </ul>

templates/web/prod/preview/basket_train.html

@@ -13,7 +13,7 @@
       {% endif %}
 
       {% set tooltip = '' %}
-      {% if GV_rollover_reg_preview %}
+      {% if registry.get('GV_rollover_reg_preview') %}
         {% set tooltip = 'tooltipsrc="/prod/tooltip/caption/' ~ child.getRecord().get_sbas_id() ~ '/' ~ child.getRecord().get_record_id() ~ '/basket/"' %}
       {% endif %}
 

templates/web/prod/preview/feed_train.html

@@ -13,7 +13,7 @@
       {% endif %}
 
       {% set tooltip = '' %}
-      {% if GV_rollover_reg_preview %}
+      {% if registry.get('GV_rollover_reg_preview') %}
         {% set tooltip = 'tooltipsrc="/prod/tooltip/preview/' ~ child.get_record().get_sbas_id() ~ '/' ~ child.get_record().get_record_id() ~ '/"'%}
       {% endif %}
 

templates/web/prod/preview/reg_train.html

@@ -32,7 +32,7 @@
       {% endif %}
 
       {% set tooltip = '' %}
-      {% if GV_rollover_reg_preview %}
+      {% if registry.get('GV_rollover_reg_preview') %}
         {% set tooltip = 'tooltipsrc="/prod/tooltip/caption/'~ contained.get_sbas_id() ~'/'~ contained.get_record_id() ~ '/preview/?number=' ~ contained.get_number() ~ '"' %}
       {% endif %}
 

templates/web/prod/results/record.html

@@ -34,9 +34,12 @@
       {% set user_rollover_thumbnail = user.getPrefs('rollover_thumbnail') %}
 
       {% set extraclass = '' %}
-      {% if user_rollover_thumbnail == 'caption' %}
+      {% if user_rollover_thumbnail == 'caption' and searchEngine is not null %}
         {% set extraclass = extraclass ~ ' captionTips' %}
         {% set tooltipsrc = '/prod/tooltip/caption/' ~ record.get_sbas_id() ~ '/' ~ record.get_record_id() ~ '/answer/?number=' ~record.get_number() %}
+      {% elseif user_rollover_thumbnail == 'caption' and searchEngine is null %}
+        {% set extraclass = extraclass ~ ' captionTips' %}
+        {% set tooltipsrc = '/prod/tooltip/caption/' ~ record.get_sbas_id() ~ '/' ~ record.get_record_id() ~ '/publi/' %}
       {% elseif user_rollover_thumbnail == 'preview' %}
         {% set extraclass = extraclass ~ ' captionTips' %}
         {% set tooltipsrc = '/prod/tooltip/preview/' ~ record.get_sbas_id() ~ '/' ~ record.get_record_id() ~ '/' %}

templates/web/setup/step2.html.twig

@@ -341,13 +341,8 @@
                         <tr>
                           <td>
                             <p>
-                              <a href="http://www.phraseanet.com/download/prerequisite/" target="_blank">
+                              <a href="https://docs.phraseanet.com/Admin/" target="_blank">
-                                {% trans 'Pre-requis' %}
+                                {% trans 'Prerequisite and Configuration' %}
-                              </a>
-                            </p>
-                            <p>
-                              <a href="http://www.phraseanet.com/download/" target="_blank">
-                                {% trans 'Configuration du serveur web' %}
                               </a>
                             </p>
                           </td>

www/admin/adminFeedback.php

@@ -66,6 +66,7 @@ switch ($parm['action'])
 
   case 'EMPTYBASE':
     $parm = $request->get_parms(array('sbas_id' => http_request::SANITIZE_NUMBER_INT));
+    $message = _('Base empty successful');
     try
     {
       $sbas_id = (int) $parm['sbas_id'];
@@ -73,17 +74,26 @@ switch ($parm['action'])
       $class_name = 'task_period_emptyColl';
       foreach ($databox->get_collections() as $collection)
       {
-        $settings = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><tasksettings><base_id>" . $collection->get_base_id() . "</base_id></tasksettings>";
+        if($collection->get_record_amount() <= 500)
-
+        {
-        task_abstract::create($appbox, $class_name, $settings);
+          $collection->empty_collection(500);
+        }
+        else
+        {
+          $settings = "<?xml version=\"1.0\" encoding=\"UTF-8\"?><tasksettings><base_id>" . $collection->get_base_id() . "</base_id></tasksettings>";
+          task_abstract::create($appbox, $class_name, $settings);
+          $message = _('A task has been creted, please run it to complete empty collection');
+        }
       }
     }
     catch (Exception $e)
     {
-
+      $message = _('An error occurred');
     }
+    $output = p4string::jsonencode(array('message'=>$message));
     break;
   case 'EMPTYCOLL':
+    $message = _('Collection empty successful');
     $parm = $request->get_parms(
                     array(
                         "sbas_id" => http_request::SANITIZE_NUMBER_INT
@@ -95,15 +105,24 @@ switch ($parm['action'])
       $databox = databox::get_instance($parm['sbas_id']);
       $collection = collection::get_from_coll_id($databox, $parm['coll_id']);
 
-      $class_name = 'task_period_emptyColl';
+      if($collection->get_record_amount() <= 500)
-      $settings = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<tasksettings>\n<base_id>" . $collection->get_base_id() . "</base_id></tasksettings>";
+      {
+        $collection->empty_collection(500);
+      }
+      else
+      {
+        $class_name = 'task_period_emptyColl';
+        $settings = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<tasksettings>\n<base_id>" . $collection->get_base_id() . "</base_id></tasksettings>";
 
-      task_abstract::create($appbox, $class_name, $settings);
+        task_abstract::create($appbox, $class_name, $settings);
+        $message = _('A task has been creted, please run it to complete empty collection');
+      }
     }
     catch (Exception $e)
     {
-
+      $message = _('An error occurred');
     }
+    $output = p4string::jsonencode(array('message'=>$message));
     break;
 
   case 'SETTASKSTATUS':

www/admin/collection.php

@@ -291,6 +291,7 @@ phrasea::headers();
 
             },
             success: function(data){
+              alert(data.message);
               return;
             }
           });

www/admin/database.php

@@ -194,6 +194,7 @@ if ($parm['act'])
         dataType: 'json',
         data: { sbas_id:<?php echo $sbas_id ?>  },
         success: function(data){
+          alert(data.message);
         }
       });
     }

www/client/baskets.php

@@ -41,7 +41,7 @@ if ($Request->get('act') == "ADDIMG" && ($Request->get("p0") != "" && $Request->
 {
   $repository = $em->getRepository('\Entities\Basket');
   /* @var $repository \Repositories\BasketRepository */
-  $basket = $repository->findUserBasket($Request->get('courChuId'), $user);
+  $basket = $repository->findUserBasket($Request->get('courChuId'), $user, true);
 
   $sbas_id = phrasea::sbasFromBas($Request->get('bas'));
   $record = new record_adapter($sbas_id, $Request->get('p0'));
@@ -61,7 +61,7 @@ if ($Request->get('act') == "DELCHU" && ($Request->get("p0") != "" && $Request->
 {
   $repository = $em->getRepository('\Entities\Basket');
   /* @var $repository \Repositories\BasketRepository */
-  $basket = $repository->findUserBasket($Request->get('courChuId'), $user);
+  $basket = $repository->findUserBasket($Request->get('courChuId'), $user, true);
 
   $em->remove($basket);
   $em->flush();
@@ -142,7 +142,7 @@ $out .= '</td><td style="width:40%">';
 $em = $Core->getEntityManager();
 $repository = $em->getRepository('\Entities\Basket');
 /* @var $repository \Repositories\BasketRepository */
-$basket = $repository->findUserBasket($courChuId, $user);
+$basket = $repository->findUserBasket($courChuId, $user, true);
 
 $jscriptnochu = $basket->getName() . " :  " . sprintf(_('paniers:: %d documents dans le panier'), $basket->getElements()->count());
 

www/client/clientFeedBack.php

@@ -57,8 +57,7 @@ switch ($parm['action'])
     if ($record->is_from_reg())
     {
       $train = $twig->render('prod/preview/reg_train.html', array(
-          'record' => $record,
+          'record' => $record
-          'GV_rollover_reg_preview' => $registry->get('GV_rollover_reg_preview')
               )
       );
     }
@@ -66,8 +65,7 @@ switch ($parm['action'])
     if ($record->is_from_basket() && $parm['roll'])
     {
       $train = $twig->render('prod/preview/basket_train.html', array(
-          'record' => $record,
+          'record' => $record
-          'GV_rollover_reg_preview' => $registry->get('GV_rollover_reg_preview')
               )
       );
     }
@@ -93,8 +91,7 @@ switch ($parm['action'])
                         )
                         , "others" => $twig->render('prod/preview/appears_in.html', array(
                             'parents' => $record->get_grouping_parents(),
-                            'baskets' => $record->get_container_baskets(),
+                            'baskets' => $record->get_container_baskets()
-                            'show_tooltips' => $registry->get('GV_rollover_reg_preview')
                                 )
                         )
                         , "current" => $train

www/include/download.php

@@ -48,7 +48,7 @@ if ($parm["ssttid"] != "")
 
   /* @var $repository \Repositories\BasketRepository */
 
-  $Basket = $repository->findUserBasket($Request->get('ssttid'), $Core->getAuthenticatedUser());
+  $Basket = $repository->findUserBasket($Request->get('ssttid'), $Core->getAuthenticatedUser(), false);
   $exportname = str_replace(' ', '_', $basket->getName()) . "_" . date("Y-n-d");
 }
 

www/include/jquery.tooltip.js

@@ -7,14 +7,14 @@
  * Copyright (c) 2006 - 2008 J<>rn Zaefferer
  *
  * $Id: jquery.tooltip.js 5741 2008-06-21 15:22:16Z joern.zaefferer $
- * 
+ *
  * Dual licensed under the MIT and GPL licenses:
  *   http://www.opensource.org/licenses/mit-license.php
  *   http://www.gnu.org/licenses/gpl.html
  */
- 
+
 (function($) {
-	
+
   // the tooltip element
   var helper = {},
   // the title of the current element, used for restoring
@@ -25,7 +25,7 @@
   IE = $.browser.msie && (/MSIE\s(5\.5|6\.)/).test(navigator.userAgent),
   // flag for mouse tracking
   track = false;
-	
+
   $.tooltip = {
     blocked: false,
     ajaxTimeout : false,
@@ -71,7 +71,7 @@
       });
     }
   };
-	
+
   $.fn.extend({
     tooltip: function(settings) {
       settings = $.extend({}, $.tooltip.defaults, settings);
@@ -131,7 +131,7 @@
       return this.attr('href') || this.attr('src');
     }
   });
-	
+
   function createHelper(settings) {
     // there can be only one tooltip helper
     if( helper.parent )
@@ -142,7 +142,7 @@
     .appendTo(document.body)
     // hide it at first
     .hide();
-			
+
     // apply bgiframe if available
     if ( $.fn.bgiframe )
       helper.parent.bgiframe();
@@ -152,11 +152,11 @@
     helper.body = $('div.body', helper.parent);
     helper.url = $('div.url', helper.parent);
   }
-	
+
   function settings(element) {
     return $.data(element, "tooltip");
   }
-	
+
   // main event handler to start showing tooltips
   function handle(event) {
 
@@ -169,15 +169,15 @@
     else
       visible();
     show();
-		
+
     // if selected, update the helper position when the mouse moves
     track = !!settings(this).track;
     $(document.body).bind('mousemove', update);
-		
+
     // update at least once
     update(event);
   }
-	
+
   // save elements title before the tooltip is displayed
   function save(event) {
     // if this is the current source, or it has no title (occurs with click event), stop
@@ -192,7 +192,7 @@
     // save current
     $.tooltip.current = this;
     title = this.tooltipText;
-		
+
     //		if ( settings(this).bodyHandler ) {
     //			helper.title.hide();
     //			var bodyContent = settings(this).bodyHandler.call(this);
@@ -215,13 +215,13 @@
     //		} else {
     //			helper.body.html(title).show();
     //		}
-		
+
     // if element has href or src, add and show it, otherwise hide it
     if( settings(this).showURL && $(this).url() )
       helper.url.html( $(this).url().replace('http://', '') ).show();
     else
       helper.url.hide();
-		
+
     // add an optional class for this tip
     //		helper.parent.addClass(settings(this).extraClass);
     if(this.ajaxLoad)
@@ -251,8 +251,11 @@
       var width = 'auto';
       var height = 'auto';
       var ratio = 1;
+      var resizeImgTips = false;
       var $imgTips = $('#' + settings($.tooltip.current).id + ' .imgTips');
-      if ($imgTips[0]) {
+
+      if ($imgTips[0] && $('#' + settings($.tooltip.current).id + ' .noToolTipResize').length === 0) {
+        resizeImgTips = true;
         width = parseInt($imgTips[0].style.width);
         height = parseInt($imgTips[0].style.height);
         ratio = width/height;
@@ -325,7 +328,7 @@
 
 
         //correction par ratio
-        if ($('#' + settings($.tooltip.current).id + ' .imgTips')[0]) {
+        if (resizeImgTips && $('#' + settings($.tooltip.current).id + ' .imgTips')[0]) {
 
           if(ratioSurfaceH > ratioImage)
           {
@@ -403,7 +406,7 @@
 
 
         //si ya une image on re-ajuste au ratio
-        if ($('#' + settings($.tooltip.current).id + ' .imgTips')[0]) {
+        if (resizeImgTips && $('#' + settings($.tooltip.current).id + ' .imgTips')[0]) {
           if(width == 'auto')
             width = $('#' + settings($.tooltip.current).id).width();
           if(height == 'auto')
@@ -439,20 +442,14 @@
           top: top
         });
 
-        $imgTips.css({
+        if(resizeImgTips)
-          width: width,
+        {
-          height: height
+          $imgTips.css({
-//          ,
+            width: width,
-//          left: left,
+            height: height
-//          top: top
+          });
-        });
+        }
 
-//        if($imgTips.size() > 0)
-//        {
-//          $('#' + settings($.tooltip.current).id).image_enhance('destroy').image_enhance({
-//            zoomable:true
-//          });
-//        }
       }
 
     }
@@ -463,7 +460,7 @@
   // delete timeout and show helper
   function show() {
     tID = null;
-		
+
     if ((!IE || !$.fn.bgiframe) && settings($.tooltip.current).fade) {
       if (helper.parent.is(":animated"))
         helper.parent.stop().show().fadeTo(settings($.tooltip.current).fade, 100);
@@ -474,7 +471,7 @@
     }
     update();
   }
-	
+
   function fix(event)
   {
     if(!settings(this).fixable)
@@ -489,21 +486,21 @@
     $('#tooltip .tooltip_closer').show();
     $.tooltip.blocked = true;
   }
-	
+
   function visible(){
     $.tooltip.visible = true;
     helper.parent.css({
       visibility:'visible'
     });
   }
-	
+
   /**
 	 * callback for mousemove
 	 * updates the helper position
 	 * removes itself when no current element
 	 */
   function update(event)	{
-		
+
     if($.tooltip.blocked)
       return;
 
@@ -515,7 +512,7 @@
     if ( !track && helper.parent.is(":visible")) {
       $(document.body).unbind('mousemove', update);
     }
-		
+
     // if no current element is available, remove this listener
     if( $.tooltip.current === null ) {
       $(document.body).unbind('mousemove', update);
@@ -524,7 +521,7 @@
 
     // remove position helper classes
     helper.parent.removeClass("viewport-right").removeClass("viewport-bottom");
-		
+
     if(!settings($.tooltip.current).outside)
     {
       var left = helper.parent[0].offsetLeft;
@@ -546,7 +543,7 @@
           top: top
         });
       }
-			
+
       var v = viewport(),
       h = helper.parent[0];
       // check horizontal position
@@ -565,17 +562,17 @@
       }
     }
   }
-	
+
   function viewport() {
     return {
       x: $(window).width(),
       y: $(window).height(),
-			
+
       cx: 0,
       cy: 0
     };
   }
-	
+
   // hide helper and restore added classes and the title
   function hide(event)
   {
@@ -603,11 +600,11 @@
         helper.parent.stop().fadeOut(tsettings.fade, complete);
     } else
       complete();
-		
+
     if( tsettings.fixPNG )
       helper.parent.unfixPNG();
   }
-	
+
 })(jQuery);
 
 function unfix_tooltip()

www/include/js/jquery.Edit.js

@@ -1,6 +1,6 @@
 
 (function( window ) {
-  
+
   function checkVocabId(VocabularyId)
   {
     if(typeof VocabularyId === 'undefined')
@@ -8,23 +8,23 @@
 
     if(VocabularyId === '')
       VocabularyId = null;
-      
+
     return VocabularyId;
   }
-  
+
   var recordFieldValue = function(meta_id, value, VocabularyId) {
-    
+
     VocabularyId = checkVocabId(VocabularyId);
-    
+
     this.datas = {
-      meta_id:meta_id, 
+      meta_id:meta_id,
-      value:value, 
+      value:value,
       VocabularyId:VocabularyId
     };
-    
+
     var $this = this;
   };
-  
+
   recordFieldValue.prototype = {
     getValue : function() {
       return this.datas.value;
@@ -36,7 +36,7 @@
       return this.datas.VocabularyId;
     },
     setValue : function(value, VocabularyId) {
-      
+
       this.datas.value = value;
       this.datas.VocabularyId = checkVocabId(VocabularyId);
       return this;
@@ -44,13 +44,13 @@
     remove : function() {
       this.datas.value = '';
       this.datas.VocabularyId = null;
-      
+
       return this;
     }
   };
-  
+
   var databoxField = function(name, meta_struct_id, options) {
-    
+
     var defaults = {
       multi : false,
       required : false,
@@ -63,23 +63,23 @@
       vocabularyRestricted : false
     },
     options = (typeof options == 'object') ? options : {};
-        
+
     if(isNaN(meta_struct_id))
     {
       throw 'meta_struct_id should be a number';
     }
-    
+
     this.name = name;
     this.meta_struct_id = meta_struct_id;
     this.options = jQuery.extend(defaults, options);
-    
+
     if(this.options.multi === true && this.options.separator === null)
     {
       this.options.separator = ';';
     }
-    
+
   };
-  
+
   databoxField.prototype = {
     getMetaStructId : function() {
       return this.meta_struct_id;
@@ -109,9 +109,9 @@
       return this.options.separator;
     }
   };
-  
+
   var recordField = function(databoxField, arrayValues) {
-    
+
     this.databoxField = databoxField;
     this.options = {
       dirty : false
@@ -122,9 +122,9 @@
     {
       if(arrayValues.length > 1 && !databoxField.isMulti())
         throw 'You can not add multiple values to a non multi field';
-      
+
       var first = true;
-      
+
       for(v in arrayValues)
       {
         if(typeof arrayValues[v] !== 'object')
@@ -133,20 +133,20 @@
           {
             console.error('Trying to add a non-recordFieldValue to the field...');
           }
-          
+
           continue;
         }
-        
+
         if(isNaN(arrayValues[v].getMetaId()))
         {
           if(window.console)
           {
             console.error('Trying to add a recordFieldValue without metaId...');
           }
-          
+
           continue;
         }
-        
+
         if(!first && this.options.multi === false)
         {
           if(window.console)
@@ -154,17 +154,17 @@
             console.error('Trying to add multi values in a non-multi field');
           }
         }
-        
+
         if(window.console)
         {
           console.log('adding a value : ', arrayValues[v]);
         }
-        
+
         this.datas.push(arrayValues[v]);
         first = false;
       }
     }
-    
+
     var $this = this;
   }
   recordField.prototype = {
@@ -184,26 +184,26 @@
       return this.options.dirty;
     },
     addValue : function(value, merge, VocabularyId) {
-      
+
       VocabularyId = checkVocabId(VocabularyId);
-      
+
       merge = !!merge;
-      
+
       if(this.databoxField.isReadonly())
       {
         if(window.console)
         {
           console.error('Unable to set a value to a readonly field');
         }
-        
+
         return;
       }
-      
+
       if(window.console)
       {
         console.log('adding value ',value,' vocId : ', VocabularyId , '  ; merge is ',merge);
       }
-      
+
       if(this.isMulti())
       {
         if(!this.hasValue(value, VocabularyId))
@@ -232,10 +232,10 @@
             console.log('Merging value ',value);
           }
           this.datas[0].setValue(this.datas[0].getValue() + ' ' + value, VocabularyId);
-          
+
           this.options.dirty = true;
         }
-        else  
+        else
         {
           if(merge === true && this.isEmpty() === false && VocabularyId !== null)
           {
@@ -247,7 +247,7 @@
           }
           else
           {
-           
+
             if(!this.hasValue(value, VocabularyId))
             {
               if(this.datas.length === 0)
@@ -271,11 +271,11 @@
           }
         }
       }
-      
+
       return this;
     },
     hasValue : function(value, VocabularyId) {
-      
+
       if(typeof value === 'undefined')
       {
         if(window.console)
@@ -283,9 +283,9 @@
           console.error('Trying to check the presence of an undefined value');
         }
       }
-      
+
       VocabularyId = checkVocabId(VocabularyId);
-      
+
       for(d in this.datas)
       {
         if(VocabularyId !== null)
@@ -311,24 +311,24 @@
       return false;
     },
     removeValue : function(value, vocabularyId) {
-      
+
       if(this.databoxField.isReadonly())
       {
         if(window.console)
         {
           console.error('Unable to set a value to a readonly field');
         }
-        
+
         return;
       }
-      
+
       vocabularyId = checkVocabId(vocabularyId);
-      
+
       if(window.console)
       {
         console.log('Try to remove value ', value, vocabularyId, this.datas);
       }
-      
+
       for(d in this.datas)
       {
         if(window.console)
@@ -361,7 +361,7 @@
     },
     isEmpty : function() {
       var empty = true;
-      
+
       for(d in this.datas)
       {
         if(this.datas[d].getValue() !== '')
@@ -370,17 +370,17 @@
       return empty;
     },
     empty : function() {
-      
+
       if(this.databoxField.isReadonly())
       {
         if(window.console)
         {
           console.error('Unable to set a value to a readonly field');
         }
-        
+
         return;
       }
-      
+
       for(d in this.datas)
       {
         this.datas[d].remove();
@@ -389,100 +389,101 @@
       return this;
     },
     getValue : function() {
-      
+
       if(this.isMulti())
         throw 'This field is multi, I can not give you a single value';
-      
+
       if(this.isEmpty())
         return null;
-      
+
       return this.datas[0];
     },
     getValues : function() {
-      
+
       if(!this.isMulti())
       {
         throw 'This field is not multi, I can not give you multiple values';
       }
-    
+
       if(this.isEmpty())
         return new Array();
-      
+
       var arrayValues = [];
-      
+
       for(d in this.datas)
       {
         if(this.datas[d].getValue() === '')
           continue;
-        
+
         arrayValues.push(this.datas[d]);
       }
-      
+
       return arrayValues;
     },
     sort : function(algo) {
       this.datas.sort(algo);
-      
+
       return this;
     },
     getSerializedValues : function() {
 
       var arrayValues = [];
       var values = this.getValues();
-      
+
       for(v in values)
       {
         arrayValues.push(values[v].getValue());
       }
-      
+
       return arrayValues.join(' ' + this.databoxField.getSeparator() + ' ');
     },
     replaceValue : function(search, replace) {
-      
+
       if(this.databoxField.isReadonly())
       {
         if(window.console)
         {
           console.error('Unable to set a value to a readonly field');
         }
-        
+
-        return;
+        return 0;
       }
-      
+
+      var n = 0;
+
       for(d in this.datas)
       {
         if(this.datas[d].getVocabularyId() !== null)
         {
           continue;
         }
-        
+
         var value = this.datas[d].getValue();
         var replacedValue = value.replace(search, replace);
-        
+
         if(value === replacedValue)
         {
           continue;
         }
+
+        n++;
+
         this.removeValue(value);
-        
+
         if(!this.hasValue(replacedValue))
         {
           this.addValue(replacedValue);
         }
-        
+
         this.options.dirty = true;
       }
-      
+
-      /**
+      return n;
-       * cleanup and remove duplicates
-       */
-      
-      return this;
     },
     exportDatas : function() {
-      
+
       var returnValue = new Array();
-      
+
       for(d in this.datas)
       {
         var temp = {
@@ -490,22 +491,22 @@
           meta_struct_id : this.getMetaStructId(),
           value  : this.datas[d].getValue()
         };
-        
+
         if(this.datas[d].getVocabularyId())
         {
           temp.vocabularyId = this.datas[d].getVocabularyId();
         }
         returnValue.push(temp);
       }
-        
+
       return returnValue;
     }
   };
 
   window.p4 = window.p4 || {};
-  
+
   window.p4.databoxField = databoxField;
   window.p4.recordFieldValue = recordFieldValue;
   window.p4.recordField = recordField;
-  
+
 })(window);

www/include/js/jquery.Selection.js

@@ -263,6 +263,12 @@
         }
       });
 
+
+      if(typeof $this.options.selectStop === 'function')
+      {
+        $this.options.selectStop(jQuery.Event('selectStop'), $this);
+      }
+
       return this;
     }
   };

www/include/sendmailpage.php

@@ -50,7 +50,7 @@ if ($parm["ssttid"] != "")
 
   /* @var $repository \Repositories\BasketRepository */
 
-  $Basket = $repository->findUserBasket($Request->get('ssttid'), $Core->getAuthenticatedUser());
+  $Basket = $repository->findUserBasket($Request->get('ssttid'), $Core->getAuthenticatedUser(), false);
 
   $exportname = str_replace(' ', '_', $basket->getName()) . "_" . date("Y-n-d");
 }

www/prod/docfunction.php

@@ -243,7 +243,7 @@ $user       = User_Adapter::getInstance($usr_id, $appbox);
     $repository = $em->getRepository('\Entities\Basket');
     /* @var $repository \Repositories\BasketRepository */
 
-    $Basket = $repository->findUserBasket($Request->get('SSTTID'), $Core->getAuthenticatedUser());
+    $Basket = $repository->findUserBasket($Request->get('SSTTID'), $Core->getAuthenticatedUser(), false);
 
     foreach ($Basket->getElements() as $basket_element)
     {

www/prod/imgfunction.php

@@ -55,6 +55,7 @@ if ($parm['ACT'] === null)
       $Basket = $repository->findUserBasket(
               $Request->get('SSTTID')
               , $Core->getAuthenticatedUser()
+              , false
       );
 
       foreach ($Basket->getElements() as $basket_element)

www/prod/jquery.Feedback.js

@@ -576,7 +576,7 @@
 
     var initRight = function(){
 
-      var $container = this.container;
+      var $container = this.container = $('#ListManager .editor');
 
       $('form[name="list-editor-search"]', this.container).bind('submit', function(){
 
@@ -605,11 +605,11 @@
 
       $('button', this.container).button();
 
-      $('.EditToggle', $('#ListManager')).bind('click', function(){
+      $('.EditToggle', $container).bind('click', function(){
         $('.content.readonly, .content.readwrite', $('#ListManager')).toggle();
         return false;
       });
-      $('.Refresher', $('#ListManager')).bind('click', function(){
+      $('.Refresher', $container).bind('click', function(){
         $('#ListManager ul.lists .list.selected a').trigger('click');
         return false;
       });
@@ -646,60 +646,6 @@
 
         return false;
       });
-
-//
-//      $('.editor input[name="list-add-user"]', this.container).autocomplete({
-//          minLength: 2,
-//          source: function( request, response ) {
-//            $.ajax({
-//              url: '/prod/push/search-user/',
-//              dataType: "json",
-//              data: {
-//                query: request.term
-//              },
-//              success: function( data ) {
-//                response( data );
-//              }
-//            });
-//          },
-//          select: function( event, ui ) {
-//            if(ui.item.type == 'USER')
-//            {
-//              var callback = function(list, datas) {
-//                if($.inArray(ui.item.usr_id, datas.result) >= 0)
-//                {
-//                  p4.Mustache.Render('List-Badge', ui.item, p4.ListManager.appendBadge);
-//                }
-//                $('.counter.current, .list.selected .counter', $('#ListManager')).each(function(){
-//                  $(this).text(parseInt($(this).text()) + datas.result.length);
-//                });
-//                console.log('increment counter');
-//              }
-//              p4.ListManager.getList().addUser(ui.item.usr_id, callback);
-//            }
-//            return false;
-//          }
-//        })
-//        .data( "autocomplete" )._renderItem = function( ul, item ) {
-//
-//          var autocompleter = $('.editor input[name="list-add-user"]', this.container);
-//
-//          autocompleter.addClass('loading');
-//
-//          var callback = function(datas){
-//            $(datas).data( "item.autocomplete", item ).appendTo( ul );
-//            autocompleter.data( "autocomplete" ).menu.refresh();
-//            autocompleter.data('autocomplete')._resizeMenu();
-//            autocompleter.removeClass('loading');
-//          };
-//
-//          if(item.type == 'USER')
-//          {
-//            var datas = p4.Mustache.Render('List-User-Item', item, callback);
-//          }
-//
-//          return;
-//        };
     };
 
 

www/prod/jquery.edit.js

@@ -1454,7 +1454,7 @@ function replace()
 
   search = new RegExp(r_search, commut);
 
-  var r, f;
+  var r, f, n = 0;
   for(r in p4.edit.T_records)
   {
     if(!p4.edit.T_records[r]._selected)
@@ -1463,10 +1463,13 @@ function replace()
     {
       if(field == '' || field==f)
       {
-        p4.edit.T_records[r].fields[f].replaceValue(search, replace);
+        n += p4.edit.T_records[r].fields[f].replaceValue(search, replace);
       }
     }
   }
+
+  humane.info($.sprintf(language.nFieldsChanged, n));
+
   updateEditSelectedRecords(null);
 }
 

www/prod/page0.js

@@ -888,18 +888,18 @@ $(document).ready(function(){
       var sim_rgb = hsl2rgb(hsb.h, hsb.s, sim_b);
       var sim_hex = RGBtoHex(sim_rgb.r,sim_rgb.g,sim_rgb.b);
 
-      $('style[title=color_selection]').empty().append(
-        '.diapo.selected,#reorder_box .diapo.selected, #EDIT_ALL .diapo.selected, .list.selected, .list.selected .diapo' +
-        '{'+
-        '    COLOR: #'+back_hex+';'+
-        '    BACKGROUND-COLOR: #'+hex+';'+
-        '}');
-
       setPref('background-selection', hex);
       setPref('background-selection-disabled', sim_hex);
       setPref('fontcolor-selection', back_hex);
 
+      $('style[title=color_selection]').empty()
 
+      var datas = '.diapo.selected,#reorder_box .diapo.selected, #EDIT_ALL .diapo.selected, .list.selected, .list.selected .diapo' +
+        '{'+
+        '    COLOR: #'+back_hex+';'+
+        '    BACKGROUND-COLOR: #'+hex+';'+
+        '}';
+      $('style[title=color_selection]').empty().text(datas);
     }
   });
   $('#backcolorpickerHolder').find('.colorpicker_submit').append($('#backcolorpickerHolder .submiter')).bind('click',function(){

www/prod/prodFeedBack.php

@@ -152,7 +152,7 @@ switch ($action)
     $parm = $request->get_parms('cont', 'pos');
     $record = new record_preview('REG', $parm['pos'], $parm['cont']);
     $output = $twig->render('prod/preview/reg_train.html', array('container_records' => $record->get_container()->get_children(),
-        'record' => $record, 'GV_rollover_reg_preview' => $registry->get('GV_rollover_reg_preview')));
+        'record' => $record));
     break;
 
   case 'GET_ORDERMANAGER':

www/skins/lightbox/jquery.lightbox.ie6.js

@@ -14,11 +14,11 @@ $(window).bind('beforeunload', function(){
 
 $(document).ready(function(){
 
-	
+
 	$(window).bind('resize',function(){
 		resize();
 	}).trigger('resize');
-	
+
 	function resize()
 	{
 		var h = $(window).height();
@@ -31,19 +31,19 @@ $(document).ready(function(){
 		$('#record_wrapper').width($('#innerWrapper').innerWidth() - $('#right_column').outerWidth() - 2);
 //		var right_column_wrapper_height = $('#right_column').innerHeight() - $('.right_column_title').outerHeight() - 10;
 //		$('.right_column_wrapper').height(right_column_wrapper_height);
-		
+
 		$('.record_display_box').each(function(i,n){
 			$('.container',n).height($(n).innerHeight() - $('.header').outerHeight());
 		});
 		display_record($('#record_compare').css('visibility') != 'hidden');
 	}
-	
+
-	
+
 	$(this).data('slideshow',false);
 	$(this).data('slideshow_ctime', false);
 
 	$('#mainMenu, .unselectable').disableSelection();
-	
+
 	display_basket();
 
 	$(window).bind('mousedown', function(){
@@ -53,7 +53,7 @@ $(document).ready(function(){
 	$('.basket_downloader').bind('click', function(){
 		download_basket();
 	});
-	
+
 	$('.basket_wrapper').hover(
 		function(){
 			$(this).addClass('hover');
@@ -83,16 +83,16 @@ $(document).ready(function(){
 			$('.validate', title).addClass('highlight');
 		}
 	}).addClass('clickable');
-	
+
 	var sselcont = $('#sc_container .basket_element:first');
 	if(sselcont.length > 0)
 	{
 		display_basket_element(false, sselcont.attr('id').split('_').pop());
 	}
 
-	
+
 	set_sizeable($('#record_main .container, #record_compare .container'));
-	
+
 	$('#navigation')
 			.bind('change',
 					function()
@@ -107,16 +107,16 @@ $(document).ready(function(){
 function bind_keyboard()
 {
 	$(document).bind('keydown', function(event){
-		
+
 		var stop = false;
 		$('.notes_wrapper').each(function(i,n){
 			if(parseInt($(n).css('top')) >= 0)
 				stop = true;
 		});
-		
+
 		if(stop)
 			return true;
-		
+
 		var cancelKey = false;
 
     var el, id;
@@ -159,7 +159,7 @@ function bind_keyboard()
 		{
 			event.cancelBubble = true;
 			if(event.stopPropagation)
-				event.stopPropagation(); 
+				event.stopPropagation();
 			return(false);
 		}
     return true;
@@ -183,13 +183,11 @@ function set_release(el)
       $('.loader', el).css({
         visibility:'hidden'
       });
-			if(data.error)
+      if(data.datas)
-			{
+  		{
-				
+      	alert(data.datas);
-				return;
+      }
-			}
+      
-			alert(data.datas);
-			
 			return;
 		}
 	});
@@ -216,17 +214,17 @@ function load_report()
 
 function set_sizeable(container)
 {
-	
+
 	$(container).bind('mousewheel',function(event,delta){
 
 		if($(this).hasClass('note_editing'))
 			return;
-		
+
 		var record = $('.record', this);
-		
+
 		if(record.length === 0)
 			return;
-		
+
 		var o_top = parseInt(record.css('top'));
 		var o_left = parseInt(record.css('left'));
 
@@ -253,13 +251,13 @@ function set_sizeable(container)
 
 		var top = Math.round((height / o_height) * (o_top - $(this).height() / 2) + $(this).height() / 2);
 		var left = Math.round((width / o_width) * (o_left - $(this).width() / 2) + $(this).width() / 2);
-		
+
 		record.width(width).height(height).css({top:top, left:left});
 	});
-	
+
 }
 
-	
+
 
 function display_basket()
 {
@@ -273,18 +271,18 @@ function display_basket()
 	}).bind('click',function(){
 		set_release($(this));
 	});
-	
+
 	$('.basket_element',sc_wrapper).parent()
 		.bind('click',function(event){
 			scid_click(event, this);
       return false;
 		})
 		.addClass('clickable');
-		
+
 	$('.agree_button, .disagree_button',sc_wrapper).bind('click',function(event){
 
 		var sselcont_id = $(this).closest('.basket_element').attr('id').split('_').pop();
-		
+
 		var agreement = $(this).hasClass('agree_button') ? '1' : '-1';
 
 		set_agreement(event, $(this), sselcont_id, agreement);
@@ -297,18 +295,18 @@ function display_basket()
 	$('.previewTips').tooltip();
 }
 
-	
+
-	
+
-	
+
-	
+
-	
+
-	
+
-	
+
-	
+
-	
+
-	
+
-	
+
-	
+
 
 function display_basket_element(compare, sselcont_id)
 {
@@ -322,15 +320,15 @@ function display_basket_element(compare, sselcont_id)
 		container = $('#record_main');
 	}
 	$('.record_image', container).draggable();
-	
+
 	var options_container = $('.options',container);
-	
+
 	$('.download_button', options_container).button({
 				text	: false
 	}).bind('click',function(){
 		download($(this).next('form[name=download_form]').find('input').val());
 	});
-	
+
 	$('.comment_button', options_container).button({
 		text	: true
 	}).bind('click',function()
@@ -345,7 +343,7 @@ function display_basket_element(compare, sselcont_id)
 				}
 			}
 		);
-	
+
 	activate_notes(container);
 
 	$('.previous_button', options_container).button({
@@ -353,19 +351,19 @@ function display_basket_element(compare, sselcont_id)
 	}).bind('click',function(){
 		get_prev();
 	});
-	
+
 	$('.play_button', options_container).button({
 		text	: false
 	}).bind('click',function(){
 		slideshow(true);
 	});
-	
+
 	$('.pause_button', options_container).button({
 		text	: false
 	}).bind('click',function(){
 		slideshow(false);
 	});
-	
+
 	if($(document).data('slideshow'))
 	{
 		$('.play_button, .next_button.play, .previous_button.play', options_container).hide();
@@ -374,17 +372,17 @@ function display_basket_element(compare, sselcont_id)
 	{
 		$('.pause_button, .next_button.pause, .previous_button.pause', options_container).hide();
 	}
-	
+
 	$('.next_button', options_container).button({
 		text	: false
 	}).bind('click',function(){
 		get_next();
 	});
-	
+
 	$('.container', container).bind('dblclick',function(event){
 								display_record();
 							});
-	
+
 	$('#record_wrapper .agree_'+sselcont_id+', .big_box.agree')
 			.bind('click',
 					function(event)
@@ -393,7 +391,7 @@ function display_basket_element(compare, sselcont_id)
 					}
 				)
 			.addClass('clickable');
-	
+
 	$('#record_wrapper .disagree_'+sselcont_id+', .big_box.disagree')
 			.bind('click',
 					function(event)
@@ -402,7 +400,7 @@ function display_basket_element(compare, sselcont_id)
 					}
 				)
 			.addClass('clickable');
-	
+
 	if(compare == $('#record_wrapper').hasClass('single'))
 	{
 		if(compare)
@@ -420,13 +418,13 @@ function display_basket_element(compare, sselcont_id)
 			$('#record_infos, #right_column').show();
 			$('#record_compare .container').empty();
 		}
-		
+
 	}
 	else
 	{
 		display_record(compare);
 	}
-	
+
 }
 
 
@@ -469,15 +467,15 @@ function activate_notes(container)
 			}
 		);
 }
-	
+
-	
+
 
 
 function download(value)
 {
-	var dialog_box = $('#dialog_dwnl'); 
+	var dialog_box = $('#dialog_dwnl');
-	
+
-	dialog_box = $('#dialog_dwnl'); 
+	dialog_box = $('#dialog_dwnl');
 
 	dialog_box.empty().addClass('loading').dialog({
 		width:800,
@@ -491,38 +489,38 @@ function download(value)
 		},
 		beforeclose:function(){
 			tinyMCE.execCommand('mceRemoveControl',true,'sendmail_message');
-			tinyMCE.execCommand('mceRemoveControl',true,'order_usage');	
+			tinyMCE.execCommand('mceRemoveControl',true,'order_usage');
 		}
 	}).dialog('open');
-	
+
 	$.post("/include/multiexports.php", "lst="+value, function(data) {
-		
+
 		dialog_box.removeClass('loading').empty().append(data);
 		$('.tabs', dialog_box).tabs();
 		tinyMCE.execCommand('mceAddControl',true,'sendmail_message');
-		tinyMCE.execCommand('mceAddControl',true,'order_usage');	
+		tinyMCE.execCommand('mceAddControl',true,'order_usage');
 
 		$('.close_button', dialog_box).bind('click',function(){
 			dialog_box.dialog('close').dialog('destroy');
 		});
 		return false;
 	});
-	
+
 }
-	
+
 
 function display_record(compare)
 {
 	var main_container 				= $('#record_wrapper');
-	
+
   main_container.width($('#innerWrapper').innerWidth() - $('#right_column').outerWidth() - 2);
-  
+
 	if(typeof compare == 'undefined')
 		compare = !main_container.hasClass('single');
 
 	var main_box					= $('#record_main');
 	var compare_box					= $('#record_compare');
-	
+
 	var main_record 				= $('.container .record', main_box);
 	var compare_record 				= $('.container .record', compare_box);
 
@@ -530,7 +528,7 @@ function display_record(compare)
 	var main_record_height			= parseInt($('input[name=height]', main_box).val());
 	var compare_record_width		= parseInt($('input[name=width]', compare_box).val());
 	var compare_record_height		= parseInt($('input[name=height]', compare_box).val());
-	
+
 	var main_container_width 		= main_container.width();
 	var main_container_innerwidth 	= main_container.innerWidth();
 	var main_container_height 		= main_container.height();
@@ -541,31 +539,31 @@ function display_record(compare)
 	{
     $('.agreement_selector').show();
 		main_container.addClass('comparison');
-		
+
 		var double_portrait_width		= main_container_innerwidth / 2;
 		var double_portrait_height		= main_container_innerheight - $('.header', main_box).outerHeight();
 
 		var double_paysage_width		= main_container_innerwidth;
 		var double_paysage_height		= main_container_innerheight / 2  - $('.header', main_box).outerHeight();
-	
+
 		var main_display_portrait		= calculate_display(
-											double_portrait_width, double_portrait_height, 
+											double_portrait_width, double_portrait_height,
 											main_record_width, main_record_height
 											);
 		var main_display_paysage		= calculate_display(
-											double_paysage_width, double_paysage_height, 
+											double_paysage_width, double_paysage_height,
 											main_record_width, main_record_height
 											);
 
 		var compare_display_portrait	= calculate_display(
-											double_portrait_width, double_portrait_height, 
+											double_portrait_width, double_portrait_height,
 											compare_record_width, compare_record_height
 											);
 		var compare_display_paysage		= calculate_display(
-											double_paysage_width, double_paysage_height, 
+											double_paysage_width, double_paysage_height,
 											compare_record_width, compare_record_height
 											);
-	
+
 		var surface_main_portrait		= main_display_portrait.width * main_display_portrait.height;
 		var surface_main_paysage		= main_display_paysage.width * main_display_paysage.height;
 		var surface_compare_portrait	= compare_display_portrait.width * compare_display_portrait.height;
@@ -575,15 +573,15 @@ function display_record(compare)
 		var double_paysage_surface		= (surface_main_paysage + surface_compare_paysage) / 2;
 
 		var smooth_image = false;
-		
+
 		var m_width_image, m_height_image, c_width_image, c_height_image, dim_container;
-		
+
 		if(double_portrait_surface > double_paysage_surface)
 		{
 			if(!main_container.hasClass('portrait'))
 			{
 				smooth_image = true;
-				
+
 				smooth_transform(
 						main_box,
 						parseInt($('#innerWrapper').width() / 2 - 13),
@@ -595,7 +593,7 @@ function display_record(compare)
 					);
 
 				compare_box.css('visibility','hidden');
-				
+
 				smooth_transform(
 							compare_box,
 							parseInt($('#innerWrapper').width() / 2 - 13),
@@ -618,7 +616,7 @@ function display_record(compare)
 			if(!main_container.hasClass('paysage'))
 			{
 				smooth_image = true;
-				
+
 				smooth_transform(
 							main_box,
 							$('#innerWrapper').width(),
@@ -628,9 +626,9 @@ function display_record(compare)
 								set_container_status('paysage');
 							}
 						);
-				
+
 				compare_box.css('visibility','hidden');
-				
+
 				smooth_transform(
 							compare_box,
 							$('#innerWrapper').width(),
@@ -657,7 +655,7 @@ function display_record(compare)
 	{
     $('.agreement_selector').hide();
 		main_container.removeClass('comparison');
-		
+
 		if(compare_box.is(':visible'))
 		{
 			compare_box.hide().css('visibility','hidden').css('display','block');
@@ -669,15 +667,15 @@ function display_record(compare)
                       , main_record_width
                       , main_record_height
 										);
-		
+
 		if(!main_container.hasClass('single'))
 		{
 			main_box.width('100%')
 					.height('100%');
-			
+
 			set_container_status('single');
 		}
-    
+
 		set_image_position(
       smooth_image
       , main_record
@@ -697,9 +695,9 @@ function set_agreement(event, el, sselcont_id, boolean_value)
 	if(event.stopPropagation)
 		event.stopPropagation();
 	event.cancelBubble = true;
-	
+
-	var id = 
+	var id =
-	
+
 	$.ajax({
     type: "POST",
     url: "/lightbox/ajax/SET_ELEMENT_AGREEMENT/"+sselcont_id+"/",
@@ -708,23 +706,30 @@ function set_agreement(event, el, sselcont_id, boolean_value)
 			agreement		: boolean_value
 		},
 		success: function(datas){
-			if(boolean_value == '1')
+      if(!datas.error)
-			{
-				$('.agree_'+sselcont_id+'').removeClass('not_decided');
-				$('.disagree_'+sselcont_id+'').addClass('not_decided');
-				$('.userchoice.me').addClass('agree').removeClass('disagree');
-			}
-			else
-			{
-				$('.agree_'+sselcont_id+'').addClass('not_decided');
-				$('.disagree_'+sselcont_id+'').removeClass('not_decided');
-				$('.userchoice.me').addClass('disagree').removeClass('agree');
-			}
-      p4.releasable = datas.releasable;
-      if(datas.releasable !== false)
       {
-        if(confirm(datas.releasable))
+        if(boolean_value == '1')
-          $('#basket_options .confirm_report').trigger('click');
+        {
+          $('.agree_'+sselcont_id+'').removeClass('not_decided');
+          $('.disagree_'+sselcont_id+'').addClass('not_decided');
+          $('.userchoice.me').addClass('agree').removeClass('disagree');
+        }
+        else
+        {
+          $('.agree_'+sselcont_id+'').addClass('not_decided');
+          $('.disagree_'+sselcont_id+'').removeClass('not_decided');
+          $('.userchoice.me').addClass('disagree').removeClass('agree');
+        }
+        p4.releasable = datas.releasable;
+        if(datas.releasable !== false)
+        {
+          if(confirm(datas.releasable))
+            $('#basket_options .confirm_report').trigger('click');
+        }
+      }
+      else
+      {
+        alert(datas.datas);
       }
 			return;
 		}
@@ -739,15 +744,15 @@ function get_next()
 
 	if(current_wrapper.length === 0)
 		return;
-	
+
 	current_wrapper = current_wrapper.next();
 	if(current_wrapper.length === 0)
 		current_wrapper = $('#sc_container .basket_element_wrapper:first');
-	
+
 	$('.basket_element', current_wrapper).trigger('click');
-	
+
 	adjust_visibility($('.basket_element', current_wrapper));
-	
+
 	if($(document).data('slideshow'))
 	{
 		var timer = setTimeout('get_next();', 3500);
@@ -761,13 +766,13 @@ function get_prev()
 
 	if(current_wrapper.length === 0)
 		return;
-		
+
 	slideshow(false);
-	
+
 	current_wrapper = current_wrapper.prev();
 	if(current_wrapper.length === 0)
 		current_wrapper = $('#sc_container .basket_element_wrapper:last');
-	
+
 	$('.basket_element', current_wrapper).trigger('click');
 
 	adjust_visibility($('.basket_element', current_wrapper));
@@ -776,16 +781,16 @@ function is_viewable(el)
 {
 	var sc_wrapper = $('#sc_wrapper');
 	var sc_container = $('#sc_container');
-	
+
 	var el_width = $(el).parent().outerWidth();
 	var el_position = $(el).parent().position();
 	var sc_scroll_left = sc_wrapper.scrollLeft();
-	
+
 	var boundup = sc_wrapper.width(),
 		bounddown = 0,
 		placeup = el_position.left + el_width - sc_scroll_left,
 		placedown = el_position.left - sc_scroll_left;
-	
+
 	if(placeup <= boundup && placedown >= bounddown)
 		return true;
 	return false;
@@ -795,12 +800,12 @@ function adjust_visibility(el)
 {
 	if(is_viewable(el))
 		return;
-	
+
 	var sc_wrapper = $('#sc_wrapper');
 	var el_parent = $(el).parent();
-	
+
 	var sc_left = el_parent.position().left + el_parent.outerWidth() / 2 - sc_wrapper.width() / 2;
-	
+
 	sc_wrapper.stop().animate({'scrollLeft':sc_left});
 }
 
@@ -809,17 +814,17 @@ function slideshow(boolean_value)
 {
 	if(boolean_value == $(document).data('slideshow'))
 		return;
-	
+
 	if(!boolean_value && $(document).data('slideshow_ctime'))
 	{
 		clearTimeout($(document).data('slideshow_ctime'));
 		$(document).data('slideshow_ctime', false);
 	}
-	
+
 	$(document).data('slideshow', boolean_value);
-	
+
 	var headers = $('#record_wrapper .header');
-	
+
 	if(boolean_value)
 	{
 		$('.play_button, .next_button.play, .previous_button.play').hide();
@@ -838,7 +843,7 @@ function smooth_transform(box, width, height, callback)
 {
 	if(typeof callback == 'undefined')
 		callback = function(){};
-		
+
 	$(box).stop()
 		.css(
 			{
@@ -856,7 +861,7 @@ function save_note(container, button)
 {
 	var sselcont_id = $(button).attr('id').split('_').pop();
 	var note = $('.notes_wrapper textarea', container).val();
-	
+
 	$.ajax({
     type: "POST",
     url: "/lightbox/ajax/SET_NOTE/"+sselcont_id+"/",
@@ -872,7 +877,7 @@ function save_note(container, button)
 			return;
 		}
 	});
-	
+
 }
 function calculate_display(display_width, display_height, width, height, margin)
 {
@@ -905,12 +910,12 @@ function calculate_display(display_width, display_height, width, height, margin)
 function set_image_position(smooth, image, width, height, container, callback)
 {
 	var dimensions = {};
-	
+
 	if(typeof container !== 'undefined')
 	{
 		var c_width		= container.width;
 		var c_height	= container.height;
-	
+
 		dimensions.top	= parseInt((c_height - height) / 2);
 		dimensions.left	= parseInt((c_width - width) / 2);
 	}
@@ -918,7 +923,7 @@ function set_image_position(smooth, image, width, height, container, callback)
 	{
 		callback = function(){};
 	}
-	
+
 	dimensions.width	= parseInt(width);
 	dimensions.height	= parseInt(height);
 //		if(smooth)
@@ -936,7 +941,7 @@ function set_image_position(smooth, image, width, height, container, callback)
 function scid_click(event, el)
 {
 	var compare = is_ctrl_key(event);
-	
+
   if(compare)
   {
     if($('.basket_element', el).hasClass('selected'))
@@ -947,18 +952,18 @@ function scid_click(event, el)
     $('#sc_container .basket_element.selected').removeClass('selected');
     $('.basket_element', el).addClass('selected');
   }
-	
+
 	var sselcont_id = $('.basket_element', el).attr('id').split('_').pop();
 	var ssel_id = $('#navigation').val();
-	
+
 	var container = $('#sc_container');
-	
+
 	var request = container.data('request');
 	if(request && typeof(request.abort) == 'function')
 	{
 		request.abort();
 	}
-	
+
 	request = $.ajax({
     type: "GET",
     url: $(el).attr('href'),//"/lightbox/ajax/LOAD_BASKET_ELEMENT/"+sselcont_id+'/',
@@ -973,11 +978,11 @@ function scid_click(event, el)
 			else
 			{
 				container = $('#record_main');
-				
+
 				$('#record_infos .container')
 						.empty()
 						.append(data.caption);
-				
+
 				$('#basket_infos')
 						.empty()
 						.append(data.agreement_html);
@@ -991,7 +996,7 @@ function scid_click(event, el)
 					.empty()
 					.append(data.title)
 					.attr('title', data.title);
-			
+
 			var options_container = $('.options',container);
 			options_container
 					.empty()
@@ -999,11 +1004,11 @@ function scid_click(event, el)
 
 			$('.container', container).empty()
 									.append(data.preview+data.selector_html+data.note_html);
-			
+
-			
+
 			display_basket_element(compare, sselcont_id);
-			
+
-			
+
 			return;
 		}
 	});
@@ -1034,7 +1039,7 @@ function is_ctrl_key(event)
 		return true;
 	if(event.keyCode == '91')	// apple key safari
 		return true;
-	
+
 	return false;
 }
 
@@ -1044,5 +1049,5 @@ function is_shift_key(event)
 		return true;
 	return false;
 }
-	
+
 

www/skins/lightbox/jquery.lightbox.js

@@ -3,18 +3,18 @@ var p4 = {
 };
 
 $(document).ready(function(){
-	
+
   $(this).data('slideshow',false);
   $(this).data('slideshow_ctime', false);
 
   $('#mainMenu, .unselectable').disableSelection();
-	
+
   display_basket();
 
   $(window).bind('mousedown', function(){
     $(this).focus();
   }).trigger('mousedown');
-	
+
   $('.basket_wrapper').hover(
     function(){
       $(this).addClass('hover');
@@ -58,10 +58,10 @@ $(document).ready(function(){
   {
     display_basket_element(false, sselcont.attr('id').split('_').pop());
   }
-	
+
-	
+
   set_sizeable($('#record_main .container, #record_compare .container'));
-	
+
   $('#navigation')
   .bind('change',
     function()
@@ -69,7 +69,7 @@ $(document).ready(function(){
       window.location.replace(window.location.protocol+"//"+window.location.host+'/lightbox/validate/'+$(this).val()+'/');
     }
     );
-	
+
   $('#left_scroller')
   .bind('click',
     function()
@@ -77,14 +77,14 @@ $(document).ready(function(){
       scroll_elements(false);
     }
     );
-	
+
   $('#right_scroller')
   .bind('click', function()
   {
     scroll_elements(true);
   }
   );
-	
+
   $(window)
   .bind('resize',function()
   {
@@ -107,16 +107,16 @@ $(window).bind('beforeunload', function(){
 function bind_keyboard()
 {
   $(document).bind('keydown', function(event){
-		
+
     var stop = false;
     $('.notes_wrapper').each(function(i,n){
       if(parseInt($(n).css('top')) >= 0)
         stop = true;
     });
-		
+
     if(stop)
       return true;
-		
+
     var cancelKey = false;
     var el, id;
     switch(event.keyCode)
@@ -178,7 +178,7 @@ function is_ctrl_key(event)
     return true;
   if(event.keyCode == '91')	// apple key safari
     return true;
-	
+
   return false;
 }
 
@@ -217,13 +217,11 @@ function set_release(el)
       $('.loader', el).css({
         visibility:'hidden'
       });
-      if(data.error)
+      if(data.datas)
-      {
+  		{
-				
+      	alert(data.datas);
-        return;
       }
-      alert(data.datas);
+
-			
       return;
     }
   });
@@ -246,7 +244,7 @@ function load_report()
         resizable:false,
         height	: Math.round($(window).height() * 0.8)
       });
-			
+
       return;
     }
   });
@@ -272,17 +270,17 @@ function display_basket()
   .bind('click',function(){
     set_release($(this));
   });
-	
+
   $('.basket_element',sc_wrapper).parent()
   .bind('click',function(event){
     scid_click(event, this);
     return false;
   });
-		
+
   $('.agree_button, .disagree_button',sc_wrapper).bind('click',function(event){
 
     var sselcont_id = $(this).closest('.basket_element').attr('id').split('_').pop();
-		
+
     var agreement = $(this).hasClass('agree_button') ? '1' : '-1';
 
     set_agreement(event, $(this), sselcont_id, agreement);
@@ -299,7 +297,7 @@ function display_basket()
 function scid_click(event, el)
 {
   var compare = is_ctrl_key(event);
-	
+
   if(compare)
   {
     if($('.basket_element', el).hasClass('selected'))
@@ -310,18 +308,18 @@ function scid_click(event, el)
     $('#sc_container .basket_element.selected').removeClass('selected');
     $('.basket_element', el).addClass('selected');
   }
-	
+
   var sselcont_id = $('.basket_element', el).attr('id').split('_').pop();
   var ssel_id = $('#navigation').val();
-	
+
   var container = $('#sc_container');
-	
+
   var request = container.data('request');
   if(request && typeof(request.abort) == 'function')
   {
     request.abort();
   }
-	
+
   request = $.ajax({
     type: "GET",
     url: $(el).attr('href'),//"/lightbox/ajax/LOAD_BASKET_ELEMENT/"+sselcont_id+'/',
@@ -329,7 +327,7 @@ function scid_click(event, el)
     success: function(datas){
       var container = false;
       var data = datas;
-			
+
       if(compare)
       {
         container = $('#record_compare');
@@ -337,11 +335,11 @@ function scid_click(event, el)
       else
       {
         container = $('#record_main');
-				
+
         $('#record_infos .container')
         .empty()
         .append(data.caption);
-				
+
         $('#basket_infos')
         .empty()
         .append(data.agreement_html);
@@ -355,7 +353,7 @@ function scid_click(event, el)
       .empty()
       .append(data.title)
       .attr('title', data.title);
-			
+
       var options_container = $('.options',container);
       options_container
       .empty()
@@ -363,11 +361,11 @@ function scid_click(event, el)
 
       $('.container', container).empty()
       .append(data.preview+data.selector_html+data.note_html);
-			
+
-			
+
       display_basket_element(compare, sselcont_id);
-			
+
-			
+
       return;
     }
   });
@@ -378,7 +376,7 @@ function save_note(container, button)
 {
   var sselcont_id = $(button).attr('id').split('_').pop();
   var note = $('.notes_wrapper textarea', container).val();
-	
+
   $.ajax({
     type: "POST",
     url: "/lightbox/ajax/SET_NOTE/"+sselcont_id+"/",
@@ -394,7 +392,7 @@ function save_note(container, button)
       return;
     }
   });
-	
+
 }
 
 function display_basket_element(compare, sselcont_id)
@@ -409,9 +407,9 @@ function display_basket_element(compare, sselcont_id)
     container = $('#record_main');
   }
   $('.record_image', container).draggable();
-	
+
   var options_container = $('.options',container);
-	
+
   $('.download_button', options_container).button({
     text	: false
   //				,
@@ -422,7 +420,7 @@ function display_basket_element(compare, sselcont_id)
     //		$(this).blur();
     download($(this).next('form[name=download_form]').find('input').val());
   });
-	
+
   $('.comment_button', options_container).button({
     text	: true
   //		,
@@ -442,7 +440,7 @@ function display_basket_element(compare, sselcont_id)
     }
   }
   );
-	
+
   activate_notes(container);
 
   $('.previous_button', options_container).button({
@@ -455,7 +453,7 @@ function display_basket_element(compare, sselcont_id)
     //		$(this).blur();
     get_prev();
   });
-	
+
   $('.play_button', options_container).button({
     text	: false
   //		,
@@ -466,7 +464,7 @@ function display_basket_element(compare, sselcont_id)
     //		$(this).blur();
     slideshow(true);
   });
-	
+
   $('.pause_button', options_container).button({
     text	: false
   //		,
@@ -486,7 +484,7 @@ function display_basket_element(compare, sselcont_id)
   {
     $('.pause_button, .next_button.pause, .previous_button.pause', options_container).hide();
   }
-	
+
   $('.next_button', options_container).button({
     text	: false
   //		,
@@ -498,13 +496,13 @@ function display_basket_element(compare, sselcont_id)
     slideshow(false);
     get_next();
   });
-	
+
-	
+
   $('.container', container).bind('dblclick',function(event){
     display_record();
   });
-	
+
-	
+
   $('#record_wrapper .agree_'+sselcont_id+', .big_box.agree')
   .bind('click',
     function(event)
@@ -513,7 +511,7 @@ function display_basket_element(compare, sselcont_id)
     }
     )
   .addClass('clickable');
-	
+
   $('#record_wrapper .disagree_'+sselcont_id+', .big_box.disagree')
   .bind('click',
     function(event)
@@ -522,7 +520,7 @@ function display_basket_element(compare, sselcont_id)
     }
     )
   .addClass('clickable');
-	
+
   if(compare == $('#record_wrapper').hasClass('single'))
   {
     if(compare)
@@ -545,13 +543,13 @@ function display_basket_element(compare, sselcont_id)
       $('#right_column').show();
       $('#record_compare .container').empty();
     }
-		
+
   }
   else
   {
     display_record(compare);
   }
-	
+
 }
 
 function show_notes(container)
@@ -597,16 +595,16 @@ function is_viewable(el)
 {
   var sc_wrapper = $('#sc_wrapper');
   var sc_container = $('#sc_container');
-	
+
   var el_width = $(el).parent().outerWidth();
   var el_position = $(el).parent().position();
   var sc_scroll_left = sc_wrapper.scrollLeft();
-	
+
   var boundup = sc_wrapper.width(),
   bounddown = 0,
   placeup = el_position.left + el_width - sc_scroll_left,
   placedown = el_position.left - sc_scroll_left;
-	
+
   if(placeup <= boundup && placedown >= bounddown)
     return true;
   return false;
@@ -616,12 +614,12 @@ function adjust_visibility(el)
 {
   if(is_viewable(el))
     return;
-	
+
   var sc_wrapper = $('#sc_wrapper');
   var el_parent = $(el).parent();
-	
+
   var sc_left = el_parent.position().left + el_parent.outerWidth() / 2 - sc_wrapper.width() / 2;
-	
+
   sc_wrapper.stop().animate({
     'scrollLeft':sc_left
   });
@@ -633,15 +631,15 @@ function get_next()
 
   if(current_wrapper.length === 0)
     return;
-	
+
   current_wrapper = current_wrapper.next();
   if(current_wrapper.length === 0)
     current_wrapper = $('#sc_container .basket_element_wrapper:first');
-	
+
   $('.basket_element', current_wrapper).parent().trigger('click');
-	
+
   adjust_visibility($('.basket_element', current_wrapper));
-	
+
   if($(document).data('slideshow'))
   {
     var timer = setTimeout('get_next();', 3500);
@@ -655,13 +653,13 @@ function get_prev()
 
   if(current_wrapper.length === 0)
     return;
-		
+
   slideshow(false);
-	
+
   current_wrapper = current_wrapper.prev();
   if(current_wrapper.length === 0)
     current_wrapper = $('#sc_container .basket_element_wrapper:last');
-	
+
   $('.basket_element', current_wrapper).parent().trigger('click');
 
   adjust_visibility($('.basket_element', current_wrapper));
@@ -671,17 +669,17 @@ function slideshow(boolean_value)
 {
   if(boolean_value == $(document).data('slideshow'))
     return;
-	
+
   if(!boolean_value && $(document).data('slideshow_ctime'))
   {
     clearTimeout($(document).data('slideshow_ctime'));
     $(document).data('slideshow_ctime', false);
   }
-	
+
   $(document).data('slideshow', boolean_value);
-	
+
   var headers = $('#record_wrapper .header');
-	
+
   if(boolean_value)
   {
     $('.play_button, .next_button.play, .previous_button.play', headers).hide();
@@ -697,17 +695,17 @@ function slideshow(boolean_value)
 
 function set_sizeable(container)
 {
-	
+
   $(container).bind('mousewheel',function(event,delta){
 
     if($(this).hasClass('note_editing'))
       return;
-		
+
     var record = $('.record_image', this);
-		
+
     if(record.length === 0)
       return;
-		
+
     var o_top = parseInt(record.css('top'));
     var o_left = parseInt(record.css('left'));
 
@@ -734,13 +732,13 @@ function set_sizeable(container)
 
     var top = Math.round((height / o_height) * (o_top - $(this).height() / 2) + $(this).height() / 2);
     var left = Math.round((width / o_width) * (o_left - $(this).width() / 2) + $(this).width() / 2);
-		
+
     record.width(width).height(height).css({
       top:top,
       left:left
     });
   });
-	
+
 }
 
 function set_agreement(event, el, sselcont_id, boolean_value)
@@ -748,9 +746,9 @@ function set_agreement(event, el, sselcont_id, boolean_value)
   if(event.stopPropagation)
     event.stopPropagation();
   event.cancelBubble = true;
-	
+
   var id =
-	
+
   $.ajax({
     type: "POST",
     url: "/lightbox/ajax/SET_ELEMENT_AGREEMENT/"+sselcont_id+"/",
@@ -759,23 +757,30 @@ function set_agreement(event, el, sselcont_id, boolean_value)
       agreement		: boolean_value
     },
     success: function(datas){
-      if(boolean_value == '1')
+      if(!datas.error)
       {
-        $('.agree_'+sselcont_id+'').removeClass('not_decided');
+        if(boolean_value == '1')
-        $('.disagree_'+sselcont_id+'').addClass('not_decided');
+        {
-        $('.userchoice.me').addClass('agree').removeClass('disagree');
+          $('.agree_'+sselcont_id+'').removeClass('not_decided');
+          $('.disagree_'+sselcont_id+'').addClass('not_decided');
+          $('.userchoice.me').addClass('agree').removeClass('disagree');
+        }
+        else
+        {
+          $('.agree_'+sselcont_id+'').addClass('not_decided');
+          $('.disagree_'+sselcont_id+'').removeClass('not_decided');
+          $('.userchoice.me').addClass('disagree').removeClass('agree');
+        }
+        p4.releasable = datas.releasable;
+        if(datas.releasable !== false)
+        {
+          if(confirm(datas.releasable))
+            $('#basket_options .confirm_report').trigger('click');
+        }
       }
       else
       {
-        $('.agree_'+sselcont_id+'').addClass('not_decided');
+        alert(datas.datas);
-        $('.disagree_'+sselcont_id+'').removeClass('not_decided');
-        $('.userchoice.me').addClass('disagree').removeClass('agree');
-      }
-      p4.releasable = datas.releasable;
-      if(datas.releasable !== false)
-      {
-        if(confirm(datas.releasable))
-          $('#basket_options .confirm_report').trigger('click');
       }
       return;
     }
@@ -817,13 +822,13 @@ function calculate_display(display_width, display_height, width, height, margin)
 function display_record(compare)
 {
   var main_container 				= $('#record_wrapper');
-	
+
   if(typeof compare == 'undefined')
     compare = !main_container.hasClass('single');
 
   var main_box					= $('#record_main');
   var compare_box					= $('#record_compare');
-	
+
   var main_record 				= $('.container .record', main_box);
   var compare_record 				= $('.container .record', compare_box);
 
@@ -831,23 +836,23 @@ function display_record(compare)
   var main_record_height			= parseInt($('input[name=height]', main_box).val());
   var compare_record_width		= parseInt($('input[name=width]', compare_box).val());
   var compare_record_height		= parseInt($('input[name=height]', compare_box).val());
-	
+
   var main_container_width 		= main_container.width();
   var main_container_innerwidth 	= main_container.innerWidth();
   var main_container_height 		= main_container.height();
   var main_container_innerheight 	= main_container.innerHeight();
-	
+
   if(compare)
   {
     $('.agreement_selector').show();
     main_container.addClass('comparison');
-		
+
     var double_portrait_width		= main_container_innerwidth / 2;
     var double_portrait_height		= main_container_innerheight - $('.header', main_box).outerHeight();
 
     var double_paysage_width		= main_container_innerwidth;
     var double_paysage_height		= main_container_innerheight / 2  - $('.header', main_box).outerHeight();
-	
+
     var main_display_portrait		= calculate_display(
       double_portrait_width, double_portrait_height,
       main_record_width, main_record_height
@@ -865,7 +870,7 @@ function display_record(compare)
       double_paysage_width, double_paysage_height,
       compare_record_width, compare_record_height
       );
-	
+
     var surface_main_portrait		= main_display_portrait.width * main_display_portrait.height;
     var surface_main_paysage		= main_display_paysage.width * main_display_paysage.height;
     var surface_compare_portrait	= compare_display_portrait.width * compare_display_portrait.height;
@@ -875,15 +880,15 @@ function display_record(compare)
     var double_paysage_surface		= (surface_main_paysage + surface_compare_paysage) / 2;
 
     var smooth_image = false;
-		
+
     var m_width_image, m_height_image, c_width_image, c_height_image, dim_container;
-		
+
     if(double_portrait_surface > double_paysage_surface)
     {
       if(!main_container.hasClass('portrait'))
       {
         smooth_image = true;
-				
+
         smooth_transform(
           main_box,
           '50%',
@@ -895,7 +900,7 @@ function display_record(compare)
           );
 
         compare_box.css('visibility','hidden');
-				
+
         smooth_transform(
           compare_box,
           '50%',
@@ -922,7 +927,7 @@ function display_record(compare)
       if(!main_container.hasClass('paysage'))
       {
         smooth_image = true;
-				
+
         smooth_transform(
           main_box,
           '100%',
@@ -932,9 +937,9 @@ function display_record(compare)
             set_container_status('paysage');
           }
           );
-				
+
         compare_box.css('visibility','hidden');
-				
+
         smooth_transform(
           compare_box,
           '100%',
@@ -964,7 +969,7 @@ function display_record(compare)
   {
     $('.agreement_selector').hide();
     main_container.removeClass('comparison');
-		
+
     if(compare_box.is(':visible'))
     {
       compare_box.hide().css('visibility','hidden').css('display','block');
@@ -974,12 +979,12 @@ function display_record(compare)
       main_container_innerwidth, (main_container_innerheight - $('.header', main_box).outerHeight()),
       main_record_width, main_record_height
       );
-		
+
     if(!main_container.hasClass('single'))
     {
       main_box.width('100%')
       .height('100%');
-			
+
       set_container_status('single');
     }
     set_image_position(smooth_image, main_record, main_display.width, main_display.height, {
@@ -1002,7 +1007,7 @@ function set_image_position(smooth, image, width, height, container, callback)
   {
     var c_width		= container.width;
     var c_height	= container.height;
-	
+
     dimensions.top	= parseInt((c_height - height) / 2);
     dimensions.left	= parseInt((c_width - width) / 2);
   }
@@ -1013,7 +1018,7 @@ function set_image_position(smooth, image, width, height, container, callback)
 
   dimensions.width	= width;
   dimensions.height	= height;
-	
+
   if(smooth)
   {
     $(image).stop().animate(dimensions,500,callback);
@@ -1029,7 +1034,7 @@ function smooth_transform(box, width, height, callback)
 {
   if(typeof callback == 'undefined')
     callback = function(){};
-		
+
   $(box).stop()
   .animate(
   {
@@ -1050,7 +1055,7 @@ function scroll_elements(boolean_value)
     value = sc_wrapper.scrollLeft() + 400;
   else
     value = sc_wrapper.scrollLeft() - 400;
-	
+
   sc_wrapper.stop().animate({
     'scrollLeft':value
   });
@@ -1068,7 +1073,7 @@ function download_basket()
 function download(value)
 {
   var dialog_box = $('#dialog_dwnl');
-	
+
   dialog_box = $('#dialog_dwnl');
 
   dialog_box.empty().addClass('loading').dialog({
@@ -1086,9 +1091,9 @@ function download(value)
       tinyMCE.execCommand('mceRemoveControl',true,'order_usage');
     }
   }).dialog('open');
-	
+
   $.post("/include/multiexports.php", "lst="+value, function(data) {
-		
+
     dialog_box.removeClass('loading').empty().append(data);
     $('.tabs', dialog_box).tabs();
     tinyMCE.execCommand('mceAddControl',true,'sendmail_message');
@@ -1099,6 +1104,6 @@ function download(value)
     });
     return false;
   });
-	
+
 }
 

www/skins/lightbox/jquery.validator.mobile.js

@@ -24,15 +24,22 @@ $(document).ready(function(){
         $.mobile.pageLoading(true);
       },
       success: function(datas){
-        if(agreement == '1')
+        if(!datas.error)
-          $('.valid_choice_'+sselcont_id).removeClass('disagree').addClass('agree');
+        {
+          if(agreement == '1')
+            $('.valid_choice_'+sselcont_id).removeClass('disagree').addClass('agree');
+          else
+            $('.valid_choice_'+sselcont_id).removeClass('agree').addClass('disagree');
+          $.mobile.pageLoading(true);
+          if(datas.error)
+          {
+            alert(datas.datas);
+            return;
+          }
+        }
         else
-          $('.valid_choice_'+sselcont_id).removeClass('agree').addClass('disagree');
-        $.mobile.pageLoading(true);
-        if(datas.error)
         {
           alert(datas.datas);
-          return;
         }
         return;
       }

www/skins/prod/000000/prodcolor.css

@@ -2785,7 +2785,7 @@ dans l'onglet thesaurus : arbres, menus contextuels
 
 #answers .feed
 {
-  margin:10px 10px 10px 0;
+  margin:10px;
 }
 
 #answers .feed .entry table.head

www/skins/prod/Basket.css

@@ -88,7 +88,8 @@
 #BasketBrowser input {
     display:none;
 }
-#BasketBrowser input:checked + label {
+#BasketBrowser input:checked + label,
+#BasketBrowser label.selected {
     color: #d18827;
 }
 
@@ -96,7 +97,8 @@
   padding:3px;
   display:block;
   border-radius:4px;
-  width:180px;
+  width:155px;
+  padding-left:25px;
 }
 
 #BasketBrowser form h1{