diff --git a/package.json b/package.json
index ea0ab5b830..d06b8769dd 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,6 @@
"postinstall": "./node_modules/.bin/gulp install;"
},
"dependencies": {
- "phraseanet-production-client": "~0.6.0"
+ "phraseanet-production-client": "~0.7.0"
}
}
diff --git a/templates/web/admin/index.html.twig b/templates/web/admin/index.html.twig
index af21233cdc..249d3e40ad 100644
--- a/templates/web/admin/index.html.twig
+++ b/templates/web/admin/index.html.twig
@@ -13,6 +13,10 @@
{% block javascript %}
+
+
{% include "common/templates.html.twig" %}
{# note: Tinymce must be include here without minify else URL resolution for tinymce plugins will fail #}
diff --git a/templates/web/common/dialog_export.html.twig b/templates/web/common/dialog_export.html.twig
index 18bb198d21..3f0c09c238 100644
--- a/templates/web/common/dialog_export.html.twig
+++ b/templates/web/common/dialog_export.html.twig
@@ -487,20 +487,6 @@
-
{% endif %}
@@ -510,6 +496,7 @@
var exportConfig = {
isGuest: false,
maxDownload: {{max_download}},
+ haveFtp: {% if download.get_total_ftp() > 0 %}true{% else %}false{% endif %},
msg: {
termOfUseTitle: '{{ "Terms of Use" | trans }}',
termOfUseAgree: '{{ 'You must agree to the Terms of Use to continue.' | trans }}',
diff --git a/templates/web/common/index_bootstrap.html.twig b/templates/web/common/index_bootstrap.html.twig
index 06f2597ca9..5a70b3351d 100644
--- a/templates/web/common/index_bootstrap.html.twig
+++ b/templates/web/common/index_bootstrap.html.twig
@@ -19,16 +19,7 @@
-
-
-
{% block rss %}{% endblock %}
{% block javascript %}{% endblock %}
diff --git a/templates/web/prod/actions/Download/prepare.html.twig b/templates/web/prod/actions/Download/prepare.html.twig
index 7c95ba866a..a55fa492c9 100644
--- a/templates/web/prod/actions/Download/prepare.html.twig
+++ b/templates/web/prod/actions/Download/prepare.html.twig
@@ -106,7 +106,6 @@
{% if list['complete'] is not defined %} {# Zip not done #}
$.post("{{ path('execute_download', {'token': token.getValue(), 'type': type, 'anonymous': anonymous}) }}", function(data){
- var data = $.parseJSON(data);
if(data.success) {
$('form[name=download]').submit();
}
diff --git a/templates/web/report/all_content.html.twig b/templates/web/report/all_content.html.twig
index 7c21adc558..f4c4e0c8ee 100644
--- a/templates/web/report/all_content.html.twig
+++ b/templates/web/report/all_content.html.twig
@@ -10,6 +10,10 @@
{% endblock icon%}
{% block javascript %}
+
+