summaryrefslogtreecommitdiff
path: root/archaeological_operations/templates/ishtar
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2014-01-16 20:49:57 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2014-01-16 20:50:45 +0100
commitbcb27ee5d77a8d60e25443f9aef59c395b4cee06 (patch)
treee5d1e4fdf72caacf457924a0b79e9506e7313011 /archaeological_operations/templates/ishtar
parent818463cd01a5f82861058cf75e0f6e794d69f57e (diff)
downloadIshtar-bcb27ee5d77a8d60e25443f9aef59c395b4cee06.tar.bz2
Ishtar-bcb27ee5d77a8d60e25443f9aef59c395b4cee06.zip
Improve layout of administrativ acts in tables and record carts (refs #1621)
Diffstat (limited to 'archaeological_operations/templates/ishtar')
-rw-r--r--archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html18
-rw-r--r--archaeological_operations/templates/ishtar/sheet_operation.html23
2 files changed, 21 insertions, 20 deletions
diff --git a/archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html b/archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html
new file mode 100644
index 000000000..9feb51e72
--- /dev/null
+++ b/archaeological_operations/templates/ishtar/blocks/window_tables/administrativacts.html
@@ -0,0 +1,18 @@
+{% load i18n %}
+<table>
+ <caption>{{caption}}</caption>
+ <tr>
+ <th>{% trans "Ref." %}</th>
+ <th>{% trans "Type" %}</th>
+ <th>{% trans "Date" %}</th>
+ </tr>
+ {% for act in data %}
+ <tr>
+ <td>{{act.full_ref}}</td>
+ <td class='string'>{{act.act_type}}</td>
+ <td>{{act.signature_date}}</td>
+ </tr>
+ {% empty %}
+ <tr><td colspan="4" class='no_items'>{% trans "No administrative act associated" %}</td></tr>
+ {% endfor %}
+</table>
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html
index 9d9b845e3..77e4f1f1d 100644
--- a/archaeological_operations/templates/ishtar/sheet_operation.html
+++ b/archaeological_operations/templates/ishtar/sheet_operation.html
@@ -1,5 +1,5 @@
{% extends "ishtar/sheet.html" %}
-{% load i18n window_tables %}
+{% load i18n window_tables window_ope_tables %}
{% block head_sheet %}
{{block.super}}
@@ -100,25 +100,8 @@
{% endfor %}
</table>
-<table>
- <caption>{%trans "Administrative acts"%}</caption>
- <tr>
- <th>{% trans "Year" %}</th>
- <th>{% trans "Ref." %}</th>
- <th>{% trans "Type" %}</th>
- <th>{% trans "Date" %}</th>
- </tr>
- {% for act in item.administrative_act.all %}
- <tr>
- <td>{{act.signature_date.year}}</td>
- <td>{% if act.ref_sra %}{{act.ref_sra}}{% endif %}</td>
- <td class='string'>{{act.act_type}}</td>
- <td class="string">{{act.signature_date}}</td>
- </tr>
- {% empty %}
- <tr><td colspan="4" class='no_items'>{% trans "No acts associated to this operation" %}</td></tr>
- {% endfor %}
-</table>
+{% trans "Administrativ acts" as administrativeacts_label %}
+{% table_administrativact administrativeacts_label item.administrative_act.all %}
{% trans "Document from this operation" as operation_docs %}
{% if item.source.count %} {% table_document operation_docs item.source.all %}{% endif %}