diff --git a/templates/display/import/import.twig b/templates/display/import/import.twig index 209eb2edaf..054f6a6608 100644 --- a/templates/display/import/import.twig +++ b/templates/display/import/import.twig @@ -51,10 +51,42 @@ 'disable_is': disable_is } only %} - {% include 'display/import/partial_import_option.twig' with { - 'timeout_passed': timeout_passed, - 'offset': offset - } only %} +
+

{% trans 'Partial import:' %}

+ + {% if timeout_passed is defined and timeout_passed %} +
+ + {{ 'Previous import timed out, after resubmitting will continue from position %d.'|trans|format(offset) }} +
+ {% endif %} + +
+ + +
+ + {% if not (timeout_passed is defined and timeout_passed) %} +
+ + +
+ {% else %} + {# If timeout has passed, + do not show the Skip dialog to avoid the risk of someone + entering a value here that would interfere with "skip" #} + + {% endif %} +

{% trans 'Other options:' %}

diff --git a/templates/display/import/partial_import_option.twig b/templates/display/import/partial_import_option.twig deleted file mode 100644 index a454293630..0000000000 --- a/templates/display/import/partial_import_option.twig +++ /dev/null @@ -1,36 +0,0 @@ -
-

{% trans 'Partial import:' %}

- - {% if timeout_passed is defined and timeout_passed %} -
- - {{ 'Previous import timed out, after resubmitting will continue from position %d.'|trans|format(offset) }} -
- {% endif %} - -
- - -
- - {% if not (timeout_passed is defined and timeout_passed) %} -
- - -
- {% else %} - {# If timeout has passed, - do not show the Skip dialog to avoid the risk of someone - entering a value here that would interfere with "skip" #} - - {% endif %} -