mravi/dynamicweb
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

django version update #3

Browse source
This commit is contained in:
Tomislav R 2016-02-29 23:28:31 +01:00
commit 0558d6e396
17 changed files with 153 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

9
dynamicweb/settings/base.py
View file

@ -146,13 +146,8 @@ TEMPLATE_CONTEXT_PROCESSORS = (
)
TEMPLATE_DIRS = (
os.path.join(PROJECT_DIR, 'templates'),
os.path.join(PROJECT_DIR, 'templates'),os.path.join(PROJECT_DIR, 'templates/cms/'),
)
CMS_TEMPLATES_DIR = {
1: os.path.join(TEMPLATE_DIRS[0], 'cms/'),
}
# Database
# https://docs.djangoproject.com/en/1.8/ref/settings/#databases
@ -283,7 +278,7 @@ META_USE_SITES = True
MIGRATION_MODULES = {
'cms': 'cms.migrations',
'filer': 'filer.migrations_django',
# 'filer': 'filer.migrations_django',
'menus': 'menus.migrations_django',
'djangocms_flash': 'djangocms_flash.migrations_django',
'djangocms_googlemap': 'djangocms_googlemap.migrations_django',

22
dynamicweb/urls.py
View file

@ -8,20 +8,20 @@ from django.conf import settings
from hosting.views import railshosting
urlpatterns = [
url(r'^hosting/', include('hosting.urls', namespace="hosting")),
url(r'^railshosting/', railshosting, name="rails.hosting"),
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
url(r'^jsi18n/(?P<packages>\S+?)/$',
'django.views.i18n.javascript_catalog'),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
url(r'^hosting/', include('hosting.urls', namespace="hosting")),
url(r'^railshosting/', railshosting, name="rails.hosting"),
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
url(r'^jsi18n/(?P<packages>\S+?)/$',
'django.views.i18n.javascript_catalog'),
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
# note the django CMS URLs included via i18n_patterns
urlpatterns += i18n_patterns('',
url(r'^admin/', include(admin.site.urls)),
url(r'^digitalglarus/', include('digitalglarus.urls',
namespace="digitalglarus")),
url(r'^', include('cms.urls')),
)
url(r'^admin/', include(admin.site.urls)),
url(r'^digitalglarus/', include('digitalglarus.urls',
namespace="digitalglarus")),
url(r'^', include('cms.urls')),
)
if settings.DEBUG:
urlpatterns += patterns('',