Changeset eb69f78


Ignore:
Timestamp:
Jun 22, 2011 4:20:33 PM (3 years ago)
Author:
riccardo <riccardo@…>
Branches:
master, crem, crem2, dev, dev2, diadems, feature/breadcrumbs, feature/ts-0.5, feature/ts-0.5.4, feature/writecache, forma, generic, instru_search, lam, lam2, mapsv3, merge, nlivemulti, production, release/1.4.4, sabiod, security, server, social, storage, telecaster, test, video
Children:
a36128d
Parents:
8a47ef5
git-author:
riccardo <riccardo@…> (22/06/2011 16:20:33)
git-committer:
riccardo <riccardo@…> (22/06/2011 16:20:33)
Message:

done player link

Location:
telemeta
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • telemeta/htdocs/timeside/js/rulermarker.js

    r03f3d24 reb69f78  
    238238    createCanvasPath: function(x,w){ 
    239239        var halfW = w >>> 1; 
    240         var h = this.$J(window).height(); 
     240        //in order to calculate the line height, we could simply set the wave height. However, due to potential 
     241        //resizing afterwards, the line could not stretch till the bottom (if it overflows it's fine, as the wave div container has  
     242        //overflow = hidden). As we do not want to rebuild the canvas on resize, 
     243        //we assess an height which will 99% overflow the wave height in any case. 
     244        //We use the wave height and the window height, and take 2 times 
     245        //the maximum of those heights: 
     246        var wdwH = this.$J(window).height(); 
     247        var waveH = this.getWaveHeight(); 
     248        var h = 2* (wdwH > waveH ? wdwH : waveH); 
    241249        return 'M '+(x-halfW)+' 0 L '+(x)+' '+(halfW)+' L '+x+' '+h+ 
    242250        ' L '+ (x+1)+' '+h+' L '+(x+1)+ ' '+(halfW)+' L '+(x+halfW+1)+' 0 z'; 
  • telemeta/templates/telemeta_default/mediaitem_detail.html

    r8a47ef5 reb69f78  
    262262{% if user.is_authenticated and perms.telemeta.delete_mediaitem %} 
    263263<div style="float: right;"> 
    264  <a href="{% url telemeta-item-delete item.public_id %}" class="component_icon button icon_delete">{% trans "Delete" %}</a> 
     264 <a href="#" onclick="if(confirm(gettrans('delete the marker permanently?'))){window.location.href='{% url telemeta-item-delete item.public_id %}';};return false;" class="component_icon button icon_delete">{% trans "Delete" %}</a> 
    265265</div> 
    266266{% endif %} 
  • telemeta/templates/telemeta_default/mediaitem_player.html

    r490d025 reb69f78  
    33{% load i18n %} 
    44 
    5 {% block header %}{% endblock %} 
     5 
     6{% block stylesheets %} 
     7{{ block.super }} 
     8    <style type="text/css"> 
     9        #rightcol { 
     10            width: {{width}}px; 
     11        } 
     12        .ts-skin-lab .ts-player .ts-wave { 
     13            height: {{height}}px; 
     14        } 
     15    </style> 
     16{% endblock %} 
     17 
    618{% block title %}{% endblock %} 
    719{% block title_buttons %}{% endblock %} 
     
    2739</div> 
    2840 
    29 width : {{ width }}, height : {{ height }} 
    30  
    3141{% endblock content%} 
    3242{% endblock layout %} 
Note: See TracChangeset for help on using the changeset viewer.