Changeset eb69f78

Timestamp:

06/22/11 16:20:33 (2 years ago)

Author:

riccardo <riccardo@…>

Branches:

master, crem, crem2, dev, dev2, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video

Children:

a36128d

Parents:

8a47ef5

git-author:

riccardo <riccardo@…> (06/22/11 16:20:33)

git-committer:

riccardo <riccardo@…> (06/22/11 16:20:33)

Message:

done player link

Location:

telemeta

Files:

• htdocs/timeside/js/rulermarker.js (modified) (1 diff)
• templates/telemeta_default/mediaitem_detail.html (modified) (1 diff)
• templates/telemeta_default/mediaitem_player.html (modified) (2 diffs)

telemeta/htdocs/timeside/js/rulermarker.js

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

telemeta/templates/telemeta_default/mediaitem_detail.html

@@ -262 +262 @@
 {% if user.is_authenticated and perms.telemeta.delete_mediaitem %}
 <div style="float: right;">
- <a href="{% url telemeta-item-delete item.public_id %}" class="component_icon button icon_delete">{% trans "Delete" %}</a>
+ <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>
 </div>
 {% endif %}

telemeta/templates/telemeta_default/mediaitem_player.html

@@ -3 +3 @@
 {% load i18n %}
 
-{% block header %}{% endblock %}
+
+{% block stylesheets %}
+{{ block.super }}
+    <style type="text/css">
+        #rightcol {
+            width: {{width}}px;
+        }
+        .ts-skin-lab .ts-player .ts-wave {
+            height: {{height}}px;
+        }
+    </style>
+{% endblock %}
+
 {% block title %}{% endblock %}
 {% block title_buttons %}{% endblock %}
@@ -27 +39 @@
 </div>
 
-width : {{ width }}, height : {{ height }}
-
 {% endblock content%}
 {% endblock layout %}