From 4910072c29e064ff743ecd8affb7418a735a5e5d Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 28 Oct 2013 02:28:08 +0100 Subject: Better title for sheets (refs #1372) --- .../templates/ishtar/sheet_contextrecord.html | 8 ++++++-- archaeological_files/templates/ishtar/sheet_file.html | 6 ++++++ archaeological_finds/templates/ishtar/sheet_find.html | 7 +++++-- .../templates/ishtar/sheet_operation.html | 6 ++++++ ishtar_common/static/media/style.css | 18 ++++++++++++++++-- ishtar_common/templates/ishtar/sheet_person.html | 8 ++++++-- 6 files changed, 45 insertions(+), 8 deletions(-) diff --git a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html index 8356d789d..741201daa 100644 --- a/archaeological_context_records/templates/ishtar/sheet_contextrecord.html +++ b/archaeological_context_records/templates/ishtar/sheet_contextrecord.html @@ -1,5 +1,11 @@ {% extends "ishtar/sheet.html" %} {% load i18n %} + +{% block head_sheet %} +{{block.super}} +

{% trans "Context Record"%}

+{% endblock %} + {% block content %} {% if previous or next %}
@@ -15,8 +21,6 @@ {% endif %} -

{% trans "Context Record"%}

- {% if item.operation.code_patriarche %}

{% else %} diff --git a/archaeological_files/templates/ishtar/sheet_file.html b/archaeological_files/templates/ishtar/sheet_file.html index ff0acb1a7..6602b8ee3 100644 --- a/archaeological_files/templates/ishtar/sheet_file.html +++ b/archaeological_files/templates/ishtar/sheet_file.html @@ -1,5 +1,11 @@ {% extends "ishtar/sheet.html" %} {% load i18n %} + +{% block head_sheet %} +{{block.super}} +

{% trans "Archaeological file"%}

+{% endblock %} + {% block content %} {% if previous or next %}
diff --git a/archaeological_finds/templates/ishtar/sheet_find.html b/archaeological_finds/templates/ishtar/sheet_find.html index da1e91cc5..7e45637d8 100644 --- a/archaeological_finds/templates/ishtar/sheet_find.html +++ b/archaeological_finds/templates/ishtar/sheet_find.html @@ -1,6 +1,11 @@ {% extends "ishtar/sheet.html" %} {% load i18n %} +{% block head_sheet %} +{{block.super}} +

{% trans "Find"%}

+{% endblock %} + {% block content %} {% if previous or next %} @@ -18,8 +23,6 @@ -

{% trans "Find"%}

- {% if item.image %} {% endif%} diff --git a/archaeological_operations/templates/ishtar/sheet_operation.html b/archaeological_operations/templates/ishtar/sheet_operation.html index 06c30b9e7..0672cf22f 100644 --- a/archaeological_operations/templates/ishtar/sheet_operation.html +++ b/archaeological_operations/templates/ishtar/sheet_operation.html @@ -1,5 +1,11 @@ {% extends "ishtar/sheet.html" %} {% load i18n %} + +{% block head_sheet %} +{{block.super}} +

{% trans "Operation"%}

+{% endblock %} + {% block content %} {% if previous or next %} diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index cfc75728b..83e538331 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -12,6 +12,10 @@ div.form { background-color: #EEE; } +#window h1{ + background-color: #922; +} + /* color */ a, a.remove { color:#D14; @@ -20,6 +24,10 @@ a.add-button{ color:#61615C; } +#window h1{ + color:#fff; +} + /* borders */ a.add-button, a.remove, #progress-content, @@ -548,13 +556,19 @@ table.confirm tr.spacer td:last-child{ #window .body{ position:absolute; - padding:10px; + padding:2px 10px 6px 10px; overflow:auto; - top:18px; + top:38px; bottom:10px; width:740px; } +#window h1{ + text-align:center; + font-size:16px; + margin-top:0; +} + #window label{ display:inline-table; font-weight:bold; diff --git a/ishtar_common/templates/ishtar/sheet_person.html b/ishtar_common/templates/ishtar/sheet_person.html index 61b87654d..88fe59f41 100644 --- a/ishtar_common/templates/ishtar/sheet_person.html +++ b/ishtar_common/templates/ishtar/sheet_person.html @@ -1,10 +1,14 @@ {% extends "ishtar/sheet.html" %} {% load i18n %} + +{% block head_sheet %} +{{block.super}} +

{% trans "Person"%}

+{% endblock %} + {% block content %} -

{% trans "Person"%}

-

{{item.name}}

{{item.surname}}

{% if item.email %}

{{item.email}}

{% endif %} -- cgit v1.2.3