michael@323: Index: cdr_stats/settings.py michael@323: --- cdr_stats/settings.py.orig 2010-11-23 20:49:13.000000000 +0100 michael@323: +++ cdr_stats/settings.py 2011-03-24 19:48:52.368398330 +0100 michael@323: @@ -55,6 +55,7 @@ michael@323: # calendars according to the current locale michael@323: USE_L10N = True michael@323: michael@323: +SERVE_ROOT = 'https://tls.europalab.com/cdr/' michael@323: MEDIA_ROOT = os.path.join( APPLICATION_DIR, 'resources' ) michael@323: MEDIA_URL = 'http://localhost:8000/resources/' michael@323: ADMIN_MEDIA_PREFIX = '/resources/admin/' michael@323: Index: cdr_stats/cdr/views.py michael@323: --- cdr_stats/cdr/views.py.orig 2010-11-23 20:49:13.000000000 +0100 michael@323: +++ cdr_stats/cdr/views.py 2011-03-23 23:47:35.524666932 +0100 michael@323: @@ -1,3 +1,4 @@ michael@323: +from django.conf import settings michael@323: from django.contrib.auth.models import User michael@323: from django.contrib.auth import authenticate, login, logout michael@323: from django.contrib.auth.decorators import login_required