diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py index 29c9dcb8..ac72fc26 100644 --- a/digitalglarus/urls.py +++ b/digitalglarus/urls.py @@ -5,13 +5,13 @@ from . import views from .views import ContactView, IndexView, AboutView urlpatterns = [ - url(r'', IndexView.as_view(), name='home'), + 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<month>\d+)/(?P<year>\d+)?$'),views.CalendarApi.as_view()), - url(_(r'calendar_api/'),views.CalendarApi.as_view()), + url(r'calendar_api/(?P<month>\d+)/(?P<year>\d+)?$',views.CalendarApi.as_view()), + url(r'calendar_api/',views.CalendarApi.as_view()), url(_(r'support-us/?$'), views.support, name='support'), url(r'^blog/(?P<slug>\w[-\w]*)/$', views.blog_detail, name='blog-detail'), url(r'blog/$', views.blog, name='blog'), diff --git a/membership/templates/login.html b/membership/templates/login.html index d199f601..6d1c981c 100644 --- a/membership/templates/login.html +++ b/membership/templates/login.html @@ -25,7 +25,7 @@ <div class="collapse navbar-collapse" id="navbar-ex-collapse"> <ul class="nav navbar-nav navbar-right"> <li class="active"> - <a href="{% url 'digitalglarus:index' %}">Home</a> + <a href="{% url 'digitalglarus:home' %}">Home</a> </li> <li> <a href="{% url 'digitalglarus:contact' %}">Contacts</a> diff --git a/membership/templates/membership.html b/membership/templates/membership.html index 335bc847..a9579709 100644 --- a/membership/templates/membership.html +++ b/membership/templates/membership.html @@ -38,7 +38,7 @@ <div class="collapse navbar-collapse" id="navbar-ex-collapse"> <ul class="nav navbar-nav navbar-right"> <li class="active"> - <a href="{% url 'digitalglarus:index' %}">Home</a> + <a href="{% url 'digitalglarus:home' %}">Home</a> </li> <li> <a href="{% url 'digitalglarus:contact' %}">Contacts</a>