diff --git a/oj/local_settings.py b/oj/local_settings.py index e61ec9c..3b685e7 100644 --- a/oj/local_settings.py +++ b/oj/local_settings.py @@ -38,4 +38,8 @@ TEST_CASE_DIR = os.path.join(BASE_DIR, 'test_case/') ALLOWED_HOSTS = [] -IMAGE_UPLOAD_DIR = os.path.join(BASE_DIR, 'static/src/upload_image/') \ No newline at end of file +IMAGE_UPLOAD_DIR = os.path.join(BASE_DIR, 'static/src/upload_image/') + +STATICFILES_DIRS = [os.path.join(BASE_DIR, "static/src/")] + +TEMPLATE_DIRS = [os.path.join(BASE_DIR, 'template/src/')] \ No newline at end of file diff --git a/oj/server_settings.py b/oj/server_settings.py index cc5ee82..1702fa9 100644 --- a/oj/server_settings.py +++ b/oj/server_settings.py @@ -43,3 +43,7 @@ TEST_CASE_DIR = '/root/test_case/' ALLOWED_HOSTS = ['*'] IMAGE_UPLOAD_DIR = '/var/mnt/source/OnlineJudge/static/src/upload_image/' + +STATICFILES_DIRS = [os.path.join(BASE_DIR, "static/release/")] + +TEMPLATE_DIRS = [os.path.join(BASE_DIR, 'template/release/')] diff --git a/oj/settings.py b/oj/settings.py index 097a4c2..bc40069 100644 --- a/oj/settings.py +++ b/oj/settings.py @@ -32,8 +32,6 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) SECRET_KEY = 'hzfp^8mbgapc&x%$#xv)0=t8s7_ilingw(q3!@h&2fty6v6fxz' - - # Application definition INSTALLED_APPS = ( @@ -76,7 +74,7 @@ ROOT_URLCONF = 'oj.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [os.path.join(BASE_DIR, 'template/src')], + 'DIRS': TEMPLATE_DIRS, 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ @@ -111,8 +109,6 @@ USE_TZ = True STATIC_URL = '/static/' -STATICFILES_DIRS = (os.path.join(BASE_DIR, "static/src/"),) - AUTH_USER_MODEL = 'account.User' LOGGING = {