Merge branch 'master' into develop

dynamicweb/settings/base.py

@@ -131,13 +131,14 @@ ROOT_URLCONF = 'dynamicweb.urls'
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [
-            os.path.join(PROJECT_DIR, 'membership/'),  # membership template
-            os.path.join(PROJECT_DIR, 'templates/'),
-            os.path.join(PROJECT_DIR, 'templates/digitalglarus/partials'),
-            os.path.join(PROJECT_DIR, 'templates/cms'),
-            os.path.join(PROJECT_DIR, 'templates/digitalglarus'),
-        ],
+        'DIRS': [os.path.join(PROJECT_DIR,'cms_templates/'),
+                 os.path.join(PROJECT_DIR,'cms_templates/djangocms_blog/'),
+                 os.path.join(PROJECT_DIR,'membership'),
+                 os.path.join(PROJECT_DIR,'ungleich/templates/djangocms_blog/'),
+                 os.path.join(PROJECT_DIR,'ungleich/templates/cms/ungleichch'),
+                 os.path.join(PROJECT_DIR,'ungleich/templates/ungleich')
+
+                  ],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -158,11 +159,20 @@ TEMPLATES = [
 
 WSGI_APPLICATION = 'dynamicweb.wsgi.application'
 
-TDIR = os.path.join(PROJECT_DIR, 'templates')
-
-CMS_TEMPLATES_DIR = {
-    1: os.path.join(TDIR, '')
-}
+CMS_TEMPLATES = (
+    ('base_glarus.html', gettext('default')),
+    ('one_column.html', gettext('2 Column')),
+    ('two_columns.html', gettext('3 Column')),
+    ('about.html', gettext('DG.About')),
+    ('contact.html', gettext('DG.Contact')),
+    ('index.html', gettext('DG.Home')),
+    ('letscowork.html', gettext('DG.CoWork')),
+    # ('detail.html', gettext('DG.Detail')),
+    ('one_column.html', gettext('DG.OneColumn')),
+    #ungleich
+    ('blog_ungleich.html', gettext('Blog')),
+    ('page.html', gettext('Page')),
+)
 
 DATABASES = {
     'default': {

dynamicweb/urls.py

@@ -18,6 +18,8 @@ urlpatterns = [
 
 # note the django CMS URLs included via i18n_patterns
 urlpatterns += i18n_patterns('',
+                             url(r'^$',include('ungleich.urls')),
+                             url(r'^blog/',include('ungleich.urls',namespace='ungleich')),
                              url(r'^login/',include(membership_urls)),
                              url(r'^admin/', include(admin.site.urls)),
                              url(r'^digitalglarus/', include('digitalglarus.urls',