Skip to content
Snippets Groups Projects
Verified Commit 228b86f8 authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Add option to shorten groups via text collapsible

- Add CSS fix for correct style of text collapsibles in timetables

Advances #71
parent 526c53fb
No related branches found
No related tags found
1 merge request!46Resolve "Improve display of groups in timetable views"
...@@ -9,6 +9,18 @@ CONSTANCE_CONFIG = { ...@@ -9,6 +9,18 @@ CONSTANCE_CONFIG = {
" show the parent groups instead of the original group." " show the parent groups instead of the original group."
), ),
), ),
"CHRONOS_SHORTEN_GROUPS": (
False,
_(
"If there are more groups than the limit set in CHRONOS_SHORTEN_GROUPS_LIMIT, add text collapsible."
),
),
"CHRONOS_SHORTEN_GROUPS_LIMIT": (
4,
_(
"If there are more groups than this limit and CHRONOS_SHORTEN_GROUPS is enabled, add text collapsible."
),
),
"CHRONOS_SUBSTITUTIONS_PRINT_DAY_NUMBER": ( "CHRONOS_SUBSTITUTIONS_PRINT_DAY_NUMBER": (
2, 2,
_("Number of days shown on substitutions print view"), _("Number of days shown on substitutions print view"),
...@@ -21,6 +33,8 @@ CONSTANCE_CONFIG = { ...@@ -21,6 +33,8 @@ CONSTANCE_CONFIG = {
CONSTANCE_CONFIG_FIELDSETS = { CONSTANCE_CONFIG_FIELDSETS = {
"Chronos settings": ( "Chronos settings": (
"CHRONOS_USE_PARENT_GROUPS", "CHRONOS_USE_PARENT_GROUPS",
"CHRONOS_SHORTEN_GROUPS",
"CHRONOS_SHORTEN_GROUPS_LIMIT",
"CHRONOS_SUBSTITUTIONS_PRINT_DAY_NUMBER", "CHRONOS_SUBSTITUTIONS_PRINT_DAY_NUMBER",
"CHRONOS_SUBSTITUTIONS_SHOW_HEADER_BOX", "CHRONOS_SUBSTITUTIONS_SHOW_HEADER_BOX",
), ),
......
...@@ -35,7 +35,7 @@ li.active > a > .sidenav-badge { ...@@ -35,7 +35,7 @@ li.active > a > .sidenav-badge {
flex-direction: column; flex-direction: column;
} }
.lesson-card .card-content div { .lesson-card .card-content > div {
padding: 3px; padding: 3px;
flex: auto; flex: auto;
width: 100%; width: 100%;
......
<a href="{% url "timetable" "group" item.pk %}">
{{ item.short_name }}{% if not forloop.last %},{% endif %}
</a>
{% for group in groups %} {% if groups.count > config.CHRONOS_SHORTEN_GROUPS_LIMIT and config.CHRONOS_SHORTEN_GROUPS %}
<a href="{% url "timetable" "group" group.pk %}"> {% include "components/text_collapsible.html" with template="chronos/partials/group.html" qs=groups %}
{{ group.short_name }}{% if not forloop.last %},{% endif %} {% else %}
</a> {% for group in groups %}
{% endfor %} {% include "chronos/partials/group.html" with item=group %}
{% endfor %}
{% endif %}
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