diff --git a/digitalglarus/templates/base_glarus.html b/digitalglarus/templates/base_glarus.html
index 429353fd..9f27cfb9 100644
--- a/digitalglarus/templates/base_glarus.html
+++ b/digitalglarus/templates/base_glarus.html
@@ -98,11 +98,9 @@
{% filter force_escape %} {% debug %} {% endfilter %}
#}
- {# {% show_menu 0 0 0 1 %}#}
-
- Home
-
+
+ Home
+
{% show_menu_below_id "digital-glarus-page" 0 %}
Supporters
diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py
index ac72fc26..b5329bab 100644
--- a/digitalglarus/urls.py
+++ b/digitalglarus/urls.py
@@ -5,9 +5,9 @@ from . import views
from .views import ContactView, IndexView, AboutView
urlpatterns = [
- url(r'^$', IndexView.as_view(), name='home'),
- url(_(r'home/?$'), IndexView.as_view(), name='home'),
- url(_(r'about/?$'), AboutView.as_view(), name='about'),
+# url(r'^$', IndexView.as_view(), name='home'),
+# url(_(r'home/?$'), IndexView.as_view(), name='home'),
+# url(_(r'about/?$'), AboutView.as_view(), name='about'),
url(_(r'contact/?$'), ContactView.as_view(), name='contact'),
url(_(r'supporters/?$'), views.supporters, name='supporters'),
url(r'calendar_api/(?P\d+)/(?P\d+)?$',views.CalendarApi.as_view()),
diff --git a/dynamicweb/settings/base.py b/dynamicweb/settings/base.py
index 49d9ba0e..6daec940 100644
--- a/dynamicweb/settings/base.py
+++ b/dynamicweb/settings/base.py
@@ -53,7 +53,6 @@ INSTALLED_APPS = (
'django.contrib.sites',
'easy_thumbnails',
'utils',
- 'ungleich_page',
'mptt',
'parler',
'taggit',
@@ -103,6 +102,7 @@ INSTALLED_APPS = (
'reversion',
# ungleich
'ungleich',
+ 'ungleich_page',
'hosting',
'digitalglarus',
'django_extensions',
diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py
index cc8fcab3..10fa0536 100644
--- a/dynamicweb/urls.py
+++ b/dynamicweb/urls.py
@@ -26,7 +26,7 @@ urlpatterns += i18n_patterns('',
url(r'^digitalglarus/', include('digitalglarus.urls',
namespace="digitalglarus"),name='digitalglarus'),
url(r'^blog/',include('ungleich.urls',namespace='ungleich')),
- url(r'^',include('ungleich_page.urls',namespace='ungleich_page'),name='ungleich_page'),
+ url(r'^ungleich_page/',include('ungleich_page.urls',namespace='ungleich_page'),name='ungleich_page'),
url(r'^', include('cms.urls')),
)
diff --git a/ungleich_page/templates/ungleich_page/landing.html b/ungleich_page/templates/ungleich_page/landing.html
index 79ec4338..d6444ec2 100644
--- a/ungleich_page/templates/ungleich_page/landing.html
+++ b/ungleich_page/templates/ungleich_page/landing.html
@@ -109,7 +109,7 @@
- {% include "ungleich_page/includes/_about.html" %}
+ {% include "ungleich_page/includes/_about.html" %}$
{% include "ungleich_page/includes/_team.html" %}
diff --git a/ungleich_page/urls.py b/ungleich_page/urls.py
index 3dcc97eb..6720bc6e 100644
--- a/ungleich_page/urls.py
+++ b/ungleich_page/urls.py
@@ -3,6 +3,6 @@ from .views import ContactView, LandingView
from django.utils.translation import ugettext_lazy as _
urlpatterns = [
- url(r'', LandingView.as_view(), name='landing'),
+ url(r'^$', LandingView.as_view(), name='landing'),
url(_(r'contact/$'), ContactView.as_view(), name='contact'),
]