From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 23 Mar 2015 21:32:10 +0000 (+0100)
Subject: fix rightcol
X-Git-Tag: 1.6a^2~41
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5995e550747420732635e59030930d9bcc9a0e8b;p=telemeta.git

fix rightcol
---

diff --git a/telemeta/static/telemeta/css/telemeta.css b/telemeta/static/telemeta/css/telemeta.css
index 935c6d05..7af24b54 100644
--- a/telemeta/static/telemeta/css/telemeta.css
+++ b/telemeta/static/telemeta/css/telemeta.css
@@ -209,7 +209,7 @@ svg {
     border: 1px solid #adadad;
     padding: 2px;
     height: 26px;
-    margin: 5px 0 0;
+    margin: 5px 0 5px;
     font-size: 0.9em;
     color: #000;
     font-weight: bold;
@@ -219,7 +219,7 @@ svg {
     background-color: #fff;
     color: #000;
     border: 1px solid #adadad;
-    width: 356px;
+    width: 348px;
     padding: 2px;
     /* margin: 5px 0 0; */
     font-size: 1em;
diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index 225db7d9..7dab0e42 100644
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -163,7 +163,7 @@
 
     {% if "video" in mime_type %}
     <div>
-    <video id="my_video_1" class="video-js vjs-default-skin" width="362" height="240" controls preload="auto" data-setup="{}">
+    <video id="my_video_1" class="video-js vjs-default-skin" width="348" height="240" controls preload="auto" data-setup="{}">
         <!-- Hello Chrome and Firefox (and Opera?) -->
         <source src="{% url "telemeta-item-export" item.public_id mime_type|mime_to_ext %}" type="{{ mime_type }}" />
         </video>
diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index 22f62684..f2196bc9 100644
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
+
+# Copyright (C) 2010-2015 Parisson SARL
 # Copyright (C) 2007-2010 Samalyse SARL
-# Copyright (C) 2010-2012 Parisson SARL
 
 # This software is a computer program whose purpose is to backup, analyse,
 # transcode and stream any audio content with its metadata over a web frontend.
@@ -255,6 +256,7 @@ class ItemView(ItemBaseMixin):
         #FIXME: MP4 handling in TimeSide
         if 'mp4' in extension:
             mime_type = 'video/mp4'
+            print 'ok'
             video = item.file.path
             response = StreamingHttpResponse(stream_from_file(video), mimetype = mime_type)
             response['Content-Disposition'] = 'attachment'