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/navigation_buttons.html.jinja
+++ b/helix/templates/navigation_buttons.html.jinja
@@ -1,5 +1,9 @@
 <div class="navigation_buttons">
-    <a class="back button" href="{{ context['steps'][context['current_step'] - 2][2] }}">Back</a>
+    {% if context['hide_back'] %}
+    {% else %}
+        <a class="back button" href="{{ context['steps'][context['current_step'] - 2][2] }}">Back</a>
+    {% endif %}
+
    {% if context['steps']|length > context['current_step'] and not context.get('no_proceed') %}
        {% if not form or context['override_form'] %}
            <a class="button" href="{{ context['steps'][context['current_step']][2] }}" value="Next">Next</a>