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

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

@@ -183,10 +183,12 @@ class Push implements ControllerProviderInterface
 
           $appbox = \appbox::get_instance($app['Core']);
 
-          $push_name = $request->get(
+          $push_name = $request->get('name');
-            'name'
+
-            , sprintf(_('Push from %s'), $user->get_display_name())
+          if (trim($push_name) === '')
-          );
+          {
+            $push_name = sprintf(_('Push from %s'), $user->get_display_name());
+          }
 
           $push_description = $request->get('push_description');
 
@@ -322,10 +324,12 @@ class Push implements ControllerProviderInterface
 
           $repository = $em->getRepository('\Entities\Basket');
 
-          $validation_name = $request->get(
+          $validation_name = $request->get('name');
-            'name'
+
-            , sprintf(_('Validation from %s'), $user->get_display_name())
+          if (trim($validation_name) === '')
-          );
+          {
+            $validation_name = sprintf(_('Validation from %s'), $user->get_display_name());
+          }
 
           $validation_description = $request->get('validation_description');
 

lib/Doctrine/Repositories/BasketRepository.php

@@ -286,7 +286,7 @@ class BasketRepository extends EntityRepository
       $params['description'] = '%' . $query . '%';
     }
 
-    $dql .= ' ORDER BY e.ord ASC';
+    $dql .= ' ORDER BY b.id DESC, e.ord ASC';
 
     $query = $this->_em->createQuery($dql);
     $query->setParameters($params);

templates/web/prod/actions/Push.html.twig

@@ -61,16 +61,20 @@
     </div>
   </div>
   <div class="PNB" style="left:205px;">
-    <div class="PNB" style="height:150px;bottom:auto;">
+    <div class="PNB" style="height:150px;bottom:auto;line-height:26px">
       <div class="PNB10">
         <table>
-          <tr>
+          <tr style="vertical-align:top;">
             <td>
-              <input class="search" name="users-search" placeholder="{% trans 'Users' %}" type="text" />
+              <div>
-
+                {% trans 'Find a user' %}
+              </div>
+              <div>
+                <input class="search" name="users-search" placeholder="{% trans 'Users' %}" type="text" />
+              </div>
+              {% trans 'Or' %}
               <a href="/prod/push/add-user/" class="user_adder link">{% trans 'Add user' %}</a>
 
-              <button class="FeedbackSend">{% trans "Send" %}</button>
               <p>
 
                 {% set recommendation = '' %}
@@ -142,6 +146,11 @@
                   {% trans 'Push::une validation est une demande d\'appreciation a d\'autres personnes' %}
                 {% endif %}
               </p>
+              <div style="text-align:right;">
+                <button class="FeedbackSend">
+                  {% trans "Send" %}
+                </button>
+              </div>
             </td>
           </tr>
         </table>

templates/web/prod/index.html.twig

@@ -2,7 +2,7 @@
 {% set unique_id = module.getRandom() %}
 {% for base in search_datas['bases'] %}
 {% set sbas_id = base['sbas_id'] %}
-<div class="sbas_list sbas_{{sbas_id}}">
+<div class="sbas_list sbas_{{sbas_id}}" style="margin-bottom:10px;">
   <input type="hidden" name="reference" value="{{sbas_id}}"/>
   <div class="clksbas" style="text-align:center;">
     <input type="checkbox" checked style="display:none" id="sbasChkr_{{sbas_id}}_{{unique_id}}" class="sbasChkr_{{sbas_id}}" />
@@ -423,15 +423,12 @@
             <div class="adv_options" style="display:none;">
 
 
-              <div>
-                <input onclick="reset_adv_search();" type="button" value="{% trans 'Re-initialiser' %}" class="input-button"/>
-              </div>
               <div>
                 <table style="width:100%;table-layout:fixed;">
                   <tr>
                     <td style="width:50%;vertical-align:top;">
                       <div class="sbasglob ui-corner-all">
-                        <div style="text-align:center;margin:0 10px;">
+                        <div style="text-align:center;margin:10px;">
                           <input class="input-button" type="button"
                                 value="{% trans 'boutton:: selectionner toutes les bases' %}" onclick="checkBases(true);"/>
                           <input class="input-button" type="button"
@@ -443,6 +440,9 @@
                     <td style="width:50%;vertical-align:top;">
                       <div id="sbasfiltercont" class="ui-corner-all">
                         <div>
+                          <div style="margin:10px 0;">
+                            <input onclick="reset_adv_search();" type="button" value="{% trans 'Re-initialiser' %}" class="input-button"/>
+                          </div>
                           {% if registry.get('GV_sphinx') %}
                           {% trans 'Trier par ' %}
                             <select name="sort">

www/prod/jquery.Feedback.js

@@ -576,9 +576,9 @@
 
     var initRight = function(){
 
-      var $container = this.container = $('#ListManager .editor');
+      var $container = $('#ListManager .editor');
 
-      $('form[name="list-editor-search"]', this.container).bind('submit', function(){
+      $('form[name="list-editor-search"]', $container).bind('submit', function(){
 
         var $this = $(this);
         var dest = $('.list-editor-results', $container);
@@ -599,11 +599,11 @@
         return false;
       });
 
-      $('form[name="list-editor-search"] select', this.container).bind('change', function(){
+      $('form[name="list-editor-search"] select', $container).bind('change', function(){
         $(this).closest('form').trigger('submit');
       });
 
-      $('button', this.container).button();
+      $('button', $container).button();
 
       $('.EditToggle', $container).bind('click', function(){
         $('.content.readonly, .content.readwrite', $('#ListManager')).toggle();
@@ -614,7 +614,7 @@
         return false;
       });
 
-      $('button.deleter', this.container).bind('click', function(event){
+      $('button.deleter', $container).bind('click', function(event){
 
         var list_id = $(this).find('input[name=list_id]').val();
 

www/skins/prod/000000/prodcolor.css

@@ -1592,8 +1592,7 @@ BOITES MODALES
 #sbasfiltercont
 {
 	color:#FFFFFF;
-	padding:10px;
+  margin: 0 0 0 10px;
-	margin:10px;
 }
 #adv_search .sbasglob div hr
 {

www/skins/prod/959595/prodcolor.css

@@ -1596,8 +1596,7 @@ BOITES MODALES
 #sbasfiltercont
 {
 	color:#FFFFFF;
-	padding:10px;
+  margin: 0 0 0 10px;
-	margin:10px;
 }
 #adv_search .sbasglob div hr
 {