From: riccardo <riccardo@parisson.com>
Date: Wed, 22 Jun 2011 14:20:33 +0000 (+0200)
Subject: done player link
X-Git-Tag: 1.1~86
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=eb69f786f74c28c9749051db45a105f3172b7125;p=telemeta.git

done player link
---

diff --git a/telemeta/htdocs/timeside/js/rulermarker.js b/telemeta/htdocs/timeside/js/rulermarker.js
index ae0cd88e..5409b194 100644
--- a/telemeta/htdocs/timeside/js/rulermarker.js
+++ b/telemeta/htdocs/timeside/js/rulermarker.js
@@ -237,7 +237,15 @@ Timeside.classes.RulerMarker = Timeside.classes.TimesideClass.extend({
     //
     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';
     },
diff --git a/telemeta/templates/telemeta_default/mediaitem_detail.html b/telemeta/templates/telemeta_default/mediaitem_detail.html
index 822f7e26..412f80a3 100644
--- a/telemeta/templates/telemeta_default/mediaitem_detail.html
+++ b/telemeta/templates/telemeta_default/mediaitem_detail.html
@@ -261,7 +261,7 @@
 </div> <!-- with-rightcol -->
 {% 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 %}
 {% endblock %}
diff --git a/telemeta/templates/telemeta_default/mediaitem_player.html b/telemeta/templates/telemeta_default/mediaitem_player.html
index 214dc4b1..8bcaecd6 100644
--- a/telemeta/templates/telemeta_default/mediaitem_player.html
+++ b/telemeta/templates/telemeta_default/mediaitem_player.html
@@ -2,7 +2,19 @@
 {% load telemeta_utils %}
 {% 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 %}
 
@@ -26,8 +38,6 @@
 {% endif %}
 </div>
 
-width : {{ width }}, height : {{ height }}
-
 {% endblock content%}
 {% endblock layout %}