fix menu styling, and urls for speakers+sponsors

This commit is contained in:
Thomas Steen Rasmussen 2016-06-06 22:02:59 +02:00
parent 5b2c35437b
commit c728e27c64
2 changed files with 3 additions and 21 deletions

View file

@ -31,7 +31,7 @@
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="/">
<img src="{% static 'img/logo-new.png' %}" class="img-responsive" />
<img src="{% static 'img/logo-new.png' %}" width="150" class="img-responsive" />
</a>
</div>

View file

@ -17,81 +17,63 @@ urlpatterns = [
TemplateView.as_view(template_name='frontpage.html'),
name='frontpage'
),
url(
r'info/',
TemplateView.as_view(template_name='info.html'),
name='info'
),
url(
r'contact/',
TemplateView.as_view(template_name='contact.html'),
name='contact'
),
url(
r'conduct/',
TemplateView.as_view(template_name='coc.html'),
name='conduct'
),
url(
r'call-for-sponsors/',
r'sponsors/',
TemplateView.as_view(template_name='sponsors.html'),
name='call-for-sponsors'
),
url(r'^sponsors/$', RedirectView.as_view(url=reverse_lazy('call-for-sponsors'), permanent=True)),
url(r'^sponsor/$', RedirectView.as_view(url=reverse_lazy('call-for-sponsors'), permanent=True)),
url(
r'call-for-speakers/',
r'speakers/',
TemplateView.as_view(template_name='speakers.html'),
name='call-for-speakers'
),
url(r'^speakers/$', RedirectView.as_view(url=reverse_lazy('call-for-speakers'), permanent=True)),
url(r'^speaker/$', RedirectView.as_view(url=reverse_lazy('call-for-speakers'), permanent=True)),
url(
r'^login/$',
LoginView.as_view(),
name='account_login',
),
url(
r'^logout/$',
LogoutView.as_view(),
name='account_logout',
),
url(
r'privacy-policy/$',
TemplateView.as_view(template_name='legal/privacy_policy.html'),
name='privacy-policy'
),
url(
r'general-terms-and-conditions/$',
TemplateView.as_view(template_name='legal/general_terms_and_conditions.html'),
name='general-terms'
),
url(
r'^profile/',
include('profiles.urls', namespace='profiles')
),
url(
r'^shop/',
include('shop.urls', namespace='shop')
),
url(
r'^news/',
include('news.urls', namespace='news')
),
url(r'^accounts/', include('allauth.urls')),
url(r'^admin/', include(admin.site.urls)),
]