diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-18 17:43:27 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-01-18 17:43:27 +0100 |
| commit | 40370a61b04c0caed748477fe13d2d3a47423bb1 (patch) | |
| tree | e72b2e7f9cb3007616f9a6cc70e946a726e42d6e | |
| parent | eae7d9eae70a1345b7ebbca81f43234d673e3c4a (diff) | |
| download | Ishtar-40370a61b04c0caed748477fe13d2d3a47423bb1.tar.bz2 Ishtar-40370a61b04c0caed748477fe13d2d3a47423bb1.zip | |
UI: adapt default form
| -rw-r--r-- | ishtar_common/forms_common.py | 1 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/form.html | 21 |
2 files changed, 19 insertions, 3 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index dc18a2108..f98a97385 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -439,6 +439,7 @@ class PersonFormSelection(forms.Form): class PersonMergeFormSelection(ManualMerge, forms.Form): + SEARCH_AND_SELECT = True form_label = _("Person to merge") associated_models = {'to_merge': models.Person} currents = {'to_merge': models.Person} diff --git a/ishtar_common/templates/ishtar/form.html b/ishtar_common/templates/ishtar/form.html index 236818c66..246f719ed 100644 --- a/ishtar_common/templates/ishtar/form.html +++ b/ishtar_common/templates/ishtar/form.html @@ -8,10 +8,25 @@ {% for error in form.non_field_errors %} <p>{{ error }}</p> {% endfor %} -<table> {{form}} -</table> -<input id="submit_form" type="submit" value="{% if submit_label %}{{submit_label}}{% else%}{% trans "Validate" %}{% endif %}"/> </form> </div> {% endblock %} + +{% block footer %} +<div id="footer"> + {% if form.SEARCH_AND_SELECT %} + <p class="confirm-message">{% trans "Search and select an item in the table" %}</p> + {% endif %} + <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"> + {% if submit_label %}{{submit_label}}{% else%}{% trans "Validate" %}{% endif %} + </button> + </div> + </div> + {% include 'ishtar/blocks/footer.html' %} +</div> +{% endblock %} + |