Skip to content
Snippets Groups Projects
Verified Commit 0b4bda91 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Reformat templates.

parent a41bf962
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
biscuit/apps/chronos/templates/chronos/edit_substitution.html
+ 7
− 7
View file @ 0b4bda91
{# -*- engine:django -*- #}
{% extends "core/base.html" %}
{% load bootstrap4 i18n %}
......@@ -6,11 +8,9 @@
{% block page_title %}{% blocktrans %}Edit substitution{% endblocktrans %}{% endblock %}
{% block content %}
<form method="post">
{% csrf_token %}
{% bootstrap_form edit_substitution_form %}
<input type="submit" value="Edit" />
</form>
<form method="post">
{% csrf_token %}
{% bootstrap_form edit_substitution_form %}
<input type="submit" value="Edit" />
</form>
{% endblock %}
biscuit/apps/chronos/templates/chronos/lessons_day.html
+ 16
− 15
View file @ 0b4bda91
{# -*- engine:django -*- #}
{% extends "core/base.html" %}
{% load bootstrap4 i18n font_awesome %}
{% load render_table from django_tables2 %}
......@@ -7,20 +9,19 @@
{% block page_title %}{% blocktrans %}Lessons{% endblocktrans %}{% endblock %}
{% block content %}
<div class="d-flex justify-content-between">
<div>
<h1>{{ day }}</h1>
</div>
<div class="btn-group" role="group" aria-label="Day actions">
<a href="{% url 'lessons_day_by_date' day_prev %}" class="btn btn-secondary">
{% fa 'arrow-left' %}
</a>
<a href="{% url 'lessons_day_by_date' day_next %}" class="btn btn-secondary">
{% fa 'arrow-right' %}
</a>
</div>
</div>
{% render_table lessons_table %}
<div class="d-flex justify-content-between">
<div>
<h1>{{ day }}</h1>
</div>
<div class="btn-group" role="group" aria-label="Day actions">
<a href="{% url 'lessons_day_by_date' day_prev %}" class="btn btn-secondary">
{% fa 'arrow-left' %}
</a>
<a href="{% url 'lessons_day_by_date' day_next %}" class="btn btn-secondary">
{% fa 'arrow-right' %}
</a>
</div>
</div>
{% render_table lessons_table %}
{% endblock %}
biscuit/apps/chronos/templates/chronos/tt_day.html
+ 18
− 16
View file @ 0b4bda91
{# -*- engine:django -*- #}
<div class="col-sm px-0">
<div class="container">
<div class="row">
<div class="col-sm px-0">
<div class="card chronos-head">
<div class="card-body">
<span class="card-title">{{ weekday_name }}</span>
</div>
<div class="container">
<div class="row">
<div class="col-sm px-0">
<div class="card chronos-head">
<div class="card-body">
<span class="card-title">{{ weekday_name }}</span>
</div>
</div>
</div>
</div>
</div>
{% for period_num, lesson_period in lesson_periods.items %}
<div class="row">
<div class="col-sm px-0">
{% include "chronos/tt_lesson.html" with lesson_period=lesson_period %}
</div>
</div>
{% endfor %}
</div>
{% for period_num, lesson_period in lesson_periods.items %}
<div class="row">
<div class="col-sm px-0">
{% include "chronos/tt_lesson.html" with lesson_period=lesson_period %}
</div>
</div>
{% endfor %}
</div>
</div>
biscuit/apps/chronos/templates/chronos/tt_lesson.html
+ 36
− 34
View file @ 0b4bda91
{# -*- engine:django -*- #}
<div class="card chronos-lesson
{% if lesson_period.get_substitution %}
border border-warning
border border-warning
{% endif %}
"
style="
"
style="
{% if lesson_period.lesson.subject.colour_fg %}
color: {{ lesson_period.lesson.subject.colour_fg }};
color: {{ lesson_period.lesson.subject.colour_fg }};
{% endif %}
{% if lesson_period.lesson.subject.colour_bg %}
background-color: {{ lesson_period.lesson.subject.colour_bg }};
background-color: {{ lesson_period.lesson.subject.colour_bg }};
{% endif %}
">
<div class="card-body">
<div class="row">
<div class="col-sm">
<span class="card-title">
{{ lesson_period.get_subject.abbrev }}
</span>
</div>
">
<div class="card-body">
<div class="row">
<div class="col-sm">
<span class="card-title">
{{ lesson_period.get_subject.abbrev }}
</span>
</div>
</div>
<div class="row">
<div class="col-sm">
{% for group in lesson_period.get_groups.all %}
<span class="card-text">{{ group.short_name }}</span>
{% endfor %}
</div>
<div class="col-sm">
{% for teacher in lesson_period.get_teachers.all %}
<a href="{% url 'person_by_id' teacher.id %}"
title="{{ teacher.first_name }} {{ teacher.last_name }}"
class="card-text"
data-poload="{% url 'person_by_id_card' teacher.id %}">
{{ teacher.short_name }}
</a>
{% endfor %}
</div>
<div class="col-sm">
<span class="card-text">{{ lesson_period.get_room.short_name }}</span>
</div>
</div>
</div>
<div class="row">
<div class="col-sm">
{% for group in lesson_period.get_groups.all %}
<span class="card-text">{{ group.short_name }}</span>
{% endfor %}
</div>
<div class="col-sm">
{% for teacher in lesson_period.get_teachers.all %}
<a href="{% url 'person_by_id' teacher.id %}"
title="{{ teacher.first_name }} {{ teacher.last_name }}"
class="card-text"
data-poload="{% url 'person_by_id_card' teacher.id %}">
{{ teacher.short_name }}
</a>
{% endfor %}
</div>
<div class="col-sm">
<span class="card-text">{{ lesson_period.get_room.short_name }}</span>
</div>
</div>
</div>
</div>
biscuit/apps/chronos/templates/chronos/tt_week.html
+ 61
− 61
View file @ 0b4bda91
{# -*- engine:django -*- #}
{% extends "core/base.html" %}
{% load bootstrap4 data_helpers font_awesome i18n staticfiles %}
{% block bootstrap4_extra_head %}
{{ block.super }}
<link rel="stylesheet" href="{% static 'css/chronos/timetable.css' %}" />
{{ block.super }}
<link rel="stylesheet" href="{% static 'css/chronos/timetable.css' %}" />
{% endblock %}
{% block bootstrap4_title %}{% blocktrans %}Timetable{% endblocktrans %} - {{ block.super }}{% endblock %}
......@@ -12,71 +13,70 @@
{% block page_title %}{% blocktrans %}Timetable{% endblocktrans %}{% endblock %}
{% block content %}
<div class="d-flex justify-content-between">
<div>
<h1>{{ day }}</h1>
</div>
<div class="btn-group" role="group" aria-label="Day actions">
<a href="{% url 'timetable_by_week' week_prev %}" class="btn btn-secondary">
{% fa 'arrow-left' %}
</a>
<a href="{% url 'timetable_by_week' week_next %}" class="btn btn-secondary">
{% fa 'arrow-right' %}
</a>
</div>
</div>
<div class="d-flex justify-content-between">
<div>
<h1>{{ day }}</h1>
</div>
<div class="btn-group" role="group" aria-label="Day actions">
<a href="{% url 'timetable_by_week' week_prev %}" class="btn btn-secondary">
{% fa 'arrow-left' %}
</a>
<a href="{% url 'timetable_by_week' week_next %}" class="btn btn-secondary">
{% fa 'arrow-right' %}
</a>
</div>
</div>
<form method="get">
<ul id="timetable_select_form">
{{ select_form.as_ul }}
</ul>
<input type="submit" value="Select" />
</form>
<form method="get">
<ul id="timetable_select_form">
{{ select_form.as_ul }}
</ul>
<input type="submit" value="Select" />
</form>
<div class="row">
<div class="col-sm px-0">
<div class="container">
<div class="row">
<div class="col-sm px-0">
<div class="card chronos-head">
<div class="card-body">
<span class="card-title">{% blocktrans %}Times{% endblocktrans %}</span>
</div>
</div>
</div>
</div>
{% for num, times in periods.items %}
<div class="row">
<div class="col-sm px-0">
<div class="card chronos-lesson">
<div class="card-body">
<div class="row">
<div class="col-sm px-0">
<span class="card-title">{{ num }}.</span>
</div>
</div>
<div class="row">
<div class="row">
<div class="col-sm px-0">
<div class="container">
<div class="row">
<div class="col-sm px-0">
<span class="card-text">{{ times.0}}</span>
<div class="card chronos-head">
<div class="card-body">
<span class="card-title">{% blocktrans %}Times{% endblocktrans %}</span>
</div>
</div>
</div>
<div class="col-sm px-0">
<span class="card-text">-</span>
</div>
<div class="col-sm px-0">
<span class="card-text">{{ times.1 }}</span>
</div>
</div>
</div>
</div>
{% for num, times in periods.items %}
<div class="row">
<div class="col-sm px-0">
<div class="card chronos-lesson">
<div class="card-body">
<div class="row">
<div class="col-sm px-0">
<span class="card-title">{{ num }}.</span>
</div>
</div>
<div class="row">
<div class="col-sm px-0">
<span class="card-text">{{ times.0}}</span>
</div>
<div class="col-sm px-0">
<span class="card-text">-</span>
</div>
<div class="col-sm px-0">
<span class="card-text">{{ times.1 }}</span>
</div>
</div>
</div>
</div>
</div>
</div>
{% endfor %}
</div>
</div>
</div>
{% for weekday, lesson_periods_day in lesson_periods.items %}
{% include "chronos/tt_day.html" with weekday_name=weekdays|get_dict:weekday lesson_periods=lesson_periods_day %}
{% endfor %}
</div>
</div>
{% for weekday, lesson_periods_day in lesson_periods.items %}
{% include "chronos/tt_day.html" with weekday_name=weekdays|get_dict:weekday lesson_periods=lesson_periods_day %}
{% endfor %}
</div>
{% endblock %}
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