diff options
Diffstat (limited to 'pv')
-rw-r--r-- | pv/settings.py | 7 | ||||
-rw-r--r-- | pv/urls.py | 15 | ||||
-rw-r--r-- | pv/wsgi.py | 3 |
3 files changed, 15 insertions, 10 deletions
diff --git a/pv/settings.py b/pv/settings.py index cf1da74..7ef0067 100644 --- a/pv/settings.py +++ b/pv/settings.py @@ -1,12 +1,13 @@ # Django settings for pv project. import os.path + PROJECT_DIR = os.path.dirname(__file__) DEBUG = True TEMPLATE_DEBUG = DEBUG -ADMINS = ( ) +ADMINS = () MANAGERS = ADMINS @@ -42,7 +43,7 @@ SECRET_KEY = '' TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', -# 'django.template.loaders.eggs.Loader', + # 'django.template.loaders.eggs.Loader', ) MIDDLEWARE_CLASSES = ( @@ -74,7 +75,7 @@ INSTALLED_APPS = ( TINYMCE_JS_URL = '/static/js/tiny_mce/tiny_mce.js' TINYMCE_DEFAULT_CONFIG = { - 'plugins' : 'contextmenu', + 'plugins': 'contextmenu', 'theme': 'advanced', 'theme_advanced_toolbar_location': 'top', } @@ -5,15 +5,18 @@ from django.contrib import admin admin.autodiscover() from program.views import json_day_schedule -urlpatterns = patterns('', + +urlpatterns = patterns( + '', (r'^admin/', include(admin.site.urls)), (r'^program/', include('program.urls')), (r'^nop', include('nop.urls')), (r'^tinymce/', include('tinymce.urls')), - url(r'^export/day_schedule/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', json_day_schedule), -) + url(r'^export/day_schedule/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', + json_day_schedule)) if settings.DEBUG: - urlpatterns += patterns('', - (r'^site_media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT}) - ) + urlpatterns += patterns( + '', + (r'^site_media/(?P<path>.*)$', 'django.views.static.serve', + {'document_root': settings.MEDIA_ROOT})) @@ -13,7 +13,8 @@ middleware here, or combine a Django application with an application of another framework. """ -import os, sys +import os +import sys sys.path.append('/var/www/pv') |