Commits

Luke Plant committed a3c5f8f

Upgraded to django-cms 2.2

Comments (0)

Files changed (3)

christchurch/settings.py

     'cms.middleware.page.CurrentPageMiddleware',
     'cms.middleware.user.CurrentUserMiddleware',
     'cms.middleware.toolbar.ToolbarMiddleware',
-    'cms.middleware.media.PlaceholderMediaMiddleware',
     'pagination.middleware.PaginationMiddleware',
 ]
 
     'django.core.context_processors.static',
     'cms.context_processors.media',
     'christchurch.processors.common',
+    'sekizai.context_processors.sekizai',
 ]
 
 ROOT_URLCONF = 'christchurch.urls'
     'cms',
     'menus',
     'mptt',
+    'sekizai',
     'appmedia',
     'cms.plugins.text',
     'cms.plugins.picture',

christchurch/templates/standard.html

-{% load cms_tags %}{% load menu_tags %}<!DOCTYPE html>
+{% load cms_tags sekizai_tags %}
+{% load menu_tags %}
+<!DOCTYPE html>
 <html>
 <head>
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
   <title>{% block title %}{{ request.current_page.get_title }}{% endblock %} :: Christ Church, Bradford</title>
   <meta name="keywords" content="Christ church, Bradford, church, evangelical, reformed, christchurch, Yorkshire, UK, Pollard Park">
-  <script type="text/javascript" src="{{ STATIC_URL }}admin/js/jquery.min.js"></script>
   <link rel="StyleSheet" href="{{ STATIC_URL }}christchurch/css/style.css" type="text/css">
 
-  {% plugins_media %}
+  {% render_block "css" %}
+
   {% if GOOGLE_ANALYTICS_ACCOUNT %}
 <script type="text/javascript">
 
 
 
 <body>
+ {% cms_toolbar %}
   <div id="headercont">
     <div id="header">
       <div id="headertext"><a href="/">Christ Church, Bradford</a></div>
       </div>
     </div>
   </div>
+  <script type="text/javascript" src="{{ STATIC_URL }}admin/js/jquery.min.js"></script>
+  {% render_block "js" %}
 </body>
 </html>
 psycopg2>=0.7.2
 south
-django-cms==2.1.3
+django-cms==2.2
 django-appmedia
-django-classy-tags>=0.2.2
+django-classy-tags>=0.3.4.1
+django-mptt==0.5.1
 Django==1.3.1
 vobject
 requests
 django-inline-ordering==0.1.3
 easy-thumbnails==1.0-alpha-17
 cmsplugin_gallery==0.1.7
-
+django-sekizai==0.5
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.