Merge pull request #48 from tmslav/develop

url structure fix ungleich

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')),
                              )
 

ungleich_page/templates/ungleich_page/includes/_contact_us.html

@@ -1,4 +1,4 @@
-{% load static %}
+{% load static meta%}
 {% load i18n %}
 
 <section id="contact">

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'),
 ]