Port monitor.html to bootstrap, fix minor issues in group.html, purgo old assets

website/frontend/templates/group.html

@@ -7,10 +7,7 @@
 
 {% block head %}
     <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/swfobject/2.2/swfobject.js"></script>
-    <script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-    {% if config.flumotion %}
     <script type="text/javascript" src="/static/third_party/jwplayer/jwplayer.js"></script>
-    {% endif %}
     <script type="text/javascript" src="/static/js/whats_on.js"></script>
     <script type="text/javascript" src="/static/js/streams.js"></script>
     <script type="text/javascript" src="/tracker/{{group|urlencode}}/stream.js"></script>
@@ -235,7 +232,7 @@
             height: '100%',
             frameborder: '0',
             allowfullscreen: 'allowfullscreen',
-            src: '//www.youtube-nocookie.com/embed/{{ config.youtube }}?rel=0&amp;showinfo=0&amp;autoplay=1'
+            src: '//www.youtube-nocookie.com/embed/{{ config.youtube|urlencode }}?rel=0&amp;showinfo=0&amp;autoplay=1'
         }));
 {% endif %}
   }

website/frontend/templates/monitor.html

@@ -1,48 +1,80 @@
-{% extends "base.html" %}
+{% extends "base-bs.html" %}
 {% comment %}
 -*- coding: utf-8 -*-
 vim: set ts=2 sw=2 et sts=2 ai:
 {% endcomment %}
 {% load safe_js %}
 
 {% block head %}
-    <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.5.2/jquery.min.js"></script>
     <script type="text/javascript" src="/static/third_party/jwplayer/jwplayer.js"></script>
 
     <script type="text/javascript" src="/static/js/streams.js"></script>
     <script type="text/javascript" src="/tracker/streams.js"></script>
     <script type="text/javascript" src="/static/js/bugreport.js"></script>
   {% for group in groups %}
-    <script type="text/javascript" src="/tracker/{{group}}/stream.js"></script>
+    <script type="text/javascript" src="/tracker/{{group|urlencode}}/stream.js"></script>
   {% endfor %}
 
+    <script type="text/javascript" src="/static/js/jquery.tweet.js"></script>
+    <link href="/static/css/jquery.tweet.css" media="all" rel="stylesheet" type="text/css"/>
+
+<script type="text/javascript">
+    jQuery(function(){
+        var switter_url = '{% url "switter_tweets" %}';
+        // Twitter search for Individual tweets from @PyconAV to inform about the website
+        $("#twitter").tweet({
+            twitter_api_proxy_url: switter_url,
+
+            count: 20,
+            fetch: 100,
+            avatar_size: 32,
+
+            result_type: 'recent',
+            retweets: false,
+            filter: function(t){
+                return !t.retweet && !/RT\s+@/.test(t.tweet_raw_text); 
+            },
+	    {% if default.twitter_geo %}
+            geocode: "{{ default.twitter_geo|escapejs }}",
+            {% endif %}
+            query: "{{ default.twitter|escapejs }}",
+            loading_text: "Searching twitter...",
+
+            refresh_interval: 60,
+	});
+      });
+    </script>
+
+
     <title>Stream Time for Linux.conf.au!</title>
 {% endblock %}
 
 {% block content %}
-    <td style="height: 220px;">
-      <div>
+<div class="row">
   {% for group in groups %}
-      <div style="float: left; height: 220px; width: auto;">
-        {{group}}
-        <div id="{{group}}"></div>
-      </div>
+    <div class="col-md-2">
+	    {{group}}<br/>
+      <div id="{{group}}" style="height: 300px"></div>
+    </div>
   {% endfor %}
-    </td>
-  </tr><tr>
-    <td style="height: 300px;">
-      <iframe src="/tracker/endpoint/stats"></iframe>
-    </td>
-  </tr><tr>
-      <td id="twitter-cell" style="height: auto;">
-        <div id="twitter-container" class="container_3">
-          <div id="twitter-sizer" class="sizer">
-            <div id="twitter-juitter">
-              <div id="juitterContainer"></div>
-            </div>
-          </div>
-        </div>
-      </td>
+</div>
+
+<div class="row">
+  <div class="col-md-12">
+    <iframe src="/tracker/endpoint/stats"></iframe>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-md-12">
+    <div id="twitter-container" class="container_3">
+      <div id="twitter-sizer" class="sizer">
+        <div id="twitter">Searching twitter...</div>
+      </div>
+    </div>
+  </div>
+</div>
+
 {% endblock %}
 
 {% block script %}
@@ -52,13 +84,15 @@
 }
 
 function start_it () {
-{% for group in groups %}
+{% for group, conf in groups.iteritems %}
+  {% if conf.flumotion %}
   if (x{{group|safe_js}}_player_jwobject) {
     var state = x{{group|safe_js}}_player_jwobject.getState();
     if (state == x{{group|safe_js}}_player_jwobject.IDLE) {
         jwplayer_{{group|safe_js}}();
     }
   }
+  {% endif %}
 {% endfor %}
 }
 setInterval(start_it, 1e3);
@@ -75,9 +109,10 @@
 {% endfor %}
 }
 
-{% for group in groups %}
+{% for group, conf in groups.iteritems %}
 function jwplayer_{{group|safe_js}}() {
   try {
+    {% if conf.flumotion %}
     var jwsettings = {
       autostart: true,
       mute: true,
@@ -90,6 +125,17 @@
       var player_sizer = $("#{{group}}");
       x{{group|safe_js}}_player_jwobject.resize(player_sizer.width(), player_sizer.height());
     });
+    {% elif conf.youtube %}
+    $('#{{group}}').append($('<iframe>')
+        .attr({
+		id: 'yt-live-{{group|escapejs}}',
+		width: '100%',
+		height: '100%',
+		frameborder: '0',
+		allowfullscreen: 'allowfullscreen',
+		src: '//www.youtube-nocookie.com/embed/{{ conf.youtube|urlencode }}?rel=0&amp;showinfo=0&amp;autoplay=1'
+        }));
+    {% endif %}
   } catch (e) {
     if (window.console) {
       window.console.log([e,' likely stream not registered.']);
@@ -103,5 +149,6 @@
   jwplayers();
 });
 
+
 </script>
 {% endblock %}