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

Merge pull request #48 from tmslav/develop

Browse source 
url structure fix ungleich
This commit is contained in:
tmslav 2016-04-24 01:16:38 +02:00
commit 7ac715684e
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dynamicweb/urls.py
View file

@ -26,8 +26,7 @@ urlpatterns += i18n_patterns('',
url(r'^digitalglarus/', include('digitalglarus.urls', url(r'^digitalglarus/', include('digitalglarus.urls',
namespace="digitalglarus"),name='digitalglarus'), namespace="digitalglarus"),name='digitalglarus'),
url(r'^blog/',include('ungleich.urls',namespace='ungleich')), 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')), url(r'^', include('cms.urls')),
) )

2
ungleich_page/templates/ungleich_page/includes/_contact_us.html
View file

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

3
ungleich_page/urls.py
View file

@ -2,8 +2,7 @@ from django.conf.urls import url
from .views import ContactView, LandingView from .views import ContactView, LandingView
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
urlpatterns = [ urlpatterns = [
url(_(r'contact/?$'), ContactView.as_view(), name='contact'),
url(r'', LandingView.as_view(), name='landing'), url(r'', LandingView.as_view(), name='landing'),
url(_(r'contact/$'), ContactView.as_view(), name='contact'),
] ]