diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2013-07-16 23:28:25 +0000 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2013-07-16 23:28:25 +0000 |
| commit | 748940e2a215bf62adb0e61647d117c94dceb708 (patch) | |
| tree | 0eb9903217350f33513d97b6ddf4d4e4126c332f /archaeological_operations/templates/ishtar/sheet_operation.html | |
| parent | 23e4ba7b12751cf481015e68e1336dd5bb1042f0 (diff) | |
| parent | 06824fcb9a58226cb017ae5104aefa48874754f6 (diff) | |
| download | Ishtar-748940e2a215bf62adb0e61647d117c94dceb708.tar.bz2 Ishtar-748940e2a215bf62adb0e61647d117c94dceb708.zip | |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
Diffstat (limited to 'archaeological_operations/templates/ishtar/sheet_operation.html')
| -rw-r--r-- | archaeological_operations/templates/ishtar/sheet_operation.html | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 3a6a20e74..1e43c7112 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -145,8 +145,9 @@ <caption>{%trans "Finds"%}</caption> <tr> <th>{% trans "Find" %}</th> + <th>{% trans "Id by material type" %}</th> <th>{% trans "Material type" %}</th> - <th>{% trans "Context record" %}</th> + <th>{% trans "Context record" context "short"%}</th> <th>{% trans "Periods" %}</th> <th>{% trans "Description" %}</th> <th>{% trans "Weight" %}</th> @@ -161,6 +162,7 @@ {# Displayed as (Patriarche operation code)-(Record unit label)-(Finds label). #} {# or displayed as (Year)-(index)-(Record unit label)-(Finds label). #} <td class="ref">{{ find.material_type_label }}</td> + <td class="string">{{ find.material|default:"" }}</td> <td>{{find.context_record.label}}</td> <td class='string'>{{ find.get_last_find.dating}}</td>{# TODO .all|join:", " ? #} <td class='string'>{{ find.get_last_find.description }}</td> |