From c7b9b426f4cc06cf8e2d1bd0999a4d36adef2c10 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Thu, 18 Jul 2019 00:38:36 +0200
Subject: [PATCH] Use bootstrap grid for week view.
---
.../chronos/templates/chronos/tt_day.html | 2 +-
.../chronos/templates/chronos/tt_week.html | 65 ++++++++++---------
2 files changed, 35 insertions(+), 32 deletions(-)
diff --git a/biscuit/apps/chronos/templates/chronos/tt_day.html b/biscuit/apps/chronos/templates/chronos/tt_day.html
index 4e37be64..97aea6a0 100644
--- a/biscuit/apps/chronos/templates/chronos/tt_day.html
+++ b/biscuit/apps/chronos/templates/chronos/tt_day.html
@@ -1,4 +1,4 @@
-<div class="float-left">
+<div class="col-sm">
<ul class="list-group">
<li class="list-group-item active">
{{ lesson_periods.0.period.get_weekday_display }}
diff --git a/biscuit/apps/chronos/templates/chronos/tt_week.html b/biscuit/apps/chronos/templates/chronos/tt_week.html
index c07d17de..b2bed204 100644
--- a/biscuit/apps/chronos/templates/chronos/tt_week.html
+++ b/biscuit/apps/chronos/templates/chronos/tt_week.html
@@ -9,43 +9,46 @@
{{ filter_descs }}
</p>
- <div class="float-left">
- <ul class="list-group">
- <li class="list-group-item active">
- {% blocktrans %}Times{% endblocktrans %}
- </li>
- </ul>
- <div class="container">
- {% for num, times in periods.items %}
- <div class="row">
- <div class="col-sm">
- <div class="card" style="width: 18rem; {% if lesson.colour_fg %} color: {{ lesson.colour_fg }}; {% endif %} {% if lesson.colour_bg %} background-color: {{ lesson.colour_bg }}; {% endif %}">
- <div class="card-body">
- <div class="row">
- <div class="col-sm">
- <span class="card-title">{{ num }}.</span>
+ <div class="row">
+ <div class="col-sm">
+ <ul class="list-group">
+ <li class="list-group-item active">
+ {% blocktrans %}Times{% endblocktrans %}
+ </li>
+ </ul>
+ <div class="container">
+ {% for num, times in periods.items %}
+ <div class="row">
+ <div class="col-sm">
+ <div class="card" style="width: 18rem; {% if lesson.colour_fg %} color: {{ lesson.colour_fg }}; {% endif %} {% if lesson.colour_bg %} background-color: {{ lesson.colour_bg }}; {% endif %}">
+ <div class="card-body">
+ <div class="row">
+ <div class="col-sm">
+ <span class="card-title">{{ num }}.</span>
+ </div>
</div>
- </div>
- <div class="row">
- <div class="col-sm">
- <span class="card-text">{{ times.0}}</span>
- </div>
- <div class="col-sm">
- <span class="card-text">-</span>
- </div>
- <div class="col-sm">
- <span class="card-text">{{ times.1 }}</span>
+ <div class="row">
+ <div class="col-sm">
+ <span class="card-text">{{ times.0}}</span>
+ </div>
+ <div class="col-sm">
+ <span class="card-text">-</span>
+ </div>
+ <div class="col-sm">
+ <span class="card-text">{{ times.1 }}</span>
+ </div>
</div>
</div>
</div>
</div>
</div>
- </div>
- {% endfor %}
+ {% endfor %}
+ </div>
</div>
+
+ {% for weekday, lesson_periods_day in lesson_periods.items %}
+ {% include "chronos/tt_day.html" with lesson_periods=lesson_periods_day %}
+ {% endfor %}
</div>
-
- {% for weekday, lesson_periods_day in lesson_periods.items %}
- {% include "chronos/tt_day.html" with lesson_periods=lesson_periods_day %}
- {% endfor %}
{% endblock %}
+
\ No newline at end of file
--
GitLab