diff options
| -rw-r--r-- | ishtar_common/templates/base.html | 1 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/import_list.html | 36 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/wizard/wizard_person.html | 2 |
3 files changed, 30 insertions, 9 deletions
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index db39ecc8e..ee318fa7c 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -65,6 +65,7 @@ <button class="nav-button btn btn-sm btn-secondary" id="to_top_arrow"> <i class="fa fa-arrow-up" aria-hidden="true"></i> </button> + {% block pre_container %}{% endblock %} <div class="container"> {% block top_content %}{% endblock %} <div id="window_wrapper"> diff --git a/ishtar_common/templates/ishtar/import_list.html b/ishtar_common/templates/ishtar/import_list.html index c72c86d10..ee466ad24 100644 --- a/ishtar_common/templates/ishtar/import_list.html +++ b/ishtar_common/templates/ishtar/import_list.html @@ -1,13 +1,17 @@ {% extends "base.html" %} {% load i18n inline_formset %} + +{% block pre_container %} +<form action="." method="post">{% csrf_token %} +{% endblock %} + {% block content %} <h2>{{page_name}}</h2> <div class='form'> {% if not object_list %} <p>{% trans "No pending imports." %}</p> {% else %} -<form action="." method="post">{% csrf_token %} -<table class="clean-table"> +<table class="table table-striped"> <tr> <th>{% trans "Name" %}</th> <th>{% trans "Type" %}</th> @@ -15,6 +19,10 @@ <th>{% trans "Creation" %}</th> <th>{% trans "Status" %}</th> <th>{% trans "Action" %}</th> + <th>{% trans "Unmatched items" %}</th> + <th>{% trans "Error" %}</th> + <th>{% trans "Control" %}</th> + <th>{% trans "Match" %}</th> </tr> {% for import in object_list %} <tr> @@ -43,24 +51,36 @@ </td> <td> {% if import.need_matching %} - <a href='{% url "import_link_unmatched" import.pk %}'>{% trans "Link unmatched items" %}</a> + <a href='{% url "import_link_unmatched" import.pk %}'>{% trans "Match"%}</a> {% endif %} </td> <td>{% if import.error_file %} - <a href='{{import.error_file.url}}'>{% trans "Error file" %}</a> + <a href='{{import.error_file.url}}'>{% trans "File" context "not a directory" %}</a> {% endif %}</td> <td>{% if import.result_file %} - <a href='{{import.result_file.url}}'>{% trans "Control file" %}</a> + <a href='{{import.result_file.url}}'>{% trans "File" context "not a directory" %}</a> {% endif %}</td> <td>{% if import.match_file %} - <a href='{{import.match_file.url}}'>{% trans "Match file" %}</a> + <a href='{{import.match_file.url}}'>{% trans "File" context "not a directory" %}</a> {% endif %}</td> </tr> {% endfor %} </table> - <input type="submit" onclick="long_wait();return true;" value="{% trans 'Validate' %}" /> -</form> {% endif %} </div> {% endblock %} +{% block footer %} +<div id="footer"> + <div id='validation-bar' class="row text-center"> + <div class="col-sm"> + <button type="submit" id="submit_form" name='validate' + value="validate" class="btn btn-success" onclick="long_wait();return true;"> + {% trans "Validate" %} + </button> + </div> + </div> + {% include 'ishtar/blocks/footer.html' %} +</div> +</form> +{% endblock %} diff --git a/ishtar_common/templates/ishtar/wizard/wizard_person.html b/ishtar_common/templates/ishtar/wizard/wizard_person.html index 2446c06cc..fc15dbfad 100644 --- a/ishtar_common/templates/ishtar/wizard/wizard_person.html +++ b/ishtar_common/templates/ishtar/wizard/wizard_person.html @@ -19,9 +19,9 @@ {% trans "Identity" %} </div> <div class="card-body form-row"> - {% bs_field wizard.form.title %} {% bs_field wizard.form.surname 1 %} {% bs_field wizard.form.name 1 %} + {% bs_field wizard.form.title %} {% bs_field wizard.form.raw_name %} {% bs_field wizard.form.email %} {% bs_field wizard.form.attached_to %} |