Ignore:
Timestamp:
13/12/2011 15:36:12 (3 years 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@…> (13/12/2011 15:36:12)
git-committer:
yomguy <yomguy@…> (13/12/2011 15:36:12)
Message:

Merge branch 'master' into video

File:
1 edited

Legend:

Unmodified
Added
Removed
  • telemeta/templates/telemeta_default/mediaitem_detail.html

    ra6ca5fa rb497a41  
    4141        soundManager.useHTML5Audio = true; 
    4242        soundManager.preferFlash = true; 
    43          
     43 
    4444        //initializing the visualizers to be passed to the player 
    4545        var visualizers = {}; 
     
    8282 
    8383{% block title %} 
    84 <img src="{% url telemeta-images "item.png" %}" alt="item" style="vertical-align:middle" />  
     84<img src="{% url telemeta-images "item.png" %}" alt="item" style="vertical-align:middle" /> 
    8585Item : <a href="{% url telemeta-item-detail item.public_id %}">{{ item }}</a> 
    8686{% endblock %} 
     
    188188                {% dl_field item "cultural_area" %} 
    189189                {% dl_field item "language" %} 
     190                {% if item.language_iso %} 
     191                <dt>{% trans "Language ISO" %}</dt> 
     192                <dd>{{ item.language_iso.name|to_utf8 }}</dd> 
     193                {% endif %} 
    190194                {% dl_field item "ethnic_group" placeholder %} 
    191195                <dt>{% trans "Ethnographic context" %}</dt> 
     
    292296{% block delete %} 
    293297{% if user.is_authenticated and perms.telemeta.delete_mediaitem %} 
    294  <a href="#" onclick="if(confirm(gettrans('delete the item permanently?'))){window.location.href='{% url telemeta-item-delete item.public_id %}';};return false;"   
     298 <a href="#" onclick="if(confirm(gettrans('delete the item permanently?'))){window.location.href='{% url telemeta-item-delete item.public_id %}';};return false;" 
    295299        class="component_icon button icon_delete" style="float:right;margin-top:0.5em;margin-bottom:1em">{% trans "Delete" %}</a> 
    296300{% endif %} 
Note: See TracChangeset for help on using the changeset viewer.