Skip to content
Snippets Groups Projects
Commit eac589df authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch '170-use-iconify-for-material-icons-instead-of-icon-font' into 'master'

Resolve "Use iconify for Material Icons instead of icon font"

Closes #170

See merge request AlekSIS/official/AlekSIS-App-Chronos!250
parents aca10558 adb94cfc
No related branches found
No related tags found
No related merge requests found
Showing with 33 additions and 27 deletions
......@@ -9,6 +9,12 @@ and this project adheres to `Semantic Versioning`_.
Unreleased
----------
Changed
~~~~~~~
* Change the icon set to iconify.
`2.3`_ - 2022-03-21
-------------------
......
......@@ -5,7 +5,7 @@ MENUS = {
{
"name": _("Timetables"),
"url": "#",
"icon": "school",
"svg_icon": "mdi:school-outline",
"root": True,
"validators": [
"menu_generator.validators.is_authenticated",
......@@ -15,7 +15,7 @@ MENUS = {
{
"name": _("My timetable"),
"url": "my_timetable",
"icon": "person",
"svg_icon": "mdi:account-outline",
"validators": [
(
"aleksis.core.util.predicates.permission_validator",
......@@ -26,7 +26,7 @@ MENUS = {
{
"name": _("All timetables"),
"url": "all_timetables",
"icon": "grid_on",
"svg_icon": "mdi:grid",
"validators": [
(
"aleksis.core.util.predicates.permission_validator",
......@@ -37,7 +37,7 @@ MENUS = {
{
"name": _("Daily lessons"),
"url": "lessons_day",
"icon": "calendar_today",
"svg_icon": "mdi:calendar-outline",
"validators": [
(
"aleksis.core.util.predicates.permission_validator",
......@@ -48,7 +48,7 @@ MENUS = {
{
"name": _("Substitutions"),
"url": "substitutions",
"icon": "update",
"svg_icon": "mdi:update",
"validators": [
(
"aleksis.core.util.predicates.permission_validator",
......
......@@ -23,7 +23,7 @@
</a>
{% empty %}
{% trans 'No teachers timetables available.' as message %}
{% include 'components/msgbox.html' with status='missing_teachers' icon='warning' msg=message %}
{% include 'components/msgbox.html' with status='info' icon='mdi:alert-outline' msg=message %}
{% endfor %}
</div>
......@@ -37,7 +37,7 @@
</a>
{% empty %}
{% trans 'No group timetables available.' as message %}
{% include 'components/msgbox.html' with status='missing_groups' icon='warning' msg=message %}
{% include 'components/msgbox.html' with status='info' icon='mdi:alert-outline' msg=message %}
{% endfor %}
</div>
......@@ -51,7 +51,7 @@
</a>
{% empty %}
{% trans 'No room timetables available.' as message %}
{% include 'components/msgbox.html' with status='missing_rooms' icon='warning' msg=message %}
{% include 'components/msgbox.html' with status='info' icon='mdi:alert-outline' msg=message %}
{% endfor %}
</div>
</div>
......
......@@ -10,7 +10,7 @@
{% block content %}
<a class="btn green waves-effect waves-light" href="{% url 'create_automatic_plan' %}">
<i class="material-icons left">add</i>
<i class="material-icons iconify left" data-icon="mdi:add"></i>
{% trans "Create automatic plan" %}
</a>
......
......@@ -17,7 +17,7 @@
{# FIXME Respect year as well #}
<a href="{% url 'delete_substitution' substitution.lesson_period.id substitution.week %}"
class="btn red waves-effect waves-light">
<i class="material-icons left">delete</i> {% trans "Delete" %}
<i class="material-icons iconify left" data-icon="mdi:delete-outline"></i> {% trans "Delete" %}
</a>
{% endif %}
</form>
......
......@@ -7,8 +7,8 @@
{% endif %}
<div class="col s2 no-padding">
<a class="waves-effect waves-teal btn-flat btn-flat-medium left" href="{{ url_prev }}">
<i class="material-icons center">navigate_before</i>
<a class="waves-effect waves-secondary btn-flat btn-flat-medium left" href="{{ url_prev }}">
<i class="material-icons iconify center" data-icon="mdi:chevron-left"></i>
</a>
</div>
......@@ -24,7 +24,7 @@
</div>
{% endif %}
<div class="col s2 no-padding">
<a class="waves-effect waves-teal btn-flat btn-flat-medium right" href="{{ url_next }}">
<i class="material-icons center">navigate_next</i>
<a class="waves-effect waves-secondary btn-flat btn-flat-medium right" href="{{ url_next }}">
<i class="material-icons iconify center" data-icon="mdi:chevron-right"></i>
</a>
</div>
......@@ -3,7 +3,7 @@
<div class="col s12 m6 right">
<div class="col s2 no-print">
<a class="waves-effect waves-teal btn-flat btn-flat-medium right" href="{{ url_prev }}">
<i class="material-icons center">navigate_before</i>
<i class="material-icons iconify center" data-icon="mdi:chevron-left"></i>
</a>
</div>
......@@ -41,7 +41,7 @@
<div class="col s2 no-print">
<a class="waves-effect waves-teal btn-flat btn-flat-medium left" href="{{ url_next }}">
<i class="material-icons center">navigate_next</i>
<i class="material-icons iconify center" data-icon="mdi:chevron-right"></i>
</a>
</div>
</div>
......@@ -19,7 +19,7 @@
<div class="col s2 m6 right align-right print-icon">
<a class="waves-effect waves-teal btn-flat btn-flat-medium right"
href="{% url "substitutions_print_by_date" day.year day.month day.day %}" target="_blank">
<i class="material-icons center">print</i>
<i class="material-icons iconify center" data-icon="mdi:printer-outline"></i>
</a>
</div>
</div>
......@@ -41,8 +41,8 @@
<table class="substitutions striped">
<thead>
<tr>
<th><i class="material-icons">people</i></th>
<th><i class="material-icons">access_time</i></th>
<th><i class="material-icons iconify center" data-icon="mdi:account-multiple-outline"></i></th>
<th><i class="material-icons iconify center" data-icon="mdi:clock-outline"></i></th>
<th>{% trans "Teacher" %}</th>
<th>{% trans "Subject" %}</th>
<th>{% trans "Room" %}</th>
......
......@@ -23,8 +23,8 @@
<table class="substitutions">
<thead>
<tr>
<th><i class="material-icons">people</i></th>
<th><i class="material-icons">access_time</i></th>
<th><i class="material-icons iconify center" data-icon="mdi:account-multiple-outline"></i></th>
<th><i class="material-icons iconify center" data-icon="mdi:clock-outline"></i></th>
<th>{% blocktrans %}Teachers{% endblocktrans %}</th>
<th>{% blocktrans %}Subject{% endblocktrans %}</th>
<th>{% blocktrans %}Room{% endblocktrans %}</th>
......
......@@ -38,7 +38,7 @@
</div>
<div class="col s4 m6 l4 xl3 right align-right no-print">
<a class="waves-effect waves-teal btn-flat btn-flat-medium right hide-on-small-and-down" href="{% url "timetable_print" type.value pk %}">
<i class="material-icons center">print</i>
<i class="material-icons iconify center" data-icon="mdi:printer-outline"></i>
</a>
</div>
</div>
......@@ -51,7 +51,7 @@
<a class="waves-effect waves-light btn-flat no-print"
href="{% url "timetable_regular" type.value pk "regular" %}">
<i class="material-icons left">slideshow</i>
<i class="material-icons iconify left" data-icon="mdi:play-box-outline"></i>
{% trans "Show regular timetable" %}
</a>
......@@ -59,7 +59,7 @@
{% if is_alsijil_installed and can_view_week_view %}
<a class="waves-effect waves-light btn-flat no-print"
href="{% url "week_view_by_week" year=week.year week=week.week %}">
<i class="material-icons left">chrome_reader_mode</i>
<i class="material-icons iconify left" data-icon="mdi:book-open"></i>
{% trans "View class register of this week" %}
</a>
{% endif %}
......@@ -72,7 +72,7 @@
{# Show if regular #}
<a class="waves-effect waves-light btn-flat no-print"
href="{% url "timetable" type.value pk %}">
<i class="material-icons left">slideshow</i>
<i class="material-icons iconify left" data-icon="mdi:play-box-outline"></i>
{% trans "Show SMART PLAN" %}
</a>
......@@ -80,7 +80,7 @@
{% if is_alsijil_installed and can_view_week_view %}
<a class="waves-effect waves-light btn-flat no-print"
href="{% url "week_view_by_week" year=week.year week=week.week %}">
<i class="material-icons left">chrome_reader_mode</i>
<i class="material-icons iconify left" data-icon="mdi:book-open"></i>
{% trans "View class register of the current week" %}
</a>
{% endif %}
......
......@@ -14,7 +14,7 @@
{% include "chronos/partials/lessons_col.html" with lesson_periods=lesson_periods %}
{% else %}
<figure class="alert warning">
<i class="material-icons left">info</i>
<i class="material-icons iconify left" data-icon="mdi:alert-outline"></i>
{% blocktrans %}
There is no timetable linked to your person.
{% endblocktrans %}
......
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