merge with upstream master

2017-12-19 15:18:35 +01:00
parent efb4547a37
commit 197db1003b
85 changed files with 2522 additions and 697 deletions
--- a/helix/templates/array_summary.html.jinja
+++ b/helix/templates/array_summary.html.jinja
@@ -1,6 +1,15 @@
 {% extends "layout.html.jinja" %}
 {% set title = "Helix Calculator" %}
 {% block contents %}
+    <script>
+        var is_csv_available = {{ context['csv_available']|tojson|safe }};
+    </script>
+
+    <div id="spinner-panel" class="spinner-panel">
+        <p>Uploading files. Please wait, this may take a while.</p>
+        <i class="icon-spin6 animate-spin"></i>
+    </div>
+
    {% if not context['csv_available'] %}
        <form action="" method="post" enctype="multipart/form-data">
            {{ form.csrf_token }}