From 5feb23ad51007f3f019addf80fe265fb0a004fd3 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Tue, 1 Sep 2020 14:33:38 +0200 Subject: [PATCH] Use Debian font awesome --- apps/member/templates/member/base.html | 6 ++-- apps/member/templates/member/user_list.html | 2 +- .../templates/permission/all_rights.html | 4 +-- apps/wei/templates/wei/base.html | 6 ++-- note_kfet/templates/base.html | 28 +++++++++---------- 5 files changed, 23 insertions(+), 23 deletions(-) diff --git a/apps/member/templates/member/base.html b/apps/member/templates/member/base.html index bb99595e..e1e9335b 100644 --- a/apps/member/templates/member/base.html +++ b/apps/member/templates/member/base.html @@ -69,11 +69,11 @@ SPDX-License-Identifier: GPL-3.0-or-later {% endif %} {% if can_lock_note %} {% elif can_unlock_note %} {% endif %} @@ -181,4 +181,4 @@ SPDX-License-Identifier: GPL-3.0-or-later }); } -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/apps/member/templates/member/user_list.html b/apps/member/templates/member/user_list.html index ce0b14a7..a41d7e69 100644 --- a/apps/member/templates/member/user_list.html +++ b/apps/member/templates/member/user_list.html @@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-3.0-or-later {% block content %} {% if "member.change_profile_registration_valid"|has_perm:user %} - {% trans "Registrations" %} + {% trans "Registrations" %} {% endif %} diff --git a/apps/permission/templates/permission/all_rights.html b/apps/permission/templates/permission/all_rights.html index 107f8f25..69b74714 100644 --- a/apps/permission/templates/permission/all_rights.html +++ b/apps/permission/templates/permission/all_rights.html @@ -13,7 +13,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
- {% trans "Superusers have all rights on everything, to manage the website." %} + {% trans "Superusers have all rights on everything, to manage the website." %}
@@ -116,4 +116,4 @@ SPDX-License-Identifier: GPL-3.0-or-later update(); }); -{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/apps/wei/templates/wei/base.html b/apps/wei/templates/wei/base.html index dd343f8e..a6521bd2 100644 --- a/apps/wei/templates/wei/base.html +++ b/apps/wei/templates/wei/base.html @@ -43,14 +43,14 @@ SPDX-License-Identifier: GPL-3.0-or-later {% with bde_kfet_fee=club.parent_club.membership_fee_paid|add:club.parent_club.parent_club.membership_fee_paid %}
{% trans 'WEI fee (paid students)'|capfirst %}
{{ club.membership_fee_paid|add:bde_kfet_fee|pretty_money }} -
{% endwith %} {% with bde_kfet_fee=club.parent_club.membership_fee_unpaid|add:club.parent_club.parent_club.membership_fee_unpaid %}
{% trans 'WEI fee (unpaid students)'|capfirst %}
{{ club.membership_fee_unpaid|add:bde_kfet_fee|pretty_money }} -
{% endwith %} {% endif %} @@ -106,4 +106,4 @@ SPDX-License-Identifier: GPL-3.0-or-later {% block profile_content %}{% endblock %}
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/note_kfet/templates/base.html b/note_kfet/templates/base.html index 13d0623f..3381c78e 100644 --- a/note_kfet/templates/base.html +++ b/note_kfet/templates/base.html @@ -59,54 +59,54 @@ SPDX-License-Identifier: GPL-3.0-or-later {% if "note.transactiontemplate"|not_empty_model_list %}
  • {% url 'note:consos' as url %} - {% trans 'Consumptions' %} + {% trans 'Consumptions' %}
    • {% endif %} {% if "note.transaction"|not_empty_model_list %}
  • {% url 'note:transfer' as url %} - {% trans 'Transfer' %} + {% trans 'Transfer' %}
    • {% endif %} {% if "auth.user"|model_list_length >= 2 %}
  • {% url 'member:user_list' as url %} - {% trans 'Users' %} + {% trans 'Users' %}
    • {% endif %} {% if "member.club"|not_empty_model_list %}
  • {% url 'member:club_list' as url %} - {% trans 'Clubs' %} + {% trans 'Clubs' %}
    • {% endif %} {% if "activity.activity"|not_empty_model_list %}
  • {% url 'activity:activity_list' as url %} - {% trans 'Activities' %} + {% trans 'Activities' %}
    • {% endif %} {% if "treasury.invoice"|not_empty_model_list %}
  • {% url 'treasury:invoice_list' as url %} - {% trans 'Treasury' %} + {% trans 'Treasury' %}
    • {% endif %} {% if "wei.weiclub"|not_empty_model_list %}
  • {% url 'wei:current_wei_detail' as url %} - {% trans 'WEI' %} + {% trans 'WEI' %}
    • {% endif %} {% if request.user.is_authenticated %}
  • {% url 'permission:rights' as url %} - {% trans 'Rights' %} + {% trans 'Rights' %}
    • {% endif %} {% if request.user.is_staff and ""|has_perm:user %}
  • - {% trans 'Admin' %} + {% trans 'Admin' %}
    • {% endif %} @@ -114,16 +114,16 @@ SPDX-License-Identifier: GPL-3.0-or-later {% if request.user.is_authenticated %}
  • - Mon compte + Mon compte - Se déconnecter + Se déconnecter
    • @@ -131,14 +131,14 @@ SPDX-License-Identifier: GPL-3.0-or-later {% if request.path != "/registration/signup/" %}
  • - S'inscrire + S'inscrire
    • {% endif %} {% if request.path != "/accounts/login/" %}
  • - Se connecter + Se connecter
    • {% endif %}