Merge lp:~cjohnston/summit/bzr_apps into lp:summit

[Chris Johnston]

Switches summit to using bzr_apps by running init-summit.

[lp:~cjohnston/summit/bzr_apps]

126. By Chris Johnston on 2011-07-11

[r=][] Fixes minor spelling error

127. By Chris Johnston on 2011-07-18

[r=][] Updates required version of south

128. By Chris Johnston on 2011-07-18

[r=chrisjohnston][] Fixes a minor spelling issue in fields.py

129. By Michael Hall on 2011-07-19

[r=mhall119][781117] Changes /today url to /summit_name/today

130. By Chris Johnston on 2011-07-19

[r=mhall119][793020] Modifies links to match uds.ubuntu.com

131. By Chris Johnston on 2011-07-19

[r=mhall119][765031] Adds private room as an option for a room status.

132. By Chris Johnston on 2011-07-19

[r=mhall119][] Adds update-openids script to summit to fix usernames.

133. By Michael Hall on 2011-07-20

Merge from 1.x

134. By Michael Hall on 2011-07-20

Merge from 1.x

135. By Michael Hall on 2011-07-21

Merge from 1.x

136. By Chris Johnston on 2011-07-25

[r=mhall119][] Removes old migrations and adds new initial migration

[Nigel Babu (nigelbabu)]

Why are we checking in .hg files?

[lp:~cjohnston/summit/bzr_apps]

137. By Nigel Babu on 2011-07-30

[r=][] Create a docs so that it shows up in rtfd.org

138. By Chris Johnston on 2011-07-30

[r=nigelbabu][] Remove translation tags, summit is not translated.

139. By Nigel Babu on 2011-07-30

[r=mhall119] Reset the theme of the documentation to default.

140. By Chris Johnston on 2011-08-01

Updating trunk from 1.x

141. By Chris Johnston on 2011-08-12

[r=nigelbabu] Adds a link to the page for editing an etherpad

[Chris Johnston (cjohnston)]

We aren't.. That's bzrignore

[Chris Johnston (cjohnston)]

We don't need it though now that we use a current version of south.

[Nigel Babu (nigelbabu)]

11 +summit/.hgignore
12 +summit/.hgtags

Those are hg dotfiles. If we don't need them, remove and update the MP.

review: Needs Fixing

[Chris Johnston (cjohnston)]

review: Needs Resubmitting

[lp:~cjohnston/summit/bzr_apps]

142. By Chris Johnston on 2011-08-12

Removes conflicts

[Nigel Babu (nigelbabu)]

When, I do ./manage.py init-summit, I get

You will need to run ./manage.py init-summit to make Summit fully work.
You will need to run ./manage.py init-summit to make Summit fully work.

I think we shouldn't show this if you're actually calling the init-summit command.

[Chris Johnston (cjohnston)]

LoCo Directory has done the same thing for a year.. I filed a bug against it. https://bugs.launchpad.net/loco-directory/+bug/722224

[Nigel Babu (nigelbabu)]

Ok, approve.

review: Approve

[Nigel Babu (nigelbabu)]

Could you also add a summit task to that bug?

=== modified file '.bzrignore'
--- .bzrignore	2011-05-15 01:11:24 +0000
+++ .bzrignore	2011-08-12 14:28:26 +0000
@@ -4,9 +4,5 @@
 summit/summit.db
 summit/ubuntu_website
 summit/linaro_website
-summit/docs
-summit/south
-summit/.hgignore
-summit/.hg_archival.txt
-summit/.hgtags
-summit/setup.py
+bzr_apps
+summit/media/js/twidenash

=== modified file 'summit/media/css/twidenash.css'
--- summit/media/css/twidenash.css	2010-08-30 14:30:29 +0000
+++ summit/media/css/twidenash.css	2011-08-12 14:28:26 +0000
@@ -1,20 +1,38 @@
-ul.twidenash li {
-    list-style-type: none;
-    clear: both;
-    padding: 3px;
-    font-size: 100%;
-}
-ul.twidenash li img {
-    float: left;
-    vertical-align: top;
-    padding-right: 10px;
-}
-ul.twidenash li .comment {
-    margin-left: 5px;
-    display: block;
-}
-
-ul.twidenash li .nick {
-    font-weight: bold;
+/*
+ * twidenash.css
+ *
+ * twidenash CSS stuff.
+ *
+ *  Author: Michael Hall      ( mhall119 )
+ */
+
+
+.twidenash li {
+    list-style-type:  none;
+    clear:            both;
+    padding:          3px;
+    font-size:        0.75em;
+}
+
+.twidenash li img {
+    float:            left;
+    vertical-align:   top;
+    padding-right:    10px;
+    margin-top:       3px;
+}
+
+.twidenash li .comment {
+    margin-left:      5px;
+    display:          block;
+    overflow:         auto;
+}
+
+.twidenash li .nick {
+    font-weight:      bold;
+}
+
+.twidenash li .time {
+    font-size: 0.75em;
+    color: #555;
 }
 

=== added directory 'summit/media/jquery'
=== added directory 'summit/media/jquery-ui'
=== added directory 'summit/media/js'
=== removed file 'summit/media/twidenash.js'
--- summit/media/twidenash.js	2010-08-30 14:30:29 +0000
+++ summit/media/twidenash.js	1970-01-01 00:00:00 +0000
@@ -1,122 +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 span = document.createElement("span");
-                span.className = 'comment';
-                var nick = document.createElement("span");
-                nick.className = 'nick';
-                nick.appendChild(document.createTextNode(twidenash.items[i].user + 
-                    ": "));
-                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(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();
-

=== added file 'summit/schedule/management/commands/init-summit.py'
--- summit/schedule/management/commands/init-summit.py	1970-01-01 00:00:00 +0000
+++ summit/schedule/management/commands/init-summit.py	2011-08-12 14:28:26 +0000
@@ -0,0 +1,28 @@
+#!/usr/bin/python
+
+from django.core.management.base import NoArgsCommand
+from django.contrib.auth.models import Group
+
+import settings
+
+import subprocess
+import sys
+import os
+
+class Command(NoArgsCommand):
+    help = "Make sure Summit is set up properly."
+
+    def handle_noargs(self, **options):
+        path = settings.PROJECT_PATH
+
+        print " * Adding Bzr Apps:",
+        if os.path.isdir(os.path.join(path, "bzr_apps", ".bzr")):
+            print "not necessary."
+        else:
+            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 'summit/schedule/templates/schedule/index.html'
--- summit/schedule/templates/schedule/index.html	2011-07-19 01:57:02 +0000
+++ summit/schedule/templates/schedule/index.html	2011-08-12 14:28:26 +0000
@@ -1,7 +1,17 @@
 {% extends "base.html" %}
 {% load datetime %}
 {% load i18n %}
-
+{% block extrahead %}{{block.super}}
+    <script type="text/javascript" src="{{MEDIA_URL}}jquery/jquery.js"></script>
+    <script type="text/javascript" src="{{MEDIA_URL}}js/twidenash/jquery-twidenash.js"></script>
+    <script type="text/javascript"> 
+       //<![CDATA[
+           $(function() {
+               $('.twidenash').twidenash();
+           });
+       //]]>
+    </script>
+{% endblock %}
 {% block sub_nav %}{% endblock %}
 {% block content %}
 <article class="minor-content">
@@ -16,6 +26,6 @@
 </article>
 <article class="minor-content alone">
     <h2>Microblogging #UDS</h2>
-    <p><script src="/media/twidenash.js?uds"></script></p>
+    <div class="twidenash" id="uds"></div>
 </article>
 {% endblock %}

=== modified file 'summit/settings.py'
--- summit/settings.py	2011-06-16 18:12:32 +0000
+++ summit/settings.py	2011-08-12 14:28:26 +0000
@@ -19,7 +19,14 @@
 import os
 import sys
 
-THIS_DIR = os.path.dirname(__file__)
+try:
+    import ubuntu_website
+    uw_import = True
+except ImportError:
+    print "You will need to run  ./manage.py init-summit to make Summit fully work."
+    uw_import = False
+
+PROJECT_PATH = os.path.dirname(os.path.abspath(__file__))
 
 DEBUG = False
 TEMPLATE_DEBUG = DEBUG
@@ -64,7 +71,7 @@
 
 # Absolute path to the directory that holds media.
 # Example: "/home/media/media.lawrence.com/"
-MEDIA_ROOT = os.path.join(THIS_DIR, 'media')
+MEDIA_ROOT = os.path.join(PROJECT_PATH, 'media')
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash if there is a path component (optional in other cases).
@@ -113,11 +120,10 @@
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    os.path.join(THIS_DIR, 'templates'),
+    os.path.join(PROJECT_PATH, 'templates'),
 )
 
-try:
-    import ubuntu_website
+if uw_import:
     TEMPLATE_CONTEXT_PROCESSORS += (
         "ubuntu_website.media_processor",
         "ubuntu_website.popup_check",
@@ -125,10 +131,10 @@
     TEMPLATE_DIRS += (
         ubuntu_website.TEMPLATE_DIR,
     )
-except ImportError:
-    print "You will need to include lp:ubuntu-community-webthemes/light-django-theme into ./ubuntu_website for the theme to fully work."
+#except ImportError:
+#    print "You will need to include lp:ubuntu-community-webthemes/light-django-theme into ./ubuntu_website for the theme to fully work."
 
-INSTALLED_APPS = (
+INSTALLED_APPS = [
     'django.contrib.auth',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
@@ -137,7 +143,7 @@
     'summit.schedule',
     'summit.sponsor',
     'south',
-)
+]
 
 AUTHENTICATION_BACKENDS = (
     'django_openid_auth.auth.OpenIDBackend',
@@ -162,7 +168,7 @@
 LOGIN_URL = '/openid/login'
 LOGIN_REDIRECT_URL = '/'
 
-LAUNCHPAD_CACHE = os.path.join(THIS_DIR, 'lp-cache')
+LAUNCHPAD_CACHE = os.path.join(PROJECT_PATH, 'lp-cache')
 
 CACHE_BACKEND = 'locmem:///'
 
@@ -170,6 +176,24 @@
 # could include a port and prefix if required
 ETHERPAD_HOST = 'http://pad.ubuntu.com/'
 
+# 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', '35'),
+    
+    ## twidenash supplied microblog embedding javascript
+    'media/js/twidenash': ('bzr+ssh://bazaar.launchpad.net/~django-foundations-dev/twidenash/2.0/', '3'),
+}
+
 import logging
 try:
   from local_settings import *

=== modified file 'summit/urls.py'
--- summit/urls.py	2011-07-22 01:34:00 +0000
+++ summit/urls.py	2011-08-12 14:28:26 +0000
@@ -16,6 +16,7 @@
 
 from django.conf.urls.defaults import *
 from django.conf import settings
+import ubuntu_website
 
 from django.contrib import admin
 admin.autodiscover()
@@ -72,7 +73,6 @@
 )
 
 if settings.DEBUG or settings.SERVE_STATIC:
-    import ubuntu_website
     urlpatterns += patterns('',
         (r'^media/(?P<path>.*)$', 'django.views.static.serve',
             {'document_root': settings.MEDIA_ROOT}),