add global and modal item share infos, more ignore

diff --git a/.dockerignore b/.dockerignore
index b81e8e2ae366209f24e1d1e64ae03a0a1c8a9075..3d2ee082c887cfd0851a46954ab85cbd27c28399 100644 (file)
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,5 +1,11 @@
-media
-static
-var
-backup
-tmp
+.git
+*.pyc
+*.egg-info
+app/
+build/
+dist/
+media/
+static/
+var/
+backup/
+tmp/

diff --git a/.gitignore b/.gitignore
index 810dd10bf85c1e8ccf608068c1e6b41cde13f7c3..a3908b6d0cf5affe211535d3f9caabc45bc9a03a 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,9 @@ pip-log.txt
 
 #Mr Developer
 .mr.developer.cfg
+
+#app
+media
+static
+var
+

diff --git a/telemeta/templates/telemeta/inc/mediaitem_video.html b/telemeta/templates/telemeta/inc/mediaitem_video.html
new file mode 100644 (file)
index 0000000..afef649
--- /dev/null
+++ b/telemeta/templates/telemeta/inc/mediaitem_video.html
@@ -0,0 +1,37 @@
+{% load telemeta_utils %}
+{% load i18n %}
+
+<div class="video">
+<video width="{% if width %}{{ width }}{% else %}348{% endif %}" controls preload="none">
+    {% for transcoded in item.transcoded.all %}
+     {% if "video" in transcoded.mime_type %}
+      <source src="{{ MEDIA_URL }}{{ transcoded.file }}#t=0" type="{{ transcoded.mime_type }}" />
+     {% endif %}
+    {% endfor %}
+      <source src="{{ MEDIA_URL }}{{ item.file }}#t=0" type="{{ mime_type }}" />
+</video>
+</div>
+
+{% comment %}
+<div class="video">
+<video id="my_video_1" class="video-js vjs-default-skin" width="640" height="360" controls preload="none" {% if item.related.all %}{% for related in item.related.all %}{% if related.title == "preview" %}poster="{{ MEDIA_URL }}{{ related.file }}"{% endif %}{% endfor %}{% endif %} data-setup='{}'>
+  {% for transcoded in item.transcoded.all %}
+   {% if "video" in transcoded.mime_type %}
+    <source src="{{ MEDIA_URL }}{{ transcoded.file }}#t=0" type="{{ transcoded.mime_type }}" />
+   {% endif %}
+  {% endfor %}
+    <source src="{{ MEDIA_URL }}{{ item.file }}#t=0" type="{{ mime_type }}" />
+</video>
+</div>
+
+<div id="videotime"></div>
+<script>
+(function(){
+    var v = document.getElementsByTagName('video')[0]
+    var t = document.getElementById('videotime');
+    v.addEventListener('timeupdate',function(event){
+        t.innerHTML = v.currentTime;
+        },false);
+        })();
+</script>
+{% endcomment %}

diff --git a/telemeta/templates/telemeta/mediaitem_detail.html b/telemeta/templates/telemeta/mediaitem_detail.html
index eb252b7ce984ab538e7c2505166ef974ef9ed0d5..3ce287fc36c09f610bd56c8086a415c5ee1c6377 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_detail.html
+++ b/telemeta/templates/telemeta/mediaitem_detail.html
@@ -76,8 +76,8 @@
 </script>
 
 {% if "video" in mime_type %}
- <script src="{{ STATIC_URL }}video-js/video.js" ></script>
- <link href="{{ STATIC_URL }}video-js/video-js.css" rel="stylesheet">
+<script src="{{ STATIC_URL }}video-js/video.js" ></script>
+<link href="{{ STATIC_URL }}video-js/video-js.css" rel="stylesheet">
 {% endif %}
 
 {% endif %}
@@ -94,7 +94,7 @@
 {% endblock %}
 
 {% block title_buttons %}
-<div class="fixedWidthAsPlayer">
+<div>
     <a href="{% url "telemeta-item-detail" previous %}">
       <button type="button" class="btn btn-default">
         <span class="glyphicon glyphicon-chevron-left"></span>
@@ -119,6 +119,11 @@
       </button>
     </a>
     {% endif %}
+    <a id="_share" href='#'>
+      <button type="button" class="btn btn-default" data-toggle="modal" data-target="#share">
+        <span class="glyphicon glyphicon-share"></span> {% trans "Share" %}
+      </button>
+    </a>
     <a href="{% url "telemeta-item-detail" next %}">
       <button type="button" class="btn btn-default">
         <span class="glyphicon glyphicon-chevron-right"></span>
@@ -162,30 +167,7 @@
         </div>
 
     {% if "video" in mime_type %}
-    <div>
-    <video width="348" height="240" controls preload="none">
-        <source src="{% url "telemeta-item-export" item.public_id mime_type|mime_to_ext %}" type="{{ mime_type }}" />
-    </video>
-    </div>
-
-    <button type="button" class="btn btn-default">
-      <span class="glyphicon glyphicon-share"></span> {% trans "Share" %}
-    </button>
-
-{% comment %}
-    <div id="videotime"></div>
-    <script>
-    (function(){
-        var v = document.getElementsByTagName('video')[0]
-        var t = document.getElementById('videotime');
-        v.addEventListener('timeupdate',function(event){
-            t.innerHTML = v.currentTime;
-            },false);
-            })();
-    </script>
-{% endcomment %}
-
-
+     {% include "telemeta/inc/mediaitem_video.html" %}
     {% endif %}
 
         <!-- </div> -->
@@ -417,6 +399,33 @@
     </a>
 
 {% endif %}
+
+{% block modal %}
+<div id="share" class="modal fade" role="dialog">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal">&times;</button>
+        <h4 class="modal-title"><b>{% trans "Share" %}</b></h4>
+      </div>
+      <div class="modal-body">
+        <p><b>{% trans "Share the link"%}</b></p>
+         <input class="share" name="share_url" value="{{ site }}{% url "telemeta-item-detail" item.public_id %}" title="{% trans "Share the link"%}" onclick="this.focus();this.select()" size="68">
+        <br><br>
+        <p><b>{% trans "Share the audio player" %}</b></p>
+         <input class="share" name="share_audio_player" value="<iframe width='361' height='215' frameborder='0' scrolling='no' marginheight='0' marginwidth='0' src='{{ site }}{% url "telemeta-item-player" item.public_id 346 130 %}'></iframe>" title="{% trans "Share the audio player" %}" onclick="this.focus();this.select()" size="68">
+        <br><br>
+        <p><b>{% trans "Share the video player" %}</b></p>
+         <input class="share" name="share_video_player" value="<iframe width='640' height='480' frameborder='0' scrolling='no' marginheight='0' marginwidth='0' src='{{ site }}{% url "telemeta-item-video-player" item.public_id 640 480 %}'></iframe>" title="{% trans "Share the video player" %}" onclick="this.focus();this.select()" size="68">
+       </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endblock %}
+
 {% endblock %}
 
 {% else %}

diff --git a/telemeta/templates/telemeta/mediaitem_video_player.html b/telemeta/templates/telemeta/mediaitem_video_player.html
new file mode 100644 (file)
index 0000000..a54c9fa
--- /dev/null
+++ b/telemeta/templates/telemeta/mediaitem_video_player.html
@@ -0,0 +1,22 @@
+{% extends "telemeta/mediaitem_detail.html" %}
+{% load telemeta_utils %}
+{% load i18n %}
+
+{% block extra_javascript %}{% endblock %}
+{% block title %}{% endblock %}
+{% block title_buttons %}{% endblock %}
+
+{% block layout %}
+{% block content %}
+<div>
+{% if item.file %}
+    {% if access or user.is_staff %}
+     {% include "telemeta/inc/mediaitem_video.html" %}
+    {% endif %}
+{% endif %}
+</div>
+
+{% endblock content%}
+{% endblock layout %}
+
+{% block footer %}{% endblock %}

diff --git a/telemeta/urls.py b/telemeta/urls.py
index c5592252f1002292518be187551627c599cabc76..dbd1bf8e5814b53150b9818ccc3373467dd4582a 100644 (file)
--- a/telemeta/urls.py
+++ b/telemeta/urls.py
@@ -84,6 +84,7 @@ urlpatterns = patterns('',
     url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/copy/$', ItemCopyView.as_view(), name="telemeta-item-copy"),
     url(r'^archives/items_add/$', ItemAddView.as_view(), name="telemeta-item-add"),
     url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/player/(?P<width>[0-9]+)x(?P<height>[0-9]+)/$', ItemPlayerDefaultView.as_view(), name="telemeta-item-player"),
+    url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/video-player/(?P<width>[0-9]+)x(?P<height>[0-9]+)/$', ItemVideoPlayerView.as_view(), name="telemeta-item-video-player"),
     url(r'^archives/items/(?P<public_id>[A-Za-z0-9._-]+)/delete/$', item_view.item_delete, name="telemeta-item-delete"),
     url(r'^archives/items/(?P<item_public_id>[A-Za-z0-9._-]+)/related/(?P<media_id>[A-Za-z0-9._-]+)/view/$', item_view.related_media_item_stream, name="telemeta-item-related"),
     url(r'^archives/items/(?P<item_public_id>[A-Za-z0-9._-]+)/related/(?P<media_id>[A-Za-z0-9._-]+)/download/$', item_view.related_media_item_download, name="telemeta-item-related-download"),

diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index 42fd74cb8f65f6007b5884f48cd9256fc7ca0ed6..586d9bf1859c0b763ae088947997bff32a40049d 100644 (file)
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -274,7 +274,7 @@ class ItemView(ItemBaseMixin):
                 graph.render(output=path)
                 f.close()
                 self.cache_data.add_file(image_file)
-                
+
         response = StreamingHttpResponse(self.cache_data.read_stream_bin(image_file), content_type=mime_type)
         return response
 
@@ -746,6 +746,7 @@ class ItemDetailView(ItemViewMixin, DetailView):
         context['last_revision'] = last_revision
         context['format'] = item_format
         context['private_extra_types'] = private_extra_types.values()
+        context['site'] = 'http://' + Site.objects.all()[0].name
         return context
 
 
@@ -843,3 +844,8 @@ class ItemPlayerDefaultView(ItemDetailView):
 class ItemDetailDCView(ItemDetailView):
 
     template_name = 'telemeta/mediaitem_detail_dc.html'
+
+
+class ItemVideoPlayerView(ItemDetailView):
+
+    template_name = 'telemeta/mediaitem_video_player.html'