From c5dfe379eb37c4ec5f2e70b7c5baf52c35540d80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maur=C3=ADcio=20Meneghini=20Fauth?=
 <mauriciofauth@gmail.com>
Date: Wed, 29 Nov 2017 20:48:26 -0200
Subject: [PATCH] Move options.twig into import.twig
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/import.twig  | 17 ++++++++++++-----
 templates/display/import/options.twig | 12 ------------
 2 files changed, 12 insertions(+), 17 deletions(-)
 delete mode 100644 templates/display/import/options.twig

diff --git a/templates/display/import/import.twig b/templates/display/import/import.twig
index e3ea5e9307..efc22beb6b 100644
--- a/templates/display/import/import.twig
+++ b/templates/display/import/import.twig
@@ -30,11 +30,18 @@
             'table': table
         } only %}
 
-        {% include 'display/import/options.twig' with {
-            'import_type': import_type,
-            'db': db,
-            'table': table
-        } only %}
+        <div class="exportoptions" id="header">
+            <h2>
+                {{ Util_getImage('b_import', 'Import'|trans) }}
+                {% if import_type == 'server' %}
+                    {% trans 'Importing into the current server' %}
+                {% elseif import_type == 'database' %}
+                    {{ 'Importing into the database "%s"'|trans|format(db) }}
+                {% else %}
+                    {{ 'Importing into the table "%s"'|trans|format(table) }}
+                {% endif %}
+            </h2>
+        </div>
 
         <div class="importoptions">
             <h3>{% trans 'File to import:' %}</h3>
diff --git a/templates/display/import/options.twig b/templates/display/import/options.twig
deleted file mode 100644
index 812d0985b6..0000000000
--- a/templates/display/import/options.twig
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="exportoptions" id="header">
-    <h2>
-        {{ Util_getImage('b_import', 'Import'|trans) }}
-        {% if import_type == 'server' %}
-            {% trans 'Importing into the current server' %}
-        {% elseif import_type == 'database' %}
-            {{ 'Importing into the database "%s"'|trans|format(db) }}
-        {% else %}
-            {{ 'Importing into the table "%s"'|trans|format(table) }}
-        {% endif %}
-    </h2>
-</div>