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

Merge branch 'core-116-migrate-to-material-design-icons' into 'master' 

Use material-design-icons instead of font_awesome. Advances BiscuIT-ng#116.

Closes BiscuIT-ng#116

See merge request BiscuIT/BiscuIT-App-Alsijil!34
parents ec333194 53928687
No related branches found
No related tags found
1 merge request!34Use material-design-icons instead of font_awesome. Advances BiscuIT-ng#116.
Hide whitespace changes
Inline Side-by-side
Showing
with 18 additions and 19 deletions
biscuit/apps/alsijil/templates/alsijil/manage_personal_note_filter.html
+ 2
− 2
View file @ 58976ab2
{# -*- engine:django -*- #} {# -*- engine:django -*- #}
{% extends "core/base.html" %} {% extends "core/base.html" %}
{% load bootstrap4 i18n static font_awesome %} {% load bootstrap4 i18n static %}
{% block bootstrap4_extra_head %} {% block bootstrap4_extra_head %}
{{ block.super }} {{ block.super }}
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<div class="btn-group" role="group" aria-label="Filter actions"> <div class="btn-group" role="group" aria-label="Filter actions">
{% if personal_note_filter %} {% if personal_note_filter %}
<a href="{% url 'delete_personal_note_filter' personal_note_filter.id %}" class="btn btn-danger"> <a href="{% url 'delete_personal_note_filter' personal_note_filter.id %}" class="btn btn-danger">
{% fa 'trash-o' %} <span class="mdi mdi-delete"></span>
</a> </a>
{% endif %} {% endif %}
</div> </div>
......
biscuit/apps/alsijil/templates/alsijil/manage_personal_note_filters.html
+ 2
− 2
View file @ 58976ab2
{# -*- engine:django -*- #} {# -*- engine:django -*- #}
{% extends "core/base.html" %} {% extends "core/base.html" %}
{% load bootstrap4 i18n static font_awesome %} {% load bootstrap4 i18n static %}
{% block bootstrap4_extra_head %} {% block bootstrap4_extra_head %}
{{ block.super }} {{ block.super }}
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
<div class="btn-group" role="group" aria-label="Filter actions"> <div class="btn-group" role="group" aria-label="Filter actions">
{% if personal_note_filters %} {% if personal_note_filters %}
<a href="{% url 'delete_personal_note_filters' personal_note_filters.id %}" class="btn btn-danger"> <a href="{% url 'delete_personal_note_filters' personal_note_filters.id %}" class="btn btn-danger">
{% fa 'trash-o' %} <span class="mdi mdi-delete"></span>
</a> </a>
{% endif %} {% endif %}
</div> </div>
......
biscuit/apps/alsijil/templates/alsijil/personal_note_filters.html
+ 2
− 2
View file @ 58976ab2
{# -*- engine:django -*- #} {# -*- engine:django -*- #}
{% extends "core/base.html" %} {% extends "core/base.html" %}
{% load bootstrap4 i18n font_awesome %} {% load bootstrap4 i18n %}
{% load render_table from django_tables2 %} {% load render_table from django_tables2 %}
{% block bootstrap4_title %}{% blocktrans %}List of all personal note filters{% endblocktrans %} - {{ block.super }}{% endblock %} {% block bootstrap4_title %}{% blocktrans %}List of all personal note filters{% endblocktrans %} - {{ block.super }}{% endblock %}
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
{% block content %} {% block content %}
<div class="btn-group" role="group" aria-lable="Filter actions"> <div class="btn-group" role="group" aria-lable="Filter actions">
<a href="{% url 'create_personal_note_filter' %}" class="btn btn-dark"> <a href="{% url 'create_personal_note_filter' %}" class="btn btn-dark">
{% fa 'plus' %} <span class="mdi mdi-plus"></span>
</a> </a>
</div> </div>
......
biscuit/apps/alsijil/templates/alsijil/print/full_register.html
+ 10
− 11
View file @ 58976ab2
{% load staticfiles i18n cropping data_helpers font_awesome week_helpers %} {% load staticfiles i18n cropping data_helpers week_helpers %}
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
{% fa_css %}
<link rel="stylesheet" <link rel="stylesheet"
href="{% static 'css/alsijil/paper.css' %}" /> href="{% static 'css/alsijil/paper.css' %}" />
<link rel="stylesheet" <link rel="stylesheet"
href="{% static 'css/alsijil/full_register.css' %}" /> href="{% static 'css/alsijil/full_register.css' %}" />
<link rel="stylesheet"
href="{% static '@mdi/font/css/materialdesignicons.css' %}" />
</head> </head>
<body class="A4"> <body class="A4">
...@@ -136,36 +135,36 @@ ...@@ -136,36 +135,36 @@
<img src="{% static 'img/fallback.png' %}" alt="{{ person.first_name }} {{ person.last_name }}" /> <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"></span></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-gift"></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>
......
biscuit/apps/alsijil/templates/alsijil/week_view.html
+ 2
− 2
View file @ 58976ab2
{# -*- engine:django -*- #} {# -*- engine:django -*- #}
{% extends "core/turnable.html" %} {% extends "core/turnable.html" %}
{% load bootstrap4 font_awesome i18n week_helpers %} {% load bootstrap4 i18n week_helpers %}
{% block bootstrap4_extra_head %} {% block bootstrap4_extra_head %}
{{ block.super }} {{ block.super }}
...@@ -27,7 +27,7 @@ ...@@ -27,7 +27,7 @@
</form> </form>
{% if group %} {% if group %}
<a class="btn btn-dark" href="{% url 'full_register_group' group.id %}"> <a class="btn btn-dark" href="{% url 'full_register_group' group.id %}">
{% fa 'print' %} <span class="mdi mdi-printer"></span>
</a> </a>
{% endif %} {% endif %}
</div> </div>
......
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