remotes/origin/yandex
Bachurin Sergey 12 years ago
parent ca01228c7b
commit 70325e6491
  1. 40
      project/settings.py
  2. 4
      project/urls.py
  3. 3
      requirements-dev.txt
  4. 6
      requirements.txt

@ -109,11 +109,29 @@ MIDDLEWARE_CLASSES = (
'django.contrib.messages.middleware.MessageMiddleware',
# Uncomment the next line for simple clickjacking protection:
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'django.middleware.locale.LocaleMiddleware',
'django.middleware.doc.XViewMiddleware',
'cms.middleware.page.CurrentPageMiddleware',
'cms.middleware.user.CurrentUserMiddleware',
'cms.middleware.toolbar.ToolbarMiddleware',
'cms.middleware.language.LanguageCookieMiddleware',
# my
'project.customer.middleware.ProfileMiddleware',
)
TEMPLATE_CONTEXT_PROCESSORS = (
'django.contrib.auth.context_processors.auth',
'django.contrib.messages.context_processors.messages',
'django.core.context_processors.i18n',
'django.core.context_processors.request',
'django.core.context_processors.media',
'django.core.context_processors.static',
'cms.context_processors.cms_settings',
'sekizai.context_processors.sekizai',
)
ROOT_URLCONF = 'project.urls'
# Python dotted path to the WSGI application used by Django's runserver.
@ -134,13 +152,20 @@ INSTALLED_APPS = (
'django.contrib.messages',
'django.contrib.staticfiles',
# Uncomment the next line to enable the admin:
'django.contrib.admin',
# Uncomment the next line to enable admin documentation:
'django.contrib.admindocs',
'pytils',
'django_filters',
'autocomplete_light',
'cms',
'cms', # django CMS itself
'mptt', # utilities for implementing a modified pre-order traversal tree
'menus', # helper for model independent hierarchical website navigation
'sekizai', # for javascript and css management
'djangocms_admin_style', # for the admin skin. You **must** add 'djangocms_admin_style' in the list before 'django.contrib.admin'.
'django.contrib.messages', # to enable messages framework (see :ref:`Enable messages <enable-messages>`)
'django.contrib.admin',
'django.contrib.admindocs',
# my apps
'project.commons',
@ -194,6 +219,15 @@ PDF_FONTS_ROOT = path('pdf_fonts')
XLS_ROOT = path('xls_templates')
LANGUAGES = (
('ru', 'Russian'),
#('en', gettext('English')),
)
CMS_TEMPLATES = (
('pages/index.html', 'Index Page'),
('template_2.html', 'Template Two'),
)
try:
from project.local_settings import *
except ImportError:

@ -18,11 +18,11 @@ urlpatterns = patterns('',
# Uncomment the next line to enable the admin:
url(r'^admin/', include(admin.site.urls)),
url(r'autocomplete/', include('autocomplete_light.urls')),
url(r'^$', 'project.pages.views.site_index', name='site_index'),
# url(r'^$', 'project.pages.views.site_index', name='site_index'),
url(r'^my/', include('project.customer.urls')),
url(r'^my/docs/', include('project.docs.urls')),
url(r'^user/', include('project.myauth.urls')),
url(r'^', include('cms.urls')),
)

@ -14,9 +14,10 @@ pytils==0.2.3
psycopg2
flup
django-autocomplete-light==1.4.9
django-cms==3.0.2
# dev
django-devserver
django-eml-email-backend
django-debug-toolbar
ipython
ipython

@ -1,4 +1,4 @@
Django==1.5.5
Django==1.5.8
South==0.8.2
pillow==2.2.1
simplejson==3.3.1
@ -14,9 +14,11 @@ pytils==0.2.3
psycopg2
flup
django-autocomplete-light==1.4.9
django-cms==3.0.2
# dev
#django-devserver
#django-eml-email-backend
django-debug-toolbar
ipython
ipython

Loading…
Cancel
Save