Skip to content
Snippets Groups Projects
Verified Commit c0d641b8 authored by Julian's avatar Julian Committed by Jonathan Weth
Browse files

Reformat week_view template

(cherry picked from commit 02f36978)
parent 3609a918
No related branches found
No related tags found
1 merge request!246Prepare release 2.0rc7
...@@ -41,9 +41,9 @@ ...@@ -41,9 +41,9 @@
{% endblock %} {% endblock %}
{% block content %} {% 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" }} {{ 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 class="row">
<div id="toggle-row" class="col s12 m8 l10 {% if lesson_periods %}pre-hidden{% endif %}"> <div id="toggle-row" class="col s12 m8 l10 {% if lesson_periods %}pre-hidden{% endif %}">
<form method="post" action=""> <form method="post" action="">
...@@ -84,7 +84,8 @@ ...@@ -84,7 +84,8 @@
</p> </p>
<p class="hide-on-med-and-up"> <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> <i class="material-icons left">people</i>
{% trans "Students list" %} {% trans "Students list" %}
</a> </a>
...@@ -106,18 +107,18 @@ ...@@ -106,18 +107,18 @@
{% if advanced_weekday.holiday and not request.site.preferences.alsijil__allow_entries_in_holidays %} {% if advanced_weekday.holiday and not request.site.preferences.alsijil__allow_entries_in_holidays %}
<div class="card"> <div class="card">
<div class="card-content"> <div class="card-content">
<span class="card-title"> <span class="card-title">
{{ advanced_weekday.name }}, {{ advanced_weekday.date }} <span {{ advanced_weekday.name }}, {{ advanced_weekday.date }} <span
class="badge new blue no-float">{{ advanced_weekday.holiday }}</span> class="badge new blue no-float">{{ advanced_weekday.holiday }}</span>
</span> </span>
</div> </div>
</div> </div>
{% else %} {% else %}
<div class="card show-on-extra-large"> <div class="card show-on-extra-large">
<div class="card-content"> <div class="card-content">
<span class="card-title"> <span class="card-title">
{{ advanced_weekday.name }}, {{ advanced_weekday.date }} {{ advanced_weekday.name }}, {{ advanced_weekday.date }}
</span> </span>
<table class="striped datatable"> <table class="striped datatable">
<thead> <thead>
<tr> <tr>
...@@ -147,7 +148,8 @@ ...@@ -147,7 +148,8 @@
{% if register_object.period %} {% if register_object.period %}
{{ register_object.period.period }}. {{ register_object.period.period }}.
{% else %} {% 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 %} {% endif %}
</a> </a>
</td> </td>
...@@ -178,7 +180,7 @@ ...@@ -178,7 +180,7 @@
<td> <td>
<a class="tr-link" <a class="tr-link"
href="{{ register_object.alsijil_url }}?back={{ back_url }}"> href="{{ register_object.alsijil_url }}?back={{ back_url }}">
{{ register_object.teacher_names }} {{ register_object.teacher_names }}
</a> </a>
</td> </td>
<td> <td>
...@@ -210,7 +212,7 @@ ...@@ -210,7 +212,7 @@
<li class=""> <li class="">
<div class="collapsible-header flow-text"> <div class="collapsible-header flow-text">
{{ advanced_weekday.name }}, {{ advanced_weekday.date }} <i {{ 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>
<div class="collapsible-body"> <div class="collapsible-body">
<div class="collection"> <div class="collection">
...@@ -227,7 +229,8 @@ ...@@ -227,7 +229,8 @@
{% if register_object.period %} {% if register_object.period %}
{{ register_object.period.period }}. {{ register_object.period.period }}.
{% else %} {% 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 %} {% endif %}
{% if register_object.get_subject %} {% if register_object.get_subject %}
{{ register_object.get_subject.name }} {{ register_object.get_subject.name }}
...@@ -253,7 +256,7 @@ ...@@ -253,7 +256,7 @@
<tr> <tr>
<th>{% trans "Teachers" %}</th> <th>{% trans "Teachers" %}</th>
<td> <td>
{{ register_object.teacher_names }} {{ register_object.teacher_names }}
</td> </td>
</tr> </tr>
<tr> <tr>
...@@ -299,18 +302,18 @@ ...@@ -299,18 +302,18 @@
<span class="card-title"> <span class="card-title">
<span class="period"> <span class="period">
{% if register_object.period %} {% if register_object.period %}
{{ register_object.period.period }}. {{ register_object.period.period }}.
{% else %} {% 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 %} {% endif %}
</span> </span>
<span class="subject"> <span class="subject">
{% if register_object.get_subject %} {% if register_object.get_subject %}
{{ register_object.get_subject.name }} {{ register_object.get_subject.name }}
{% elif register_object.subject %} {% elif register_object.subject %}
{{ register_object.subject }} {{ register_object.subject }}
{% else %} {% else %}
{% trans "Event" %} {% trans "Event" %}
{% endif %} {% endif %}
</span> </span>
<span class="lesson-icon"> <span class="lesson-icon">
...@@ -323,9 +326,9 @@ ...@@ -323,9 +326,9 @@
<dt>{% trans "Groups" %}</dt> <dt>{% trans "Groups" %}</dt>
<dd> <dd>
{% if register_object.lesson %} {% if register_object.lesson %}
{{ register_object.lesson.group_names }} {{ register_object.lesson.group_names }}
{% else %} {% else %}
{{ register_object.group_names }} {{ register_object.group_names }}
{% endif %} {% endif %}
</dd> </dd>
{% endif %} {% endif %}
...@@ -352,7 +355,8 @@ ...@@ -352,7 +355,8 @@
</dl> </dl>
</div> </div>
<div class="card-action"> <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" %} {% trans "Visit lesson overview" %}
</a> </a>
</div> </div>
...@@ -367,9 +371,9 @@ ...@@ -367,9 +371,9 @@
<div class="col s12" id="personal-notes"> <div class="col s12" id="personal-notes">
<div class="card"> <div class="card">
<div class="card-content"> <div class="card-content">
<span class="card-title"> <span class="card-title">
{% blocktrans %}Personal notes{% endblocktrans %} {% blocktrans %}Personal notes{% endblocktrans %}
</span> </span>
{% for person in persons %} {% for person in persons %}
<h5 class="card-title"> <h5 class="card-title">
<a href="{% url "overview_person" person.person.pk %}">{{ person.person.full_name }}</a> <a href="{% url "overview_person" person.person.pk %}">{{ person.person.full_name }}</a>
...@@ -440,5 +444,5 @@ ...@@ -440,5 +444,5 @@
</div> </div>
{% endif %} {% 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 %} {% endblock %}
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