From c57db296aaa73e54193d12c482e2b15842e802d7 Mon Sep 17 00:00:00 2001 From: Tomislav R Date: Sun, 24 Apr 2016 01:15:58 +0200 Subject: [PATCH] url structure fix ungleich --- dynamicweb/urls.py | 3 +-- .../templates/ungleich_page/includes/_contact_us.html | 2 +- ungleich_page/urls.py | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/dynamicweb/urls.py b/dynamicweb/urls.py index b8d10e19..cc8fcab3 100644 --- a/dynamicweb/urls.py +++ b/dynamicweb/urls.py @@ -26,8 +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'^login/',include(membership_urls)), - url(r'^$',include('ungleich_page.urls',namespace='ungleich_page'),name="ungleich_page"), + url(r'^',include('ungleich_page.urls',namespace='ungleich_page'),name='ungleich_page'), url(r'^', include('cms.urls')), ) diff --git a/ungleich_page/templates/ungleich_page/includes/_contact_us.html b/ungleich_page/templates/ungleich_page/includes/_contact_us.html index 055c92f1..b2c19f62 100644 --- a/ungleich_page/templates/ungleich_page/includes/_contact_us.html +++ b/ungleich_page/templates/ungleich_page/includes/_contact_us.html @@ -1,4 +1,4 @@ -{% load static %} +{% load static meta%} {% load i18n %}
diff --git a/ungleich_page/urls.py b/ungleich_page/urls.py index c0ce1feb..3dcc97eb 100644 --- a/ungleich_page/urls.py +++ b/ungleich_page/urls.py @@ -2,8 +2,7 @@ from django.conf.urls import url from .views import ContactView, LandingView from django.utils.translation import ugettext_lazy as _ - urlpatterns = [ - url(_(r'contact/?$'), ContactView.as_view(), name='contact'), url(r'', LandingView.as_view(), name='landing'), + url(_(r'contact/$'), ContactView.as_view(), name='contact'), ]