summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@peacefrogs.net>2013-10-28 02:28:08 +0100
committerÉtienne Loks <etienne.loks@peacefrogs.net>2013-10-28 02:28:08 +0100
commit4910072c29e064ff743ecd8affb7418a735a5e5d (patch)
tree79d40d45e44ee16a245987feda1d279f5b5fe6b5
parent003896dffef54abeb04409bdabd485723eaf8805 (diff)
downloadIshtar-4910072c29e064ff743ecd8affb7418a735a5e5d.tar.bz2
Ishtar-4910072c29e064ff743ecd8affb7418a735a5e5d.zip
Better title for sheets (refs #1372)
-rw-r--r--archaeological_context_records/templates/ishtar/sheet_contextrecord.html8
-rw-r--r--archaeological_files/templates/ishtar/sheet_file.html6
-rw-r--r--archaeological_finds/templates/ishtar/sheet_find.html7
-rw-r--r--archaeological_operations/templates/ishtar/sheet_operation.html6
-rw-r--r--ishtar_common/static/media/style.css18
-rw-r--r--ishtar_common/templates/ishtar/sheet_person.html8
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}}
+<h1>{% trans "Context Record"%}</h1>
+{% endblock %}
+
{% block content %}
{% if previous or next %}
<div class='tool'>
@@ -15,8 +21,6 @@
{% endif %}
<div class='tool'>{%trans "Export as:"%} <a href='{% url show-contextrecord item.pk "odt" %}'>{%trans "OpenOffice.org file"%}</a>, <a href='{% url show-contextrecord item.pk "pdf" %}'>{%trans "PDF file"%}</a></div>
-<h3>{% trans "Context Record"%}</h3>
-
{% if item.operation.code_patriarche %}
<p><label>{%trans "Complete ID:"%}</label>
{% 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}}
+<h1>{% trans "Archaeological file"%}</h1>
+{% endblock %}
+
{% block content %}
{% if previous or next %}
<div class='tool'>
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}}
+<h1>{% trans "Find"%}</h1>
+{% endblock %}
+
{% block content %}
{% if previous or next %}
@@ -18,8 +23,6 @@
<div class='tool'>{%trans "Export as:"%} <a href='{% url show-find item.pk "odt" %}'>{%trans "OpenOffice.org file"%}</a>, <a href='{% url show-find item.pk "pdf" %}'>{%trans "PDF file"%}</a></div>
-<h3>{% trans "Find"%}</h3>
-
{% if item.image %}
<a href='{{item.image.url}}' rel="prettyPhoto" title="{{item.label}}"><img src='{{item.thumbnail.url}}'/></a>
{% 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}}
+<h1>{% trans "Operation"%}</h1>
+{% 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}}
+<h1>{% trans "Person"%}</h1>
+{% endblock %}
+
{% block content %}
<div class='tool'>{%trans "Export as:"%} <a href='{% url show-person item.pk "odt" %}'>{%trans "OpenOffice.org file"%}</a>, <a href='{% url show-person item.pk "pdf" %}'>{%trans "PDF file"%}</a></div>
-<h3>{% trans "Person"%}</h3>
-
<p><label>{% trans "Name" %}</label> <span class='value'>{{item.name}}</span></p>
<p><label>{% trans "Surname" %}</label> <span class='value'>{{item.surname}}</span></p>
{% if item.email %}<p><label>{% trans "Email" %}</label> <span class='value'>{{item.email}}</span></p>{% endif %}