gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move format_option.twig into import.twig

Browse Source 
Signed-off-by: Maurício Meneghini Fauth <mauriciofauth@gmail.com>
This commit is contained in:
Maurício Meneghini Fauth 2017-11-29 20:43:13 -02:00
parent 6e15e838f4
commit a8cc3ec829
2 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
templates/display/import/format_option.twig
View File

@ -1,22 +0,0 @@
<div class="importoptions">
<h3>{% trans 'Format:' %}</h3>
{{ Plugins_getChoice('Import', 'format', import_list) }}
<div id="import_notification"></div>
</div>
<div class="importoptions" id="format_specific_opts">
<h3>{% trans 'Format-specific options:' %}</h3>
<p class="no_js_msg" id="scroll_to_options_msg">
{% trans 'Scroll down to fill in the options for the selected format and ignore the options for other formats.' %}
</p>
{{ Plugins_getOptions('Import', import_list) }}
</div>
<div class="clearfloat"></div>
{# Japanese encoding setting #}
{% if can_convert_kanji %}
<div class="importoptions" id="kanji_encoding">
<h3>{% trans 'Encoding Conversion:' %}</h3>
{% include 'encoding/kanji_encoding_form.twig' %}
</div>
{% endif %}

26
templates/display/import/import.twig
View File

@ -58,10 +58,28 @@
{% include 'display/import/other_option.twig' only %}
{% include 'display/import/format_option.twig' with {
'import_list': import_list,
'can_convert_kanji': can_convert_kanji
} only %}
<div class="importoptions">
<h3>{% trans 'Format:' %}</h3>
{{ Plugins_getChoice('Import', 'format', import_list) }}
<div id="import_notification"></div>
</div>
<div class="importoptions" id="format_specific_opts">
<h3>{% trans 'Format-specific options:' %}</h3>
<p class="no_js_msg" id="scroll_to_options_msg">
{% trans 'Scroll down to fill in the options for the selected format and ignore the options for other formats.' %}
</p>
{{ Plugins_getOptions('Import', import_list) }}
</div>
<div class="clearfloat"></div>
{# Japanese encoding setting #}
{% if can_convert_kanji %}
<div class="importoptions" id="kanji_encoding">
<h3>{% trans 'Encoding Conversion:' %}</h3>
{% include 'encoding/kanji_encoding_form.twig' %}
</div>
{% endif %}
<div class="importoptions" id="submit">
<input type="submit" value="{% trans 'Go' %}" id="buttonGo" />