#69: add meaningful html titles

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index e42705f9e641a4d50f59a91863e24d1b863284c1..fb8c3f24279a03a990e922ad246fa6fe246d625c 100644 (file)
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 a7247051f174f07d647622c55f9c12734b39ee3e..bfda89eeb27b6763280b9226433f1d12ffe093fa 100644 (file)
--- 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: 2010-02-15 17:49+0100\n"
+"POT-Creation-Date: 2010-02-15 22:08+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"
@@ -428,7 +428,6 @@ msgid "Search"
 msgstr "Recherche"
 
 #: templates/telemeta_default/base.html:34
-#: templates/telemeta_default/search_criteria.html:53
 msgid "Advanced search"
 msgstr "Recherche avancée"
 
@@ -460,58 +459,68 @@ msgstr "Par"
 msgid "Visit the Telemeta open source project at"
 msgstr "Visitez le projet libre Telemeta"
 
-#: templates/telemeta_default/collection_detail.html:49
+#: templates/telemeta_default/collection_detail.html:5
+#: templates/telemeta_default/collection_detail_dc.html:5
+msgid "Collection"
+msgstr "Collection"
+
+#: templates/telemeta_default/collection_detail.html:51
 msgid "Recording year"
 msgstr "Année d'enregistrement"
 
-#: templates/telemeta_default/collection_detail.html:59
-#: templates/telemeta_default/mediaitem_detail.html:144
+#: templates/telemeta_default/collection_detail.html:61
+#: templates/telemeta_default/mediaitem_detail.html:146
 msgid "Geographic and cultural informations"
 msgstr "Indications géographiques et culturelles"
 
-#: templates/telemeta_default/collection_detail.html:72
+#: templates/telemeta_default/collection_detail.html:74
 msgid "Legal mentions"
 msgstr "Mentions légales"
 
-#: templates/telemeta_default/collection_detail.html:77
+#: templates/telemeta_default/collection_detail.html:79
 #: templates/telemeta_default/inc/collection_list.html:17
 #: templates/telemeta_default/inc/mediaitem_list.html:16
 msgid "Recordist"
 msgstr "Enregistré par"
 
-#: templates/telemeta_default/collection_detail.html:98
-#: templates/telemeta_default/mediaitem_detail.html:209
+#: templates/telemeta_default/collection_detail.html:100
+#: templates/telemeta_default/mediaitem_detail.html:211
 msgid "Archiving data"
 msgstr "Données d'archivage"
 
-#: templates/telemeta_default/collection_detail.html:121
-#: templates/telemeta_default/mediaitem_detail.html:224
+#: templates/telemeta_default/collection_detail.html:123
+#: templates/telemeta_default/mediaitem_detail.html:226
 msgid "Technical data"
 msgstr "Données techniques"
 
-#: templates/telemeta_default/collection_detail.html:126
-#: templates/telemeta_default/mediaitem_detail.html:227
+#: templates/telemeta_default/collection_detail.html:128
+#: templates/telemeta_default/mediaitem_detail.html:229
 msgid "Media type"
 msgstr "Type de media"
 
-#: templates/telemeta_default/collection_detail.html:126
-#: templates/telemeta_default/mediaitem_detail.html:227
+#: templates/telemeta_default/collection_detail.html:128
+#: templates/telemeta_default/mediaitem_detail.html:229
 msgid "Audio"
 msgstr "Audio"
 
-#: templates/telemeta_default/collection_detail.html:130
+#: templates/telemeta_default/collection_detail.html:132
 msgid "Number of items"
 msgstr "Nombre d'items"
 
-#: templates/telemeta_default/collection_detail_dc.html:8
-#: templates/telemeta_default/mediaitem_detail_dc.html:8
+#: templates/telemeta_default/collection_detail_dc.html:10
+#: templates/telemeta_default/mediaitem_detail_dc.html:10
 msgid "Normal View"
 msgstr "Vue normale"
 
-#: templates/telemeta_default/collection_detail_dc.html:18
+#: templates/telemeta_default/collection_detail_dc.html:20
 msgid "No such collection"
 msgstr "Collection introuvable"
 
+#: templates/telemeta_default/collection_list.html:4
+#: templates/telemeta_default/collection_list.html:7
+msgid "Media Collections"
+msgstr "Collections"
+
 #: templates/telemeta_default/country_info.html:9
 msgid "in"
 msgstr "dans"
@@ -520,22 +529,26 @@ msgstr "dans"
 msgid "Populations / Social groups"
 msgstr "Populations / Groupes sociaux"
 
-#: templates/telemeta_default/geo_continents.html:19
+#: templates/telemeta_default/geo_continents.html:5
+#: templates/telemeta_default/geo_continents.html:26
+#: templates/telemeta_default/geo_countries.html:5
+#: templates/telemeta_default/geo_country_collections.html:5
+#: templates/telemeta_default/geo_country_items.html:5
+#: templates/telemeta_default/index.html:9
+msgid "Geographic Navigator"
+msgstr "Navigateur géographique"
+
+#: templates/telemeta_default/geo_continents.html:21
 msgid "Map"
 msgstr "Carte"
 
-#: templates/telemeta_default/geo_continents.html:20
+#: templates/telemeta_default/geo_continents.html:22
 msgid "List"
 msgstr "Liste"
 
-#: templates/telemeta_default/geo_continents.html:24
-#: templates/telemeta_default/index.html:9
-msgid "Geographic Navigator"
-msgstr "Navigateur géographique"
-
-#: templates/telemeta_default/geo_countries.html:6
-#: templates/telemeta_default/geo_country_collections.html:6
-#: templates/telemeta_default/geo_country_items.html:6
+#: templates/telemeta_default/geo_countries.html:8
+#: templates/telemeta_default/geo_country_collections.html:8
+#: templates/telemeta_default/geo_country_items.html:8
 msgid "World"
 msgstr "Monde"
 
@@ -547,57 +560,74 @@ msgstr "Accéder au navigateur géographique"
 msgid "Musical selection"
 msgstr "Sélection musicale"
 
-#: templates/telemeta_default/mediaitem_detail.html:135
+#: templates/telemeta_default/mediaitem_detail.html:5
+#: templates/telemeta_default/mediaitem_detail_dc.html:5
+msgid "Item"
+msgstr "Item"
+
+#: templates/telemeta_default/mediaitem_detail.html:137
 msgid "Recording date"
 msgstr "Date d'enregistrement"
 
-#: templates/telemeta_default/mediaitem_detail.html:147
+#: templates/telemeta_default/mediaitem_detail.html:149
 #: templates/telemeta_default/inc/mediaitem_list.html:18
 msgid "Location"
 msgstr "Lieu"
 
-#: templates/telemeta_default/mediaitem_detail.html:162
+#: templates/telemeta_default/mediaitem_detail.html:164
 msgid "Musical informations"
 msgstr "Informations sur la musique"
 
-#: templates/telemeta_default/mediaitem_detail.html:198
+#: templates/telemeta_default/mediaitem_detail.html:200
 msgid "General informations"
 msgstr "Informations générales"
 
-#: templates/telemeta_default/mediaitem_detail_dc.html:17
+#: templates/telemeta_default/mediaitem_detail_dc.html:19
 msgid "No such item"
 msgstr "Item introuvable"
 
-#: templates/telemeta_default/search_criteria.html:87
+#: templates/telemeta_default/mediaitem_list.html:5
+#: templates/telemeta_default/mediaitem_list.html:8
+msgid "Media Items"
+msgstr "Items"
+
+#: templates/telemeta_default/search_criteria.html:5
+#: templates/telemeta_default/search_criteria.html:55
+msgid "Advanced Search"
+msgstr "Recherche avancée"
+
+#: templates/telemeta_default/search_criteria.html:79
+#: templates/telemeta_default/search_results.html:28
 #: templates/telemeta_default/inc/collection_list.html:14
 #: templates/telemeta_default/inc/mediaitem_list.html:14
 msgid "Title"
 msgstr "Titre"
 
-#: templates/telemeta_default/search_criteria.html:93
-#: templates/telemeta_default/search_results.html:29
+#: templates/telemeta_default/search_criteria.html:95
+#: templates/telemeta_default/search_results.html:31
 #: templates/telemeta_default/inc/collection_list.html:18
 #: templates/telemeta_default/inc/mediaitem_list.html:22
 msgid "Year of recording"
 msgstr "Année d'enregistrement"
 
-#: templates/telemeta_default/search_criteria.html:100
-#: templates/telemeta_default/search_criteria.html:119
-#: templates/telemeta_default/search_results.html:31
-#: templates/telemeta_default/search_results.html:38
+#: templates/telemeta_default/search_criteria.html:102
+#: templates/telemeta_default/search_criteria.html:121
+#: templates/telemeta_default/search_results.html:33
+#: templates/telemeta_default/search_results.html:40
 msgid "to"
 msgstr "à"
 
-#: templates/telemeta_default/search_criteria.html:112
-#: templates/telemeta_default/search_results.html:36
+#: templates/telemeta_default/search_criteria.html:114
+#: templates/telemeta_default/search_results.html:38
 msgid "Year of issue"
 msgstr "Année de parution"
 
-#: templates/telemeta_default/search_results.html:6
-msgid "Search results"
+#: templates/telemeta_default/search_results.html:5
+#: templates/telemeta_default/search_results.html:8
+msgid "Search Results"
 msgstr "Résultats de recherche"
 
-#: templates/telemeta_default/search_results.html:11
+#: templates/telemeta_default/search_results.html:13
 msgid "Search pattern"
 msgstr "Recherche"
 
@@ -632,14 +662,14 @@ msgstr "Pays/Continent"
 msgid "No item"
 msgstr "Aucun item"
 
-#: templatetags/telemeta_utils.py:203
+#: templatetags/telemeta_utils.py:204
 #, python-format
 msgid "%(count)d item"
 msgid_plural "%(count)d items"
 msgstr[0] "%(count)d item"
 msgstr[1] "%(count)d items"
 
-#: templatetags/telemeta_utils.py:206
+#: templatetags/telemeta_utils.py:207
 #, python-format
 msgid "%(count)d collection"
 msgid_plural "%(count)d collections"

diff --git a/telemeta/templates/telemeta_default/base.html b/telemeta/templates/telemeta_default/base.html
index e844dec2cbb140a026e0da75105d0cf80c1aa5a9..36ea19518e74ee5b135a24687cbfb2bd35a8148d 100644 (file)
--- a/telemeta/templates/telemeta_default/base.html
+++ b/telemeta/templates/telemeta_default/base.html
@@ -1,7 +1,9 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
 <head>
-<title>Telemeta</title>
+{% load i18n %}
+{% load telemeta_utils %}
+<title>{%block head_title %}{% organization %} - Telemeta{% endblock %}</title>
 {% block stylesheets %}
 <link rel="stylesheet" type="text/css" href="{% url telemeta-css "telemeta.css" %}" />
 <!--[if IE]>
@@ -15,8 +17,6 @@
 <script src="{% url telemeta-js "application.js" %}" type="text/javascript"></script>
 {% block extra_javascript %}{% endblock %}
 </head>
-{% load i18n %}
-{% load telemeta_utils %}
 <body>
 <div id="layout">
 <div id="header">

diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html
index eeb8efcc2cf01cb8204b917109b1dcabe6b3706c..35b9bd4b40f3c2c37f4a1f14f44f3accd131c028 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail.html
+++ b/telemeta/templates/telemeta_default/collection_detail.html
@@ -2,6 +2,8 @@
 {% load telemeta_utils %}\r
 {% load i18n %}\r
 \r
+{% block head_title %}{% trans "Collection" %}{{collection|prepend:': '}} - {{ block.super }}{% endblock %}\r
+\r
 {% block extra_javascript %}\r
 <script src="{% url telemeta-js "swfobject.js" %}" type="text/javascript"></script>\r
 {% endblock %}\r

diff --git a/telemeta/templates/telemeta_default/collection_detail_dc.html b/telemeta/templates/telemeta_default/collection_detail_dc.html
index 7cd73461a60edbd7ed30c28f694acbf88a839fd7..f102c36e3ffecdb47e77373804e4f2e0951bccd6 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail_dc.html
+++ b/telemeta/templates/telemeta_default/collection_detail_dc.html
@@ -2,6 +2,8 @@
 {% load telemeta_utils %}
 {% load i18n %}
 
+{% block head_title %}{% trans "Collection" %}{{collection|prepend:': '}} - {{ block.super }}{% endblock %}
+
 {% if collection %}
 {% block submenu %}
     <h3>Collection: {{ collection }}</h3>

diff --git a/telemeta/templates/telemeta_default/collection_list.html b/telemeta/templates/telemeta_default/collection_list.html
index b37aae1a710c0eb7b872de453f0be79ac691cc05..c7ca853ef85d356e9fc8bd4024cf59eb1ed845cf 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_list.html
+++ b/telemeta/templates/telemeta_default/collection_list.html
@@ -1,8 +1,10 @@
 {% extends "telemeta/base.html" %}
 {% load telemeta_utils %}
 
+{% block head_title %}{% trans "Media Collections" %} - {{ block.super }}{% endblock %}
+
 {% block content %}
-<h3>Collections</h3>
+<h3>{% trans "Media Collections" %}</h3>
 
 {% with object_list as collections %}
 <div class="fullpage">

diff --git a/telemeta/templates/telemeta_default/geo_continents.html b/telemeta/templates/telemeta_default/geo_continents.html
index bbb14663c56b3c84dff47aa3b13befd20b8e062e..39ece45e481ae4c8fcb001faf9c797a1595eef2f 100644 (file)
--- a/telemeta/templates/telemeta_default/geo_continents.html
+++ b/telemeta/templates/telemeta_default/geo_continents.html
@@ -2,6 +2,8 @@
 {% load telemeta_utils %}
 {% load i18n %}
 
+{% block head_title %}{% trans "Geographic Navigator" %} - {{ block.super }}{% endblock %}
+
 {% block extra_javascript %}
 {% if gmap_key %}
 <script src="http://www.google.com/jsapi?key={{ gmap_key }}" type="text/javascript"></script>

diff --git a/telemeta/templates/telemeta_default/geo_countries.html b/telemeta/templates/telemeta_default/geo_countries.html
index d244400ae40b1d422fd26a603a1bb9a76ecf39f4..a23e3e1553c54019038d922be7500cb3c60da68a 100644 (file)
--- a/telemeta/templates/telemeta_default/geo_countries.html
+++ b/telemeta/templates/telemeta_default/geo_countries.html
@@ -2,6 +2,8 @@
 {% load telemeta_utils %}
 {% load i18n %}
 
+{% block head_title %}{{ continent.location.name }} - {% trans "Geographic Navigator" %} - {{ block.super }}{% endblock %}
+
 {% block content %}
 <h3><a href="{% url telemeta-geo-continents %}">{% trans "World" %}</a> /
   {{ continent.location.name }}</h3>

diff --git a/telemeta/templates/telemeta_default/geo_country_collections.html b/telemeta/templates/telemeta_default/geo_country_collections.html
index 16d985c86b7a389bca4fc4f4ed197d760a664aa1..4d4f107eeba3ab129ee67bae7b7001899c45754c 100644 (file)
--- a/telemeta/templates/telemeta_default/geo_country_collections.html
+++ b/telemeta/templates/telemeta_default/geo_country_collections.html
@@ -2,6 +2,8 @@
 {% load telemeta_utils %}
 {% load i18n %}
 
+{% block head_title %}{{ country }} - {% trans "Geographic Navigator" %} - {{ block.super }}{% endblock %}
+
 {% block content %}
 <h3><a href="{% url telemeta-geo-continents %}">{% trans "World" %}</a> /
   <a href="{% url telemeta-geo-countries continent.flatname %}">{{ continent }}</a> 

diff --git a/telemeta/templates/telemeta_default/geo_country_items.html b/telemeta/templates/telemeta_default/geo_country_items.html
index 4f4f95a84b2fb53defe7638e21d31f27efd0f920..f8167b592cfb3e1b05355a3645ff14657bc82544 100644 (file)
--- a/telemeta/templates/telemeta_default/geo_country_items.html
+++ b/telemeta/templates/telemeta_default/geo_country_items.html
@@ -2,6 +2,8 @@
 {% load telemeta_utils %}
 {% load i18n %}
 
+{% block head_title %}{{ country }} - {% trans "Geographic Navigator" %} - {{ block.super }}{% endblock %}
+
 {% block content %}
 <h3><a href="{% url telemeta-geo-continents %}">{% trans "World" %}</a> /
   <a href="{% url telemeta-geo-countries continent.flatname %}">{{ continent }}</a> 

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index 0a884e165f913950f6a4e6e1bde2e254268073a3..1251eb2ffd16227ecbafd2fe2ba7aa5d5867500f 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -2,6 +2,8 @@
 {% load telemeta_utils %}\r
 {% load i18n %}\r
 \r
+{% block head_title %}{% trans "Item" %}{{item|prepend:': '}} - {{ block.super }}{% endblock %}\r
+\r
 {% block stylesheets %}\r
 {{ block.super }}\r
 <link rel="stylesheet" type="text/css" href="{% url telemeta-timeside "css/timeside.css" %}" />\r

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail_dc.html b/telemeta/templates/telemeta_default/mediaitem_detail_dc.html
index b7db63ffdad13a0cb87682acf1bda699bd14581c..b0c13a731db6e778bde05c1c1f9c35d76f194593 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail_dc.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail_dc.html
@@ -2,6 +2,8 @@
 {% load telemeta_utils %}\r
 {% load i18n %}\r
 \r
+{% block head_title %}{% trans "Item" %}{{item|prepend:': '}} - {{ block.super }}{% endblock %}\r
+\r
 {% if item %}\r
 {% block submenu %}\r
     <h3>Item: {{ item }}</h3>\r

diff --git a/telemeta/templates/telemeta_default/mediaitem_list.html b/telemeta/templates/telemeta_default/mediaitem_list.html
index 8a4a28fe07afeb69ad7a1af719f98a01fad7f23b..b20e8d8c94c7794c92bb62bcc2cf8fcd5b28ffe8 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_list.html
+++ b/telemeta/templates/telemeta_default/mediaitem_list.html
@@ -2,8 +2,10 @@
 {% load i18n %}
 {% load telemeta_utils %}
 
+{% block head_title %}{% trans "Media Items" %} - {{ block.super }}{% endblock %}
+
 {% block content %}
-<h3>Media items</h3>
+<h3>{% trans "Media Items" %}</h3>
 {% with object_list as items %}
 <div class="fullpage">
 {% include "telemeta/inc/mediaitem_list.html" %}

diff --git a/telemeta/templates/telemeta_default/search_criteria.html b/telemeta/templates/telemeta_default/search_criteria.html
index a9b3f00b1c671c1c05f646669ab626f6d57e353c..1e005df0f46bf544da40a034d5eab7ba6d5ee1ef 100644 (file)
--- a/telemeta/templates/telemeta_default/search_criteria.html
+++ b/telemeta/templates/telemeta_default/search_criteria.html
@@ -2,6 +2,8 @@
 {% load telemeta_utils %}
 {% load i18n %}
 
+{% block head_title %}{% trans "Advanced Search" %} - {{ block.super }}{% endblock %}
+
 {% block stylesheets %}
 {{ block.super }}
 <link rel="stylesheet" type="text/css" href="{% url telemeta-css "jquery.autocomplete.css" %}" />
@@ -50,7 +52,7 @@ $(document).ready(function () {
 {% endblock %}
 
 {% block content %}
-<h3>{% trans "Advanced search" %}</h3>
+<h3>{% trans "Advanced Search" %}</h3>
 
 <form action="{% url telemeta-search %}" id="searchform">
 <fieldset>

diff --git a/telemeta/templates/telemeta_default/search_results.html b/telemeta/templates/telemeta_default/search_results.html
index 9d5868b1411112068d399a662e403882e165d7af..08262c1f8bc67f8cd17aba41b8a97c4ae3401a92 100644 (file)
--- a/telemeta/templates/telemeta_default/search_results.html
+++ b/telemeta/templates/telemeta_default/search_results.html
@@ -2,8 +2,10 @@
 {% load telemeta_utils %}
 {% load i18n %}
 
+{% block head_title %}{% trans "Search Results" %} - {{ block.super }}{% endblock %}
+
 {% block content %}
-<h3>{% trans "Search results" %}</h3>
+<h3>{% trans "Search Results" %}</h3>
 
 {% if criteria %}
 <ul>

diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py
index 0c1c626a8517f0f6589ae15f0d957f588d5e8578..75876685ca2e525d12b6f629e9aa6a4db586b6be 100644 (file)
--- a/telemeta/templatetags/telemeta_utils.py
+++ b/telemeta/templatetags/telemeta_utils.py
@@ -13,6 +13,7 @@ from django.utils.encoding import smart_str, force_unicode
 from django.utils.safestring import mark_safe
 from django import db
 import re
+from django.conf import settings
 
 register = template.Library()
 
@@ -250,5 +251,7 @@ def render_flatpage(content):
     return mark_safe('<div class="rst-content">\n' + force_unicode(parts["html_body"]) + '</div>')
 render_flatpage.is_safe = True
 
-
+@register.simple_tag
+def organization():
+    return settings.TELEMETA_ORGANIZATION