merging change on ethertoff context_processors by Gijs on Contour branch

ethertoff/context_processors.py

@@ -7,7 +7,7 @@ from datetime import datetime
 from ethertoff.settings import MEDIA_ROOT
 from etherpadlite.models import Pad, PadAuthor, PadServer
 from django.contrib.auth.models import AnonymousUser
-from django.contrib.sites.models import get_current_site
+from django.contrib.sites.shortcuts import get_current_site
 
 
 class EthertoffError(Exception):

ethertoff/settings.py

@@ -37,7 +37,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    #'django.contrib.sites',
+    'django.contrib.sites',
     'etherpadlite',
     'ethertoff',
     #'south'
@@ -66,6 +66,9 @@ TEMPLATES = [
                 'django.template.context_processors.request',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
+                'ethertoff.context_processors.site_name',
+                'ethertoff.context_processors.pads',
+                'ethertoff.context_processors.local',
             ],
         },
     },