increase some field size, fix items order for lists, fix TextFields view with line...

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index e11917fbf2022c62cf93819c9ad1b65c17f5043f..7acaa838dd7e4001b1cdb393f390aa9e9653c003 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -1154,6 +1154,9 @@ a.image-link {
 #id_value_edit {
     width: 500px;
 }
+#id_file {
+    width: 500px;
+}
 
 /*focus on elements*/
 a:focus,div:focus{

diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index 3bdb7f26f1e14bbfea9f466b6152b2ff3f82e3dc..390e00e4fa7c365e7c642f7af2decf4d8eea6174 100644 (file)
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 eb765fc3405ecffea13f099928c60facaf1d0e78..2b57614740d22eec5eb115d70af1ea6d1e17f71a 100644 (file)
--- 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: 2011-05-29 21:26+0200\n"
+"POT-Creation-Date: 2011-05-30 11:05+0200\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"
@@ -338,7 +338,7 @@ msgid "item number"
 msgstr ""
 
 #: models/media.py:262
-msgid "published reference"
+msgid "published references"
 msgstr ""
 
 #: models/media.py:263
@@ -350,7 +350,7 @@ msgid "file"
 msgstr ""
 
 #: models/media.py:275 models/media.py:440
-#: templates/telemeta_default/mediaitem_detail.html:207
+#: templates/telemeta_default/mediaitem_detail.html:208
 msgid "keywords"
 msgstr ""
 
@@ -685,8 +685,8 @@ msgstr ""
 
 #: templates/telemeta_default/collection_detail.html:44
 #: templates/telemeta_default/mediaitem_detail.html:108
-#: templates/telemeta_default/mediaitem_detail.html:207
-#: templates/telemeta_default/mediaitem_detail.html:246
+#: templates/telemeta_default/mediaitem_detail.html:208
+#: templates/telemeta_default/mediaitem_detail.html:247
 #: templates/telemeta_default/profile_detail.html:63
 msgid "Edit"
 msgstr ""
@@ -725,27 +725,40 @@ msgstr ""
 msgid "Recordist"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:141
-#: templates/telemeta_default/mediaitem_detail.html:262
+#: templates/telemeta_default/collection_detail.html:129
+msgid "Bibliographic references"
+msgstr ""
+
+#: templates/telemeta_default/collection_detail.html:142
+#: templates/telemeta_default/mediaitem_detail.html:264
 msgid "Archiving data"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:162
-#: templates/telemeta_default/mediaitem_detail.html:277
-msgid "Technical data"
+#: templates/telemeta_default/collection_detail.html:148
+msgid "Related documentation"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:167
+#: templates/telemeta_default/collection_detail.html:152
+#: templates/telemeta_default/mediaitem_detail.html:200
+msgid "Comments"
+msgstr ""
+
+#: templates/telemeta_default/collection_detail.html:165
 #: templates/telemeta_default/mediaitem_detail.html:280
+msgid "Technical data"
+msgstr ""
+
+#: templates/telemeta_default/collection_detail.html:170
+#: templates/telemeta_default/mediaitem_detail.html:283
 msgid "Media type"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:167
-#: templates/telemeta_default/mediaitem_detail.html:280
+#: templates/telemeta_default/collection_detail.html:170
+#: templates/telemeta_default/mediaitem_detail.html:283
 msgid "Audio"
 msgstr ""
 
-#: templates/telemeta_default/collection_detail.html:172
+#: templates/telemeta_default/collection_detail.html:175
 #: templates/telemeta_default/geo_countries.html:16
 msgid "Number of items"
 msgstr ""
@@ -989,18 +1002,26 @@ msgstr ""
 msgid "Location"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:212
+#: templates/telemeta_default/mediaitem_detail.html:213
 msgid "Musical informations"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:246
+#: templates/telemeta_default/mediaitem_detail.html:247
 msgid "performance"
 msgstr ""
 
-#: templates/telemeta_default/mediaitem_detail.html:251
+#: templates/telemeta_default/mediaitem_detail.html:252
 msgid "General informations"
 msgstr ""
 
+#: templates/telemeta_default/mediaitem_detail.html:254
+msgid "Remarks"
+msgstr ""
+
+#: templates/telemeta_default/mediaitem_detail.html:270
+msgid "Published references"
+msgstr ""
+
 #: templates/telemeta_default/mediaitem_detail_dc.html:16
 msgid "No such item"
 msgstr ""
@@ -1118,7 +1139,7 @@ msgstr ""
 msgid "No item"
 msgstr ""
 
-#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1081
+#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1082
 msgid "Last changes"
 msgstr ""
 
@@ -1292,11 +1313,11 @@ msgid_plural "%(count)d collections"
 msgstr[0] ""
 msgstr[1] ""
 
-#: web/base.py:1092
+#: web/base.py:1093
 msgid "Access not allowed"
 msgstr ""
 
-#: web/base.py:1094
+#: web/base.py:1095
 msgid ""
 "Please login or contact the website administator to get admin or private "
 "access."

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index 1799e71d6d1616fcc7ac6fe870a2b6f200ebaef2..c9d9a428d7afc38e53c87b07dc142499c052b7b6 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 4494f606be79572ccff598620c71987cf45a3b64..bd19990bca88a78128a1a811fec0b77d15cc9424 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: 2011-05-29 21:26+0200\n"
+"POT-Creation-Date: 2011-05-30 11:05+0200\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"
@@ -338,8 +338,8 @@ msgid "item number"
 msgstr "n° de l'item"
 
 #: models/media.py:262
-msgid "published reference"
-msgstr "référence éditée"
+msgid "published references"
+msgstr "références éditées"
 
 #: models/media.py:263
 msgid "copy of"
@@ -350,7 +350,7 @@ msgid "file"
 msgstr "fichier"
 
 #: models/media.py:275 models/media.py:440
-#: templates/telemeta_default/mediaitem_detail.html:207
+#: templates/telemeta_default/mediaitem_detail.html:208
 msgid "keywords"
 msgstr "mots-clés"
 
@@ -693,8 +693,8 @@ msgstr "Collection"
 
 #: templates/telemeta_default/collection_detail.html:44
 #: templates/telemeta_default/mediaitem_detail.html:108
-#: templates/telemeta_default/mediaitem_detail.html:207
-#: templates/telemeta_default/mediaitem_detail.html:246
+#: templates/telemeta_default/mediaitem_detail.html:208
+#: templates/telemeta_default/mediaitem_detail.html:247
 #: templates/telemeta_default/profile_detail.html:63
 msgid "Edit"
 msgstr "Editer"
@@ -733,27 +733,40 @@ msgstr "Indications géographiques et culturelles"
 msgid "Recordist"
 msgstr "Collecteur"
 
-#: templates/telemeta_default/collection_detail.html:141
-#: templates/telemeta_default/mediaitem_detail.html:262
+#: templates/telemeta_default/collection_detail.html:129
+msgid "Bibliographic references"
+msgstr "Références bibliographiques"
+
+#: templates/telemeta_default/collection_detail.html:142
+#: templates/telemeta_default/mediaitem_detail.html:264
 msgid "Archiving data"
 msgstr "Données d'archivage"
 
-#: templates/telemeta_default/collection_detail.html:162
-#: templates/telemeta_default/mediaitem_detail.html:277
+#: templates/telemeta_default/collection_detail.html:148
+msgid "Related documentation"
+msgstr "Documentation associée"
+
+#: templates/telemeta_default/collection_detail.html:152
+#: templates/telemeta_default/mediaitem_detail.html:200
+msgid "Comments"
+msgstr "Commentaires"
+
+#: templates/telemeta_default/collection_detail.html:165
+#: templates/telemeta_default/mediaitem_detail.html:280
 msgid "Technical data"
 msgstr "Données techniques"
 
-#: templates/telemeta_default/collection_detail.html:167
-#: templates/telemeta_default/mediaitem_detail.html:280
+#: templates/telemeta_default/collection_detail.html:170
+#: templates/telemeta_default/mediaitem_detail.html:283
 msgid "Media type"
 msgstr "Type de media"
 
-#: templates/telemeta_default/collection_detail.html:167
-#: templates/telemeta_default/mediaitem_detail.html:280
+#: templates/telemeta_default/collection_detail.html:170
+#: templates/telemeta_default/mediaitem_detail.html:283
 msgid "Audio"
 msgstr "Audio"
 
-#: templates/telemeta_default/collection_detail.html:172
+#: templates/telemeta_default/collection_detail.html:175
 #: templates/telemeta_default/geo_countries.html:16
 msgid "Number of items"
 msgstr "Nombre d'items"
@@ -998,18 +1011,26 @@ msgstr "Date d'enregistrement"
 msgid "Location"
 msgstr "Lieu"
 
-#: templates/telemeta_default/mediaitem_detail.html:212
+#: templates/telemeta_default/mediaitem_detail.html:213
 msgid "Musical informations"
 msgstr "Informations sur la musique"
 
-#: templates/telemeta_default/mediaitem_detail.html:246
+#: templates/telemeta_default/mediaitem_detail.html:247
 msgid "performance"
 msgstr "composition"
 
-#: templates/telemeta_default/mediaitem_detail.html:251
+#: templates/telemeta_default/mediaitem_detail.html:252
 msgid "General informations"
 msgstr "Informations générales"
 
+#: templates/telemeta_default/mediaitem_detail.html:254
+msgid "Remarks"
+msgstr "Remarques"
+
+#: templates/telemeta_default/mediaitem_detail.html:270
+msgid "Published references"
+msgstr "Références éditées"
+
 #: templates/telemeta_default/mediaitem_detail_dc.html:16
 msgid "No such item"
 msgstr "Item introuvable"
@@ -1127,7 +1148,7 @@ msgstr "Etat/Continent"
 msgid "No item"
 msgstr "Aucun item"
 
-#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1081
+#: templates/telemeta_default/inc/module_revisions.html:7 web/base.py:1082
 msgid "Last changes"
 msgstr "Dernières modifications"
 
@@ -1307,11 +1328,11 @@ msgid_plural "%(count)d collections"
 msgstr[0] "%(count)d collection"
 msgstr[1] "%(count)d collections"
 
-#: web/base.py:1092
+#: web/base.py:1093
 msgid "Access not allowed"
 msgstr "Accès non autorisé"
 
-#: web/base.py:1094
+#: web/base.py:1095
 msgid ""
 "Please login or contact the website administator to get admin or private "
 "access."

diff --git a/telemeta/models/media.py b/telemeta/models/media.py
index 3a664bd38d23232a24350cf794ed58edc97610a4..2b7fe39ab6d0f59cd8ea985f70be8a547b863f7e 100644 (file)
--- a/telemeta/models/media.py
+++ b/telemeta/models/media.py
@@ -259,7 +259,7 @@ class MediaItem(MediaResource):
     old_code              = CharField(_('old code'), unique=False, null=True, blank=True)
     track                 = CharField(_('item number'))
     creator_reference     = CharField(_('reference'))
-    external_references   = TextField(_('published reference'))
+    external_references   = TextField(_('published references'))
     copied_from_item      = WeakForeignKey('self', related_name="copies", verbose_name=_('copy of'))
     public_access         = CharField(_('public access'), choices=PUBLIC_ACCESS_CHOICES, max_length=16, default="metadata")
     file                  = FileField(_('file'), upload_to='items/%Y/%m/%d', db_column="filename")

diff --git a/telemeta/templates/telemeta_default/collection_detail.html b/telemeta/templates/telemeta_default/collection_detail.html
index 29596af4aa33e115ed024d2d3e2f8b438e6fcfd6..652111de13cc25c931af7936ccad3ff17e498609 100644 (file)
--- a/telemeta/templates/telemeta_default/collection_detail.html
+++ b/telemeta/templates/telemeta_default/collection_detail.html
@@ -126,7 +126,8 @@
                         {% dl_field collection "publisher_collection" %}
                         {% dl_field collection "publisher_serial" %}
                         {% dl_field collection "booklet_author" %}
-                        {% dl_field collection "external_references" %}
+                        <dt>{% trans "Bibliographic references" %}</dt>
+                        <dd>{{ collection.external_references|html_line_break|safe }}</dd>
                         {% dl_field collection "doctype_code" %}
                         {% dl_field collection "public_access_label" %}
                         {% dl_field collection "legal_rights" %}
@@ -144,10 +145,12 @@
                         {% dl_field collection "acquisition_mode" %}
                         {% dl_field collection "cnrs_contributor" %}
                         {% dl_field collection "metadata_author" %}
-                        {% dl_field collection "booklet_description" %}
+                        <dt>{% trans "Related documentation" %}</dt>
+                        <dd>{{ collection.booklet_description|html_line_break|safe }}</dd>
                         {% dl_field collection "publishing_status" %}
                         {% dl_field collection "alt_ids" %}
-                        {% dl_field collection "comment" %}
+                        <dt>{% trans "Comments" %}</dt>
+                        <dd>{{ collection.comment|html_line_break|safe }}</dd>
                         {% dl_field collection "metadata_writer" %}
                         {% dl_field collection "travail" %}
                         {% dl_field collection "items_done" %}

diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index 85c1e0517d32853e081c606834629a22465b0cba..ef118bf9f6591c17591e3295c2c7badbf7c7ff83 100644 (file)
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -197,7 +197,8 @@
                 {% dl_field item "cultural_area" %}
                 {% dl_field item "language" %}
                 {% dl_field item "ethnic_group" placeholder %}
-                {% dl_field item "context_comment" %}
+                <dt>{% trans "Comments" %}</dt>
+                <dd>{{ item.context_comment|html_line_break|safe }}</dd>
                 {% dl_field item "keywords" join with ", " %}
             </dl>
         </div>
@@ -250,7 +251,8 @@
         <div>
             <h4><a href="#">{% trans "General informations" %}</a></h4>
             <dl class="listing">
-                {% dl_field item "comment" %}
+                <dt>{% trans "Remarks" %}</dt>
+                <dd>{{ item.comment|html_line_break|safe }}</dd>
                 {% dl_field item "collector_selection" %}
             </dl>
         </div>
@@ -265,7 +267,8 @@
                 {% dl_field item "old_code" %}
                 {% dl_field item "track" %}
                 {% dl_field item "creator_reference" %}
-                {% dl_field item "external_references" %}
+                <dt>{% trans "Published references" %}</dt>
+                <dd>{{ item.external_references|html_line_break|safe }}</dd>
                 {% dl_field item "public_access_label" %}
             </dl>
         </div>

diff --git a/telemeta/templatetags/telemeta_utils.py b/telemeta/templatetags/telemeta_utils.py
index 6e038bf563705d211edfc4fe92b649e2d6b3dd35..74a3e6b972d2e7c743f9c4135e198f4779b724ac 100644 (file)
--- a/telemeta/templatetags/telemeta_utils.py
+++ b/telemeta/templatetags/telemeta_utils.py
@@ -299,3 +299,7 @@ def current_year():
 @register.filter
 def sort_by_code(items):
     return items.order_by('code')
+
+@register.filter
+def html_line_break(text):
+    return text.replace('\n', '<br />')