From b407a854c1121f4ecec45828417bd5bdb06b9832 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Mon, 6 Jul 2020 18:31:46 +0400 Subject: [PATCH 1/5] PHRAS-3164 #comment add download action on lightbox #time 6h --- package.json | 2 +- templates/web/lightbox/validate.html.twig | 1 + yarn.lock | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index c51d6fd6f8..bee423ee72 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.248-d", + "phraseanet-production-client": "0.34.250-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", diff --git a/templates/web/lightbox/validate.html.twig b/templates/web/lightbox/validate.html.twig index 72d55c0f6d..20d53511cb 100644 --- a/templates/web/lightbox/validate.html.twig +++ b/templates/web/lightbox/validate.html.twig @@ -15,6 +15,7 @@ {% block content %} {% set basket_element = basket.getElements().first() %}
+
diff --git a/yarn.lock b/yarn.lock index 43cc3ddc1c..3e726f9310 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7678,10 +7678,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.248-d: - version "0.34.248-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.248-d.tgz#92b23159cff6437b9aba0a2a9cbc63979b4c68c6" - integrity sha512-DgIToC7zdKBIvH47Rr2fceMJT4Aj8WQcHftEBqqFVTH/qQ4kLFMOZqR6aTezwlHms11opZ5s5CFVvM3kkVqa/w== +phraseanet-production-client@0.34.250-d: + version "0.34.250-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.250-d.tgz#6d885ed986b22733bdd8e76a1abb0ab85fe35635" + integrity sha512-ae9URsI+LfoRcEP8OD73KpOjJnLYRiqXtgzAzLF97oATY9fidd70lZQPRHgSGKCMLgvE4F68noEAjWoIWE7cpQ== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 16a390fdb2aa996083abcc72c5705e3210208d2d Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 7 Jul 2020 14:53:21 +0400 Subject: [PATCH 2/5] PHRAS-3164 add favicon --- package.json | 2 +- resources/www/lightbox/styles/main.scss | 18 ++++++++++++++++++ templates/web/lightbox/index.html.twig | 4 ---- templates/web/lightbox/index_layout.html.twig | 3 +++ yarn.lock | 8 ++++---- 5 files changed, 26 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index bee423ee72..c306bb3e9e 100644 --- a/package.json +++ b/package.json @@ -65,7 +65,7 @@ "normalize-css": "^2.1.0", "npm": "^6.0.0", "npm-modernizr": "^2.8.3", - "phraseanet-production-client": "0.34.250-d", + "phraseanet-production-client": "0.34.252-d", "requirejs": "^2.3.5", "tinymce": "^4.0.28", "underscore": "^1.8.3", 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/lightbox/index.html.twig b/templates/web/lightbox/index.html.twig index 38c7b45b9c..849653daf6 100644 --- a/templates/web/lightbox/index.html.twig +++ b/templates/web/lightbox/index.html.twig @@ -11,10 +11,6 @@ {% endblock %} - {% block icon %} - - {% endblock %} - {% block content %}
diff --git a/templates/web/lightbox/index_layout.html.twig b/templates/web/lightbox/index_layout.html.twig index e04cfe9b77..92d42a9207 100644 --- a/templates/web/lightbox/index_layout.html.twig +++ b/templates/web/lightbox/index_layout.html.twig @@ -1,5 +1,8 @@ {% extends "common/index_bootstrap.html.twig" %} +{% block icon %} + +{% endblock %} {% block extra_content %}
{% endblock %} diff --git a/yarn.lock b/yarn.lock index 3e726f9310..865b962908 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7678,10 +7678,10 @@ phraseanet-common@^0.4.5-d: js-cookie "^2.1.0" pym.js "^1.3.1" -phraseanet-production-client@0.34.250-d: - version "0.34.250-d" - resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.250-d.tgz#6d885ed986b22733bdd8e76a1abb0ab85fe35635" - integrity sha512-ae9URsI+LfoRcEP8OD73KpOjJnLYRiqXtgzAzLF97oATY9fidd70lZQPRHgSGKCMLgvE4F68noEAjWoIWE7cpQ== +phraseanet-production-client@0.34.252-d: + version "0.34.252-d" + resolved "https://registry.yarnpkg.com/phraseanet-production-client/-/phraseanet-production-client-0.34.252-d.tgz#e3a628d08d825c2554220cfcbbda3f8e3c3c6127" + integrity sha512-jSfa47v3TcwIbv6ItpzzXER/1U7ydrLyiUFRpJn+H0FapPUJCoKZ9Iy1PqNmUIzlTjqewQlatXSCLzMfzBcMlg== dependencies: "@mapbox/mapbox-gl-language" "^0.9.2" "@turf/turf" "^5.1.6" From 47c6ad80e0676d7b87b029f29f388bad2a008b07 Mon Sep 17 00:00:00 2001 From: Harrys Ravalomanana Date: Tue, 7 Jul 2020 15:46:30 +0400 Subject: [PATCH 3/5] PHRAS-3164 export add term of use design --- resources/www/common/styles/main.scss | 17 +++++++++++++++++ templates/web/common/dialog_export.html.twig | 3 +-- 2 files changed, 18 insertions(+), 2 deletions(-) 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/templates/web/common/dialog_export.html.twig b/templates/web/common/dialog_export.html.twig index a7b1abc21b..386deda247 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 }}

@@ -234,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 %} -
+
' %} @@ -387,7 +389,7 @@
{% if app['conf'].get(['registry', 'actions', 'tou-validation-required-for-export']) == true %} -
+
' %} @@ -468,7 +470,7 @@ {% endif %} {% if app['conf'].get(['registry', 'actions', 'tou-validation-required-for-export']) == true %} -
+
' %} From a6f01624e8decf3f85f96c1f1c37096f906ebb7a Mon Sep 17 00:00:00 2001 From: aynsix Date: Tue, 7 Jul 2020 20:19:51 +0300 Subject: [PATCH 5/5] fix lazaret storage path --- lib/Alchemy/Phrasea/Application.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'; }