diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-10 09:21:05 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-10 09:21:05 +0100 |
| commit | 455e4dfcc4496ac4f36b82c84c3f82825822501c (patch) | |
| tree | f41483905aa192715bde5ccfb2cf81aaba07ea59 | |
| parent | 28b36f6e06c7cdeafa0b8e107ecbc252f75ce044 (diff) | |
| parent | e2a45e2db75ec6960d458ea08004becaf429d2f6 (diff) | |
| download | Ishtar-455e4dfcc4496ac4f36b82c84c3f82825822501c.tar.bz2 Ishtar-455e4dfcc4496ac4f36b82c84c3f82825822501c.zip | |
Merge branch 'v0.9' into wheezy
| -rw-r--r-- | CHANGES.md | 5 | ||||
| -rw-r--r-- | archaeological_finds/templates/ishtar/sheet_find.html | 9 | ||||
| -rw-r--r-- | version.py | 2 |
3 files changed, 9 insertions, 7 deletions
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/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 %} 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(): |