diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-09-05 13:56:09 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2018-10-24 12:06:08 +0200 |
| commit | 93486b4c08af232d95fde4cff372ddaf8c290925 (patch) | |
| tree | ec9c9767e29588622d0e70c58fcf3bbd2b8e98de /ishtar_common/templates | |
| parent | 85fd89f8960a766615ac16cf445b958d2122032a (diff) | |
| download | Ishtar-93486b4c08af232d95fde4cff372ddaf8c290925.tar.bz2 Ishtar-93486b4c08af232d95fde4cff372ddaf8c290925.zip | |
Fix display of QA form. Improve layout of criteria search.
Diffstat (limited to 'ishtar_common/templates')
| -rw-r--r-- | ishtar_common/templates/blocks/bs_form_snippet.html | 19 | ||||
| -rw-r--r-- | ishtar_common/templates/ishtar/qa_form.html | 9 |
2 files changed, 11 insertions, 17 deletions
diff --git a/ishtar_common/templates/blocks/bs_form_snippet.html b/ishtar_common/templates/blocks/bs_form_snippet.html index 95b8ac086..f122b33f2 100644 --- a/ishtar_common/templates/blocks/bs_form_snippet.html +++ b/ishtar_common/templates/blocks/bs_form_snippet.html @@ -48,22 +48,9 @@ <button type="button" class="close" data-dismiss="modal" aria-label="Close"> <span aria-hidden="true">×</span> </button> + <div class="form-group col-12" id="advanced-search-info"></div> </div> - <div class="modal-body form-row"> - <div class="form-group col-12" id="advanced-search-info"> - </div> - <div class="form-group col-12"> - <p class="text-center"> - <button type="button" - class="btn btn-primary advanced-search-valid"> - {% trans "Add" %}</button> - <button type="button" - class="btn btn-secondary advanced-search-clear"> - {% trans 'Clear' %}</button> - <button type="button" class="btn btn-secondary" - data-dismiss="modal">{% trans 'Close' %}</button> - </p> - </div> + <div class="modal-body body-scroll"> <hr> {% endif %} {% if field.name in form.HEADERS %} @@ -91,6 +78,8 @@ {% if search and forloop.counter0 >= 1 %} </div> + </div> + <div class="modal-footer"> <div class="form-group col-12"> <p class="text-center"> <button type="button" diff --git a/ishtar_common/templates/ishtar/qa_form.html b/ishtar_common/templates/ishtar/qa_form.html index 95f8887a8..2df3775ea 100644 --- a/ishtar_common/templates/ishtar/qa_form.html +++ b/ishtar_common/templates/ishtar/qa_form.html @@ -3,16 +3,21 @@ <div class="modal-dialog modal-lg modal-dialog-centered"> <div class="modal-content" id='progress-content'> <div class="modal-header"> - <h2>{{page_name}}</h2> + <h2>{{page_name|safe}}</h2> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"> + <span aria-hidden="true">×</span> + </button> </div> <form enctype="multipart/form-data" action="." method="post">{% csrf_token %} - <div class="modal-body"> + <div class="modal-body body-scroll"> <div class='form'> {% for error in form.non_field_errors %} <p>{{ error }}</p> {% endfor %} {% bs_form form %} </div> + </div> + <div class="modal-footer"> <button type="submit" id="submit_form" name='validate' value="validate" class="btn btn-success"> {% trans "Modify" %} |