From fe4aaf6f90856a9d0f9bf5b278d4da3745fec5f1 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 10 Feb 2017 09:17:22 +0100
Subject: Sheet find: change comment/description position

---
 archaeological_finds/templates/ishtar/sheet_find.html | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 94685b63d..a6a0ccf69 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -33,12 +33,6 @@
 {% endwith %}
 {% endif %}
 {% field_li "Administrative index" item.administrative_index %}
-{% if item.description or item.comment %}
-</ul>
-{% field "Description" item.description "<pre>" "</pre>" %}
-{% field "Comment" item.comment "<pre>" "</pre>" %}
-<ul class='form-flex'>
-{% endif %}
 {% field_li_multiple "Material types" item.material_types %}
 {% field_li "Dating" item.dating %}
 {% field_li "Length (cm)" item.length %}
@@ -75,6 +69,9 @@
 {% endif%}
 </ul>
 
+{% field "Description" item.description "<pre>" "</pre>" %}
+{% field "Comment" item.comment "<pre>" "</pre>" %}
+
 {% if item.container %}
 <h3>{% trans "Warehouse"%}</h3>
 {% field_detail "Container" item.container %}
-- 
cgit v1.2.3


From 6605c6b65e6a0f1b1b0b67b1591f5919a5a5fb6e Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 10 Feb 2017 09:19:39 +0100
Subject: v0.99.12.2

---
 CHANGES.md | 5 +++++
 version.py | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 380b93a59..df5bc087b 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,11 @@
 Ishtar changelog
 ================
 
+v0.99.12.2 (2017-02-10)
+-----------------------
+### Features ###
+- Sheet find: change comment/description position
+
 v0.99.12.1 (2017-02-10)
 -----------------------
 ### Features ###
diff --git a/version.py b/version.py
index 2d724201c..8fdddac48 100644
--- a/version.py
+++ b/version.py
@@ -1,4 +1,4 @@
-VERSION = (0, 99, 12, 1)
+VERSION = (0, 99, 12, 2)
 
 
 def get_version():
-- 
cgit v1.2.3