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

Merge pull request #43 from tmslav/develop

Browse source 
new url structure
This commit is contained in:
tmslav 2016-04-23 20:13:34 +02:00
commit 17788cafb9
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
digitalglarus/urls.py
View file

@ -5,13 +5,13 @@ from . import views
from .views import ContactView, IndexView, AboutView from .views import ContactView, IndexView, AboutView
urlpatterns = [ 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'home/?$'), IndexView.as_view(), name='home'),
url(_(r'about/?$'), AboutView.as_view(), name='about'), url(_(r'about/?$'), AboutView.as_view(), name='about'),
url(_(r'contact/?$'), ContactView.as_view(), name='contact'), url(_(r'contact/?$'), ContactView.as_view(), name='contact'),
url(_(r'supporters/?$'), views.supporters, name='supporters'), 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/(?P<month>\d+)/(?P<year>\d+)?$',views.CalendarApi.as_view()),
url(_(r'calendar_api/'),views.CalendarApi.as_view()), url(r'calendar_api/',views.CalendarApi.as_view()),
url(_(r'support-us/?$'), views.support, name='support'), url(_(r'support-us/?$'), views.support, name='support'),
url(r'^blog/(?P<slug>\w[-\w]*)/$', views.blog_detail, name='blog-detail'), url(r'^blog/(?P<slug>\w[-\w]*)/$', views.blog_detail, name='blog-detail'),
url(r'blog/$', views.blog, name='blog'), url(r'blog/$', views.blog, name='blog'),

2
membership/templates/login.html
View file

@ -25,7 +25,7 @@
<div class="collapse navbar-collapse" id="navbar-ex-collapse"> <div class="collapse navbar-collapse" id="navbar-ex-collapse">
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li class="active"> <li class="active">
<a href="{% url 'digitalglarus:index' %}">Home</a> <a href="{% url 'digitalglarus:home' %}">Home</a>
</li> </li>
<li> <li>
<a href="{% url 'digitalglarus:contact' %}">Contacts</a> <a href="{% url 'digitalglarus:contact' %}">Contacts</a>

2
membership/templates/membership.html
View file

@ -38,7 +38,7 @@
<div class="collapse navbar-collapse" id="navbar-ex-collapse"> <div class="collapse navbar-collapse" id="navbar-ex-collapse">
<ul class="nav navbar-nav navbar-right"> <ul class="nav navbar-nav navbar-right">
<li class="active"> <li class="active">
<a href="{% url 'digitalglarus:index' %}">Home</a> <a href="{% url 'digitalglarus:home' %}">Home</a>
</li> </li>
<li> <li>
<a href="{% url 'digitalglarus:contact' %}">Contacts</a> <a href="{% url 'digitalglarus:contact' %}">Contacts</a>