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

Replace all icons by new icon set

parent 0ae870bc
No related branches found
No related tags found
1 merge request!2Resolve "Use iconify for Material Icons instead of icon font"
Pipeline #59267 passed
...@@ -6,7 +6,7 @@ MENUS = { ...@@ -6,7 +6,7 @@ MENUS = {
"name": _("Student ID Cards"), "name": _("Student ID Cards"),
"url": "#", "url": "#",
"root": True, "root": True,
"icon": "credit_card", "svg_icon": "mdi:card-account-details-outline",
"validators": [ "validators": [
"menu_generator.validators.is_authenticated", "menu_generator.validators.is_authenticated",
"aleksis.core.util.core_helpers.has_person", "aleksis.core.util.core_helpers.has_person",
...@@ -15,7 +15,7 @@ MENUS = { ...@@ -15,7 +15,7 @@ MENUS = {
{ {
"name": _("All Cards"), "name": _("All Cards"),
"url": "cards", "url": "cards",
"icon": "list", "svg_icon": "mdi:card-multiple-outline",
"validators": [ "validators": [
( (
"aleksis.core.util.predicates.permission_validator", "aleksis.core.util.predicates.permission_validator",
......
...@@ -7,13 +7,13 @@ ...@@ -7,13 +7,13 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a href="#!" class="modal-close waves-effect waves-green btn-flat"> <a href="#!" class="modal-close waves-effect waves-green btn-flat">
<i class="material-icons left">close</i> <i class="material-icons left iconify" data-icon="mdi:close"></i>
{% trans "Close" %} {% trans "Close" %}
</a> </a>
</div> </div>
</div> </div>
<a class="btn-flat waves-effect waves-green green-text modal-trigger" href="#detail-modal-{{ card.pk }}"> <a class="btn-flat waves-effect waves-green green-text modal-trigger" href="#detail-modal-{{ card.pk }}">
<i class="material-icons left">slideshow</i> <i class="material-icons left iconify" data-icon="mdi:play-box-outline"></i>
{% trans "Show" %} {% trans "Show" %}
</a> </a>
{% if not card.deactivated %} {% if not card.deactivated %}
...@@ -24,21 +24,21 @@ ...@@ -24,21 +24,21 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a href="#!" class="modal-close waves-effect waves-green btn-flat"> <a href="#!" class="modal-close waves-effect waves-green btn-flat">
<i class="material-icons left">close</i> <i class="material-icons left iconify" data-icon="mdi:close"></i>
{% trans "Close" %} {% trans "Close" %}
</a> </a>
<a href="{% url "deactivate_card" card.pk %}" class="modal-close waves-effect waves-light orange btn"> <a href="{% url "deactivate_card" card.pk %}" class="modal-close waves-effect waves-light orange btn">
<i class="material-icons left">timer_off</i> <i class="material-icons left iconify" data-icon="mdi:timer-off-outline"></i>
{% trans "Deactivate" %} {% trans "Deactivate" %}
</a> </a>
</div> </div>
</div> </div>
<a class="btn-flat waves-effect waves-orange orange-text modal-trigger" href="#deactivate-modal-{{ card.pk }}"> <a class="btn-flat waves-effect waves-orange orange-text modal-trigger" href="#deactivate-modal-{{ card.pk }}">
<i class="material-icons left">timer_off</i> <i class="material-icons left iconify" data-icon="mdi:timer-off-outline"></i>
{% trans "Deactivate" %} {% trans "Deactivate" %}
</a> </a>
{% endif %} {% endif %}
<a class="btn-flat waves-effect waves-red red-text modal-trigger" href="{% url "delete_card" card.pk %}"> <a class="btn-flat waves-effect waves-red red-text modal-trigger" href="{% url "delete_card" card.pk %}">
<i class="material-icons left">delete</i> <i class="material-icons left iconify" data-icon="mdi:delete-outline"></i>
{% trans "Delete" %} {% trans "Delete" %}
</a> </a>
\ No newline at end of file
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<p class="flow-text">{% trans "Do you really want to delete the following card?" %}</p> <p class="flow-text">{% trans "Do you really want to delete the following card?" %}</p>
{% include "kort/card/short.html" %} {% include "kort/card/short.html" %}
<figure class="alert warning"> <figure class="alert warning">
<i class="material-icons left">warning</i> <i class="material-icons left iconify" data-icon="mdi:alert-octagon-outline"></i>
{% blocktrans %} {% blocktrans %}
Please pay attention that a deletion of a card is irreversible and should be only used to clean up misprints. Please pay attention that a deletion of a card is irreversible and should be only used to clean up misprints.
If you just want to make a card unusable because a student has lost his card or left the school, If you just want to make a card unusable because a student has lost his card or left the school,
...@@ -22,11 +22,11 @@ ...@@ -22,11 +22,11 @@
<form method="post" action=""> <form method="post" action="">
{% csrf_token %} {% csrf_token %}
<a href="{% url "cards" %}" class="modal-close waves-effect waves-green btn"> <a href="{% url "cards" %}" class="modal-close waves-effect waves-green btn">
<i class="material-icons left">arrow_back</i> <i class="material-icons left iconify" data-icon="mdi:arrow-left"></i>
{% trans "Go back" %} {% trans "Go back" %}
</a> </a>
<button type="submit" name="delete" class="modal-close waves-effect waves-light red btn"> <button type="submit" name="delete" class="modal-close waves-effect waves-light red btn">
<i class="material-icons left">delete</i> <i class="material-icons left iconify" data-icon="mdi:delete-outline"></i>
{% trans "Delete" %} {% trans "Delete" %}
</button> </button>
</form> </form>
......
...@@ -6,19 +6,30 @@ ...@@ -6,19 +6,30 @@
<div class="card-title">{% trans "Card details" %}</div> <div class="card-title">{% trans "Card details" %}</div>
<table> <table>
<tr> <tr>
<th>{% trans "Person" %}</th> <th>
<i class="material-icons left iconify" data-icon="mdi:person-outline"></i>
{% trans "Person" %}</th>
<td>{{ card.person }}</td> <td>{{ card.person }}</td>
</tr> </tr>
<tr> <tr>
<th>{% trans "Chip number" %}</th> <th>
<i class="material-icons left iconify" data-icon="mdi:barcode"></i>
{% trans "Chip number" %}
</th>
<td><code>{{ card.chip_number|default:_("not set yet") }}</code></td> <td><code>{{ card.chip_number|default:_("not set yet") }}</code></td>
</tr> </tr>
<tr> <tr>
<th>{% trans "Valid until" %}</th> <th>
<i class="material-icons left iconify" data-icon="mdi:calendar-clock"></i>
{% trans "Valid until" %}
</th>
<td>{{ card.valid_until }}</td> <td>{{ card.valid_until }}</td>
</tr> </tr>
<tr> <tr>
<th>{% trans "Status" %}</th> <th>
<i class="material-icons left iconify" data-icon="mdi:checkbox-blank-badge-outline"></i>
{% trans "Status" %}
</th>
<td> <td>
{% include "kort/card/status.html" %} {% include "kort/card/status.html" %}
</td> </td>
...@@ -34,7 +45,7 @@ ...@@ -34,7 +45,7 @@
{% else %} {% else %}
<div class="row center-via-flex"> <div class="row center-via-flex">
<a class="btn waves-effect waves-light" href="{% url "generate_card_pdf" card.pk %}"> <a class="btn waves-effect waves-light" href="{% url "generate_card_pdf" card.pk %}">
<i class="material-icons left">picture_as_pdf</i> <i class="material-icons left iconify" data-icon="mdi:file-pdf-box"></i>
{% trans "Generate card as PDF" %} {% trans "Generate card as PDF" %}
</a> </a>
</div> </div>
......
...@@ -9,17 +9,11 @@ ...@@ -9,17 +9,11 @@
{% block page_title %}{% blocktrans %}Cards{% endblocktrans %}{% endblock %} {% block page_title %}{% blocktrans %}Cards{% endblocktrans %}{% endblock %}
{% block content %} {% block content %}
<script>
</script>
{% has_perm 'core.create_card_rule' user person as can_create_person %} {% has_perm 'core.create_card_rule' user person as can_create_person %}
{% if can_create_person %} {% if can_create_person %}
<a class="btn green waves-effect waves-light" href="{% url 'create_card' %}"> <a class="btn green waves-effect waves-light" href="{% url 'create_card' %}">
<i class="material-icons left">add</i> <i class="material-icons left iconify" data-icon="mdi:plus"></i>
{% trans "Issue new card" %} {% trans "Issue new card" %}
</a> </a>
{% endif %} {% endif %}
......
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