merge with upstream

This commit is contained in:
Senad Uka
2017-12-20 20:27:55 +01:00
parent 8beef5faea
commit 2ea9e2e702
12 changed files with 237 additions and 81 deletions

View File

@@ -10,6 +10,16 @@
<i class="icon-spin6 animate-spin"></i>
</div>
{% if 'SFID' in session %}
<ul id="sf_msg_container" class="msg-container" style="display:none;">
</ul>
<div id="sf-spinner-panel" class="spinner-panel">
<p>Loading DXF file from Sales Force. Please wait, this may take a while.</p>
<i class="icon-spin6 animate-spin"></i>
</div>
{% endif %}
{% if not context['csv_available'] %}
<form action="" method="post" enctype="multipart/form-data">
{{ form.csrf_token }}
@@ -33,6 +43,11 @@
<span id="error_message_txt" class="error_message centered_error">{{ field.errors[0] }}</span>
{% endif %}
{% endfor %}
{% if context['infinite_loop_detection_message'] %}
<span id="error_message_txt_inf_loop" class="error_message centered_error">{{ context['infinite_loop_detection_message'] }}</span>
{% endif %}
</div>
</div>