Merge branch '6-use-iconify-for-material-icons-instead-of-icon-font' into 'main'

Resolve "Use iconify for Material Icons instead of icon font"

Closes #6

See merge request !2

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",

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

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>

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>

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 %}