From 81ee68feef68804dce99c37c79f91e392bea800d Mon Sep 17 00:00:00 2001
From: Weitian LI <liweitianux@gmail.com>
Date: Sun, 20 Apr 2014 16:20:48 +0800
Subject: * updated django_skaschool/settings.py o SITE_ID, LANGUAGE_CODE,
TIME_ZONE o INSTALLED_APPS * updated top-level urls.py
---
django_skaschool/settings.py | 9 +++++++--
django_skaschool/urls.py | 15 ++++++++++-----
2 files changed, 17 insertions(+), 7 deletions(-)
(limited to 'django_skaschool')
diff --git a/django_skaschool/settings.py b/django_skaschool/settings.py
index b75ed25..79d0299 100644
--- a/django_skaschool/settings.py
+++ b/django_skaschool/settings.py
@@ -47,8 +47,9 @@ THIRD_PARTY_APPS = (
)
# LOCAL_APPS
LOCAL_APPS = (
+ 'account',
'page',
- 'demo',
+ 'notice',
)
# INSTALLED_APPS
INSTALLED_APPS = DEFAULT_APPS + THIRD_PARTY_APPS + LOCAL_APPS
@@ -80,7 +81,8 @@ DATABASES = {
# Internationalization
# https://docs.djangoproject.com/en/1.6/topics/i18n/
-LANGUAGE_CODE = 'en-us'
+#LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = 'zh-cn'
#TIME_ZONE = 'UTC'
TIME_ZONE = 'Asia/Shanghai'
@@ -91,6 +93,9 @@ USE_L10N = True
USE_TZ = True
+# contrib.sites
+SITE_ID = 1
+
## template directories
TEMPLATE_DIRS = (
# Don't forget to use absolute paths, not relative paths.
diff --git a/django_skaschool/urls.py b/django_skaschool/urls.py
index 770e524..65b05c4 100644
--- a/django_skaschool/urls.py
+++ b/django_skaschool/urls.py
@@ -11,20 +11,25 @@ from django.views.generic.base import TemplateView
urlpatterns = patterns('',
+ # admin
url(r'^admin/', include(admin.site.urls)),
- url(r'^page/', include('page.urls')),
+ # index page
url(r'^$', TemplateView.as_view(template_name='index.html'),
name='index'),
+ # app 'page'
+ url(r'^page/', include('page.urls')),
)
-## demo
+## django-registration
urlpatterns += patterns('',
- url(r'^demo/', include('demo.urls')),
+ # url(r'^accounts/', include('registration.backends.default.urls')),
+ url(r'^accounts/', include('account.urls')),
)
-## django-registration
+
+## demo
urlpatterns += patterns('',
- url(r'^accounts/', include('registration.backends.default.urls')),
+ url(r'^demo/', include('demo.urls')),
)
## staticfiles
--
cgit v1.2.2