Skip to content
Snippets Groups Projects
Commit 02f36978 authored by Julian's avatar Julian
Browse files

Reformat week_view template

parent b90fd90e
No related branches found
No related tags found
1 merge request!236Resolve "Improve week view for mobile devices (size s)"
Pipeline #45915 passed
Stage: test
Stage: build
Stage: publish
Hide whitespace changes
Inline Side-by-side
aleksis/apps/alsijil/templates/alsijil/class_register/week_view.html
+ 30
− 26
View file @ 02f36978
......@@ -41,9 +41,9 @@
{% endblock %}
{% block content %}
<script type="text/javascript" src="{% static "js/helper.js" %}"></script>
<script type="text/javascript" src="{% static " js/helper.js" %}"></script>
{{ week_select|json_script:"week_select" }}
<script type="text/javascript" src="{% static "js/chronos/week_select.js" %}"></script>
<script type="text/javascript" src="{% static " js/chronos/week_select.js" %}"></script>
<div class="row">
<div id="toggle-row" class="col s12 m8 l10 {% if lesson_periods %}pre-hidden{% endif %}">
<form method="post" action="">
......@@ -84,7 +84,8 @@
</p>
<p class="hide-on-med-and-up">
<a class="btn primary-color waves-effect waves-light hundred-percent" href="{% url "students_list" group.pk %}">
<a class="btn primary-color waves-effect waves-light hundred-percent"
href="{% url "students_list" group.pk %}">
<i class="material-icons left">people</i>
{% trans "Students list" %}
</a>
......@@ -106,18 +107,18 @@
{% if advanced_weekday.holiday and not request.site.preferences.alsijil__allow_entries_in_holidays %}
<div class="card">
<div class="card-content">
<span class="card-title">
{{ advanced_weekday.name }}, {{ advanced_weekday.date }} <span
<span class="card-title">
{{ advanced_weekday.name }}, {{ advanced_weekday.date }} <span
class="badge new blue no-float">{{ advanced_weekday.holiday }}</span>
</span>
</span>
</div>
</div>
{% else %}
<div class="card show-on-extra-large">
<div class="card-content">
<span class="card-title">
{{ advanced_weekday.name }}, {{ advanced_weekday.date }}
</span>
<span class="card-title">
{{ advanced_weekday.name }}, {{ advanced_weekday.date }}
</span>
<table class="striped datatable">
<thead>
<tr>
......@@ -147,7 +148,8 @@
{% if register_object.period %}
{{ register_object.period.period }}.
{% else %}
{{ register_object.period_from_on_day }}.–{{ register_object.period_to_on_day }}.
{{ register_object.period_from_on_day }}.–
{{ register_object.period_to_on_day }}.
{% endif %}
</a>
</td>
......@@ -178,7 +180,7 @@
<td>
<a class="tr-link"
href="{{ register_object.alsijil_url }}?back={{ back_url }}">
{{ register_object.teacher_names }}
{{ register_object.teacher_names }}
</a>
</td>
<td>
......@@ -210,7 +212,7 @@
<li class="">
<div class="collapsible-header flow-text">
{{ advanced_weekday.name }}, {{ advanced_weekday.date }} <i
class="material-icons collapsible-icon-right">expand_more</i>
class="material-icons collapsible-icon-right">expand_more</i>
</div>
<div class="collapsible-body">
<div class="collection">
......@@ -227,7 +229,8 @@
{% if register_object.period %}
{{ register_object.period.period }}.
{% else %}
{{ register_object.period_from_on_day }}.–{{ register_object.period_to_on_day }}.
{{ register_object.period_from_on_day }}.–
{{ register_object.period_to_on_day }}.
{% endif %}
{% if register_object.get_subject %}
{{ register_object.get_subject.name }}
......@@ -253,7 +256,7 @@
<tr>
<th>{% trans "Teachers" %}</th>
<td>
{{ register_object.teacher_names }}
{{ register_object.teacher_names }}
</td>
</tr>
<tr>
......@@ -299,18 +302,18 @@
<span class="card-title">
<span class="period">
{% if register_object.period %}
{{ register_object.period.period }}.
{{ register_object.period.period }}.
{% else %}
{{ register_object.period_from_on_day }}.–{{ register_object.period_to_on_day }}.
{{ register_object.period_from_on_day }}.–{{ register_object.period_to_on_day }}.
{% endif %}
</span>
<span class="subject">
{% if register_object.get_subject %}
{{ register_object.get_subject.name }}
{{ register_object.get_subject.name }}
{% elif register_object.subject %}
{{ register_object.subject }}
{{ register_object.subject }}
{% else %}
{% trans "Event" %}
{% trans "Event" %}
{% endif %}
</span>
<span class="lesson-icon">
......@@ -323,9 +326,9 @@
<dt>{% trans "Groups" %}</dt>
<dd>
{% if register_object.lesson %}
{{ register_object.lesson.group_names }}
{{ register_object.lesson.group_names }}
{% else %}
{{ register_object.group_names }}
{{ register_object.group_names }}
{% endif %}
</dd>
{% endif %}
......@@ -352,7 +355,8 @@
</dl>
</div>
<div class="card-action">
<a href="{{ register_object.alsijil_url }}?back={{ back_url }}" class="">
<a href="{{ register_object.alsijil_url }}?back={{ back_url }}"
class="">
{% trans "Visit lesson overview" %}
</a>
</div>
......@@ -367,9 +371,9 @@
<div class="col s12" id="personal-notes">
<div class="card">
<div class="card-content">
<span class="card-title">
{% blocktrans %}Personal notes{% endblocktrans %}
</span>
<span class="card-title">
{% blocktrans %}Personal notes{% endblocktrans %}
</span>
{% for person in persons %}
<h5 class="card-title">
<a href="{% url "overview_person" person.person.pk %}">{{ person.person.full_name }}</a>
......@@ -440,5 +444,5 @@
</div>
{% endif %}
<script src="{% static 'js/alsijil/week_view.js' %}" type="text/javascript"></script>
<script src="{% static 'js/alsijil/week_view.js' %}" type="text/javascript"></script>
{% 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