# HG changeset patch
# User cavaliet
# Date 1405434119 -7200
# Node ID a30f2b5a2267d42bbe84f13d870f542e00f6f4aa
# Parent  67ca35da33cfeff008042015ba598b6f8469b297
v0.5.24 : update player for theatre

diff -r 67ca35da33cf -r a30f2b5a2267 src/spel/__init__.py
--- a/src/spel/__init__.py	Tue Jul 15 11:28:21 2014 +0200
+++ b/src/spel/__init__.py	Tue Jul 15 16:21:59 2014 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 5, 22, "final", 0)
+VERSION = (0, 5, 24, "final", 0)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
 
diff -r 67ca35da33cf -r a30f2b5a2267 src/spel/templates/partial/spel_annotations.html
--- a/src/spel/templates/partial/spel_annotations.html	Tue Jul 15 11:28:21 2014 +0200
+++ b/src/spel/templates/partial/spel_annotations.html	Tue Jul 15 16:21:59 2014 +0200
@@ -22,7 +22,7 @@
   {% for s in res.list %}
   {% with s.tags|get_tags:"type_inter" as tag_list %}
 <div class="searched-annot" data-type-inter="{{ tag_list|join:', ' }}" data-start="{{ s.start_ts }}" data-content="{{ s.iri_id }}">
-<p><a class="play-button" href="{% url 'spel_player' %}?g={{ s.iri_id }}&d=theatre&f=720p.mp4#id={{ s.element_id }}" target="_blank"><span class="glyphicon glyphicon-play"></span></a>
+<p><a class="play-button" href="{% url 'spel_player' %}?g={{ s.iri_id }}&d=theatre&f=720p.mp4&p={{ s.project_id }}#id={{ s.element_id }}" target="_blank"><span class="glyphicon glyphicon-play"></span></a>
   {{ res.content.title }} / {{ s.start_ts|str_duration }} - {{ s.start_ts|add:s.duration|str_duration }} / {{ s.cutting_id }}
 </p>
 <p class="small">{{ s.tags|get_tags:"modscen_and_perso"|join:', ' }}</p>
diff -r 67ca35da33cf -r a30f2b5a2267 src/spel/templates/partial/spel_chapters.html
--- a/src/spel/templates/partial/spel_chapters.html	Tue Jul 15 11:28:21 2014 +0200
+++ b/src/spel/templates/partial/spel_chapters.html	Tue Jul 15 16:21:59 2014 +0200
@@ -37,7 +37,7 @@
         <td>
           <span class="glyphicon glyphicon-info-sign popinfo" data-trigger="hover" data-container="body" data-toggle="popover" data-placement="auto" 
                   data-content="<strong>Timecodes:</strong> {{ s.start_ts|str_duration }} - {{ s.start_ts|add:s.duration|str_duration }}<br/>{{ s.tags|get_tags:'group'|safe }}"></span>
-          <a class="play-button" href="{% url 'spel_player' %}?g={{ s.iri_id }}&d=theatre&f=720p.mp4#id={{ s.element_id }}" target="_blank"><span class="glyphicon glyphicon-play"></span></a>
+          <a class="play-button" href="{% url 'spel_player' %}?g={{ s.iri_id }}&d=theatre&f=720p.mp4&p={{ s.project_id }}#id={{ s.element_id }}" target="_blank"><span class="glyphicon glyphicon-play"></span></a>
           <input type="checkbox" class="filter-chapter-annot" />
         </td>
     </tr>
diff -r 67ca35da33cf -r a30f2b5a2267 src/spel/templates/spel_player.html
--- a/src/spel/templates/spel_player.html	Tue Jul 15 11:28:21 2014 +0200
+++ b/src/spel/templates/spel_player.html	Tue Jul 15 16:21:59 2014 +0200
@@ -12,7 +12,7 @@
     <script type="text/javascript" src="{% static 'spel/lib/jquery.min.js' %}"></script>
     <script type="text/javascript" src="{% static 'spel/lib/jquery-ui.min.js' %}"></script>
     <script type="text/javascript" src="{% static 'spel/metadataplayer/LdtPlayer-core.js' %}"></script>
-    <script type="text/javascript" src="{% static 'spel/metadataplayer/spel-serializer.js' %}"></script>
+    <!--script type="text/javascript" src="{% static 'spel/metadataplayer/spel-serializer.js' %}"></script-->
     <script type="text/javascript">
     function getURLParameter(name) {
         return decodeURI(
@@ -24,13 +24,16 @@
         var g = getURLParameter("g");
         var d = getURLParameter("d");
         var f = getURLParameter("f");
+        var p = getURLParameter("p");// project id
         if(typeof g=="string"){
             
             IriSP.libFiles.defaultDir = "{% static 'spel/lib' %}";
             IriSP.widgetsDir = "{% static 'spel/metadataplayer' %}";
             var _metadata = {
-                url: "/data/" + d + "/" + g + "/cinelab" + ( (d!="opera") ? "_iri" : "" ) + ".json",
-                format: 'spel'
+                //url: "/data/" + d + "/" + g + "/cinelab" + ( (d!="opera") ? "_iri" : "" ) + ".json",
+                url: "{% url 'projectjson_id' id='' %}" + p,
+                //format: 'spel'
+                format: 'ldt'
             };
             var _config = {
                 width : 550,
@@ -51,15 +54,15 @@
                     { type: "Slider" },
                     { type: "Controller" },
                     {
-                        type: "Segments",
-                        annotation_type: ["performance","discussion"]
+                        type: "MultiSegments",
+                        //annotation_type: ["performance","discussion"]
                     },
                     {
                         type: "Annotation",
                         show_social: false,
                         show_annotation_type: true,
-                        annotation_type: ["performance","discussion"]
-                    },
+                        //annotation_type: ["performance","discussion"]
+                    },/*
                     {
                         type: "Polemic",
                         annotation_type: "interpretation",
@@ -152,7 +155,7 @@
                         annotation_type: "interpretation",
                         show_social: false,
                         arrow_position: 0
-                    },
+                    },*/
                     {
                         type: "SpelSyncHtml",
                         container: "AnnotationsListContainer",
diff -r 67ca35da33cf -r a30f2b5a2267 web/static/media/thumbnails/groups/group_default_icon.png
Binary file web/static/media/thumbnails/groups/group_default_icon.png has changed
diff -r 67ca35da33cf -r a30f2b5a2267 web/static/media/thumbnails/projects/project_default_icon.png
Binary file web/static/media/thumbnails/projects/project_default_icon.png has changed
diff -r 67ca35da33cf -r a30f2b5a2267 web/static/media/thumbnails/users/user_default_icon.png
Binary file web/static/media/thumbnails/users/user_default_icon.png has changed