# HG changeset patch
# User cavaliet
# Date 1404834611 -7200
# Node ID 231c0319666ca38d70cdadb5e8de4ce64d8293a0
# Parent  b8298e7938a0a4e26ea2b60eeae081d5480144fc
v0.5.22 : correct video call in template

diff -r b8298e7938a0 -r 231c0319666c src/spel/__init__.py
--- a/src/spel/__init__.py	Tue Jul 08 17:03:34 2014 +0200
+++ b/src/spel/__init__.py	Tue Jul 08 17:50:11 2014 +0200
@@ -1,4 +1,4 @@
-VERSION = (0, 5, 21, "final", 0)
+VERSION = (0, 5, 22, "final", 0)
 
 VERSION_STR = unicode(".".join(map(lambda i:"%02d" % (i,), VERSION[:2])))
 
diff -r b8298e7938a0 -r 231c0319666c src/spel/management/commands/loadoperadata.py
--- a/src/spel/management/commands/loadoperadata.py	Tue Jul 08 17:03:34 2014 +0200
+++ b/src/spel/management/commands/loadoperadata.py	Tue Jul 08 17:50:11 2014 +0200
@@ -93,7 +93,7 @@
                         if json_data:
                             dur = int(json_data["medias"][0]["meta"]["duration"])
                             # Save media and content
-                            media, _ = Media.objects.get_or_create(src="/data/opera/"+ctt_id+"/original_web.mp4", duration=dur)
+                            media, _ = Media.objects.get_or_create(src="/data/opera/"+ctt_id+"/720p.mp4", duration=dur)
                             media.is_public = True
                             content = Content.objects.create(iri_id=ctt_id, 
                                                              iriurl=ctt_id+u"/"+ctt_id+u".iri", 
diff -r b8298e7938a0 -r 231c0319666c src/spel/management/commands/loadtheatredata.py
--- a/src/spel/management/commands/loadtheatredata.py	Tue Jul 08 17:03:34 2014 +0200
+++ b/src/spel/management/commands/loadtheatredata.py	Tue Jul 08 17:50:11 2014 +0200
@@ -90,7 +90,7 @@
                             ctt_id = os.path.basename(dirpath)
                             # Save media and content
                             dur = int(json_data["medias"][0]["meta"]["duration"])
-                            media, _ = Media.objects.get_or_create(src="/data/theatre/"+ctt_id+"/original_web.mp4", duration=dur)
+                            media, _ = Media.objects.get_or_create(src="/data/theatre/"+ctt_id+"/720p.mp4", duration=dur)
                             media.is_public = True
                             content = Content.objects.create(iri_id=ctt_id, 
                                                              iriurl=ctt_id+u"/"+ctt_id+u".iri", 
diff -r b8298e7938a0 -r 231c0319666c src/spel/migrations/0003_video_to_720p.py
--- a/src/spel/migrations/0003_video_to_720p.py	Tue Jul 08 17:03:34 2014 +0200
+++ b/src/spel/migrations/0003_video_to_720p.py	Tue Jul 08 17:50:11 2014 +0200
@@ -11,7 +11,6 @@
         "Write your forwards methods here."
         # Note: Remember to use orm['appname.ModelName'] rather than "from appname.models..."
         for media in orm['ldt_utils.media'].objects.all():
-            # replace ID_MEDIA/original.mp4 by /data/theatre/ID_MEDIA/original_web.mp4
             s = media.src
             media.src = s[:s.rfind("/")] + "/720p.mp4"
             media.save()
diff -r b8298e7938a0 -r 231c0319666c src/spel/templates/partial/spel_annotations.html
--- a/src/spel/templates/partial/spel_annotations.html	Tue Jul 08 17:03:34 2014 +0200
+++ b/src/spel/templates/partial/spel_annotations.html	Tue Jul 08 17:50:11 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=original_web.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#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 b8298e7938a0 -r 231c0319666c src/spel/templates/partial/spel_chapters.html
--- a/src/spel/templates/partial/spel_chapters.html	Tue Jul 08 17:03:34 2014 +0200
+++ b/src/spel/templates/partial/spel_chapters.html	Tue Jul 08 17:50:11 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=original_web.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#id={{ s.element_id }}" target="_blank"><span class="glyphicon glyphicon-play"></span></a>
           <input type="checkbox" class="filter-chapter-annot" />
         </td>
     </tr>