Fix indentation in settings and urls modules
This commit is contained in:
parent
15ce31eedb
commit
e9bdb18b7e
2 changed files with 28 additions and 28 deletions
|
@ -17,6 +17,8 @@
|
||||||
# along with this program in a file in the toplevel directory called
|
# along with this program in a file in the toplevel directory called
|
||||||
# "AGPLv3". If not, see <http://www.gnu.org/licenses/>.
|
# "AGPLv3". If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
from djangocommonsettings import *
|
from djangocommonsettings import *
|
||||||
|
|
||||||
SITE_ID = 2
|
SITE_ID = 2
|
||||||
|
@ -104,24 +106,24 @@ DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
|
||||||
|
|
||||||
BASE_DIR = Path(__file__).resolve().parent.parent
|
BASE_DIR = Path(__file__).resolve().parent.parent
|
||||||
TEMPLATES = [
|
TEMPLATES = [
|
||||||
{
|
{
|
||||||
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
'BACKEND': 'django.template.backends.django.DjangoTemplates',
|
||||||
'DIRS': [
|
'DIRS': [
|
||||||
BASE_DIR / 'conservancy' / 'templates',
|
BASE_DIR / 'conservancy' / 'templates',
|
||||||
BASE_DIR / 'conservancy' / 'static',
|
BASE_DIR / 'conservancy' / 'static',
|
||||||
],
|
],
|
||||||
'APP_DIRS': True,
|
'APP_DIRS': True,
|
||||||
'OPTIONS': {
|
'OPTIONS': {
|
||||||
'context_processors': [
|
'context_processors': [
|
||||||
'django.template.context_processors.debug',
|
'django.template.context_processors.debug',
|
||||||
'django.template.context_processors.request',
|
'django.template.context_processors.request',
|
||||||
'django.contrib.auth.context_processors.auth',
|
'django.contrib.auth.context_processors.auth',
|
||||||
'django.contrib.messages.context_processors.messages',
|
'django.contrib.messages.context_processors.messages',
|
||||||
'conservancy.local_context_processors.host_url',
|
'conservancy.local_context_processors.host_url',
|
||||||
'conservancy.local_context_processors.sitefundraiser',
|
'conservancy.local_context_processors.sitefundraiser',
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
STATIC_ROOT = BASE_DIR.parent / 'collected_static'
|
STATIC_ROOT = BASE_DIR.parent / 'collected_static'
|
||||||
|
@ -130,10 +132,10 @@ STATICFILES_DIRS = [
|
||||||
]
|
]
|
||||||
|
|
||||||
MIDDLEWARE = [
|
MIDDLEWARE = [
|
||||||
'django.middleware.common.CommonMiddleware',
|
'django.middleware.common.CommonMiddleware',
|
||||||
'django.contrib.sessions.middleware.SessionMiddleware',
|
'django.contrib.sessions.middleware.SessionMiddleware',
|
||||||
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
'django.contrib.auth.middleware.AuthenticationMiddleware',
|
||||||
'django.contrib.messages.middleware.MessageMiddleware',
|
'django.contrib.messages.middleware.MessageMiddleware',
|
||||||
'conservancy.middleware.ForceCanonicalHostnameMiddleware',
|
'conservancy.middleware.ForceCanonicalHostnameMiddleware',
|
||||||
# 'django.middleware.doc.XViewMiddleware',
|
# 'django.middleware.doc.XViewMiddleware',
|
||||||
]
|
]
|
||||||
|
|
|
@ -49,14 +49,12 @@ urlpatterns = [
|
||||||
url(r'^about', static_views.index),
|
url(r'^about', static_views.index),
|
||||||
url(r'^activities', static_views.index),
|
url(r'^activities', static_views.index),
|
||||||
url(r'^donate', static_views.index),
|
url(r'^donate', static_views.index),
|
||||||
url(r'^copyleft-compliance', static_views.index,
|
url(r'^copyleft-compliance', static_views.index, {'fundraiser_sought': 'vmware-match-0'}),
|
||||||
{'fundraiser_sought' : 'vmware-match-0'}),
|
|
||||||
url(r'^learn', static_views.index),
|
url(r'^learn', static_views.index),
|
||||||
url(r'^press', static_views.index),
|
url(r'^press', static_views.index),
|
||||||
url(r'^projects', static_views.index),
|
url(r'^projects', static_views.index),
|
||||||
url(r'^GiveUpGitHub', static_views.index),
|
url(r'^GiveUpGitHub', static_views.index),
|
||||||
url(r'^npoacct', static_views.index,
|
url(r'^npoacct', static_views.index, {'fundraiser_sought': 'npoacct'}),
|
||||||
{'fundraiser_sought' : 'npoacct'}),
|
|
||||||
url(r'^contractpatch', include('conservancy.apps.contractpatch.urls')),
|
url(r'^contractpatch', include('conservancy.apps.contractpatch.urls')),
|
||||||
url(r'^overview', static_views.index),
|
url(r'^overview', static_views.index),
|
||||||
url(r'^privacy-policy', static_views.index),
|
url(r'^privacy-policy', static_views.index),
|
||||||
|
|
Loading…
Reference in a new issue