From: Guillaume Pellerin <yomguy@parisson.com>
Date: Thu, 11 Jul 2013 22:43:40 +0000 (+0200)
Subject: add room to record page
X-Git-Tag: 1.1~566
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=8a6f787dd92135ea0093f9d076525d6de65aba95;p=teleforma.git

add room to record page
---

diff --git a/teleforma/templates/teleforma/course_conference_record.html b/teleforma/templates/teleforma/course_conference_record.html
index c8fa3de6..999b3daf 100644
--- a/teleforma/templates/teleforma/course_conference_record.html
+++ b/teleforma/templates/teleforma/course_conference_record.html
@@ -3,6 +3,7 @@
 {% load teleforma_tags %}
 {% load i18n %}
 
+
 {% block extra_javascript %}
 <script type="text/javascript">
 
@@ -12,6 +13,13 @@ jQuery(window).ready(function(){
     a.unbind('click').click(function(){f.submit();return false;});
     });
 </script>
+
+<script type="text/javascript">
+$(document).ready(function(){
+    InitChatWindow("{% url jqchat_ajax room.id %}", null);
+    });
+</script>
+
 {% endblock extra_javascript %}
 
 
@@ -71,6 +79,13 @@ jQuery(window).ready(function(){
 {% endblock course %}
 
 
+{% block chat %}
+{% if room %}
+{% with "General tweeter" as title %}
+{% include "teleforma/inc/chat_room.html" %}
+{% endwith %}
+{% endif %}
+{% endblock chat %}
 
 {% block status %}
 {% endblock status %}
diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 1d3ac685..8f25d69b 100644
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -121,7 +121,7 @@ def stream_from_file(__file):
 
 
 def get_room(content_type=None, id=None, name=None):
-    if settings.TELEFORMA_GLOBAL_TWEETER or 'site' in name:
+    if settings.TELEFORMA_GLOBAL_TWEETER or 'site' in name or 'monitor' in name:
         rooms = jqchat.models.Room.objects.filter(name=name)
 
     else:
@@ -129,7 +129,6 @@ def get_room(content_type=None, id=None, name=None):
                                                   content_type=content_type,
                                                   object_id=id)
     if not rooms:
-        print name
         room = jqchat.models.Room.objects.create(content_type=content_type,
                                                  object_id=id,
                                                  name=name[:20])