diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-03-20 19:40:24 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2020-03-20 19:40:24 +0100 |
| commit | ef7bc287bd743b01b534cff5b28bbe39268063a5 (patch) | |
| tree | d5fc7bd1cb9d8dab4c967fcad6dccba5e6b3517a /ishtar_common/templates/ishtar | |
| parent | 8d72941c7ba307d8f4541e34f24a957784e9660d (diff) | |
| download | Ishtar-ef7bc287bd743b01b534cff5b28bbe39268063a5.tar.bz2 Ishtar-ef7bc287bd743b01b534cff5b28bbe39268063a5.zip | |
Refactoring and many fixes on file module
Diffstat (limited to 'ishtar_common/templates/ishtar')
3 files changed, 9 insertions, 3 deletions
diff --git a/ishtar_common/templates/ishtar/forms/qa_new_item.html b/ishtar_common/templates/ishtar/forms/qa_new_item.html index ae57adfc2..435531594 100644 --- a/ishtar_common/templates/ishtar/forms/qa_new_item.html +++ b/ishtar_common/templates/ishtar/forms/qa_new_item.html @@ -3,7 +3,8 @@ {% block main_form %} {% if new_item_pk %} -<p>{% if new_item_label %}{{new_item_label}}{% else %}{% trans "Item" %}{% endif %} {% trans "created." %}</p> +<p>{% if new_item_label %}{{new_item_label}}{% else %}{% trans "Item" %}{% endif %} + {% if modify %}{% trans "modified." %}{% else %}{% trans "created." %}{% endif %}</p> {% else %} {% bs_compact_form form %} {% endif %} diff --git a/ishtar_common/templates/ishtar/wizard/default_wizard.html b/ishtar_common/templates/ishtar/wizard/default_wizard.html index b5ea4207c..cfd17e58f 100644 --- a/ishtar_common/templates/ishtar/wizard/default_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/default_wizard.html @@ -62,6 +62,8 @@ $(document).ready(function(){ return false; }); {% if open_url %}load_window("{{open_url}}");{% endif %} + {% block "js_extra_ready" %} + {% endblock %} }); </script> {% endblock %} diff --git a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html index 2028d8792..d8c902c72 100644 --- a/ishtar_common/templates/ishtar/wizard/parcels_wizard.html +++ b/ishtar_common/templates/ishtar/wizard/parcels_wizard.html @@ -22,13 +22,16 @@ {% bs_form wizard.form.selection_form %} <table class='inline-table' id='parcel-table'> - <tr>{% for field in wizard.form.forms.0 %}<th{% if not forloop.last %} rowspan='2'{% endif %}>{{ field.label_tag }}</th>{% endfor %}</tr> + <tr>{% for field in wizard.form.forms.0 %} + {% if field.required %}<th{%else%}<td{% endif %}{% if not forloop.last %} rowspan='2'{% endif %}> + {{ field.label_tag }}{% if field.required %}</th>{%else%}</td>{% endif %}{% endfor %} + </tr> <tr><td>({% trans "all"%} <input type='checkbox' name='check-all' class='check-all'/>)</td></tr> {% inline_formset 'Parcels' wizard.form.forms False %} </table> {% if add_all %}<p><input type='checkbox' name='add_all_parcels' id='add_all_parcels'> <label for='add_all_parcels'>{% trans "Add all parcels from the archaeological file" %}</label></p>{% endif %} - <div class="text-center"> + <div class="mt-3 text-center"> <button class="btn btn-success" name="formset_modify" value="{{wizard.steps.current}}"> {% trans "Add/Modify" %} </button> |