diff --git a/biscuit/core/templates/core/base.html b/biscuit/core/templates/core/base.html index 9b440b9ab6ac3ab7a41682f7819861a75ba74348..aafbabac0515906e4d726756b1542e7239a44823 100644 --- a/biscuit/core/templates/core/base.html +++ b/biscuit/core/templates/core/base.html @@ -2,7 +2,7 @@ {% extends "bootstrap4/bootstrap4.html" %} -{% load bootstrap4 i18n menu_generator static font_awesome any_js sass_tags %} +{% load bootstrap4 i18n menu_generator static any_js sass_tags %} {% block bootstrap4_extra_head %} {% fa_css %} @@ -10,6 +10,7 @@ {% include 'core/icons.html' %} <link rel="stylesheet" href="{% sass_src 'bootstrap_modified.scss' %}" /> <link rel="stylesheet" href="{% static 'css/style.css' %}" /> + <link rel="stylesheet" href="{% static '@mdi/font/css/materialdesignicons.css' %}" /> {% endblock %} {% block bootstrap4_title %}BiscuIT School Information System{% endblock %} @@ -24,10 +25,10 @@ <header> <nav class="navbar navbar-dark bg-dark navbar-expand-md fixed-top"> <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbar-main"> - {% fa 'fa-align-justify' %} + <span class="mdi mdi-menu"></span> </button> <a class="navbar-brand" href="{% url "index" %}"> - {% fa 'fa-briefcase' %} BiscuIT SIS + <span class="mdi mdi-briefcase"></span> BiscuIT SIS </a> <div class="collapse navbar-collapse" id="navbar-main"> diff --git a/biscuit/core/templates/core/crud_events_ul.html b/biscuit/core/templates/core/crud_events_ul.html index dbe27d8fc25d94e2e1899600be8e3d06dbfd4ae8..8eef4639e7fc56f3ac8a563f2dd7488f8c922479 100644 --- a/biscuit/core/templates/core/crud_events_ul.html +++ b/biscuit/core/templates/core/crud_events_ul.html @@ -1,5 +1,3 @@ -{% load font_awesome %} - <ul class="{{ class_ul }}"> {% for event in obj.crud_events %} <li class="{{ class_li }}"> @@ -9,15 +7,15 @@ </div> <span class="badge badge-light text-dark"> {% if event.event_type == event.CREATE %} - {% fa 'plus' %} + <span class="mdi mdi-plus"></span> {% elif event.event_type == event.UPDATE %} - {% fa 'pencil' %} + <span class="mdi mdi-pencil"></span> {% elif event.event_type == event.DELETE %} - {% fa 'trash' %} + <span class="mdi mdi-delete"></span> {% elif event.event_type == event.M2M_CHANGE %} - {% fa 'pencil' %} + <span class="mdi mdi-pencil"></span> {% elif event.event_type == event.M2M_CHANGE_REV %} - {% fa 'pencil' %} + <span class="mdi mdi-pencil"></span> {% endif %} </span> </li> diff --git a/biscuit/core/templates/core/group_full.html b/biscuit/core/templates/core/group_full.html index cb3b8e83fd232312ccef2033ef23f057f15136ed..0b925b1451f14d7b3f002b19d204cb56a80226a3 100644 --- a/biscuit/core/templates/core/group_full.html +++ b/biscuit/core/templates/core/group_full.html @@ -2,7 +2,7 @@ {% extends "core/base.html" %} -{% load bootstrap4 font_awesome i18n static %} +{% load bootstrap4 i18n static %} {% load render_table from django_tables2 %} {% block bootstrap4_title %}{% blocktrans %}Group{% endblocktrans %} - {{ block.super }}{% endblock %} @@ -19,7 +19,7 @@ <h3>{% blocktrans %}Details{% endblocktrans %}</h3> <table class="table table-responsive-xl table-border table-striped"> <tr> - <td>{% fa 'users' %}</td> + <td><span class="mdi mdi-account-group"></span></td> <td>{{ group.name }}</td> <td>{{ group.short_name }}</td> </tr> diff --git a/biscuit/core/templates/core/groups.html b/biscuit/core/templates/core/groups.html index 72b7ead8d5b3286756ca65e6bb5009d80037f846..6534a8e384dbf48b4820eac1590ebdbcf923b06c 100644 --- a/biscuit/core/templates/core/groups.html +++ b/biscuit/core/templates/core/groups.html @@ -2,7 +2,7 @@ {% extends "core/base.html" %} -{% load bootstrap4 font_awesome i18n %} +{% load bootstrap4 i18n %} {% load render_table from django_tables2 %} {% block bootstrap4_title %}{% blocktrans %}Groups{% endblocktrans %} - {{ block.super }}{% endblock %} @@ -12,7 +12,7 @@ {% block content %} <div class="btn-group" role="group" aria-lable="Group actions"> <a href="{% url 'create_group' %}" class="btn btn-dark"> - {% fa 'plus' %} + <span class="mdi mdi-plus"></span> </a> </div> diff --git a/biscuit/core/templates/core/person_full.html b/biscuit/core/templates/core/person_full.html index 684a72f40351f4551d154a32db8b5b5ec3656a21..6c05430346303d2bdeabb03c3f5ae08879dec323 100644 --- a/biscuit/core/templates/core/person_full.html +++ b/biscuit/core/templates/core/person_full.html @@ -2,7 +2,7 @@ {% extends "core/base.html" %} -{% load bootstrap4 font_awesome i18n static cropping %} +{% load bootstrap4 i18n static cropping %} {% load render_table from django_tables2 %} {% block bootstrap4_title %}{% blocktrans %}Person{% endblocktrans %} - {{ block.super }}{% endblock %} @@ -26,36 +26,36 @@ <img class="person-img" src="{% static 'img/fallback.png' %}" alt="{{ person.first_name }} {{ person.last_name }}" /> {% endif %} </td> - <td>{% fa 'user' %}</td> + <td><span class="mdi mdi-account"></span></td> <td>{{ person.first_name }}</td> <td>{{ person.additional_name }}</td> <td>{{ person.last_name }}</td> </tr> <tr> - <td>{% fa 'venus-mars' %}</td> + <td><span class="mdi mdi-gender-male-female"></td> <td colspan="3">{{ person.get_sex_display }}</td> </tr> <tr> - <td>{% fa 'fa-home' %}</td> + <td><span class="mdi mdi-home"></span></td> <td colspan="2">{{ person.street }} {{ person.housenumber }}</td> <td colspan="2">{{ person.postal_code }} {{ person.place }}</td> </tr> <tr> - <td>{% fa 'phone-square' %}</td> + <td><span class="mdi mdi-phone"></span></td> <td>{{ person.phone_number }}</td> <td>{{ person.mobile_number }}</td> </tr> <tr> - <td>{% fa 'envelope' %}</td> + <td><span class="mdi mdi-email"></span></td> <td colspan="3">{{ person.email }}</td> </tr> <tr> - <td>{% fa 'gift' %}</td> + <td><span class="mdi mdi-cake"></span></td> <td colspan="3">{{ person.date_of_birth|date }}</td> </tr> {% comment %} <tr> - <td>{% fa 'graduation-cap' %}</td> + <td><span class="mdi mdi-school"></span></td> <td>Class</td> <td>Teacher</td> </tr> diff --git a/biscuit/core/templates/core/turnable.html b/biscuit/core/templates/core/turnable.html index 61e4b3764b6fb439cdcf0221cc6974461a168ce5..237f7576f8a250bbe9ba1de42becbc093ffe6b96 100644 --- a/biscuit/core/templates/core/turnable.html +++ b/biscuit/core/templates/core/turnable.html @@ -2,7 +2,6 @@ {% extends "core/base.html" %} -{% load font_awesome %} {% block content %} @@ -12,10 +11,10 @@ </div> <div class="btn-group" role="group" aria-label="URL actions"> <a href="{{ url_prev }}" class="btn btn-dark"> - {% fa 'arrow-left' %} + <span class="mdi mdi-chevron-left"></span> </a> <a href="{{ url_next }}" class="btn btn-dark"> - {% fa 'arrow-right' %} + <span class="mdi mdi-chevron-right"></span> </a> </div> </div>