From: yomguy <yomguy@parisson.com>
Date: Wed, 18 Jul 2012 20:42:41 +0000 (+0200)
Subject: add status to all pages
X-Git-Tag: 0.7-dev^2~82
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4f5b377d4bb8e6c8f33977ac07d1daf825446943;p=teleforma.git

add status to all pages
---

diff --git a/teleforma/templates/teleforma/course_conference_record.html b/teleforma/templates/teleforma/course_conference_record.html
index a43c7a26..3637b898 100644
--- a/teleforma/templates/teleforma/course_conference_record.html
+++ b/teleforma/templates/teleforma/course_conference_record.html
@@ -64,16 +64,22 @@ jQuery(window).ready(function(){
 
 {% block chat %}
 <div id="module-set" style="width: 22%">
+
 <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>
-</div>
-
 <script type="text/javascript">
 server_status_callback();
 </script>
 
+{% if room %}
+{% with "Local tweeter" as title %}
+{% include "teleforma/inc/chat_room.html" %}
+{% endwith %}
+{% endif %}
+
+</div>
 {% endblock chat %}
 
 
diff --git a/teleforma/templates/teleforma/course_detail.html b/teleforma/templates/teleforma/course_detail.html
index 81db7595..7a91c7dd 100644
--- a/teleforma/templates/teleforma/course_detail.html
+++ b/teleforma/templates/teleforma/course_detail.html
@@ -51,11 +51,21 @@ $(document).ready(function(){
 {% endblock course %}
 
 {% block chat %}
-{% if room %}
 <div id="module-set" style="width: 22%">
+
+<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>
+<script type="text/javascript">
+server_status_callback();
+</script>
+
+{% if room %}
 {% with "Local tweeter" as title %}
 {% include "teleforma/inc/chat_room.html" %}
 {% endwith %}
-</div>
 {% endif %}
+
+</div>
 {% endblock chat %}
diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html
index 14fbe83d..99290e69 100644
--- a/teleforma/templates/teleforma/courses.html
+++ b/teleforma/templates/teleforma/courses.html
@@ -99,13 +99,25 @@ $(document).ready(function(){
 
 
 {% block chat %}
-{% if room %}
 <div id="module-set" style="width: 22%">
+
+<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>
+</div>
+
+<script type="text/javascript">
+server_status_callback();
+</script>
+
+{% if room %}
 {% with "General tweeter" as title %}
 {% include "teleforma/inc/chat_room.html" %}
 {% endwith %}
-</div>
 {% endif %}
+
+</div>
 {% endblock chat %}
 
 {% endblock content %}
diff --git a/teleforma/views.py b/teleforma/views.py
index c34239dd..0df3ee74 100755
--- a/teleforma/views.py
+++ b/teleforma/views.py
@@ -371,6 +371,9 @@ class ConferenceRecordView(FormView):
         status.update()
         context['host'] = status.ip
         context['hidden_fields'] = self.hidden_fields
+        content_type = ContentType.objects.get(app_label="teleforma", model="conference")
+        context['room'] = get_room(name=conference.course.title, content_type=content_type,
+                                   id=conference.id)
         return context
 
     def get_success_url(self):
@@ -411,7 +414,7 @@ class ConferenceRecordView(FormView):
         f = open(path, 'w')
         f.write(img.read())
         f.close()
-        command = 'sleep 10; /usr/bin/dwepb ' + path + ' -o ' + dir + os.sep + 'preview.png &'
+        command = '/usr/bin/dwepb ' + path + ' -o ' + dir + os.sep + 'preview.png &'
         os.system(command)
 
     @method_decorator(login_required)