Bug 816080: Upgrade Bedrock to latest Playdoh

Author: l-hedgehog

.gitignore

@@ -1,17 +1,18 @@
 settings_local.py
 settings/local.py
+*/settings/local.py
 *.py[co]
 *.sw[po]
 .coverage
 pip-log.txt
 docs/_gh-pages
 build.py
+build
 .DS_Store
 *-min.css
 *-all.css
 *-min.js
 *-all.js
-vendor
 .noseids
 tmp/*
 *~
@@ -20,4 +21,4 @@ tmp/*
 db.sql
 /locale
 Thumbs.db
-Desktop.ini
+Desktop.ini

.gitmodules

@@ -22,6 +22,3 @@
 [submodule "vendor-local/src/pystatsd"]
 	path = vendor-local/src/pystatsd
 	url = git://github.com/jsocol/pystatsd.git
-[submodule "vendor-local/src/django"]
-	path = vendor-local/src/django
-	url = git://github.com/django/django.git

MANIFEST.in

@@ -0,0 +1,2 @@
+recursive-include */*/templates *.*
+recursive-include */locale *.*

apps/collusion/views.py

@@ -12,7 +12,7 @@
   <nav id="nav-main" role="navigation">
     <span class="toggle" role="button" aria-controls="nav-main-menu" tabindex="0">{{_('Menu')}}</span>
     <ul id="nav-main-menu">
-      <li><a href="{{ url('collusion') }}">Home</a></li>
+      <li><a href="{{ url('collusion.collusion') }}">Home</a></li>
       <li><b>Demo</b></li>
   </ul>
   </nav>

apps/l10n_example/views.py

@@ -3,9 +3,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 from django.conf.urls.defaults import *
-from views import collusion, demo
+from bedrock.mozorg.util import page
 
 urlpatterns = patterns('',
-    url(r'^demo/$', demo, name='collusion.demo'),
-    url(r'^$', collusion, name='collusion'),
+    page('demo', 'collusion/demo.html'),
+    page('', 'collusion/collusion.html'),
 )