ynerant/nk20
1
0
Fork 0
mirror of https://gitlab.crans.org/bde/nk20 synced 2025-06-20 17:41:55 +02:00
Code Issues Releases Wiki Activity

Merge branch 'debian_deps' into 'beta'

Browse Source 
Debian deps

See merge request bde/nk20!103
This commit is contained in:
erdnaxe
2020-09-01 16:09:00 +02:00
parent 7c9287e387 aa247c281f
commit 08defd84e6
19 changed files with 165 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/member/templates/member/base.html
View File

@ -69,11 +69,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% endif %}
{% if can_lock_note %}
<button class="btn btn-sm btn-danger" data-toggle="modal" data-target="#lock-note-modal">
<i class="fas fa-ban"></i> {% trans 'Lock note' %}
<i class="fa fa-ban"></i> {% trans 'Lock note' %}
</button>
{% elif can_unlock_note %}
<button class="btn btn-sm btn-success" data-toggle="modal" data-target="#unlock-note-modal">
<i class="fas fa-check-circle"></i> {% trans 'Unlock note' %}
<i class="fa fa-check-circle"></i> {% trans 'Unlock note' %}
</button>
{% endif %}
</div>
@ -181,4 +181,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
});
}
</script>
{% endblock %}
{% endblock %}

2
apps/member/templates/member/user_list.html
View File

@ -7,7 +7,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% block content %}
{% if "member.change_profile_registration_valid"|has_perm:user %}
<a class="btn btn-block btn-secondary mb-3" href="{% url 'registration:future_user_list' %}">
<i class="fas fa-user-plus"></i> {% trans "Registrations" %}
<i class="fa fa-user-plus"></i> {% trans "Registrations" %}
</a>
{% endif %}

4
apps/permission/templates/permission/all_rights.html
View File

@ -13,7 +13,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
</h3>
<div class="card-body">
<div class="alert alert-info">
<i class="fas fa-info-circle"></i> {% trans "Superusers have all rights on everything, to manage the website." %}
<i class="fa fa-info-circle"></i> {% trans "Superusers have all rights on everything, to manage the website." %}
</div>
<div class="card">
<div class="card-head">
@ -116,4 +116,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
update();
});
</script>
{% endblock %}
{% endblock %}

6
apps/wei/templates/wei/base.html
View File

@ -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 %}
<dt class="col-xl-6">{% trans 'WEI fee (paid students)'|capfirst %}</dt>
<dd class="col-xl-6">{{ club.membership_fee_paid|add:bde_kfet_fee|pretty_money }}
<i class="fas fa-question-circle"
<i class="fa fa-question-circle"
title="{% trans "The BDE membership is included in the WEI registration." %}"></i></dd>
{% endwith %}
{% with bde_kfet_fee=club.parent_club.membership_fee_unpaid|add:club.parent_club.parent_club.membership_fee_unpaid %}
<dt class="col-xl-6">{% trans 'WEI fee (unpaid students)'|capfirst %}</dt>
<dd class="col-xl-6">{{ club.membership_fee_unpaid|add:bde_kfet_fee|pretty_money }}
<i class="fas fa-question-circle"
<i class="fa fa-question-circle"
title="{% trans "The BDE membership is included in the WEI registration." %}"></i></dd>
{% endwith %}
{% endif %}
@ -106,4 +106,4 @@ SPDX-License-Identifier: GPL-3.0-or-later
{% block profile_content %}{% endblock %}
</div>
</div>
{% endblock %}
{% endblock %}