diff --git a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php b/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php index fd4fc71cc2..e1fc4a44e2 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php +++ b/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); diff --git a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php b/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php index 9bc54eb023..df9ed8c8cc 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SearchEngineInterface.php +++ b/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 * diff --git a/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php b/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php index 79f0b50500..87224fdca9 100644 --- a/lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php +++ b/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; - } } diff --git a/templates/web/prod/upload/upload-flash.html.twig b/templates/web/prod/upload/upload-flash.html.twig index 1b55f4e2f2..84f800e169 100644 --- a/templates/web/prod/upload/upload-flash.html.twig +++ b/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 diff --git a/templates/web/prod/upload/upload.html.twig b/templates/web/prod/upload/upload.html.twig index 33614bdf42..36bcf35689 100644 --- a/templates/web/prod/upload/upload.html.twig +++ b/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 diff --git a/www/skins/prod/000000/prodcolor.css b/www/skins/prod/000000/prodcolor.css index 867e15524b..f472f948f3 100644 --- a/www/skins/prod/000000/prodcolor.css +++ b/www/skins/prod/000000/prodcolor.css @@ -3927,9 +3927,7 @@ dans l'onglet thesaurus : arbres, menus contextuels height: 100%; } -#uploadBox #tab-upload, -#uploadBox #tab-lazaret { - height: 90%; +#uploadBox .ui-tabs .ui-tabs-panel { padding: 20px; } diff --git a/www/skins/prod/959595/prodcolor.css b/www/skins/prod/959595/prodcolor.css index 047a9868cf..00c35bf4fc 100644 --- a/www/skins/prod/959595/prodcolor.css +++ b/www/skins/prod/959595/prodcolor.css @@ -4051,8 +4051,7 @@ dans l'onglet thesaurus : arbres, menus contextuels height: 100%; } -#uploadBox #tab-upload, -#uploadBox #tab-lazaret { +#uploadBox .ui-tabs .ui-tabs-panel { height: 90%; padding: 20px; }