Commit e20d1a78 authored by Sébastiaan Versteeg's avatar Sébastiaan Versteeg Committed by Sébastiaan Versteeg
Browse files

Migrate education to new template

parent 2bb6d6cd
......@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-31 13:12+0200\n"
"PO-Revision-Date: 2018-08-31 13:22+0200\n"
"POT-Creation-Date: 2018-10-13 16:20+0200\n"
"PO-Revision-Date: 2018-10-13 16:22+0200\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
......@@ -168,6 +168,7 @@ msgid "summaries"
msgstr "samenvattingen"
#: templates/education/add_exam.html templates/education/course.html
#: templates/education/courses.html
msgid "Submit Exam"
msgstr "Tentamen Insturen"
......@@ -180,6 +181,7 @@ msgid "submit"
msgstr "insturen"
#: templates/education/add_summary.html templates/education/course.html
#: templates/education/courses.html
msgid "Submit Summary"
msgstr "Samenvatting Insturen"
......@@ -226,14 +228,6 @@ msgstr ""
"Er zijn bij Thalia helaas geen documenten bekend over dit vak. Ben jij in "
"het bezit van tentamens of samenvattingen over dit vak? Laat het ons weten!"
#: templates/education/course.html
msgid "Exams"
msgstr "Tentamens"
#: templates/education/course.html
msgid "Summaries"
msgstr "Samenvattingen"
#: templates/education/course.html
#, python-format
msgid ""
......@@ -243,6 +237,14 @@ msgstr ""
"Deze documenten zijn van de cursus <a href=\"%(course_url)s\">"
"%(course_name)s</a>, een voorloper van dit vak."
#: templates/education/course.html
msgid "Exams"
msgstr "Tentamens"
#: templates/education/course.html
msgid "Summaries"
msgstr "Samenvattingen"
#: templates/education/course.html
#, python-format
msgid ""
......@@ -260,7 +262,7 @@ msgstr ""
"Houd er rekening mee dat oude tentamens en samenvattingen niet altijd "
"representatief zijn voor wat er dit jaar wordt getoetst."
#: templates/education/course.html
#: templates/education/course.html templates/education/courses.html
msgid "Course code"
msgstr "Cursus code"
......@@ -287,6 +289,20 @@ msgstr ""
msgid "all courses"
msgstr "alle vakken"
#: templates/education/courses.html
msgid "Name"
msgstr "Naam"
#: templates/education/courses.html
#, fuzzy
#| msgid "categories"
msgid "Categories"
msgstr "categorieën"
#: templates/education/courses.html
msgid "Available documents"
msgstr "Beschikbare documenten"
#: templates/education/student_participation.html
msgid "Student Participation"
msgstr "Medezeggenschap"
......@@ -297,40 +313,44 @@ msgstr "De Opleidingscommisie"
#: templates/education/student_participation.html
msgid ""
"<p>The Education Program Committee (EPC) is responsible for giving advice "
"The Education Program Committee (EPC) is responsible for giving advice "
"concerning education and exam regulations, that have to be approved every "
"year, and evaluate the quality of education. The EPC consists of six "
"students and six teachers. The EPC considers both course evaluations and "
"teacher's reactions to those, and evaluates the quality of the courses. They "
"also give advice, even unsolicited, to the Director of Education and dean.</"
"p> <p>The EPC meets every month and works good with, but independently from "
"the Board of Directors. Together, students and teachers think about "
"education in order to improve its quality for everyone. The EPC has their "
"own page at Radboudnet. You can also read more about the students that take "
"place in the EPC on their <a href=\"https://www.facebook.com/"
"OLCInformaticaInformatiekunde/\">Facebook page</a>.</p>"
"also give advice, even unsolicited, to the Director of Education and dean."
msgstr ""
"De opleidingscommissie is verantwoordelijk voor het advies uitbrengen over "
"de onderwijs- en examenregeling, die ieder jaar opnieuw goedgekeurd moet "
"worden, en het beoordelen van de kwaliteit van onderwijs. De OLC bestaat uit "
"zes studenten en zes docenten. De OLC bekijkt de vakevaluaties en de "
"reacties van de docenten daarop, en beoordeelt de kwaliteit van de vakken. "
"Daarnaast brengen we advies uit, ook ongevraagd, aan de onderwijsdirecteur "
"en decaan."
#: templates/education/student_participation.html
msgid ""
"The EPC meets every month and works with, but independently from the Board "
"of Directors. Together, students and teachers think about education in order "
"to improve its quality for everyone. The EPC has their own page at "
"Radboudnet. You can also read more about the students that take place in the "
"EPC on their <a href=\"https://www.facebook.com/"
"OLCInformaticaInformatiekunde/\">Facebook page</a>."
msgstr ""
"<p>De opleidingscommissie is verantwoordelijk voor het advies uitbrengen "
"over de onderwijs- en examenregeling, die ieder jaar opnieuw goedgekeurd "
"moet worden, en het beoordelen van de kwaliteit van onderwijs. De OLC "
"bestaat uit zes studenten en zes docenten. De OLC bekijkt de vakevaluaties "
"en de reacties van de docenten daarop, en beoordeelt de kwaliteit van de "
"vakken. Daarnaast brengen we advies uit, ook ongevraagd, aan de "
"onderwijsdirecteur en decaan.</p> <p>De OLC vergadert doorgaans iedere "
"maand, en werkt goed maar onafhankelijk samen met de directie. Docenten en "
"studenten denken samen na over het onderwijs om de kwaliteit voor iedereen "
"te verbeteren. De OLC heeft ook haar eigen pagina op Radboudnet. Daarnaast "
"kan je meer lezen over de studenten die in de OLC zitten op hun <a href="
"\"https://www.facebook.com/OLCInformaticaInformatiekunde/\">Facebookpagina</"
"a>.</p>"
"De OLC vergadert doorgaans iedere maand, en werkt goed maar onafhankelijk "
"samen met de directie. Docenten en studenten denken samen na over het "
"onderwijs om de kwaliteit voor iedereen te verbeteren. De OLC heeft ook haar "
"eigen pagina op Radboudnet. Daarnaast kan je meer lezen over de studenten "
"die in de OLC zitten op hun <a href=\"https://www.facebook.com/"
"OLCInformaticaInformatiekunde/\">Facebookpagina</a>."
#: templates/education/student_participation.html
msgid "Faculty Student Council"
msgstr "De Facultaire Studentenraad"
msgstr "Facultaire Studentenraad"
#: templates/education/student_participation.html
msgid ""
"<p>The Faculty of Science has their own student participation organ that "
"The Faculty of Science has their own student participation organ that "
"concerns itself with matters that are important to our faculty. This ranges "
"from an expension of the computer rooms to more lenient opening hours to "
"changes concerning education. The Faculty Student Council is open for all "
......@@ -340,9 +360,8 @@ msgid ""
"Council tries to tackle all problems and make sure that the Faculty of "
"Science remains the best faculty at our university. You can read more about "
"the Faculty Student Council <a href=\"http://www.ru.nl/fnwi/fsr/\">here</a>."
"</p>"
msgstr ""
"<p>De bètafaculteit heeft een eigen medezeggeschapsorgaan dat meedenkt en "
"De bètafaculteit heeft een eigen medezeggeschapsorgaan dat meedenkt en "
"besluit over zaken die onze faculteit aangaan. Dit kan bijvoorbeeld gaan om "
"een uitbreiding van de computerruimtes tot verruiming van de openingstijden "
"en veranderingen in het onderwijs. De FSR staat open voor alle suggesties "
......@@ -351,28 +370,28 @@ msgstr ""
"tijd gekregen voor een tentamen door surveillanten? Vind je dat je te lang "
"moet wachten voor de studentenbalie? De FSR probeert alle onrecht en "
"problemen aan te pakken en de fijnste faculteit van de universiteit te "
"blijven. Je kan <a href=\"ḧttp://www.ru.nl/fnwi/fsr/\">hier</a> meer over "
"de FSR lezen.</p>"
"blijven. Je kan <a href=\"ḧttp://www.ru.nl/fnwi/fsr/\">hier</a> meer over de "
"FSR lezen."
#: templates/education/student_participation.html
msgid "University Student Council"
msgstr "De Universitaire Studentenraad"
msgstr "Universitaire Studentenraad"
#: templates/education/student_participation.html
msgid ""
"<p>The University Student Council (USC) is concerned with all issues that "
"The University Student Council (USC) is concerned with all issues that "
"concern the entire university. One could think of the opening hours of the "
"university library or the renting of rooms for student organizations. The "
"USC consists of fourteen members. Eight are chosen by students and the other "
"six represent different student organizations from the university. You can "
"read more about the USC <a href=\"http://www.ru.nl/usr/\">here</a>.</p>"
"read more about the USC <a href=\"http://www.ru.nl/usr/\">here</a>."
msgstr ""
"<p>De Universitaire Studentenraad (USR) houdt zich bezig met allerlei "
"problemen die de gehele universiteit aangaan, zoals de openingsuren van de "
"bibliotheek of het huren van lokalen door studentenorganizaties. De USR "
"bestaat uit veertien leden. Acht daarvan worden gekozen door de studenten en "
"de andere zes representeren verschillende studentenorganisaties. Je kan <a "
"href=\"http://www.ru.nl/usr/\">hier</a> meer lezen over de USR.</p>"
"De Universitaire Studentenraad (USR) houdt zich bezig met allerlei problemen "
"die de gehele universiteit aangaan, zoals de openingsuren van de bibliotheek "
"of het huren van lokalen door studentenorganizaties. De USR bestaat uit "
"veertien leden. Acht daarvan worden gekozen door de studenten en de andere "
"zes representeren verschillende studentenorganisaties. Je kan <a href="
"\"http://www.ru.nl/usr/\">hier</a> meer lezen over de USR."
#: views.py
msgid "Summary"
......
.thimbus-page {
.portfolio {
.course-name-depiction-box {
display: inline-block;
width: 100%;
height: 100px;
position: relative;
}
.course-name-shorthand-box {
position: absolute;
bottom: 3px;
}
.course-name-shorthand-title {
text-align: center;
width: 100%;
font-size: 70px;
color: #e62272;
white-space: nowrap;
}
.course-name-shorthand-subtitle {
font-size: 40px;
}
p.course-cat {
margin: 0 20px;
margin-top: 6px;
color: white;
}
.has-overlay .post-inner:hover .post-overlay-meta.course-overlay {
top: 55px;
}
.course-overlay {
h2 {
font-size: 18px;
font-family: 'Open Sans';
text-transform: none;
}
}
}
.btn-large {
min-height: 40px;
height: auto;
}
#id_exam_date_day {
width: 60px;
}
#id_exam_date_month {
width: 33%;
}
#id_exam_date_year {
width: 20%;
}
}
$(function () {
mixitup('#education-courses', {
selectors: {
control: '.nav-link'
},
animation: {
enable: false
}
});
$('.table-clickable tbody tr').click(function() {
window.location = $(this).data('link');
})
});
{% extends 'education/base.html' %}
{% load i18n fieldtype %}
{% load i18n fieldtype bootstrap4 %}
{% block title %}{% trans "Submit Exam" %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans "Submit Exam" %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans "Submit Exam" %} —
{{ block.super }}{% endblock %}
{% block body %}
<h1>{% trans "Submit Exam" %}</h1>
{% if saved %}
<div class="alert alert-success">
{% trans "Exam submitted successfully." %}
<button class="close" type="button"><span class="alert-icon-close"></span></button>
</div>
{% endif %}
<form method="post" enctype="multipart/form-data" class="form-horizontal span8 offset2">
{% csrf_token %}
{% for field in form %}
<div class="control-group row {% if field.errors %}error{% endif %}">
<label class="control-label" for="{{ field.name }}">{{ field.label_tag }}</label>
<div class="controls">
{{ field }}
{% for error in field.errors %}
<span class="help-block">{{ error|escape }}</span>
<section class="page-section">
<div class="container">
<h1 class="text-center section-title">
{% trans "Submit Exam" %}
</h1>
{% if saved %}
<div class="alert alert-success alert-dismissible">
{% trans "Exam submitted successfully." %}
<button type="button" class="close" data-dismiss="alert"
aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
{% endif %}
<form method="post" enctype="multipart/form-data"
class="col-lg-6 offset-lg-3">
{% csrf_token %}
<input type="hidden" name="next" value="{{ next }}">
{% for field in form %}
{% bootstrap_field field show_help=False %}
{% endfor %}
</div>
</div>
{% endfor %}
<input type="submit" value="{% trans 'submit'|capfirst %}" class="btn btn-style1 pull-right login" />
</form>
<div class="form-group">
<input type="submit" value="{% trans "submit"|capfirst %}"
class="btn btn-primary float-right">
</div>
</form>
</div>
</section>
{% endblock %}
{% extends 'education/base.html' %}
{% load i18n fieldtype %}
{% load i18n fieldtype bootstrap4 %}
{% block title %}{% trans "Submit Summary" %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans "Submit Summary" %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans "Submit Summary" %} —
{{ block.super }}{% endblock %}
{% block body %}
<h1>{% trans "Submit Summary" %}</h1>
{% if saved %}
<div class="alert alert-success">
{% trans "Summary submitted successfully." %}
<button class="close" type="button"><span class="alert-icon-close"></span></button>
</div>
{% endif %}
<form method="post" enctype="multipart/form-data" class="form-horizontal span8 offset2">
{% csrf_token %}
{% for field in form %}
<div class="control-group row {% if field.errors %}error{% endif %}">
<label class="control-label" for="{{ field.name }}">{{ field.label_tag }}</label>
<div class="controls">
{{ field }}
{% for error in field.errors %}
<span class="help-block">{{ error|escape }}</span>
<section class="page-section">
<div class="container">
<h1 class="text-center section-title">
{% trans "Submit Summary" %}
</h1>
{% if saved %}
<div class="alert alert-success alert-dismissible">
{% trans "Summary submitted successfully." %}
<button type="button" class="close" data-dismiss="alert"
aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
{% endif %}
<form method="post" enctype="multipart/form-data"
class="col-lg-6 offset-lg-3">
{% csrf_token %}
<input type="hidden" name="next" value="{{ next }}">
{% for field in form %}
{% bootstrap_field field show_help=False %}
{% endfor %}
</div>
</div>
{% endfor %}
<input type="submit" value="{% trans 'submit'|capfirst %}" class="btn btn-style1 pull-right login" />
</form>
<div class="form-group">
<input type="submit" value="{% trans "submit"|capfirst %}"
class="btn btn-primary float-right">
</div>
</form>
</div>
</section>
{% endblock %}
{% extends 'old-base.html' %}
{% extends 'base.html' %}
{% load staticfiles compress %}
{% block css_head %}
{{ block.super }}
{% compress css %}
<link href="{% static "education/css/style.scss" %}" rel="stylesheet" type="text/x-scss">
{% endcompress %}
{% endblock %}
{% block header_image %}{% static "img/headers/fixed/banner3.jpg" %}{% endblock header_image%}
......@@ -2,19 +2,31 @@
{% load i18n %}
{% block title %}{% trans "Book Sale" %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans "Book Sale" %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{% trans "Book Sale" %} —
{{ block.super }}{% endblock %}
{% block body %}
<h1>{% trans "Book Sale" %}</h1>
<p>
{% blocktrans trimmed %}
Thalia's book sale goes through Studystore. You can find the personalized webshop <a href="https://betabooks.itdepartment.nl/en" target="_blank">here</a>.
As a member of Thalia you receive a 15% discount on study books ordered at this webshop.
{% endblocktrans %}
</p>
<p>
{% blocktrans trimmed %}
If you cannot find a certain book or you find another error, please contact the board at <a href="mailto:books@thalia.nu">books@thalia.nu</a>.
{% endblocktrans %}
</p>
<section class="page-section" id="education-booksale">
<div class="container">
<h1 class="text-center section-title">{% trans "Book Sale" %}</h1>
<p class="text-center">
{% blocktrans trimmed %}
Thalia's book sale goes through Studystore. You can find
the personalized webshop
<a href="https://betabooks.itdepartment.nl/en"
target="_blank">here</a>.
As a member of Thalia you receive a 15% discount on study
books ordered at this webshop.
{% endblocktrans %}
</p>
<p class="text-center">
{% blocktrans trimmed %}
If you cannot find a certain book or you find another
error, please contact the board at
<a href="mailto:books@thalia.nu">books@thalia.nu</a>.
{% endblocktrans %}
</p>
</div>
</section>
{% endblock %}}
{% extends 'education/base.html' %}
{% load i18n %}
{% block title %}{{ course.name }} — {% trans "Course" %} — {{ block.super }}{% endblock %}
{% block opengraph_title %}{{ course.name }} — {% trans "Course" %} — {{ block.super }}{% endblock %}
{% block title %}{{ course.name }} — {% trans "Course" %} —
{{ block.super }}{% endblock %}
{% block opengraph_title %}{{ course.name }} — {% trans "Course" %} —
{{ block.super }}{% endblock %}
{% block body %}
<h1>{{ course.name }}</h1>
<div class="type-portfolio type-portfolio-half clearfix">
<div class="post">
<section class="page-section" id="education-course">
<div class="container">
<h1 class="text-center section-title">{{ course.name }}</h1>
<div class="row">
<div class="post-body span8">
{% regroup items|dictsortreversed:"year" by year as year_list %}
{% if year_list|length == 0 %}
<p><i>{% blocktrans %}Thalia does not have any documents for this course, unfortunately. Are you in possession of exams or summaries for this course? Then let us know or add them to the catalog using the submission page!{% endblocktrans %}</i></p>
<div class="col-12 col-md-8">
{% if items|length == 0 %}
<p class="text-center">
<i>
{% blocktrans trimmed %}
Thalia does not have any documents for this
course, unfortunately. Are you in
possession of
exams or summaries for this course? Then
let us
know or add them to the catalog using the
submission page!
{% endblocktrans %}
</i>
</p>
{% else %}
<ul class="toggles">
{% for year in year_list %}
{% with next_year=year.grouper|add:1|stringformat:"s" %}
{% with indicator=year.grouper|stringformat:"s"|add:"-"|add:next_year %}
<li id="{{ year.grouper }}">
<div class="toggle-title">
<a name="{{ indicator }}" href="#"><span></span>{{ year.grouper }} - {{ next_year }}</a>
<div class="accordion bordered">
{% for year, data in items %}
<div class="card mb-0">
<div class="card-header collapsed"
data-toggle="collapse"
data-target="#year-{{ year }}">
<a href="#year-{{ year }}">
{{ year }} - {{ year|add:1 }}
</a>
</div>
<div class="toggle-content">
{% regroup year.list by course as course_list %}
{% for course_item in course_list %}
{% regroup course_item.list by type as type_list %}
{% for type in type_list %}
<h5>{% if type.grouper == 'exam' %}{% trans "Exams" %}{% else %}{% trans "Summaries" %}{% endif %}</h5>
<ul class="list-dot">
{% for item in type.list %}
<li>
{% if item.type == 'exam' %}
<a href="{% url 'education:exam' item.id %}" target="_blank">{{ item.name }}</a>
{% else %}
<a href="{% url 'education:summary' item.id %}" target="_blank">{{ item.name }}</a>
{% endif %}
</li>
{% endfor %}
</ul>
<br />
{% endfor %}
{% if course_item.grouper != course %}
<div class="alert alert-info1">
<i>{% blocktrans with course_url=course_item.grouper.get_absolute_url course_name=course_item.grouper %}These documents were collected for <a href="{{ course_url }}">{{ course_name }}</a>, a predecessor of this course.{% endblocktrans %}</i>
<div
class="collapse"
id="year-{{ year }}"
>
<div class="card-body">
{% if data.legacy %}
<div
class="alert alert-warning">
{% blocktrans trimmed with course_url=data.legacy.get_absolute_url course_name=data.legacy.name %}
These documents were collected for <a href="{{ course_url }}">{{ course_name }}</a>, a
predecessor of this course.
{% endblocktrans %}
</div>
{% endif %}
{% if data.exams|length != 0 %}
<h5>{% trans "Exams" %}</h5>
<ul
{% if data.summaries|length == 0 %}
class="mb-0"{% endif %}>
{% for item in data.exams %}
<li>
<a href="{% url 'education:exam' item.id %}"
target="_blank">{{ item.name }}</a>
</li>
{% endfor %}
</ul>
{% endif %}
{% if data.summaries|length != 0 %}
<h5>{% trans "Summaries" %}</h5>
<ul class="mb-0">
{% for item in data.summaries %}
<li>
<a href="{% url 'education:summary' item.id %}"
target="_blank">
{{ item.name }}
</a>
</li>
{% endfor %}
</ul>
{% endif %}
</div>
{% endif %}
{% endfor %}
</div>
</li>
{% endwith %}
{% endwith %}
</div>
{% endfor %}
</ul>
</div>
{% endif %}
</div>
<div class="post-body span4 row">