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

Fix design and trans tags of core templates

parent f717a83a
No related branches found
No related tags found
1 merge request!48Review use of Materialize
Hide whitespace changes
Inline Side-by-side
aleksis/apps/alsijil/templates/alsijil/lesson.html
+ 80
− 32
View file @ 498234cf
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
{% block extra_head %} {% block extra_head %}
{{ block.super }} {{ block.super }}
<link rel="stylesheet" href="{% static 'css/alsijil/lesson.css' %}" /> <link rel="stylesheet" href="{% static 'css/alsijil/lesson.css' %}"/>
{% endblock %} {% endblock %}
{% block page_title %} {% block page_title %}
{{ day }} - {{ day }}, {% blocktrans with period=lesson_period.period.period %}{{ period }}. period{% endblocktrans %} –
{% for group in lesson_period.get_groups.all %} {% for group in lesson_period.get_groups.all %}
<span>{{ group.short_name }}</span>, <span>{{ group.name }}</span>,
{% endfor %} {% endfor %}
{{ lesson_period.get_subject.name }}, {{ lesson_period.get_subject.name }},
...@@ -25,54 +25,102 @@ ...@@ -25,54 +25,102 @@
{% block content %} {% block content %}
<form method="post"> <form method="post">
<div class="row">
<div class="col s12">
{% include "core/save_button.html" %}
</div>
</div>
{% csrf_token %} {% csrf_token %}
<div class="row"> <div class="row">
<div class="col s8"> <div class="col s12 m12 l8">
<div class="card dark-text"> <div class="card">
<div class="card-content">
<span class="card-title"> <span class="card-title">
{% blocktrans %}Lesson documentation{% endblocktrans %} {% blocktrans %}Lesson documentation{% endblocktrans %}
</span>
{% form form=lesson_documentation_form %}{% endform %}
</div> </div>
{% csrf_token %}
{% form form=lesson_documentation_form %}{% endform %}
</div> </div>
</div> </div>
<div class="col s4"> <div class="col s12 m12 l4">
<div class="card dark-text"> <div class="card">
<div class="card-content">
<span class="card-title"> <span class="card-title">
{% blocktrans %}Change history{% endblocktrans %} {% blocktrans %}Change history{% endblocktrans %}
</span> </span>
{% include 'core/crud_events_ul.html' with class_ul='list-group list-group-flush' class_li='list-group-item d-flex justify-content-between align-items-center' obj=lesson_documentation %} {% include 'core/crud_events.html' with obj=lesson_documentation %}
</div>
</div> </div>
</div> </div>
</div> </div>
<div class="card dark-text"> <div class="row">
<div class="col s12">
<div class="card">
<div class="card-content">
<span class="card-title"> <span class="card-title">
{% blocktrans %}Personal notes{% endblocktrans %} {% blocktrans %}Personal notes{% endblocktrans %}
</span> </span>
{{ personal_note_formset.management_form }} {% form form=personal_note_formset.management_form %}{% endform %}
<table class="striped responsive-table"> <table class="striped responsive-table">
<tr> <thead>
<th>{% blocktrans %}Person{% endblocktrans %}</th> <tr>
<th>{% blocktrans %}Absent{% endblocktrans %}</th> <th>{% blocktrans %}Person{% endblocktrans %}</th>
<th>{% blocktrans %}Tardiness{% endblocktrans %}</th> <th>{% blocktrans %}Absent{% endblocktrans %}</th>
<th>{% blocktrans %}Excused{% endblocktrans %}</th> <th>{% blocktrans %}Tardiness{% endblocktrans %}</th>
<th>{% blocktrans %}Remarks{% endblocktrans %}</th> <th>{% blocktrans %}Excused{% endblocktrans %}</th>
</tr> <th>{% blocktrans %}Remarks{% endblocktrans %}</th>
{% for form in personal_note_formset %} </tr>
{{ form.id }} </thead>
<tr> <tbody>
<td>{{ form.person_name }}</td> {% for form in personal_note_formset %}
<td>{{ form.absent }}</td> <tr>
<td>{{ form.late }}</td> {{ form.id }}
<td>{{ form.excused }}</td> <td>{{ form.person_name }}{{ form.person_name.value }}</td>
<td>{{ form.remarks }}</td> <td class="center-align">
</tr> <label>
{% endfor %} {{ form.absent }}
</table> <span></span>
</label>
</td>
<td>
<div class="input-field">
{{ form.late }}
<label for="{{ form.absent.id_for_label }}">
{% trans "Tardiness (in m)" %}
</label>
</div>
</td>
<td class="center-align">
<label>
{{ form.excused }}
<span></span>
</label>
</td>
<td>
<div class="input-field">
{{ form.remarks }}
<label for="{{ form.absent.id_for_label }}">
{% trans "Remarks" %}
</label>
</div>
</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>
<div class="row">
<div class="col s12">
{% include "core/save_button.html" %}
</div>
</div> </div>
{% include "core/save_button.html" %}
</form> </form>
{% endblock %} {% endblock %}
aleksis/apps/alsijil/templates/alsijil/week_view.html
+ 59
− 44
View file @ 498234cf
...@@ -7,31 +7,32 @@ ...@@ -7,31 +7,32 @@
{% block extra_head %} {% block extra_head %}
{{ block.super }} {{ block.super }}
<link rel="stylesheet" href="{% static 'css/alsijil/alsijil.css' %}" /> <link rel="stylesheet" href="{% static 'css/alsijil/alsijil.css' %}"/>
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<div class="row"> <div class="row">
<div class="col s10"> <div class="col s10">
<form method="get"> <form method="post" action="">
<ul id="timetable_select_form"> {% csrf_token %}
{% form form=select_form %}{% endform %} {% form form=select_form %}{% endform %}
</ul> <button type="submit" class="btn waves-effect waves-light">
<button type="submit" class="btn waves-effect waves-light"> {% blocktrans %}Select{% endblocktrans %}
{% blocktrans %}Select{% endblocktrans %} </button>
</button> </form>
</form>
</div>
{% if group %}
<div class="col s2">
<a class="btn waves-effect waves-light" href="{% url 'full_register_group' group.id %}">
<i class="material-icons">printer</i>
</a>
</div> </div>
{% endif %} {% if group %}
</div> <div class="col s2">
<a class="btn waves-effect waves-light right" href="{% url 'full_register_group' group.id %}">
<i class="material-icons center">print</i>
</a>
</div>
{% endif %}
</div>
<h4>{% blocktrans with el=el week=week.week %}CW {{ week }}: {{ instance }}{% endblocktrans %} </h4>
{% if lesson_periods.count %} {% if lesson_periods %}
<div class="row"> <div class="row">
<div class="col s7"> <div class="col s7">
{% regroup lesson_periods by period.get_weekday_display as periods_by_day %} {% regroup lesson_periods by period.get_weekday_display as periods_by_day %}
...@@ -43,15 +44,15 @@ ...@@ -43,15 +44,15 @@
</span> </span>
<table class="striped responsive-table datatable"> <table class="striped responsive-table datatable">
<thead> <thead>
<tr> <tr>
<th>{% blocktrans %}Period{% endblocktrans %}</th> <th>{% blocktrans %}Period{% endblocktrans %}</th>
<th>{% blocktrans %}Subject{% endblocktrans %}</th> <th>{% blocktrans %}Subject{% endblocktrans %}</th>
<th>{% blocktrans %}Teachers{% endblocktrans %}</th> <th>{% blocktrans %}Teachers{% endblocktrans %}</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{% for period in periods %} {% for period in periods %}
<tr class=" <tr class="
{% if period.has_documentation %} {% if period.has_documentation %}
success success
{% else %} {% else %}
...@@ -69,15 +70,15 @@ ...@@ -69,15 +70,15 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
"> ">
<td>{{ period.period.period }}</td> <td>{{ period.period.period }}</td>
<td> <td>
<a href="{% url 'lesson_by_week_and_period' week.year week.week period.id %}"> <a href="{% url 'lesson_by_week_and_period' week.year week.week period.id %}">
{{ period.get_subject.name }} {{ period.get_subject.name }}
</a> </a>
</td> </td>
<td>{{ period.get_teacher_names }}</td> <td>{{ period.get_teacher_names }}</td>
</tr> </tr>
{% endfor %} {% endfor %}
</tbody> </tbody>
</table> </table>
</div> </div>
...@@ -93,20 +94,22 @@ ...@@ -93,20 +94,22 @@
{% for person in persons %} {% for person in persons %}
<h5 class="card-title">{{ person.full_name }}</h5> <h5 class="card-title">{{ person.full_name }}</h5>
<p class="card-text"> <p class="card-text">
{% trans "Absent" %}: {{ person.absences }} {% trans "Absent" %}: {{ person.absences_count }}
({{ person.unexcused }} {% trans "unexcused" %}) ({{ person.unexcused_count }} {% trans "unexcused" %})
</p> </p>
<p class="card-text"> <p class="card-text">
{% trans "Summed up tardiness" %}: {{ person.tardiness }} {% trans "Summed up tardiness" %}: {{ person.tardiness_sum }}'
</p> </p>
{% for note in person.personal_notes|only_week:week %} {% for note in person.personal_notes|only_week:week %}
{% if note.remarks %} {% if note.remarks %}
<blockquote class="blockquote mb-0"> <blockquote>
{{ note.remarks }} {{ note.remarks }}
<footer class="blockquote-footer"> {% weekday_to_date week note.lesson_period.period.weekday as note_date %}
{% weekday_to_date week note.lesson_period.period.weekday as note_date %} <em class="right">
{{ note_date }}, {{ note.lesson_period.lesson.subject.name }} <a href="{% url 'lesson_by_week_and_period' week.year week.week note.lesson_period.id %}">
</footer> {{ note_date }}, {{ note.lesson_period.get_subject.name }}
</a>
</em>
</blockquote> </blockquote>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
...@@ -123,10 +126,22 @@ ...@@ -123,10 +126,22 @@
</span> </span>
<p> <p>
{% blocktrans %} {% blocktrans %}
There are no lessons for the selected group, teacher, room or time. There are no lessons for the selected group, teacher or time.
{% endblocktrans %} {% endblocktrans %}
</p> </p>
</div> </div>
</div> </div>
{% endif %} {% endif %}
<script>
$(document).ready(function () {
$("#id_group").change(function () {
$("#id_teacher").val("").formSelect();
});
$("#id_teacher").change(function () {
$("#id_group").val("").formSelect();
});
});
</script>
{% endblock %} {% 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