diff options
4 files changed, 21 insertions, 6 deletions
diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index 907697c9e..e5edb4af5 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -10,6 +10,9 @@ <a href='{{item.image.url}}' rel="prettyPhoto" title="{{item.label}}" class='photo'><img src='{{item.thumbnail.url}}'/></a> {% endif%} +<p class='window-refs'>{{ item.parcel.short_label }}</p> +<p class="window-refs">{{ item.label|default:"" }}</p> + <ul class='form-flex'> <li><label>{% if item.operation.code_patriarche %}{%trans "Complete ID:"%}{% else %}{%trans "Temporary ID:"%}{% endif %}</label><span class='value'>{{item.full_label}}</span></li> {% field_li "Creation date" item.creation_date %} @@ -17,7 +20,6 @@ {% field_li "Type" item.unit %} {% field_li_multiple "Chronology" item.datings %} {% field_li "Town" item.parcel.town %} -{% field_li "Parcel" item.parcel.short_label %} </ul> {% field "Comment on datings" item.datings_comment "<pre>" "</pre>" %} diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index 0cc1616b2..00470906d 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -10,8 +10,15 @@ <a href='{{item.image.url}}' rel="prettyPhoto" title="{{item.label}}" class='photo'><img src='{{item.thumbnail.url}}'/></a> {% endif%} +<p class="window-refs">{{ item.label|default:"" }}</p> +<p class='window-refs'>{% for base_find in item.base_finds.all %}{% if forloop.counter0 %} – {% endif %}{{base_find.complete_id}}{% endfor %}</p> +<p class='window-refs'>{% for base_find in item.base_finds.all %}{% if forloop.counter0 %} – {% endif %}{{base_find.short_id}}{% endfor %}</p> +<p class="window-refs">{{ item.administrative_index|default:"" }}</p> +<p class="window-refs">{{ item.contextrecord|default:"" }}</p> + + + <ul class='form-flex'> -{% field_li "Free-ID" item.label %} {% field_li "Previous ID" item.previous_id %} {% with item.history_creation_date|date:"SHORT_DATETIME_FORMAT" as creation_date %} {% with item.history_creator.ishtaruser.full_label|add:"<br/><i>"|add:creation_date|add:"</i>" as creator %} diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 07f8d8ab0..daddb42d6 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -17,12 +17,12 @@ <p class='alert'><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> {%trans "Patriarche OA code not yet recorded!"%}</p> {% endif %} +<p class='window-refs'>{% if item.year or item.operation_code %}{{item.year|default:''}}-{{item.operation_code|default:''}}{% endif %}{% if item.code_patriarche %} – OA{{item.code_patriarche}}{% endif %} +</p> +<p class='window-refs'>{{item.common_name|default:''}}</p> + <h3>{% trans "General"%}</h3> <ul class='form-flex'> -{% field_li "Name" item.common_name %} -{% field_li "Year" item.year %} -{% field_li "Numeric reference" item.operation_code %} -{% field_li "Code patriarche" item.code_patriarche 'OA' %} {% field_li "Old code" item.old_code %} <li><label>{%trans "Last modification date:"%}</label> <span class='value'>{% if item.history_date %}{{ item.history_date }}{% else %}{{ item.history.all.0.history_date }}{% endif %}</span></li> <!-- date = now --> {% field_li "Created by" item.history_creator.ishtaruser.full_label %} diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 7b441c085..00fed380d 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -739,6 +739,12 @@ ul.form-flex li li label { width: 300px; } +.window-refs{ + font-size: 1.1em; + font-weight: bold; + text-align: center; +} + #window ul.form-flex label { width: 150px; } |