1 files changed, 18 insertions, 22 deletions
diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html
index 19076b0de..a7a705f59 100644
--- a/ishtar_common/templates/ishtar/wizard/default_wizard.html
+++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html
@@ -5,21 +5,13 @@
 {% endblock %}
 {% block content %}
 {% block wizard_head %}
-<h2>{{wizard_label}}</h2>
-<form action="." method="post">{% csrf_token %}
-<ul id='form_path'>
-{% for step in previous_steps %}
-  <li><button class='change_step' name="form_prev_step" value="{{forloop.counter0}}">{{step}}</button></li>
-{% endfor %}
-  <li class='current'><a href='#'>{{current_step_label}}</a></li>
-{% for step in next_steps %}
-  <li><button class='change_step' name="form_prev_step" value="{{forloop.counter|add:previous_step_counter}}">{{step}}</button></li>
-{% endfor %}
-</ul>
-</form>
+<h3>{{wizard_label}}</h3>
+
+{% include "ishtar/blocks/wizard_breadcrumb.html" %}
+
 {% endblock %}
 {% block wizard_form %}
-<form action="." method="post" name='wizard'{% if wizard.form.file_upload %} enctype="multipart/form-data"{% endif %}>{% csrf_token %}
+<form action="." class='wizard-form' id="wizard-form" method="post" name='wizard'{% if wizard.form.file_upload %} enctype="multipart/form-data"{% endif %}>{% csrf_token %}
 <div class='form'>
 {{ wizard.form.media }}
 {{ wizard.management_form }}
@@ -27,18 +19,19 @@
 {% block form_detail %}
 {% if wizard.form.forms %}
   {{ wizard.form.management_form }}
-<div class='top_button'><input type="submit" id="submit_form" value="{% trans "Validate" %}"/></div>
-<table class='formset'>
-  {%if wizard.form.non_form_errors%}<tr class='error'><th colspan='2'>{{wizard.form.non_form_errors}}</th></tr>{%endif%}
+  {% if wizard.form.non_form_errors %}
+    <div class="alert alert-danger" role="alert">
+        {{wizard.form.non_form_errors}}
+    </div>
+  {% endif %}
   {% for formsetform in wizard.form.forms %}
-  {% table_form formsetform %}
+  {% bs_form formsetform %}
   {% endfor %}
-  <tr class='modify'><td colspan="2"><button name="formset_modify" value="{{wizard.steps.current}}">{% trans "Add/Modify" %}</button></td></tr></li>
-</table>
+    <button class="btn btn-success" name="formset_modify" value="{{wizard.steps.current}}">
+      {% trans "Add/Modify" %}
+    </button>
 {% else %}
-{% if not is_search %}<table>{% endif %}
-{% table_form wizard.form %}
-{% if not is_search %}</table>{% endif %}
+  {% bs_form wizard.form %}
 {% endif %}
 {% endblock %}
 <input type="hidden" name="{{ step_field }}" value="{{ step0 }}" />
@@ -46,6 +39,9 @@
 {% block "footer" %}
   <div id="footer">
   {% block "validation_bar" %}
+    {% if wizard.form.SEARCH_AND_SELECT %}
+    <p class="confirm-message">{% trans "Search and select an item in the table" %}</p>
+    {% endif %}
   {% include 'ishtar/wizard/validation_bar.html' %}
   {% endblock %}
   {% include 'ishtar/blocks/footer.html' %}