first working link with telecaster :), fix various conference start & stop seq, adapt...

diff --git a/example/settings.py b/example/settings.py
index 2dcb4509309f9bf226396f55e077e199199ca151..65fdb03451e7ba6035f490244d809ba457dd86f8 100644 (file)
--- a/example/settings.py
+++ b/example/settings.py
@@ -158,7 +158,7 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.core.context_processors.static',
 )
 
-TELEMETA_ORGANIZATION = 'Pré-Barreau - CRFPA'
+TELEMETA_ORGANIZATION = 'Pre-Barreau - CRFPA'
 TELEMETA_SUBJECTS = ('test', 'telemeta', 'sandbox')
 TELEMETA_DESCRIPTION = "Telemeta TEST sandbox"
 TELEMETA_GMAP_KEY = 'ABQIAAAArg7eSfnfTkBRma8glnGrlxRVbMrhnNNvToCbZQtWdaMbZTA_3RRGObu5PDoiBImgalVnnLU2yN4RMA'

diff --git a/teleforma/models.py b/teleforma/models.py
index 4e190665db7bcbf619416ce984d3a1bf7c926680..5a41e6b6a2f6fbfc6ccfb5986ae8095ef4a58ac3 100755 (executable)
--- a/teleforma/models.py
+++ b/teleforma/models.py
@@ -214,6 +214,13 @@ class Conference(Model):
                            self.professor.user.last_name,
                            str(self.date_begin)])
 
+    @property
+    def slug(self):
+        slug = '-'.join([self.course.department.slug,
+                         self.course.slug,
+                         self.course_type.name.lower()])
+        return slug
+
     def __unicode__(self):
         return self.description
 

diff --git a/teleforma/static/teleforma/css/teleforma.css b/teleforma/static/teleforma/css/teleforma.css
index 96f894e2c51ff2cf89a7653f5b4c0a3c5b63afbe..25731ff3b3adb0b955fff2c29992d9c2fc2299d9 100644 (file)
--- a/teleforma/static/teleforma/css/teleforma.css
+++ b/teleforma/static/teleforma/css/teleforma.css
@@ -1647,3 +1647,16 @@ input,textarea{
 .default {
     color: green;
     }
+
+.conference_form {
+    font-size: 1em;
+    }
+
+.conference_form select {
+    font-size: 1.2em;
+    height: 2em;
+    }
+
+.conference_form textarea {
+    font-size: 1.2em;
+    }

diff --git a/teleforma/templates/teleforma/course_conference.html b/teleforma/templates/teleforma/course_conference.html
index 89914038b589796da9633144472fc9a80ba1aaa6..08c8b071b85482dd392da47bdf6b6d99f28d9b68 100644 (file)
--- a/teleforma/templates/teleforma/course_conference.html
+++ b/teleforma/templates/teleforma/course_conference.html
@@ -1,10 +1,14 @@
 {% extends "teleforma/course_media.html" %}
 {% load telemeta_utils %}
+{% load teleforma_tags %}
 {% load i18n %}
 
 {% block module-action %}
 {% if "telecaster"|installed %}
 <script src="{{ STATIC_URL }}teleforma/js/application.js" type="text/javascript"></script>
+{% if 'telecaster'|installed %}
+<script src="{{ STATIC_URL }}telecaster/js/application.js" type="text/javascript"></script>
+{% endif %}
 <script type="text/javascript">
 
 var conferenceUtils = {
@@ -58,9 +62,10 @@ jQuery(window).ready(function(){
 <dt>{% trans "Title" %}</dt><dd>{{ conference.course.title }}</dd>
 <dt>{% trans "Session" %}</dt><dd>{{ conference.session }}</dd>
 <dt>{% trans "Professor" %}</dt><dd><a href="{% url telemeta-profile-detail conference.professor.user.username %}" target="_blank">{{ conference.professor }}</a></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 }}</dd>
-<dt>{% trans "Live" %}</dt><dd>{{ conference.streaming }}</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 %}
@@ -69,11 +74,27 @@ jQuery(window).ready(function(){
 {% endblock course %}
 
 {% block chat %}
-{% if room %}
 <div id="module-set" style="width: 22%">
+
+{% if 'telecaster'|installed %}
+<div class="module">
+ <h3><img src="{{STATIC_URL}}teleforma/images/status.png" alt="status" style="vertical-align:middle" /> {% trans "Status" %}</h3>
+ <div id="server_status_table_wrapper" class="status"></div>
+</div>
+{% endif %}
+
+{% if room %}
 {% with "Local tweeter" as title %}
 {% include "teleforma/inc/chat_room.html" %}
 {% endwith %}
+{% endif %}
+
 </div>
+
+{% if 'telecaster'|installed %}
+<script type="text/javascript">
+server_status_callback();
+</script>
 {% endif %}
+
 {% endblock chat %}

diff --git a/teleforma/templates/teleforma/course_conference_record.html b/teleforma/templates/teleforma/course_conference_record.html
index 7c3107f93f176d8fa305d5b39cc2f2385c2cf71d..a43c7a26d19620ca5117cde83f12a45b161f341e 100644 (file)
--- a/teleforma/templates/teleforma/course_conference_record.html
+++ b/teleforma/templates/teleforma/course_conference_record.html
@@ -38,7 +38,7 @@ jQuery(window).ready(function(){
 
 <div class="course_content" id="media_infos">
 <form enctype="multipart/form-data" id="_StationForm" method="post" action="" name="formulaire">{% csrf_token %}
-<table class="form">
+<table class="conference_form">
     <tr><td colspan="2">{% for error in form.non_field_errors %}<li class="error">{{ error }}</li>{% endfor %}</td></tr>
     {% for field in form %}
     <tr>

diff --git a/teleforma/views.py b/teleforma/views.py
index 43717151ba0cd1f79eca635dffc277243e4cf612..4b85fa3f8e631e5edc6d1a9fa7632b0654341538 100755 (executable)
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -1,6 +1,7 @@
 # Create your views here.
 
 import mimetypes
+import datetime
 
 from jsonrpc import jsonrpc_method
 
@@ -333,13 +334,13 @@ class ConferenceView(DetailView):
     @jsonrpc_method('teleforma.conference_stop')
     def stop(request, id):
         conference = Conference.objects.get(id=id)
+        conference.date_end = datetime.datetime.now()
+        conference.save()
         for stream in conference.livestream.all():
-            stream.streaming = False
-            stream.save()
-        for station in conference.livestream.all():
-            station.started = False
-            station.save()
-        conference.delete()
+            stream.delete()
+        for station in conference.station.all():
+            station.stop()
+            station.delete()
 
     @method_decorator(login_required)
     def dispatch(self, *args, **kwargs):
@@ -367,8 +368,11 @@ class ConferenceRecordView(FormView):
     def form_valid(self, form):
         form.save()
         self.conference = form.instance
+        self.conference.date_begin = datetime.datetime.now()
+        self.conference.save()
         station = Station(conference=self.conference)
-#        station.start()
+        station.setup(settings.TELECASTER_CONF)
+        station.start()
         station.save()
         server, c= StreamingServer.objects.get_or_create(host='localhost')
         stream = LiveStream(conference=self.conference, server=server,