Unverified Commit 47128457 authored by Thom Wiggers's avatar Thom Wiggers 📐
Browse files

Merge branch 'release/1.0.0'

parents c0e1e9bc 96acee11
{% extends "base.html" %}
{% load i18n %}
{% block title %}{% trans "Become active" %} — {{ block.super }}{% endblock %}
{% block body %}
<h1>{% trans "Become active" %}</h1>
......
{% extends "base.html" %}
{% load i18n %}
{% block title %}{% trans "Contact" %} — {{ block.super }}{% endblock %}
{% block body %}
<h1>{% trans "Contact" %}</h1>
......
{% extends "base.html" %}
{% load i18n %}
{% block title %}{% trans "for members"|capfirst %} — {{ block.super }}{% endblock %}
{% block body %}
<h1>{% trans "for members"|upper %}</h1>
......
{% extends "base.html" %}
{% load i18n %}
{% block title %}{% trans "Sister Associations" %} — {{ block.super }}{% endblock %}
{% block body %}
<h1>{% trans "Associations of the Radboud University Science Faculty" %}</h1>
<ul>
......
......@@ -74,7 +74,7 @@ urlpatterns = [
url(r'^become-active/', TemplateView.as_view(template_name='singlepages/become_active.html'), name='become-active'),
url(r'^photos/', include('photos.urls')),
url(r'^statistics/', members.views.statistics, name='statistics'),
url(r'^styleguide/', TemplateView.as_view(template_name='singlepages/styleguide.html'), name='styleguide'),
url(r'^styleguide/', views.styleguide, name='styleguide'),
])),
url(r'^career/', include('partners.urls')),
url(r'^contact$', TemplateView.as_view(template_name='singlepages/contact.html'), name='contact'),
......
from django.conf import settings
from django.contrib.auth import authenticate
from django.contrib.admin.views.decorators import staff_member_required
from django.contrib.auth.decorators import login_required
from django.http import (HttpResponseBadRequest,
HttpResponseForbidden, JsonResponse)
from django.shortcuts import render
from django.utils import timezone
from django.views.decorators.csrf import csrf_exempt
from django.views.decorators.http import require_POST
......@@ -10,6 +12,11 @@ from django.views.decorators.http import require_POST
from members.models import Member
@login_required
def styleguide(request):
return render(request, 'singlepages/styleguide.html')
@require_POST
@csrf_exempt
def wiki_login(request):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment