From: yomguy <yomguy@parisson.com>
Date: Wed, 18 Jul 2012 22:23:20 +0000 (+0200)
Subject: fix no telecaster
X-Git-Tag: 0.7-dev^2~79
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2b633721537100d0cf28bdc0ccd0c4f6aae31b5d;p=teleforma.git

fix no telecaster
---

diff --git a/teleforma/templates/teleforma/course_conference.html b/teleforma/templates/teleforma/course_conference.html
index 02f5a3ea..ee134f52 100644
--- a/teleforma/templates/teleforma/course_conference.html
+++ b/teleforma/templates/teleforma/course_conference.html
@@ -95,7 +95,7 @@ jQuery(window).ready(function(){
 
 </div>
 
-<script src="{{ STATIC_URL }}teleforma/js/application.js" type="text/javascript"></script>
+
 {% get_telecaster as telecaster %}
 {%  if telecaster %}
 <script type="text/javascript">
diff --git a/teleforma/templates/teleforma/course_conference_record.html b/teleforma/templates/teleforma/course_conference_record.html
index 3637b898..4a80d6a9 100644
--- a/teleforma/templates/teleforma/course_conference_record.html
+++ b/teleforma/templates/teleforma/course_conference_record.html
@@ -4,6 +4,8 @@
 {% load i18n %}
 
 {% block extra_javascript %}
+{% get_telecaster as telecaster %}
+{%  if telecaster %}
 <script src="{{ STATIC_URL }}telecaster/js/application.js" type="text/javascript"></script>
 <script type="text/javascript">
 
@@ -14,6 +16,7 @@ jQuery(window).ready(function(){
     });
 
 </script>
+{% endif %}}
 {% endblock extra_javascript %}
 
 {% block module-action %}
@@ -65,6 +68,8 @@ jQuery(window).ready(function(){
 {% block chat %}
 <div id="module-set" style="width: 22%">
 
+{% get_telecaster as telecaster %}
+{%  if telecaster %}
 <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>
@@ -72,6 +77,7 @@ jQuery(window).ready(function(){
 <script type="text/javascript">
 server_status_callback();
 </script>
+{% endif %}
 
 {% if room %}
 {% with "Local tweeter" as title %}
diff --git a/teleforma/templates/teleforma/course_detail.html b/teleforma/templates/teleforma/course_detail.html
index 81f5b10b..7d1eaaa9 100644
--- a/teleforma/templates/teleforma/course_detail.html
+++ b/teleforma/templates/teleforma/course_detail.html
@@ -4,7 +4,12 @@
 {% block extra_javascript %}
 
 <script type="text/javascript" src="{{ STATIC_URL }}jqchat/jqchat.js"></script>
+
+{% get_telecaster as telecaster %}
+{%  if telecaster %}
 <script src="{{ STATIC_URL }}telecaster/js/application.js" type="text/javascript"></script>
+{% endif %}
+
 <script type="text/javascript">
 $(document).ready(function(){
     InitChatWindow("{% url jqchat_ajax room.id %}", null);
@@ -54,6 +59,8 @@ $(document).ready(function(){
 {% block chat %}
 <div id="module-set" style="width: 22%">
 
+{% get_telecaster as telecaster %}
+{%  if telecaster %}
 <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>
@@ -61,7 +68,8 @@ $(document).ready(function(){
 <script type="text/javascript">
 server_status_callback();
 </script>
-
+{% endif %}
+}
 {% if room %}
 {% with "Local tweeter" as title %}
 {% include "teleforma/inc/chat_room.html" %}
diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html
index d776a1c3..5dadd44b 100644
--- a/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@ -10,6 +10,11 @@
 <link href="{% url telemeta-video-js "video-js.css" %}" rel="stylesheet">
 {% endif %}
 
+{% get_telecaster as telecaster %}
+{%  if telecaster %}
+<script src="{{ STATIC_URL }}telecaster/js/application.js" type="text/javascript"></script>
+{% endif %}
+
 <script type="text/javascript" src="{{ STATIC_URL }}jqchat/jqchat.js"></script>
 <script type="text/javascript">
 $(document).ready(function(){
@@ -77,11 +82,25 @@ $(document).ready(function(){
 {% endblock course %}
 
 {% block chat %}
-{% if room %}
 <div id="module-set" style="width: 22%">
+
+{% get_telecaster as telecaster %}
+{%  if telecaster %}
+<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>
+{% endif %}
+
+{% 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 156d8ab8..12a64005 100644
--- a/teleforma/templates/teleforma/courses.html
+++ b/teleforma/templates/teleforma/courses.html
@@ -7,7 +7,12 @@
 {% block extra_javascript %}
 
 <script type="text/javascript" src="{{ STATIC_URL }}jqchat/jqchat.js"></script>
+
+{% get_telecaster as telecaster %}
+{%  if telecaster %}
 <script src="{{ STATIC_URL }}telecaster/js/application.js" type="text/javascript"></script>
+{% endif %}
+
 <script type="text/javascript">
 $(document).ready(function(){
     InitChatWindow("{% url jqchat_ajax room.id %}", null);
@@ -16,7 +21,6 @@ $(document).ready(function(){
 
 {% endblock extra_javascript %}
 
-
 {% block content %}
 
 <div id="module-set-left" style="width: 18%">
@@ -102,6 +106,8 @@ $(document).ready(function(){
 {% block chat %}
 <div id="module-set" style="width: 22%">
 
+{% get_telecaster as telecaster %}
+{%  if telecaster %}
 <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>
@@ -110,7 +116,8 @@ $(document).ready(function(){
 <script type="text/javascript">
 server_status_callback();
 </script>
-
+{% endif %}
+}
 {% if room %}
 {% with "General tweeter" as title %}
 {% include "teleforma/inc/chat_room.html" %}