From: yomguy <yomguy@parisson.com>
Date: Wed, 1 Feb 2012 12:23:18 +0000 (+0100)
Subject: fix admin templates
X-Git-Tag: 1.3.9~22
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=cd2e8603e3358fb22b9a22e455395b4514bc0a36;p=telemeta.git

fix admin templates
---

diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index de4caed2..a6d2db0e 100644
Binary files a/telemeta/locale/de/LC_MESSAGES/django.mo and b/telemeta/locale/de/LC_MESSAGES/django.mo differ
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 de4caed2..a6d2db0e 100644
Binary files a/telemeta/locale/de/LC_MESSAGES/djangojs.mo and b/telemeta/locale/de/LC_MESSAGES/djangojs.mo differ
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 5cfed4ad..d2938904 100644
Binary files a/telemeta/locale/fr/LC_MESSAGES/django.mo and b/telemeta/locale/fr/LC_MESSAGES/django.mo differ
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 697517d4..6e023cdd 100644
Binary files a/telemeta/locale/fr/LC_MESSAGES/djangojs.mo and b/telemeta/locale/fr/LC_MESSAGES/djangojs.mo differ
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"