Changeset b497a41 for telemeta/templates/telemeta_default/mediaitem_detail.html

Timestamp:

12/13/11 15:36:12 (18 months ago)

Author:

yomguy <yomguy@…>

Branches:

video

Parents:

f8953be (diff), 91bae44 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

yomguy <yomguy@…> (12/13/11 15:36:12)

git-committer:

yomguy <yomguy@…> (12/13/11 15:36:12)

Message:

Merge branch 'master' into video

File:

• telemeta/templates/telemeta_default/mediaitem_detail.html (modified) (4 diffs)

telemeta/templates/telemeta_default/mediaitem_detail.html

@@ -41 +41 @@
         soundManager.useHTML5Audio = true;
         soundManager.preferFlash = true;
-        
+
         //initializing the visualizers to be passed to the player
         var visualizers = {};
@@ -82 +82 @@
 
 {% block title %}
-<img src="{% url telemeta-images "item.png" %}" alt="item" style="vertical-align:middle" /> 
+<img src="{% url telemeta-images "item.png" %}" alt="item" style="vertical-align:middle" />
 Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a>
 {% endblock %}
@@ -188 +188 @@
                 {% dl_field item "cultural_area" %}
                 {% dl_field item "language" %}
+                {% if item.language_iso %}
+                <dt>{% trans "Language ISO" %}</dt>
+                <dd>{{ item.language_iso.name|to_utf8 }}</dd>
+                {% endif %}
                 {% dl_field item "ethnic_group" placeholder %}
                 <dt>{% trans "Ethnographic context" %}</dt>
@@ -292 +296 @@
 {% block delete %}
 {% if user.is_authenticated and perms.telemeta.delete_mediaitem %}
- <a href="#" onclick="if(confirm(gettrans('delete the item permanently?'))){window.location.href='{% url telemeta-item-delete item.public_id %}';};return false;"  
+ <a href="#" onclick="if(confirm(gettrans('delete the item permanently?'))){window.location.href='{% url telemeta-item-delete item.public_id %}';};return false;"
         class="component_icon button icon_delete" style="float:right;margin-top:0.5em;margin-bottom:1em">{% trans "Delete" %}</a>
 {% endif %}