X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=xnet%2Fsettings.py;h=4260933768fd06f7fd10d9b51e606e8bd07a1609;hb=f70839f67ae1ddacc5de297e574ef32269f64d7e;hp=71191256da0251e4a9284c8ac681bdd669f44f60;hpb=33234b2f1004f7e45208a8ef55c16e7cac1da5b9;p=xnet

diff --git a/xnet/settings.py b/xnet/settings.py
index 7119125..4260933 100644
--- a/xnet/settings.py
+++ b/xnet/settings.py
@@ -30,9 +30,12 @@ AUTHENTICATION_BACKENDS = (
 AUTHGROUPEX_KEY = read_pass('authgroupex.key')
 AUTHGROUPEX_FIELDS = ('username', 'firstname', 'lastname', 'perms')
 AUTHGROUPEX_SUPERADMIN_PERMS = ('admin',)
+AUTHGROUPEX_USER_MODEL = 'accounts.Account'
 LOGIN_URL = '/xorgauth/'
 LOGIN_REDIRECT_URL = '/'
 
+AUTH_USER_MODEL = 'accounts.Account'
+
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # although not all choices may be available on all operating systems.
@@ -42,6 +45,10 @@ TIME_ZONE = 'Europe/Paris'
 # Language code for this installation. All choices can be found here:
 # http://www.i18nguy.com/unicode/language-identifiers.html
 LANGUAGE_CODE = 'en-us'
+OCALE_PATHS = (
+    os.path.join(ROOT_DIR, 'locale'),
+)
+
 
 SITE_ID = 1
 
@@ -58,12 +65,12 @@ USE_TZ = True
 
 # Absolute filesystem path to the directory that will hold user-uploaded files.
 # Example: "/home/media/media.lawrence.com/media/"
-MEDIA_ROOT = ''
+MEDIA_ROOT = os.path.join(ROOT_DIR, 'media')
 
 # URL that handles the media served from MEDIA_ROOT. Make sure to use a
 # trailing slash.
 # Examples: "http://media.lawrence.com/media/", "http://example.com/media/"
-MEDIA_URL = ''
+MEDIA_URL = '/media/'
 
 # Absolute path to the directory static files should be collected to.
 # Don't put anything in this directory yourself; store your static files
@@ -77,6 +84,7 @@ STATIC_URL = '/static/'
 
 # Additional locations of static files
 STATICFILES_DIRS = (
+    os.path.join(ROOT_DIR, 'static'),
     # Put strings here, like "/home/html/static" or "C:/www/django/static".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
@@ -116,6 +124,7 @@ ROOT_URLCONF = 'xnet.urls'
 WSGI_APPLICATION = 'xnet.wsgi.application'
 
 TEMPLATE_DIRS = (
+    os.path.join(ROOT_DIR, 'templates'),
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
@@ -131,7 +140,11 @@ INSTALLED_APPS = (
     'django.contrib.admin',
 
     'django_authgroupex',
+    'crispy_forms',
     'xnet.site',
+    'xnet.accounts',
+    'xnet.news',
+    'xnet.events',
     'xnet.example',
 )
 
@@ -163,3 +176,5 @@ LOGGING = {
         },
     }
 }
+
+CRISPY_TEMPLATE_PACK = 'bootstrap'