From a4d102896cd261ced64316fce45dd264a797a903 Mon Sep 17 00:00:00 2001
From: Weitian LI <liweitianux@gmail.com>
Date: Fri, 18 Apr 2014 21:18:50 +0800
Subject: * updated settings.py, added settings_email.py * created directories
 'static' and 'templates' * added app 'account', 'notice' * added app 'demo'

---
 django_skaschool/settings.py       | 73 +++++++++++++++++++++++++++++++++++---
 django_skaschool/settings_email.py | 13 +++++++
 django_skaschool/urls.py           | 30 +++++++++++++---
 3 files changed, 108 insertions(+), 8 deletions(-)
 create mode 100644 django_skaschool/settings_email.py

(limited to 'django_skaschool')

diff --git a/django_skaschool/settings.py b/django_skaschool/settings.py
index 57f8598..b75ed25 100644
--- a/django_skaschool/settings.py
+++ b/django_skaschool/settings.py
@@ -11,6 +11,7 @@ https://docs.djangoproject.com/en/1.6/ref/settings/
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
 BASE_DIR = os.path.dirname(os.path.dirname(__file__))
+PROJECT_DIR = os.path.dirname(__file__)
 
 
 # Quick-start development settings - unsuitable for production
@@ -28,16 +29,29 @@ ALLOWED_HOSTS = []
 
 
 # Application definition
-
-INSTALLED_APPS = (
+# DEFAULT_APPS: django framework apps
+DEFAULT_APPS = (
     'django.contrib.admin',
     'django.contrib.auth',
+    'django.contrib.sites',
     'django.contrib.contenttypes',
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+)
+# THIRD_PARTY_APPS
+THIRD_PARTY_APPS = (
     'south',
+    'bootstrap3',
+    'registration',
+)
+# LOCAL_APPS
+LOCAL_APPS = (
+    'page',
+    'demo',
 )
+# INSTALLED_APPS
+INSTALLED_APPS = DEFAULT_APPS + THIRD_PARTY_APPS + LOCAL_APPS
 
 MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -68,7 +82,8 @@ DATABASES = {
 
 LANGUAGE_CODE = 'en-us'
 
-TIME_ZONE = 'UTC'
+#TIME_ZONE = 'UTC'
+TIME_ZONE = 'Asia/Shanghai'
 
 USE_I18N = True
 
@@ -76,8 +91,58 @@ USE_L10N = True
 
 USE_TZ = True
 
+## template directories
+TEMPLATE_DIRS = (
+    # Don't forget to use absolute paths, not relative paths.
+    os.path.join(BASE_DIR, 'templates'),
+)
+
+## static directories
+STATICFILES_DIRS = (
+    # Don't forget to use absolute paths, not relative paths.
+    os.path.join(BASE_DIR, 'static'),
+)
+
+## static root
+# absolute path to the directory where 'collectstatic' will collect
+# static files for deployment
+#STATIC_ROOT = '/var/www/example.com/static/'
+STATIC_ROOT = os.path.join(BASE_DIR, 'static_root')
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.6/howto/static-files/
-
 STATIC_URL = '/static/'
+
+## media root
+# absolute filesystem path to the directory that hold user-uploaded files
+#MEDIA_ROOT = '/var/www/example.com/media/'
+# media url
+MEDIA_URL = '/media/'
+
+## email settings
+try:
+    from settings_email import *
+except ImportError:
+    pass
+
+
+#################################################
+## bootstrap3
+BOOTSTRAP3 = {
+    'jquery_url': '//code.jquery.com/jquery-1.11.0.min.js',
+    'base_url': '//netdna.bootstrapcdn.com/bootstrap/3.1.1/',
+    'css_url': None,
+    'theme_url': None,
+    'javascript_url': None,
+    'javascript_in_head': False,
+    'horizontal_label_class': 'col-md-2',
+    'horizontal_field_class': 'col-md-4',
+}
+
+## django-registration
+# One-week activation window
+ACCOUNT_ACTIVATION_DAYS = 7
+# whether registration of new accounts if currently permitted
+REGISTRATION_OPEN = True
+
+# vim: set ts=4 sw=4 tw=0 fenc=utf-8 ft=python: 
diff --git a/django_skaschool/settings_email.py b/django_skaschool/settings_email.py
new file mode 100644
index 0000000..e06cc3b
--- /dev/null
+++ b/django_skaschool/settings_email.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+#
+# django email settings
+#
+
+EMAIL_HOST = "smtp.163.com"
+EMAIL_HOST_USER = "skaschool2014"
+EMAIL_HOST_PASSWORD = "2014skasjtu"
+EMAIL_PORT = 25
+EMAIL_SUBJECT_PREFIX = '[Django] '
+EMAIL_USE_TLS = False
+DEFAULT_FROM_EMAIL = "2014SKA School <skaschool2014@163.com>"
+
diff --git a/django_skaschool/urls.py b/django_skaschool/urls.py
index f3ae807..770e524 100644
--- a/django_skaschool/urls.py
+++ b/django_skaschool/urls.py
@@ -1,12 +1,34 @@
+# -*- coding: utf-8 -*-
+
 from django.conf.urls import patterns, include, url
+from django.conf import settings
 
 from django.contrib import admin
 admin.autodiscover()
 
-urlpatterns = patterns('',
-    # Examples:
-    # url(r'^$', 'django_skaschool.views.home', name='home'),
-    # url(r'^blog/', include('blog.urls')),
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+from django.views.generic.base import TemplateView
+
 
+urlpatterns = patterns('',
     url(r'^admin/', include(admin.site.urls)),
+    url(r'^page/', include('page.urls')),
+    url(r'^$', TemplateView.as_view(template_name='index.html'),
+        name='index'),
+)
+
+## demo
+urlpatterns += patterns('',
+    url(r'^demo/', include('demo.urls')),
 )
+
+## django-registration
+urlpatterns += patterns('',
+    url(r'^accounts/', include('registration.backends.default.urls')),
+)
+
+## staticfiles
+if settings.DEBUG:
+    urlpatterns += staticfiles_urlpatterns()
+
+
-- 
cgit v1.2.2