modify list orders, add a loudspeaker icon for digitized resources

diff --git a/telemeta/locale/de/LC_MESSAGES/django.mo b/telemeta/locale/de/LC_MESSAGES/django.mo
index 74af69d37ddcdf7a7eab2898485a400a1ccf42c4..9e089eb42dd46e8f29f6059c6cf5e5ef86bddccc 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 4b23a63e71ebd55303738af9bb05138940d42e0b..ebcdf115f6ac9c92728e7d357b99a74929e61d89 100644 (file)
--- a/telemeta/locale/de/LC_MESSAGES/django.po
+++ b/telemeta/locale/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-13 11:15+0100\n"
+"POT-Creation-Date: 2014-11-13 11:34+0100\n"
 "PO-Revision-Date: 2012-12-22 21:24+0100\n"
 "Last-Translator: Patrik Tschudin <patsch@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -866,10 +866,10 @@ msgstr "Ablaufdatum"
 msgid "key"
 msgstr "Schlüssel"
 
-#: models/system.py:117 templates/telemeta/inc/children_list.html:16
+#: models/system.py:117 templates/telemeta/inc/children_list.html:17
 #: templates/telemeta/inc/collection_related.html:39
 #: templates/telemeta/inc/mediaitem_related.html:39
-#: templates/telemeta/inc/resource_list.html:9
+#: templates/telemeta/inc/resource_list.html:10
 #: templates/telemeta/inc/resource_related.html:39
 msgid "Description"
 msgstr "Beschreibung"
@@ -1605,7 +1605,7 @@ msgid_plural "%(counter)s items "
 msgstr[0] "1 Element"
 msgstr[1] "%(counter)s Elemente"
 
-#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:65
+#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:67
 msgid "Musical selection"
 msgstr "Musikauswahl"
 
@@ -1613,7 +1613,7 @@ msgstr "Musikauswahl"
 msgid "Open the geographic navigator"
 msgstr "GeoNavigation öffnen"
 
-#: templates/telemeta/home.html:39
+#: templates/telemeta/home.html:41
 msgid "Partners"
 msgstr "Partners"
 
@@ -1626,30 +1626,27 @@ msgstr ""
 "%(resource.children_type|capitalize)s %(first_on_page)s bis %(last_on_page)s "
 "von %(hits)s"
 
-#: templates/telemeta/inc/children_list.html:17
+#: templates/telemeta/inc/children_list.html:16
 #: templates/telemeta/inc/collection_list.html:9
 #: templates/telemeta/inc/mediaitem_list.html:9
-#: templates/telemeta/inc/resource_list.html:10
-#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40
-msgid "Code"
-msgstr "Code"
+#: templates/telemeta/inc/resource_list.html:9
+msgid "Digitized"
+msgstr ""
 
 #: templates/telemeta/inc/children_list.html:18
 #: templates/telemeta/inc/collection_list.html:13
 #: templates/telemeta/inc/mediaitem_list.html:17
 #: templates/telemeta/inc/resource_list.html:11
-#: templates/telemeta/lists.html:74
-#: templates/telemeta/search_criteria.html:143
-#: templates/telemeta/search_results.html:70
-msgid "Sound"
-msgstr "Ton"
+#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40
+msgid "Code"
+msgstr "Code"
 
 #: templates/telemeta/inc/children_list.html:39
-#: templates/telemeta/inc/resource_list.html:29
+#: templates/telemeta/inc/resource_list.html:31
 msgid "No resource"
 msgstr "keine Ressource"
 
-#: templates/telemeta/inc/collection_list.html:42
+#: templates/telemeta/inc/collection_list.html:43
 msgid "No collection"
 msgstr "keine Sammlung"
 
@@ -1684,7 +1681,7 @@ msgstr "Land / Kontinent"
 msgid "Year of recording"
 msgstr "Aufnahmejahr"
 
-#: templates/telemeta/inc/mediaitem_list.html:52
+#: templates/telemeta/inc/mediaitem_list.html:53
 msgid "No item"
 msgstr "kein Element"
 
@@ -1743,6 +1740,12 @@ msgstr "Diese Instrumentenliste ist leer"
 msgid "My playlists"
 msgstr "Meine Wiedergabeliste"
 
+#: templates/telemeta/lists.html:74
+#: templates/telemeta/search_criteria.html:143
+#: templates/telemeta/search_results.html:70
+msgid "Sound"
+msgstr "Ton"
+
 #: templates/telemeta/login.html:21
 msgid "User authentication"
 msgstr "Authentifizierung"

diff --git a/telemeta/locale/es/LC_MESSAGES/django.mo b/telemeta/locale/es/LC_MESSAGES/django.mo
index f5d241fb2047d14ecee7629ee86928a9bd3d4bdb..e868184974a0ae8b43be59b60a167ef196556345 100644 (file)
Binary files a/telemeta/locale/es/LC_MESSAGES/django.mo and b/telemeta/locale/es/LC_MESSAGES/django.mo differ

diff --git a/telemeta/locale/es/LC_MESSAGES/django.po b/telemeta/locale/es/LC_MESSAGES/django.po
index fdcd1a544b75d9e8aedcc68418b397dfefc2dd8d..e97b55ff302b1edf95bc0662c06add70d99edad6 100644 (file)
--- a/telemeta/locale/es/LC_MESSAGES/django.po
+++ b/telemeta/locale/es/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-13 11:15+0100\n"
+"POT-Creation-Date: 2014-11-13 11:34+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"
@@ -836,10 +836,10 @@ msgstr ""
 msgid "key"
 msgstr ""
 
-#: models/system.py:117 templates/telemeta/inc/children_list.html:16
+#: models/system.py:117 templates/telemeta/inc/children_list.html:17
 #: templates/telemeta/inc/collection_related.html:39
 #: templates/telemeta/inc/mediaitem_related.html:39
-#: templates/telemeta/inc/resource_list.html:9
+#: templates/telemeta/inc/resource_list.html:10
 #: templates/telemeta/inc/resource_related.html:39
 msgid "Description"
 msgstr ""
@@ -1554,7 +1554,7 @@ msgid_plural "%(counter)s items "
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:65
+#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:67
 msgid "Musical selection"
 msgstr ""
 
@@ -1562,7 +1562,7 @@ msgstr ""
 msgid "Open the geographic navigator"
 msgstr ""
 
-#: templates/telemeta/home.html:39
+#: templates/telemeta/home.html:41
 msgid "Partners"
 msgstr ""
 
@@ -1573,30 +1573,27 @@ msgid ""
 "on %(hits)s"
 msgstr ""
 
-#: templates/telemeta/inc/children_list.html:17
+#: templates/telemeta/inc/children_list.html:16
 #: templates/telemeta/inc/collection_list.html:9
 #: templates/telemeta/inc/mediaitem_list.html:9
-#: templates/telemeta/inc/resource_list.html:10
-#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40
-msgid "Code"
+#: templates/telemeta/inc/resource_list.html:9
+msgid "Digitized"
 msgstr ""
 
 #: templates/telemeta/inc/children_list.html:18
 #: templates/telemeta/inc/collection_list.html:13
 #: templates/telemeta/inc/mediaitem_list.html:17
 #: templates/telemeta/inc/resource_list.html:11
-#: templates/telemeta/lists.html:74
-#: templates/telemeta/search_criteria.html:143
-#: templates/telemeta/search_results.html:70
-msgid "Sound"
+#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40
+msgid "Code"
 msgstr ""
 
 #: templates/telemeta/inc/children_list.html:39
-#: templates/telemeta/inc/resource_list.html:29
+#: templates/telemeta/inc/resource_list.html:31
 msgid "No resource"
 msgstr ""
 
-#: templates/telemeta/inc/collection_list.html:42
+#: templates/telemeta/inc/collection_list.html:43
 msgid "No collection"
 msgstr ""
 
@@ -1631,7 +1628,7 @@ msgstr ""
 msgid "Year of recording"
 msgstr ""
 
-#: templates/telemeta/inc/mediaitem_list.html:52
+#: templates/telemeta/inc/mediaitem_list.html:53
 msgid "No item"
 msgstr ""
 
@@ -1690,6 +1687,12 @@ msgstr ""
 msgid "My playlists"
 msgstr ""
 
+#: templates/telemeta/lists.html:74
+#: templates/telemeta/search_criteria.html:143
+#: templates/telemeta/search_results.html:70
+msgid "Sound"
+msgstr ""
+
 #: templates/telemeta/login.html:21
 msgid "User authentication"
 msgstr ""

diff --git a/telemeta/locale/fr/LC_MESSAGES/django.mo b/telemeta/locale/fr/LC_MESSAGES/django.mo
index 40f5ef0833a6bf5e9cad10dd2a7f772c14a60566..bffbe31048ba62161b4ec84aebc808513844f9f0 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 1817d3439aed2827f927546daa3e24338f76eb36..e756f90713d73327b7258d8c9ddc44ca64db7527 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: 2014-11-13 11:15+0100\n"
+"POT-Creation-Date: 2014-11-13 11:34+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"
@@ -835,10 +835,10 @@ msgstr "Date d'expiration"
 msgid "key"
 msgstr "clé"
 
-#: models/system.py:117 templates/telemeta/inc/children_list.html:16
+#: models/system.py:117 templates/telemeta/inc/children_list.html:17
 #: templates/telemeta/inc/collection_related.html:39
 #: templates/telemeta/inc/mediaitem_related.html:39
-#: templates/telemeta/inc/resource_list.html:9
+#: templates/telemeta/inc/resource_list.html:10
 #: templates/telemeta/inc/resource_related.html:39
 msgid "Description"
 msgstr "Description"
@@ -1556,7 +1556,7 @@ msgid_plural "%(counter)s items "
 msgstr[0] "1 item"
 msgstr[1] "%(counter)s items "
 
-#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:65
+#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:67
 msgid "Musical selection"
 msgstr "Sélection musicale"
 
@@ -1564,7 +1564,7 @@ msgstr "Sélection musicale"
 msgid "Open the geographic navigator"
 msgstr "Accéder au navigateur géographique"
 
-#: templates/telemeta/home.html:39
+#: templates/telemeta/home.html:41
 msgid "Partners"
 msgstr "Partenaires"
 
@@ -1577,30 +1577,27 @@ msgstr ""
 "%(resource.children_type|capitalize)s %(first_on_page)s à %(last_on_page)s "
 "sur %(hits)s"
 
-#: templates/telemeta/inc/children_list.html:17
+#: templates/telemeta/inc/children_list.html:16
 #: templates/telemeta/inc/collection_list.html:9
 #: templates/telemeta/inc/mediaitem_list.html:9
-#: templates/telemeta/inc/resource_list.html:10
-#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40
-msgid "Code"
-msgstr "Cote"
+#: templates/telemeta/inc/resource_list.html:9
+msgid "Digitized"
+msgstr "Numérisé"
 
 #: templates/telemeta/inc/children_list.html:18
 #: templates/telemeta/inc/collection_list.html:13
 #: templates/telemeta/inc/mediaitem_list.html:17
 #: templates/telemeta/inc/resource_list.html:11
-#: templates/telemeta/lists.html:74
-#: templates/telemeta/search_criteria.html:143
-#: templates/telemeta/search_results.html:70
-msgid "Sound"
-msgstr "Sonore"
+#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40
+msgid "Code"
+msgstr "Cote"
 
 #: templates/telemeta/inc/children_list.html:39
-#: templates/telemeta/inc/resource_list.html:29
+#: templates/telemeta/inc/resource_list.html:31
 msgid "No resource"
 msgstr "Aucune ressource"
 
-#: templates/telemeta/inc/collection_list.html:42
+#: templates/telemeta/inc/collection_list.html:43
 msgid "No collection"
 msgstr "Aucune collection"
 
@@ -1635,7 +1632,7 @@ msgstr "Etat/Continent"
 msgid "Year of recording"
 msgstr "Année d'enregistrement"
 
-#: templates/telemeta/inc/mediaitem_list.html:52
+#: templates/telemeta/inc/mediaitem_list.html:53
 msgid "No item"
 msgstr "Aucun item"
 
@@ -1694,6 +1691,12 @@ msgstr "Cette énumération est vide"
 msgid "My playlists"
 msgstr "Mes listes de lecture"
 
+#: templates/telemeta/lists.html:74
+#: templates/telemeta/search_criteria.html:143
+#: templates/telemeta/search_results.html:70
+msgid "Sound"
+msgstr "Sonore"
+
 #: templates/telemeta/login.html:21
 msgid "User authentication"
 msgstr "Identification"

diff --git a/telemeta/locale/zh_CN/LC_MESSAGES/django.mo b/telemeta/locale/zh_CN/LC_MESSAGES/django.mo
index 0d8e6ea478e1f63ca2bb3e9c6b59b1ed79934d9e..6e14356464d8ffd7abf005130763a00cbc84eb6f 100644 (file)
Binary files a/telemeta/locale/zh_CN/LC_MESSAGES/django.mo and b/telemeta/locale/zh_CN/LC_MESSAGES/django.mo differ

diff --git a/telemeta/locale/zh_CN/LC_MESSAGES/django.po b/telemeta/locale/zh_CN/LC_MESSAGES/django.po
index a97db344ed64d61c2e40c33e7a447d06cea77ed9..c2c103a5e7305315280ef7e942da83320904b934 100644 (file)
--- a/telemeta/locale/zh_CN/LC_MESSAGES/django.po
+++ b/telemeta/locale/zh_CN/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Telemeta 1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-11-13 11:15+0100\n"
+"POT-Creation-Date: 2014-11-13 11:34+0100\n"
 "PO-Revision-Date: 2014-09-02 16:18+2\n"
 "Last-Translator: Zaichao XIA <xiazaichao@gmail.com>\n"
 "Language-Team: zh_CN <LL@li.org>\n"
@@ -866,10 +866,10 @@ msgstr "过期日期"
 msgid "key"
 msgstr "键"
 
-#: models/system.py:117 templates/telemeta/inc/children_list.html:16
+#: models/system.py:117 templates/telemeta/inc/children_list.html:17
 #: templates/telemeta/inc/collection_related.html:39
 #: templates/telemeta/inc/mediaitem_related.html:39
-#: templates/telemeta/inc/resource_list.html:9
+#: templates/telemeta/inc/resource_list.html:10
 #: templates/telemeta/inc/resource_related.html:39
 msgid "Description"
 msgstr "描述"
@@ -1594,7 +1594,7 @@ msgid_plural "%(counter)s items "
 msgstr[0] ""
 msgstr[1] ""
 
-#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:65
+#: templates/telemeta/home.html:14 templates/telemeta/home.html.py:67
 msgid "Musical selection"
 msgstr "音乐选择"
 
@@ -1602,7 +1602,7 @@ msgstr "音乐选择"
 msgid "Open the geographic navigator"
 msgstr "打开地图导航"
 
-#: templates/telemeta/home.html:39
+#: templates/telemeta/home.html:41
 msgid "Partners"
 msgstr "合作伙伴"
 
@@ -1613,30 +1613,27 @@ msgid ""
 "on %(hits)s"
 msgstr ""
 
-#: templates/telemeta/inc/children_list.html:17
+#: templates/telemeta/inc/children_list.html:16
 #: templates/telemeta/inc/collection_list.html:9
 #: templates/telemeta/inc/mediaitem_list.html:9
-#: templates/telemeta/inc/resource_list.html:10
-#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40
-msgid "Code"
-msgstr "密码"
+#: templates/telemeta/inc/resource_list.html:9
+msgid "Digitized"
+msgstr ""
 
 #: templates/telemeta/inc/children_list.html:18
 #: templates/telemeta/inc/collection_list.html:13
 #: templates/telemeta/inc/mediaitem_list.html:17
 #: templates/telemeta/inc/resource_list.html:11
-#: templates/telemeta/lists.html:74
-#: templates/telemeta/search_criteria.html:143
-#: templates/telemeta/search_results.html:70
-msgid "Sound"
-msgstr "声音"
+#: templates/telemeta/lists.html:71 templates/telemeta/mediaitem_copy.html:40
+msgid "Code"
+msgstr "密码"
 
 #: templates/telemeta/inc/children_list.html:39
-#: templates/telemeta/inc/resource_list.html:29
+#: templates/telemeta/inc/resource_list.html:31
 msgid "No resource"
 msgstr "无资源"
 
-#: templates/telemeta/inc/collection_list.html:42
+#: templates/telemeta/inc/collection_list.html:43
 msgid "No collection"
 msgstr "无选集"
 
@@ -1671,7 +1668,7 @@ msgstr "国家/洲"
 msgid "Year of recording"
 msgstr "录音年份"
 
-#: templates/telemeta/inc/mediaitem_list.html:52
+#: templates/telemeta/inc/mediaitem_list.html:53
 msgid "No item"
 msgstr "无项目"
 
@@ -1730,6 +1727,12 @@ msgstr "该仪器列表为空"
 msgid "My playlists"
 msgstr "我的播放列表"
 
+#: templates/telemeta/lists.html:74
+#: templates/telemeta/search_criteria.html:143
+#: templates/telemeta/search_results.html:70
+msgid "Sound"
+msgstr "声音"
+
 #: templates/telemeta/login.html:21
 msgid "User authentication"
 msgstr "用户认证"

diff --git a/telemeta/templates/telemeta/collection_list.html b/telemeta/templates/telemeta/collection_list.html
index 6235f5ea2a88fd174cd7d2fd0b080ad123899d0d..72c3465c6ccb8719622c30fddbc805f19beb871a 100644 (file)
--- a/telemeta/templates/telemeta/collection_list.html
+++ b/telemeta/templates/telemeta/collection_list.html
@@ -28,7 +28,7 @@
     <li><a href="{% url "telemeta-collections" %}" class="">{% trans "All" %}</a></li>
     <li><a href="{% url "telemeta-collections-unpublished" %}">{% trans "Unpublished" %}</a></li>
     <li><a href="{% url "telemeta-collections-published" %}">{% trans "Published" %}</a></li>
-    <li><a href="{% url "telemeta-collections-sound" %}">{% trans "Sounds" %}</a></li>
+    <li><a href="{% url "telemeta-collections-sound" %}">{% trans "Digitized" %}</a></li>
   </ul>
 </div>
 

diff --git a/telemeta/templates/telemeta/home.html b/telemeta/templates/telemeta/home.html
index 47700d09359b08301a80415ec605f271cd433d0b..9c0684288d762ae5ef9f29267b471fefcb5086bd 100644 (file)
--- a/telemeta/templates/telemeta/home.html
+++ b/telemeta/templates/telemeta/home.html
@@ -29,9 +29,11 @@
     </div>
 </div>
 
+<!--
 {% with "Last changes" as title %}
 {% include "telemeta/inc/module_revisions.html" %}
 {% endwith %}
+-->
 
 {{ block.super }}
 <div id="module" class="module">

diff --git a/telemeta/templates/telemeta/inc/children_list.html b/telemeta/templates/telemeta/inc/children_list.html
index 17fe187efe51259208050e976dff198b7db2066c..b356f60d535552a467bebec32782bf9039eedbd7 100644 (file)
--- a/telemeta/templates/telemeta/inc/children_list.html
+++ b/telemeta/templates/telemeta/inc/children_list.html
@@ -13,9 +13,9 @@
 <table class="listing">
 <tr>
     <th class="highlight">{% trans "Title" %}</th>
+    <th width="5%">{% trans "Digitized" %}</th>
     <th>{% trans "Description" %}</th>
     <th>{% trans "Code" %}</th>
-    <th width="5%">{% trans "Sound" %}</th>
 </tr>
 {% for child in children %}
 {% if child.code %}
@@ -23,13 +23,13 @@
     <td class="highlight">
         <a href="{% url "telemeta-resource-detail" resource.children_type child.public_id %}">{{ child.title }}</a>
     </td>
-    <td>{{ child.descriptions }}</td>
-    <td>{{ child.code }}</td>
     <td>
       {% if child.has_mediafile %}
-       <img src="{{ STATIC_URL }}telemeta/images/ok.png" alt="yes" style="vertical-align:middle" />
+       <center><span class="glyphicon glyphicon-volume-up" style="font-size: 1.3em;"></span></center>
       {% endif %}
     </td>
+    <td>{{ child.descriptions }}</td>
+    <td>{{ child.code }}</td>
 </tr>
 {% endif %}
 {% endfor %}

diff --git a/telemeta/templates/telemeta/inc/collection_list.html b/telemeta/templates/telemeta/inc/collection_list.html
index d215e8185b52ae62931829ef833e840546b8844e..da275b01df565cfc1d97a4b70a20022874037ccc 100644 (file)
--- a/telemeta/templates/telemeta/inc/collection_list.html
+++ b/telemeta/templates/telemeta/inc/collection_list.html
@@ -6,11 +6,11 @@
 <table class="listing">
 <tr>
     <th class="highlight">{% trans "Title" %}</th>
-    <th>{% trans "Code" %}</th>
+    <th>{% trans "Digitized" %}</th>
     <th>{% field_label "MediaCollection" "creator" %}</th>
     <th>{% trans "Recordist" %}</th>
     <th>{% trans "Recording period" %}</th>
-    <th>{% trans "Sound" %}</th>
+    <th>{% trans "Code" %}</th>
 </tr>
 {% for collection in collections %}
 <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
@@ -18,8 +18,11 @@
         <a href="{% url "telemeta-collection-detail" collection.public_id %}">{{ collection.title }}</a>
     </td>
     <td>
-        {{ collection.code|default:collection.old_code }}
+      {% if collection.has_mediafile %}
+       <center><span class="glyphicon glyphicon-volume-up" style="font-size: 1.3em;"></span></center>
+      {% endif %}
     </td>
+
     <td>{{ collection.creator }}</td>
     <td>{{ collection.apparent_collector }}</td>
     <td>
@@ -31,9 +34,7 @@
     {% endif %}
     </td>
     <td>
-      {% if collection.has_mediafile %}
-       <img src="{{ STATIC_URL }}telemeta/images/ok.png" alt="yes" style="vertical-align:middle" />
-      {% endif %}
+        {{ collection.code|default:collection.old_code }}
     </td>
 </tr>
 {% endfor %}

diff --git a/telemeta/templates/telemeta/inc/mediaitem_list.html b/telemeta/templates/telemeta/inc/mediaitem_list.html
index bcd53d3c80f5127b7e0c23d300d95ce4fb9003bc..e958b4b05a65e97137d4128e7c750cc626eb9a42 100644 (file)
--- a/telemeta/templates/telemeta/inc/mediaitem_list.html
+++ b/telemeta/templates/telemeta/inc/mediaitem_list.html
@@ -6,7 +6,7 @@
 <table class="listing">
 <tr>
     <th class="highlight">{% trans "Title" %}</th>
-    <th>{% trans "Code" %}</th>
+    <th>{% trans "Digitized" %}</th>
     <th>{% trans "Recordist" %}</th>
     {% if location_name %}
     <th>{% trans "Location" %}</th>
@@ -14,16 +14,20 @@
     <th>{% trans "Country/Continent" %}</th>
     {% endif %}
     <th>{% trans "Year of recording" %}</th>
-    <th>{% trans "Sound" %}</th>
+    <th>{% trans "Code" %}</th>
 </tr>
 {% for item in items %}
 <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
     <td class="highlight">
         <a href="{% url "telemeta-item-detail" item.public_id %}">{{ item }}</a>
     </td>
-    <td>
-        {{ item.code|default:item.old_code }}
+    <td align="center">
+        {% if item.file %}
+         <a href="{% url "telemeta-item-detail" item.public_id %}">
+          <center><span class="glyphicon glyphicon-volume-up" style="font-size: 1.3em;"></span></center>
+        {% endif %}
     </td>
+
     <td>{{ item.collector }}</td>
     {% if location_name %}
     <td>{{ item.location.name }}</td>
@@ -38,11 +42,8 @@
         {% endif %}
     {% endif %}
     </td>
-    <td align="center">
-        {% if item.file %}
-         <a href="{% url "telemeta-item-detail" item.public_id %}">
-          <img src="{{ STATIC_URL }}telemeta/images/ok.png" alt="yes" style="vertical-align:middle" /></a>
-        {% endif %}
+    <td>
+        {{ item.code|default:item.old_code }}
     </td>
 </tr>
 {% endfor %}

diff --git a/telemeta/templates/telemeta/inc/resource_list.html b/telemeta/templates/telemeta/inc/resource_list.html
index 3dcec5a4c46ef520a1f1639633e3c5b02c0ee292..683b63ac85d94d65e5f3343f4bba41ccee82d3da 100644 (file)
--- a/telemeta/templates/telemeta/inc/resource_list.html
+++ b/telemeta/templates/telemeta/inc/resource_list.html
@@ -6,21 +6,23 @@
 <table class="listing">
 <tr>
     <th class="highlight" width="15%">{% trans "Title" %}</th>
+    <th width="5%">{% trans "Digitized" %}</th>
     <th>{% trans "Description" %}</th>
     <th width="15%">{% trans "Code" %}</th>
-    <th width="5%">{% trans "Sound" %}</th>
+
 </tr>
 {% for resource in object_list %}
 <tr {% if not forloop.counter0|divisibleby:"2" %}class="odd"{% endif %}>
     <td class="highlight">
         <a href="{% url "telemeta-resource-detail" type resource.public_id %}">{{ resource.title }}</a>
     </td>
-    <td>{{ resource.descriptions }}</td>
-    <td>{{ resource.code }}</td>
     <td>{% if resource.has_mediafile %}
-       <img src="{{ STATIC_URL }}telemeta/images/ok.png" alt="yes" style="vertical-align:middle" />
+       <center><span class="glyphicon glyphicon-volume-up" style="font-size: 1.3em;"></span></center>
       {% endif %}
     </td>
+    <td>{{ resource.descriptions }}</td>
+    <td>{{ resource.code }}</td>
+
 </tr>
 {% endfor %}
 </table>

diff --git a/telemeta/templates/telemeta/mediaitem_list.html b/telemeta/templates/telemeta/mediaitem_list.html
index 69016b7915544e9a6c356c64c61a5e9abc213b77..15c23435e2d09b84ecf4bf88afbed9169cfa5585 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_list.html
+++ b/telemeta/templates/telemeta/mediaitem_list.html
@@ -27,7 +27,7 @@
     <li><a href="{% url "telemeta-items" %}" class="">{% trans "All" %}</a></li>
     <li><a href="{% url "telemeta-items-unpublished" %}">{% trans "Unpublished" %}</a></li>
     <li><a href="{% url "telemeta-items-published" %}">{% trans "Published" %}</a></li>
-    <li><a href="{% url "telemeta-items-sound" %}">{% trans "Sounds" %}</a></li>
+    <li><a href="{% url "telemeta-items-sound" %}">{% trans "Digitized" %}</a></li>
   </ul>
 </div>