diff options
author | Mike Crute <mcrute@gmail.com> | 2012-12-04 16:21:32 -0500 |
---|---|---|
committer | Mike Crute <mcrute@gmail.com> | 2012-12-11 15:27:46 -0500 |
commit | bd95993653a1b94d07316e24a0f519d00f9359d6 (patch) | |
tree | 45f44092fde26ad38db1aaaf123d7e2173fa973e /codemash | |
parent | ab626f31a0645d87560d242a20dd60e01b3d3b46 (diff) | |
download | django-precompiler-bd95993653a1b94d07316e24a0f519d00f9359d6.tar.bz2 django-precompiler-bd95993653a1b94d07316e24a0f519d00f9359d6.tar.xz django-precompiler-bd95993653a1b94d07316e24a0f519d00f9359d6.zip |
User can login and logout
Diffstat (limited to 'codemash')
-rw-r--r-- | codemash/settings.py | 14 | ||||
-rw-r--r-- | codemash/urls.py | 3 |
2 files changed, 8 insertions, 9 deletions
diff --git a/codemash/settings.py b/codemash/settings.py index 23b1b93..0285da9 100644 --- a/codemash/settings.py +++ b/codemash/settings.py | |||
@@ -11,20 +11,15 @@ ADMINS = ( | |||
11 | 11 | ||
12 | MANAGERS = ADMINS | 12 | MANAGERS = ADMINS |
13 | 13 | ||
14 | PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) | ||
15 | |||
14 | DATABASES = { | 16 | DATABASES = { |
15 | 'default': { | 17 | 'default': { |
16 | 'ENGINE': 'django.db.backends.', # Add 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. | 18 | 'ENGINE': 'django.db.backends.sqlite3', |
17 | 'NAME': '', # Or path to database file if using sqlite3. | 19 | 'NAME': os.path.join(PROJECT_ROOT, "database.db"), |
18 | # The following settings are not used with sqlite3: | ||
19 | 'USER': '', | ||
20 | 'PASSWORD': '', | ||
21 | 'HOST': '', # Empty for localhost through domain sockets or '127.0.0.1' for localhost through TCP. | ||
22 | 'PORT': '', # Set to empty string for default. | ||
23 | } | 20 | } |
24 | } | 21 | } |
25 | 22 | ||
26 | PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) | ||
27 | |||
28 | # Local time zone for this installation. Choices can be found here: | 23 | # Local time zone for this installation. Choices can be found here: |
29 | # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name | 24 | # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name |
30 | # although not all choices may be available on all operating systems. | 25 | # although not all choices may be available on all operating systems. |
@@ -133,6 +128,7 @@ INSTALLED_APPS = ( | |||
133 | # 'django.contrib.admindocs', | 128 | # 'django.contrib.admindocs', |
134 | 129 | ||
135 | 'contact', | 130 | 'contact', |
131 | 'accounts', | ||
136 | ) | 132 | ) |
137 | 133 | ||
138 | # A sample logging configuration. The only tangible logging | 134 | # A sample logging configuration. The only tangible logging |
diff --git a/codemash/urls.py b/codemash/urls.py index 0431c65..567499c 100644 --- a/codemash/urls.py +++ b/codemash/urls.py | |||
@@ -6,6 +6,9 @@ from django.conf.urls import patterns, include, url | |||
6 | 6 | ||
7 | urlpatterns = patterns('', | 7 | urlpatterns = patterns('', |
8 | (r'^contact/', include('contact.urls', namespace='contact')), | 8 | (r'^contact/', include('contact.urls', namespace='contact')), |
9 | (r'^accounts/', include('django.contrib.auth.urls', namespace='auth')), | ||
10 | (r'^accounts/', include('accounts.urls', namespace='account')), | ||
11 | |||
9 | url(r'^$', 'pages.views.home', name='home'), | 12 | url(r'^$', 'pages.views.home', name='home'), |
10 | 13 | ||
11 | # Uncomment the admin/doc line below to enable admin documentation: | 14 | # Uncomment the admin/doc line below to enable admin documentation: |