cleanup js

diff --git a/teleforma/templates/teleforma/course_conference.html b/teleforma/templates/teleforma/course_conference.html
index 0b21f64e7ad6276524826903abede2e9bfcba4e4..42d8912a3ff27a8fd69e2cd8e8dad4a1c4fc3337 100644 (file)
--- a/teleforma/templates/teleforma/course_conference.html
+++ b/teleforma/templates/teleforma/course_conference.html
@@ -4,32 +4,27 @@
 {% load i18n %}
 
 {% block module-action %}
-<script src="{{ STATIC_URL }}teleforma/js/application.js" type="text/javascript"></script>
 
-{% get_telecaster as telecaster %}
-{%  if telecaster %}
-<script src="{{ STATIC_URL }}telecaster/js/application.js" type="text/javascript"></script>
-<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 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>
 
-{% endif %}
 {% endblock module-action %}
 
 {% block course %}
@@ -86,6 +81,9 @@ jQuery(window).ready(function(){
  <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 %}
 {% endblock status %}
 
@@ -96,13 +94,4 @@ jQuery(window).ready(function(){
 {% endif %}
 
 </div>
-
-
-{% get_telecaster as telecaster %}
-{%  if telecaster %}
-<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 4a80d6a90c021d74efaa54f66dc1d38ed957e626..70496a01561fcf47f5ca6cce43ca1f15e892fb14 100644 (file)
--- a/teleforma/templates/teleforma/course_conference_record.html
+++ b/teleforma/templates/teleforma/course_conference_record.html
@@ -4,9 +4,6 @@
 {% 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">
 
 jQuery(window).ready(function(){
@@ -14,9 +11,7 @@ jQuery(window).ready(function(){
     var f = jQuery('#_StationForm');
     a.unbind('click').click(function(){f.submit();return false;});
     });
-
 </script>
-{% endif %}}
 {% endblock extra_javascript %}
 
 {% block module-action %}

diff --git a/teleforma/templates/teleforma/course_detail.html b/teleforma/templates/teleforma/course_detail.html
index 7d1eaaa97ad110643409a20af3e2dff2ff00f063..14ec3eb86b6d6c955a2aada93e09708899eabb82 100644 (file)
--- a/teleforma/templates/teleforma/course_detail.html
+++ b/teleforma/templates/teleforma/course_detail.html
@@ -2,20 +2,11 @@
 {% load i18n %}
 
 {% 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);
     });
 </script>
-
 {% endblock extra_javascript %}
 
 {% block courses %}
@@ -59,6 +50,7 @@ $(document).ready(function(){
 {% block chat %}
 <div id="module-set" style="width: 22%">
 
+{% block status %}
 {% get_telecaster as telecaster %}
 {%  if telecaster %}
 <div class="module">
@@ -69,7 +61,8 @@ $(document).ready(function(){
 server_status_callback();
 </script>
 {% endif %}
-}
+{% endblock status %}
+
 {% if room %}
 {% with "Local tweeter" as title %}
 {% include "teleforma/inc/chat_room.html" %}

diff --git a/teleforma/templates/teleforma/course_document.html b/teleforma/templates/teleforma/course_document.html
index c89cd2c59695b879adeabfa6ce1d0f16a6244b7e..60c2c599b56d9469575ec3131e971589101d965d 100644 (file)
--- a/teleforma/templates/teleforma/course_document.html
+++ b/teleforma/templates/teleforma/course_document.html
@@ -5,7 +5,6 @@
 
 {% block extra_javascript %}
 
-<script type="text/javascript" src="{{ STATIC_URL }}jqchat/jqchat.js"></script>
 <script type="text/javascript">
 $(document).ready(function(){
     InitChatWindow("{% url jqchat_ajax room.id %}", null);

diff --git a/teleforma/templates/teleforma/course_media.html b/teleforma/templates/teleforma/course_media.html
index 5dadd44b82ac512c0879806bf22c0a769ebb89e0..b42f9fa8279d961a979734250c32e67a972617d4 100644 (file)
--- a/teleforma/templates/teleforma/course_media.html
+++ b/teleforma/templates/teleforma/course_media.html
@@ -10,12 +10,6 @@
 <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(){
     InitChatWindow("{% url jqchat_ajax room.id %}", null);
@@ -84,6 +78,7 @@ $(document).ready(function(){
 {% block chat %}
 <div id="module-set" style="width: 22%">
 
+{% block status %}
 {% get_telecaster as telecaster %}
 {%  if telecaster %}
 <div class="module">
@@ -95,6 +90,7 @@ $(document).ready(function(){
 server_status_callback();
 </script>
 {% endif %}
+{% endblock status %}
 
 {% if room %}
 {% with "Local tweeter" as title %}

diff --git a/teleforma/templates/teleforma/courses.html b/teleforma/templates/teleforma/courses.html
index 12a640050f94b2e20fe9695a46fb2c3ae45566a4..6e2c3a14d9723cd0012df34edb7f32db979feffe 100644 (file)
--- a/teleforma/templates/teleforma/courses.html
+++ b/teleforma/templates/teleforma/courses.html
@@ -5,22 +5,14 @@
 
 
 {% 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);
     });
 </script>
-
 {% endblock extra_javascript %}
 
+
 {% block content %}
 
 <div id="module-set-left" style="width: 18%">
@@ -106,6 +98,7 @@ $(document).ready(function(){
 {% block chat %}
 <div id="module-set" style="width: 22%">
 
+{% block status %}
 {% get_telecaster as telecaster %}
 {%  if telecaster %}
 <div class="module">
@@ -117,7 +110,8 @@ $(document).ready(function(){
 server_status_callback();
 </script>
 {% endif %}
-}
+{% endblock status %}
+
 {% if room %}
 {% with "General tweeter" as title %}
 {% include "teleforma/inc/chat_room.html" %}

diff --git a/teleforma/templates/telemeta/base.html b/teleforma/templates/telemeta/base.html
index bdf93fec95ad0bf514a27d6522d70fc58cc4107c..1618a843556d6df2321c2a36cc7c93001c712ca4 100644 (file)
--- a/teleforma/templates/telemeta/base.html
+++ b/teleforma/templates/telemeta/base.html
@@ -41,12 +41,22 @@
 <script src="{% url telemeta-timeside "js/libs/jquery-1.6.min.js" %}" type="text/javascript"></script>
 <script src="{% url telemeta-js "locale.js" %}" type="text/javascript"></script>
 <script src="{% url telemeta-js "application.js" %}" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}teleforma/js/application.js" type="text/javascript"></script>
+<script src="{{ STATIC_URL }}jqchat/jqchat.js" type="text/javascript" ></script>
+
 {% if user.is_authenticated %}
 <script type='text/javascript'>var CURRENT_USER_NAME="{{ user.username }}";</script>
 {% else %}
 <script type='text/javascript'>var CURRENT_USER_NAME=undefined;</script>
 {% endif %}
 
+{% block js-status %}
+{% get_telecaster as telecaster %}
+{%  if telecaster %}
+<script src="{{ STATIC_URL }}telecaster/js/application.js" type="text/javascript"></script>
+{% endif %}
+{% endblock js-status %}
+
 {% endblock %}
 
 {% block extra_javascript %}{% endblock %}