Merge branch '58-migrate-to-materialize-css' of...

Merge branch '58-migrate-to-materialize-css' of edugit.org:AlekSIS/AlekSIS-App-Alsijil into 58-migrate-to-materialize-css

Merge branch '58-migrate-to-materialize-css' of...
8fbd0847 · Tom Teichler · 17f7a5f7 · 82d7539e · 8fbd0847 · 8fbd0847
Commit 8fbd0847 authored 5 years ago by Tom Teichler
--- a/aleksis/apps/alsijil/templates/alsijil/manage_personal_note_filter.html
+++ b/aleksis/apps/alsijil/templates/alsijil/manage_personal_note_filter.html
@@ -8,7 +8,7 @@
 {% block content %}
  {% if personal_note_filter %}
    <a href="{% url 'delete_personal_note_filter' personal_note_filter.id %}" class="waves-effect waves-dark btn red">
-      <i class="material-icons">add</i>{% blocktrans %}Add filter{% endblocktrans %}
+      <i class="material-icons">delete</i>{% blocktrans %}Delete filter{% endblocktrans %}
    </a>
  {% endif %}


--- a/aleksis/apps/alsijil/templates/alsijil/personal_note_filters.html
+++ b/aleksis/apps/alsijil/templates/alsijil/personal_note_filters.html
@@ -9,7 +9,7 @@

 {% block content %}
  <a href="{% url 'create_personal_note_filter' %}" class="waves-effect waves-dark green btn">
-    <i class="material-icons">add</i>{% blocktrans %}Add filter{% endblock %}
+    <i class="material-icons">add</i>{% blocktrans %}Add filter{% endblocktrans %}
  </a>

  {% render_table personal_note_filters_table %}

--- a/aleksis/apps/alsijil/templates/alsijil/print/full_register.html
+++ b/aleksis/apps/alsijil/templates/alsijil/print/full_register.html
-{% load staticfiles i18n cropping data_helpers week_helpers %}
+{% load static i18n cropping data_helpers week_helpers %}

 <!DOCTYPE html>
 <html>