Merge lp:~mhall119/loco-team-portal/bzr-apps-upgrades into lp:loco-team-portal

[Michael Hall]

Use bzr_apps to get and manage the latest light-django-theme and twidenash

[lp:~mhall119/loco-team-portal/bzr-apps-upgrades]

425. By Michael Hall on 2011-03-18

bzr-apps version bump

426. By Michael Hall on 2011-03-18

Version bump for twidenash

427. By Michael Hall on 2011-03-18

Solves the case of the missing </script>

[Ronnie (ronnie.vd.c)]

Change the twidenash script to rev3 (which contains a twitter fix) then ill approve

[Chris Johnston (cjohnston)]

review: Approve

=== modified file 'loco_directory/media/css/twidenash.css'
--- loco_directory/media/css/twidenash.css	2010-09-28 17:21:02 +0000
+++ loco_directory/media/css/twidenash.css	2011-03-18 22:26:31 +0000
@@ -7,30 +7,30 @@
  */
 
 
-ul.twidenash li {
+.twidenash li {
     list-style-type:  none;
     clear:            both;
     padding:          3px;
-    font-size:        100%;
+    font-size:        0.75em;
 }
 
-ul.twidenash li img {
+.twidenash li img {
     float:            left;
     vertical-align:   top;
     padding-right:    10px;
 }
 
-ul.twidenash li .comment {
+.twidenash li .comment {
     margin-left:      5px;
     display:          block;
     overflow:         auto;
 }
 
-ul.twidenash li .nick {
+.twidenash li .nick {
     font-weight:      bold;
 }
 
-ul.twidenash li .time {
+.twidenash li .time {
     font-size: 0.75em;
     color: #555;
 }

=== removed file 'loco_directory/media/js/twidenash.js'
--- loco_directory/media/js/twidenash.js	2010-09-28 17:21:02 +0000
+++ loco_directory/media/js/twidenash.js	1970-01-01 00:00:00 +0000
@@ -1,140 +0,0 @@
-/*
-* 
-* Copyright (c) 2010 Stuart Langridge
-* 
-* Permission is hereby granted, free of charge, to any person obtaining a copy
-* of this software and associated documentation files (the "Software"), to deal
-* in the Software without restriction, including without limitation the rights
-* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-* copies of the Software, and to permit persons to whom the Software is
-* furnished to do so, subject to the following conditions:
-* 
-* The above copyright notice and this permission notice shall be included in
-* all copies or substantial portions of the Software.
-* 
-* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-* THE SOFTWARE.
-*
-* Website: http://code.google.com/p/twidenash/
-*/
-
-/*
-* With modification by Michael Hall for use in loco.ubuntu.com
-*/
-
-twidenash = {
-    init: function() {
-        if (!twidenash.hashtag) return;
-        // request hashtag search values for both twitter and identica
-        twidenash.callbacks = 0;
-        twidenash.items = [];
-        twidenash.add_script("http://locoteams.status.net/api/search.json?" +
-           "callback=twidenash.cb&rpp=10&q=%23" + twidenash.hashtag);
-        twidenash.add_script("http://identi.ca/api/search.json?" +
-           "callback=twidenash.cb&rpp=10&q=%23" + twidenash.hashtag);
-        twidenash.add_script("http://search.twitter.com/search.json?" +
-           "callback=twidenash.cb&rpp=10&q=%23" + twidenash.hashtag);
-        twidenash.printed = 0;
-    },
-    add_script: function(url) {
-        var scr = document.createElement("script");
-        scr.src = url;
-        document.getElementsByTagName("head")[0].appendChild(scr);
-    },
-    cb: function(data) {
-        for (var i=0; i<data.results.length; i++) {
-            var dupe = false;
-            for (var j=0; j<twidenash.items.length; j++) {
-                // Strip characters that may be specific to networks
-                var comp1 = data.results[i].text.replace(/[♺\!\#\@]/g, '');
-                var comp2 = twidenash.items[j].text.replace(/[♺\!\#\@]/g, '');
-                var compdate = Date.parse(data.results[i].created_at);
-                var datediff = Math.abs(Date.parse(data.results[i].created_at) - twidenash.items[j].dt)
-                if (comp1 == comp2 && datediff < 120000) {
-                    dupe = true;
-                    break;
-                }
-            }
-            if (dupe) continue;
-            twidenash.items.push({ text: data.results[i].text, 
-                img: data.results[i].profile_image_url, 
-                dt: Date.parse(data.results[i].created_at),
-                user: data.results[i].from_user })
-        }
-        twidenash.callbacks += 1;
-        if (twidenash.callbacks == 2) {
-            twidenash.items.sort(function(a,b) { return b.dt - a.dt });
-            var ul = document.createElement("ul");
-            ul.className = "twidenash";
-            for (i=0; i<twidenash.items.length && twidenash.printed < 5; i++) {
-                var li = document.createElement("li");
-                var img = document.createElement("img");
-                img.src = twidenash.items[i].img;
-                img.width = 48;
-                var relative_to = (arguments.length > 1) ? arguments[1] : new Date();
-                var delta = parseInt((relative_to.getTime() - twidenash.items[i].dt) / 1000);
-                var pluralize = function (singular, n) {
-                    return '' + n + ' ' + singular + (n == 1 ? '' : 's');
-                };
-                if(delta < 60) {
-                     date_msg = 'less than a minute ago ';
-                } else if(delta < (45*60)) {
-                    date_msg = 'about ' + pluralize("minute", parseInt(delta / 60)) + ' ago ';
-                } else if(delta < (24*60*60)) {
-                    date_msg = 'about ' + pluralize("hour", parseInt(delta / 3600)) + ' ago ';
-                } else {
-                    date_msg = 'about ' + pluralize("day", parseInt(delta / 86400)) + ' ago ';
-                }
-                var span = document.createElement("span");
-                span.className = 'comment';
-                var nick = document.createElement("span");
-                nick.className = 'nick';
-                nick.appendChild(document.createTextNode(twidenash.items[i].user));
-                var time = document.createElement("span");
-                time.className = 'time';
-                time.appendChild(document.createTextNode(" ( "+ date_msg +" ) "));
-                
-                var exp = /(\b(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/gi;
-                span.innerHTML = twidenash.items[i].text.replace(exp,"<a href='$1' target='_blank'>$1</a>");
-                li.appendChild(img);
-                li.appendChild(nick);
-                li.appendChild(time);
-                li.appendChild(span);
-                ul.appendChild(li);
-                twidenash.printed++;
-            }
-            twidenash.scriptelement.parentNode.insertBefore(ul, twidenash.scriptelement);
-        }
-    },
-    cache_scriptname: function() {
-        // called before page load so we can find our own name
-        var scr = document.getElementsByTagName("script");
-        var url = scr[scr.length-1].getAttribute("src");
-        if (!url) {
-            var twidenash_script = document.getElementById("twidenash_script");
-            if (twidenash_script) url = twidenash_script.getAttribute("src");
-        }
-        if (url && url.lastIndexOf('?') != -1) {
-            twidenash.hashtag = url.substr(url.lastIndexOf('?')+1);
-            if (twidenash_script) {
-                twidenash.scriptelement = twidenash_script;
-            } else {
-                twidenash.scriptelement = scr[scr.length-1];
-            }
-        }
-    }
-};
-(function(i) {var u =navigator.userAgent;var e=/*@cc_on!@*/false; var st = 
-setTimeout;if(/webkit/i.test(u)){st(function(){var dr=document.readyState;
-if(dr=="loaded"||dr=="complete"){i()}else{st(arguments.callee,10);}},10);}
-else if((/mozilla/i.test(u)&&!/(compati)/.test(u)) || (/opera/i.test(u))){
-document.addEventListener("DOMContentLoaded",i,false); } else if(e){     (
-function(){var t=document.createElement('doc:rdy');try{t.doScroll('left');
-i();t=null;}catch(e){st(arguments.callee,0);}})();}else{window.onload=i;}})(twidenash.init);
-twidenash.cache_scriptname();
-

=== modified file 'loco_directory/settings.py'
--- loco_directory/settings.py	2010-12-07 21:42:01 +0000
+++ loco_directory/settings.py	2011-03-18 22:26:31 +0000
@@ -113,7 +113,7 @@
         ubuntu_website.TEMPLATE_DIR,
     )
 
-INSTALLED_APPS = (
+INSTALLED_APPS = [
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
@@ -126,7 +126,7 @@
     'userprofiles',
     'django_openid_auth',
     'south',
-)
+]
 
 AUTHENTICATION_BACKENDS = (
     'django_openid_auth.auth.OpenIDBackend',
@@ -159,6 +159,24 @@
 
 FLICKR_API_KEY = '8c969a1e8a49629bb89b411930ab1cc8'
 
+# Manage apps from bzr branches
+try:
+    import bzr_apps
+    INSTALLED_APPS.append('bzr_apps')
+except:
+    pass
+
+BZR_APPS = {
+    ## ubuntu-django-foundations app management
+    'bzr_apps': ('bzr+ssh://bazaar.launchpad.net/%2Bbranch/ubuntu-django-foundations/bzr-apps/', '3'),
+
+    ## ubuntu-website supplied templates and styles
+    'ubuntu_website': ('bzr+ssh://bazaar.launchpad.net/~ubuntu-community-webthemes/ubuntu-community-webthemes/light-django-theme', '32'),
+    
+    ## twidenash supplied microblog embedding javascript
+    'media/js/twidenash': ('bzr+ssh://bazaar.launchpad.net/~django-foundations-dev/twidenash/2.0/', '2'),
+}
+
 import logging
 try:
   from local_settings import *

=== modified file 'loco_directory/teams/management/commands/init-ld.py'
--- loco_directory/teams/management/commands/init-ld.py	2011-03-15 13:08:01 +0000
+++ loco_directory/teams/management/commands/init-ld.py	2011-03-18 22:26:31 +0000
@@ -44,11 +44,14 @@
         else:
             print " * Creating jquery symlinks: not necessary."
 
-        print " * Adding ubuntu_website media:",
-        if os.path.isdir(os.path.join(path, "ubuntu_website")):
+        print " * Adding Bzr Apps:",
+        if os.path.isdir(os.path.join(path, "bzr_apps", ".bzr")):
             print "not necessary."
         else:
-            subprocess.call(["bzr", "branch", "-q",
-                             "lp:ubuntu-community-webthemes/light-django-theme", 
-                             "ubuntu_website"])
+            subprocess.call(["bzr", "branch", "-q", "--use-existing-dir", 
+                             "lp:ubuntu-django-foundations/bzr-apps", 
+                             "bzr_apps"])
             print "added."
+
+        print " * Pulling Bzr Apps:",
+        subprocess.call(["./manage.py", "pullapps"])

=== modified file 'loco_directory/templates/events/global_event_detail.html'
--- loco_directory/templates/events/global_event_detail.html	2011-02-17 20:05:03 +0000
+++ loco_directory/templates/events/global_event_detail.html	2011-03-18 22:26:31 +0000
@@ -6,9 +6,11 @@
         <script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false&language={% trans 'en' %}&region={% trans 'US' %}"></script>
         <script type="text/javascript" src="http://google-maps-utility-library-v3.googlecode.com/svn/tags/markerclusterer/1.0/src/markerclusterer_packed.js"></script>
         <script type="text/javascript" src="{{MEDIA_URL}}js/jquery-ubuntu-maps.js"></script>
+        <script type="text/javascript" src="{{MEDIA_URL}}js/twidenash/jquery-twidenash.js"></script>
         <script type="text/javascript"> 
         //<![CDATA[
         $(function(){
+            $('.twidenash').twidenash();
             $('#venue-map').showLocations({markers_url:'{% url global-event-locations global_event_id=global_event_object.id %}',
                                            marker_icon: '{{ MEDIA_URL }}/img/marker.png'});
         });

=== modified file 'loco_directory/templates/events/global_event_detail.inc.html'
--- loco_directory/templates/events/global_event_detail.inc.html	2011-02-17 20:05:03 +0000
+++ loco_directory/templates/events/global_event_detail.inc.html	2011-03-18 22:26:31 +0000
@@ -100,7 +100,7 @@
 {% if global_event_object.microbloghashtag %}
     <article class="minor-content alone">
     <h2>{% trans "Microblogging" %} #{{global_event_object.microbloghashtag}}</h2>
-    <p><script src="{{MEDIA_URL}}js/twidenash.js?{{global_event_object.microbloghashtag}}"></script></p>
+    <div class="twidenash" id="{{ global_event_object.microbloghashtag }}"></div>
     </article>
 {% endif %}
 

=== modified file 'loco_directory/templates/index.html'
--- loco_directory/templates/index.html	2011-02-18 03:16:32 +0000
+++ loco_directory/templates/index.html	2011-03-18 22:26:31 +0000
@@ -9,6 +9,14 @@
 {% block extrahead %}{{block.super}}
         <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/twidenash.css" />
         <link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/continents.css" />
+        <script type="text/javascript" src="{{MEDIA_URL}}js/twidenash/jquery-twidenash.js"></script>
+        <script type="text/javascript"> 
+        //<![CDATA[
+            $(function() {
+                $('.twidenash').twidenash();
+            });
+        //]]>
+        </script>
 {% endblock %}
 
 {% block content %}
@@ -79,7 +87,7 @@
 
 <article class="minor-content alone">
     <h2>{% trans "Microblogging" %} #locoteams</h2>
-    <p><script src="{{MEDIA_URL}}js/twidenash.js?locoteams"></script></p>
+    <div class="twidenash" id="locoteams"></div>
 </article>
 
 {% endblock %}

=== modified file 'loco_directory/templates/teams/team_detail.html'
--- loco_directory/templates/teams/team_detail.html	2011-03-02 22:34:34 +0000
+++ loco_directory/templates/teams/team_detail.html	2011-03-18 22:26:31 +0000
@@ -14,16 +14,21 @@
 
 
 {% block extrahead %}{{ block.super }}
-<link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/twidenash.css" />
 {% if team.flickr_id or team.picasa_id or team.pixie_id %}
 <script type="text/javascript" src="{{MEDIA_URL}}jquery/jquery.js"></script>
 <script type="text/javascript" src="{{MEDIA_URL}}js/jquery.lightbox-0.5.min.js"></script>
 <link rel="stylesheet" href="{{MEDIA_URL}}css/jquery.lightbox-0.5.css" type="text/css" media="screen" />
 <script type="text/javascript" src="{{MEDIA_URL}}js/jquery-flickr.js"></script>
+{% endif %}
+
+<link rel="stylesheet" type="text/css" href="{{MEDIA_URL}}/css/twidenash.css" />
+<script type="text/javascript" src="{{MEDIA_URL}}js/twidenash/jquery-twidenash.js"></script>
 <script type="text/javascript"> 
 $(function() {
     var perPage = '16';
-{% endif %}
+    $('.twidenash').twidenash();
+
+
 {% if team.flickr_id %}
     $('#flickr').flickr({ key: "{{ flickr_api_key }}", id: "{{ team.flickr_id }}", amount: perPage });
 {% endif %}
@@ -65,10 +70,10 @@
         $("a.lightbox").lightBox();
     });
 {% endif %}
-{% if team.flickr_id or team.picasa_id or team.pixie_id %}
 });
 
 </script>
+{% if team.flickr_id or team.picasa_id or team.pixie_id %}
 <style type="text/css"> 
 div#flickr a.lightbox img {
 	border: 5px solid #b3aaa4;
@@ -208,7 +213,7 @@
 {% if team.microbloghashtag %}
 <article class="minor-content alone">
     <h2>{% trans "Microblogging" %} #{{team.microbloghashtag}}</h2>
-    <p><script src="{{MEDIA_URL}}js/twidenash.js?{{team.microbloghashtag}}"></script></p>
+    <div class="twidenash" id="{{ team.microbloghashtag }}"></div>
 </article>
 {% endif %}