Unverified Commit 14845d51 authored by Joost Rijneveld's avatar Joost Rijneveld
Browse files

Merge branch 'master' into 19-become-a-member-page

Conflicts:
	website/thaliawebsite/locale/nl/LC_MESSAGES/django.mo
	website/thaliawebsite/locale/nl/LC_MESSAGES/django.po
	website/thaliawebsite/menus.py
parents d713a589 facf03f9
{% extends "base.html" %}
{% load i18n %}
{% block page_title %}{% trans "Contact" %}{% endblock %}
{% block body %}
<h1>{% trans "Contact" %}</h1>
<table class="table">
<tr>
<td>{% trans "Faculty:" %}</td>
<td>{% trans "Faculty of Science" %}</td>
</tr>
<tr>
<td>{% trans "Room:" %}</td>
<td>HG00.150</td>
</tr>
<tr>
<td valign="top">{% trans "Address:" %}</td>
<td>Heyendaalseweg 135<br>6525 AJ Nijmegen<br>{% trans "Board room: HG00.150 (above the north-canteen)" %}</td>
</tr>
<tr>
<td valign="top">{% trans "Postal address:" %}</td>
<td>Postbus 9010<br>6500 GL Nijmegen</td>
</tr>
<tr>
<td>{% trans "Telephone:" %}</td>
<td>024 - 3652079</td>
</tr>
<tr>
<td>{% trans "Voicemailbox:" %}</td>
<td>084 - 8339677</td>
</tr>
<tr>
<td valign="top">{% trans "Email:" %}</td>
<td>
<a href="mailto:info@thalia.nu">info@thalia.nu</a> {% trans "general" %}<br>
<a href="mailto:samenwerking@thalia.nu">samenwerking@thalia.nu</a> {% trans "communication w.r.t. promoting your company (activities)" %}
</td>
</tr>
<tr>
<td valign="top">Kamer van Koophandel:</td>
<td>40146464</td>
</tr>
<tr>
<td valign="top">IBAN:</td>
<td>NL23INGB0006234184</td>
</tr>
<tr>
<td valign="top">{% trans "VAT number:" %}</td>
<td>NL800232483B02</td>
</tr>
</table>
{% endblock %}
{% extends "base.html" %}
{% load i18n %}
{% block page_title %}{% trans "Sister Associations" %}{% endblock %}
{% block body %}
<h1>{% trans "Associations of the Radboud University Science Faculty" %}</h1>
<ul>
<li><a href="http://www.beevee.nl/home.php">BeeVee ({% trans "(Medical) Biology" %})</a></li>
<li><a href="http://svcognac.nl/">CognAC ({% trans "Artificial Intelligence" %})</a></li>
<li><a href="http://www.desda.org/">DESDA ({% trans "Mathematics" %})</a></li>
<li><a href="http://www.leonardo.science.ru.nl/">Leonardo da Vinci ({% trans "Science" %})</a></li>
<li><a href="http://www.marie-curie.nl/">Marie Curie ({% trans "Physics and Astronomy" %})</a></li>
<li><a href="http://www.olympus.science.ru.nl/">Olympus ({% trans "Science faculty umbrella association" %})</a></li>
<li><a href="https://www.vcmw-sigma.nl/home">Sigma ({% trans "Molecular Sciences" %})</a></li>
</ul>
<h1>{% trans "Sister Associations" %}</h1>
<ul>
<li><a href="https://www.abacus.utwente.nl/">Abacus ({% trans "University of Twente" %})</a></li>
<li><a href="http://www.a-eskwadraat.nl/">A-Eskwadraat ({% trans "Utrecht University" %})</a></li>
<li><a href="http://ch.tudelft.nl/">Christiaan Huygens ({% trans "Delft University of Technology" %})</a></li>
<li><a href="http://www.svcover.nl/">Cover ({% trans "University of Groningen" %})</a></li>
<li><a href="http://www.deleidscheflesch.nl/">De Leidsche Flesch ({% trans "Leiden University" %})</a></li>
<li><a href="http://www.fmf.nl/">FMF ({% trans "University of Groningen" %})</a></li>
<li><a href="http://www.gewis.nl/">GEWIS ({% trans "Eindhoven University of Technology" %})</a></li>
<li><a href="https://www.inter-actief.utwente.nl/">Inter-<i>Actief</i> ({% trans "University of Twente" %})</a></li>
<li><a href="http://nsaweb.nl/">NSA ({% trans "University of Amsterdam" %})</a></li>
<li><a href="http://www.stickyutrecht.nl/">Sticky ({% trans "Utrecht University" %})</a></li>
<li><a href="http://www.storm.vu/">STORM ({% trans "VU University Amsterdam" %})</a></li>
<li><a href="http://www.svia.nl/">via ({% trans "University of Amsterdam" %})</a></li>
</ul>
{% endblock %}
......@@ -25,9 +25,15 @@ urlpatterns = [
url(r'^members/', include('members.urls', namespace='members')),
url(r'^nyi$', TemplateView.as_view(template_name='status/nyi.html'), name='#'),
url(r'^association/', include([
url(r'^sister-associations', TemplateView.as_view(template_name='singlepages/sister_associations.html'), name='sister-associations'),
url(r'^documents/', include('documents.urls', namespace='documents')),
url(r'^become-a-member/', members.views.become_a_member, name='become-a-member'),
])),
url(r'^for-members/', include([
url(r'^become-active', TemplateView.as_view(template_name='singlepages/become_active.html'), name='become-active'),
])),
url(r'^contact$', TemplateView.as_view(template_name='singlepages/contact.html'), name='contact'),
# Default login helpers
url(r'^', include('django.contrib.auth.urls')),
url(r'^i18n/', include('django.conf.urls.i18n')),
]
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