Commit 20e2e465 authored by svilayphiou's avatar svilayphiou

merging change on ethertoff context_processors by Gijs on Contour branch

parent f54e5a1a
......@@ -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):
......
......@@ -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',
],
},
},
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment