Merge branch '3.8'

Conflicts:
	lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php

lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php

@@ -341,6 +341,7 @@ class PhraseaEngine implements SearchEngineInterface
 
         $this->initialize();
         $this->checkSession();
+        $this->clearAllCache(new \DateTime('-1 hour'));
 
         assert(is_int($offset));
         assert($offset >= 0);

lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php

@@ -206,15 +206,6 @@ interface SearchEngineInterface
      */
     public function clearCache();
 
-    /**
-     * Clear all cache prior to the given date (if applicable)
-     *
-     * If no date provided, clear all entries
-     *
-     * @return SearchEngineInterface
-     */
-    public function clearAllCache(\DateTime $date = null);
-
     /**
      * Returns a subscriber
      *

lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php

@@ -1061,12 +1061,4 @@ class SphinxSearchEngine implements SearchEngineInterface
     {
         return $this;
     }
-
-    /**
-     * @inheritdoc
-     */
-    public function clearAllCache(\DateTime $date = null)
-    {
-        return $this;
-    }
 }

templates/web/prod/upload/upload-flash.html.twig

@@ -152,7 +152,11 @@
             load: function(event, ui)
             {
               ui.tab.find('span').empty();
-            }
+            },
+            create : function () {
+                $('#tab-upload').css('overflow', 'hidden');
+            },
+            heightStyle: "fill"
         });
 
         //Show the good collection status box

templates/web/prod/upload/upload.html.twig

@@ -179,7 +179,11 @@ $(document).ready(function () {
         load: function(event, ui)
         {
           ui.tab.find('span').empty();
-        }
+        },
+        create : function () {
+            $('#tab-upload').css('overflow', 'hidden');
+        },
+        heightStyle: "fill"
     });
 
     //Show the good collection status box

www/skins/prod/000000/prodcolor.css

@@ -3927,9 +3927,7 @@ dans l'onglet thesaurus : arbres, menus contextuels
     height: 100%;
 }
 
-#uploadBox #tab-upload,
+#uploadBox .ui-tabs .ui-tabs-panel {
-#uploadBox #tab-lazaret {
-    height: 90%;
     padding: 20px;
 }
 

www/skins/prod/959595/prodcolor.css

@@ -4051,8 +4051,7 @@ dans l'onglet thesaurus :  arbres, menus contextuels
     height: 100%;
 }
 
-#uploadBox #tab-upload,
+#uploadBox .ui-tabs .ui-tabs-panel {
-#uploadBox #tab-lazaret {
     height: 90%;
     padding: 20px;
 }