Skip to content
Snippets Groups Projects
Commit f072f91c authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

Merge branch '89-provide-page-turning-base-template' into 'master'

Prepare template. Advances BiscuIT-ng#89.

See merge request Teckids/BiscuIT/BiscuIT-App-Alsijil!10
parents 9c478b28 a6f64864
No related branches found
No related tags found
1 merge request!10Prepare template. Advances BiscuIT-ng#89.
{# -*- engine:django -*- #} {# -*- engine:django -*- #}
{% extends "core/base.html" %} {% extends "core/turnable.html" %}
{% load bootstrap4 font_awesome i18n week_helpers %} {% load bootstrap4 font_awesome i18n week_helpers %}
{% block bootstrap4_title %}{% blocktrans%}Current week{% endblocktrans %} — {{ block.super }}{% endblock %} {% block bootstrap4_title %}{% blocktrans%}Current week{% endblocktrans %} — {{ block.super }}{% endblock %}
{% block page_title %} {% block current_content %}
{% blocktrans %}Week{% endblocktrans %} {{ week }} ({{ week|week_start }} - {{ week|week_end }}), {{ group.name }}
{% endblock %}
{% block content %}
<form method="get"> <form method="get">
<ul id="timetable_select_form"> <ul id="timetable_select_form">
{{ select_form.as_ul }} {{ select_form.as_ul }}
...@@ -25,14 +21,6 @@ ...@@ -25,14 +21,6 @@
<div class="card"> <div class="card">
<div class="card-header bg-light text-dark"> <div class="card-header bg-light text-dark">
{% blocktrans %}Lessons{% endblocktrans %} {% blocktrans %}Lessons{% endblocktrans %}
<div class="btn-group" role="group" aria-label="Week actions">
<a href="{% url 'group_week_by_week' week_prev %}?{{ request.GET.urlencode }}" class="btn btn-secondary">
{% fa 'arrow-left' %}
</a>
<a href="{% url 'group_week_by_week' week_next %}?{{ request.GET.urlencode }}" class="btn btn-secondary">
{% fa 'arrow-right' %}
</a>
</div>
</div> </div>
<div class="card-body"> <div class="card-body">
{% regroup lesson_periods by period.get_weekday_display as periods_by_day %} {% regroup lesson_periods by period.get_weekday_display as periods_by_day %}
......
...@@ -147,9 +147,12 @@ def group_week(request: HttpRequest, week: Optional[int] = None) -> HttpResponse ...@@ -147,9 +147,12 @@ def group_week(request: HttpRequest, week: Optional[int] = None) -> HttpResponse
# Add a form to filter the view # Add a form to filter the view
select_form = SelectForm(request.GET or None) select_form = SelectForm(request.GET or None)
context['current_head'] = _('Week (%s %s - %s) ') % (wanted_week, week_start, week_end)
context['week'] = wanted_week context['week'] = wanted_week
context['week_next'] = wanted_week + 1 context['url_next'] = '%s?%s' % (redirect('group_week_by_week', week=wanted_week + 1), request.GET.urlencode())
context['week_prev'] = wanted_week - 1 context['url_prev'] = '%s?%s' % (redirect('group_week_by_week', week=wanted_week - 1), request.GET.urlencode())
context['group'] = group context['group'] = group
context['lesson_periods'] = lesson_periods context['lesson_periods'] = lesson_periods
context['persons'] = persons context['persons'] = persons
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment