Skip to content
Snippets Groups Projects
Verified Commit 778baa73 authored by Tom Teichler's avatar Tom Teichler :beers:
Browse files

Migrate to material-design-icons. Closes #116.

parent 6e4669bf
No related branches found
No related tags found
No related merge requests found
Pipeline #375 failed
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% extends "bootstrap4/bootstrap4.html" %} {% 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 %} {% block bootstrap4_extra_head %}
{% fa_css %} {% fa_css %}
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
{% include 'core/icons.html' %} {% include 'core/icons.html' %}
<link rel="stylesheet" href="{% sass_src 'bootstrap_modified.scss' %}" /> <link rel="stylesheet" href="{% sass_src 'bootstrap_modified.scss' %}" />
<link rel="stylesheet" href="{% static 'css/style.css' %}" /> <link rel="stylesheet" href="{% static 'css/style.css' %}" />
<link rel="stylesheet" href="{% static '@mdi/font/css/materialdesignicons.css' %}" />
{% endblock %} {% endblock %}
{% block bootstrap4_title %}BiscuIT School Information System{% endblock %} {% block bootstrap4_title %}BiscuIT School Information System{% endblock %}
...@@ -24,10 +25,10 @@ ...@@ -24,10 +25,10 @@
<header> <header>
<nav class="navbar navbar-dark bg-dark navbar-expand-md fixed-top"> <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"> <button type="button" class="navbar-toggler" data-toggle="collapse" data-target="#navbar-main">
{% fa 'fa-align-justify' %} <span class="mdi mdi-menu"></span>
</button> </button>
<a class="navbar-brand" href="{% url "index" %}"> <a class="navbar-brand" href="{% url "index" %}">
{% fa 'fa-briefcase' %} BiscuIT SIS <span class="mdi mdi-briefcase"></span> BiscuIT SIS
</a> </a>
<div class="collapse navbar-collapse" id="navbar-main"> <div class="collapse navbar-collapse" id="navbar-main">
......
{% load font_awesome %}
<ul class="{{ class_ul }}"> <ul class="{{ class_ul }}">
{% for event in obj.crud_events %} {% for event in obj.crud_events %}
<li class="{{ class_li }}"> <li class="{{ class_li }}">
...@@ -9,15 +7,15 @@ ...@@ -9,15 +7,15 @@
</div> </div>
<span class="badge badge-light text-dark"> <span class="badge badge-light text-dark">
{% if event.event_type == event.CREATE %} {% if event.event_type == event.CREATE %}
{% fa 'plus' %} <span class="mdi mdi-plus"></span>
{% elif event.event_type == event.UPDATE %} {% elif event.event_type == event.UPDATE %}
{% fa 'pencil' %} <span class="mdi mdi-pencil"></span>
{% elif event.event_type == event.DELETE %} {% elif event.event_type == event.DELETE %}
{% fa 'trash' %} <span class="mdi mdi-delete"></span>
{% elif event.event_type == event.M2M_CHANGE %} {% elif event.event_type == event.M2M_CHANGE %}
{% fa 'pencil' %} <span class="mdi mdi-pencil"></span>
{% elif event.event_type == event.M2M_CHANGE_REV %} {% elif event.event_type == event.M2M_CHANGE_REV %}
{% fa 'pencil' %} <span class="mdi mdi-pencil"></span>
{% endif %} {% endif %}
</span> </span>
</li> </li>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% extends "core/base.html" %} {% extends "core/base.html" %}
{% load bootstrap4 font_awesome i18n static %} {% load bootstrap4 i18n static %}
{% load render_table from django_tables2 %} {% load render_table from django_tables2 %}
{% block bootstrap4_title %}{% blocktrans %}Group{% endblocktrans %} - {{ block.super }}{% endblock %} {% block bootstrap4_title %}{% blocktrans %}Group{% endblocktrans %} - {{ block.super }}{% endblock %}
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<h3>{% blocktrans %}Details{% endblocktrans %}</h3> <h3>{% blocktrans %}Details{% endblocktrans %}</h3>
<table class="table table-responsive-xl table-border table-striped"> <table class="table table-responsive-xl table-border table-striped">
<tr> <tr>
<td>{% fa 'users' %}</td> <td><span class="mdi mdi-account-group"></span></td>
<td>{{ group.name }}</td> <td>{{ group.name }}</td>
<td>{{ group.short_name }}</td> <td>{{ group.short_name }}</td>
</tr> </tr>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% extends "core/base.html" %} {% extends "core/base.html" %}
{% load bootstrap4 font_awesome i18n %} {% load bootstrap4 i18n %}
{% load render_table from django_tables2 %} {% load render_table from django_tables2 %}
{% block bootstrap4_title %}{% blocktrans %}Groups{% endblocktrans %} - {{ block.super }}{% endblock %} {% block bootstrap4_title %}{% blocktrans %}Groups{% endblocktrans %} - {{ block.super }}{% endblock %}
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
{% block content %} {% block content %}
<div class="btn-group" role="group" aria-lable="Group actions"> <div class="btn-group" role="group" aria-lable="Group actions">
<a href="{% url 'create_group' %}" class="btn btn-dark"> <a href="{% url 'create_group' %}" class="btn btn-dark">
{% fa 'plus' %} <span class="mdi mdi-plus"></span>
</a> </a>
</div> </div>
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
{% extends "core/base.html" %} {% extends "core/base.html" %}
{% load bootstrap4 font_awesome i18n static cropping %} {% load bootstrap4 i18n static cropping %}
{% load render_table from django_tables2 %} {% load render_table from django_tables2 %}
{% block bootstrap4_title %}{% blocktrans %}Person{% endblocktrans %} - {{ block.super }}{% endblock %} {% block bootstrap4_title %}{% blocktrans %}Person{% endblocktrans %} - {{ block.super }}{% endblock %}
...@@ -26,36 +26,36 @@ ...@@ -26,36 +26,36 @@
<img class="person-img" src="{% static 'img/fallback.png' %}" alt="{{ person.first_name }} {{ person.last_name }}" /> <img class="person-img" src="{% static 'img/fallback.png' %}" alt="{{ person.first_name }} {{ person.last_name }}" />
{% endif %} {% endif %}
</td> </td>
<td>{% fa 'user' %}</td> <td><span class="mdi mdi-account"></span></td>
<td>{{ person.first_name }}</td> <td>{{ person.first_name }}</td>
<td>{{ person.additional_name }}</td> <td>{{ person.additional_name }}</td>
<td>{{ person.last_name }}</td> <td>{{ person.last_name }}</td>
</tr> </tr>
<tr> <tr>
<td>{% fa 'venus-mars' %}</td> <td><span class="mdi mdi-gender-male-female"></td>
<td colspan="3">{{ person.get_sex_display }}</td> <td colspan="3">{{ person.get_sex_display }}</td>
</tr> </tr>
<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.street }} {{ person.housenumber }}</td>
<td colspan="2">{{ person.postal_code }} {{ person.place }}</td> <td colspan="2">{{ person.postal_code }} {{ person.place }}</td>
</tr> </tr>
<tr> <tr>
<td>{% fa 'phone-square' %}</td> <td><span class="mdi mdi-phone"></span></td>
<td>{{ person.phone_number }}</td> <td>{{ person.phone_number }}</td>
<td>{{ person.mobile_number }}</td> <td>{{ person.mobile_number }}</td>
</tr> </tr>
<tr> <tr>
<td>{% fa 'envelope' %}</td> <td><span class="mdi mdi-email"></span></td>
<td colspan="3">{{ person.email }}</td> <td colspan="3">{{ person.email }}</td>
</tr> </tr>
<tr> <tr>
<td>{% fa 'gift' %}</td> <td><span class="mdi mdi-cake"></span></td>
<td colspan="3">{{ person.date_of_birth|date }}</td> <td colspan="3">{{ person.date_of_birth|date }}</td>
</tr> </tr>
{% comment %} {% comment %}
<tr> <tr>
<td>{% fa 'graduation-cap' %}</td> <td><span class="mdi mdi-school"></span></td>
<td>Class</td> <td>Class</td>
<td>Teacher</td> <td>Teacher</td>
</tr> </tr>
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
{% extends "core/base.html" %} {% extends "core/base.html" %}
{% load font_awesome %}
{% block content %} {% block content %}
...@@ -12,10 +11,10 @@ ...@@ -12,10 +11,10 @@
</div> </div>
<div class="btn-group" role="group" aria-label="URL actions"> <div class="btn-group" role="group" aria-label="URL actions">
<a href="{{ url_prev }}" class="btn btn-dark"> <a href="{{ url_prev }}" class="btn btn-dark">
{% fa 'arrow-left' %} <span class="mdi mdi-chevron-left"></span>
</a> </a>
<a href="{{ url_next }}" class="btn btn-dark"> <a href="{{ url_next }}" class="btn btn-dark">
{% fa 'arrow-right' %} <span class="mdi mdi-chevron-right"></span>
</a> </a>
</div> </div>
</div> </div>
......
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