From c84f612f2acc19f2d7fcc5456f4fb6f634155251 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?=
 <mauriciofauth@gmail.com>
Date: Wed, 29 Nov 2017 17:01:18 -0200
Subject: [PATCH] Move compressions template into file_option template
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
---
 templates/display/import/compressions.twig | 10 ----------
 templates/display/import/file_option.twig  | 15 ++++++++++++---
 2 files changed, 12 insertions(+), 13 deletions(-)
 delete mode 100644 templates/display/import/compressions.twig

diff --git a/templates/display/import/compressions.twig b/templates/display/import/compressions.twig
deleted file mode 100644
index e3834299bc..0000000000
--- a/templates/display/import/compressions.twig
+++ /dev/null
@@ -1,10 +0,0 @@
-{# We don't have show anything about compression, when no supported #}
-{% if compressions is not empty %}
-    <div class="formelementrow" id="compression_info">
-        <p>
-            {{ 'File may be compressed (%s) or uncompressed.'|trans|format(compressions|join(', ')) }}
-            <br>
-            {% trans 'A compressed file\'s name must end in <strong>.[format].[compression]</strong>. Example: <strong>.sql.zip</strong>' %}
-        </p>
-    </div>
-{% endif %}
diff --git a/templates/display/import/file_option.twig b/templates/display/import/file_option.twig
index b703595ba4..28ac2ff2b8 100644
--- a/templates/display/import/file_option.twig
+++ b/templates/display/import/file_option.twig
@@ -1,8 +1,17 @@
 <div class="importoptions">
     <h3>{% trans 'File to import:' %}</h3>
-    {% include 'display/import/compressions.twig' with {
-        'compressions': compressions
-    } only %}
+
+    {# We don't have show anything about compression, when no supported #}
+    {% if compressions is not empty %}
+        <div class="formelementrow" id="compression_info">
+            <p>
+                {{ 'File may be compressed (%s) or uncompressed.'|trans|format(compressions|join(', ')) }}
+                <br>
+                {% trans 'A compressed file\'s name must end in <strong>.[format].[compression]</strong>. Example: <strong>.sql.zip</strong>' %}
+            </p>
+        </div>
+    {% endif %}
+
     <div class="formelementrow" id="upload_form">
         {% if is_upload and upload_dir is not empty %}
             <ul>