add audio live view

diff --git a/teleforma/templates/teleforma/course_conference.html b/teleforma/templates/teleforma/course_conference.html
index ea4c4d881d25ed88e9c183eb22ac678b7b472ddd..565f141adb63a2b88e728c23d1a4e2de67bbd8e9 100644 (file)
--- a/teleforma/templates/teleforma/course_conference.html
+++ b/teleforma/templates/teleforma/course_conference.html
@@ -28,7 +28,12 @@
 {% block course %}
 <div class="course_media">
 
-<div class="course_title">{{ course.title }}{% if course.description %} - {{ course.description }}{% endif %} - {{ conference.session }} - {{ conference.professor }}
+<div class="course_title">
+    <div style="float: right; font-size: 0.9em;">
+        <a href="{% url teleforma-conference-audio conference.id %}" class="component_icon button icon_speaker">&nbsp;{% trans "Audio" %}</a>
+    </div>
+
+{{ course.title }}{% if course.description %} - {{ course.description }}{% endif %} - {{ conference.session }} - {{ conference.professor }}
 </div>
 
 <div class="media">
@@ -40,14 +45,6 @@
 <source src="{{ livestream.url|get_host:host }}" type="video/webm" />
 </video>
 </div>
-
-{% elif "mp3" == livestream.stream_type %}
-<div class="audio">
-<audio controls autoplay preload="auto">
-<!-- Hello Chrome and Firefox (and Opera?) -->
-<source src="{{ livestream.url|get_host:host }}" type="audio/mpeg" />
-</audio>
-</div>
 {% endif %}
 {% endfor %}
 </div>

diff --git a/teleforma/templates/teleforma/course_conference_audio.html b/teleforma/templates/teleforma/course_conference_audio.html
new file mode 100644 (file)
index 0000000..ea3248f
--- /dev/null
+++ b/teleforma/templates/teleforma/course_conference_audio.html
@@ -0,0 +1,75 @@
+{% extends "teleforma/course_media.html" %}
+{% load telemeta_utils %}
+{% load teleforma_tags %}
+{% load i18n %}
+
+{% block module-action %}
+<script type="text/javascript">
+    var conferenceUtils = {
+        stop : function(id){
+            json([id],'teleforma.conference_stop',function(){
+                location.href = '{% url teleforma-desk %}';});
+        }}
+
+    jQuery(window).ready(function(){
+        var a = jQuery('#action_red');
+        var f = conferenceUtils;
+        a.unbind('click').click(function(){
+            f.stop({{conference.id}});return false;});
+        });
+</script>
+
+<div class="module_action">
+<a href="#" class="component_icon button" id="action_red">{% trans "S T O P" %}</a>
+</div>
+
+{% endblock module-action %}
+
+{% block course %}
+<div class="course_media">
+
+<div class="course_title">
+    <div style="float: right; font-size: 0.9em;">
+        <a href="{% url teleforma-conference-detail conference.id %}" class="component_icon button icon_clap">&nbsp;{% trans "Video" %}</a>
+    </div>
+
+{{ course.title }}{% if course.description %} - {{ course.description }}{% endif %} - {{ conference.session }} - {{ conference.professor }}
+</div>
+
+<div class="media">
+{% for livestream in livestreams %}
+{% if "mp3" == livestream.stream_type %}
+<div class="audio">
+<audio controls autoplay preload="auto">
+<!-- Hello Chrome and Firefox (and Opera?) -->
+<source src="{{ livestream.url|get_host:host }}" type="audio/mpeg" />
+</audio>
+</div>
+{% endif %}
+{% endfor %}
+</div>
+
+{% block general_info %}
+<div class="course_content" id="media_infos">
+<dl class="listing">
+<dt>{% trans "Title" %}</dt><dd>{{ conference.course.title }}</dd>
+<dt>{% trans "Professor" %}</dt><dd><a href="{% url telemeta-profile-detail conference.professor.user.username %}" target="_blank">{{ conference.professor }}</a></dd>
+<dt>{% trans "Session" %}</dt><dd>{{ conference.session }}</dd>
+<dt>{% trans "Room" %}</dt><dd>{{ conference.room }}</dd>
+<dt>{% trans "Begin" %}</dt><dd>{{ conference.date_begin }}</dd>
+<dt>{% trans "End" %}</dt><dd>{{ conference.date_end|yes_no }}</dd>
+<dt>{% trans "Live" %}</dt><dd>{{ conference.streaming|yes_no }}</dd>
+</dl>
+</div>
+{% endblock general_info %}
+
+</div>
+{% endblock course %}
+
+{% block chat %}
+{% if room %}
+{% with "Local tweeter" as title %}
+{% include "teleforma/inc/chat_room.html" %}
+{% endwith %}
+{% endif %}
+{% endblock chat %}
\ No newline at end of file

diff --git a/teleforma/urls.py b/teleforma/urls.py
index 539dc99b873ddf0ab649a7709828e5ab2cd85832..285d92f04933d6b4706598426598a2937987537c 100644 (file)
--- a/teleforma/urls.py
+++ b/teleforma/urls.py
@@ -75,6 +75,8 @@ urlpatterns = patterns('',
 
     url(r'^desk/conferences/(?P<pk>.*)/$', ConferenceView.as_view(),
         name="teleforma-conference-detail"),
+    url(r'^desk/conferences/(?P<pk>.*)/audio/$', ConferenceView.as_view(template_name="teleforma/course_conference_audio.html"),
+        name="teleforma-conference-audio"),
     url(r'^desk/conference_record/$', ConferenceRecordView.as_view(),
         name="teleforma-conference-record"),