From 4ca59f854515b6939c4a6cc7d0aa8c12ae51e566 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 26 Feb 2018 17:42:05 +0100
Subject: Document generation: fix and improve layout (refs #3934)

---
 .../ishtar/administrativeact_document.html         | 36 +++++++++++++++++-----
 scss/custom.scss                                   |  4 +--
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/archaeological_files/templates/ishtar/administrativeact_document.html b/archaeological_files/templates/ishtar/administrativeact_document.html
index 104e5063e..f8ab213fe 100644
--- a/archaeological_files/templates/ishtar/administrativeact_document.html
+++ b/archaeological_files/templates/ishtar/administrativeact_document.html
@@ -6,15 +6,37 @@
 {% endblock %}
 
 {% block content %}
+{% if template_form.non_field_errors %}
+<div class="alert alert-warning alert-dismissible fade show" role="alert">
+    {{template_form.non_field_errors}}
+    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+    <span aria-hidden="true">&times;</span>
+</button>
+</div>
+{% endif %}
 <h2>{% trans "Document generation" %}</h2>
-<form action="." method="post">{% csrf_token %}
-<div class='form'>
+<form action="." class='wizard-form' id="wizard-form" method="post" name='wizard'>{% csrf_token %}
+<div class='form search'>
 {{ search_form.as_p }}
-<h4>{% trans "Choose the type of document" %}</h4>
-<table>
-{{ template_form }}
-</table>
-<input type="submit" id="submit_form" name='validate' value="{% trans "Generate" %}"/>
+</div>
+{% endblock %}
+
+{% block footer %}
+<div id="footer">
+    <div class="confirm-message row justify-content-center">
+        <div class="col-2">
+            <label>{{template_form.document_template.label}}</label>
+        </div>
+        <div class="col-4">
+            {{template_form.document_template}}
+        </div>
+        <div class="col-2">
+            <button type="submit" id="submit_form" name='validate' class="btn btn-success">
+                {% trans "Generate" %}
+            </button>
+        </div>
+    </div>
+    {% include 'ishtar/blocks/footer.html' %}
 </div>
 </form>
 {% endblock %}
diff --git a/scss/custom.scss b/scss/custom.scss
index d2c6dbc0f..37cdaff26 100644
--- a/scss/custom.scss
+++ b/scss/custom.scss
@@ -207,7 +207,7 @@ textarea {
 
 #context-menu,
 #reminder,
-p.confirm-message,
+.confirm-message,
 div#validation-bar{
     background-color: $ishtar-secondary-color;
     color: $dark-secondary-color;
@@ -217,7 +217,7 @@ div#validation-bar{
     padding: 0.6em 1em 0.1em 1em;
 }
 
-p.confirm-message{
+.confirm-message{
     text-align:center;
     margin: 0;
     padding: 0.5rem;
-- 
cgit v1.2.3