From cd2e8603e3358fb22b9a22e455395b4514bc0a36 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Wed, 1 Feb 2012 13:23:18 +0100
Subject: [PATCH] fix admin templates

---
 telemeta/locale/de/LC_MESSAGES/django.mo      | Bin 420 -> 420 bytes
 telemeta/locale/de/LC_MESSAGES/django.po      |  66 +++++++++---------
 telemeta/locale/de/LC_MESSAGES/djangojs.mo    | Bin 420 -> 420 bytes
 telemeta/locale/de/LC_MESSAGES/djangojs.po    |   2 +-
 telemeta/locale/fr/LC_MESSAGES/django.mo      | Bin 14722 -> 14789 bytes
 telemeta/locale/fr/LC_MESSAGES/django.po      |  66 +++++++++---------
 telemeta/locale/fr/LC_MESSAGES/djangojs.mo    | Bin 1466 -> 1466 bytes
 telemeta/locale/fr/LC_MESSAGES/djangojs.po    |   2 +-
 .../telemeta/admin_enumerations.html          |   6 +-
 .../templates/telemeta/admin_general.html     |   4 ++
 .../templates/telemeta/enumeration_edit.html  |   9 ++-
 .../telemeta/enumeration_edit_value.html      |   7 +-
 .../templates/telemeta/instrument_edit.html   |   5 +-
 .../telemeta/instrument_edit_value.html       |   4 +-
 14 files changed, 89 insertions(+), 82 deletions(-)

diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index de4caed24610569138498933055a2afd0651ba3f..a6d2db0ecc13949aae54d308c233a2217fe739dd 100644
GIT binary patch
delta 14
VcmZ3&yo7neWM*S4qm9$}7y%?d1Zn^P

delta 14
VcmZ3&yo7neWM(5Pla15(7y%?g1Zw~Q

diff --git a/telemeta/locale/de/LC_MESSAGES/django.po b/telemeta/locale/de/LC_MESSAGES/django.po
index 0859c72a..1d2d29ef 100644
--- a/telemeta/locale/de/LC_MESSAGES/django.po
+++ b/telemeta/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-01 12:42+0100\n"
+"POT-Creation-Date: 2012-02-01 13:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -573,15 +573,19 @@ msgid "Telemeta administration"
 msgstr ""
 
 #: templates/telemeta/admin.html:11
+#: templates/telemeta/admin_enumerations.html:6
+#: templates/telemeta/admin_general.html:5
+#: templates/telemeta/enumeration_edit.html:7
+#: templates/telemeta/instrument_edit.html:7
 msgid "Administration"
 msgstr ""
 
 #: templates/telemeta/admin_enumerations.html:6
-#: templates/telemeta/base.html:126
+#: templates/telemeta/base.html:126 templates/telemeta/enumeration_edit.html:7
 msgid "Enumerations"
 msgstr ""
 
-#: templates/telemeta/admin_enumerations.html:12
+#: templates/telemeta/admin_enumerations.html:14
 #: templates/telemeta/home.html:46 templates/telemeta/mediaitem_add.html:33
 #: templates/telemeta/mediaitem_copy.html:34
 #: templates/telemeta/mediaitem_detail_video.html:295
@@ -599,10 +603,14 @@ msgstr ""
 msgid "Title"
 msgstr ""
 
-#: templates/telemeta/admin_enumerations.html:22
+#: templates/telemeta/admin_enumerations.html:24
 msgid "No enumerations"
 msgstr ""
 
+#: templates/telemeta/admin_general.html:5 templates/telemeta/base.html:125
+msgid "General"
+msgstr ""
+
 #: templates/telemeta/admin_instruments.html:6
 #: templates/telemeta/admin_users.html:6 templates/telemeta/base.html:89
 #: templates/telemeta/base.html.py:120 templates/telemeta/users.html:5
@@ -680,14 +688,9 @@ msgstr ""
 msgid "Corpus"
 msgstr ""
 
-#: templates/telemeta/base.html:125
-msgid "General"
-msgstr ""
-
 #: templates/telemeta/base.html:127 templates/telemeta/instrument_edit.html:4
 #: templates/telemeta/instrument_edit.html:7
-#: templates/telemeta/instrument_edit_value.html:4
-#: templates/telemeta/instrument_edit_value.html:7
+#: templates/telemeta/instrument_edit_value.html:5
 msgid "Instruments"
 msgstr ""
 
@@ -716,8 +719,8 @@ msgstr ""
 #: templates/telemeta/collection_edit.html:29
 #: templates/telemeta/collection_related_edit.html:12
 #: templates/telemeta/collection_related_edit.html:39
-#: templates/telemeta/enumeration_edit_value.html:22
-#: templates/telemeta/instrument_edit_value.html:21
+#: templates/telemeta/enumeration_edit_value.html:19
+#: templates/telemeta/instrument_edit_value.html:19
 #: templates/telemeta/mediaitem_add.html:15
 #: templates/telemeta/mediaitem_add.html:45
 #: templates/telemeta/mediaitem_copy.html:16
@@ -744,8 +747,8 @@ msgstr ""
 #: templates/telemeta/collection_add.html:32
 #: templates/telemeta/collection_edit.html:31
 #: templates/telemeta/collection_related_edit.html:41
-#: templates/telemeta/enumeration_edit_value.html:20
-#: templates/telemeta/instrument_edit_value.html:19
+#: templates/telemeta/enumeration_edit_value.html:17
+#: templates/telemeta/instrument_edit_value.html:17
 #: templates/telemeta/mediaitem_add.html:47
 #: templates/telemeta/mediaitem_copy.html:47
 #: templates/telemeta/mediaitem_edit.html:40
@@ -908,8 +911,8 @@ msgid "Sounds"
 msgstr ""
 
 #: templates/telemeta/collection_list.html:17
-#: templates/telemeta/enumeration_edit.html:20 templates/telemeta/home.html:27
-#: templates/telemeta/instrument_edit.html:19
+#: templates/telemeta/enumeration_edit.html:23 templates/telemeta/home.html:27
+#: templates/telemeta/instrument_edit.html:22
 #: templates/telemeta/mediaitem_list.html:15
 #: templates/telemeta/resource_list.html:13
 msgid "Add"
@@ -934,36 +937,33 @@ msgid "Populations / Social groups"
 msgstr ""
 
 #: templates/telemeta/enumeration_edit.html:4
-#: templates/telemeta/enumeration_edit.html:7
-#: templates/telemeta/enumeration_edit_value.html:4
-#: templates/telemeta/enumeration_edit_value.html:7
 msgid "Enumeration"
 msgstr ""
 
-#: templates/telemeta/enumeration_edit.html:12
-#: templates/telemeta/instrument_edit.html:11
+#: templates/telemeta/enumeration_edit.html:15
+#: templates/telemeta/instrument_edit.html:14
 msgid "Add entry"
 msgstr ""
 
-#: templates/telemeta/enumeration_edit.html:14
-#: templates/telemeta/enumeration_edit.html:28
-#: templates/telemeta/enumeration_edit_value.html:14
+#: templates/telemeta/enumeration_edit.html:17
+#: templates/telemeta/enumeration_edit.html:31
+#: templates/telemeta/enumeration_edit_value.html:11
 #: templates/telemeta/mediaitem_detail.html:137
 #: templates/telemeta/mediaitem_detail_video.html:136
 msgid "Value"
 msgstr ""
 
-#: templates/telemeta/enumeration_edit.html:44
-#: templates/telemeta/instrument_edit.html:41
+#: templates/telemeta/enumeration_edit.html:47
+#: templates/telemeta/instrument_edit.html:44
 msgid "Remove selected items"
 msgstr ""
 
-#: templates/telemeta/enumeration_edit.html:48
+#: templates/telemeta/enumeration_edit.html:51
 msgid "This enumeration is empty"
 msgstr ""
 
-#: templates/telemeta/enumeration_edit_value.html:12
-#: templates/telemeta/instrument_edit_value.html:11
+#: templates/telemeta/enumeration_edit_value.html:9
+#: templates/telemeta/instrument_edit_value.html:9
 msgid "Modify an entry"
 msgstr ""
 
@@ -1054,13 +1054,13 @@ msgstr ""
 msgid "Open the geographic navigator"
 msgstr ""
 
-#: templates/telemeta/instrument_edit.html:13
-#: templates/telemeta/instrument_edit.html:27
-#: templates/telemeta/instrument_edit_value.html:13
+#: templates/telemeta/instrument_edit.html:16
+#: templates/telemeta/instrument_edit.html:30
+#: templates/telemeta/instrument_edit_value.html:11
 msgid "Name"
 msgstr ""
 
-#: templates/telemeta/instrument_edit.html:45
+#: templates/telemeta/instrument_edit.html:48
 msgid "This instrument list is empty"
 msgstr ""
 
diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.mo b/telemeta/locale/de/LC_MESSAGES/djangojs.mo
index de4caed24610569138498933055a2afd0651ba3f..a6d2db0ecc13949aae54d308c233a2217fe739dd 100644
GIT binary patch
delta 14
VcmZ3&yo7neWM*S4qm9$}7y%?d1Zn^P

delta 14
VcmZ3&yo7neWM(5Pla15(7y%?g1Zw~Q

diff --git a/telemeta/locale/de/LC_MESSAGES/djangojs.po b/telemeta/locale/de/LC_MESSAGES/djangojs.po
index da1e2817..6230063b 100644
--- a/telemeta/locale/de/LC_MESSAGES/djangojs.po
+++ b/telemeta/locale/de/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-01 12:42+0100\n"
+"POT-Creation-Date: 2012-02-01 13:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index 5cfed4adaea5e027c82202e41b1ed041954c2bbb..d29389040896b431fa25baf11aab35d38fc123d1 100644
GIT binary patch
delta 5897
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

delta 5839
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
DH<TY9

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.po b/telemeta/locale/fr/LC_MESSAGES/django.po
index a952d51c..4235163a 100644
--- a/telemeta/locale/fr/LC_MESSAGES/django.po
+++ b/telemeta/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-01 12:42+0100\n"
+"POT-Creation-Date: 2012-02-01 13:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Olivier Guilyardi <olivier samalyse com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -575,15 +575,19 @@ msgid "Telemeta administration"
 msgstr "Administration Telemeta"
 
 #: templates/telemeta/admin.html:11
+#: templates/telemeta/admin_enumerations.html:6
+#: templates/telemeta/admin_general.html:5
+#: templates/telemeta/enumeration_edit.html:7
+#: templates/telemeta/instrument_edit.html:7
 msgid "Administration"
 msgstr "Administration"
 
 #: templates/telemeta/admin_enumerations.html:6
-#: templates/telemeta/base.html:126
+#: templates/telemeta/base.html:126 templates/telemeta/enumeration_edit.html:7
 msgid "Enumerations"
 msgstr "Énumérations"
 
-#: templates/telemeta/admin_enumerations.html:12
+#: templates/telemeta/admin_enumerations.html:14
 #: templates/telemeta/home.html:46 templates/telemeta/mediaitem_add.html:33
 #: templates/telemeta/mediaitem_copy.html:34
 #: templates/telemeta/mediaitem_detail_video.html:295
@@ -601,10 +605,14 @@ msgstr "Énumérations"
 msgid "Title"
 msgstr "Titre"
 
-#: templates/telemeta/admin_enumerations.html:22
+#: templates/telemeta/admin_enumerations.html:24
 msgid "No enumerations"
 msgstr "Pas d'énumérations"
 
+#: templates/telemeta/admin_general.html:5 templates/telemeta/base.html:125
+msgid "General"
+msgstr "Générale"
+
 #: templates/telemeta/admin_instruments.html:6
 #: templates/telemeta/admin_users.html:6 templates/telemeta/base.html:89
 #: templates/telemeta/base.html.py:120 templates/telemeta/users.html:5
@@ -682,14 +690,9 @@ msgstr ""
 msgid "Corpus"
 msgstr ""
 
-#: templates/telemeta/base.html:125
-msgid "General"
-msgstr ""
-
 #: templates/telemeta/base.html:127 templates/telemeta/instrument_edit.html:4
 #: templates/telemeta/instrument_edit.html:7
-#: templates/telemeta/instrument_edit_value.html:4
-#: templates/telemeta/instrument_edit_value.html:7
+#: templates/telemeta/instrument_edit_value.html:5
 msgid "Instruments"
 msgstr "Instruments"
 
@@ -720,8 +723,8 @@ msgstr "Mentions légales"
 #: templates/telemeta/collection_edit.html:29
 #: templates/telemeta/collection_related_edit.html:12
 #: templates/telemeta/collection_related_edit.html:39
-#: templates/telemeta/enumeration_edit_value.html:22
-#: templates/telemeta/instrument_edit_value.html:21
+#: templates/telemeta/enumeration_edit_value.html:19
+#: templates/telemeta/instrument_edit_value.html:19
 #: templates/telemeta/mediaitem_add.html:15
 #: templates/telemeta/mediaitem_add.html:45
 #: templates/telemeta/mediaitem_copy.html:16
@@ -748,8 +751,8 @@ msgstr "Annuler"
 #: templates/telemeta/collection_add.html:32
 #: templates/telemeta/collection_edit.html:31
 #: templates/telemeta/collection_related_edit.html:41
-#: templates/telemeta/enumeration_edit_value.html:20
-#: templates/telemeta/instrument_edit_value.html:19
+#: templates/telemeta/enumeration_edit_value.html:17
+#: templates/telemeta/instrument_edit_value.html:17
 #: templates/telemeta/mediaitem_add.html:47
 #: templates/telemeta/mediaitem_copy.html:47
 #: templates/telemeta/mediaitem_edit.html:40
@@ -912,8 +915,8 @@ msgid "Sounds"
 msgstr "Sonores"
 
 #: templates/telemeta/collection_list.html:17
-#: templates/telemeta/enumeration_edit.html:20 templates/telemeta/home.html:27
-#: templates/telemeta/instrument_edit.html:19
+#: templates/telemeta/enumeration_edit.html:23 templates/telemeta/home.html:27
+#: templates/telemeta/instrument_edit.html:22
 #: templates/telemeta/mediaitem_list.html:15
 #: templates/telemeta/resource_list.html:13
 msgid "Add"
@@ -938,36 +941,33 @@ msgid "Populations / Social groups"
 msgstr "Populations / Groupes sociaux"
 
 #: templates/telemeta/enumeration_edit.html:4
-#: templates/telemeta/enumeration_edit.html:7
-#: templates/telemeta/enumeration_edit_value.html:4
-#: templates/telemeta/enumeration_edit_value.html:7
 msgid "Enumeration"
 msgstr "Enumération"
 
-#: templates/telemeta/enumeration_edit.html:12
-#: templates/telemeta/instrument_edit.html:11
+#: templates/telemeta/enumeration_edit.html:15
+#: templates/telemeta/instrument_edit.html:14
 msgid "Add entry"
 msgstr "Ajouter une entrée"
 
-#: templates/telemeta/enumeration_edit.html:14
-#: templates/telemeta/enumeration_edit.html:28
-#: templates/telemeta/enumeration_edit_value.html:14
+#: templates/telemeta/enumeration_edit.html:17
+#: templates/telemeta/enumeration_edit.html:31
+#: templates/telemeta/enumeration_edit_value.html:11
 #: templates/telemeta/mediaitem_detail.html:137
 #: templates/telemeta/mediaitem_detail_video.html:136
 msgid "Value"
 msgstr "Valeur"
 
-#: templates/telemeta/enumeration_edit.html:44
-#: templates/telemeta/instrument_edit.html:41
+#: templates/telemeta/enumeration_edit.html:47
+#: templates/telemeta/instrument_edit.html:44
 msgid "Remove selected items"
 msgstr "Supprimer les éléments sélectionnés"
 
-#: templates/telemeta/enumeration_edit.html:48
+#: templates/telemeta/enumeration_edit.html:51
 msgid "This enumeration is empty"
 msgstr "Cette énumération est vide"
 
-#: templates/telemeta/enumeration_edit_value.html:12
-#: templates/telemeta/instrument_edit_value.html:11
+#: templates/telemeta/enumeration_edit_value.html:9
+#: templates/telemeta/instrument_edit_value.html:9
 msgid "Modify an entry"
 msgstr "Modification d'une entrée"
 
@@ -1058,13 +1058,13 @@ msgstr "Sélection musicale"
 msgid "Open the geographic navigator"
 msgstr "Accéder au navigateur géographique"
 
-#: templates/telemeta/instrument_edit.html:13
-#: templates/telemeta/instrument_edit.html:27
-#: templates/telemeta/instrument_edit_value.html:13
+#: templates/telemeta/instrument_edit.html:16
+#: templates/telemeta/instrument_edit.html:30
+#: templates/telemeta/instrument_edit_value.html:11
 msgid "Name"
 msgstr "Nom"
 
-#: templates/telemeta/instrument_edit.html:45
+#: templates/telemeta/instrument_edit.html:48
 msgid "This instrument list is empty"
 msgstr "Cette énumération est vide"
 
diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo
index 697517d4ec401b6a6c9b2f7301b06672c42f08cf..6e023cdd3356c13d71a12c7b637e232013af9f81 100644
GIT binary patch
delta 16
YcmdnRy^DLp7ba$7E2GWdnGQ1n05?7cL;wH)

delta 16
YcmdnRy^DLp7ba#SE0fLNnGQ1n05?JgMF0Q*

diff --git a/telemeta/locale/fr/LC_MESSAGES/djangojs.po b/telemeta/locale/fr/LC_MESSAGES/djangojs.po
index ffc1833e..a6c4333e 100644
--- a/telemeta/locale/fr/LC_MESSAGES/djangojs.po
+++ b/telemeta/locale/fr/LC_MESSAGES/djangojs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-01 12:42+0100\n"
+"POT-Creation-Date: 2012-02-01 13:22+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Guillaume Pellerin <yomguy@parisson.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/telemeta/templates/telemeta/admin_enumerations.html b/telemeta/templates/telemeta/admin_enumerations.html
index 9c68d74f..98861f89 100644
--- a/telemeta/templates/telemeta/admin_enumerations.html
+++ b/telemeta/templates/telemeta/admin_enumerations.html
@@ -2,9 +2,11 @@
 {% load telemeta_utils %}
 {% load i18n %}
 
+{% block title %}
+<h1><img src="{% url telemeta-images "admin_red.png" %}" style="vertical-align:middle" /> {% trans "Administration" %} > {% trans "Enumerations" %}</h1>
+{% endblock %}
+
 {% block tabcontents %}
- <h4>{% trans "Enumerations" %}</h4>
- 
 {% if enumerations %}
 
   <table class="listing">
diff --git a/telemeta/templates/telemeta/admin_general.html b/telemeta/templates/telemeta/admin_general.html
index ec562324..a8e29702 100644
--- a/telemeta/templates/telemeta/admin_general.html
+++ b/telemeta/templates/telemeta/admin_general.html
@@ -1,6 +1,10 @@
 {% extends "telemeta/admin.html" %}
 {% load i18n %}
 
+{% block title %}
+<h1><img src="{% url telemeta-images "admin_red.png" %}" style="vertical-align:middle" /> {% trans "Administration" %} > {% trans "General" %}</h1>
+{% endblock %}
+
 {% block tabcontents %}
  <iframe align="middle" frameborder="0" width="100%" height="600px"  src="{% url telemeta-home %}admin/django/" />
 {% endblock %}
diff --git a/telemeta/templates/telemeta/enumeration_edit.html b/telemeta/templates/telemeta/enumeration_edit.html
index 56f17dde..ec16531d 100644
--- a/telemeta/templates/telemeta/enumeration_edit.html
+++ b/telemeta/templates/telemeta/enumeration_edit.html
@@ -1,11 +1,14 @@
 {% extends "telemeta/admin.html" %}
 {% load i18n %}
 
-{% block head_title %}{% trans "Enumeration" %}: {{ enumeration_name|capfirst }} - {{ block.super }}{% endblock %}
+{% block head_title %}{% trans "Enumeration" %} : {{ enumeration_name|capfirst }} - {{ block.super }}{% endblock %}
 
-{% block tabcontents %}
- <h4>{% trans "Enumeration" %}: {{ enumeration_name|capfirst }}</h4>
+{% block title %}
+<h1><img src="{% url telemeta-images "admin_red.png" %}" style="vertical-align:middle" /> {% trans "Administration" %} > {% trans "Enumerations" %}</h1>
+{% endblock %}
 
+{% block tabcontents %}
+ <h4>{{ enumeration_name|capfirst }}</h4>
  <form class="addnew" id="_addenum" method="POST"
         action="{% url telemeta-enumeration-add enumeration_id %}">{% csrf_token %}
   <fieldset>
diff --git a/telemeta/templates/telemeta/enumeration_edit_value.html b/telemeta/templates/telemeta/enumeration_edit_value.html
index 103f9ffe..18bb0b69 100644
--- a/telemeta/templates/telemeta/enumeration_edit_value.html
+++ b/telemeta/templates/telemeta/enumeration_edit_value.html
@@ -1,11 +1,8 @@
-{% extends "telemeta/admin.html" %}
+{% extends "telemeta/enumeration_edit.html" %}
 {% load i18n %}
 
-{% block head_title %}{% trans "Enumeration" %}: {{ enumeration_name|capfirst }} - {{ block.super }}{% endblock %}
-
 {% block tabcontents %}
- <h4>{% trans "Enumeration" %}: {{ enumeration_name|capfirst }}</h4>
-
+ <h4>{{ enumeration_name|capfirst }}</h4>
  <form class="mod" id="addenum" method="post"
     action="{% url telemeta-enumeration-record-update enumeration_id,enumeration_record.id %}">{% csrf_token %}
   <fieldset>
diff --git a/telemeta/templates/telemeta/instrument_edit.html b/telemeta/templates/telemeta/instrument_edit.html
index 4988a6fa..29827113 100644
--- a/telemeta/templates/telemeta/instrument_edit.html
+++ b/telemeta/templates/telemeta/instrument_edit.html
@@ -3,8 +3,11 @@
 
 {% block head_title %}{% trans "Instruments" %} - {{ block.super }}{% endblock %}
 
+{% block title %}
+<h1><img src="{% url telemeta-images "admin_red.png" %}" style="vertical-align:middle" /> {% trans "Administration" %} > {% trans "Instruments" %}</h1>
+{% endblock %}
+
 {% block tabcontents %}
- <h4>{% trans "Instruments" %}</h4>
  <form class="addnew" id="_addinstru" method="POST"
         action="{% url telemeta-instrument-add %}">{% csrf_token %}
   <fieldset>
diff --git a/telemeta/templates/telemeta/instrument_edit_value.html b/telemeta/templates/telemeta/instrument_edit_value.html
index ca28c254..28d2bd5b 100644
--- a/telemeta/templates/telemeta/instrument_edit_value.html
+++ b/telemeta/templates/telemeta/instrument_edit_value.html
@@ -1,8 +1,6 @@
-{% extends "telemeta/admin.html" %}
+{% extends "telemeta/instrument_edit.html" %}
 {% load i18n %}
 
-{% block head_title %}{% trans "Instruments" %} - {{ block.super }}{% endblock %}
-
 {% block tabcontents %}
  <h4>{% trans "Instruments" %}</h4>
  <form class="mod" id="addinstru" method="post"
-- 
2.39.5