From fcff428e689ff40836d6c0792101f42cbb3b8601 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Mon, 5 Mar 2018 20:56:09 +0100
Subject: Improve find card

---
 archaeological_finds/forms.py                         | 2 +-
 archaeological_finds/models_finds.py                  | 2 +-
 archaeological_finds/templates/ishtar/sheet_find.html | 5 +++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/archaeological_finds/forms.py b/archaeological_finds/forms.py
index 1d7f3426a..04001366e 100644
--- a/archaeological_finds/forms.py
+++ b/archaeological_finds/forms.py
@@ -147,11 +147,11 @@ class FindForm(CustomForm, ManageOldType):
     label = forms.CharField(
         label=_(u"Free ID"),
         validators=[validators.MaxLengthValidator(60)])
+    denomination = forms.CharField(label=_(u"Denomination"), required=False)
     previous_id = forms.CharField(label=_("Previous ID"), required=False)
     get_first_base_find__excavation_id = forms.CharField(
         label=_(u"Excavation ID"), required=False)
     museum_id = forms.CharField(label=_(u"Museum ID"), required=False)
-    denomination = forms.CharField(label=_(u"Label"), required=False)
     mark = forms.CharField(label=_(u"Mark"), required=False)
 
     HEADERS['description'] = FormHeader(_(u"Description"))
diff --git a/archaeological_finds/models_finds.py b/archaeological_finds/models_finds.py
index 088fc14b7..1f132d3e8 100644
--- a/archaeological_finds/models_finds.py
+++ b/archaeological_finds/models_finds.py
@@ -678,7 +678,7 @@ class Find(BulkUpdatedItem, ValueGetter, BaseHistorizedItem, ImageModel,
         _(u"External ID is set automatically"), default=False)
     order = models.IntegerField(_(u"Order"), default=1)
     label = models.TextField(_(u"Free ID"))
-    denomination = models.TextField(_(u"Label"), blank=True, null=True)
+    denomination = models.TextField(_(u"Denomination"), blank=True, null=True)
     museum_id = models.TextField(_(u"Museum ID"), blank=True, null=True)
     description = models.TextField(_(u"Description"), blank=True, null=True)
     decoration = models.TextField(_(u"Decoration"), blank=True, null=True)
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html
index 5d2d58ac9..6b49a66b9 100644
--- a/archaeological_finds/templates/ishtar/sheet_find.html
+++ b/archaeological_finds/templates/ishtar/sheet_find.html
@@ -1,7 +1,7 @@
 {% extends "ishtar/sheet.html" %}
 {% load i18n window_field from_dict link_to_window window_tables window_header humanize %}
 
-{% block head_title %}<strong xmlns:h2="http://www.w3.org/1999/html">{% trans "Find" %}</strong> - {{item.label|default:""}}{% endblock %}
+{% block head_title %}<strong>{% trans "Find" %}</strong>{% if item.denomination %} - {{item.denomination|default:""}}{% endif %} - {{item.label|default:""}}{% endblock %}
 
 {% block toolbar %}
 {% window_nav item window_id 'show-find' 'find_modify' 'show-historized-find' 'revert-find' previous next 1 %}
@@ -15,8 +15,8 @@
       {% include "ishtar/blocks/window_image.html" %}
       <div class="card-body">
         <p class="card-text">
+            <p class="window-refs" title="{% trans 'Denomination' %}">{{ item.denomination|default:"" }}</p>
             <p class="window-refs" title="{% trans 'Free ID' %}">{{ item.label|default:"" }}</p>
-            <p class="window-refs" title="{% trans 'Label' %}">{{ item.denomination|default:"" }}</p>
             <p class='window-refs' title="{% trans 'Base find - Complete ID' %}">{% for base_find in item.base_finds.all %}{% if forloop.counter0 %} &ndash; {% endif %}{{base_find.complete_id}}{% endfor %}</p>
             <p class='window-refs' title="{% trans 'Base find - Short ID' %}">{% for base_find in item.base_finds.all %}{% if forloop.counter0 %} &ndash; {% endif %}{{base_find.short_id}}{% endfor %}</p>
             <p class="window-refs" title="{% trans 'Find - Administrative ID' %}">{{ item.administrative_index|default:"" }}</p>
@@ -36,6 +36,7 @@
 <h3>{% trans "Identification" %}</h3>
 
 <div class='row'>
+    {% field_flex "Denomination" item.denomination %}
     {% field_flex "Free ID" item.label %}
     {% field_flex "Previous ID" item.previous_id %}
     {% field_flex "Excavation ID" item.excavation_ids %}
-- 
cgit v1.2.3