diff --git a/aleksis/apps/kort/menus.py b/aleksis/apps/kort/menus.py index a28ff3e279d238bd3d3bfe6447015beb11be7bb6..812fb3894999177feb8f04c7b2644c635756e5e1 100644 --- a/aleksis/apps/kort/menus.py +++ b/aleksis/apps/kort/menus.py @@ -6,7 +6,7 @@ MENUS = { "name": _("Student ID Cards"), "url": "#", "root": True, - "icon": "credit_card", + "svg_icon": "mdi:card-account-details-outline", "validators": [ "menu_generator.validators.is_authenticated", "aleksis.core.util.core_helpers.has_person", @@ -15,7 +15,7 @@ MENUS = { { "name": _("All Cards"), "url": "cards", - "icon": "list", + "svg_icon": "mdi:card-multiple-outline", "validators": [ ( "aleksis.core.util.predicates.permission_validator", diff --git a/aleksis/apps/kort/templates/kort/card/actions.html b/aleksis/apps/kort/templates/kort/card/actions.html index ce253a92178bb47677c286fdf3d106a9d23b72e7..6a73798fb5f10b716692f1add0a12f237704cdf0 100644 --- a/aleksis/apps/kort/templates/kort/card/actions.html +++ b/aleksis/apps/kort/templates/kort/card/actions.html @@ -7,13 +7,13 @@ </div> <div class="modal-footer"> <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" %} </a> </div> </div> <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" %} </a> {% if not card.deactivated %} @@ -24,21 +24,21 @@ </div> <div class="modal-footer"> <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" %} </a> <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" %} </a> </div> </div> <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" %} </a> {% endif %} <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" %} </a> \ No newline at end of file diff --git a/aleksis/apps/kort/templates/kort/card/delete.html b/aleksis/apps/kort/templates/kort/card/delete.html index f15a2df3f7ebdaec360450b8d149f5f24de3a9e5..822999f55a2082bff63839a3bde6a7a5534b6cf4 100644 --- a/aleksis/apps/kort/templates/kort/card/delete.html +++ b/aleksis/apps/kort/templates/kort/card/delete.html @@ -12,7 +12,7 @@ <p class="flow-text">{% trans "Do you really want to delete the following card?" %}</p> {% include "kort/card/short.html" %} <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 %} 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, @@ -22,11 +22,11 @@ <form method="post" action=""> {% csrf_token %} <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" %} </a> <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" %} </button> </form> diff --git a/aleksis/apps/kort/templates/kort/card/detail_content.html b/aleksis/apps/kort/templates/kort/card/detail_content.html index c0a4cb37836d6a09ea6b854ed0ec51200f94f0d2..78f6036b10bc65ac2cba248a1e7cd78d687de970 100644 --- a/aleksis/apps/kort/templates/kort/card/detail_content.html +++ b/aleksis/apps/kort/templates/kort/card/detail_content.html @@ -6,19 +6,30 @@ <div class="card-title">{% trans "Card details" %}</div> <table> <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> </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> </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> </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> {% include "kort/card/status.html" %} </td> @@ -34,7 +45,7 @@ {% else %} <div class="row center-via-flex"> <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" %} </a> </div> diff --git a/aleksis/apps/kort/templates/kort/card/list.html b/aleksis/apps/kort/templates/kort/card/list.html index 874d37d17bc8ad80f6d954d22ea47e2ea33c4c4c..5f96123eb76ab63a52dabfc133850b649ae07e18 100644 --- a/aleksis/apps/kort/templates/kort/card/list.html +++ b/aleksis/apps/kort/templates/kort/card/list.html @@ -9,17 +9,11 @@ {% block page_title %}{% blocktrans %}Cards{% endblocktrans %}{% endblock %} {% block content %} - - <script> - - </script> - - {% has_perm 'core.create_card_rule' user person as can_create_person %} {% if can_create_person %} <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" %} </a> {% endif %}