diff --git a/lib/Alchemy/Phrasea/Application.php b/lib/Alchemy/Phrasea/Application.php index 4d0d2ab2d5..60d8f2bf3e 100644 --- a/lib/Alchemy/Phrasea/Application.php +++ b/lib/Alchemy/Phrasea/Application.php @@ -618,7 +618,7 @@ class Application extends SilexApplication ); $this['tmp.lazaret.path'] = $factory->createDefinition( - ['main', 'storage', 'quarantine'], + ['main', 'storage', 'lazaret'], function (Application $app) { return $app['tmp.path'].'/lazaret'; } diff --git a/resources/www/common/styles/main.scss b/resources/www/common/styles/main.scss index e232bde41c..ab639af0ce 100644 --- a/resources/www/common/styles/main.scss +++ b/resources/www/common/styles/main.scss @@ -164,3 +164,20 @@ $mainMenuLinkBackgroundHoverColor: transparent; } +.acceptDl-info { + background-color: #d9edf7; + border: 1px solid #bce8f1; + border-radius: 3px; + color: #3a87ad; + display: inline-block; + padding: 9px 24px 5px 9px; + margin-bottom: 20px; + text-shadow: 0 1px 0 rgba(255,255,255,.5); + a, label { + color: #3a87ad!important; + } + a { + text-decoration: underline; + } +} + diff --git a/resources/www/lightbox/styles/main.scss b/resources/www/lightbox/styles/main.scss index c98acc4a3e..35a94621ec 100644 --- a/resources/www/lightbox/styles/main.scss +++ b/resources/www/lightbox/styles/main.scss @@ -713,3 +713,21 @@ a.btn-info { } /** End Lightbox summary modal**/ + +.humane{ + position: fixed; + z-index: 100000; + font-family: Ubuntu, Arial, sans-serif; + text-align: center; + font-size: 15px; + top: 100px; + right: 70px; + width: 400px; + background: #2d2d72; + color: rgb(255, 255, 255); + box-shadow: rgb(0, 0, 0) 0px 4px 4px -4px; + transform: translateY(-40px); + transition: all 0.3s ease-out 0s; + padding: 10px; + border-radius: 5px; +} \ No newline at end of file diff --git a/templates/web/common/dialog_export.html.twig b/templates/web/common/dialog_export.html.twig index a7b1abc21b..d7862af917 100644 --- a/templates/web/common/dialog_export.html.twig +++ b/templates/web/common/dialog_export.html.twig @@ -152,9 +152,8 @@ {% endif %} {{ _self.choose_title('download', choose_export_title, default_export_title) }} - {% if app['conf'].get(['registry', 'actions', 'tou-validation-required-for-export']) == true %} -
+

{{ 'export::mail: contenu du mail' | trans }}

@@ -235,7 +236,7 @@ {{ _self.choose_title('sendmail', choose_export_title, default_export_title) }} {% if app['conf'].get(['registry', 'actions', 'tou-validation-required-for-export']) == true %} -