From e2321b650989bfb79975a6ba5b6758d36d0189d0 Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Fri, 10 Mar 2017 15:45:34 +0100 Subject: Update labels --- archaeological_warehouse/models.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'archaeological_warehouse') diff --git a/archaeological_warehouse/models.py b/archaeological_warehouse/models.py index 81660bf43..91184c907 100644 --- a/archaeological_warehouse/models.py +++ b/archaeological_warehouse/models.py @@ -114,8 +114,8 @@ class Collection(LightHistorizedItem): class WarehouseDivision(GeneralType): class Meta: - verbose_name = _(u"Warehouse division") - verbose_name_plural = _(u"Warehouse divisions") + verbose_name = _(u"Warehouse division type") + verbose_name_plural = _(u"Warehouse division types") post_save.connect(post_save_cache, sender=WarehouseDivision) post_delete.connect(post_save_cache, sender=WarehouseDivision) -- cgit v1.2.3 From 83a5855c7bb49f0caca9b18d01579688b6490380 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 13 Mar 2017 13:54:25 +0100 Subject: Sheets: add ishtar ID (refs #3517) --- .../templates/ishtar/sheet_contextrecord.html | 18 +++--------- archaeological_files/models.py | 5 ++++ .../templates/ishtar/sheet_file.html | 27 +++++------------- .../templates/ishtar/sheet_find.html | 32 +++++++++------------- archaeological_operations/models.py | 4 +++ .../templates/ishtar/sheet_operation.html | 3 +- .../templates/ishtar/sheet_container.html | 6 ++-- .../templates/ishtar/sheet_warehouse.html | 7 +++-- example_project/settings.py | 1 + ishtar_common/static/media/style.css | 4 +++ .../ishtar/blocks/sheet_creation_section.html | 19 +++++++++++++ .../templates/ishtar/blocks/sheet_external_id.html | 7 +++++ version.py | 2 +- 13 files changed, 76 insertions(+), 59 deletions(-) create mode 100644 ishtar_common/templates/ishtar/blocks/sheet_creation_section.html create mode 100644 ishtar_common/templates/ishtar/blocks/sheet_external_id.html (limited to 'archaeological_warehouse') diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index 1c024dcfc..7ba34fd13 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -12,23 +12,13 @@

{{ item.parcel.short_label }}

{{ item.label|default:"" }}

+{% include "ishtar/blocks/sheet_external_id.html" %}