From a098f704240cef9319566771ad33fce29dc87bfb Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Wed, 22 Jul 2020 01:46:31 +0200
Subject: [PATCH 01/77] Better import

---
 apps/scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/scripts b/apps/scripts
index ee54fca8..6cfae5fd 160000
--- a/apps/scripts
+++ b/apps/scripts
@@ -1 +1 @@
-Subproject commit ee54fca89ee247a4ba4af080dd3036d92340eade
+Subproject commit 6cfae5fd69deb8beccb342cb589c6d8c594cf1b8

From e3045522d110678e213f78acd471ee09cb14b419 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Wed, 22 Jul 2020 21:05:25 +0200
Subject: [PATCH 02/77] Bind GuestTransaction to entry rather than guest (fix
 OneToOneField)

---
 apps/activity/models.py | 6 +++---
 tox.ini                 | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/apps/activity/models.py b/apps/activity/models.py
index cab229c4..2c014ca5 100644
--- a/apps/activity/models.py
+++ b/apps/activity/models.py
@@ -163,7 +163,7 @@ class Entry(models.Model):
                 amount=self.activity.activity_type.guest_entry_fee,
                 reason="Invitation " + self.activity.name + " " + self.guest.first_name + " " + self.guest.last_name,
                 valid=True,
-                guest=self.guest,
+                entry=self,
             ).save()
 
         return ret
@@ -240,8 +240,8 @@ class Guest(models.Model):
 
 
 class GuestTransaction(Transaction):
-    guest = models.OneToOneField(
-        Guest,
+    entry = models.OneToOneField(
+        Entry,
         on_delete=models.PROTECT,
     )
 
diff --git a/tox.ini b/tox.ini
index 48bc3286..eef83e31 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,6 +2,7 @@
 envlist =
     py36-django22
     py37-django22
+    py38-django22
     linters
 skipsdist = True
 

From 50024dc03dd72e81e05bf33458a6c1c9db500de5 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Thu, 23 Jul 2020 07:21:49 +0200
Subject: [PATCH 03/77] :bug: Fix NK15 import

---
 apps/scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/scripts b/apps/scripts
index 6cfae5fd..f5967359 160000
--- a/apps/scripts
+++ b/apps/scripts
@@ -1 +1 @@
-Subproject commit 6cfae5fd69deb8beccb342cb589c6d8c594cf1b8
+Subproject commit f5967359a95b6be8739ba8a43419de06c9bc9587

From 2eb601bd6679df4dfa4adee462bc76632f6d34da Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 25 Jul 2020 17:25:57 +0200
Subject: [PATCH 04/77] :boom: Improve performances

---
 apps/member/views.py                        |    6 +-
 apps/note/models/transactions.py            |    6 +
 apps/note/views.py                          |   19 +-
 apps/permission/templatetags/perms.py       |   15 +-
 apps/permission/views.py                    |    2 +-
 apps/scripts                                |    2 +-
 apps/treasury/forms.py                      |    3 +-
 apps/treasury/views.py                      |   38 +-
 locale/de/LC_MESSAGES/django.po             |   94 +-
 locale/fr/LC_MESSAGES/django.po             |  100 +-
 note_kfet/settings/base.py                  |    1 +
 static/admin/js/vendor/jquery/LICENSE.txt   |    8 +-
 static/admin/js/vendor/jquery/jquery.js     | 1793 ++++++++++++-------
 static/admin/js/vendor/jquery/jquery.min.js |    4 +-
 static/debug_toolbar/css/print.css          |    3 +
 static/debug_toolbar/css/toolbar.css        |  646 +++++++
 static/debug_toolbar/img/ajax-loader.gif    |  Bin 0 -> 404 bytes
 static/debug_toolbar/img/back.png           |  Bin 0 -> 574 bytes
 static/debug_toolbar/img/back_hover.png     |  Bin 0 -> 613 bytes
 static/debug_toolbar/img/close.png          |  Bin 0 -> 498 bytes
 static/debug_toolbar/img/close_hover.png    |  Bin 0 -> 706 bytes
 static/debug_toolbar/img/djdt_vertical.png  |  Bin 0 -> 882 bytes
 static/debug_toolbar/img/indicator.png      |  Bin 0 -> 436 bytes
 static/debug_toolbar/js/redirect.js         |    1 +
 static/debug_toolbar/js/toolbar.js          |  324 ++++
 static/debug_toolbar/js/toolbar.timer.js    |   52 +
 templates/base.html                         |    2 +-
 templates/note/conso_form.html              |   34 +-
 templates/treasury/remittance_list.html     |    8 +-
 29 files changed, 2387 insertions(+), 774 deletions(-)
 create mode 100644 static/debug_toolbar/css/print.css
 create mode 100644 static/debug_toolbar/css/toolbar.css
 create mode 100644 static/debug_toolbar/img/ajax-loader.gif
 create mode 100644 static/debug_toolbar/img/back.png
 create mode 100644 static/debug_toolbar/img/back_hover.png
 create mode 100644 static/debug_toolbar/img/close.png
 create mode 100644 static/debug_toolbar/img/close_hover.png
 create mode 100644 static/debug_toolbar/img/djdt_vertical.png
 create mode 100644 static/debug_toolbar/img/indicator.png
 create mode 100644 static/debug_toolbar/js/redirect.js
 create mode 100644 static/debug_toolbar/js/toolbar.js
 create mode 100644 static/debug_toolbar/js/toolbar.timer.js

diff --git a/apps/member/views.py b/apps/member/views.py
index c52522e2..37f04304 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -129,7 +129,7 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
         user = context['user_object']
         history_list = \
             Transaction.objects.all().filter(Q(source=user.note) | Q(destination=user.note))\
-            .order_by("-created_at", "-id")\
+            .order_by("-created_at")\
             .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view"))
         history_table = HistoryTable(history_list, prefix='transaction-')
         history_table.paginate(per_page=20, page=self.request.GET.get("transaction-page", 1))
@@ -155,7 +155,7 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
         """
         Filter the user list with the given pattern.
         """
-        qs = super().get_queryset().filter(profile__registration_valid=True)
+        qs = super().get_queryset().distinct().filter(profile__registration_valid=True)
         if "search" in self.request.GET:
             pattern = self.request.GET["search"]
 
@@ -332,7 +332,7 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
 
         club_transactions = Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note))\
             .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view"))\
-            .order_by('-created_at', '-id')
+            .order_by('-created_at')
         history_table = HistoryTable(club_transactions, prefix="history-")
         history_table.paginate(per_page=20, page=self.request.GET.get('history-page', 1))
         context['history_list'] = history_table
diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py
index a8fb3c22..8a7162c3 100644
--- a/apps/note/models/transactions.py
+++ b/apps/note/models/transactions.py
@@ -62,6 +62,7 @@ class TransactionTemplate(models.Model):
     category = models.ForeignKey(
         TemplateCategory,
         on_delete=models.PROTECT,
+        related_name='templates',
         verbose_name=_('type'),
         max_length=31,
     )
@@ -71,6 +72,11 @@ class TransactionTemplate(models.Model):
         verbose_name=_("display"),
     )
 
+    highlighted = models.BooleanField(
+        default=False,
+        verbose_name=_("highlighted"),
+    )
+
     description = models.CharField(
         verbose_name=_('description'),
         max_length=255,
diff --git a/apps/note/views.py b/apps/note/views.py
index 81d58441..b62b0ae1 100644
--- a/apps/note/views.py
+++ b/apps/note/views.py
@@ -14,7 +14,7 @@ from permission.backends import PermissionBackend
 from permission.views import ProtectQuerysetMixin
 
 from .forms import TransactionTemplateForm
-from .models import Transaction, TransactionTemplate, RecurrentTransaction, NoteSpecial
+from .models import TemplateCategory, Transaction, TransactionTemplate, RecurrentTransaction, NoteSpecial
 from .models.transactions import SpecialTransaction
 from .tables import HistoryTable, ButtonTable
 
@@ -31,7 +31,7 @@ class TransactionCreateView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTabl
     table_class = HistoryTable
 
     def get_queryset(self, **kwargs):
-        return super().get_queryset(**kwargs).order_by("-created_at", "-id").all()[:20]
+        return super().get_queryset(**kwargs).order_by("-created_at").all()[:20]
 
     def get_context_data(self, **kwargs):
         """
@@ -121,19 +121,22 @@ class ConsoView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
     table_class = HistoryTable
 
     def get_queryset(self, **kwargs):
-        return super().get_queryset(**kwargs).order_by("-created_at", "-id")[:20]
+        return super().get_queryset(**kwargs).order_by("-created_at")[:20]
 
     def get_context_data(self, **kwargs):
         """
         Add some context variables in template such as page title
         """
         context = super().get_context_data(**kwargs)
-        from django.db.models import Count
-        buttons = TransactionTemplate.objects.filter(
+        categories = TemplateCategory.objects.order_by('name').all()
+        for category in categories:
+            category.templates_filtered = category.templates.filter(
+                PermissionBackend().filter_queryset(self.request.user, TransactionTemplate, "view")
+            ).filter(display=True).order_by('name').all()
+        context['categories'] = [cat for cat in categories if cat.templates_filtered]
+        context['highlighted'] = TransactionTemplate.objects.filter(highlighted=True).filter(
             PermissionBackend().filter_queryset(self.request.user, TransactionTemplate, "view")
-        ).filter(display=True).annotate(clicks=Count('recurrenttransaction')).order_by('category__name', 'name')
-        context['transaction_templates'] = buttons
-        context['most_used'] = buttons.order_by('-clicks', 'name')[:10]
+        ).order_by('name').all()
         context['title'] = _("Consumptions")
         context['polymorphic_ctype'] = ContentType.objects.get_for_model(RecurrentTransaction).pk
 
diff --git a/apps/permission/templatetags/perms.py b/apps/permission/templatetags/perms.py
index a89c7f49..101be6e7 100644
--- a/apps/permission/templatetags/perms.py
+++ b/apps/permission/templatetags/perms.py
@@ -40,7 +40,7 @@ def not_empty_model_change_list(model_name):
 
 
 @stringfilter
-def model_list(model_name, t="view"):
+def model_list(model_name, t="view", fetch=True):
     """
     Return the queryset of all visible instances of the given model.
     """
@@ -49,10 +49,20 @@ def model_list(model_name, t="view"):
         return False
     spl = model_name.split(".")
     ct = ContentType.objects.get(app_label=spl[0], model=spl[1])
-    qs = ct.model_class().objects.filter(PermissionBackend.filter_queryset(user, ct, t)).all()
+    qs = ct.model_class().objects.filter(PermissionBackend.filter_queryset(user, ct, t))
+    if fetch:
+        qs = qs.all()
     return qs
 
 
+@stringfilter
+def model_list_length(model_name, t="view"):
+    """
+    Return the length of queryset of all visible instances of the given model.
+    """
+    return model_list(model_name, t, False).count()
+
+
 def has_perm(perm, obj):
     return PermissionBackend.check_perm(get_current_authenticated_user(), perm, obj)
 
@@ -85,4 +95,5 @@ register = template.Library()
 register.filter('not_empty_model_list', not_empty_model_list)
 register.filter('not_empty_model_change_list', not_empty_model_change_list)
 register.filter('model_list', model_list)
+register.filter('model_list_length', model_list_length)
 register.filter('has_perm', has_perm)
diff --git a/apps/permission/views.py b/apps/permission/views.py
index ab555c2f..cbd26a19 100644
--- a/apps/permission/views.py
+++ b/apps/permission/views.py
@@ -19,7 +19,7 @@ class ProtectQuerysetMixin:
     """
     def get_queryset(self, **kwargs):
         qs = super().get_queryset(**kwargs)
-        return qs.filter(PermissionBackend.filter_queryset(self.request.user, qs.model, "view")).distinct()
+        return qs.filter(PermissionBackend.filter_queryset(self.request.user, qs.model, "view"))
 
     def get_form(self, form_class=None):
         form = super().get_form(form_class)
diff --git a/apps/scripts b/apps/scripts
index f5967359..580948fe 160000
--- a/apps/scripts
+++ b/apps/scripts
@@ -1 +1 @@
-Subproject commit f5967359a95b6be8739ba8a43419de06c9bc9587
+Subproject commit 580948fe1da1904ba6418daafb48a0a64824a11b
diff --git a/apps/treasury/forms.py b/apps/treasury/forms.py
index b09a46c7..85beaadc 100644
--- a/apps/treasury/forms.py
+++ b/apps/treasury/forms.py
@@ -132,8 +132,7 @@ class LinkTransactionToRemittanceForm(forms.ModelForm):
         # Add submit button
         self.helper.add_input(Submit('submit', _("Submit"), attr={'class': 'btn btn-block btn-primary'}))
 
-        self.fields["remittance"].queryset = Remittance.objects.filter(closed=False)\
-            .filter(PermissionBackend.filter_queryset(self.request.user, Remittance, "view"))
+        self.fields["remittance"].queryset = Remittance.objects.filter(closed=False)
 
     def clean_last_name(self):
         """
diff --git a/apps/treasury/views.py b/apps/treasury/views.py
index f42e5e77..4e64ce94 100644
--- a/apps/treasury/views.py
+++ b/apps/treasury/views.py
@@ -222,23 +222,41 @@ class RemittanceListView(LoginRequiredMixin, TemplateView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        context["opened_remittances"] = RemittanceTable(
+        opened_remittances = RemittanceTable(
             data=Remittance.objects.filter(closed=False).filter(
-                PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all())
-        context["closed_remittances"] = RemittanceTable(
-            data=Remittance.objects.filter(closed=True).filter(
-                PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).reverse().all())
+                PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all(),
+            prefix="opened-remittances-",
+        )
+        opened_remittances.paginate(page=self.request.GET.get("opened-remittances-page", 1), per_page=10)
+        context["opened_remittances"] = opened_remittances
 
-        context["special_transactions_no_remittance"] = SpecialTransactionTable(
+        closed_remittances = RemittanceTable(
+            data=Remittance.objects.filter(closed=True).filter(
+                PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).reverse().all(),
+            prefix="closed-remittances-",
+        )
+        closed_remittances.paginate(page=self.request.GET.get("closed-remittances-page", 1), per_page=10)
+        context["closed_remittances"] = closed_remittances
+
+        no_remittance_tr = SpecialTransactionTable(
             data=SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)),
                                                    specialtransactionproxy__remittance=None).filter(
-                PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all(),
-            exclude=('remittance_remove', ))
-        context["special_transactions_with_remittance"] = SpecialTransactionTable(
+                 PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all(),
+            exclude=('remittance_remove', ),
+            prefix="no-remittance-",
+        )
+        no_remittance_tr.paginate(page=self.request.GET.get("no-remittance-page", 1), per_page=10)
+        context["special_transactions_no_remittance"] = no_remittance_tr
+
+        with_remittance_tr = SpecialTransactionTable(
             data=SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)),
                                                    specialtransactionproxy__remittance__closed=False).filter(
                 PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all(),
-            exclude=('remittance_add', ))
+            exclude=('remittance_add', ),
+            prefix="with-remittance-",
+        )
+        with_remittance_tr.paginate(page=self.request.GET.get("with-remittance-page", 1), per_page=10)
+        context["special_transactions_with_remittance"] = with_remittance_tr
 
         return context
 
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index d4fe6420..915cfbfb 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-07 20:56+0200\n"
+"POT-Creation-Date: 2020-07-25 16:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -46,7 +46,7 @@ msgstr ""
 #: apps/activity/models.py:23 apps/activity/models.py:48
 #: apps/member/models.py:151 apps/member/models.py:255
 #: apps/note/models/notes.py:188 apps/note/models/transactions.py:25
-#: apps/note/models/transactions.py:45 apps/note/models/transactions.py:249
+#: apps/note/models/transactions.py:45 apps/note/models/transactions.py:261
 #: apps/wei/models.py:64 templates/member/club_info.html:13
 #: templates/member/profile_info.html:14
 #: templates/registration/future_profile_detail.html:16
@@ -70,7 +70,7 @@ msgstr ""
 msgid "activity types"
 msgstr ""
 
-#: apps/activity/models.py:53 apps/note/models/transactions.py:75
+#: apps/activity/models.py:53 apps/note/models/transactions.py:81
 #: apps/permission/models.py:103 apps/permission/models.py:182
 #: apps/wei/models.py:70 apps/wei/models.py:126
 #: templates/activity/activity_detail.html:16
@@ -78,7 +78,7 @@ msgid "description"
 msgstr ""
 
 #: apps/activity/models.py:60 apps/note/models/notes.py:164
-#: apps/note/models/transactions.py:65 apps/permission/models.py:157
+#: apps/note/models/transactions.py:66 apps/permission/models.py:157
 #: templates/activity/activity_detail.html:19
 msgid "type"
 msgstr ""
@@ -106,7 +106,7 @@ msgstr ""
 msgid "end date"
 msgstr ""
 
-#: apps/activity/models.py:93 apps/note/models/transactions.py:140
+#: apps/activity/models.py:93 apps/note/models/transactions.py:146
 #: templates/activity/activity_detail.html:47
 msgid "valid"
 msgstr ""
@@ -201,11 +201,11 @@ msgstr ""
 msgid "Note"
 msgstr ""
 
-#: apps/activity/tables.py:83 apps/member/tables.py:41
+#: apps/activity/tables.py:83 apps/member/tables.py:42
 msgid "Balance"
 msgstr ""
 
-#: apps/activity/views.py:46 templates/base.html:120
+#: apps/activity/views.py:44 templates/base.html:120
 msgid "Activities"
 msgstr ""
 
@@ -509,11 +509,11 @@ msgstr ""
 msgid "fee"
 msgstr ""
 
-#: apps/member/models.py:320 apps/member/views.py:505 apps/wei/views.py:768
+#: apps/member/models.py:320 apps/member/views.py:521 apps/wei/views.py:768
 msgid "User is not a member of the parent club"
 msgstr ""
 
-#: apps/member/models.py:330 apps/member/views.py:514
+#: apps/member/models.py:330 apps/member/views.py:530
 msgid "User is already a member of the club"
 msgstr ""
 
@@ -530,7 +530,7 @@ msgstr ""
 msgid "memberships"
 msgstr ""
 
-#: apps/member/tables.py:112
+#: apps/member/tables.py:113
 msgid "Renew"
 msgstr ""
 
@@ -552,32 +552,32 @@ msgstr ""
 msgid "Search user"
 msgstr ""
 
-#: apps/member/views.py:500 apps/wei/views.py:759
+#: apps/member/views.py:516 apps/wei/views.py:759
 msgid ""
 "This user don't have enough money to join this club, and can't have a "
 "negative balance."
 msgstr ""
 
-#: apps/member/views.py:518
+#: apps/member/views.py:534
 msgid "The membership must start after {:%m-%d-%Y}."
 msgstr ""
 
-#: apps/member/views.py:523
+#: apps/member/views.py:539
 msgid "The membership must begin before {:%m-%d-%Y}."
 msgstr ""
 
-#: apps/member/views.py:540 apps/member/views.py:542 apps/member/views.py:544
+#: apps/member/views.py:556 apps/member/views.py:558 apps/member/views.py:560
 #: apps/registration/views.py:289 apps/registration/views.py:291
 #: apps/registration/views.py:293
 msgid "This field is required."
 msgstr ""
 
-#: apps/note/admin.py:120 apps/note/models/transactions.py:100
+#: apps/note/admin.py:120 apps/note/models/transactions.py:106
 msgid "source"
 msgstr ""
 
 #: apps/note/admin.py:128 apps/note/admin.py:170
-#: apps/note/models/transactions.py:55 apps/note/models/transactions.py:113
+#: apps/note/models/transactions.py:55 apps/note/models/transactions.py:119
 msgid "destination"
 msgstr ""
 
@@ -619,7 +619,7 @@ msgstr ""
 msgid "display image"
 msgstr ""
 
-#: apps/note/models/notes.py:53 apps/note/models/transactions.py:123
+#: apps/note/models/notes.py:53 apps/note/models/transactions.py:129
 msgid "created at"
 msgstr ""
 
@@ -702,7 +702,7 @@ msgstr ""
 msgid "A template with this name already exist"
 msgstr ""
 
-#: apps/note/models/transactions.py:59 apps/note/models/transactions.py:131
+#: apps/note/models/transactions.py:59 apps/note/models/transactions.py:137
 msgid "amount"
 msgstr ""
 
@@ -710,78 +710,94 @@ msgstr ""
 msgid "in centimes"
 msgstr ""
 
-#: apps/note/models/transactions.py:71
+#: apps/note/models/transactions.py:72
 msgid "display"
 msgstr ""
 
-#: apps/note/models/transactions.py:81
+#: apps/note/models/transactions.py:77
+msgid "highlighted"
+msgstr ""
+
+#: apps/note/models/transactions.py:87
 msgid "transaction template"
 msgstr ""
 
-#: apps/note/models/transactions.py:82
+#: apps/note/models/transactions.py:88
 msgid "transaction templates"
 msgstr ""
 
-#: apps/note/models/transactions.py:106 apps/note/models/transactions.py:119
+#: apps/note/models/transactions.py:112 apps/note/models/transactions.py:125
 #: apps/note/tables.py:33 apps/note/tables.py:42
 msgid "used alias"
 msgstr ""
 
-#: apps/note/models/transactions.py:127
+#: apps/note/models/transactions.py:133
 msgid "quantity"
 msgstr ""
 
-#: apps/note/models/transactions.py:135
+#: apps/note/models/transactions.py:141
 msgid "reason"
 msgstr ""
 
-#: apps/note/models/transactions.py:145 apps/note/tables.py:95
+#: apps/note/models/transactions.py:151 apps/note/tables.py:95
 msgid "invalidity reason"
 msgstr ""
 
-#: apps/note/models/transactions.py:153
+#: apps/note/models/transactions.py:159
 msgid "transaction"
 msgstr ""
 
-#: apps/note/models/transactions.py:154
+#: apps/note/models/transactions.py:160
 #: templates/treasury/sogecredit_detail.html:22
 msgid "transactions"
 msgstr ""
 
-#: apps/note/models/transactions.py:216
+#: apps/note/models/transactions.py:175
+msgid ""
+"The transaction can't be saved since the source note or the destination note "
+"is not active."
+msgstr ""
+
+#: apps/note/models/transactions.py:228
 #: templates/activity/activity_entry.html:13 templates/base.html:98
 #: templates/note/transaction_form.html:19
 #: templates/note/transaction_form.html:140
 msgid "Transfer"
 msgstr ""
 
-#: apps/note/models/transactions.py:239
+#: apps/note/models/transactions.py:251
 msgid "Template"
 msgstr ""
 
-#: apps/note/models/transactions.py:254
+#: apps/note/models/transactions.py:266
 msgid "first_name"
 msgstr ""
 
-#: apps/note/models/transactions.py:259
+#: apps/note/models/transactions.py:271
 msgid "bank"
 msgstr ""
 
-#: apps/note/models/transactions.py:265
+#: apps/note/models/transactions.py:277
 #: templates/activity/activity_entry.html:17
 #: templates/note/transaction_form.html:24
 msgid "Credit"
 msgstr ""
 
-#: apps/note/models/transactions.py:265 templates/note/transaction_form.html:28
+#: apps/note/models/transactions.py:277 templates/note/transaction_form.html:28
 msgid "Debit"
 msgstr ""
 
-#: apps/note/models/transactions.py:281 apps/note/models/transactions.py:286
+#: apps/note/models/transactions.py:288
+msgid ""
+"A special transaction is only possible between a Note associated to a "
+"payment method and a User or a Club"
+msgstr ""
+
+#: apps/note/models/transactions.py:305 apps/note/models/transactions.py:310
 msgid "membership transaction"
 msgstr ""
 
-#: apps/note/models/transactions.py:282 apps/treasury/models.py:227
+#: apps/note/models/transactions.py:306 apps/treasury/models.py:227
 msgid "membership transactions"
 msgstr ""
 
@@ -814,7 +830,7 @@ msgstr ""
 msgid "Transfer money"
 msgstr ""
 
-#: apps/note/views.py:137 templates/base.html:93
+#: apps/note/views.py:140 templates/base.html:93
 msgid "Consumptions"
 msgstr ""
 
@@ -1692,7 +1708,7 @@ msgid "Consume!"
 msgstr ""
 
 #: templates/note/conso_form.html:71
-msgid "Most used buttons"
+msgid "Highlighted buttons"
 msgstr ""
 
 #: templates/note/conso_form.html:134
@@ -2030,6 +2046,10 @@ msgstr ""
 msgid "Closed remittances"
 msgstr ""
 
+#: templates/treasury/remittance_list.html:62
+msgid "There is no closed remittance yet."
+msgstr ""
+
 #: templates/treasury/sogecredit_detail.html:29
 msgid "total amount"
 msgstr ""
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 4af9cfd5..86072e23 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-05-07 20:56+0200\n"
+"POT-Creation-Date: 2020-07-25 16:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,7 +47,7 @@ msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité."
 #: apps/activity/models.py:23 apps/activity/models.py:48
 #: apps/member/models.py:151 apps/member/models.py:255
 #: apps/note/models/notes.py:188 apps/note/models/transactions.py:25
-#: apps/note/models/transactions.py:45 apps/note/models/transactions.py:249
+#: apps/note/models/transactions.py:45 apps/note/models/transactions.py:261
 #: apps/wei/models.py:64 templates/member/club_info.html:13
 #: templates/member/profile_info.html:14
 #: templates/registration/future_profile_detail.html:16
@@ -71,7 +71,7 @@ msgstr "type d'activité"
 msgid "activity types"
 msgstr "types d'activité"
 
-#: apps/activity/models.py:53 apps/note/models/transactions.py:75
+#: apps/activity/models.py:53 apps/note/models/transactions.py:81
 #: apps/permission/models.py:103 apps/permission/models.py:182
 #: apps/wei/models.py:70 apps/wei/models.py:126
 #: templates/activity/activity_detail.html:16
@@ -79,7 +79,7 @@ msgid "description"
 msgstr "description"
 
 #: apps/activity/models.py:60 apps/note/models/notes.py:164
-#: apps/note/models/transactions.py:65 apps/permission/models.py:157
+#: apps/note/models/transactions.py:66 apps/permission/models.py:157
 #: templates/activity/activity_detail.html:19
 msgid "type"
 msgstr "type"
@@ -107,7 +107,7 @@ msgstr "date de début"
 msgid "end date"
 msgstr "date de fin"
 
-#: apps/activity/models.py:93 apps/note/models/transactions.py:140
+#: apps/activity/models.py:93 apps/note/models/transactions.py:146
 #: templates/activity/activity_detail.html:47
 msgid "valid"
 msgstr "valide"
@@ -202,11 +202,11 @@ msgstr "Prénom"
 msgid "Note"
 msgstr "Note"
 
-#: apps/activity/tables.py:83 apps/member/tables.py:41
+#: apps/activity/tables.py:83 apps/member/tables.py:42
 msgid "Balance"
 msgstr "Solde du compte"
 
-#: apps/activity/views.py:46 templates/base.html:120
+#: apps/activity/views.py:44 templates/base.html:120
 msgid "Activities"
 msgstr "Activités"
 
@@ -514,11 +514,11 @@ msgstr "l'adhésion finit le"
 msgid "fee"
 msgstr "cotisation"
 
-#: apps/member/models.py:320 apps/member/views.py:505 apps/wei/views.py:768
+#: apps/member/models.py:320 apps/member/views.py:521 apps/wei/views.py:768
 msgid "User is not a member of the parent club"
 msgstr "L'utilisateur n'est pas membre du club parent"
 
-#: apps/member/models.py:330 apps/member/views.py:514
+#: apps/member/models.py:330 apps/member/views.py:530
 msgid "User is already a member of the club"
 msgstr "L'utilisateur est déjà membre du club"
 
@@ -535,7 +535,7 @@ msgstr "adhésion"
 msgid "memberships"
 msgstr "adhésions"
 
-#: apps/member/tables.py:112
+#: apps/member/tables.py:113
 msgid "Renew"
 msgstr "Renouveler"
 
@@ -557,7 +557,7 @@ msgstr "Un alias avec un nom similaire existe déjà."
 msgid "Search user"
 msgstr "Chercher un utilisateur"
 
-#: apps/member/views.py:500 apps/wei/views.py:759
+#: apps/member/views.py:516 apps/wei/views.py:759
 msgid ""
 "This user don't have enough money to join this club, and can't have a "
 "negative balance."
@@ -565,26 +565,26 @@ msgstr ""
 "Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne peut pas "
 "avoir un solde négatif."
 
-#: apps/member/views.py:518
+#: apps/member/views.py:534
 msgid "The membership must start after {:%m-%d-%Y}."
 msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}."
 
-#: apps/member/views.py:523
+#: apps/member/views.py:539
 msgid "The membership must begin before {:%m-%d-%Y}."
 msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}."
 
-#: apps/member/views.py:540 apps/member/views.py:542 apps/member/views.py:544
+#: apps/member/views.py:556 apps/member/views.py:558 apps/member/views.py:560
 #: apps/registration/views.py:289 apps/registration/views.py:291
 #: apps/registration/views.py:293
 msgid "This field is required."
 msgstr "Ce champ est requis."
 
-#: apps/note/admin.py:120 apps/note/models/transactions.py:100
+#: apps/note/admin.py:120 apps/note/models/transactions.py:106
 msgid "source"
 msgstr "source"
 
 #: apps/note/admin.py:128 apps/note/admin.py:170
-#: apps/note/models/transactions.py:55 apps/note/models/transactions.py:113
+#: apps/note/models/transactions.py:55 apps/note/models/transactions.py:119
 msgid "destination"
 msgstr "destination"
 
@@ -627,7 +627,7 @@ msgstr ""
 msgid "display image"
 msgstr "image affichée"
 
-#: apps/note/models/notes.py:53 apps/note/models/transactions.py:123
+#: apps/note/models/notes.py:53 apps/note/models/transactions.py:129
 msgid "created at"
 msgstr "créée le"
 
@@ -710,7 +710,7 @@ msgstr "catégories de transaction"
 msgid "A template with this name already exist"
 msgstr "Un modèle de transaction avec un nom similaire existe déjà."
 
-#: apps/note/models/transactions.py:59 apps/note/models/transactions.py:131
+#: apps/note/models/transactions.py:59 apps/note/models/transactions.py:137
 msgid "amount"
 msgstr "montant"
 
@@ -718,78 +718,94 @@ msgstr "montant"
 msgid "in centimes"
 msgstr "en centimes"
 
-#: apps/note/models/transactions.py:71
+#: apps/note/models/transactions.py:72
 msgid "display"
 msgstr "afficher"
 
-#: apps/note/models/transactions.py:81
+#: apps/note/models/transactions.py:77
+msgid "highlighted"
+msgstr ""
+
+#: apps/note/models/transactions.py:87
 msgid "transaction template"
 msgstr "modèle de transaction"
 
-#: apps/note/models/transactions.py:82
+#: apps/note/models/transactions.py:88
 msgid "transaction templates"
 msgstr "modèles de transaction"
 
-#: apps/note/models/transactions.py:106 apps/note/models/transactions.py:119
+#: apps/note/models/transactions.py:112 apps/note/models/transactions.py:125
 #: apps/note/tables.py:33 apps/note/tables.py:42
 msgid "used alias"
 msgstr "alias utilisé"
 
-#: apps/note/models/transactions.py:127
+#: apps/note/models/transactions.py:133
 msgid "quantity"
 msgstr "quantité"
 
-#: apps/note/models/transactions.py:135
+#: apps/note/models/transactions.py:141
 msgid "reason"
 msgstr "raison"
 
-#: apps/note/models/transactions.py:145 apps/note/tables.py:95
+#: apps/note/models/transactions.py:151 apps/note/tables.py:95
 msgid "invalidity reason"
 msgstr "Motif d'invalidité"
 
-#: apps/note/models/transactions.py:153
+#: apps/note/models/transactions.py:159
 msgid "transaction"
 msgstr "transaction"
 
-#: apps/note/models/transactions.py:154
+#: apps/note/models/transactions.py:160
 #: templates/treasury/sogecredit_detail.html:22
 msgid "transactions"
 msgstr "transactions"
 
-#: apps/note/models/transactions.py:216
+#: apps/note/models/transactions.py:175
+msgid ""
+"The transaction can't be saved since the source note or the destination note "
+"is not active."
+msgstr ""
+
+#: apps/note/models/transactions.py:228
 #: templates/activity/activity_entry.html:13 templates/base.html:98
 #: templates/note/transaction_form.html:19
 #: templates/note/transaction_form.html:140
 msgid "Transfer"
 msgstr "Virement"
 
-#: apps/note/models/transactions.py:239
+#: apps/note/models/transactions.py:251
 msgid "Template"
 msgstr "Bouton"
 
-#: apps/note/models/transactions.py:254
+#: apps/note/models/transactions.py:266
 msgid "first_name"
 msgstr "prénom"
 
-#: apps/note/models/transactions.py:259
+#: apps/note/models/transactions.py:271
 msgid "bank"
 msgstr "banque"
 
-#: apps/note/models/transactions.py:265
+#: apps/note/models/transactions.py:277
 #: templates/activity/activity_entry.html:17
 #: templates/note/transaction_form.html:24
 msgid "Credit"
 msgstr "Crédit"
 
-#: apps/note/models/transactions.py:265 templates/note/transaction_form.html:28
+#: apps/note/models/transactions.py:277 templates/note/transaction_form.html:28
 msgid "Debit"
 msgstr "Débit"
 
-#: apps/note/models/transactions.py:281 apps/note/models/transactions.py:286
+#: apps/note/models/transactions.py:288
+msgid ""
+"A special transaction is only possible between a Note associated to a "
+"payment method and a User or a Club"
+msgstr ""
+
+#: apps/note/models/transactions.py:305 apps/note/models/transactions.py:310
 msgid "membership transaction"
 msgstr "Transaction d'adhésion"
 
-#: apps/note/models/transactions.py:282 apps/treasury/models.py:227
+#: apps/note/models/transactions.py:306 apps/treasury/models.py:227
 msgid "membership transactions"
 msgstr "Transactions d'adhésion"
 
@@ -822,7 +838,7 @@ msgstr "Éditer"
 msgid "Transfer money"
 msgstr "Transférer de l'argent"
 
-#: apps/note/views.py:137 templates/base.html:93
+#: apps/note/views.py:140 templates/base.html:93
 msgid "Consumptions"
 msgstr "Consommations"
 
@@ -865,8 +881,8 @@ msgid ""
 "Tells if the permission should be granted even if the membership of the user "
 "is expired."
 msgstr ""
-"Indique si la permission doit être attribuée même si l'adhésion de l'utilisateur "
-"est expirée."
+"Indique si la permission doit être attribuée même si l'adhésion de "
+"l'utilisateur est expirée."
 
 #: apps/permission/models.py:176 templates/permission/all_rights.html:26
 msgid "permanent"
@@ -1750,8 +1766,8 @@ msgid "Consume!"
 msgstr "Consommer !"
 
 #: templates/note/conso_form.html:71
-msgid "Most used buttons"
-msgstr "Boutons les plus utilisés"
+msgid "Highlighted buttons"
+msgstr "Boutons mis en avant"
 
 #: templates/note/conso_form.html:134
 msgid "Single consumptions"
@@ -2117,6 +2133,10 @@ msgstr "Il n'y a pas de transaction associée à une remise ouverte."
 msgid "Closed remittances"
 msgstr "Remises fermées"
 
+#: templates/treasury/remittance_list.html:62
+msgid "There is no closed remittance yet."
+msgstr "Il n'y a pas encore de remise fermée."
+
 #: templates/treasury/sogecredit_detail.html:29
 msgid "total amount"
 msgstr "montant total"
diff --git a/note_kfet/settings/base.py b/note_kfet/settings/base.py
index 5ed8b1d8..4733bbad 100644
--- a/note_kfet/settings/base.py
+++ b/note_kfet/settings/base.py
@@ -61,6 +61,7 @@ INSTALLED_APPS = [
     'note',
     'permission',
     'registration',
+    'scripts',
     'treasury',
     'wei',
 ]
diff --git a/static/admin/js/vendor/jquery/LICENSE.txt b/static/admin/js/vendor/jquery/LICENSE.txt
index d930e62a..e3dbacb9 100644
--- a/static/admin/js/vendor/jquery/LICENSE.txt
+++ b/static/admin/js/vendor/jquery/LICENSE.txt
@@ -1,10 +1,4 @@
-Copyright jQuery Foundation and other contributors, https://jquery.org/
-
-This software consists of voluntary contributions made by many
-individuals. For exact contribution history, see the revision history
-available at https://github.com/jquery/jquery
-
-====
+Copyright JS Foundation and other contributors, https://js.foundation/
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the
diff --git a/static/admin/js/vendor/jquery/jquery.js b/static/admin/js/vendor/jquery/jquery.js
index 34a5703d..50937333 100644
--- a/static/admin/js/vendor/jquery/jquery.js
+++ b/static/admin/js/vendor/jquery/jquery.js
@@ -1,5 +1,5 @@
 /*!
- * jQuery JavaScript Library v3.3.1
+ * jQuery JavaScript Library v3.5.1
  * https://jquery.com/
  *
  * Includes Sizzle.js
@@ -9,7 +9,7 @@
  * Released under the MIT license
  * https://jquery.org/license
  *
- * Date: 2018-01-20T17:24Z
+ * Date: 2020-05-04T22:49Z
  */
 ( function( global, factory ) {
 
@@ -47,13 +47,16 @@
 
 var arr = [];
 
-var document = window.document;
-
 var getProto = Object.getPrototypeOf;
 
 var slice = arr.slice;
 
-var concat = arr.concat;
+var flat = arr.flat ? function( array ) {
+	return arr.flat.call( array );
+} : function( array ) {
+	return arr.concat.apply( [], array );
+};
+
 
 var push = arr.push;
 
@@ -86,25 +89,40 @@ var isWindow = function isWindow( obj ) {
 	};
 
 
+var document = window.document;
+
 
 
 	var preservedScriptAttributes = {
 		type: true,
 		src: true,
+		nonce: true,
 		noModule: true
 	};
 
-	function DOMEval( code, doc, node ) {
+	function DOMEval( code, node, doc ) {
 		doc = doc || document;
 
-		var i,
+		var i, val,
 			script = doc.createElement( "script" );
 
 		script.text = code;
 		if ( node ) {
 			for ( i in preservedScriptAttributes ) {
-				if ( node[ i ] ) {
-					script[ i ] = node[ i ];
+
+				// Support: Firefox 64+, Edge 18+
+				// Some browsers don't support the "nonce" property on scripts.
+				// On the other hand, just using `getAttribute` is not enough as
+				// the `nonce` attribute is reset to an empty string whenever it
+				// becomes browsing-context connected.
+				// See https://github.com/whatwg/html/issues/2369
+				// See https://html.spec.whatwg.org/#nonce-attributes
+				// The `node.getAttribute` check was added for the sake of
+				// `jQuery.globalEval` so that it can fake a nonce-containing node
+				// via an object.
+				val = node[ i ] || node.getAttribute && node.getAttribute( i );
+				if ( val ) {
+					script.setAttribute( i, val );
 				}
 			}
 		}
@@ -129,7 +147,7 @@ function toType( obj ) {
 
 
 var
-	version = "3.3.1",
+	version = "3.5.1",
 
 	// Define a local copy of jQuery
 	jQuery = function( selector, context ) {
@@ -137,11 +155,7 @@ var
 		// The jQuery object is actually just the init constructor 'enhanced'
 		// Need init if jQuery is called (just allow error to be thrown if not included)
 		return new jQuery.fn.init( selector, context );
-	},
-
-	// Support: Android <=4.0 only
-	// Make sure we trim BOM and NBSP
-	rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;
+	};
 
 jQuery.fn = jQuery.prototype = {
 
@@ -207,6 +221,18 @@ jQuery.fn = jQuery.prototype = {
 		return this.eq( -1 );
 	},
 
+	even: function() {
+		return this.pushStack( jQuery.grep( this, function( _elem, i ) {
+			return ( i + 1 ) % 2;
+		} ) );
+	},
+
+	odd: function() {
+		return this.pushStack( jQuery.grep( this, function( _elem, i ) {
+			return i % 2;
+		} ) );
+	},
+
 	eq: function( i ) {
 		var len = this.length,
 			j = +i + ( i < 0 ? len : 0 );
@@ -258,7 +284,6 @@ jQuery.extend = jQuery.fn.extend = function() {
 
 			// Extend the base object
 			for ( name in options ) {
-				src = target[ name ];
 				copy = options[ name ];
 
 				// Prevent Object.prototype pollution
@@ -270,14 +295,17 @@ jQuery.extend = jQuery.fn.extend = function() {
 				// Recurse if we're merging plain objects or arrays
 				if ( deep && copy && ( jQuery.isPlainObject( copy ) ||
 					( copyIsArray = Array.isArray( copy ) ) ) ) {
+					src = target[ name ];
 
-					if ( copyIsArray ) {
-						copyIsArray = false;
-						clone = src && Array.isArray( src ) ? src : [];
-
+					// Ensure proper type for the source value
+					if ( copyIsArray && !Array.isArray( src ) ) {
+						clone = [];
+					} else if ( !copyIsArray && !jQuery.isPlainObject( src ) ) {
+						clone = {};
 					} else {
-						clone = src && jQuery.isPlainObject( src ) ? src : {};
+						clone = src;
 					}
+					copyIsArray = false;
 
 					// Never move original objects, clone them
 					target[ name ] = jQuery.extend( deep, clone, copy );
@@ -330,9 +358,6 @@ jQuery.extend( {
 	},
 
 	isEmptyObject: function( obj ) {
-
-		/* eslint-disable no-unused-vars */
-		// See https://github.com/eslint/eslint/issues/6125
 		var name;
 
 		for ( name in obj ) {
@@ -341,9 +366,10 @@ jQuery.extend( {
 		return true;
 	},
 
-	// Evaluates a script in a global context
-	globalEval: function( code ) {
-		DOMEval( code );
+	// Evaluates a script in a provided context; falls back to the global one
+	// if not specified.
+	globalEval: function( code, options, doc ) {
+		DOMEval( code, { nonce: options && options.nonce }, doc );
 	},
 
 	each: function( obj, callback ) {
@@ -367,13 +393,6 @@ jQuery.extend( {
 		return obj;
 	},
 
-	// Support: Android <=4.0 only
-	trim: function( text ) {
-		return text == null ?
-			"" :
-			( text + "" ).replace( rtrim, "" );
-	},
-
 	// results is for internal usage only
 	makeArray: function( arr, results ) {
 		var ret = results || [];
@@ -460,7 +479,7 @@ jQuery.extend( {
 		}
 
 		// Flatten any nested arrays
-		return concat.apply( [], ret );
+		return flat( ret );
 	},
 
 	// A global GUID counter for objects
@@ -477,7 +496,7 @@ if ( typeof Symbol === "function" ) {
 
 // Populate the class2type map
 jQuery.each( "Boolean Number String Function Array Date RegExp Object Error Symbol".split( " " ),
-function( i, name ) {
+function( _i, name ) {
 	class2type[ "[object " + name + "]" ] = name.toLowerCase();
 } );
 
@@ -499,17 +518,16 @@ function isArrayLike( obj ) {
 }
 var Sizzle =
 /*!
- * Sizzle CSS Selector Engine v2.3.3
+ * Sizzle CSS Selector Engine v2.3.5
  * https://sizzlejs.com/
  *
- * Copyright jQuery Foundation and other contributors
+ * Copyright JS Foundation and other contributors
  * Released under the MIT license
- * http://jquery.org/license
+ * https://js.foundation/
  *
- * Date: 2016-08-08
+ * Date: 2020-03-14
  */
-(function( window ) {
-
+( function( window ) {
 var i,
 	support,
 	Expr,
@@ -540,6 +558,7 @@ var i,
 	classCache = createCache(),
 	tokenCache = createCache(),
 	compilerCache = createCache(),
+	nonnativeSelectorCache = createCache(),
 	sortOrder = function( a, b ) {
 		if ( a === b ) {
 			hasDuplicate = true;
@@ -548,61 +567,71 @@ var i,
 	},
 
 	// Instance methods
-	hasOwn = ({}).hasOwnProperty,
+	hasOwn = ( {} ).hasOwnProperty,
 	arr = [],
 	pop = arr.pop,
-	push_native = arr.push,
+	pushNative = arr.push,
 	push = arr.push,
 	slice = arr.slice,
+
 	// Use a stripped-down indexOf as it's faster than native
 	// https://jsperf.com/thor-indexof-vs-for/5
 	indexOf = function( list, elem ) {
 		var i = 0,
 			len = list.length;
 		for ( ; i < len; i++ ) {
-			if ( list[i] === elem ) {
+			if ( list[ i ] === elem ) {
 				return i;
 			}
 		}
 		return -1;
 	},
 
-	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",
+	booleans = "checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|" +
+		"ismap|loop|multiple|open|readonly|required|scoped",
 
 	// Regular expressions
 
 	// http://www.w3.org/TR/css3-selectors/#whitespace
 	whitespace = "[\\x20\\t\\r\\n\\f]",
 
-	// http://www.w3.org/TR/CSS21/syndata.html#value-def-identifier
-	identifier = "(?:\\\\.|[\\w-]|[^\0-\\xa0])+",
+	// https://www.w3.org/TR/css-syntax-3/#ident-token-diagram
+	identifier = "(?:\\\\[\\da-fA-F]{1,6}" + whitespace +
+		"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",
 
 	// Attribute selectors: http://www.w3.org/TR/selectors/#attribute-selectors
 	attributes = "\\[" + whitespace + "*(" + identifier + ")(?:" + whitespace +
+
 		// Operator (capture 2)
 		"*([*^$|!~]?=)" + whitespace +
-		// "Attribute values must be CSS identifiers [capture 5] or strings [capture 3 or capture 4]"
-		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" + whitespace +
-		"*\\]",
+
+		// "Attribute values must be CSS identifiers [capture 5]
+		// or strings [capture 3 or capture 4]"
+		"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|(" + identifier + "))|)" +
+		whitespace + "*\\]",
 
 	pseudos = ":(" + identifier + ")(?:\\((" +
+
 		// To reduce the number of selectors needing tokenize in the preFilter, prefer arguments:
 		// 1. quoted (capture 3; capture 4 or capture 5)
 		"('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|" +
+
 		// 2. simple (capture 6)
 		"((?:\\\\.|[^\\\\()[\\]]|" + attributes + ")*)|" +
+
 		// 3. anything else (capture 2)
 		".*" +
 		")\\)|)",
 
 	// Leading and non-escaped trailing whitespace, capturing some non-whitespace characters preceding the latter
 	rwhitespace = new RegExp( whitespace + "+", "g" ),
-	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" + whitespace + "+$", "g" ),
+	rtrim = new RegExp( "^" + whitespace + "+|((?:^|[^\\\\])(?:\\\\.)*)" +
+		whitespace + "+$", "g" ),
 
 	rcomma = new RegExp( "^" + whitespace + "*," + whitespace + "*" ),
-	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace + "*" ),
-
-	rattributeQuotes = new RegExp( "=" + whitespace + "*([^\\]'\"]*?)" + whitespace + "*\\]", "g" ),
+	rcombinators = new RegExp( "^" + whitespace + "*([>+~]|" + whitespace + ")" + whitespace +
+		"*" ),
+	rdescend = new RegExp( whitespace + "|>" ),
 
 	rpseudo = new RegExp( pseudos ),
 	ridentifier = new RegExp( "^" + identifier + "$" ),
@@ -613,16 +642,19 @@ var i,
 		"TAG": new RegExp( "^(" + identifier + "|[*])" ),
 		"ATTR": new RegExp( "^" + attributes ),
 		"PSEUDO": new RegExp( "^" + pseudos ),
-		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" + whitespace +
-			"*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" + whitespace +
-			"*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
+		"CHILD": new RegExp( "^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\(" +
+			whitespace + "*(even|odd|(([+-]|)(\\d*)n|)" + whitespace + "*(?:([+-]|)" +
+			whitespace + "*(\\d+)|))" + whitespace + "*\\)|)", "i" ),
 		"bool": new RegExp( "^(?:" + booleans + ")$", "i" ),
+
 		// For use in libraries implementing .is()
 		// We use this for POS matching in `select`
-		"needsContext": new RegExp( "^" + whitespace + "*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" +
-			whitespace + "*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
+		"needsContext": new RegExp( "^" + whitespace +
+			"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\(" + whitespace +
+			"*((?:-\\d)?\\d*)" + whitespace + "*\\)|)(?=[^-]|$)", "i" )
 	},
 
+	rhtml = /HTML$/i,
 	rinputs = /^(?:input|select|textarea|button)$/i,
 	rheader = /^h\d$/i,
 
@@ -635,18 +667,21 @@ var i,
 
 	// CSS escapes
 	// http://www.w3.org/TR/CSS21/syndata.html#escaped-characters
-	runescape = new RegExp( "\\\\([\\da-f]{1,6}" + whitespace + "?|(" + whitespace + ")|.)", "ig" ),
-	funescape = function( _, escaped, escapedWhitespace ) {
-		var high = "0x" + escaped - 0x10000;
-		// NaN means non-codepoint
-		// Support: Firefox<24
-		// Workaround erroneous numeric interpretation of +"0x"
-		return high !== high || escapedWhitespace ?
-			escaped :
+	runescape = new RegExp( "\\\\[\\da-fA-F]{1,6}" + whitespace + "?|\\\\([^\\r\\n\\f])", "g" ),
+	funescape = function( escape, nonHex ) {
+		var high = "0x" + escape.slice( 1 ) - 0x10000;
+
+		return nonHex ?
+
+			// Strip the backslash prefix from a non-hex escape sequence
+			nonHex :
+
+			// Replace a hexadecimal escape sequence with the encoded Unicode code point
+			// Support: IE <=11+
+			// For values outside the Basic Multilingual Plane (BMP), manually construct a
+			// surrogate pair
 			high < 0 ?
-				// BMP codepoint
 				String.fromCharCode( high + 0x10000 ) :
-				// Supplemental Plane codepoint (surrogate pair)
 				String.fromCharCode( high >> 10 | 0xD800, high & 0x3FF | 0xDC00 );
 	},
 
@@ -662,7 +697,8 @@ var i,
 			}
 
 			// Control characters and (dependent upon position) numbers get escaped as code points
-			return ch.slice( 0, -1 ) + "\\" + ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
+			return ch.slice( 0, -1 ) + "\\" +
+				ch.charCodeAt( ch.length - 1 ).toString( 16 ) + " ";
 		}
 
 		// Other potentially-special ASCII characters get backslash-escaped
@@ -677,9 +713,9 @@ var i,
 		setDocument();
 	},
 
-	disabledAncestor = addCombinator(
+	inDisabledFieldset = addCombinator(
 		function( elem ) {
-			return elem.disabled === true && ("form" in elem || "label" in elem);
+			return elem.disabled === true && elem.nodeName.toLowerCase() === "fieldset";
 		},
 		{ dir: "parentNode", next: "legend" }
 	);
@@ -687,18 +723,20 @@ var i,
 // Optimize for push.apply( _, NodeList )
 try {
 	push.apply(
-		(arr = slice.call( preferredDoc.childNodes )),
+		( arr = slice.call( preferredDoc.childNodes ) ),
 		preferredDoc.childNodes
 	);
+
 	// Support: Android<4.0
 	// Detect silently failing push.apply
+	// eslint-disable-next-line no-unused-expressions
 	arr[ preferredDoc.childNodes.length ].nodeType;
 } catch ( e ) {
 	push = { apply: arr.length ?
 
 		// Leverage slice if possible
 		function( target, els ) {
-			push_native.apply( target, slice.call(els) );
+			pushNative.apply( target, slice.call( els ) );
 		} :
 
 		// Support: IE<9
@@ -706,8 +744,9 @@ try {
 		function( target, els ) {
 			var j = target.length,
 				i = 0;
+
 			// Can't trust NodeList.length
-			while ( (target[j++] = els[i++]) ) {}
+			while ( ( target[ j++ ] = els[ i++ ] ) ) {}
 			target.length = j - 1;
 		}
 	};
@@ -731,24 +770,21 @@ function Sizzle( selector, context, results, seed ) {
 
 	// Try to shortcut find operations (as opposed to filters) in HTML documents
 	if ( !seed ) {
-
-		if ( ( context ? context.ownerDocument || context : preferredDoc ) !== document ) {
-			setDocument( context );
-		}
+		setDocument( context );
 		context = context || document;
 
 		if ( documentIsHTML ) {
 
 			// If the selector is sufficiently simple, try using a "get*By*" DOM method
 			// (excepting DocumentFragment context, where the methods don't exist)
-			if ( nodeType !== 11 && (match = rquickExpr.exec( selector )) ) {
+			if ( nodeType !== 11 && ( match = rquickExpr.exec( selector ) ) ) {
 
 				// ID selector
-				if ( (m = match[1]) ) {
+				if ( ( m = match[ 1 ] ) ) {
 
 					// Document context
 					if ( nodeType === 9 ) {
-						if ( (elem = context.getElementById( m )) ) {
+						if ( ( elem = context.getElementById( m ) ) ) {
 
 							// Support: IE, Opera, Webkit
 							// TODO: identify versions
@@ -767,7 +803,7 @@ function Sizzle( selector, context, results, seed ) {
 						// Support: IE, Opera, Webkit
 						// TODO: identify versions
 						// getElementById can match elements by name instead of ID
-						if ( newContext && (elem = newContext.getElementById( m )) &&
+						if ( newContext && ( elem = newContext.getElementById( m ) ) &&
 							contains( context, elem ) &&
 							elem.id === m ) {
 
@@ -777,12 +813,12 @@ function Sizzle( selector, context, results, seed ) {
 					}
 
 				// Type selector
-				} else if ( match[2] ) {
+				} else if ( match[ 2 ] ) {
 					push.apply( results, context.getElementsByTagName( selector ) );
 					return results;
 
 				// Class selector
-				} else if ( (m = match[3]) && support.getElementsByClassName &&
+				} else if ( ( m = match[ 3 ] ) && support.getElementsByClassName &&
 					context.getElementsByClassName ) {
 
 					push.apply( results, context.getElementsByClassName( m ) );
@@ -792,50 +828,62 @@ function Sizzle( selector, context, results, seed ) {
 
 			// Take advantage of querySelectorAll
 			if ( support.qsa &&
-				!compilerCache[ selector + " " ] &&
-				(!rbuggyQSA || !rbuggyQSA.test( selector )) ) {
+				!nonnativeSelectorCache[ selector + " " ] &&
+				( !rbuggyQSA || !rbuggyQSA.test( selector ) ) &&
 
-				if ( nodeType !== 1 ) {
-					newContext = context;
-					newSelector = selector;
-
-				// qSA looks outside Element context, which is not what we want
-				// Thanks to Andrew Dupont for this workaround technique
-				// Support: IE <=8
+				// Support: IE 8 only
 				// Exclude object elements
-				} else if ( context.nodeName.toLowerCase() !== "object" ) {
+				( nodeType !== 1 || context.nodeName.toLowerCase() !== "object" ) ) {
 
-					// Capture the context ID, setting it first if necessary
-					if ( (nid = context.getAttribute( "id" )) ) {
-						nid = nid.replace( rcssescape, fcssescape );
-					} else {
-						context.setAttribute( "id", (nid = expando) );
+				newSelector = selector;
+				newContext = context;
+
+				// qSA considers elements outside a scoping root when evaluating child or
+				// descendant combinators, which is not what we want.
+				// In such cases, we work around the behavior by prefixing every selector in the
+				// list with an ID selector referencing the scope context.
+				// The technique has to be used as well when a leading combinator is used
+				// as such selectors are not recognized by querySelectorAll.
+				// Thanks to Andrew Dupont for this technique.
+				if ( nodeType === 1 &&
+					( rdescend.test( selector ) || rcombinators.test( selector ) ) ) {
+
+					// Expand context for sibling selectors
+					newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
+						context;
+
+					// We can use :scope instead of the ID hack if the browser
+					// supports it & if we're not changing the context.
+					if ( newContext !== context || !support.scope ) {
+
+						// Capture the context ID, setting it first if necessary
+						if ( ( nid = context.getAttribute( "id" ) ) ) {
+							nid = nid.replace( rcssescape, fcssescape );
+						} else {
+							context.setAttribute( "id", ( nid = expando ) );
+						}
 					}
 
 					// Prefix every selector in the list
 					groups = tokenize( selector );
 					i = groups.length;
 					while ( i-- ) {
-						groups[i] = "#" + nid + " " + toSelector( groups[i] );
+						groups[ i ] = ( nid ? "#" + nid : ":scope" ) + " " +
+							toSelector( groups[ i ] );
 					}
 					newSelector = groups.join( "," );
-
-					// Expand context for sibling selectors
-					newContext = rsibling.test( selector ) && testContext( context.parentNode ) ||
-						context;
 				}
 
-				if ( newSelector ) {
-					try {
-						push.apply( results,
-							newContext.querySelectorAll( newSelector )
-						);
-						return results;
-					} catch ( qsaError ) {
-					} finally {
-						if ( nid === expando ) {
-							context.removeAttribute( "id" );
-						}
+				try {
+					push.apply( results,
+						newContext.querySelectorAll( newSelector )
+					);
+					return results;
+				} catch ( qsaError ) {
+					nonnativeSelectorCache( selector, true );
+				} finally {
+					if ( nid === expando ) {
+						context.removeAttribute( "id" );
 					}
 				}
 			}
@@ -856,12 +904,14 @@ function createCache() {
 	var keys = [];
 
 	function cache( key, value ) {
+
 		// Use (key + " ") to avoid collision with native prototype properties (see Issue #157)
 		if ( keys.push( key + " " ) > Expr.cacheLength ) {
+
 			// Only keep the most recent entries
 			delete cache[ keys.shift() ];
 		}
-		return (cache[ key + " " ] = value);
+		return ( cache[ key + " " ] = value );
 	}
 	return cache;
 }
@@ -880,17 +930,19 @@ function markFunction( fn ) {
  * @param {Function} fn Passed the created element and returns a boolean result
  */
 function assert( fn ) {
-	var el = document.createElement("fieldset");
+	var el = document.createElement( "fieldset" );
 
 	try {
 		return !!fn( el );
-	} catch (e) {
+	} catch ( e ) {
 		return false;
 	} finally {
+
 		// Remove from its parent by default
 		if ( el.parentNode ) {
 			el.parentNode.removeChild( el );
 		}
+
 		// release memory in IE
 		el = null;
 	}
@@ -902,11 +954,11 @@ function assert( fn ) {
  * @param {Function} handler The method that will be applied
  */
 function addHandle( attrs, handler ) {
-	var arr = attrs.split("|"),
+	var arr = attrs.split( "|" ),
 		i = arr.length;
 
 	while ( i-- ) {
-		Expr.attrHandle[ arr[i] ] = handler;
+		Expr.attrHandle[ arr[ i ] ] = handler;
 	}
 }
 
@@ -928,7 +980,7 @@ function siblingCheck( a, b ) {
 
 	// Check if b follows a
 	if ( cur ) {
-		while ( (cur = cur.nextSibling) ) {
+		while ( ( cur = cur.nextSibling ) ) {
 			if ( cur === b ) {
 				return -1;
 			}
@@ -956,7 +1008,7 @@ function createInputPseudo( type ) {
 function createButtonPseudo( type ) {
 	return function( elem ) {
 		var name = elem.nodeName.toLowerCase();
-		return (name === "input" || name === "button") && elem.type === type;
+		return ( name === "input" || name === "button" ) && elem.type === type;
 	};
 }
 
@@ -999,7 +1051,7 @@ function createDisabledPseudo( disabled ) {
 					// Where there is no isDisabled, check manually
 					/* jshint -W018 */
 					elem.isDisabled !== !disabled &&
-						disabledAncestor( elem ) === disabled;
+					inDisabledFieldset( elem ) === disabled;
 			}
 
 			return elem.disabled === disabled;
@@ -1021,21 +1073,21 @@ function createDisabledPseudo( disabled ) {
  * @param {Function} fn
  */
 function createPositionalPseudo( fn ) {
-	return markFunction(function( argument ) {
+	return markFunction( function( argument ) {
 		argument = +argument;
-		return markFunction(function( seed, matches ) {
+		return markFunction( function( seed, matches ) {
 			var j,
 				matchIndexes = fn( [], seed.length, argument ),
 				i = matchIndexes.length;
 
 			// Match elements found at the specified indexes
 			while ( i-- ) {
-				if ( seed[ (j = matchIndexes[i]) ] ) {
-					seed[j] = !(matches[j] = seed[j]);
+				if ( seed[ ( j = matchIndexes[ i ] ) ] ) {
+					seed[ j ] = !( matches[ j ] = seed[ j ] );
 				}
 			}
-		});
-	});
+		} );
+	} );
 }
 
 /**
@@ -1056,10 +1108,13 @@ support = Sizzle.support = {};
  * @returns {Boolean} True iff elem is a non-HTML XML node
  */
 isXML = Sizzle.isXML = function( elem ) {
-	// documentElement is verified for cases where it doesn't yet exist
-	// (such as loading iframes in IE - #4833)
-	var documentElement = elem && (elem.ownerDocument || elem).documentElement;
-	return documentElement ? documentElement.nodeName !== "HTML" : false;
+	var namespace = elem.namespaceURI,
+		docElem = ( elem.ownerDocument || elem ).documentElement;
+
+	// Support: IE <=8
+	// Assume HTML when documentElement doesn't yet exist, such as inside loading iframes
+	// https://bugs.jquery.com/ticket/4833
+	return !rhtml.test( namespace || docElem && docElem.nodeName || "HTML" );
 };
 
 /**
@@ -1072,7 +1127,11 @@ setDocument = Sizzle.setDocument = function( node ) {
 		doc = node ? node.ownerDocument || node : preferredDoc;
 
 	// Return early if doc is invalid or already selected
-	if ( doc === document || doc.nodeType !== 9 || !doc.documentElement ) {
+	// Support: IE 11+, Edge 17 - 18+
+	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+	// two documents; shallow comparisons work.
+	// eslint-disable-next-line eqeqeq
+	if ( doc == document || doc.nodeType !== 9 || !doc.documentElement ) {
 		return document;
 	}
 
@@ -1081,10 +1140,14 @@ setDocument = Sizzle.setDocument = function( node ) {
 	docElem = document.documentElement;
 	documentIsHTML = !isXML( document );
 
-	// Support: IE 9-11, Edge
+	// Support: IE 9 - 11+, Edge 12 - 18+
 	// Accessing iframe documents after unload throws "permission denied" errors (jQuery #13936)
-	if ( preferredDoc !== document &&
-		(subWindow = document.defaultView) && subWindow.top !== subWindow ) {
+	// Support: IE 11+, Edge 17 - 18+
+	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+	// two documents; shallow comparisons work.
+	// eslint-disable-next-line eqeqeq
+	if ( preferredDoc != document &&
+		( subWindow = document.defaultView ) && subWindow.top !== subWindow ) {
 
 		// Support: IE 11, Edge
 		if ( subWindow.addEventListener ) {
@@ -1096,25 +1159,36 @@ setDocument = Sizzle.setDocument = function( node ) {
 		}
 	}
 
+	// Support: IE 8 - 11+, Edge 12 - 18+, Chrome <=16 - 25 only, Firefox <=3.6 - 31 only,
+	// Safari 4 - 5 only, Opera <=11.6 - 12.x only
+	// IE/Edge & older browsers don't support the :scope pseudo-class.
+	// Support: Safari 6.0 only
+	// Safari 6.0 supports :scope but it's an alias of :root there.
+	support.scope = assert( function( el ) {
+		docElem.appendChild( el ).appendChild( document.createElement( "div" ) );
+		return typeof el.querySelectorAll !== "undefined" &&
+			!el.querySelectorAll( ":scope fieldset div" ).length;
+	} );
+
 	/* Attributes
 	---------------------------------------------------------------------- */
 
 	// Support: IE<8
 	// Verify that getAttribute really returns attributes and not properties
 	// (excepting IE8 booleans)
-	support.attributes = assert(function( el ) {
+	support.attributes = assert( function( el ) {
 		el.className = "i";
-		return !el.getAttribute("className");
-	});
+		return !el.getAttribute( "className" );
+	} );
 
 	/* getElement(s)By*
 	---------------------------------------------------------------------- */
 
 	// Check if getElementsByTagName("*") returns only elements
-	support.getElementsByTagName = assert(function( el ) {
-		el.appendChild( document.createComment("") );
-		return !el.getElementsByTagName("*").length;
-	});
+	support.getElementsByTagName = assert( function( el ) {
+		el.appendChild( document.createComment( "" ) );
+		return !el.getElementsByTagName( "*" ).length;
+	} );
 
 	// Support: IE<9
 	support.getElementsByClassName = rnative.test( document.getElementsByClassName );
@@ -1123,38 +1197,38 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// Check if getElementById returns elements by name
 	// The broken getElementById methods don't pick up programmatically-set names,
 	// so use a roundabout getElementsByName test
-	support.getById = assert(function( el ) {
+	support.getById = assert( function( el ) {
 		docElem.appendChild( el ).id = expando;
 		return !document.getElementsByName || !document.getElementsByName( expando ).length;
-	});
+	} );
 
 	// ID filter and find
 	if ( support.getById ) {
-		Expr.filter["ID"] = function( id ) {
+		Expr.filter[ "ID" ] = function( id ) {
 			var attrId = id.replace( runescape, funescape );
 			return function( elem ) {
-				return elem.getAttribute("id") === attrId;
+				return elem.getAttribute( "id" ) === attrId;
 			};
 		};
-		Expr.find["ID"] = function( id, context ) {
+		Expr.find[ "ID" ] = function( id, context ) {
 			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
 				var elem = context.getElementById( id );
 				return elem ? [ elem ] : [];
 			}
 		};
 	} else {
-		Expr.filter["ID"] =  function( id ) {
+		Expr.filter[ "ID" ] =  function( id ) {
 			var attrId = id.replace( runescape, funescape );
 			return function( elem ) {
 				var node = typeof elem.getAttributeNode !== "undefined" &&
-					elem.getAttributeNode("id");
+					elem.getAttributeNode( "id" );
 				return node && node.value === attrId;
 			};
 		};
 
 		// Support: IE 6 - 7 only
 		// getElementById is not reliable as a find shortcut
-		Expr.find["ID"] = function( id, context ) {
+		Expr.find[ "ID" ] = function( id, context ) {
 			if ( typeof context.getElementById !== "undefined" && documentIsHTML ) {
 				var node, i, elems,
 					elem = context.getElementById( id );
@@ -1162,7 +1236,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 				if ( elem ) {
 
 					// Verify the id attribute
-					node = elem.getAttributeNode("id");
+					node = elem.getAttributeNode( "id" );
 					if ( node && node.value === id ) {
 						return [ elem ];
 					}
@@ -1170,8 +1244,8 @@ setDocument = Sizzle.setDocument = function( node ) {
 					// Fall back on getElementsByName
 					elems = context.getElementsByName( id );
 					i = 0;
-					while ( (elem = elems[i++]) ) {
-						node = elem.getAttributeNode("id");
+					while ( ( elem = elems[ i++ ] ) ) {
+						node = elem.getAttributeNode( "id" );
 						if ( node && node.value === id ) {
 							return [ elem ];
 						}
@@ -1184,7 +1258,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 	}
 
 	// Tag
-	Expr.find["TAG"] = support.getElementsByTagName ?
+	Expr.find[ "TAG" ] = support.getElementsByTagName ?
 		function( tag, context ) {
 			if ( typeof context.getElementsByTagName !== "undefined" ) {
 				return context.getElementsByTagName( tag );
@@ -1199,12 +1273,13 @@ setDocument = Sizzle.setDocument = function( node ) {
 			var elem,
 				tmp = [],
 				i = 0,
+
 				// By happy coincidence, a (broken) gEBTN appears on DocumentFragment nodes too
 				results = context.getElementsByTagName( tag );
 
 			// Filter out possible comments
 			if ( tag === "*" ) {
-				while ( (elem = results[i++]) ) {
+				while ( ( elem = results[ i++ ] ) ) {
 					if ( elem.nodeType === 1 ) {
 						tmp.push( elem );
 					}
@@ -1216,7 +1291,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 		};
 
 	// Class
-	Expr.find["CLASS"] = support.getElementsByClassName && function( className, context ) {
+	Expr.find[ "CLASS" ] = support.getElementsByClassName && function( className, context ) {
 		if ( typeof context.getElementsByClassName !== "undefined" && documentIsHTML ) {
 			return context.getElementsByClassName( className );
 		}
@@ -1237,10 +1312,14 @@ setDocument = Sizzle.setDocument = function( node ) {
 	// See https://bugs.jquery.com/ticket/13378
 	rbuggyQSA = [];
 
-	if ( (support.qsa = rnative.test( document.querySelectorAll )) ) {
+	if ( ( support.qsa = rnative.test( document.querySelectorAll ) ) ) {
+
 		// Build QSA regex
 		// Regex strategy adopted from Diego Perini
-		assert(function( el ) {
+		assert( function( el ) {
+
+			var input;
+
 			// Select is set to empty string on purpose
 			// This is to test IE's treatment of not explicitly
 			// setting a boolean content attribute,
@@ -1254,78 +1333,98 @@ setDocument = Sizzle.setDocument = function( node ) {
 			// Nothing should be selected when empty strings follow ^= or $= or *=
 			// The test attribute must be unknown in Opera but "safe" for WinRT
 			// https://msdn.microsoft.com/en-us/library/ie/hh465388.aspx#attribute_section
-			if ( el.querySelectorAll("[msallowcapture^='']").length ) {
+			if ( el.querySelectorAll( "[msallowcapture^='']" ).length ) {
 				rbuggyQSA.push( "[*^$]=" + whitespace + "*(?:''|\"\")" );
 			}
 
 			// Support: IE8
 			// Boolean attributes and "value" are not treated correctly
-			if ( !el.querySelectorAll("[selected]").length ) {
+			if ( !el.querySelectorAll( "[selected]" ).length ) {
 				rbuggyQSA.push( "\\[" + whitespace + "*(?:value|" + booleans + ")" );
 			}
 
 			// Support: Chrome<29, Android<4.4, Safari<7.0+, iOS<7.0+, PhantomJS<1.9.8+
 			if ( !el.querySelectorAll( "[id~=" + expando + "-]" ).length ) {
-				rbuggyQSA.push("~=");
+				rbuggyQSA.push( "~=" );
+			}
+
+			// Support: IE 11+, Edge 15 - 18+
+			// IE 11/Edge don't find elements on a `[name='']` query in some cases.
+			// Adding a temporary attribute to the document before the selection works
+			// around the issue.
+			// Interestingly, IE 10 & older don't seem to have the issue.
+			input = document.createElement( "input" );
+			input.setAttribute( "name", "" );
+			el.appendChild( input );
+			if ( !el.querySelectorAll( "[name='']" ).length ) {
+				rbuggyQSA.push( "\\[" + whitespace + "*name" + whitespace + "*=" +
+					whitespace + "*(?:''|\"\")" );
 			}
 
 			// Webkit/Opera - :checked should return selected option elements
 			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
 			// IE8 throws error here and will not see later tests
-			if ( !el.querySelectorAll(":checked").length ) {
-				rbuggyQSA.push(":checked");
+			if ( !el.querySelectorAll( ":checked" ).length ) {
+				rbuggyQSA.push( ":checked" );
 			}
 
 			// Support: Safari 8+, iOS 8+
 			// https://bugs.webkit.org/show_bug.cgi?id=136851
 			// In-page `selector#id sibling-combinator selector` fails
 			if ( !el.querySelectorAll( "a#" + expando + "+*" ).length ) {
-				rbuggyQSA.push(".#.+[+~]");
+				rbuggyQSA.push( ".#.+[+~]" );
 			}
-		});
 
-		assert(function( el ) {
+			// Support: Firefox <=3.6 - 5 only
+			// Old Firefox doesn't throw on a badly-escaped identifier.
+			el.querySelectorAll( "\\\f" );
+			rbuggyQSA.push( "[\\r\\n\\f]" );
+		} );
+
+		assert( function( el ) {
 			el.innerHTML = "<a href='' disabled='disabled'></a>" +
 				"<select disabled='disabled'><option/></select>";
 
 			// Support: Windows 8 Native Apps
 			// The type and name attributes are restricted during .innerHTML assignment
-			var input = document.createElement("input");
+			var input = document.createElement( "input" );
 			input.setAttribute( "type", "hidden" );
 			el.appendChild( input ).setAttribute( "name", "D" );
 
 			// Support: IE8
 			// Enforce case-sensitivity of name attribute
-			if ( el.querySelectorAll("[name=d]").length ) {
+			if ( el.querySelectorAll( "[name=d]" ).length ) {
 				rbuggyQSA.push( "name" + whitespace + "*[*^$|!~]?=" );
 			}
 
 			// FF 3.5 - :enabled/:disabled and hidden elements (hidden elements are still enabled)
 			// IE8 throws error here and will not see later tests
-			if ( el.querySelectorAll(":enabled").length !== 2 ) {
+			if ( el.querySelectorAll( ":enabled" ).length !== 2 ) {
 				rbuggyQSA.push( ":enabled", ":disabled" );
 			}
 
 			// Support: IE9-11+
 			// IE's :disabled selector does not pick up the children of disabled fieldsets
 			docElem.appendChild( el ).disabled = true;
-			if ( el.querySelectorAll(":disabled").length !== 2 ) {
+			if ( el.querySelectorAll( ":disabled" ).length !== 2 ) {
 				rbuggyQSA.push( ":enabled", ":disabled" );
 			}
 
+			// Support: Opera 10 - 11 only
 			// Opera 10-11 does not throw on post-comma invalid pseudos
-			el.querySelectorAll("*,:x");
-			rbuggyQSA.push(",.*:");
-		});
+			el.querySelectorAll( "*,:x" );
+			rbuggyQSA.push( ",.*:" );
+		} );
 	}
 
-	if ( (support.matchesSelector = rnative.test( (matches = docElem.matches ||
+	if ( ( support.matchesSelector = rnative.test( ( matches = docElem.matches ||
 		docElem.webkitMatchesSelector ||
 		docElem.mozMatchesSelector ||
 		docElem.oMatchesSelector ||
-		docElem.msMatchesSelector) )) ) {
+		docElem.msMatchesSelector ) ) ) ) {
+
+		assert( function( el ) {
 
-		assert(function( el ) {
 			// Check to see if it's possible to do matchesSelector
 			// on a disconnected node (IE 9)
 			support.disconnectedMatch = matches.call( el, "*" );
@@ -1334,11 +1433,11 @@ setDocument = Sizzle.setDocument = function( node ) {
 			// Gecko does not error, returns false instead
 			matches.call( el, "[s!='']:x" );
 			rbuggyMatches.push( "!=", pseudos );
-		});
+		} );
 	}
 
-	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join("|") );
-	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join("|") );
+	rbuggyQSA = rbuggyQSA.length && new RegExp( rbuggyQSA.join( "|" ) );
+	rbuggyMatches = rbuggyMatches.length && new RegExp( rbuggyMatches.join( "|" ) );
 
 	/* Contains
 	---------------------------------------------------------------------- */
@@ -1355,11 +1454,11 @@ setDocument = Sizzle.setDocument = function( node ) {
 				adown.contains ?
 					adown.contains( bup ) :
 					a.compareDocumentPosition && a.compareDocumentPosition( bup ) & 16
-			));
+			) );
 		} :
 		function( a, b ) {
 			if ( b ) {
-				while ( (b = b.parentNode) ) {
+				while ( ( b = b.parentNode ) ) {
 					if ( b === a ) {
 						return true;
 					}
@@ -1388,7 +1487,11 @@ setDocument = Sizzle.setDocument = function( node ) {
 		}
 
 		// Calculate position if both inputs belong to the same document
-		compare = ( a.ownerDocument || a ) === ( b.ownerDocument || b ) ?
+		// Support: IE 11+, Edge 17 - 18+
+		// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+		// two documents; shallow comparisons work.
+		// eslint-disable-next-line eqeqeq
+		compare = ( a.ownerDocument || a ) == ( b.ownerDocument || b ) ?
 			a.compareDocumentPosition( b ) :
 
 			// Otherwise we know they are disconnected
@@ -1396,13 +1499,24 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 		// Disconnected nodes
 		if ( compare & 1 ||
-			(!support.sortDetached && b.compareDocumentPosition( a ) === compare) ) {
+			( !support.sortDetached && b.compareDocumentPosition( a ) === compare ) ) {
 
 			// Choose the first element that is related to our preferred document
-			if ( a === document || a.ownerDocument === preferredDoc && contains(preferredDoc, a) ) {
+			// Support: IE 11+, Edge 17 - 18+
+			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+			// two documents; shallow comparisons work.
+			// eslint-disable-next-line eqeqeq
+			if ( a == document || a.ownerDocument == preferredDoc &&
+				contains( preferredDoc, a ) ) {
 				return -1;
 			}
-			if ( b === document || b.ownerDocument === preferredDoc && contains(preferredDoc, b) ) {
+
+			// Support: IE 11+, Edge 17 - 18+
+			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+			// two documents; shallow comparisons work.
+			// eslint-disable-next-line eqeqeq
+			if ( b == document || b.ownerDocument == preferredDoc &&
+				contains( preferredDoc, b ) ) {
 				return 1;
 			}
 
@@ -1415,6 +1529,7 @@ setDocument = Sizzle.setDocument = function( node ) {
 		return compare & 4 ? -1 : 1;
 	} :
 	function( a, b ) {
+
 		// Exit early if the nodes are identical
 		if ( a === b ) {
 			hasDuplicate = true;
@@ -1430,8 +1545,14 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 		// Parentless nodes are either documents or disconnected
 		if ( !aup || !bup ) {
-			return a === document ? -1 :
-				b === document ? 1 :
+
+			// Support: IE 11+, Edge 17 - 18+
+			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+			// two documents; shallow comparisons work.
+			/* eslint-disable eqeqeq */
+			return a == document ? -1 :
+				b == document ? 1 :
+				/* eslint-enable eqeqeq */
 				aup ? -1 :
 				bup ? 1 :
 				sortInput ?
@@ -1445,26 +1566,32 @@ setDocument = Sizzle.setDocument = function( node ) {
 
 		// Otherwise we need full lists of their ancestors for comparison
 		cur = a;
-		while ( (cur = cur.parentNode) ) {
+		while ( ( cur = cur.parentNode ) ) {
 			ap.unshift( cur );
 		}
 		cur = b;
-		while ( (cur = cur.parentNode) ) {
+		while ( ( cur = cur.parentNode ) ) {
 			bp.unshift( cur );
 		}
 
 		// Walk down the tree looking for a discrepancy
-		while ( ap[i] === bp[i] ) {
+		while ( ap[ i ] === bp[ i ] ) {
 			i++;
 		}
 
 		return i ?
+
 			// Do a sibling check if the nodes have a common ancestor
-			siblingCheck( ap[i], bp[i] ) :
+			siblingCheck( ap[ i ], bp[ i ] ) :
 
 			// Otherwise nodes in our document sort first
-			ap[i] === preferredDoc ? -1 :
-			bp[i] === preferredDoc ? 1 :
+			// Support: IE 11+, Edge 17 - 18+
+			// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+			// two documents; shallow comparisons work.
+			/* eslint-disable eqeqeq */
+			ap[ i ] == preferredDoc ? -1 :
+			bp[ i ] == preferredDoc ? 1 :
+			/* eslint-enable eqeqeq */
 			0;
 	};
 
@@ -1476,16 +1603,10 @@ Sizzle.matches = function( expr, elements ) {
 };
 
 Sizzle.matchesSelector = function( elem, expr ) {
-	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
-		setDocument( elem );
-	}
-
-	// Make sure that attribute selectors are quoted
-	expr = expr.replace( rattributeQuotes, "='$1']" );
+	setDocument( elem );
 
 	if ( support.matchesSelector && documentIsHTML &&
-		!compilerCache[ expr + " " ] &&
+		!nonnativeSelectorCache[ expr + " " ] &&
 		( !rbuggyMatches || !rbuggyMatches.test( expr ) ) &&
 		( !rbuggyQSA     || !rbuggyQSA.test( expr ) ) ) {
 
@@ -1494,32 +1615,46 @@ Sizzle.matchesSelector = function( elem, expr ) {
 
 			// IE 9's matchesSelector returns false on disconnected nodes
 			if ( ret || support.disconnectedMatch ||
-					// As well, disconnected nodes are said to be in a document
-					// fragment in IE 9
-					elem.document && elem.document.nodeType !== 11 ) {
+
+				// As well, disconnected nodes are said to be in a document
+				// fragment in IE 9
+				elem.document && elem.document.nodeType !== 11 ) {
 				return ret;
 			}
-		} catch (e) {}
+		} catch ( e ) {
+			nonnativeSelectorCache( expr, true );
+		}
 	}
 
 	return Sizzle( expr, document, null, [ elem ] ).length > 0;
 };
 
 Sizzle.contains = function( context, elem ) {
+
 	// Set document vars if needed
-	if ( ( context.ownerDocument || context ) !== document ) {
+	// Support: IE 11+, Edge 17 - 18+
+	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+	// two documents; shallow comparisons work.
+	// eslint-disable-next-line eqeqeq
+	if ( ( context.ownerDocument || context ) != document ) {
 		setDocument( context );
 	}
 	return contains( context, elem );
 };
 
 Sizzle.attr = function( elem, name ) {
+
 	// Set document vars if needed
-	if ( ( elem.ownerDocument || elem ) !== document ) {
+	// Support: IE 11+, Edge 17 - 18+
+	// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+	// two documents; shallow comparisons work.
+	// eslint-disable-next-line eqeqeq
+	if ( ( elem.ownerDocument || elem ) != document ) {
 		setDocument( elem );
 	}
 
 	var fn = Expr.attrHandle[ name.toLowerCase() ],
+
 		// Don't get fooled by Object.prototype properties (jQuery #13807)
 		val = fn && hasOwn.call( Expr.attrHandle, name.toLowerCase() ) ?
 			fn( elem, name, !documentIsHTML ) :
@@ -1529,13 +1664,13 @@ Sizzle.attr = function( elem, name ) {
 		val :
 		support.attributes || !documentIsHTML ?
 			elem.getAttribute( name ) :
-			(val = elem.getAttributeNode(name)) && val.specified ?
+			( val = elem.getAttributeNode( name ) ) && val.specified ?
 				val.value :
 				null;
 };
 
 Sizzle.escape = function( sel ) {
-	return (sel + "").replace( rcssescape, fcssescape );
+	return ( sel + "" ).replace( rcssescape, fcssescape );
 };
 
 Sizzle.error = function( msg ) {
@@ -1558,7 +1693,7 @@ Sizzle.uniqueSort = function( results ) {
 	results.sort( sortOrder );
 
 	if ( hasDuplicate ) {
-		while ( (elem = results[i++]) ) {
+		while ( ( elem = results[ i++ ] ) ) {
 			if ( elem === results[ i ] ) {
 				j = duplicates.push( i );
 			}
@@ -1586,17 +1721,21 @@ getText = Sizzle.getText = function( elem ) {
 		nodeType = elem.nodeType;
 
 	if ( !nodeType ) {
+
 		// If no nodeType, this is expected to be an array
-		while ( (node = elem[i++]) ) {
+		while ( ( node = elem[ i++ ] ) ) {
+
 			// Do not traverse comment nodes
 			ret += getText( node );
 		}
 	} else if ( nodeType === 1 || nodeType === 9 || nodeType === 11 ) {
+
 		// Use textContent for elements
 		// innerText usage removed for consistency of new lines (jQuery #11153)
 		if ( typeof elem.textContent === "string" ) {
 			return elem.textContent;
 		} else {
+
 			// Traverse its children
 			for ( elem = elem.firstChild; elem; elem = elem.nextSibling ) {
 				ret += getText( elem );
@@ -1605,6 +1744,7 @@ getText = Sizzle.getText = function( elem ) {
 	} else if ( nodeType === 3 || nodeType === 4 ) {
 		return elem.nodeValue;
 	}
+
 	// Do not include comment or processing instruction nodes
 
 	return ret;
@@ -1632,19 +1772,21 @@ Expr = Sizzle.selectors = {
 
 	preFilter: {
 		"ATTR": function( match ) {
-			match[1] = match[1].replace( runescape, funescape );
+			match[ 1 ] = match[ 1 ].replace( runescape, funescape );
 
 			// Move the given value to match[3] whether quoted or unquoted
-			match[3] = ( match[3] || match[4] || match[5] || "" ).replace( runescape, funescape );
+			match[ 3 ] = ( match[ 3 ] || match[ 4 ] ||
+				match[ 5 ] || "" ).replace( runescape, funescape );
 
-			if ( match[2] === "~=" ) {
-				match[3] = " " + match[3] + " ";
+			if ( match[ 2 ] === "~=" ) {
+				match[ 3 ] = " " + match[ 3 ] + " ";
 			}
 
 			return match.slice( 0, 4 );
 		},
 
 		"CHILD": function( match ) {
+
 			/* matches from matchExpr["CHILD"]
 				1 type (only|nth|...)
 				2 what (child|of-type)
@@ -1655,22 +1797,25 @@ Expr = Sizzle.selectors = {
 				7 sign of y-component
 				8 y of y-component
 			*/
-			match[1] = match[1].toLowerCase();
+			match[ 1 ] = match[ 1 ].toLowerCase();
+
+			if ( match[ 1 ].slice( 0, 3 ) === "nth" ) {
 
-			if ( match[1].slice( 0, 3 ) === "nth" ) {
 				// nth-* requires argument
-				if ( !match[3] ) {
-					Sizzle.error( match[0] );
+				if ( !match[ 3 ] ) {
+					Sizzle.error( match[ 0 ] );
 				}
 
 				// numeric x and y parameters for Expr.filter.CHILD
 				// remember that false/true cast respectively to 0/1
-				match[4] = +( match[4] ? match[5] + (match[6] || 1) : 2 * ( match[3] === "even" || match[3] === "odd" ) );
-				match[5] = +( ( match[7] + match[8] ) || match[3] === "odd" );
+				match[ 4 ] = +( match[ 4 ] ?
+					match[ 5 ] + ( match[ 6 ] || 1 ) :
+					2 * ( match[ 3 ] === "even" || match[ 3 ] === "odd" ) );
+				match[ 5 ] = +( ( match[ 7 ] + match[ 8 ] ) || match[ 3 ] === "odd" );
 
-			// other types prohibit arguments
-			} else if ( match[3] ) {
-				Sizzle.error( match[0] );
+				// other types prohibit arguments
+			} else if ( match[ 3 ] ) {
+				Sizzle.error( match[ 0 ] );
 			}
 
 			return match;
@@ -1678,26 +1823,28 @@ Expr = Sizzle.selectors = {
 
 		"PSEUDO": function( match ) {
 			var excess,
-				unquoted = !match[6] && match[2];
+				unquoted = !match[ 6 ] && match[ 2 ];
 
-			if ( matchExpr["CHILD"].test( match[0] ) ) {
+			if ( matchExpr[ "CHILD" ].test( match[ 0 ] ) ) {
 				return null;
 			}
 
 			// Accept quoted arguments as-is
-			if ( match[3] ) {
-				match[2] = match[4] || match[5] || "";
+			if ( match[ 3 ] ) {
+				match[ 2 ] = match[ 4 ] || match[ 5 ] || "";
 
 			// Strip excess characters from unquoted arguments
 			} else if ( unquoted && rpseudo.test( unquoted ) &&
+
 				// Get excess from tokenize (recursively)
-				(excess = tokenize( unquoted, true )) &&
+				( excess = tokenize( unquoted, true ) ) &&
+
 				// advance to the next closing parenthesis
-				(excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length) ) {
+				( excess = unquoted.indexOf( ")", unquoted.length - excess ) - unquoted.length ) ) {
 
 				// excess is a negative index
-				match[0] = match[0].slice( 0, excess );
-				match[2] = unquoted.slice( 0, excess );
+				match[ 0 ] = match[ 0 ].slice( 0, excess );
+				match[ 2 ] = unquoted.slice( 0, excess );
 			}
 
 			// Return only captures needed by the pseudo filter method (type and argument)
@@ -1710,7 +1857,9 @@ Expr = Sizzle.selectors = {
 		"TAG": function( nodeNameSelector ) {
 			var nodeName = nodeNameSelector.replace( runescape, funescape ).toLowerCase();
 			return nodeNameSelector === "*" ?
-				function() { return true; } :
+				function() {
+					return true;
+				} :
 				function( elem ) {
 					return elem.nodeName && elem.nodeName.toLowerCase() === nodeName;
 				};
@@ -1720,10 +1869,16 @@ Expr = Sizzle.selectors = {
 			var pattern = classCache[ className + " " ];
 
 			return pattern ||
-				(pattern = new RegExp( "(^|" + whitespace + ")" + className + "(" + whitespace + "|$)" )) &&
-				classCache( className, function( elem ) {
-					return pattern.test( typeof elem.className === "string" && elem.className || typeof elem.getAttribute !== "undefined" && elem.getAttribute("class") || "" );
-				});
+				( pattern = new RegExp( "(^|" + whitespace +
+					")" + className + "(" + whitespace + "|$)" ) ) && classCache(
+						className, function( elem ) {
+							return pattern.test(
+								typeof elem.className === "string" && elem.className ||
+								typeof elem.getAttribute !== "undefined" &&
+									elem.getAttribute( "class" ) ||
+								""
+							);
+				} );
 		},
 
 		"ATTR": function( name, operator, check ) {
@@ -1739,6 +1894,8 @@ Expr = Sizzle.selectors = {
 
 				result += "";
 
+				/* eslint-disable max-len */
+
 				return operator === "=" ? result === check :
 					operator === "!=" ? result !== check :
 					operator === "^=" ? check && result.indexOf( check ) === 0 :
@@ -1747,10 +1904,12 @@ Expr = Sizzle.selectors = {
 					operator === "~=" ? ( " " + result.replace( rwhitespace, " " ) + " " ).indexOf( check ) > -1 :
 					operator === "|=" ? result === check || result.slice( 0, check.length + 1 ) === check + "-" :
 					false;
+				/* eslint-enable max-len */
+
 			};
 		},
 
-		"CHILD": function( type, what, argument, first, last ) {
+		"CHILD": function( type, what, _argument, first, last ) {
 			var simple = type.slice( 0, 3 ) !== "nth",
 				forward = type.slice( -4 ) !== "last",
 				ofType = what === "of-type";
@@ -1762,7 +1921,7 @@ Expr = Sizzle.selectors = {
 					return !!elem.parentNode;
 				} :
 
-				function( elem, context, xml ) {
+				function( elem, _context, xml ) {
 					var cache, uniqueCache, outerCache, node, nodeIndex, start,
 						dir = simple !== forward ? "nextSibling" : "previousSibling",
 						parent = elem.parentNode,
@@ -1776,7 +1935,7 @@ Expr = Sizzle.selectors = {
 						if ( simple ) {
 							while ( dir ) {
 								node = elem;
-								while ( (node = node[ dir ]) ) {
+								while ( ( node = node[ dir ] ) ) {
 									if ( ofType ?
 										node.nodeName.toLowerCase() === name :
 										node.nodeType === 1 ) {
@@ -1784,6 +1943,7 @@ Expr = Sizzle.selectors = {
 										return false;
 									}
 								}
+
 								// Reverse direction for :only-* (if we haven't yet done so)
 								start = dir = type === "only" && !start && "nextSibling";
 							}
@@ -1799,22 +1959,22 @@ Expr = Sizzle.selectors = {
 
 							// ...in a gzip-friendly way
 							node = parent;
-							outerCache = node[ expando ] || (node[ expando ] = {});
+							outerCache = node[ expando ] || ( node[ expando ] = {} );
 
 							// Support: IE <9 only
 							// Defend against cloned attroperties (jQuery gh-1709)
 							uniqueCache = outerCache[ node.uniqueID ] ||
-								(outerCache[ node.uniqueID ] = {});
+								( outerCache[ node.uniqueID ] = {} );
 
 							cache = uniqueCache[ type ] || [];
 							nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
 							diff = nodeIndex && cache[ 2 ];
 							node = nodeIndex && parent.childNodes[ nodeIndex ];
 
-							while ( (node = ++nodeIndex && node && node[ dir ] ||
+							while ( ( node = ++nodeIndex && node && node[ dir ] ||
 
 								// Fallback to seeking `elem` from the start
-								(diff = nodeIndex = 0) || start.pop()) ) {
+								( diff = nodeIndex = 0 ) || start.pop() ) ) {
 
 								// When found, cache indexes on `parent` and break
 								if ( node.nodeType === 1 && ++diff && node === elem ) {
@@ -1824,16 +1984,18 @@ Expr = Sizzle.selectors = {
 							}
 
 						} else {
+
 							// Use previously-cached element index if available
 							if ( useCache ) {
+
 								// ...in a gzip-friendly way
 								node = elem;
-								outerCache = node[ expando ] || (node[ expando ] = {});
+								outerCache = node[ expando ] || ( node[ expando ] = {} );
 
 								// Support: IE <9 only
 								// Defend against cloned attroperties (jQuery gh-1709)
 								uniqueCache = outerCache[ node.uniqueID ] ||
-									(outerCache[ node.uniqueID ] = {});
+									( outerCache[ node.uniqueID ] = {} );
 
 								cache = uniqueCache[ type ] || [];
 								nodeIndex = cache[ 0 ] === dirruns && cache[ 1 ];
@@ -1843,9 +2005,10 @@ Expr = Sizzle.selectors = {
 							// xml :nth-child(...)
 							// or :nth-last-child(...) or :nth(-last)?-of-type(...)
 							if ( diff === false ) {
+
 								// Use the same loop as above to seek `elem` from the start
-								while ( (node = ++nodeIndex && node && node[ dir ] ||
-									(diff = nodeIndex = 0) || start.pop()) ) {
+								while ( ( node = ++nodeIndex && node && node[ dir ] ||
+									( diff = nodeIndex = 0 ) || start.pop() ) ) {
 
 									if ( ( ofType ?
 										node.nodeName.toLowerCase() === name :
@@ -1854,12 +2017,13 @@ Expr = Sizzle.selectors = {
 
 										// Cache the index of each encountered element
 										if ( useCache ) {
-											outerCache = node[ expando ] || (node[ expando ] = {});
+											outerCache = node[ expando ] ||
+												( node[ expando ] = {} );
 
 											// Support: IE <9 only
 											// Defend against cloned attroperties (jQuery gh-1709)
 											uniqueCache = outerCache[ node.uniqueID ] ||
-												(outerCache[ node.uniqueID ] = {});
+												( outerCache[ node.uniqueID ] = {} );
 
 											uniqueCache[ type ] = [ dirruns, diff ];
 										}
@@ -1880,6 +2044,7 @@ Expr = Sizzle.selectors = {
 		},
 
 		"PSEUDO": function( pseudo, argument ) {
+
 			// pseudo-class names are case-insensitive
 			// http://www.w3.org/TR/selectors/#pseudo-classes
 			// Prioritize by case sensitivity in case custom pseudos are added with uppercase letters
@@ -1899,15 +2064,15 @@ Expr = Sizzle.selectors = {
 			if ( fn.length > 1 ) {
 				args = [ pseudo, pseudo, "", argument ];
 				return Expr.setFilters.hasOwnProperty( pseudo.toLowerCase() ) ?
-					markFunction(function( seed, matches ) {
+					markFunction( function( seed, matches ) {
 						var idx,
 							matched = fn( seed, argument ),
 							i = matched.length;
 						while ( i-- ) {
-							idx = indexOf( seed, matched[i] );
-							seed[ idx ] = !( matches[ idx ] = matched[i] );
+							idx = indexOf( seed, matched[ i ] );
+							seed[ idx ] = !( matches[ idx ] = matched[ i ] );
 						}
-					}) :
+					} ) :
 					function( elem ) {
 						return fn( elem, 0, args );
 					};
@@ -1918,8 +2083,10 @@ Expr = Sizzle.selectors = {
 	},
 
 	pseudos: {
+
 		// Potentially complex pseudos
-		"not": markFunction(function( selector ) {
+		"not": markFunction( function( selector ) {
+
 			// Trim the selector passed to compile
 			// to avoid treating leading and trailing
 			// spaces as combinators
@@ -1928,39 +2095,40 @@ Expr = Sizzle.selectors = {
 				matcher = compile( selector.replace( rtrim, "$1" ) );
 
 			return matcher[ expando ] ?
-				markFunction(function( seed, matches, context, xml ) {
+				markFunction( function( seed, matches, _context, xml ) {
 					var elem,
 						unmatched = matcher( seed, null, xml, [] ),
 						i = seed.length;
 
 					// Match elements unmatched by `matcher`
 					while ( i-- ) {
-						if ( (elem = unmatched[i]) ) {
-							seed[i] = !(matches[i] = elem);
+						if ( ( elem = unmatched[ i ] ) ) {
+							seed[ i ] = !( matches[ i ] = elem );
 						}
 					}
-				}) :
-				function( elem, context, xml ) {
-					input[0] = elem;
+				} ) :
+				function( elem, _context, xml ) {
+					input[ 0 ] = elem;
 					matcher( input, null, xml, results );
+
 					// Don't keep the element (issue #299)
-					input[0] = null;
+					input[ 0 ] = null;
 					return !results.pop();
 				};
-		}),
+		} ),
 
-		"has": markFunction(function( selector ) {
+		"has": markFunction( function( selector ) {
 			return function( elem ) {
 				return Sizzle( selector, elem ).length > 0;
 			};
-		}),
+		} ),
 
-		"contains": markFunction(function( text ) {
+		"contains": markFunction( function( text ) {
 			text = text.replace( runescape, funescape );
 			return function( elem ) {
-				return ( elem.textContent || elem.innerText || getText( elem ) ).indexOf( text ) > -1;
+				return ( elem.textContent || getText( elem ) ).indexOf( text ) > -1;
 			};
-		}),
+		} ),
 
 		// "Whether an element is represented by a :lang() selector
 		// is based solely on the element's language value
@@ -1970,25 +2138,26 @@ Expr = Sizzle.selectors = {
 		// The identifier C does not have to be a valid language name."
 		// http://www.w3.org/TR/selectors/#lang-pseudo
 		"lang": markFunction( function( lang ) {
+
 			// lang value must be a valid identifier
-			if ( !ridentifier.test(lang || "") ) {
+			if ( !ridentifier.test( lang || "" ) ) {
 				Sizzle.error( "unsupported lang: " + lang );
 			}
 			lang = lang.replace( runescape, funescape ).toLowerCase();
 			return function( elem ) {
 				var elemLang;
 				do {
-					if ( (elemLang = documentIsHTML ?
+					if ( ( elemLang = documentIsHTML ?
 						elem.lang :
-						elem.getAttribute("xml:lang") || elem.getAttribute("lang")) ) {
+						elem.getAttribute( "xml:lang" ) || elem.getAttribute( "lang" ) ) ) {
 
 						elemLang = elemLang.toLowerCase();
 						return elemLang === lang || elemLang.indexOf( lang + "-" ) === 0;
 					}
-				} while ( (elem = elem.parentNode) && elem.nodeType === 1 );
+				} while ( ( elem = elem.parentNode ) && elem.nodeType === 1 );
 				return false;
 			};
-		}),
+		} ),
 
 		// Miscellaneous
 		"target": function( elem ) {
@@ -2001,7 +2170,9 @@ Expr = Sizzle.selectors = {
 		},
 
 		"focus": function( elem ) {
-			return elem === document.activeElement && (!document.hasFocus || document.hasFocus()) && !!(elem.type || elem.href || ~elem.tabIndex);
+			return elem === document.activeElement &&
+				( !document.hasFocus || document.hasFocus() ) &&
+				!!( elem.type || elem.href || ~elem.tabIndex );
 		},
 
 		// Boolean properties
@@ -2009,16 +2180,20 @@ Expr = Sizzle.selectors = {
 		"disabled": createDisabledPseudo( true ),
 
 		"checked": function( elem ) {
+
 			// In CSS3, :checked should return both checked and selected elements
 			// http://www.w3.org/TR/2011/REC-css3-selectors-20110929/#checked
 			var nodeName = elem.nodeName.toLowerCase();
-			return (nodeName === "input" && !!elem.checked) || (nodeName === "option" && !!elem.selected);
+			return ( nodeName === "input" && !!elem.checked ) ||
+				( nodeName === "option" && !!elem.selected );
 		},
 
 		"selected": function( elem ) {
+
 			// Accessing this property makes selected-by-default
 			// options in Safari work properly
 			if ( elem.parentNode ) {
+				// eslint-disable-next-line no-unused-expressions
 				elem.parentNode.selectedIndex;
 			}
 
@@ -2027,6 +2202,7 @@ Expr = Sizzle.selectors = {
 
 		// Contents
 		"empty": function( elem ) {
+
 			// http://www.w3.org/TR/selectors/#empty-pseudo
 			// :empty is negated by element (1) or content nodes (text: 3; cdata: 4; entity ref: 5),
 			//   but not by others (comment: 8; processing instruction: 7; etc.)
@@ -2040,7 +2216,7 @@ Expr = Sizzle.selectors = {
 		},
 
 		"parent": function( elem ) {
-			return !Expr.pseudos["empty"]( elem );
+			return !Expr.pseudos[ "empty" ]( elem );
 		},
 
 		// Element/input types
@@ -2064,57 +2240,62 @@ Expr = Sizzle.selectors = {
 
 				// Support: IE<8
 				// New HTML5 attribute values (e.g., "search") appear with elem.type === "text"
-				( (attr = elem.getAttribute("type")) == null || attr.toLowerCase() === "text" );
+				( ( attr = elem.getAttribute( "type" ) ) == null ||
+					attr.toLowerCase() === "text" );
 		},
 
 		// Position-in-collection
-		"first": createPositionalPseudo(function() {
+		"first": createPositionalPseudo( function() {
 			return [ 0 ];
-		}),
+		} ),
 
-		"last": createPositionalPseudo(function( matchIndexes, length ) {
+		"last": createPositionalPseudo( function( _matchIndexes, length ) {
 			return [ length - 1 ];
-		}),
+		} ),
 
-		"eq": createPositionalPseudo(function( matchIndexes, length, argument ) {
+		"eq": createPositionalPseudo( function( _matchIndexes, length, argument ) {
 			return [ argument < 0 ? argument + length : argument ];
-		}),
+		} ),
 
-		"even": createPositionalPseudo(function( matchIndexes, length ) {
+		"even": createPositionalPseudo( function( matchIndexes, length ) {
 			var i = 0;
 			for ( ; i < length; i += 2 ) {
 				matchIndexes.push( i );
 			}
 			return matchIndexes;
-		}),
+		} ),
 
-		"odd": createPositionalPseudo(function( matchIndexes, length ) {
+		"odd": createPositionalPseudo( function( matchIndexes, length ) {
 			var i = 1;
 			for ( ; i < length; i += 2 ) {
 				matchIndexes.push( i );
 			}
 			return matchIndexes;
-		}),
+		} ),
 
-		"lt": createPositionalPseudo(function( matchIndexes, length, argument ) {
-			var i = argument < 0 ? argument + length : argument;
+		"lt": createPositionalPseudo( function( matchIndexes, length, argument ) {
+			var i = argument < 0 ?
+				argument + length :
+				argument > length ?
+					length :
+					argument;
 			for ( ; --i >= 0; ) {
 				matchIndexes.push( i );
 			}
 			return matchIndexes;
-		}),
+		} ),
 
-		"gt": createPositionalPseudo(function( matchIndexes, length, argument ) {
+		"gt": createPositionalPseudo( function( matchIndexes, length, argument ) {
 			var i = argument < 0 ? argument + length : argument;
 			for ( ; ++i < length; ) {
 				matchIndexes.push( i );
 			}
 			return matchIndexes;
-		})
+		} )
 	}
 };
 
-Expr.pseudos["nth"] = Expr.pseudos["eq"];
+Expr.pseudos[ "nth" ] = Expr.pseudos[ "eq" ];
 
 // Add button/input type pseudos
 for ( i in { radio: true, checkbox: true, file: true, password: true, image: true } ) {
@@ -2145,37 +2326,39 @@ tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
 	while ( soFar ) {
 
 		// Comma and first run
-		if ( !matched || (match = rcomma.exec( soFar )) ) {
+		if ( !matched || ( match = rcomma.exec( soFar ) ) ) {
 			if ( match ) {
+
 				// Don't consume trailing commas as valid
-				soFar = soFar.slice( match[0].length ) || soFar;
+				soFar = soFar.slice( match[ 0 ].length ) || soFar;
 			}
-			groups.push( (tokens = []) );
+			groups.push( ( tokens = [] ) );
 		}
 
 		matched = false;
 
 		// Combinators
-		if ( (match = rcombinators.exec( soFar )) ) {
+		if ( ( match = rcombinators.exec( soFar ) ) ) {
 			matched = match.shift();
-			tokens.push({
+			tokens.push( {
 				value: matched,
+
 				// Cast descendant combinators to space
-				type: match[0].replace( rtrim, " " )
-			});
+				type: match[ 0 ].replace( rtrim, " " )
+			} );
 			soFar = soFar.slice( matched.length );
 		}
 
 		// Filters
 		for ( type in Expr.filter ) {
-			if ( (match = matchExpr[ type ].exec( soFar )) && (!preFilters[ type ] ||
-				(match = preFilters[ type ]( match ))) ) {
+			if ( ( match = matchExpr[ type ].exec( soFar ) ) && ( !preFilters[ type ] ||
+				( match = preFilters[ type ]( match ) ) ) ) {
 				matched = match.shift();
-				tokens.push({
+				tokens.push( {
 					value: matched,
 					type: type,
 					matches: match
-				});
+				} );
 				soFar = soFar.slice( matched.length );
 			}
 		}
@@ -2192,6 +2375,7 @@ tokenize = Sizzle.tokenize = function( selector, parseOnly ) {
 		soFar.length :
 		soFar ?
 			Sizzle.error( selector ) :
+
 			// Cache the tokens
 			tokenCache( selector, groups ).slice( 0 );
 };
@@ -2201,7 +2385,7 @@ function toSelector( tokens ) {
 		len = tokens.length,
 		selector = "";
 	for ( ; i < len; i++ ) {
-		selector += tokens[i].value;
+		selector += tokens[ i ].value;
 	}
 	return selector;
 }
@@ -2214,9 +2398,10 @@ function addCombinator( matcher, combinator, base ) {
 		doneName = done++;
 
 	return combinator.first ?
+
 		// Check against closest ancestor/preceding element
 		function( elem, context, xml ) {
-			while ( (elem = elem[ dir ]) ) {
+			while ( ( elem = elem[ dir ] ) ) {
 				if ( elem.nodeType === 1 || checkNonElements ) {
 					return matcher( elem, context, xml );
 				}
@@ -2231,7 +2416,7 @@ function addCombinator( matcher, combinator, base ) {
 
 			// We can't set arbitrary data on XML nodes, so they don't benefit from combinator caching
 			if ( xml ) {
-				while ( (elem = elem[ dir ]) ) {
+				while ( ( elem = elem[ dir ] ) ) {
 					if ( elem.nodeType === 1 || checkNonElements ) {
 						if ( matcher( elem, context, xml ) ) {
 							return true;
@@ -2239,27 +2424,29 @@ function addCombinator( matcher, combinator, base ) {
 					}
 				}
 			} else {
-				while ( (elem = elem[ dir ]) ) {
+				while ( ( elem = elem[ dir ] ) ) {
 					if ( elem.nodeType === 1 || checkNonElements ) {
-						outerCache = elem[ expando ] || (elem[ expando ] = {});
+						outerCache = elem[ expando ] || ( elem[ expando ] = {} );
 
 						// Support: IE <9 only
 						// Defend against cloned attroperties (jQuery gh-1709)
-						uniqueCache = outerCache[ elem.uniqueID ] || (outerCache[ elem.uniqueID ] = {});
+						uniqueCache = outerCache[ elem.uniqueID ] ||
+							( outerCache[ elem.uniqueID ] = {} );
 
 						if ( skip && skip === elem.nodeName.toLowerCase() ) {
 							elem = elem[ dir ] || elem;
-						} else if ( (oldCache = uniqueCache[ key ]) &&
+						} else if ( ( oldCache = uniqueCache[ key ] ) &&
 							oldCache[ 0 ] === dirruns && oldCache[ 1 ] === doneName ) {
 
 							// Assign to newCache so results back-propagate to previous elements
-							return (newCache[ 2 ] = oldCache[ 2 ]);
+							return ( newCache[ 2 ] = oldCache[ 2 ] );
 						} else {
+
 							// Reuse newcache so results back-propagate to previous elements
 							uniqueCache[ key ] = newCache;
 
 							// A match means we're done; a fail means we have to keep checking
-							if ( (newCache[ 2 ] = matcher( elem, context, xml )) ) {
+							if ( ( newCache[ 2 ] = matcher( elem, context, xml ) ) ) {
 								return true;
 							}
 						}
@@ -2275,20 +2462,20 @@ function elementMatcher( matchers ) {
 		function( elem, context, xml ) {
 			var i = matchers.length;
 			while ( i-- ) {
-				if ( !matchers[i]( elem, context, xml ) ) {
+				if ( !matchers[ i ]( elem, context, xml ) ) {
 					return false;
 				}
 			}
 			return true;
 		} :
-		matchers[0];
+		matchers[ 0 ];
 }
 
 function multipleContexts( selector, contexts, results ) {
 	var i = 0,
 		len = contexts.length;
 	for ( ; i < len; i++ ) {
-		Sizzle( selector, contexts[i], results );
+		Sizzle( selector, contexts[ i ], results );
 	}
 	return results;
 }
@@ -2301,7 +2488,7 @@ function condense( unmatched, map, filter, context, xml ) {
 		mapped = map != null;
 
 	for ( ; i < len; i++ ) {
-		if ( (elem = unmatched[i]) ) {
+		if ( ( elem = unmatched[ i ] ) ) {
 			if ( !filter || filter( elem, context, xml ) ) {
 				newUnmatched.push( elem );
 				if ( mapped ) {
@@ -2321,14 +2508,18 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 	if ( postFinder && !postFinder[ expando ] ) {
 		postFinder = setMatcher( postFinder, postSelector );
 	}
-	return markFunction(function( seed, results, context, xml ) {
+	return markFunction( function( seed, results, context, xml ) {
 		var temp, i, elem,
 			preMap = [],
 			postMap = [],
 			preexisting = results.length,
 
 			// Get initial elements from seed or context
-			elems = seed || multipleContexts( selector || "*", context.nodeType ? [ context ] : context, [] ),
+			elems = seed || multipleContexts(
+				selector || "*",
+				context.nodeType ? [ context ] : context,
+				[]
+			),
 
 			// Prefilter to get matcher input, preserving a map for seed-results synchronization
 			matcherIn = preFilter && ( seed || !selector ) ?
@@ -2336,6 +2527,7 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 				elems,
 
 			matcherOut = matcher ?
+
 				// If we have a postFinder, or filtered seed, or non-seed postFilter or preexisting results,
 				postFinder || ( seed ? preFilter : preexisting || postFilter ) ?
 
@@ -2359,8 +2551,8 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 			// Un-match failing elements by moving them back to matcherIn
 			i = temp.length;
 			while ( i-- ) {
-				if ( (elem = temp[i]) ) {
-					matcherOut[ postMap[i] ] = !(matcherIn[ postMap[i] ] = elem);
+				if ( ( elem = temp[ i ] ) ) {
+					matcherOut[ postMap[ i ] ] = !( matcherIn[ postMap[ i ] ] = elem );
 				}
 			}
 		}
@@ -2368,25 +2560,27 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 		if ( seed ) {
 			if ( postFinder || preFilter ) {
 				if ( postFinder ) {
+
 					// Get the final matcherOut by condensing this intermediate into postFinder contexts
 					temp = [];
 					i = matcherOut.length;
 					while ( i-- ) {
-						if ( (elem = matcherOut[i]) ) {
+						if ( ( elem = matcherOut[ i ] ) ) {
+
 							// Restore matcherIn since elem is not yet a final match
-							temp.push( (matcherIn[i] = elem) );
+							temp.push( ( matcherIn[ i ] = elem ) );
 						}
 					}
-					postFinder( null, (matcherOut = []), temp, xml );
+					postFinder( null, ( matcherOut = [] ), temp, xml );
 				}
 
 				// Move matched elements from seed to results to keep them synchronized
 				i = matcherOut.length;
 				while ( i-- ) {
-					if ( (elem = matcherOut[i]) &&
-						(temp = postFinder ? indexOf( seed, elem ) : preMap[i]) > -1 ) {
+					if ( ( elem = matcherOut[ i ] ) &&
+						( temp = postFinder ? indexOf( seed, elem ) : preMap[ i ] ) > -1 ) {
 
-						seed[temp] = !(results[temp] = elem);
+						seed[ temp ] = !( results[ temp ] = elem );
 					}
 				}
 			}
@@ -2404,14 +2598,14 @@ function setMatcher( preFilter, selector, matcher, postFilter, postFinder, postS
 				push.apply( results, matcherOut );
 			}
 		}
-	});
+	} );
 }
 
 function matcherFromTokens( tokens ) {
 	var checkContext, matcher, j,
 		len = tokens.length,
-		leadingRelative = Expr.relative[ tokens[0].type ],
-		implicitRelative = leadingRelative || Expr.relative[" "],
+		leadingRelative = Expr.relative[ tokens[ 0 ].type ],
+		implicitRelative = leadingRelative || Expr.relative[ " " ],
 		i = leadingRelative ? 1 : 0,
 
 		// The foundational matcher ensures that elements are reachable from top-level context(s)
@@ -2423,38 +2617,43 @@ function matcherFromTokens( tokens ) {
 		}, implicitRelative, true ),
 		matchers = [ function( elem, context, xml ) {
 			var ret = ( !leadingRelative && ( xml || context !== outermostContext ) ) || (
-				(checkContext = context).nodeType ?
+				( checkContext = context ).nodeType ?
 					matchContext( elem, context, xml ) :
 					matchAnyContext( elem, context, xml ) );
+
 			// Avoid hanging onto element (issue #299)
 			checkContext = null;
 			return ret;
 		} ];
 
 	for ( ; i < len; i++ ) {
-		if ( (matcher = Expr.relative[ tokens[i].type ]) ) {
-			matchers = [ addCombinator(elementMatcher( matchers ), matcher) ];
+		if ( ( matcher = Expr.relative[ tokens[ i ].type ] ) ) {
+			matchers = [ addCombinator( elementMatcher( matchers ), matcher ) ];
 		} else {
-			matcher = Expr.filter[ tokens[i].type ].apply( null, tokens[i].matches );
+			matcher = Expr.filter[ tokens[ i ].type ].apply( null, tokens[ i ].matches );
 
 			// Return special upon seeing a positional matcher
 			if ( matcher[ expando ] ) {
+
 				// Find the next relative operator (if any) for proper handling
 				j = ++i;
 				for ( ; j < len; j++ ) {
-					if ( Expr.relative[ tokens[j].type ] ) {
+					if ( Expr.relative[ tokens[ j ].type ] ) {
 						break;
 					}
 				}
 				return setMatcher(
 					i > 1 && elementMatcher( matchers ),
 					i > 1 && toSelector(
-						// If the preceding token was a descendant combinator, insert an implicit any-element `*`
-						tokens.slice( 0, i - 1 ).concat({ value: tokens[ i - 2 ].type === " " ? "*" : "" })
+
+					// If the preceding token was a descendant combinator, insert an implicit any-element `*`
+					tokens
+						.slice( 0, i - 1 )
+						.concat( { value: tokens[ i - 2 ].type === " " ? "*" : "" } )
 					).replace( rtrim, "$1" ),
 					matcher,
 					i < j && matcherFromTokens( tokens.slice( i, j ) ),
-					j < len && matcherFromTokens( (tokens = tokens.slice( j )) ),
+					j < len && matcherFromTokens( ( tokens = tokens.slice( j ) ) ),
 					j < len && toSelector( tokens )
 				);
 			}
@@ -2475,28 +2674,40 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
 				unmatched = seed && [],
 				setMatched = [],
 				contextBackup = outermostContext,
+
 				// We must always have either seed elements or outermost context
-				elems = seed || byElement && Expr.find["TAG"]( "*", outermost ),
+				elems = seed || byElement && Expr.find[ "TAG" ]( "*", outermost ),
+
 				// Use integer dirruns iff this is the outermost matcher
-				dirrunsUnique = (dirruns += contextBackup == null ? 1 : Math.random() || 0.1),
+				dirrunsUnique = ( dirruns += contextBackup == null ? 1 : Math.random() || 0.1 ),
 				len = elems.length;
 
 			if ( outermost ) {
-				outermostContext = context === document || context || outermost;
+
+				// Support: IE 11+, Edge 17 - 18+
+				// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+				// two documents; shallow comparisons work.
+				// eslint-disable-next-line eqeqeq
+				outermostContext = context == document || context || outermost;
 			}
 
 			// Add elements passing elementMatchers directly to results
 			// Support: IE<9, Safari
 			// Tolerate NodeList properties (IE: "length"; Safari: <number>) matching elements by id
-			for ( ; i !== len && (elem = elems[i]) != null; i++ ) {
+			for ( ; i !== len && ( elem = elems[ i ] ) != null; i++ ) {
 				if ( byElement && elem ) {
 					j = 0;
-					if ( !context && elem.ownerDocument !== document ) {
+
+					// Support: IE 11+, Edge 17 - 18+
+					// IE/Edge sometimes throw a "Permission denied" error when strict-comparing
+					// two documents; shallow comparisons work.
+					// eslint-disable-next-line eqeqeq
+					if ( !context && elem.ownerDocument != document ) {
 						setDocument( elem );
 						xml = !documentIsHTML;
 					}
-					while ( (matcher = elementMatchers[j++]) ) {
-						if ( matcher( elem, context || document, xml) ) {
+					while ( ( matcher = elementMatchers[ j++ ] ) ) {
+						if ( matcher( elem, context || document, xml ) ) {
 							results.push( elem );
 							break;
 						}
@@ -2508,8 +2719,9 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
 
 				// Track unmatched elements for set filters
 				if ( bySet ) {
+
 					// They will have gone through all possible matchers
-					if ( (elem = !matcher && elem) ) {
+					if ( ( elem = !matcher && elem ) ) {
 						matchedCount--;
 					}
 
@@ -2533,16 +2745,17 @@ function matcherFromGroupMatchers( elementMatchers, setMatchers ) {
 			// numerically zero.
 			if ( bySet && i !== matchedCount ) {
 				j = 0;
-				while ( (matcher = setMatchers[j++]) ) {
+				while ( ( matcher = setMatchers[ j++ ] ) ) {
 					matcher( unmatched, setMatched, context, xml );
 				}
 
 				if ( seed ) {
+
 					// Reintegrate element matches to eliminate the need for sorting
 					if ( matchedCount > 0 ) {
 						while ( i-- ) {
-							if ( !(unmatched[i] || setMatched[i]) ) {
-								setMatched[i] = pop.call( results );
+							if ( !( unmatched[ i ] || setMatched[ i ] ) ) {
+								setMatched[ i ] = pop.call( results );
 							}
 						}
 					}
@@ -2583,13 +2796,14 @@ compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
 		cached = compilerCache[ selector + " " ];
 
 	if ( !cached ) {
+
 		// Generate a function of recursive functions that can be used to check each element
 		if ( !match ) {
 			match = tokenize( selector );
 		}
 		i = match.length;
 		while ( i-- ) {
-			cached = matcherFromTokens( match[i] );
+			cached = matcherFromTokens( match[ i ] );
 			if ( cached[ expando ] ) {
 				setMatchers.push( cached );
 			} else {
@@ -2598,7 +2812,10 @@ compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
 		}
 
 		// Cache the compiled function
-		cached = compilerCache( selector, matcherFromGroupMatchers( elementMatchers, setMatchers ) );
+		cached = compilerCache(
+			selector,
+			matcherFromGroupMatchers( elementMatchers, setMatchers )
+		);
 
 		// Save selector and tokenization
 		cached.selector = selector;
@@ -2618,7 +2835,7 @@ compile = Sizzle.compile = function( selector, match /* Internal Use Only */ ) {
 select = Sizzle.select = function( selector, context, results, seed ) {
 	var i, tokens, token, type, find,
 		compiled = typeof selector === "function" && selector,
-		match = !seed && tokenize( (selector = compiled.selector || selector) );
+		match = !seed && tokenize( ( selector = compiled.selector || selector ) );
 
 	results = results || [];
 
@@ -2627,11 +2844,12 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 	if ( match.length === 1 ) {
 
 		// Reduce context if the leading compound selector is an ID
-		tokens = match[0] = match[0].slice( 0 );
-		if ( tokens.length > 2 && (token = tokens[0]).type === "ID" &&
-				context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[1].type ] ) {
+		tokens = match[ 0 ] = match[ 0 ].slice( 0 );
+		if ( tokens.length > 2 && ( token = tokens[ 0 ] ).type === "ID" &&
+			context.nodeType === 9 && documentIsHTML && Expr.relative[ tokens[ 1 ].type ] ) {
 
-			context = ( Expr.find["ID"]( token.matches[0].replace(runescape, funescape), context ) || [] )[0];
+			context = ( Expr.find[ "ID" ]( token.matches[ 0 ]
+				.replace( runescape, funescape ), context ) || [] )[ 0 ];
 			if ( !context ) {
 				return results;
 
@@ -2644,20 +2862,22 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 		}
 
 		// Fetch a seed set for right-to-left matching
-		i = matchExpr["needsContext"].test( selector ) ? 0 : tokens.length;
+		i = matchExpr[ "needsContext" ].test( selector ) ? 0 : tokens.length;
 		while ( i-- ) {
-			token = tokens[i];
+			token = tokens[ i ];
 
 			// Abort if we hit a combinator
-			if ( Expr.relative[ (type = token.type) ] ) {
+			if ( Expr.relative[ ( type = token.type ) ] ) {
 				break;
 			}
-			if ( (find = Expr.find[ type ]) ) {
+			if ( ( find = Expr.find[ type ] ) ) {
+
 				// Search, expanding context for leading sibling combinators
-				if ( (seed = find(
-					token.matches[0].replace( runescape, funescape ),
-					rsibling.test( tokens[0].type ) && testContext( context.parentNode ) || context
-				)) ) {
+				if ( ( seed = find(
+					token.matches[ 0 ].replace( runescape, funescape ),
+					rsibling.test( tokens[ 0 ].type ) && testContext( context.parentNode ) ||
+						context
+				) ) ) {
 
 					// If seed is empty or no tokens remain, we can return early
 					tokens.splice( i, 1 );
@@ -2688,7 +2908,7 @@ select = Sizzle.select = function( selector, context, results, seed ) {
 // One-time assignments
 
 // Sort stability
-support.sortStable = expando.split("").sort( sortOrder ).join("") === expando;
+support.sortStable = expando.split( "" ).sort( sortOrder ).join( "" ) === expando;
 
 // Support: Chrome 14-35+
 // Always assume duplicates if they aren't passed to the comparison function
@@ -2699,58 +2919,59 @@ setDocument();
 
 // Support: Webkit<537.32 - Safari 6.0.3/Chrome 25 (fixed in Chrome 27)
 // Detached nodes confoundingly follow *each other*
-support.sortDetached = assert(function( el ) {
+support.sortDetached = assert( function( el ) {
+
 	// Should return 1, but returns 4 (following)
-	return el.compareDocumentPosition( document.createElement("fieldset") ) & 1;
-});
+	return el.compareDocumentPosition( document.createElement( "fieldset" ) ) & 1;
+} );
 
 // Support: IE<8
 // Prevent attribute/property "interpolation"
 // https://msdn.microsoft.com/en-us/library/ms536429%28VS.85%29.aspx
-if ( !assert(function( el ) {
+if ( !assert( function( el ) {
 	el.innerHTML = "<a href='#'></a>";
-	return el.firstChild.getAttribute("href") === "#" ;
-}) ) {
+	return el.firstChild.getAttribute( "href" ) === "#";
+} ) ) {
 	addHandle( "type|href|height|width", function( elem, name, isXML ) {
 		if ( !isXML ) {
 			return elem.getAttribute( name, name.toLowerCase() === "type" ? 1 : 2 );
 		}
-	});
+	} );
 }
 
 // Support: IE<9
 // Use defaultValue in place of getAttribute("value")
-if ( !support.attributes || !assert(function( el ) {
+if ( !support.attributes || !assert( function( el ) {
 	el.innerHTML = "<input/>";
 	el.firstChild.setAttribute( "value", "" );
 	return el.firstChild.getAttribute( "value" ) === "";
-}) ) {
-	addHandle( "value", function( elem, name, isXML ) {
+} ) ) {
+	addHandle( "value", function( elem, _name, isXML ) {
 		if ( !isXML && elem.nodeName.toLowerCase() === "input" ) {
 			return elem.defaultValue;
 		}
-	});
+	} );
 }
 
 // Support: IE<9
 // Use getAttributeNode to fetch booleans when getAttribute lies
-if ( !assert(function( el ) {
-	return el.getAttribute("disabled") == null;
-}) ) {
+if ( !assert( function( el ) {
+	return el.getAttribute( "disabled" ) == null;
+} ) ) {
 	addHandle( booleans, function( elem, name, isXML ) {
 		var val;
 		if ( !isXML ) {
 			return elem[ name ] === true ? name.toLowerCase() :
-					(val = elem.getAttributeNode( name )) && val.specified ?
+				( val = elem.getAttributeNode( name ) ) && val.specified ?
 					val.value :
-				null;
+					null;
 		}
-	});
+	} );
 }
 
 return Sizzle;
 
-})( window );
+} )( window );
 
 
 
@@ -3119,7 +3340,7 @@ jQuery.each( {
 	parents: function( elem ) {
 		return dir( elem, "parentNode" );
 	},
-	parentsUntil: function( elem, i, until ) {
+	parentsUntil: function( elem, _i, until ) {
 		return dir( elem, "parentNode", until );
 	},
 	next: function( elem ) {
@@ -3134,10 +3355,10 @@ jQuery.each( {
 	prevAll: function( elem ) {
 		return dir( elem, "previousSibling" );
 	},
-	nextUntil: function( elem, i, until ) {
+	nextUntil: function( elem, _i, until ) {
 		return dir( elem, "nextSibling", until );
 	},
-	prevUntil: function( elem, i, until ) {
+	prevUntil: function( elem, _i, until ) {
 		return dir( elem, "previousSibling", until );
 	},
 	siblings: function( elem ) {
@@ -3147,18 +3368,24 @@ jQuery.each( {
 		return siblings( elem.firstChild );
 	},
 	contents: function( elem ) {
-        if ( nodeName( elem, "iframe" ) ) {
-            return elem.contentDocument;
-        }
+		if ( elem.contentDocument != null &&
 
-        // Support: IE 9 - 11 only, iOS 7 only, Android Browser <=4.3 only
-        // Treat the template element as a regular one in browsers that
-        // don't support it.
-        if ( nodeName( elem, "template" ) ) {
-            elem = elem.content || elem;
-        }
+			// Support: IE 11+
+			// <object> elements with no `data` attribute has an object
+			// `contentDocument` with a `null` prototype.
+			getProto( elem.contentDocument ) ) {
 
-        return jQuery.merge( [], elem.childNodes );
+			return elem.contentDocument;
+		}
+
+		// Support: IE 9 - 11 only, iOS 7 only, Android Browser <=4.3 only
+		// Treat the template element as a regular one in browsers that
+		// don't support it.
+		if ( nodeName( elem, "template" ) ) {
+			elem = elem.content || elem;
+		}
+
+		return jQuery.merge( [], elem.childNodes );
 	}
 }, function( name, fn ) {
 	jQuery.fn[ name ] = function( until, selector ) {
@@ -3490,7 +3717,7 @@ jQuery.extend( {
 					var fns = arguments;
 
 					return jQuery.Deferred( function( newDefer ) {
-						jQuery.each( tuples, function( i, tuple ) {
+						jQuery.each( tuples, function( _i, tuple ) {
 
 							// Map tuples (progress, done, fail) to arguments (done, fail, progress)
 							var fn = isFunction( fns[ tuple[ 4 ] ] ) && fns[ tuple[ 4 ] ];
@@ -3943,7 +4170,7 @@ var access = function( elems, fn, key, value, chainable, emptyGet, raw ) {
 			// ...except when executing function values
 			} else {
 				bulk = fn;
-				fn = function( elem, key, value ) {
+				fn = function( elem, _key, value ) {
 					return bulk.call( jQuery( elem ), value );
 				};
 			}
@@ -3978,7 +4205,7 @@ var rmsPrefix = /^-ms-/,
 	rdashAlpha = /-([a-z])/g;
 
 // Used by camelCase as callback to replace()
-function fcamelCase( all, letter ) {
+function fcamelCase( _all, letter ) {
 	return letter.toUpperCase();
 }
 
@@ -4467,6 +4694,26 @@ var rcssNum = new RegExp( "^(?:([+-])=|)(" + pnum + ")([a-z%]*)$", "i" );
 
 var cssExpand = [ "Top", "Right", "Bottom", "Left" ];
 
+var documentElement = document.documentElement;
+
+
+
+	var isAttached = function( elem ) {
+			return jQuery.contains( elem.ownerDocument, elem );
+		},
+		composed = { composed: true };
+
+	// Support: IE 9 - 11+, Edge 12 - 18+, iOS 10.0 - 10.2 only
+	// Check attachment across shadow DOM boundaries when possible (gh-3504)
+	// Support: iOS 10.0-10.2 only
+	// Early iOS 10 versions support `attachShadow` but not `getRootNode`,
+	// leading to errors. We need to check for `getRootNode`.
+	if ( documentElement.getRootNode ) {
+		isAttached = function( elem ) {
+			return jQuery.contains( elem.ownerDocument, elem ) ||
+				elem.getRootNode( composed ) === elem.ownerDocument;
+		};
+	}
 var isHiddenWithinTree = function( elem, el ) {
 
 		// isHiddenWithinTree might be called from jQuery#filter function;
@@ -4481,32 +4728,11 @@ var isHiddenWithinTree = function( elem, el ) {
 			// Support: Firefox <=43 - 45
 			// Disconnected elements can have computed display: none, so first confirm that elem is
 			// in the document.
-			jQuery.contains( elem.ownerDocument, elem ) &&
+			isAttached( elem ) &&
 
 			jQuery.css( elem, "display" ) === "none";
 	};
 
-var swap = function( elem, options, callback, args ) {
-	var ret, name,
-		old = {};
-
-	// Remember the old values, and insert the new ones
-	for ( name in options ) {
-		old[ name ] = elem.style[ name ];
-		elem.style[ name ] = options[ name ];
-	}
-
-	ret = callback.apply( elem, args || [] );
-
-	// Revert the old values
-	for ( name in options ) {
-		elem.style[ name ] = old[ name ];
-	}
-
-	return ret;
-};
-
-
 
 
 function adjustCSS( elem, prop, valueParts, tween ) {
@@ -4523,7 +4749,8 @@ function adjustCSS( elem, prop, valueParts, tween ) {
 		unit = valueParts && valueParts[ 3 ] || ( jQuery.cssNumber[ prop ] ? "" : "px" ),
 
 		// Starting value computation is required for potential unit mismatches
-		initialInUnit = ( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) &&
+		initialInUnit = elem.nodeType &&
+			( jQuery.cssNumber[ prop ] || unit !== "px" && +initial ) &&
 			rcssNum.exec( jQuery.css( elem, prop ) );
 
 	if ( initialInUnit && initialInUnit[ 3 ] !== unit ) {
@@ -4670,17 +4897,46 @@ jQuery.fn.extend( {
 } );
 var rcheckableType = ( /^(?:checkbox|radio)$/i );
 
-var rtagName = ( /<([a-z][^\/\0>\x20\t\r\n\f]+)/i );
+var rtagName = ( /<([a-z][^\/\0>\x20\t\r\n\f]*)/i );
 
 var rscriptType = ( /^$|^module$|\/(?:java|ecma)script/i );
 
 
 
-// We have to close these tags to support XHTML (#13200)
-var wrapMap = {
+( function() {
+	var fragment = document.createDocumentFragment(),
+		div = fragment.appendChild( document.createElement( "div" ) ),
+		input = document.createElement( "input" );
+
+	// Support: Android 4.0 - 4.3 only
+	// Check state lost if the name is set (#11217)
+	// Support: Windows Web Apps (WWA)
+	// `name` and `type` must use .setAttribute for WWA (#14901)
+	input.setAttribute( "type", "radio" );
+	input.setAttribute( "checked", "checked" );
+	input.setAttribute( "name", "t" );
+
+	div.appendChild( input );
+
+	// Support: Android <=4.1 only
+	// Older WebKit doesn't clone checked state correctly in fragments
+	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
+
+	// Support: IE <=11 only
+	// Make sure textarea (and checkbox) defaultValue is properly cloned
+	div.innerHTML = "<textarea>x</textarea>";
+	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
 
 	// Support: IE <=9 only
-	option: [ 1, "<select multiple='multiple'>", "</select>" ],
+	// IE <=9 replaces <option> tags with their contents when inserted outside of
+	// the select element.
+	div.innerHTML = "<option></option>";
+	support.option = !!div.lastChild;
+} )();
+
+
+// We have to close these tags to support XHTML (#13200)
+var wrapMap = {
 
 	// XHTML parsers do not magically insert elements in the
 	// same way that tag soup parsers do. So we cannot shorten
@@ -4693,12 +4949,14 @@ var wrapMap = {
 	_default: [ 0, "", "" ]
 };
 
-// Support: IE <=9 only
-wrapMap.optgroup = wrapMap.option;
-
 wrapMap.tbody = wrapMap.tfoot = wrapMap.colgroup = wrapMap.caption = wrapMap.thead;
 wrapMap.th = wrapMap.td;
 
+// Support: IE <=9 only
+if ( !support.option ) {
+	wrapMap.optgroup = wrapMap.option = [ 1, "<select multiple='multiple'>", "</select>" ];
+}
+
 
 function getAll( context, tag ) {
 
@@ -4742,7 +5000,7 @@ function setGlobalEval( elems, refElements ) {
 var rhtml = /<|&#?\w+;/;
 
 function buildFragment( elems, context, scripts, selection, ignored ) {
-	var elem, tmp, tag, wrap, contains, j,
+	var elem, tmp, tag, wrap, attached, j,
 		fragment = context.createDocumentFragment(),
 		nodes = [],
 		i = 0,
@@ -4806,13 +5064,13 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
 			continue;
 		}
 
-		contains = jQuery.contains( elem.ownerDocument, elem );
+		attached = isAttached( elem );
 
 		// Append to fragment
 		tmp = getAll( fragment.appendChild( elem ), "script" );
 
 		// Preserve script evaluation history
-		if ( contains ) {
+		if ( attached ) {
 			setGlobalEval( tmp );
 		}
 
@@ -4831,34 +5089,6 @@ function buildFragment( elems, context, scripts, selection, ignored ) {
 }
 
 
-( function() {
-	var fragment = document.createDocumentFragment(),
-		div = fragment.appendChild( document.createElement( "div" ) ),
-		input = document.createElement( "input" );
-
-	// Support: Android 4.0 - 4.3 only
-	// Check state lost if the name is set (#11217)
-	// Support: Windows Web Apps (WWA)
-	// `name` and `type` must use .setAttribute for WWA (#14901)
-	input.setAttribute( "type", "radio" );
-	input.setAttribute( "checked", "checked" );
-	input.setAttribute( "name", "t" );
-
-	div.appendChild( input );
-
-	// Support: Android <=4.1 only
-	// Older WebKit doesn't clone checked state correctly in fragments
-	support.checkClone = div.cloneNode( true ).cloneNode( true ).lastChild.checked;
-
-	// Support: IE <=11 only
-	// Make sure textarea (and checkbox) defaultValue is properly cloned
-	div.innerHTML = "<textarea>x</textarea>";
-	support.noCloneChecked = !!div.cloneNode( true ).lastChild.defaultValue;
-} )();
-var documentElement = document.documentElement;
-
-
-
 var
 	rkeyEvent = /^key/,
 	rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
@@ -4872,8 +5102,19 @@ function returnFalse() {
 	return false;
 }
 
+// Support: IE <=9 - 11+
+// focus() and blur() are asynchronous, except when they are no-op.
+// So expect focus to be synchronous when the element is already active,
+// and blur to be synchronous when the element is not already active.
+// (focus and blur are always synchronous in other supported browsers,
+// this just defines when we can count on it).
+function expectSync( elem, type ) {
+	return ( elem === safeActiveElement() ) === ( type === "focus" );
+}
+
 // Support: IE <=9 only
-// See #13393 for more info
+// Accessing document.activeElement can throw unexpectedly
+// https://bugs.jquery.com/ticket/13393
 function safeActiveElement() {
 	try {
 		return document.activeElement;
@@ -4956,8 +5197,8 @@ jQuery.event = {
 			special, handlers, type, namespaces, origType,
 			elemData = dataPriv.get( elem );
 
-		// Don't attach events to noData or text/comment nodes (but allow plain objects)
-		if ( !elemData ) {
+		// Only attach events to objects that accept data
+		if ( !acceptData( elem ) ) {
 			return;
 		}
 
@@ -4981,7 +5222,7 @@ jQuery.event = {
 
 		// Init the element's event structure and main handler, if this is the first
 		if ( !( events = elemData.events ) ) {
-			events = elemData.events = {};
+			events = elemData.events = Object.create( null );
 		}
 		if ( !( eventHandle = elemData.handle ) ) {
 			eventHandle = elemData.handle = function( e ) {
@@ -5139,12 +5380,15 @@ jQuery.event = {
 
 	dispatch: function( nativeEvent ) {
 
-		// Make a writable jQuery.Event from the native event object
-		var event = jQuery.event.fix( nativeEvent );
-
 		var i, j, ret, matched, handleObj, handlerQueue,
 			args = new Array( arguments.length ),
-			handlers = ( dataPriv.get( this, "events" ) || {} )[ event.type ] || [],
+
+			// Make a writable jQuery.Event from the native event object
+			event = jQuery.event.fix( nativeEvent ),
+
+			handlers = (
+					dataPriv.get( this, "events" ) || Object.create( null )
+				)[ event.type ] || [],
 			special = jQuery.event.special[ event.type ] || {};
 
 		// Use the fix-ed jQuery.Event rather than the (read-only) native event
@@ -5173,9 +5417,10 @@ jQuery.event = {
 			while ( ( handleObj = matched.handlers[ j++ ] ) &&
 				!event.isImmediatePropagationStopped() ) {
 
-				// Triggered event must either 1) have no namespace, or 2) have namespace(s)
-				// a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) {
+				// If the event is namespaced, then each handler is only invoked if it is
+				// specially universal or its namespaces are a superset of the event's.
+				if ( !event.rnamespace || handleObj.namespace === false ||
+					event.rnamespace.test( handleObj.namespace ) ) {
 
 					event.handleObj = handleObj;
 					event.data = handleObj.data;
@@ -5299,39 +5544,51 @@ jQuery.event = {
 			// Prevent triggered image.load events from bubbling to window.load
 			noBubble: true
 		},
-		focus: {
-
-			// Fire native event if possible so blur/focus sequence is correct
-			trigger: function() {
-				if ( this !== safeActiveElement() && this.focus ) {
-					this.focus();
-					return false;
-				}
-			},
-			delegateType: "focusin"
-		},
-		blur: {
-			trigger: function() {
-				if ( this === safeActiveElement() && this.blur ) {
-					this.blur();
-					return false;
-				}
-			},
-			delegateType: "focusout"
-		},
 		click: {
 
-			// For checkbox, fire native event so checked state will be right
-			trigger: function() {
-				if ( this.type === "checkbox" && this.click && nodeName( this, "input" ) ) {
-					this.click();
-					return false;
+			// Utilize native event to ensure correct state for checkable inputs
+			setup: function( data ) {
+
+				// For mutual compressibility with _default, replace `this` access with a local var.
+				// `|| data` is dead code meant only to preserve the variable through minification.
+				var el = this || data;
+
+				// Claim the first handler
+				if ( rcheckableType.test( el.type ) &&
+					el.click && nodeName( el, "input" ) ) {
+
+					// dataPriv.set( el, "click", ... )
+					leverageNative( el, "click", returnTrue );
 				}
+
+				// Return false to allow normal processing in the caller
+				return false;
+			},
+			trigger: function( data ) {
+
+				// For mutual compressibility with _default, replace `this` access with a local var.
+				// `|| data` is dead code meant only to preserve the variable through minification.
+				var el = this || data;
+
+				// Force setup before triggering a click
+				if ( rcheckableType.test( el.type ) &&
+					el.click && nodeName( el, "input" ) ) {
+
+					leverageNative( el, "click" );
+				}
+
+				// Return non-false to allow normal event-path propagation
+				return true;
 			},
 
-			// For cross-browser consistency, don't fire native .click() on links
+			// For cross-browser consistency, suppress native .click() on links
+			// Also prevent it if we're currently inside a leveraged native-event stack
 			_default: function( event ) {
-				return nodeName( event.target, "a" );
+				var target = event.target;
+				return rcheckableType.test( target.type ) &&
+					target.click && nodeName( target, "input" ) &&
+					dataPriv.get( target, "click" ) ||
+					nodeName( target, "a" );
 			}
 		},
 
@@ -5348,6 +5605,93 @@ jQuery.event = {
 	}
 };
 
+// Ensure the presence of an event listener that handles manually-triggered
+// synthetic events by interrupting progress until reinvoked in response to
+// *native* events that it fires directly, ensuring that state changes have
+// already occurred before other listeners are invoked.
+function leverageNative( el, type, expectSync ) {
+
+	// Missing expectSync indicates a trigger call, which must force setup through jQuery.event.add
+	if ( !expectSync ) {
+		if ( dataPriv.get( el, type ) === undefined ) {
+			jQuery.event.add( el, type, returnTrue );
+		}
+		return;
+	}
+
+	// Register the controller as a special universal handler for all event namespaces
+	dataPriv.set( el, type, false );
+	jQuery.event.add( el, type, {
+		namespace: false,
+		handler: function( event ) {
+			var notAsync, result,
+				saved = dataPriv.get( this, type );
+
+			if ( ( event.isTrigger & 1 ) && this[ type ] ) {
+
+				// Interrupt processing of the outer synthetic .trigger()ed event
+				// Saved data should be false in such cases, but might be a leftover capture object
+				// from an async native handler (gh-4350)
+				if ( !saved.length ) {
+
+					// Store arguments for use when handling the inner native event
+					// There will always be at least one argument (an event object), so this array
+					// will not be confused with a leftover capture object.
+					saved = slice.call( arguments );
+					dataPriv.set( this, type, saved );
+
+					// Trigger the native event and capture its result
+					// Support: IE <=9 - 11+
+					// focus() and blur() are asynchronous
+					notAsync = expectSync( this, type );
+					this[ type ]();
+					result = dataPriv.get( this, type );
+					if ( saved !== result || notAsync ) {
+						dataPriv.set( this, type, false );
+					} else {
+						result = {};
+					}
+					if ( saved !== result ) {
+
+						// Cancel the outer synthetic event
+						event.stopImmediatePropagation();
+						event.preventDefault();
+						return result.value;
+					}
+
+				// If this is an inner synthetic event for an event with a bubbling surrogate
+				// (focus or blur), assume that the surrogate already propagated from triggering the
+				// native event and prevent that from happening again here.
+				// This technically gets the ordering wrong w.r.t. to `.trigger()` (in which the
+				// bubbling surrogate propagates *after* the non-bubbling base), but that seems
+				// less bad than duplication.
+				} else if ( ( jQuery.event.special[ type ] || {} ).delegateType ) {
+					event.stopPropagation();
+				}
+
+			// If this is a native event triggered above, everything is now in order
+			// Fire an inner synthetic event with the original arguments
+			} else if ( saved.length ) {
+
+				// ...and capture the result
+				dataPriv.set( this, type, {
+					value: jQuery.event.trigger(
+
+						// Support: IE <=9 - 11+
+						// Extend with the prototype to reset the above stopImmediatePropagation()
+						jQuery.extend( saved[ 0 ], jQuery.Event.prototype ),
+						saved.slice( 1 ),
+						this
+					)
+				} );
+
+				// Abort handling of the native event
+				event.stopImmediatePropagation();
+			}
+		}
+	} );
+}
+
 jQuery.removeEvent = function( elem, type, handle ) {
 
 	// This "if" is needed for plain objects
@@ -5460,6 +5804,7 @@ jQuery.each( {
 	shiftKey: true,
 	view: true,
 	"char": true,
+	code: true,
 	charCode: true,
 	key: true,
 	keyCode: true,
@@ -5506,6 +5851,33 @@ jQuery.each( {
 	}
 }, jQuery.event.addProp );
 
+jQuery.each( { focus: "focusin", blur: "focusout" }, function( type, delegateType ) {
+	jQuery.event.special[ type ] = {
+
+		// Utilize native event if possible so blur/focus sequence is correct
+		setup: function() {
+
+			// Claim the first handler
+			// dataPriv.set( this, "focus", ... )
+			// dataPriv.set( this, "blur", ... )
+			leverageNative( this, type, expectSync );
+
+			// Return false to allow normal processing in the caller
+			return false;
+		},
+		trigger: function() {
+
+			// Force setup before trigger
+			leverageNative( this, type );
+
+			// Return non-false to allow normal event-path propagation
+			return true;
+		},
+
+		delegateType: delegateType
+	};
+} );
+
 // Create mouseenter/leave events using mouseover/out and event-time checks
 // so that event delegation works in jQuery.
 // Do the same for pointerenter/pointerleave and pointerover/pointerout
@@ -5591,13 +5963,6 @@ jQuery.fn.extend( {
 
 var
 
-	/* eslint-disable max-len */
-
-	// See https://github.com/eslint/eslint/issues/3229
-	rxhtmlTag = /<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,
-
-	/* eslint-enable */
-
 	// Support: IE <=10 - 11, Edge 12 - 13 only
 	// In IE/Edge using regex groups here causes severe slowdowns.
 	// See https://connect.microsoft.com/IE/feedback/details/1736512/
@@ -5634,7 +5999,7 @@ function restoreScript( elem ) {
 }
 
 function cloneCopyEvent( src, dest ) {
-	var i, l, type, pdataOld, pdataCur, udataOld, udataCur, events;
+	var i, l, type, pdataOld, udataOld, udataCur, events;
 
 	if ( dest.nodeType !== 1 ) {
 		return;
@@ -5642,13 +6007,11 @@ function cloneCopyEvent( src, dest ) {
 
 	// 1. Copy private data: events, handlers, etc.
 	if ( dataPriv.hasData( src ) ) {
-		pdataOld = dataPriv.access( src );
-		pdataCur = dataPriv.set( dest, pdataOld );
+		pdataOld = dataPriv.get( src );
 		events = pdataOld.events;
 
 		if ( events ) {
-			delete pdataCur.handle;
-			pdataCur.events = {};
+			dataPriv.remove( dest, "handle events" );
 
 			for ( type in events ) {
 				for ( i = 0, l = events[ type ].length; i < l; i++ ) {
@@ -5684,7 +6047,7 @@ function fixInput( src, dest ) {
 function domManip( collection, args, callback, ignored ) {
 
 	// Flatten any nested arrays
-	args = concat.apply( [], args );
+	args = flat( args );
 
 	var fragment, first, scripts, hasScripts, node, doc,
 		i = 0,
@@ -5756,11 +6119,13 @@ function domManip( collection, args, callback, ignored ) {
 						if ( node.src && ( node.type || "" ).toLowerCase()  !== "module" ) {
 
 							// Optional AJAX dependency, but won't run scripts if not present
-							if ( jQuery._evalUrl ) {
-								jQuery._evalUrl( node.src );
+							if ( jQuery._evalUrl && !node.noModule ) {
+								jQuery._evalUrl( node.src, {
+									nonce: node.nonce || node.getAttribute( "nonce" )
+								}, doc );
 							}
 						} else {
-							DOMEval( node.textContent.replace( rcleanScript, "" ), doc, node );
+							DOMEval( node.textContent.replace( rcleanScript, "" ), node, doc );
 						}
 					}
 				}
@@ -5782,7 +6147,7 @@ function remove( elem, selector, keepData ) {
 		}
 
 		if ( node.parentNode ) {
-			if ( keepData && jQuery.contains( node.ownerDocument, node ) ) {
+			if ( keepData && isAttached( node ) ) {
 				setGlobalEval( getAll( node, "script" ) );
 			}
 			node.parentNode.removeChild( node );
@@ -5794,13 +6159,13 @@ function remove( elem, selector, keepData ) {
 
 jQuery.extend( {
 	htmlPrefilter: function( html ) {
-		return html.replace( rxhtmlTag, "<$1></$2>" );
+		return html;
 	},
 
 	clone: function( elem, dataAndEvents, deepDataAndEvents ) {
 		var i, l, srcElements, destElements,
 			clone = elem.cloneNode( true ),
-			inPage = jQuery.contains( elem.ownerDocument, elem );
+			inPage = isAttached( elem );
 
 		// Fix IE cloning issues
 		if ( !support.noCloneChecked && ( elem.nodeType === 1 || elem.nodeType === 11 ) &&
@@ -6056,6 +6421,27 @@ var getStyles = function( elem ) {
 		return view.getComputedStyle( elem );
 	};
 
+var swap = function( elem, options, callback ) {
+	var ret, name,
+		old = {};
+
+	// Remember the old values, and insert the new ones
+	for ( name in options ) {
+		old[ name ] = elem.style[ name ];
+		elem.style[ name ] = options[ name ];
+	}
+
+	ret = callback.call( elem );
+
+	// Revert the old values
+	for ( name in options ) {
+		elem.style[ name ] = old[ name ];
+	}
+
+	return ret;
+};
+
+
 var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 
 
@@ -6096,8 +6482,10 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 
 		// Support: IE 9 only
 		// Detect overflow:scroll screwiness (gh-3699)
+		// Support: Chrome <=64
+		// Don't get tricked when zoom affects offsetWidth (gh-4029)
 		div.style.position = "absolute";
-		scrollboxSizeVal = div.offsetWidth === 36 || "absolute";
+		scrollboxSizeVal = roundPixelMeasures( div.offsetWidth / 3 ) === 12;
 
 		documentElement.removeChild( container );
 
@@ -6111,7 +6499,7 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 	}
 
 	var pixelPositionVal, boxSizingReliableVal, scrollboxSizeVal, pixelBoxStylesVal,
-		reliableMarginLeftVal,
+		reliableTrDimensionsVal, reliableMarginLeftVal,
 		container = document.createElement( "div" ),
 		div = document.createElement( "div" );
 
@@ -6146,6 +6534,35 @@ var rboxStyle = new RegExp( cssExpand.join( "|" ), "i" );
 		scrollboxSize: function() {
 			computeStyleTests();
 			return scrollboxSizeVal;
+		},
+
+		// Support: IE 9 - 11+, Edge 15 - 18+
+		// IE/Edge misreport `getComputedStyle` of table rows with width/height
+		// set in CSS while `offset*` properties report correct values.
+		// Behavior in IE 9 is more subtle than in newer versions & it passes
+		// some versions of this test; make sure not to make it pass there!
+		reliableTrDimensions: function() {
+			var table, tr, trChild, trStyle;
+			if ( reliableTrDimensionsVal == null ) {
+				table = document.createElement( "table" );
+				tr = document.createElement( "tr" );
+				trChild = document.createElement( "div" );
+
+				table.style.cssText = "position:absolute;left:-11111px";
+				tr.style.height = "1px";
+				trChild.style.height = "9px";
+
+				documentElement
+					.appendChild( table )
+					.appendChild( tr )
+					.appendChild( trChild );
+
+				trStyle = window.getComputedStyle( tr );
+				reliableTrDimensionsVal = parseInt( trStyle.height ) > 3;
+
+				documentElement.removeChild( table );
+			}
+			return reliableTrDimensionsVal;
 		}
 	} );
 } )();
@@ -6168,7 +6585,7 @@ function curCSS( elem, name, computed ) {
 	if ( computed ) {
 		ret = computed.getPropertyValue( name ) || computed[ name ];
 
-		if ( ret === "" && !jQuery.contains( elem.ownerDocument, elem ) ) {
+		if ( ret === "" && !isAttached( elem ) ) {
 			ret = jQuery.style( elem, name );
 		}
 
@@ -6224,30 +6641,13 @@ function addGetHookIf( conditionFn, hookFn ) {
 }
 
 
-var
+var cssPrefixes = [ "Webkit", "Moz", "ms" ],
+	emptyStyle = document.createElement( "div" ).style,
+	vendorProps = {};
 
-	// Swappable if display is none or starts with table
-	// except "table", "table-cell", or "table-caption"
-	// See here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
-	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
-	rcustomProp = /^--/,
-	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
-	cssNormalTransform = {
-		letterSpacing: "0",
-		fontWeight: "400"
-	},
-
-	cssPrefixes = [ "Webkit", "Moz", "ms" ],
-	emptyStyle = document.createElement( "div" ).style;
-
-// Return a css property mapped to a potentially vendor prefixed property
+// Return a vendor-prefixed property or undefined
 function vendorPropName( name ) {
 
-	// Shortcut for names that are not vendor prefixed
-	if ( name in emptyStyle ) {
-		return name;
-	}
-
 	// Check for vendor prefixed names
 	var capName = name[ 0 ].toUpperCase() + name.slice( 1 ),
 		i = cssPrefixes.length;
@@ -6260,17 +6660,34 @@ function vendorPropName( name ) {
 	}
 }
 
-// Return a property mapped along what jQuery.cssProps suggests or to
-// a vendor prefixed property.
+// Return a potentially-mapped jQuery.cssProps or vendor prefixed property
 function finalPropName( name ) {
-	var ret = jQuery.cssProps[ name ];
-	if ( !ret ) {
-		ret = jQuery.cssProps[ name ] = vendorPropName( name ) || name;
+	var final = jQuery.cssProps[ name ] || vendorProps[ name ];
+
+	if ( final ) {
+		return final;
 	}
-	return ret;
+	if ( name in emptyStyle ) {
+		return name;
+	}
+	return vendorProps[ name ] = vendorPropName( name ) || name;
 }
 
-function setPositiveNumber( elem, value, subtract ) {
+
+var
+
+	// Swappable if display is none or starts with table
+	// except "table", "table-cell", or "table-caption"
+	// See here for display values: https://developer.mozilla.org/en-US/docs/CSS/display
+	rdisplayswap = /^(none|table(?!-c[ea]).+)/,
+	rcustomProp = /^--/,
+	cssShow = { position: "absolute", visibility: "hidden", display: "block" },
+	cssNormalTransform = {
+		letterSpacing: "0",
+		fontWeight: "400"
+	};
+
+function setPositiveNumber( _elem, value, subtract ) {
 
 	// Any relative (+/-) values have already been
 	// normalized at this point
@@ -6341,7 +6758,10 @@ function boxModelAdjustment( elem, dimension, box, isBorderBox, styles, computed
 			delta -
 			extra -
 			0.5
-		) );
+
+		// If offsetWidth/offsetHeight is unknown, then we can't determine content-box scroll gutter
+		// Use an explicit zero to avoid NaN (gh-3964)
+		) ) || 0;
 	}
 
 	return delta;
@@ -6351,9 +6771,16 @@ function getWidthOrHeight( elem, dimension, extra ) {
 
 	// Start with computed style
 	var styles = getStyles( elem ),
+
+		// To avoid forcing a reflow, only fetch boxSizing if we need it (gh-4322).
+		// Fake content-box until we know it's needed to know the true value.
+		boxSizingNeeded = !support.boxSizingReliable() || extra,
+		isBorderBox = boxSizingNeeded &&
+			jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+		valueIsBorderBox = isBorderBox,
+
 		val = curCSS( elem, dimension, styles ),
-		isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-		valueIsBorderBox = isBorderBox;
+		offsetProp = "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 );
 
 	// Support: Firefox <=54
 	// Return a confounding non-pixel value or feign ignorance, as appropriate.
@@ -6364,22 +6791,38 @@ function getWidthOrHeight( elem, dimension, extra ) {
 		val = "auto";
 	}
 
-	// Check for style in case a browser which returns unreliable values
-	// for getComputedStyle silently falls back to the reliable elem.style
-	valueIsBorderBox = valueIsBorderBox &&
-		( support.boxSizingReliable() || val === elem.style[ dimension ] );
 
-	// Fall back to offsetWidth/offsetHeight when value is "auto"
-	// This happens for inline elements with no explicit setting (gh-3571)
-	// Support: Android <=4.1 - 4.3 only
-	// Also use offsetWidth/offsetHeight for misreported inline dimensions (gh-3602)
-	if ( val === "auto" ||
-		!parseFloat( val ) && jQuery.css( elem, "display", false, styles ) === "inline" ) {
+	// Support: IE 9 - 11 only
+	// Use offsetWidth/offsetHeight for when box sizing is unreliable.
+	// In those cases, the computed value can be trusted to be border-box.
+	if ( ( !support.boxSizingReliable() && isBorderBox ||
 
-		val = elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ];
+		// Support: IE 10 - 11+, Edge 15 - 18+
+		// IE/Edge misreport `getComputedStyle` of table rows with width/height
+		// set in CSS while `offset*` properties report correct values.
+		// Interestingly, in some cases IE 9 doesn't suffer from this issue.
+		!support.reliableTrDimensions() && nodeName( elem, "tr" ) ||
 
-		// offsetWidth/offsetHeight provide border-box values
-		valueIsBorderBox = true;
+		// Fall back to offsetWidth/offsetHeight when value is "auto"
+		// This happens for inline elements with no explicit setting (gh-3571)
+		val === "auto" ||
+
+		// Support: Android <=4.1 - 4.3 only
+		// Also use offsetWidth/offsetHeight for misreported inline dimensions (gh-3602)
+		!parseFloat( val ) && jQuery.css( elem, "display", false, styles ) === "inline" ) &&
+
+		// Make sure the element is visible & connected
+		elem.getClientRects().length ) {
+
+		isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box";
+
+		// Where available, offsetWidth/offsetHeight approximate border box dimensions.
+		// Where not available (e.g., SVG), assume unreliable box-sizing and interpret the
+		// retrieved value as a content box dimension.
+		valueIsBorderBox = offsetProp in elem;
+		if ( valueIsBorderBox ) {
+			val = elem[ offsetProp ];
+		}
 	}
 
 	// Normalize "" and auto
@@ -6425,6 +6868,13 @@ jQuery.extend( {
 		"flexGrow": true,
 		"flexShrink": true,
 		"fontWeight": true,
+		"gridArea": true,
+		"gridColumn": true,
+		"gridColumnEnd": true,
+		"gridColumnStart": true,
+		"gridRow": true,
+		"gridRowEnd": true,
+		"gridRowStart": true,
 		"lineHeight": true,
 		"opacity": true,
 		"order": true,
@@ -6480,7 +6930,9 @@ jQuery.extend( {
 			}
 
 			// If a number was passed in, add the unit (except for certain CSS properties)
-			if ( type === "number" ) {
+			// The isCustomProp check can be removed in jQuery 4.0 when we only auto-append
+			// "px" to a few hardcoded values.
+			if ( type === "number" && !isCustomProp ) {
 				value += ret && ret[ 3 ] || ( jQuery.cssNumber[ origName ] ? "" : "px" );
 			}
 
@@ -6554,7 +7006,7 @@ jQuery.extend( {
 	}
 } );
 
-jQuery.each( [ "height", "width" ], function( i, dimension ) {
+jQuery.each( [ "height", "width" ], function( _i, dimension ) {
 	jQuery.cssHooks[ dimension ] = {
 		get: function( elem, computed, extra ) {
 			if ( computed ) {
@@ -6580,18 +7032,29 @@ jQuery.each( [ "height", "width" ], function( i, dimension ) {
 		set: function( elem, value, extra ) {
 			var matches,
 				styles = getStyles( elem ),
-				isBorderBox = jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
-				subtract = extra && boxModelAdjustment(
-					elem,
-					dimension,
-					extra,
-					isBorderBox,
-					styles
-				);
+
+				// Only read styles.position if the test has a chance to fail
+				// to avoid forcing a reflow.
+				scrollboxSizeBuggy = !support.scrollboxSize() &&
+					styles.position === "absolute",
+
+				// To avoid forcing a reflow, only fetch boxSizing if we need it (gh-3991)
+				boxSizingNeeded = scrollboxSizeBuggy || extra,
+				isBorderBox = boxSizingNeeded &&
+					jQuery.css( elem, "boxSizing", false, styles ) === "border-box",
+				subtract = extra ?
+					boxModelAdjustment(
+						elem,
+						dimension,
+						extra,
+						isBorderBox,
+						styles
+					) :
+					0;
 
 			// Account for unreliable border-box dimensions by comparing offset* to computed and
 			// faking a content-box to get border and padding (gh-3699)
-			if ( isBorderBox && support.scrollboxSize() === styles.position ) {
+			if ( isBorderBox && scrollboxSizeBuggy ) {
 				subtract -= Math.ceil(
 					elem[ "offset" + dimension[ 0 ].toUpperCase() + dimension.slice( 1 ) ] -
 					parseFloat( styles[ dimension ] ) -
@@ -6759,9 +7222,9 @@ Tween.propHooks = {
 			// Use .style if available and use plain properties where available.
 			if ( jQuery.fx.step[ tween.prop ] ) {
 				jQuery.fx.step[ tween.prop ]( tween );
-			} else if ( tween.elem.nodeType === 1 &&
-				( tween.elem.style[ jQuery.cssProps[ tween.prop ] ] != null ||
-					jQuery.cssHooks[ tween.prop ] ) ) {
+			} else if ( tween.elem.nodeType === 1 && (
+					jQuery.cssHooks[ tween.prop ] ||
+					tween.elem.style[ finalPropName( tween.prop ) ] != null ) ) {
 				jQuery.style( tween.elem, tween.prop, tween.now + tween.unit );
 			} else {
 				tween.elem[ tween.prop ] = tween.now;
@@ -7316,7 +7779,7 @@ jQuery.fn.extend( {
 			clearQueue = type;
 			type = undefined;
 		}
-		if ( clearQueue && type !== false ) {
+		if ( clearQueue ) {
 			this.queue( type || "fx", [] );
 		}
 
@@ -7399,7 +7862,7 @@ jQuery.fn.extend( {
 	}
 } );
 
-jQuery.each( [ "toggle", "show", "hide" ], function( i, name ) {
+jQuery.each( [ "toggle", "show", "hide" ], function( _i, name ) {
 	var cssFn = jQuery.fn[ name ];
 	jQuery.fn[ name ] = function( speed, easing, callback ) {
 		return speed == null || typeof speed === "boolean" ?
@@ -7620,7 +8083,7 @@ boolHook = {
 	}
 };
 
-jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( i, name ) {
+jQuery.each( jQuery.expr.match.bool.source.match( /\w+/g ), function( _i, name ) {
 	var getter = attrHandle[ name ] || jQuery.find.attr;
 
 	attrHandle[ name ] = function( elem, name, isXML ) {
@@ -8244,7 +8707,9 @@ jQuery.extend( jQuery.event, {
 				special.bindType || type;
 
 			// jQuery handler
-			handle = ( dataPriv.get( cur, "events" ) || {} )[ event.type ] &&
+			handle = (
+					dataPriv.get( cur, "events" ) || Object.create( null )
+				)[ event.type ] &&
 				dataPriv.get( cur, "handle" );
 			if ( handle ) {
 				handle.apply( cur, data );
@@ -8355,7 +8820,10 @@ if ( !support.focusin ) {
 
 		jQuery.event.special[ fix ] = {
 			setup: function() {
-				var doc = this.ownerDocument || this,
+
+				// Handle: regular nodes (via `this.ownerDocument`), window
+				// (via `this.document`) & document (via `this`).
+				var doc = this.ownerDocument || this.document || this,
 					attaches = dataPriv.access( doc, fix );
 
 				if ( !attaches ) {
@@ -8364,7 +8832,7 @@ if ( !support.focusin ) {
 				dataPriv.access( doc, fix, ( attaches || 0 ) + 1 );
 			},
 			teardown: function() {
-				var doc = this.ownerDocument || this,
+				var doc = this.ownerDocument || this.document || this,
 					attaches = dataPriv.access( doc, fix ) - 1;
 
 				if ( !attaches ) {
@@ -8380,7 +8848,7 @@ if ( !support.focusin ) {
 }
 var location = window.location;
 
-var nonce = Date.now();
+var nonce = { guid: Date.now() };
 
 var rquery = ( /\?/ );
 
@@ -8468,6 +8936,10 @@ jQuery.param = function( a, traditional ) {
 				encodeURIComponent( value == null ? "" : value );
 		};
 
+	if ( a == null ) {
+		return "";
+	}
+
 	// If an array was passed in, assume that it is an array of form elements.
 	if ( Array.isArray( a ) || ( a.jquery && !jQuery.isPlainObject( a ) ) ) {
 
@@ -8508,7 +8980,7 @@ jQuery.fn.extend( {
 				rsubmittable.test( this.nodeName ) && !rsubmitterTypes.test( type ) &&
 				( this.checked || !rcheckableType.test( type ) );
 		} )
-		.map( function( i, elem ) {
+		.map( function( _i, elem ) {
 			var val = jQuery( this ).val();
 
 			if ( val == null ) {
@@ -8970,12 +9442,14 @@ jQuery.extend( {
 						if ( !responseHeaders ) {
 							responseHeaders = {};
 							while ( ( match = rheaders.exec( responseHeadersString ) ) ) {
-								responseHeaders[ match[ 1 ].toLowerCase() ] = match[ 2 ];
+								responseHeaders[ match[ 1 ].toLowerCase() + " " ] =
+									( responseHeaders[ match[ 1 ].toLowerCase() + " " ] || [] )
+										.concat( match[ 2 ] );
 							}
 						}
-						match = responseHeaders[ key.toLowerCase() ];
+						match = responseHeaders[ key.toLowerCase() + " " ];
 					}
-					return match == null ? null : match;
+					return match == null ? null : match.join( ", " );
 				},
 
 				// Raw string
@@ -9119,7 +9593,8 @@ jQuery.extend( {
 			// Add or update anti-cache param if needed
 			if ( s.cache === false ) {
 				cacheURL = cacheURL.replace( rantiCache, "$1" );
-				uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce++ ) + uncached;
+				uncached = ( rquery.test( cacheURL ) ? "&" : "?" ) + "_=" + ( nonce.guid++ ) +
+					uncached;
 			}
 
 			// Put hash and anti-cache on the URL that will be requested (gh-1732)
@@ -9252,6 +9727,11 @@ jQuery.extend( {
 				response = ajaxHandleResponses( s, jqXHR, responses );
 			}
 
+			// Use a noop converter for missing script
+			if ( !isSuccess && jQuery.inArray( "script", s.dataTypes ) > -1 ) {
+				s.converters[ "text script" ] = function() {};
+			}
+
 			// Convert no matter what (that way responseXXX fields are always set)
 			response = ajaxConvert( s, response, jqXHR, isSuccess );
 
@@ -9342,7 +9822,7 @@ jQuery.extend( {
 	}
 } );
 
-jQuery.each( [ "get", "post" ], function( i, method ) {
+jQuery.each( [ "get", "post" ], function( _i, method ) {
 	jQuery[ method ] = function( url, data, callback, type ) {
 
 		// Shift arguments if data argument was omitted
@@ -9363,8 +9843,17 @@ jQuery.each( [ "get", "post" ], function( i, method ) {
 	};
 } );
 
+jQuery.ajaxPrefilter( function( s ) {
+	var i;
+	for ( i in s.headers ) {
+		if ( i.toLowerCase() === "content-type" ) {
+			s.contentType = s.headers[ i ] || "";
+		}
+	}
+} );
 
-jQuery._evalUrl = function( url ) {
+
+jQuery._evalUrl = function( url, options, doc ) {
 	return jQuery.ajax( {
 		url: url,
 
@@ -9374,7 +9863,16 @@ jQuery._evalUrl = function( url ) {
 		cache: true,
 		async: false,
 		global: false,
-		"throws": true
+
+		// Only evaluate the response if it is successful (gh-4126)
+		// dataFilter is not invoked for failure responses, so using it instead
+		// of the default converter is kludgy but it works.
+		converters: {
+			"text script": function() {}
+		},
+		dataFilter: function( response ) {
+			jQuery.globalEval( response, options, doc );
+		}
 	} );
 };
 
@@ -9657,24 +10155,21 @@ jQuery.ajaxPrefilter( "script", function( s ) {
 // Bind script tag hack transport
 jQuery.ajaxTransport( "script", function( s ) {
 
-	// This transport only deals with cross domain requests
-	if ( s.crossDomain ) {
+	// This transport only deals with cross domain or forced-by-attrs requests
+	if ( s.crossDomain || s.scriptAttrs ) {
 		var script, callback;
 		return {
 			send: function( _, complete ) {
-				script = jQuery( "<script>" ).prop( {
-					charset: s.scriptCharset,
-					src: s.url
-				} ).on(
-					"load error",
-					callback = function( evt ) {
+				script = jQuery( "<script>" )
+					.attr( s.scriptAttrs || {} )
+					.prop( { charset: s.scriptCharset, src: s.url } )
+					.on( "load error", callback = function( evt ) {
 						script.remove();
 						callback = null;
 						if ( evt ) {
 							complete( evt.type === "error" ? 404 : 200, evt.type );
 						}
-					}
-				);
+					} );
 
 				// Use native DOM manipulation to avoid our domManip AJAX trickery
 				document.head.appendChild( script[ 0 ] );
@@ -9698,7 +10193,7 @@ var oldCallbacks = [],
 jQuery.ajaxSetup( {
 	jsonp: "callback",
 	jsonpCallback: function() {
-		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce++ ) );
+		var callback = oldCallbacks.pop() || ( jQuery.expando + "_" + ( nonce.guid++ ) );
 		this[ callback ] = true;
 		return callback;
 	}
@@ -9915,23 +10410,6 @@ jQuery.fn.load = function( url, params, callback ) {
 
 
 
-// Attach a bunch of functions for handling common AJAX events
-jQuery.each( [
-	"ajaxStart",
-	"ajaxStop",
-	"ajaxComplete",
-	"ajaxError",
-	"ajaxSuccess",
-	"ajaxSend"
-], function( i, type ) {
-	jQuery.fn[ type ] = function( fn ) {
-		return this.on( type, fn );
-	};
-} );
-
-
-
-
 jQuery.expr.pseudos.animated = function( elem ) {
 	return jQuery.grep( jQuery.timers, function( fn ) {
 		return elem === fn.elem;
@@ -9988,6 +10466,12 @@ jQuery.offset = {
 			options.using.call( elem, props );
 
 		} else {
+			if ( typeof props.top === "number" ) {
+				props.top += "px";
+			}
+			if ( typeof props.left === "number" ) {
+				props.left += "px";
+			}
 			curElem.css( props );
 		}
 	}
@@ -10138,7 +10622,7 @@ jQuery.each( { scrollLeft: "pageXOffset", scrollTop: "pageYOffset" }, function(
 // Blink bug: https://bugs.chromium.org/p/chromium/issues/detail?id=589347
 // getComputedStyle returns percent when specified for top/left/bottom/right;
 // rather than make the css module depend on the offset module, just check for it here
-jQuery.each( [ "top", "left" ], function( i, prop ) {
+jQuery.each( [ "top", "left" ], function( _i, prop ) {
 	jQuery.cssHooks[ prop ] = addGetHookIf( support.pixelPosition,
 		function( elem, computed ) {
 			if ( computed ) {
@@ -10201,25 +10685,19 @@ jQuery.each( { Height: "height", Width: "width" }, function( name, type ) {
 } );
 
 
-jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
-	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
-	"change select submit keydown keypress keyup contextmenu" ).split( " " ),
-	function( i, name ) {
-
-	// Handle event binding
-	jQuery.fn[ name ] = function( data, fn ) {
-		return arguments.length > 0 ?
-			this.on( name, null, data, fn ) :
-			this.trigger( name );
+jQuery.each( [
+	"ajaxStart",
+	"ajaxStop",
+	"ajaxComplete",
+	"ajaxError",
+	"ajaxSuccess",
+	"ajaxSend"
+], function( _i, type ) {
+	jQuery.fn[ type ] = function( fn ) {
+		return this.on( type, fn );
 	};
 } );
 
-jQuery.fn.extend( {
-	hover: function( fnOver, fnOut ) {
-		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
-	}
-} );
-
 
 
 
@@ -10241,9 +10719,33 @@ jQuery.fn.extend( {
 		return arguments.length === 1 ?
 			this.off( selector, "**" ) :
 			this.off( types, selector || "**", fn );
+	},
+
+	hover: function( fnOver, fnOut ) {
+		return this.mouseenter( fnOver ).mouseleave( fnOut || fnOver );
 	}
 } );
 
+jQuery.each( ( "blur focus focusin focusout resize scroll click dblclick " +
+	"mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave " +
+	"change select submit keydown keypress keyup contextmenu" ).split( " " ),
+	function( _i, name ) {
+
+		// Handle event binding
+		jQuery.fn[ name ] = function( data, fn ) {
+			return arguments.length > 0 ?
+				this.on( name, null, data, fn ) :
+				this.trigger( name );
+		};
+	} );
+
+
+
+
+// Support: Android <=4.0 only
+// Make sure we trim BOM and NBSP
+var rtrim = /^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;
+
 // Bind a function to a context, optionally partially applying any
 // arguments.
 // jQuery.proxy is deprecated to promote standards (specifically Function#bind)
@@ -10306,6 +10808,11 @@ jQuery.isNumeric = function( obj ) {
 		!isNaN( obj - parseFloat( obj ) );
 };
 
+jQuery.trim = function( text ) {
+	return text == null ?
+		"" :
+		( text + "" ).replace( rtrim, "" );
+};
 
 
 
@@ -10354,7 +10861,7 @@ jQuery.noConflict = function( deep ) {
 // Expose jQuery and $ identifiers, even in AMD
 // (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
 // and CommonJS for browser emulators (#13566)
-if ( !noGlobal ) {
+if ( typeof noGlobal === "undefined" ) {
 	window.jQuery = window.$ = jQuery;
 }
 
diff --git a/static/admin/js/vendor/jquery/jquery.min.js b/static/admin/js/vendor/jquery/jquery.min.js
index 5881f6ea..b0614034 100644
--- a/static/admin/js/vendor/jquery/jquery.min.js
+++ b/static/admin/js/vendor/jquery/jquery.min.js
@@ -1,2 +1,2 @@
-/*! jQuery v3.3.1 | (c) JS Foundation and other contributors | jquery.org/license */
-!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(e,t){"use strict";var n=[],r=e.document,i=Object.getPrototypeOf,o=n.slice,a=n.concat,s=n.push,u=n.indexOf,l={},c=l.toString,f=l.hasOwnProperty,p=f.toString,d=p.call(Object),h={},g=function e(t){return"function"==typeof t&&"number"!=typeof t.nodeType},y=function e(t){return null!=t&&t===t.window},v={type:!0,src:!0,noModule:!0};function m(e,t,n){var i,o=(t=t||r).createElement("script");if(o.text=e,n)for(i in v)n[i]&&(o[i]=n[i]);t.head.appendChild(o).parentNode.removeChild(o)}function x(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?l[c.call(e)]||"object":typeof e}var b="3.3.1",w=function(e,t){return new w.fn.init(e,t)},T=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;w.fn=w.prototype={jquery:"3.3.1",constructor:w,length:0,toArray:function(){return o.call(this)},get:function(e){return null==e?o.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=w.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return w.each(this,e)},map:function(e){return this.pushStack(w.map(this,function(t,n){return e.call(t,n,t)}))},slice:function(){return this.pushStack(o.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(n>=0&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:s,sort:n.sort,splice:n.splice},w.extend=w.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||g(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)n=a[t],t!=="__proto__"&&a!==(r=e[t])&&(l&&r&&(w.isPlainObject(r)||(i=Array.isArray(r)))?(i?(i=!1,o=n&&Array.isArray(n)?n:[]):o=n&&w.isPlainObject(n)?n:{},a[t]=w.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},w.extend({expando:"jQuery"+("3.3.1"+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==c.call(e))&&(!(t=i(e))||"function"==typeof(n=f.call(t,"constructor")&&t.constructor)&&p.call(n)===d)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e){m(e)},each:function(e,t){var n,r=0;if(C(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},trim:function(e){return null==e?"":(e+"").replace(T,"")},makeArray:function(e,t){var n=t||[];return null!=e&&(C(Object(e))?w.merge(n,"string"==typeof e?[e]:e):s.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:u.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r,i=[],o=0,a=e.length,s=!n;o<a;o++)(r=!t(e[o],o))!==s&&i.push(e[o]);return i},map:function(e,t,n){var r,i,o=0,s=[];if(C(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&s.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&s.push(i);return a.apply([],s)},guid:1,support:h}),"function"==typeof Symbol&&(w.fn[Symbol.iterator]=n[Symbol.iterator]),w.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){l["[object "+t+"]"]=t.toLowerCase()});function C(e){var t=!!e&&"length"in e&&e.length,n=x(e);return!g(e)&&!y(e)&&("array"===n||0===t||"number"==typeof t&&t>0&&t-1 in e)}var E=function(e){var t,n,r,i,o,a,s,u,l,c,f,p,d,h,g,y,v,m,x,b="sizzle"+1*new Date,w=e.document,T=0,C=0,E=ae(),k=ae(),S=ae(),D=function(e,t){return e===t&&(f=!0),0},N={}.hasOwnProperty,A=[],j=A.pop,q=A.push,L=A.push,H=A.slice,O=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},P="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",R="(?:\\\\.|[\\w-]|[^\0-\\xa0])+",I="\\["+M+"*("+R+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+R+"))|)"+M+"*\\]",W=":("+R+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+I+")*)|.*)\\)|)",$=new RegExp(M+"+","g"),B=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),F=new RegExp("^"+M+"*,"+M+"*"),_=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),z=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),X=new RegExp(W),U=new RegExp("^"+R+"$"),V={ID:new RegExp("^#("+R+")"),CLASS:new RegExp("^\\.("+R+")"),TAG:new RegExp("^("+R+"|[*])"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+W),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+P+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},G=/^(?:input|select|textarea|button)$/i,Y=/^h\d$/i,Q=/^[^{]+\{\s*\[native \w/,J=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,K=/[+~]/,Z=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),ee=function(e,t,n){var r="0x"+t-65536;return r!==r||n?t:r<0?String.fromCharCode(r+65536):String.fromCharCode(r>>10|55296,1023&r|56320)},te=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ne=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},re=function(){p()},ie=me(function(e){return!0===e.disabled&&("form"in e||"label"in e)},{dir:"parentNode",next:"legend"});try{L.apply(A=H.call(w.childNodes),w.childNodes),A[w.childNodes.length].nodeType}catch(e){L={apply:A.length?function(e,t){q.apply(e,H.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function oe(e,t,r,i){var o,s,l,c,f,h,v,m=t&&t.ownerDocument,T=t?t.nodeType:9;if(r=r||[],"string"!=typeof e||!e||1!==T&&9!==T&&11!==T)return r;if(!i&&((t?t.ownerDocument||t:w)!==d&&p(t),t=t||d,g)){if(11!==T&&(f=J.exec(e)))if(o=f[1]){if(9===T){if(!(l=t.getElementById(o)))return r;if(l.id===o)return r.push(l),r}else if(m&&(l=m.getElementById(o))&&x(t,l)&&l.id===o)return r.push(l),r}else{if(f[2])return L.apply(r,t.getElementsByTagName(e)),r;if((o=f[3])&&n.getElementsByClassName&&t.getElementsByClassName)return L.apply(r,t.getElementsByClassName(o)),r}if(n.qsa&&!S[e+" "]&&(!y||!y.test(e))){if(1!==T)m=t,v=e;else if("object"!==t.nodeName.toLowerCase()){(c=t.getAttribute("id"))?c=c.replace(te,ne):t.setAttribute("id",c=b),s=(h=a(e)).length;while(s--)h[s]="#"+c+" "+ve(h[s]);v=h.join(","),m=K.test(e)&&ge(t.parentNode)||t}if(v)try{return L.apply(r,m.querySelectorAll(v)),r}catch(e){}finally{c===b&&t.removeAttribute("id")}}}return u(e.replace(B,"$1"),t,r,i)}function ae(){var e=[];function t(n,i){return e.push(n+" ")>r.cacheLength&&delete t[e.shift()],t[n+" "]=i}return t}function se(e){return e[b]=!0,e}function ue(e){var t=d.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function le(e,t){var n=e.split("|"),i=n.length;while(i--)r.attrHandle[n[i]]=t}function ce(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function fe(e){return function(t){return"input"===t.nodeName.toLowerCase()&&t.type===e}}function pe(e){return function(t){var n=t.nodeName.toLowerCase();return("input"===n||"button"===n)&&t.type===e}}function de(e){return function(t){return"form"in t?t.parentNode&&!1===t.disabled?"label"in t?"label"in t.parentNode?t.parentNode.disabled===e:t.disabled===e:t.isDisabled===e||t.isDisabled!==!e&&ie(t)===e:t.disabled===e:"label"in t&&t.disabled===e}}function he(e){return se(function(t){return t=+t,se(function(n,r){var i,o=e([],n.length,t),a=o.length;while(a--)n[i=o[a]]&&(n[i]=!(r[i]=n[i]))})})}function ge(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}n=oe.support={},o=oe.isXML=function(e){var t=e&&(e.ownerDocument||e).documentElement;return!!t&&"HTML"!==t.nodeName},p=oe.setDocument=function(e){var t,i,a=e?e.ownerDocument||e:w;return a!==d&&9===a.nodeType&&a.documentElement?(d=a,h=d.documentElement,g=!o(d),w!==d&&(i=d.defaultView)&&i.top!==i&&(i.addEventListener?i.addEventListener("unload",re,!1):i.attachEvent&&i.attachEvent("onunload",re)),n.attributes=ue(function(e){return e.className="i",!e.getAttribute("className")}),n.getElementsByTagName=ue(function(e){return e.appendChild(d.createComment("")),!e.getElementsByTagName("*").length}),n.getElementsByClassName=Q.test(d.getElementsByClassName),n.getById=ue(function(e){return h.appendChild(e).id=b,!d.getElementsByName||!d.getElementsByName(b).length}),n.getById?(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){return e.getAttribute("id")===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n=t.getElementById(e);return n?[n]:[]}}):(r.filter.ID=function(e){var t=e.replace(Z,ee);return function(e){var n="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return n&&n.value===t}},r.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&g){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),r.find.TAG=n.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):n.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},r.find.CLASS=n.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&g)return t.getElementsByClassName(e)},v=[],y=[],(n.qsa=Q.test(d.querySelectorAll))&&(ue(function(e){h.appendChild(e).innerHTML="<a id='"+b+"'></a><select id='"+b+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&y.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||y.push("\\["+M+"*(?:value|"+P+")"),e.querySelectorAll("[id~="+b+"-]").length||y.push("~="),e.querySelectorAll(":checked").length||y.push(":checked"),e.querySelectorAll("a#"+b+"+*").length||y.push(".#.+[+~]")}),ue(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=d.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&y.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&y.push(":enabled",":disabled"),h.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&y.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),y.push(",.*:")})),(n.matchesSelector=Q.test(m=h.matches||h.webkitMatchesSelector||h.mozMatchesSelector||h.oMatchesSelector||h.msMatchesSelector))&&ue(function(e){n.disconnectedMatch=m.call(e,"*"),m.call(e,"[s!='']:x"),v.push("!=",W)}),y=y.length&&new RegExp(y.join("|")),v=v.length&&new RegExp(v.join("|")),t=Q.test(h.compareDocumentPosition),x=t||Q.test(h.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return f=!0,0;var r=!e.compareDocumentPosition-!t.compareDocumentPosition;return r||(1&(r=(e.ownerDocument||e)===(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!n.sortDetached&&t.compareDocumentPosition(e)===r?e===d||e.ownerDocument===w&&x(w,e)?-1:t===d||t.ownerDocument===w&&x(w,t)?1:c?O(c,e)-O(c,t):0:4&r?-1:1)}:function(e,t){if(e===t)return f=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e===d?-1:t===d?1:i?-1:o?1:c?O(c,e)-O(c,t):0;if(i===o)return ce(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?ce(a[r],s[r]):a[r]===w?-1:s[r]===w?1:0},d):d},oe.matches=function(e,t){return oe(e,null,null,t)},oe.matchesSelector=function(e,t){if((e.ownerDocument||e)!==d&&p(e),t=t.replace(z,"='$1']"),n.matchesSelector&&g&&!S[t+" "]&&(!v||!v.test(t))&&(!y||!y.test(t)))try{var r=m.call(e,t);if(r||n.disconnectedMatch||e.document&&11!==e.document.nodeType)return r}catch(e){}return oe(t,d,null,[e]).length>0},oe.contains=function(e,t){return(e.ownerDocument||e)!==d&&p(e),x(e,t)},oe.attr=function(e,t){(e.ownerDocument||e)!==d&&p(e);var i=r.attrHandle[t.toLowerCase()],o=i&&N.call(r.attrHandle,t.toLowerCase())?i(e,t,!g):void 0;return void 0!==o?o:n.attributes||!g?e.getAttribute(t):(o=e.getAttributeNode(t))&&o.specified?o.value:null},oe.escape=function(e){return(e+"").replace(te,ne)},oe.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},oe.uniqueSort=function(e){var t,r=[],i=0,o=0;if(f=!n.detectDuplicates,c=!n.sortStable&&e.slice(0),e.sort(D),f){while(t=e[o++])t===e[o]&&(i=r.push(o));while(i--)e.splice(r[i],1)}return c=null,e},i=oe.getText=function(e){var t,n="",r=0,o=e.nodeType;if(o){if(1===o||9===o||11===o){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=i(e)}else if(3===o||4===o)return e.nodeValue}else while(t=e[r++])n+=i(t);return n},(r=oe.selectors={cacheLength:50,createPseudo:se,match:V,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(Z,ee),e[3]=(e[3]||e[4]||e[5]||"").replace(Z,ee),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||oe.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&oe.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return V.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=a(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(Z,ee).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=E[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&E(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(e,t,n){return function(r){var i=oe.attr(r,e);return null==i?"!="===t:!t||(i+="","="===t?i===n:"!="===t?i!==n:"^="===t?n&&0===i.indexOf(n):"*="===t?n&&i.indexOf(n)>-1:"$="===t?n&&i.slice(-n.length)===n:"~="===t?(" "+i.replace($," ")+" ").indexOf(n)>-1:"|="===t&&(i===n||i.slice(0,n.length+1)===n+"-"))}},CHILD:function(e,t,n,r,i){var o="nth"!==e.slice(0,3),a="last"!==e.slice(-4),s="of-type"===t;return 1===r&&0===i?function(e){return!!e.parentNode}:function(t,n,u){var l,c,f,p,d,h,g=o!==a?"nextSibling":"previousSibling",y=t.parentNode,v=s&&t.nodeName.toLowerCase(),m=!u&&!s,x=!1;if(y){if(o){while(g){p=t;while(p=p[g])if(s?p.nodeName.toLowerCase()===v:1===p.nodeType)return!1;h=g="only"===e&&!h&&"nextSibling"}return!0}if(h=[a?y.firstChild:y.lastChild],a&&m){x=(d=(l=(c=(f=(p=y)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1])&&l[2],p=d&&y.childNodes[d];while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if(1===p.nodeType&&++x&&p===t){c[e]=[T,d,x];break}}else if(m&&(x=d=(l=(c=(f=(p=t)[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]||[])[0]===T&&l[1]),!1===x)while(p=++d&&p&&p[g]||(x=d=0)||h.pop())if((s?p.nodeName.toLowerCase()===v:1===p.nodeType)&&++x&&(m&&((c=(f=p[b]||(p[b]={}))[p.uniqueID]||(f[p.uniqueID]={}))[e]=[T,x]),p===t))break;return(x-=i)===r||x%r==0&&x/r>=0}}},PSEUDO:function(e,t){var n,i=r.pseudos[e]||r.setFilters[e.toLowerCase()]||oe.error("unsupported pseudo: "+e);return i[b]?i(t):i.length>1?(n=[e,e,"",t],r.setFilters.hasOwnProperty(e.toLowerCase())?se(function(e,n){var r,o=i(e,t),a=o.length;while(a--)e[r=O(e,o[a])]=!(n[r]=o[a])}):function(e){return i(e,0,n)}):i}},pseudos:{not:se(function(e){var t=[],n=[],r=s(e.replace(B,"$1"));return r[b]?se(function(e,t,n,i){var o,a=r(e,null,i,[]),s=e.length;while(s--)(o=a[s])&&(e[s]=!(t[s]=o))}):function(e,i,o){return t[0]=e,r(t,null,o,n),t[0]=null,!n.pop()}}),has:se(function(e){return function(t){return oe(e,t).length>0}}),contains:se(function(e){return e=e.replace(Z,ee),function(t){return(t.textContent||t.innerText||i(t)).indexOf(e)>-1}}),lang:se(function(e){return U.test(e||"")||oe.error("unsupported lang: "+e),e=e.replace(Z,ee).toLowerCase(),function(t){var n;do{if(n=g?t.lang:t.getAttribute("xml:lang")||t.getAttribute("lang"))return(n=n.toLowerCase())===e||0===n.indexOf(e+"-")}while((t=t.parentNode)&&1===t.nodeType);return!1}}),target:function(t){var n=e.location&&e.location.hash;return n&&n.slice(1)===t.id},root:function(e){return e===h},focus:function(e){return e===d.activeElement&&(!d.hasFocus||d.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:de(!1),disabled:de(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!r.pseudos.empty(e)},header:function(e){return Y.test(e.nodeName)},input:function(e){return G.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:he(function(){return[0]}),last:he(function(e,t){return[t-1]}),eq:he(function(e,t,n){return[n<0?n+t:n]}),even:he(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:he(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:he(function(e,t,n){for(var r=n<0?n+t:n;--r>=0;)e.push(r);return e}),gt:he(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=r.pseudos.eq;for(t in{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})r.pseudos[t]=fe(t);for(t in{submit:!0,reset:!0})r.pseudos[t]=pe(t);function ye(){}ye.prototype=r.filters=r.pseudos,r.setFilters=new ye,a=oe.tokenize=function(e,t){var n,i,o,a,s,u,l,c=k[e+" "];if(c)return t?0:c.slice(0);s=e,u=[],l=r.preFilter;while(s){n&&!(i=F.exec(s))||(i&&(s=s.slice(i[0].length)||s),u.push(o=[])),n=!1,(i=_.exec(s))&&(n=i.shift(),o.push({value:n,type:i[0].replace(B," ")}),s=s.slice(n.length));for(a in r.filter)!(i=V[a].exec(s))||l[a]&&!(i=l[a](i))||(n=i.shift(),o.push({value:n,type:a,matches:i}),s=s.slice(n.length));if(!n)break}return t?s.length:s?oe.error(e):k(e,u).slice(0)};function ve(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function me(e,t,n){var r=t.dir,i=t.next,o=i||r,a=n&&"parentNode"===o,s=C++;return t.first?function(t,n,i){while(t=t[r])if(1===t.nodeType||a)return e(t,n,i);return!1}:function(t,n,u){var l,c,f,p=[T,s];if(u){while(t=t[r])if((1===t.nodeType||a)&&e(t,n,u))return!0}else while(t=t[r])if(1===t.nodeType||a)if(f=t[b]||(t[b]={}),c=f[t.uniqueID]||(f[t.uniqueID]={}),i&&i===t.nodeName.toLowerCase())t=t[r]||t;else{if((l=c[o])&&l[0]===T&&l[1]===s)return p[2]=l[2];if(c[o]=p,p[2]=e(t,n,u))return!0}return!1}}function xe(e){return e.length>1?function(t,n,r){var i=e.length;while(i--)if(!e[i](t,n,r))return!1;return!0}:e[0]}function be(e,t,n){for(var r=0,i=t.length;r<i;r++)oe(e,t[r],n);return n}function we(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Te(e,t,n,r,i,o){return r&&!r[b]&&(r=Te(r)),i&&!i[b]&&(i=Te(i,o)),se(function(o,a,s,u){var l,c,f,p=[],d=[],h=a.length,g=o||be(t||"*",s.nodeType?[s]:s,[]),y=!e||!o&&t?g:we(g,p,e,s,u),v=n?i||(o?e:h||r)?[]:a:y;if(n&&n(y,v,s,u),r){l=we(v,d),r(l,[],s,u),c=l.length;while(c--)(f=l[c])&&(v[d[c]]=!(y[d[c]]=f))}if(o){if(i||e){if(i){l=[],c=v.length;while(c--)(f=v[c])&&l.push(y[c]=f);i(null,v=[],l,u)}c=v.length;while(c--)(f=v[c])&&(l=i?O(o,f):p[c])>-1&&(o[l]=!(a[l]=f))}}else v=we(v===a?v.splice(h,v.length):v),i?i(null,a,v,u):L.apply(a,v)})}function Ce(e){for(var t,n,i,o=e.length,a=r.relative[e[0].type],s=a||r.relative[" "],u=a?1:0,c=me(function(e){return e===t},s,!0),f=me(function(e){return O(t,e)>-1},s,!0),p=[function(e,n,r){var i=!a&&(r||n!==l)||((t=n).nodeType?c(e,n,r):f(e,n,r));return t=null,i}];u<o;u++)if(n=r.relative[e[u].type])p=[me(xe(p),n)];else{if((n=r.filter[e[u].type].apply(null,e[u].matches))[b]){for(i=++u;i<o;i++)if(r.relative[e[i].type])break;return Te(u>1&&xe(p),u>1&&ve(e.slice(0,u-1).concat({value:" "===e[u-2].type?"*":""})).replace(B,"$1"),n,u<i&&Ce(e.slice(u,i)),i<o&&Ce(e=e.slice(i)),i<o&&ve(e))}p.push(n)}return xe(p)}function Ee(e,t){var n=t.length>0,i=e.length>0,o=function(o,a,s,u,c){var f,h,y,v=0,m="0",x=o&&[],b=[],w=l,C=o||i&&r.find.TAG("*",c),E=T+=null==w?1:Math.random()||.1,k=C.length;for(c&&(l=a===d||a||c);m!==k&&null!=(f=C[m]);m++){if(i&&f){h=0,a||f.ownerDocument===d||(p(f),s=!g);while(y=e[h++])if(y(f,a||d,s)){u.push(f);break}c&&(T=E)}n&&((f=!y&&f)&&v--,o&&x.push(f))}if(v+=m,n&&m!==v){h=0;while(y=t[h++])y(x,b,a,s);if(o){if(v>0)while(m--)x[m]||b[m]||(b[m]=j.call(u));b=we(b)}L.apply(u,b),c&&!o&&b.length>0&&v+t.length>1&&oe.uniqueSort(u)}return c&&(T=E,l=w),x};return n?se(o):o}return s=oe.compile=function(e,t){var n,r=[],i=[],o=S[e+" "];if(!o){t||(t=a(e)),n=t.length;while(n--)(o=Ce(t[n]))[b]?r.push(o):i.push(o);(o=S(e,Ee(i,r))).selector=e}return o},u=oe.select=function(e,t,n,i){var o,u,l,c,f,p="function"==typeof e&&e,d=!i&&a(e=p.selector||e);if(n=n||[],1===d.length){if((u=d[0]=d[0].slice(0)).length>2&&"ID"===(l=u[0]).type&&9===t.nodeType&&g&&r.relative[u[1].type]){if(!(t=(r.find.ID(l.matches[0].replace(Z,ee),t)||[])[0]))return n;p&&(t=t.parentNode),e=e.slice(u.shift().value.length)}o=V.needsContext.test(e)?0:u.length;while(o--){if(l=u[o],r.relative[c=l.type])break;if((f=r.find[c])&&(i=f(l.matches[0].replace(Z,ee),K.test(u[0].type)&&ge(t.parentNode)||t))){if(u.splice(o,1),!(e=i.length&&ve(u)))return L.apply(n,i),n;break}}}return(p||s(e,d))(i,t,!g,n,!t||K.test(e)&&ge(t.parentNode)||t),n},n.sortStable=b.split("").sort(D).join("")===b,n.detectDuplicates=!!f,p(),n.sortDetached=ue(function(e){return 1&e.compareDocumentPosition(d.createElement("fieldset"))}),ue(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||le("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),n.attributes&&ue(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||le("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ue(function(e){return null==e.getAttribute("disabled")})||le(P,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),oe}(e);w.find=E,w.expr=E.selectors,w.expr[":"]=w.expr.pseudos,w.uniqueSort=w.unique=E.uniqueSort,w.text=E.getText,w.isXMLDoc=E.isXML,w.contains=E.contains,w.escapeSelector=E.escape;var k=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&w(e).is(n))break;r.push(e)}return r},S=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},D=w.expr.match.needsContext;function N(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var A=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function j(e,t,n){return g(t)?w.grep(e,function(e,r){return!!t.call(e,r,e)!==n}):t.nodeType?w.grep(e,function(e){return e===t!==n}):"string"!=typeof t?w.grep(e,function(e){return u.call(t,e)>-1!==n}):w.filter(t,e,n)}w.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?w.find.matchesSelector(r,e)?[r]:[]:w.find.matches(e,w.grep(t,function(e){return 1===e.nodeType}))},w.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(w(e).filter(function(){for(t=0;t<r;t++)if(w.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)w.find(e,i[t],n);return r>1?w.uniqueSort(n):n},filter:function(e){return this.pushStack(j(this,e||[],!1))},not:function(e){return this.pushStack(j(this,e||[],!0))},is:function(e){return!!j(this,"string"==typeof e&&D.test(e)?w(e):e||[],!1).length}});var q,L=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(w.fn.init=function(e,t,n){var i,o;if(!e)return this;if(n=n||q,"string"==typeof e){if(!(i="<"===e[0]&&">"===e[e.length-1]&&e.length>=3?[null,e,null]:L.exec(e))||!i[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(i[1]){if(t=t instanceof w?t[0]:t,w.merge(this,w.parseHTML(i[1],t&&t.nodeType?t.ownerDocument||t:r,!0)),A.test(i[1])&&w.isPlainObject(t))for(i in t)g(this[i])?this[i](t[i]):this.attr(i,t[i]);return this}return(o=r.getElementById(i[2]))&&(this[0]=o,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):g(e)?void 0!==n.ready?n.ready(e):e(w):w.makeArray(e,this)}).prototype=w.fn,q=w(r);var H=/^(?:parents|prev(?:Until|All))/,O={children:!0,contents:!0,next:!0,prev:!0};w.fn.extend({has:function(e){var t=w(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(w.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&w(e);if(!D.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?a.index(n)>-1:1===n.nodeType&&w.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(o.length>1?w.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?u.call(w(e),this[0]):u.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(w.uniqueSort(w.merge(this.get(),w(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}});function P(e,t){while((e=e[t])&&1!==e.nodeType);return e}w.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return k(e,"parentNode")},parentsUntil:function(e,t,n){return k(e,"parentNode",n)},next:function(e){return P(e,"nextSibling")},prev:function(e){return P(e,"previousSibling")},nextAll:function(e){return k(e,"nextSibling")},prevAll:function(e){return k(e,"previousSibling")},nextUntil:function(e,t,n){return k(e,"nextSibling",n)},prevUntil:function(e,t,n){return k(e,"previousSibling",n)},siblings:function(e){return S((e.parentNode||{}).firstChild,e)},children:function(e){return S(e.firstChild)},contents:function(e){return N(e,"iframe")?e.contentDocument:(N(e,"template")&&(e=e.content||e),w.merge([],e.childNodes))}},function(e,t){w.fn[e]=function(n,r){var i=w.map(this,t,n);return"Until"!==e.slice(-5)&&(r=n),r&&"string"==typeof r&&(i=w.filter(r,i)),this.length>1&&(O[e]||w.uniqueSort(i),H.test(e)&&i.reverse()),this.pushStack(i)}});var M=/[^\x20\t\r\n\f]+/g;function R(e){var t={};return w.each(e.match(M)||[],function(e,n){t[n]=!0}),t}w.Callbacks=function(e){e="string"==typeof e?R(e):w.extend({},e);var t,n,r,i,o=[],a=[],s=-1,u=function(){for(i=i||e.once,r=t=!0;a.length;s=-1){n=a.shift();while(++s<o.length)!1===o[s].apply(n[0],n[1])&&e.stopOnFalse&&(s=o.length,n=!1)}e.memory||(n=!1),t=!1,i&&(o=n?[]:"")},l={add:function(){return o&&(n&&!t&&(s=o.length-1,a.push(n)),function t(n){w.each(n,function(n,r){g(r)?e.unique&&l.has(r)||o.push(r):r&&r.length&&"string"!==x(r)&&t(r)})}(arguments),n&&!t&&u()),this},remove:function(){return w.each(arguments,function(e,t){var n;while((n=w.inArray(t,o,n))>-1)o.splice(n,1),n<=s&&s--}),this},has:function(e){return e?w.inArray(e,o)>-1:o.length>0},empty:function(){return o&&(o=[]),this},disable:function(){return i=a=[],o=n="",this},disabled:function(){return!o},lock:function(){return i=a=[],n||t||(o=n=""),this},locked:function(){return!!i},fireWith:function(e,n){return i||(n=[e,(n=n||[]).slice?n.slice():n],a.push(n),t||u()),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!r}};return l};function I(e){return e}function W(e){throw e}function $(e,t,n,r){var i;try{e&&g(i=e.promise)?i.call(e).done(t).fail(n):e&&g(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}w.extend({Deferred:function(t){var n=[["notify","progress",w.Callbacks("memory"),w.Callbacks("memory"),2],["resolve","done",w.Callbacks("once memory"),w.Callbacks("once memory"),0,"resolved"],["reject","fail",w.Callbacks("once memory"),w.Callbacks("once memory"),1,"rejected"]],r="pending",i={state:function(){return r},always:function(){return o.done(arguments).fail(arguments),this},"catch":function(e){return i.then(null,e)},pipe:function(){var e=arguments;return w.Deferred(function(t){w.each(n,function(n,r){var i=g(e[r[4]])&&e[r[4]];o[r[1]](function(){var e=i&&i.apply(this,arguments);e&&g(e.promise)?e.promise().progress(t.notify).done(t.resolve).fail(t.reject):t[r[0]+"With"](this,i?[e]:arguments)})}),e=null}).promise()},then:function(t,r,i){var o=0;function a(t,n,r,i){return function(){var s=this,u=arguments,l=function(){var e,l;if(!(t<o)){if((e=r.apply(s,u))===n.promise())throw new TypeError("Thenable self-resolution");l=e&&("object"==typeof e||"function"==typeof e)&&e.then,g(l)?i?l.call(e,a(o,n,I,i),a(o,n,W,i)):(o++,l.call(e,a(o,n,I,i),a(o,n,W,i),a(o,n,I,n.notifyWith))):(r!==I&&(s=void 0,u=[e]),(i||n.resolveWith)(s,u))}},c=i?l:function(){try{l()}catch(e){w.Deferred.exceptionHook&&w.Deferred.exceptionHook(e,c.stackTrace),t+1>=o&&(r!==W&&(s=void 0,u=[e]),n.rejectWith(s,u))}};t?c():(w.Deferred.getStackHook&&(c.stackTrace=w.Deferred.getStackHook()),e.setTimeout(c))}}return w.Deferred(function(e){n[0][3].add(a(0,e,g(i)?i:I,e.notifyWith)),n[1][3].add(a(0,e,g(t)?t:I)),n[2][3].add(a(0,e,g(r)?r:W))}).promise()},promise:function(e){return null!=e?w.extend(e,i):i}},o={};return w.each(n,function(e,t){var a=t[2],s=t[5];i[t[1]]=a.add,s&&a.add(function(){r=s},n[3-e][2].disable,n[3-e][3].disable,n[0][2].lock,n[0][3].lock),a.add(t[3].fire),o[t[0]]=function(){return o[t[0]+"With"](this===o?void 0:this,arguments),this},o[t[0]+"With"]=a.fireWith}),i.promise(o),t&&t.call(o,o),o},when:function(e){var t=arguments.length,n=t,r=Array(n),i=o.call(arguments),a=w.Deferred(),s=function(e){return function(n){r[e]=this,i[e]=arguments.length>1?o.call(arguments):n,--t||a.resolveWith(r,i)}};if(t<=1&&($(e,a.done(s(n)).resolve,a.reject,!t),"pending"===a.state()||g(i[n]&&i[n].then)))return a.then();while(n--)$(i[n],s(n),a.reject);return a.promise()}});var B=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;w.Deferred.exceptionHook=function(t,n){e.console&&e.console.warn&&t&&B.test(t.name)&&e.console.warn("jQuery.Deferred exception: "+t.message,t.stack,n)},w.readyException=function(t){e.setTimeout(function(){throw t})};var F=w.Deferred();w.fn.ready=function(e){return F.then(e)["catch"](function(e){w.readyException(e)}),this},w.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--w.readyWait:w.isReady)||(w.isReady=!0,!0!==e&&--w.readyWait>0||F.resolveWith(r,[w]))}}),w.ready.then=F.then;function _(){r.removeEventListener("DOMContentLoaded",_),e.removeEventListener("load",_),w.ready()}"complete"===r.readyState||"loading"!==r.readyState&&!r.documentElement.doScroll?e.setTimeout(w.ready):(r.addEventListener("DOMContentLoaded",_),e.addEventListener("load",_));var z=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===x(n)){i=!0;for(s in n)z(e,t,s,n[s],!0,o,a)}else if(void 0!==r&&(i=!0,g(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(w(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},X=/^-ms-/,U=/-([a-z])/g;function V(e,t){return t.toUpperCase()}function G(e){return e.replace(X,"ms-").replace(U,V)}var Y=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function Q(){this.expando=w.expando+Q.uid++}Q.uid=1,Q.prototype={cache:function(e){var t=e[this.expando];return t||(t={},Y(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[G(t)]=n;else for(r in t)i[G(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][G(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(G):(t=G(t))in r?[t]:t.match(M)||[]).length;while(n--)delete r[t[n]]}(void 0===t||w.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!w.isEmptyObject(t)}};var J=new Q,K=new Q,Z=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,ee=/[A-Z]/g;function te(e){return"true"===e||"false"!==e&&("null"===e?null:e===+e+""?+e:Z.test(e)?JSON.parse(e):e)}function ne(e,t,n){var r;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(ee,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n=te(n)}catch(e){}K.set(e,t,n)}else n=void 0;return n}w.extend({hasData:function(e){return K.hasData(e)||J.hasData(e)},data:function(e,t,n){return K.access(e,t,n)},removeData:function(e,t){K.remove(e,t)},_data:function(e,t,n){return J.access(e,t,n)},_removeData:function(e,t){J.remove(e,t)}}),w.fn.extend({data:function(e,t){var n,r,i,o=this[0],a=o&&o.attributes;if(void 0===e){if(this.length&&(i=K.get(o),1===o.nodeType&&!J.get(o,"hasDataAttrs"))){n=a.length;while(n--)a[n]&&0===(r=a[n].name).indexOf("data-")&&(r=G(r.slice(5)),ne(o,r,i[r]));J.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof e?this.each(function(){K.set(this,e)}):z(this,function(t){var n;if(o&&void 0===t){if(void 0!==(n=K.get(o,e)))return n;if(void 0!==(n=ne(o,e)))return n}else this.each(function(){K.set(this,e,t)})},null,t,arguments.length>1,null,!0)},removeData:function(e){return this.each(function(){K.remove(this,e)})}}),w.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=J.get(e,t),n&&(!r||Array.isArray(n)?r=J.access(e,t,w.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=w.queue(e,t),r=n.length,i=n.shift(),o=w._queueHooks(e,t),a=function(){w.dequeue(e,t)};"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,a,o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return J.get(e,n)||J.access(e,n,{empty:w.Callbacks("once memory").add(function(){J.remove(e,[t+"queue",n])})})}}),w.fn.extend({queue:function(e,t){var n=2;return"string"!=typeof e&&(t=e,e="fx",n--),arguments.length<n?w.queue(this[0],e):void 0===t?this:this.each(function(){var n=w.queue(this,e,t);w._queueHooks(this,e),"fx"===e&&"inprogress"!==n[0]&&w.dequeue(this,e)})},dequeue:function(e){return this.each(function(){w.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=w.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=J.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var re=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,ie=new RegExp("^(?:([+-])=|)("+re+")([a-z%]*)$","i"),oe=["Top","Right","Bottom","Left"],ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&w.contains(e.ownerDocument,e)&&"none"===w.css(e,"display")},se=function(e,t,n,r){var i,o,a={};for(o in t)a[o]=e.style[o],e.style[o]=t[o];i=n.apply(e,r||[]);for(o in t)e.style[o]=a[o];return i};function ue(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return w.css(e,t,"")},u=s(),l=n&&n[3]||(w.cssNumber[t]?"":"px"),c=(w.cssNumber[t]||"px"!==l&&+u)&&ie.exec(w.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)w.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,w.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var le={};function ce(e){var t,n=e.ownerDocument,r=e.nodeName,i=le[r];return i||(t=n.body.appendChild(n.createElement(r)),i=w.css(t,"display"),t.parentNode.removeChild(t),"none"===i&&(i="block"),le[r]=i,i)}function fe(e,t){for(var n,r,i=[],o=0,a=e.length;o<a;o++)(r=e[o]).style&&(n=r.style.display,t?("none"===n&&(i[o]=J.get(r,"display")||null,i[o]||(r.style.display="")),""===r.style.display&&ae(r)&&(i[o]=ce(r))):"none"!==n&&(i[o]="none",J.set(r,"display",n)));for(o=0;o<a;o++)null!=i[o]&&(e[o].style.display=i[o]);return e}w.fn.extend({show:function(){return fe(this,!0)},hide:function(){return fe(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?w(this).show():w(this).hide()})}});var pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]+)/i,he=/^$|^module$|\/(?:java|ecma)script/i,ge={option:[1,"<select multiple='multiple'>","</select>"],thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};ge.optgroup=ge.option,ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td;function ye(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&N(e,t)?w.merge([e],n):n}function ve(e,t){for(var n=0,r=e.length;n<r;n++)J.set(e[n],"globalEval",!t||J.get(t[n],"globalEval"))}var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===x(o))w.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+w.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;w.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&w.inArray(o,r)>-1)i&&i.push(o);else if(l=w.contains(o.ownerDocument,o),a=ye(f.appendChild(o),"script"),l&&ve(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}!function(){var e=r.createDocumentFragment().appendChild(r.createElement("div")),t=r.createElement("input");t.setAttribute("type","radio"),t.setAttribute("checked","checked"),t.setAttribute("name","t"),e.appendChild(t),h.checkClone=e.cloneNode(!0).cloneNode(!0).lastChild.checked,e.innerHTML="<textarea>x</textarea>",h.noCloneChecked=!!e.cloneNode(!0).lastChild.defaultValue}();var be=r.documentElement,we=/^key/,Te=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Ce=/^([^.]*)(?:\.(.+)|)/;function Ee(){return!0}function ke(){return!1}function Se(){try{return r.activeElement}catch(e){}}function De(e,t,n,r,i,o){var a,s;if("object"==typeof t){"string"!=typeof n&&(r=r||n,n=void 0);for(s in t)De(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=ke;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return w().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=w.guid++)),e.each(function(){w.event.add(this,t,i,r,n)})}w.event={global:{},add:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.get(e);if(y){n.handler&&(n=(o=n).handler,i=o.selector),i&&w.find.matchesSelector(be,i),n.guid||(n.guid=w.guid++),(u=y.events)||(u=y.events={}),(a=y.handle)||(a=y.handle=function(t){return"undefined"!=typeof w&&w.event.triggered!==t.type?w.event.dispatch.apply(e,arguments):void 0}),l=(t=(t||"").match(M)||[""]).length;while(l--)d=g=(s=Ce.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=w.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=w.event.special[d]||{},c=w.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&w.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(e,r,h,a)||e.addEventListener&&e.addEventListener(d,a)),f.add&&(f.add.call(e,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),w.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,y=J.hasData(e)&&J.get(e);if(y&&(u=y.events)){l=(t=(t||"").match(M)||[""]).length;while(l--)if(s=Ce.exec(t[l])||[],d=g=s[1],h=(s[2]||"").split(".").sort(),d){f=w.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,y.handle)||w.removeEvent(e,d,y.handle),delete u[d])}else for(d in u)w.event.remove(e,d+t[l],n,r,!0);w.isEmptyObject(u)&&J.remove(e,"handle events")}},dispatch:function(e){var t=w.event.fix(e),n,r,i,o,a,s,u=new Array(arguments.length),l=(J.get(this,"events")||{})[t.type]||[],c=w.event.special[t.type]||{};for(u[0]=t,n=1;n<arguments.length;n++)u[n]=arguments[n];if(t.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,t)){s=w.event.handlers.call(this,t,l),n=0;while((o=s[n++])&&!t.isPropagationStopped()){t.currentTarget=o.elem,r=0;while((a=o.handlers[r++])&&!t.isImmediatePropagationStopped())t.rnamespace&&!t.rnamespace.test(a.namespace)||(t.handleObj=a,t.data=a.data,void 0!==(i=((w.event.special[a.origType]||{}).handle||a.handler).apply(o.elem,u))&&!1===(t.result=i)&&(t.preventDefault(),t.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,t),t.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&e.button>=1))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?w(i,this).index(l)>-1:w.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(e,t){Object.defineProperty(w.Event.prototype,e,{enumerable:!0,configurable:!0,get:g(t)?function(){if(this.originalEvent)return t(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[e]},set:function(t){Object.defineProperty(this,e,{enumerable:!0,configurable:!0,writable:!0,value:t})}})},fix:function(e){return e[w.expando]?e:new w.Event(e)},special:{load:{noBubble:!0},focus:{trigger:function(){if(this!==Se()&&this.focus)return this.focus(),!1},delegateType:"focusin"},blur:{trigger:function(){if(this===Se()&&this.blur)return this.blur(),!1},delegateType:"focusout"},click:{trigger:function(){if("checkbox"===this.type&&this.click&&N(this,"input"))return this.click(),!1},_default:function(e){return N(e.target,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},w.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},w.Event=function(e,t){if(!(this instanceof w.Event))return new w.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ee:ke,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&w.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[w.expando]=!0},w.Event.prototype={constructor:w.Event,isDefaultPrevented:ke,isPropagationStopped:ke,isImmediatePropagationStopped:ke,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ee,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ee,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ee,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},w.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&we.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&Te.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},w.event.addProp),w.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,t){w.event.special[e]={delegateType:t,bindType:t,handle:function(e){var n,r=this,i=e.relatedTarget,o=e.handleObj;return i&&(i===r||w.contains(r,i))||(e.type=o.origType,n=o.handler.apply(this,arguments),e.type=t),n}}}),w.fn.extend({on:function(e,t,n,r){return De(this,e,t,n,r)},one:function(e,t,n,r){return De(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,w(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=ke),this.each(function(){w.event.remove(this,e,n,t)})}});var Ne=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([a-z][^\/\0>\x20\t\r\n\f]*)[^>]*)\/>/gi,Ae=/<script|<style|<link/i,je=/checked\s*(?:[^=]|=\s*.checked.)/i,qe=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function Le(e,t){return N(e,"table")&&N(11!==t.nodeType?t:t.firstChild,"tr")?w(e).children("tbody")[0]||e:e}function He(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function Oe(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Pe(e,t){var n,r,i,o,a,s,u,l;if(1===t.nodeType){if(J.hasData(e)&&(o=J.access(e),a=J.set(t,o),l=o.events)){delete a.handle,a.events={};for(i in l)for(n=0,r=l[i].length;n<r;n++)w.event.add(t,i,l[i][n])}K.hasData(e)&&(s=K.access(e),u=w.extend({},s),K.set(t,u))}}function Me(e,t){var n=t.nodeName.toLowerCase();"input"===n&&pe.test(e.type)?t.checked=e.checked:"input"!==n&&"textarea"!==n||(t.defaultValue=e.defaultValue)}function Re(e,t,n,r){t=a.apply([],t);var i,o,s,u,l,c,f=0,p=e.length,d=p-1,y=t[0],v=g(y);if(v||p>1&&"string"==typeof y&&!h.checkClone&&je.test(y))return e.each(function(i){var o=e.eq(i);v&&(t[0]=y.call(this,i,o.html())),Re(o,t,n,r)});if(p&&(i=xe(t,e[0].ownerDocument,!1,e,r),o=i.firstChild,1===i.childNodes.length&&(i=o),o||r)){for(u=(s=w.map(ye(i,"script"),He)).length;f<p;f++)l=i,f!==d&&(l=w.clone(l,!0,!0),u&&w.merge(s,ye(l,"script"))),n.call(e[f],l,f);if(u)for(c=s[s.length-1].ownerDocument,w.map(s,Oe),f=0;f<u;f++)l=s[f],he.test(l.type||"")&&!J.access(l,"globalEval")&&w.contains(c,l)&&(l.src&&"module"!==(l.type||"").toLowerCase()?w._evalUrl&&w._evalUrl(l.src):m(l.textContent.replace(qe,""),c,l))}return e}function Ie(e,t,n){for(var r,i=t?w.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||w.cleanData(ye(r)),r.parentNode&&(n&&w.contains(r.ownerDocument,r)&&ve(ye(r,"script")),r.parentNode.removeChild(r));return e}w.extend({htmlPrefilter:function(e){return e.replace(Ne,"<$1></$2>")},clone:function(e,t,n){var r,i,o,a,s=e.cloneNode(!0),u=w.contains(e.ownerDocument,e);if(!(h.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||w.isXMLDoc(e)))for(a=ye(s),r=0,i=(o=ye(e)).length;r<i;r++)Me(o[r],a[r]);if(t)if(n)for(o=o||ye(e),a=a||ye(s),r=0,i=o.length;r<i;r++)Pe(o[r],a[r]);else Pe(e,s);return(a=ye(s,"script")).length>0&&ve(a,!u&&ye(e,"script")),s},cleanData:function(e){for(var t,n,r,i=w.event.special,o=0;void 0!==(n=e[o]);o++)if(Y(n)){if(t=n[J.expando]){if(t.events)for(r in t.events)i[r]?w.event.remove(n,r):w.removeEvent(n,r,t.handle);n[J.expando]=void 0}n[K.expando]&&(n[K.expando]=void 0)}}}),w.fn.extend({detach:function(e){return Ie(this,e,!0)},remove:function(e){return Ie(this,e)},text:function(e){return z(this,function(e){return void 0===e?w.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Re(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||Le(this,e).appendChild(e)})},prepend:function(){return Re(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=Le(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Re(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(w.cleanData(ye(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return w.clone(this,e,t)})},html:function(e){return z(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ae.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=w.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(w.cleanData(ye(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var e=[];return Re(this,arguments,function(t){var n=this.parentNode;w.inArray(this,e)<0&&(w.cleanData(ye(this)),n&&n.replaceChild(t,this))},e)}}),w.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,t){w.fn[e]=function(e){for(var n,r=[],i=w(e),o=i.length-1,a=0;a<=o;a++)n=a===o?this:this.clone(!0),w(i[a])[t](n),s.apply(r,n.get());return this.pushStack(r)}});var We=new RegExp("^("+re+")(?!px)[a-z%]+$","i"),$e=function(t){var n=t.ownerDocument.defaultView;return n&&n.opener||(n=e),n.getComputedStyle(t)},Be=new RegExp(oe.join("|"),"i");!function(){function t(){if(c){l.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",c.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",be.appendChild(l).appendChild(c);var t=e.getComputedStyle(c);i="1%"!==t.top,u=12===n(t.marginLeft),c.style.right="60%",s=36===n(t.right),o=36===n(t.width),c.style.position="absolute",a=36===c.offsetWidth||"absolute",be.removeChild(l),c=null}}function n(e){return Math.round(parseFloat(e))}var i,o,a,s,u,l=r.createElement("div"),c=r.createElement("div");c.style&&(c.style.backgroundClip="content-box",c.cloneNode(!0).style.backgroundClip="",h.clearCloneStyle="content-box"===c.style.backgroundClip,w.extend(h,{boxSizingReliable:function(){return t(),o},pixelBoxStyles:function(){return t(),s},pixelPosition:function(){return t(),i},reliableMarginLeft:function(){return t(),u},scrollboxSize:function(){return t(),a}}))}();function Fe(e,t,n){var r,i,o,a,s=e.style;return(n=n||$e(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||w.contains(e.ownerDocument,e)||(a=w.style(e,t)),!h.pixelBoxStyles()&&We.test(a)&&Be.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function _e(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}var ze=/^(none|table(?!-c[ea]).+)/,Xe=/^--/,Ue={position:"absolute",visibility:"hidden",display:"block"},Ve={letterSpacing:"0",fontWeight:"400"},Ge=["Webkit","Moz","ms"],Ye=r.createElement("div").style;function Qe(e){if(e in Ye)return e;var t=e[0].toUpperCase()+e.slice(1),n=Ge.length;while(n--)if((e=Ge[n]+t)in Ye)return e}function Je(e){var t=w.cssProps[e];return t||(t=w.cssProps[e]=Qe(e)||e),t}function Ke(e,t,n){var r=ie.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Ze(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=w.css(e,n+oe[a],!0,i)),r?("content"===n&&(u-=w.css(e,"padding"+oe[a],!0,i)),"margin"!==n&&(u-=w.css(e,"border"+oe[a]+"Width",!0,i))):(u+=w.css(e,"padding"+oe[a],!0,i),"padding"!==n?u+=w.css(e,"border"+oe[a]+"Width",!0,i):s+=w.css(e,"border"+oe[a]+"Width",!0,i));return!r&&o>=0&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))),u}function et(e,t,n){var r=$e(e),i=Fe(e,t,r),o="border-box"===w.css(e,"boxSizing",!1,r),a=o;if(We.test(i)){if(!n)return i;i="auto"}return a=a&&(h.boxSizingReliable()||i===e.style[t]),("auto"===i||!parseFloat(i)&&"inline"===w.css(e,"display",!1,r))&&(i=e["offset"+t[0].toUpperCase()+t.slice(1)],a=!0),(i=parseFloat(i)||0)+Ze(e,t,n||(o?"border":"content"),a,r,i)+"px"}w.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Fe(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=G(t),u=Xe.test(t),l=e.style;if(u||(t=Je(s)),a=w.cssHooks[t]||w.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"==(o=typeof n)&&(i=ie.exec(n))&&i[1]&&(n=ue(e,t,i),o="number"),null!=n&&n===n&&("number"===o&&(n+=i&&i[3]||(w.cssNumber[s]?"":"px")),h.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=G(t);return Xe.test(t)||(t=Je(s)),(a=w.cssHooks[t]||w.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Fe(e,t,r)),"normal"===i&&t in Ve&&(i=Ve[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),w.each(["height","width"],function(e,t){w.cssHooks[t]={get:function(e,n,r){if(n)return!ze.test(w.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?et(e,t,r):se(e,Ue,function(){return et(e,t,r)})},set:function(e,n,r){var i,o=$e(e),a="border-box"===w.css(e,"boxSizing",!1,o),s=r&&Ze(e,t,r,a,o);return a&&h.scrollboxSize()===o.position&&(s-=Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-parseFloat(o[t])-Ze(e,t,"border",!1,o)-.5)),s&&(i=ie.exec(n))&&"px"!==(i[3]||"px")&&(e.style[t]=n,n=w.css(e,t)),Ke(e,n,s)}}}),w.cssHooks.marginLeft=_e(h.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Fe(e,"marginLeft"))||e.getBoundingClientRect().left-se(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),w.each({margin:"",padding:"",border:"Width"},function(e,t){w.cssHooks[e+t]={expand:function(n){for(var r=0,i={},o="string"==typeof n?n.split(" "):[n];r<4;r++)i[e+oe[r]+t]=o[r]||o[r-2]||o[0];return i}},"margin"!==e&&(w.cssHooks[e+t].set=Ke)}),w.fn.extend({css:function(e,t){return z(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=$e(e),i=t.length;a<i;a++)o[t[a]]=w.css(e,t[a],!1,r);return o}return void 0!==n?w.style(e,t,n):w.css(e,t)},e,t,arguments.length>1)}});function tt(e,t,n,r,i){return new tt.prototype.init(e,t,n,r,i)}w.Tween=tt,tt.prototype={constructor:tt,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||w.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(w.cssNumber[n]?"":"px")},cur:function(){var e=tt.propHooks[this.prop];return e&&e.get?e.get(this):tt.propHooks._default.get(this)},run:function(e){var t,n=tt.propHooks[this.prop];return this.options.duration?this.pos=t=w.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):tt.propHooks._default.set(this),this}},tt.prototype.init.prototype=tt.prototype,tt.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=w.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){w.fx.step[e.prop]?w.fx.step[e.prop](e):1!==e.elem.nodeType||null==e.elem.style[w.cssProps[e.prop]]&&!w.cssHooks[e.prop]?e.elem[e.prop]=e.now:w.style(e.elem,e.prop,e.now+e.unit)}}},tt.propHooks.scrollTop=tt.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},w.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},w.fx=tt.prototype.init,w.fx.step={};var nt,rt,it=/^(?:toggle|show|hide)$/,ot=/queueHooks$/;function at(){rt&&(!1===r.hidden&&e.requestAnimationFrame?e.requestAnimationFrame(at):e.setTimeout(at,w.fx.interval),w.fx.tick())}function st(){return e.setTimeout(function(){nt=void 0}),nt=Date.now()}function ut(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=oe[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function lt(e,t,n){for(var r,i=(pt.tweeners[t]||[]).concat(pt.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function ct(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),y=J.get(e,"fxshow");n.queue||(null==(a=w._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,w.queue(e,"fx").length||a.empty.fire()})}));for(r in t)if(i=t[r],it.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!y||void 0===y[r])continue;g=!0}d[r]=y&&y[r]||w.style(e,r)}if((u=!w.isEmptyObject(t))||!w.isEmptyObject(d)){f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=y&&y.display)&&(l=J.get(e,"display")),"none"===(c=w.css(e,"display"))&&(l?c=l:(fe([e],!0),l=e.style.display||l,c=w.css(e,"display"),fe([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===w.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1;for(r in d)u||(y?"hidden"in y&&(g=y.hidden):y=J.access(e,"fxshow",{display:l}),o&&(y.hidden=!g),g&&fe([e],!0),p.done(function(){g||fe([e]),J.remove(e,"fxshow");for(r in d)w.style(e,r,d[r])})),u=lt(g?y[r]:0,r,p),r in y||(y[r]=u.start,g&&(u.end=u.start,u.start=0))}}function ft(e,t){var n,r,i,o,a;for(n in e)if(r=G(n),i=t[r],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=w.cssHooks[r])&&"expand"in a){o=a.expand(o),delete e[r];for(n in o)n in e||(e[n]=o[n],t[n]=i)}else t[r]=i}function pt(e,t,n){var r,i,o=0,a=pt.prefilters.length,s=w.Deferred().always(function(){delete u.elem}),u=function(){if(i)return!1;for(var t=nt||st(),n=Math.max(0,l.startTime+l.duration-t),r=1-(n/l.duration||0),o=0,a=l.tweens.length;o<a;o++)l.tweens[o].run(r);return s.notifyWith(e,[l,r,n]),r<1&&a?n:(a||s.notifyWith(e,[l,1,0]),s.resolveWith(e,[l]),!1)},l=s.promise({elem:e,props:w.extend({},t),opts:w.extend(!0,{specialEasing:{},easing:w.easing._default},n),originalProperties:t,originalOptions:n,startTime:nt||st(),duration:n.duration,tweens:[],createTween:function(t,n){var r=w.Tween(e,l.opts,t,n,l.opts.specialEasing[t]||l.opts.easing);return l.tweens.push(r),r},stop:function(t){var n=0,r=t?l.tweens.length:0;if(i)return this;for(i=!0;n<r;n++)l.tweens[n].run(1);return t?(s.notifyWith(e,[l,1,0]),s.resolveWith(e,[l,t])):s.rejectWith(e,[l,t]),this}}),c=l.props;for(ft(c,l.opts.specialEasing);o<a;o++)if(r=pt.prefilters[o].call(l,e,c,l.opts))return g(r.stop)&&(w._queueHooks(l.elem,l.opts.queue).stop=r.stop.bind(r)),r;return w.map(c,lt,l),g(l.opts.start)&&l.opts.start.call(e,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),w.fx.timer(w.extend(u,{elem:e,anim:l,queue:l.opts.queue})),l}w.Animation=w.extend(pt,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return ue(n.elem,e,ie.exec(t),n),n}]},tweener:function(e,t){g(e)?(t=e,e=["*"]):e=e.match(M);for(var n,r=0,i=e.length;r<i;r++)n=e[r],pt.tweeners[n]=pt.tweeners[n]||[],pt.tweeners[n].unshift(t)},prefilters:[ct],prefilter:function(e,t){t?pt.prefilters.unshift(e):pt.prefilters.push(e)}}),w.speed=function(e,t,n){var r=e&&"object"==typeof e?w.extend({},e):{complete:n||!n&&t||g(e)&&e,duration:e,easing:n&&t||t&&!g(t)&&t};return w.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in w.fx.speeds?r.duration=w.fx.speeds[r.duration]:r.duration=w.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){g(r.old)&&r.old.call(this),r.queue&&w.dequeue(this,r.queue)},r},w.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(e,t,n,r){var i=w.isEmptyObject(e),o=w.speed(t,n,r),a=function(){var t=pt(this,w.extend({},e),o);(i||J.get(this,"finish"))&&t.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(e,t,n){var r=function(e){var t=e.stop;delete e.stop,t(n)};return"string"!=typeof e&&(n=t,t=e,e=void 0),t&&!1!==e&&this.queue(e||"fx",[]),this.each(function(){var t=!0,i=null!=e&&e+"queueHooks",o=w.timers,a=J.get(this);if(i)a[i]&&a[i].stop&&r(a[i]);else for(i in a)a[i]&&a[i].stop&&ot.test(i)&&r(a[i]);for(i=o.length;i--;)o[i].elem!==this||null!=e&&o[i].queue!==e||(o[i].anim.stop(n),t=!1,o.splice(i,1));!t&&n||w.dequeue(this,e)})},finish:function(e){return!1!==e&&(e=e||"fx"),this.each(function(){var t,n=J.get(this),r=n[e+"queue"],i=n[e+"queueHooks"],o=w.timers,a=r?r.length:0;for(n.finish=!0,w.queue(this,e,[]),i&&i.stop&&i.stop.call(this,!0),t=o.length;t--;)o[t].elem===this&&o[t].queue===e&&(o[t].anim.stop(!0),o.splice(t,1));for(t=0;t<a;t++)r[t]&&r[t].finish&&r[t].finish.call(this);delete n.finish})}}),w.each(["toggle","show","hide"],function(e,t){var n=w.fn[t];w.fn[t]=function(e,r,i){return null==e||"boolean"==typeof e?n.apply(this,arguments):this.animate(ut(t,!0),e,r,i)}}),w.each({slideDown:ut("show"),slideUp:ut("hide"),slideToggle:ut("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,t){w.fn[e]=function(e,n,r){return this.animate(t,e,n,r)}}),w.timers=[],w.fx.tick=function(){var e,t=0,n=w.timers;for(nt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||w.fx.stop(),nt=void 0},w.fx.timer=function(e){w.timers.push(e),w.fx.start()},w.fx.interval=13,w.fx.start=function(){rt||(rt=!0,at())},w.fx.stop=function(){rt=null},w.fx.speeds={slow:600,fast:200,_default:400},w.fn.delay=function(t,n){return t=w.fx?w.fx.speeds[t]||t:t,n=n||"fx",this.queue(n,function(n,r){var i=e.setTimeout(n,t);r.stop=function(){e.clearTimeout(i)}})},function(){var e=r.createElement("input"),t=r.createElement("select").appendChild(r.createElement("option"));e.type="checkbox",h.checkOn=""!==e.value,h.optSelected=t.selected,(e=r.createElement("input")).value="t",e.type="radio",h.radioValue="t"===e.value}();var dt,ht=w.expr.attrHandle;w.fn.extend({attr:function(e,t){return z(this,w.attr,e,t,arguments.length>1)},removeAttr:function(e){return this.each(function(){w.removeAttr(this,e)})}}),w.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?w.prop(e,t,n):(1===o&&w.isXMLDoc(e)||(i=w.attrHooks[t.toLowerCase()]||(w.expr.match.bool.test(t)?dt:void 0)),void 0!==n?null===n?void w.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=w.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!h.radioValue&&"radio"===t&&N(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(M);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),dt={set:function(e,t,n){return!1===t?w.removeAttr(e,n):e.setAttribute(n,n),n}},w.each(w.expr.match.bool.source.match(/\w+/g),function(e,t){var n=ht[t]||w.find.attr;ht[t]=function(e,t,r){var i,o,a=t.toLowerCase();return r||(o=ht[a],ht[a]=i,i=null!=n(e,t,r)?a:null,ht[a]=o),i}});var gt=/^(?:input|select|textarea|button)$/i,yt=/^(?:a|area)$/i;w.fn.extend({prop:function(e,t){return z(this,w.prop,e,t,arguments.length>1)},removeProp:function(e){return this.each(function(){delete this[w.propFix[e]||e]})}}),w.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&w.isXMLDoc(e)||(t=w.propFix[t]||t,i=w.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=w.find.attr(e,"tabindex");return t?parseInt(t,10):gt.test(e.nodeName)||yt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),h.optSelected||(w.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),w.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){w.propFix[this.toLowerCase()]=this});function vt(e){return(e.match(M)||[]).join(" ")}function mt(e){return e.getAttribute&&e.getAttribute("class")||""}function xt(e){return Array.isArray(e)?e:"string"==typeof e?e.match(M)||[]:[]}w.fn.extend({addClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).addClass(e.call(this,t,mt(this)))});if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(e){var t,n,r,i,o,a,s,u=0;if(g(e))return this.each(function(t){w(this).removeClass(e.call(this,t,mt(this)))});if(!arguments.length)return this.attr("class","");if((t=xt(e)).length)while(n=this[u++])if(i=mt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=t[a++])while(r.indexOf(" "+o+" ")>-1)r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(e,t){var n=typeof e,r="string"===n||Array.isArray(e);return"boolean"==typeof t&&r?t?this.addClass(e):this.removeClass(e):g(e)?this.each(function(n){w(this).toggleClass(e.call(this,n,mt(this),t),t)}):this.each(function(){var t,i,o,a;if(r){i=0,o=w(this),a=xt(e);while(t=a[i++])o.hasClass(t)?o.removeClass(t):o.addClass(t)}else void 0!==e&&"boolean"!==n||((t=mt(this))&&J.set(this,"__className__",t),this.setAttribute&&this.setAttribute("class",t||!1===e?"":J.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&(" "+vt(mt(n))+" ").indexOf(t)>-1)return!0;return!1}});var bt=/\r/g;w.fn.extend({val:function(e){var t,n,r,i=this[0];{if(arguments.length)return r=g(e),this.each(function(n){var i;1===this.nodeType&&(null==(i=r?e.call(this,n,w(this).val()):e)?i="":"number"==typeof i?i+="":Array.isArray(i)&&(i=w.map(i,function(e){return null==e?"":e+""})),(t=w.valHooks[this.type]||w.valHooks[this.nodeName.toLowerCase()])&&"set"in t&&void 0!==t.set(this,i,"value")||(this.value=i))});if(i)return(t=w.valHooks[i.type]||w.valHooks[i.nodeName.toLowerCase()])&&"get"in t&&void 0!==(n=t.get(i,"value"))?n:"string"==typeof(n=i.value)?n.replace(bt,""):null==n?"":n}}}),w.extend({valHooks:{option:{get:function(e){var t=w.find.attr(e,"value");return null!=t?t:vt(w.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!N(n.parentNode,"optgroup"))){if(t=w(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=w.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=w.inArray(w.valHooks.option.get(r),o)>-1)&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),w.each(["radio","checkbox"],function(){w.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=w.inArray(w(e).val(),t)>-1}},h.checkOn||(w.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),h.focusin="onfocusin"in e;var wt=/^(?:focusinfocus|focusoutblur)$/,Tt=function(e){e.stopPropagation()};w.extend(w.event,{trigger:function(t,n,i,o){var a,s,u,l,c,p,d,h,v=[i||r],m=f.call(t,"type")?t.type:t,x=f.call(t,"namespace")?t.namespace.split("."):[];if(s=h=u=i=i||r,3!==i.nodeType&&8!==i.nodeType&&!wt.test(m+w.event.triggered)&&(m.indexOf(".")>-1&&(m=(x=m.split(".")).shift(),x.sort()),c=m.indexOf(":")<0&&"on"+m,t=t[w.expando]?t:new w.Event(m,"object"==typeof t&&t),t.isTrigger=o?2:3,t.namespace=x.join("."),t.rnamespace=t.namespace?new RegExp("(^|\\.)"+x.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,t.result=void 0,t.target||(t.target=i),n=null==n?[t]:w.makeArray(n,[t]),d=w.event.special[m]||{},o||!d.trigger||!1!==d.trigger.apply(i,n))){if(!o&&!d.noBubble&&!y(i)){for(l=d.delegateType||m,wt.test(l+m)||(s=s.parentNode);s;s=s.parentNode)v.push(s),u=s;u===(i.ownerDocument||r)&&v.push(u.defaultView||u.parentWindow||e)}a=0;while((s=v[a++])&&!t.isPropagationStopped())h=s,t.type=a>1?l:d.bindType||m,(p=(J.get(s,"events")||{})[t.type]&&J.get(s,"handle"))&&p.apply(s,n),(p=c&&s[c])&&p.apply&&Y(s)&&(t.result=p.apply(s,n),!1===t.result&&t.preventDefault());return t.type=m,o||t.isDefaultPrevented()||d._default&&!1!==d._default.apply(v.pop(),n)||!Y(i)||c&&g(i[m])&&!y(i)&&((u=i[c])&&(i[c]=null),w.event.triggered=m,t.isPropagationStopped()&&h.addEventListener(m,Tt),i[m](),t.isPropagationStopped()&&h.removeEventListener(m,Tt),w.event.triggered=void 0,u&&(i[c]=u)),t.result}},simulate:function(e,t,n){var r=w.extend(new w.Event,n,{type:e,isSimulated:!0});w.event.trigger(r,null,t)}}),w.fn.extend({trigger:function(e,t){return this.each(function(){w.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return w.event.trigger(e,t,n,!0)}}),h.focusin||w.each({focus:"focusin",blur:"focusout"},function(e,t){var n=function(e){w.event.simulate(t,e.target,w.event.fix(e))};w.event.special[t]={setup:function(){var r=this.ownerDocument||this,i=J.access(r,t);i||r.addEventListener(e,n,!0),J.access(r,t,(i||0)+1)},teardown:function(){var r=this.ownerDocument||this,i=J.access(r,t)-1;i?J.access(r,t,i):(r.removeEventListener(e,n,!0),J.remove(r,t))}}});var Ct=e.location,Et=Date.now(),kt=/\?/;w.parseXML=function(t){var n;if(!t||"string"!=typeof t)return null;try{n=(new e.DOMParser).parseFromString(t,"text/xml")}catch(e){n=void 0}return n&&!n.getElementsByTagName("parsererror").length||w.error("Invalid XML: "+t),n};var St=/\[\]$/,Dt=/\r?\n/g,Nt=/^(?:submit|button|image|reset|file)$/i,At=/^(?:input|select|textarea|keygen)/i;function jt(e,t,n,r){var i;if(Array.isArray(t))w.each(t,function(t,i){n||St.test(e)?r(e,i):jt(e+"["+("object"==typeof i&&null!=i?t:"")+"]",i,n,r)});else if(n||"object"!==x(t))r(e,t);else for(i in t)jt(e+"["+i+"]",t[i],n,r)}w.param=function(e,t){var n,r=[],i=function(e,t){var n=g(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(Array.isArray(e)||e.jquery&&!w.isPlainObject(e))w.each(e,function(){i(this.name,this.value)});else for(n in e)jt(n,e[n],t,i);return r.join("&")},w.fn.extend({serialize:function(){return w.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=w.prop(this,"elements");return e?w.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!w(this).is(":disabled")&&At.test(this.nodeName)&&!Nt.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=w(this).val();return null==n?null:Array.isArray(n)?w.map(n,function(e){return{name:t.name,value:e.replace(Dt,"\r\n")}}):{name:t.name,value:n.replace(Dt,"\r\n")}}).get()}});var qt=/%20/g,Lt=/#.*$/,Ht=/([?&])_=[^&]*/,Ot=/^(.*?):[ \t]*([^\r\n]*)$/gm,Pt=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,Mt=/^(?:GET|HEAD)$/,Rt=/^\/\//,It={},Wt={},$t="*/".concat("*"),Bt=r.createElement("a");Bt.href=Ct.href;function Ft(e){return function(t,n){"string"!=typeof t&&(n=t,t="*");var r,i=0,o=t.toLowerCase().match(M)||[];if(g(n))while(r=o[i++])"+"===r[0]?(r=r.slice(1)||"*",(e[r]=e[r]||[]).unshift(n)):(e[r]=e[r]||[]).push(n)}}function _t(e,t,n,r){var i={},o=e===Wt;function a(s){var u;return i[s]=!0,w.each(e[s]||[],function(e,s){var l=s(t,n,r);return"string"!=typeof l||o||i[l]?o?!(u=l):void 0:(t.dataTypes.unshift(l),a(l),!1)}),u}return a(t.dataTypes[0])||!i["*"]&&a("*")}function zt(e,t){var n,r,i=w.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&w.extend(!0,e,r),e}function Xt(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}function Ut(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}w.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Ct.href,type:"GET",isLocal:Pt.test(Ct.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":$t,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":w.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?zt(zt(e,w.ajaxSettings),t):zt(w.ajaxSettings,e)},ajaxPrefilter:Ft(It),ajaxTransport:Ft(Wt),ajax:function(t,n){"object"==typeof t&&(n=t,t=void 0),n=n||{};var i,o,a,s,u,l,c,f,p,d,h=w.ajaxSetup({},n),g=h.context||h,y=h.context&&(g.nodeType||g.jquery)?w(g):w.event,v=w.Deferred(),m=w.Callbacks("once memory"),x=h.statusCode||{},b={},T={},C="canceled",E={readyState:0,getResponseHeader:function(e){var t;if(c){if(!s){s={};while(t=Ot.exec(a))s[t[1].toLowerCase()]=t[2]}t=s[e.toLowerCase()]}return null==t?null:t},getAllResponseHeaders:function(){return c?a:null},setRequestHeader:function(e,t){return null==c&&(e=T[e.toLowerCase()]=T[e.toLowerCase()]||e,b[e]=t),this},overrideMimeType:function(e){return null==c&&(h.mimeType=e),this},statusCode:function(e){var t;if(e)if(c)E.always(e[E.status]);else for(t in e)x[t]=[x[t],e[t]];return this},abort:function(e){var t=e||C;return i&&i.abort(t),k(0,t),this}};if(v.promise(E),h.url=((t||h.url||Ct.href)+"").replace(Rt,Ct.protocol+"//"),h.type=n.method||n.type||h.method||h.type,h.dataTypes=(h.dataType||"*").toLowerCase().match(M)||[""],null==h.crossDomain){l=r.createElement("a");try{l.href=h.url,l.href=l.href,h.crossDomain=Bt.protocol+"//"+Bt.host!=l.protocol+"//"+l.host}catch(e){h.crossDomain=!0}}if(h.data&&h.processData&&"string"!=typeof h.data&&(h.data=w.param(h.data,h.traditional)),_t(It,h,n,E),c)return E;(f=w.event&&h.global)&&0==w.active++&&w.event.trigger("ajaxStart"),h.type=h.type.toUpperCase(),h.hasContent=!Mt.test(h.type),o=h.url.replace(Lt,""),h.hasContent?h.data&&h.processData&&0===(h.contentType||"").indexOf("application/x-www-form-urlencoded")&&(h.data=h.data.replace(qt,"+")):(d=h.url.slice(o.length),h.data&&(h.processData||"string"==typeof h.data)&&(o+=(kt.test(o)?"&":"?")+h.data,delete h.data),!1===h.cache&&(o=o.replace(Ht,"$1"),d=(kt.test(o)?"&":"?")+"_="+Et+++d),h.url=o+d),h.ifModified&&(w.lastModified[o]&&E.setRequestHeader("If-Modified-Since",w.lastModified[o]),w.etag[o]&&E.setRequestHeader("If-None-Match",w.etag[o])),(h.data&&h.hasContent&&!1!==h.contentType||n.contentType)&&E.setRequestHeader("Content-Type",h.contentType),E.setRequestHeader("Accept",h.dataTypes[0]&&h.accepts[h.dataTypes[0]]?h.accepts[h.dataTypes[0]]+("*"!==h.dataTypes[0]?", "+$t+"; q=0.01":""):h.accepts["*"]);for(p in h.headers)E.setRequestHeader(p,h.headers[p]);if(h.beforeSend&&(!1===h.beforeSend.call(g,E,h)||c))return E.abort();if(C="abort",m.add(h.complete),E.done(h.success),E.fail(h.error),i=_t(Wt,h,n,E)){if(E.readyState=1,f&&y.trigger("ajaxSend",[E,h]),c)return E;h.async&&h.timeout>0&&(u=e.setTimeout(function(){E.abort("timeout")},h.timeout));try{c=!1,i.send(b,k)}catch(e){if(c)throw e;k(-1,e)}}else k(-1,"No Transport");function k(t,n,r,s){var l,p,d,b,T,C=n;c||(c=!0,u&&e.clearTimeout(u),i=void 0,a=s||"",E.readyState=t>0?4:0,l=t>=200&&t<300||304===t,r&&(b=Xt(h,E,r)),b=Ut(h,b,E,l),l?(h.ifModified&&((T=E.getResponseHeader("Last-Modified"))&&(w.lastModified[o]=T),(T=E.getResponseHeader("etag"))&&(w.etag[o]=T)),204===t||"HEAD"===h.type?C="nocontent":304===t?C="notmodified":(C=b.state,p=b.data,l=!(d=b.error))):(d=C,!t&&C||(C="error",t<0&&(t=0))),E.status=t,E.statusText=(n||C)+"",l?v.resolveWith(g,[p,C,E]):v.rejectWith(g,[E,C,d]),E.statusCode(x),x=void 0,f&&y.trigger(l?"ajaxSuccess":"ajaxError",[E,h,l?p:d]),m.fireWith(g,[E,C]),f&&(y.trigger("ajaxComplete",[E,h]),--w.active||w.event.trigger("ajaxStop")))}return E},getJSON:function(e,t,n){return w.get(e,t,n,"json")},getScript:function(e,t){return w.get(e,void 0,t,"script")}}),w.each(["get","post"],function(e,t){w[t]=function(e,n,r,i){return g(n)&&(i=i||r,r=n,n=void 0),w.ajax(w.extend({url:e,type:t,dataType:i,data:n,success:r},w.isPlainObject(e)&&e))}}),w._evalUrl=function(e){return w.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,"throws":!0})},w.fn.extend({wrapAll:function(e){var t;return this[0]&&(g(e)&&(e=e.call(this[0])),t=w(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(e){return g(e)?this.each(function(t){w(this).wrapInner(e.call(this,t))}):this.each(function(){var t=w(this),n=t.contents();n.length?n.wrapAll(e):t.append(e)})},wrap:function(e){var t=g(e);return this.each(function(n){w(this).wrapAll(t?e.call(this,n):e)})},unwrap:function(e){return this.parent(e).not("body").each(function(){w(this).replaceWith(this.childNodes)}),this}}),w.expr.pseudos.hidden=function(e){return!w.expr.pseudos.visible(e)},w.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},w.ajaxSettings.xhr=function(){try{return new e.XMLHttpRequest}catch(e){}};var Vt={0:200,1223:204},Gt=w.ajaxSettings.xhr();h.cors=!!Gt&&"withCredentials"in Gt,h.ajax=Gt=!!Gt,w.ajaxTransport(function(t){var n,r;if(h.cors||Gt&&!t.crossDomain)return{send:function(i,o){var a,s=t.xhr();if(s.open(t.type,t.url,t.async,t.username,t.password),t.xhrFields)for(a in t.xhrFields)s[a]=t.xhrFields[a];t.mimeType&&s.overrideMimeType&&s.overrideMimeType(t.mimeType),t.crossDomain||i["X-Requested-With"]||(i["X-Requested-With"]="XMLHttpRequest");for(a in i)s.setRequestHeader(a,i[a]);n=function(e){return function(){n&&(n=r=s.onload=s.onerror=s.onabort=s.ontimeout=s.onreadystatechange=null,"abort"===e?s.abort():"error"===e?"number"!=typeof s.status?o(0,"error"):o(s.status,s.statusText):o(Vt[s.status]||s.status,s.statusText,"text"!==(s.responseType||"text")||"string"!=typeof s.responseText?{binary:s.response}:{text:s.responseText},s.getAllResponseHeaders()))}},s.onload=n(),r=s.onerror=s.ontimeout=n("error"),void 0!==s.onabort?s.onabort=r:s.onreadystatechange=function(){4===s.readyState&&e.setTimeout(function(){n&&r()})},n=n("abort");try{s.send(t.hasContent&&t.data||null)}catch(e){if(n)throw e}},abort:function(){n&&n()}}}),w.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),w.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return w.globalEval(e),e}}}),w.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),w.ajaxTransport("script",function(e){if(e.crossDomain){var t,n;return{send:function(i,o){t=w("<script>").prop({charset:e.scriptCharset,src:e.url}).on("load error",n=function(e){t.remove(),n=null,e&&o("error"===e.type?404:200,e.type)}),r.head.appendChild(t[0])},abort:function(){n&&n()}}}});var Yt=[],Qt=/(=)\?(?=&|$)|\?\?/;w.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Yt.pop()||w.expando+"_"+Et++;return this[e]=!0,e}}),w.ajaxPrefilter("json jsonp",function(t,n,r){var i,o,a,s=!1!==t.jsonp&&(Qt.test(t.url)?"url":"string"==typeof t.data&&0===(t.contentType||"").indexOf("application/x-www-form-urlencoded")&&Qt.test(t.data)&&"data");if(s||"jsonp"===t.dataTypes[0])return i=t.jsonpCallback=g(t.jsonpCallback)?t.jsonpCallback():t.jsonpCallback,s?t[s]=t[s].replace(Qt,"$1"+i):!1!==t.jsonp&&(t.url+=(kt.test(t.url)?"&":"?")+t.jsonp+"="+i),t.converters["script json"]=function(){return a||w.error(i+" was not called"),a[0]},t.dataTypes[0]="json",o=e[i],e[i]=function(){a=arguments},r.always(function(){void 0===o?w(e).removeProp(i):e[i]=o,t[i]&&(t.jsonpCallback=n.jsonpCallback,Yt.push(i)),a&&g(o)&&o(a[0]),a=o=void 0}),"script"}),h.createHTMLDocument=function(){var e=r.implementation.createHTMLDocument("").body;return e.innerHTML="<form></form><form></form>",2===e.childNodes.length}(),w.parseHTML=function(e,t,n){if("string"!=typeof e)return[];"boolean"==typeof t&&(n=t,t=!1);var i,o,a;return t||(h.createHTMLDocument?((i=(t=r.implementation.createHTMLDocument("")).createElement("base")).href=r.location.href,t.head.appendChild(i)):t=r),o=A.exec(e),a=!n&&[],o?[t.createElement(o[1])]:(o=xe([e],t,a),a&&a.length&&w(a).remove(),w.merge([],o.childNodes))},w.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return s>-1&&(r=vt(e.slice(s)),e=e.slice(0,s)),g(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),a.length>0&&w.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?w("<div>").append(w.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},w.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){w.fn[t]=function(e){return this.on(t,e)}}),w.expr.pseudos.animated=function(e){return w.grep(w.timers,function(t){return e===t.elem}).length},w.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l,c=w.css(e,"position"),f=w(e),p={};"static"===c&&(e.style.position="relative"),s=f.offset(),o=w.css(e,"top"),u=w.css(e,"left"),(l=("absolute"===c||"fixed"===c)&&(o+u).indexOf("auto")>-1)?(a=(r=f.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),g(t)&&(t=t.call(e,n,w.extend({},s))),null!=t.top&&(p.top=t.top-s.top+a),null!=t.left&&(p.left=t.left-s.left+i),"using"in t?t.using.call(e,p):f.css(p)}},w.fn.extend({offset:function(e){if(arguments.length)return void 0===e?this:this.each(function(t){w.offset.setOffset(this,e,t)});var t,n,r=this[0];if(r)return r.getClientRects().length?(t=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:t.top+n.pageYOffset,left:t.left+n.pageXOffset}):{top:0,left:0}},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===w.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===w.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=w(e).offset()).top+=w.css(e,"borderTopWidth",!0),i.left+=w.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-w.css(r,"marginTop",!0),left:t.left-i.left-w.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===w.css(e,"position"))e=e.offsetParent;return e||be})}}),w.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(e,t){var n="pageYOffset"===t;w.fn[e]=function(r){return z(this,function(e,r,i){var o;if(y(e)?o=e:9===e.nodeType&&(o=e.defaultView),void 0===i)return o?o[t]:e[r];o?o.scrollTo(n?o.pageXOffset:i,n?i:o.pageYOffset):e[r]=i},e,r,arguments.length)}}),w.each(["top","left"],function(e,t){w.cssHooks[t]=_e(h.pixelPosition,function(e,n){if(n)return n=Fe(e,t),We.test(n)?w(e).position()[t]+"px":n})}),w.each({Height:"height",Width:"width"},function(e,t){w.each({padding:"inner"+e,content:t,"":"outer"+e},function(n,r){w.fn[r]=function(i,o){var a=arguments.length&&(n||"boolean"!=typeof i),s=n||(!0===i||!0===o?"margin":"border");return z(this,function(t,n,i){var o;return y(t)?0===r.indexOf("outer")?t["inner"+e]:t.document.documentElement["client"+e]:9===t.nodeType?(o=t.documentElement,Math.max(t.body["scroll"+e],o["scroll"+e],t.body["offset"+e],o["offset"+e],o["client"+e])):void 0===i?w.css(t,n,s):w.style(t,n,i,s)},t,a?i:void 0,a)}})}),w.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,t){w.fn[t]=function(e,n){return arguments.length>0?this.on(t,null,e,n):this.trigger(t)}}),w.fn.extend({hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),w.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)}}),w.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),g(e))return r=o.call(arguments,2),i=function(){return e.apply(t||this,r.concat(o.call(arguments)))},i.guid=e.guid=e.guid||w.guid++,i},w.holdReady=function(e){e?w.readyWait++:w.ready(!0)},w.isArray=Array.isArray,w.parseJSON=JSON.parse,w.nodeName=N,w.isFunction=g,w.isWindow=y,w.camelCase=G,w.type=x,w.now=Date.now,w.isNumeric=function(e){var t=w.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},"function"==typeof define&&define.amd&&define("jquery",[],function(){return w});var Jt=e.jQuery,Kt=e.$;return w.noConflict=function(t){return e.$===w&&(e.$=Kt),t&&e.jQuery===w&&(e.jQuery=Jt),w},t||(e.jQuery=e.$=w),w});
+/*! jQuery v3.5.1 | (c) JS Foundation and other contributors | jquery.org/license */
+!function(e,t){"use strict";"object"==typeof module&&"object"==typeof module.exports?module.exports=e.document?t(e,!0):function(e){if(!e.document)throw new Error("jQuery requires a window with a document");return t(e)}:t(e)}("undefined"!=typeof window?window:this,function(C,e){"use strict";var t=[],r=Object.getPrototypeOf,s=t.slice,g=t.flat?function(e){return t.flat.call(e)}:function(e){return t.concat.apply([],e)},u=t.push,i=t.indexOf,n={},o=n.toString,v=n.hasOwnProperty,a=v.toString,l=a.call(Object),y={},m=function(e){return"function"==typeof e&&"number"!=typeof e.nodeType},x=function(e){return null!=e&&e===e.window},E=C.document,c={type:!0,src:!0,nonce:!0,noModule:!0};function b(e,t,n){var r,i,o=(n=n||E).createElement("script");if(o.text=e,t)for(r in c)(i=t[r]||t.getAttribute&&t.getAttribute(r))&&o.setAttribute(r,i);n.head.appendChild(o).parentNode.removeChild(o)}function w(e){return null==e?e+"":"object"==typeof e||"function"==typeof e?n[o.call(e)]||"object":typeof e}var f="3.5.1",S=function(e,t){return new S.fn.init(e,t)};function p(e){var t=!!e&&"length"in e&&e.length,n=w(e);return!m(e)&&!x(e)&&("array"===n||0===t||"number"==typeof t&&0<t&&t-1 in e)}S.fn=S.prototype={jquery:f,constructor:S,length:0,toArray:function(){return s.call(this)},get:function(e){return null==e?s.call(this):e<0?this[e+this.length]:this[e]},pushStack:function(e){var t=S.merge(this.constructor(),e);return t.prevObject=this,t},each:function(e){return S.each(this,e)},map:function(n){return this.pushStack(S.map(this,function(e,t){return n.call(e,t,e)}))},slice:function(){return this.pushStack(s.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},even:function(){return this.pushStack(S.grep(this,function(e,t){return(t+1)%2}))},odd:function(){return this.pushStack(S.grep(this,function(e,t){return t%2}))},eq:function(e){var t=this.length,n=+e+(e<0?t:0);return this.pushStack(0<=n&&n<t?[this[n]]:[])},end:function(){return this.prevObject||this.constructor()},push:u,sort:t.sort,splice:t.splice},S.extend=S.fn.extend=function(){var e,t,n,r,i,o,a=arguments[0]||{},s=1,u=arguments.length,l=!1;for("boolean"==typeof a&&(l=a,a=arguments[s]||{},s++),"object"==typeof a||m(a)||(a={}),s===u&&(a=this,s--);s<u;s++)if(null!=(e=arguments[s]))for(t in e)r=e[t],"__proto__"!==t&&a!==r&&(l&&r&&(S.isPlainObject(r)||(i=Array.isArray(r)))?(n=a[t],o=i&&!Array.isArray(n)?[]:i||S.isPlainObject(n)?n:{},i=!1,a[t]=S.extend(l,o,r)):void 0!==r&&(a[t]=r));return a},S.extend({expando:"jQuery"+(f+Math.random()).replace(/\D/g,""),isReady:!0,error:function(e){throw new Error(e)},noop:function(){},isPlainObject:function(e){var t,n;return!(!e||"[object Object]"!==o.call(e))&&(!(t=r(e))||"function"==typeof(n=v.call(t,"constructor")&&t.constructor)&&a.call(n)===l)},isEmptyObject:function(e){var t;for(t in e)return!1;return!0},globalEval:function(e,t,n){b(e,{nonce:t&&t.nonce},n)},each:function(e,t){var n,r=0;if(p(e)){for(n=e.length;r<n;r++)if(!1===t.call(e[r],r,e[r]))break}else for(r in e)if(!1===t.call(e[r],r,e[r]))break;return e},makeArray:function(e,t){var n=t||[];return null!=e&&(p(Object(e))?S.merge(n,"string"==typeof e?[e]:e):u.call(n,e)),n},inArray:function(e,t,n){return null==t?-1:i.call(t,e,n)},merge:function(e,t){for(var n=+t.length,r=0,i=e.length;r<n;r++)e[i++]=t[r];return e.length=i,e},grep:function(e,t,n){for(var r=[],i=0,o=e.length,a=!n;i<o;i++)!t(e[i],i)!==a&&r.push(e[i]);return r},map:function(e,t,n){var r,i,o=0,a=[];if(p(e))for(r=e.length;o<r;o++)null!=(i=t(e[o],o,n))&&a.push(i);else for(o in e)null!=(i=t(e[o],o,n))&&a.push(i);return g(a)},guid:1,support:y}),"function"==typeof Symbol&&(S.fn[Symbol.iterator]=t[Symbol.iterator]),S.each("Boolean Number String Function Array Date RegExp Object Error Symbol".split(" "),function(e,t){n["[object "+t+"]"]=t.toLowerCase()});var d=function(n){var e,d,b,o,i,h,f,g,w,u,l,T,C,a,E,v,s,c,y,S="sizzle"+1*new Date,p=n.document,k=0,r=0,m=ue(),x=ue(),A=ue(),N=ue(),D=function(e,t){return e===t&&(l=!0),0},j={}.hasOwnProperty,t=[],q=t.pop,L=t.push,H=t.push,O=t.slice,P=function(e,t){for(var n=0,r=e.length;n<r;n++)if(e[n]===t)return n;return-1},R="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",I="(?:\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\[^\\r\\n\\f]|[\\w-]|[^\0-\\x7f])+",W="\\["+M+"*("+I+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+I+"))|)"+M+"*\\]",F=":("+I+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+W+")*)|.*)\\)|)",B=new RegExp(M+"+","g"),$=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),_=new RegExp("^"+M+"*,"+M+"*"),z=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp(M+"|>"),X=new RegExp(F),V=new RegExp("^"+I+"$"),G={ID:new RegExp("^#("+I+")"),CLASS:new RegExp("^\\.("+I+")"),TAG:new RegExp("^("+I+"|[*])"),ATTR:new RegExp("^"+W),PSEUDO:new RegExp("^"+F),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+R+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/HTML$/i,Q=/^(?:input|select|textarea|button)$/i,J=/^h\d$/i,K=/^[^{]+\{\s*\[native \w/,Z=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ee=/[+~]/,te=new RegExp("\\\\[\\da-fA-F]{1,6}"+M+"?|\\\\([^\\r\\n\\f])","g"),ne=function(e,t){var n="0x"+e.slice(1)-65536;return t||(n<0?String.fromCharCode(n+65536):String.fromCharCode(n>>10|55296,1023&n|56320))},re=/([\0-\x1f\x7f]|^-?\d)|^-$|[^\0-\x1f\x7f-\uFFFF\w-]/g,ie=function(e,t){return t?"\0"===e?"\ufffd":e.slice(0,-1)+"\\"+e.charCodeAt(e.length-1).toString(16)+" ":"\\"+e},oe=function(){T()},ae=be(function(e){return!0===e.disabled&&"fieldset"===e.nodeName.toLowerCase()},{dir:"parentNode",next:"legend"});try{H.apply(t=O.call(p.childNodes),p.childNodes),t[p.childNodes.length].nodeType}catch(e){H={apply:t.length?function(e,t){L.apply(e,O.call(t))}:function(e,t){var n=e.length,r=0;while(e[n++]=t[r++]);e.length=n-1}}}function se(t,e,n,r){var i,o,a,s,u,l,c,f=e&&e.ownerDocument,p=e?e.nodeType:9;if(n=n||[],"string"!=typeof t||!t||1!==p&&9!==p&&11!==p)return n;if(!r&&(T(e),e=e||C,E)){if(11!==p&&(u=Z.exec(t)))if(i=u[1]){if(9===p){if(!(a=e.getElementById(i)))return n;if(a.id===i)return n.push(a),n}else if(f&&(a=f.getElementById(i))&&y(e,a)&&a.id===i)return n.push(a),n}else{if(u[2])return H.apply(n,e.getElementsByTagName(t)),n;if((i=u[3])&&d.getElementsByClassName&&e.getElementsByClassName)return H.apply(n,e.getElementsByClassName(i)),n}if(d.qsa&&!N[t+" "]&&(!v||!v.test(t))&&(1!==p||"object"!==e.nodeName.toLowerCase())){if(c=t,f=e,1===p&&(U.test(t)||z.test(t))){(f=ee.test(t)&&ye(e.parentNode)||e)===e&&d.scope||((s=e.getAttribute("id"))?s=s.replace(re,ie):e.setAttribute("id",s=S)),o=(l=h(t)).length;while(o--)l[o]=(s?"#"+s:":scope")+" "+xe(l[o]);c=l.join(",")}try{return H.apply(n,f.querySelectorAll(c)),n}catch(e){N(t,!0)}finally{s===S&&e.removeAttribute("id")}}}return g(t.replace($,"$1"),e,n,r)}function ue(){var r=[];return function e(t,n){return r.push(t+" ")>b.cacheLength&&delete e[r.shift()],e[t+" "]=n}}function le(e){return e[S]=!0,e}function ce(e){var t=C.createElement("fieldset");try{return!!e(t)}catch(e){return!1}finally{t.parentNode&&t.parentNode.removeChild(t),t=null}}function fe(e,t){var n=e.split("|"),r=n.length;while(r--)b.attrHandle[n[r]]=t}function pe(e,t){var n=t&&e,r=n&&1===e.nodeType&&1===t.nodeType&&e.sourceIndex-t.sourceIndex;if(r)return r;if(n)while(n=n.nextSibling)if(n===t)return-1;return e?1:-1}function de(t){return function(e){return"input"===e.nodeName.toLowerCase()&&e.type===t}}function he(n){return function(e){var t=e.nodeName.toLowerCase();return("input"===t||"button"===t)&&e.type===n}}function ge(t){return function(e){return"form"in e?e.parentNode&&!1===e.disabled?"label"in e?"label"in e.parentNode?e.parentNode.disabled===t:e.disabled===t:e.isDisabled===t||e.isDisabled!==!t&&ae(e)===t:e.disabled===t:"label"in e&&e.disabled===t}}function ve(a){return le(function(o){return o=+o,le(function(e,t){var n,r=a([],e.length,o),i=r.length;while(i--)e[n=r[i]]&&(e[n]=!(t[n]=e[n]))})})}function ye(e){return e&&"undefined"!=typeof e.getElementsByTagName&&e}for(e in d=se.support={},i=se.isXML=function(e){var t=e.namespaceURI,n=(e.ownerDocument||e).documentElement;return!Y.test(t||n&&n.nodeName||"HTML")},T=se.setDocument=function(e){var t,n,r=e?e.ownerDocument||e:p;return r!=C&&9===r.nodeType&&r.documentElement&&(a=(C=r).documentElement,E=!i(C),p!=C&&(n=C.defaultView)&&n.top!==n&&(n.addEventListener?n.addEventListener("unload",oe,!1):n.attachEvent&&n.attachEvent("onunload",oe)),d.scope=ce(function(e){return a.appendChild(e).appendChild(C.createElement("div")),"undefined"!=typeof e.querySelectorAll&&!e.querySelectorAll(":scope fieldset div").length}),d.attributes=ce(function(e){return e.className="i",!e.getAttribute("className")}),d.getElementsByTagName=ce(function(e){return e.appendChild(C.createComment("")),!e.getElementsByTagName("*").length}),d.getElementsByClassName=K.test(C.getElementsByClassName),d.getById=ce(function(e){return a.appendChild(e).id=S,!C.getElementsByName||!C.getElementsByName(S).length}),d.getById?(b.filter.ID=function(e){var t=e.replace(te,ne);return function(e){return e.getAttribute("id")===t}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n=t.getElementById(e);return n?[n]:[]}}):(b.filter.ID=function(e){var n=e.replace(te,ne);return function(e){var t="undefined"!=typeof e.getAttributeNode&&e.getAttributeNode("id");return t&&t.value===n}},b.find.ID=function(e,t){if("undefined"!=typeof t.getElementById&&E){var n,r,i,o=t.getElementById(e);if(o){if((n=o.getAttributeNode("id"))&&n.value===e)return[o];i=t.getElementsByName(e),r=0;while(o=i[r++])if((n=o.getAttributeNode("id"))&&n.value===e)return[o]}return[]}}),b.find.TAG=d.getElementsByTagName?function(e,t){return"undefined"!=typeof t.getElementsByTagName?t.getElementsByTagName(e):d.qsa?t.querySelectorAll(e):void 0}:function(e,t){var n,r=[],i=0,o=t.getElementsByTagName(e);if("*"===e){while(n=o[i++])1===n.nodeType&&r.push(n);return r}return o},b.find.CLASS=d.getElementsByClassName&&function(e,t){if("undefined"!=typeof t.getElementsByClassName&&E)return t.getElementsByClassName(e)},s=[],v=[],(d.qsa=K.test(C.querySelectorAll))&&(ce(function(e){var t;a.appendChild(e).innerHTML="<a id='"+S+"'></a><select id='"+S+"-\r\\' msallowcapture=''><option selected=''></option></select>",e.querySelectorAll("[msallowcapture^='']").length&&v.push("[*^$]="+M+"*(?:''|\"\")"),e.querySelectorAll("[selected]").length||v.push("\\["+M+"*(?:value|"+R+")"),e.querySelectorAll("[id~="+S+"-]").length||v.push("~="),(t=C.createElement("input")).setAttribute("name",""),e.appendChild(t),e.querySelectorAll("[name='']").length||v.push("\\["+M+"*name"+M+"*="+M+"*(?:''|\"\")"),e.querySelectorAll(":checked").length||v.push(":checked"),e.querySelectorAll("a#"+S+"+*").length||v.push(".#.+[+~]"),e.querySelectorAll("\\\f"),v.push("[\\r\\n\\f]")}),ce(function(e){e.innerHTML="<a href='' disabled='disabled'></a><select disabled='disabled'><option/></select>";var t=C.createElement("input");t.setAttribute("type","hidden"),e.appendChild(t).setAttribute("name","D"),e.querySelectorAll("[name=d]").length&&v.push("name"+M+"*[*^$|!~]?="),2!==e.querySelectorAll(":enabled").length&&v.push(":enabled",":disabled"),a.appendChild(e).disabled=!0,2!==e.querySelectorAll(":disabled").length&&v.push(":enabled",":disabled"),e.querySelectorAll("*,:x"),v.push(",.*:")})),(d.matchesSelector=K.test(c=a.matches||a.webkitMatchesSelector||a.mozMatchesSelector||a.oMatchesSelector||a.msMatchesSelector))&&ce(function(e){d.disconnectedMatch=c.call(e,"*"),c.call(e,"[s!='']:x"),s.push("!=",F)}),v=v.length&&new RegExp(v.join("|")),s=s.length&&new RegExp(s.join("|")),t=K.test(a.compareDocumentPosition),y=t||K.test(a.contains)?function(e,t){var n=9===e.nodeType?e.documentElement:e,r=t&&t.parentNode;return e===r||!(!r||1!==r.nodeType||!(n.contains?n.contains(r):e.compareDocumentPosition&&16&e.compareDocumentPosition(r)))}:function(e,t){if(t)while(t=t.parentNode)if(t===e)return!0;return!1},D=t?function(e,t){if(e===t)return l=!0,0;var n=!e.compareDocumentPosition-!t.compareDocumentPosition;return n||(1&(n=(e.ownerDocument||e)==(t.ownerDocument||t)?e.compareDocumentPosition(t):1)||!d.sortDetached&&t.compareDocumentPosition(e)===n?e==C||e.ownerDocument==p&&y(p,e)?-1:t==C||t.ownerDocument==p&&y(p,t)?1:u?P(u,e)-P(u,t):0:4&n?-1:1)}:function(e,t){if(e===t)return l=!0,0;var n,r=0,i=e.parentNode,o=t.parentNode,a=[e],s=[t];if(!i||!o)return e==C?-1:t==C?1:i?-1:o?1:u?P(u,e)-P(u,t):0;if(i===o)return pe(e,t);n=e;while(n=n.parentNode)a.unshift(n);n=t;while(n=n.parentNode)s.unshift(n);while(a[r]===s[r])r++;return r?pe(a[r],s[r]):a[r]==p?-1:s[r]==p?1:0}),C},se.matches=function(e,t){return se(e,null,null,t)},se.matchesSelector=function(e,t){if(T(e),d.matchesSelector&&E&&!N[t+" "]&&(!s||!s.test(t))&&(!v||!v.test(t)))try{var n=c.call(e,t);if(n||d.disconnectedMatch||e.document&&11!==e.document.nodeType)return n}catch(e){N(t,!0)}return 0<se(t,C,null,[e]).length},se.contains=function(e,t){return(e.ownerDocument||e)!=C&&T(e),y(e,t)},se.attr=function(e,t){(e.ownerDocument||e)!=C&&T(e);var n=b.attrHandle[t.toLowerCase()],r=n&&j.call(b.attrHandle,t.toLowerCase())?n(e,t,!E):void 0;return void 0!==r?r:d.attributes||!E?e.getAttribute(t):(r=e.getAttributeNode(t))&&r.specified?r.value:null},se.escape=function(e){return(e+"").replace(re,ie)},se.error=function(e){throw new Error("Syntax error, unrecognized expression: "+e)},se.uniqueSort=function(e){var t,n=[],r=0,i=0;if(l=!d.detectDuplicates,u=!d.sortStable&&e.slice(0),e.sort(D),l){while(t=e[i++])t===e[i]&&(r=n.push(i));while(r--)e.splice(n[r],1)}return u=null,e},o=se.getText=function(e){var t,n="",r=0,i=e.nodeType;if(i){if(1===i||9===i||11===i){if("string"==typeof e.textContent)return e.textContent;for(e=e.firstChild;e;e=e.nextSibling)n+=o(e)}else if(3===i||4===i)return e.nodeValue}else while(t=e[r++])n+=o(t);return n},(b=se.selectors={cacheLength:50,createPseudo:le,match:G,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(e){return e[1]=e[1].replace(te,ne),e[3]=(e[3]||e[4]||e[5]||"").replace(te,ne),"~="===e[2]&&(e[3]=" "+e[3]+" "),e.slice(0,4)},CHILD:function(e){return e[1]=e[1].toLowerCase(),"nth"===e[1].slice(0,3)?(e[3]||se.error(e[0]),e[4]=+(e[4]?e[5]+(e[6]||1):2*("even"===e[3]||"odd"===e[3])),e[5]=+(e[7]+e[8]||"odd"===e[3])):e[3]&&se.error(e[0]),e},PSEUDO:function(e){var t,n=!e[6]&&e[2];return G.CHILD.test(e[0])?null:(e[3]?e[2]=e[4]||e[5]||"":n&&X.test(n)&&(t=h(n,!0))&&(t=n.indexOf(")",n.length-t)-n.length)&&(e[0]=e[0].slice(0,t),e[2]=n.slice(0,t)),e.slice(0,3))}},filter:{TAG:function(e){var t=e.replace(te,ne).toLowerCase();return"*"===e?function(){return!0}:function(e){return e.nodeName&&e.nodeName.toLowerCase()===t}},CLASS:function(e){var t=m[e+" "];return t||(t=new RegExp("(^|"+M+")"+e+"("+M+"|$)"))&&m(e,function(e){return t.test("string"==typeof e.className&&e.className||"undefined"!=typeof e.getAttribute&&e.getAttribute("class")||"")})},ATTR:function(n,r,i){return function(e){var t=se.attr(e,n);return null==t?"!="===r:!r||(t+="","="===r?t===i:"!="===r?t!==i:"^="===r?i&&0===t.indexOf(i):"*="===r?i&&-1<t.indexOf(i):"$="===r?i&&t.slice(-i.length)===i:"~="===r?-1<(" "+t.replace(B," ")+" ").indexOf(i):"|="===r&&(t===i||t.slice(0,i.length+1)===i+"-"))}},CHILD:function(h,e,t,g,v){var y="nth"!==h.slice(0,3),m="last"!==h.slice(-4),x="of-type"===e;return 1===g&&0===v?function(e){return!!e.parentNode}:function(e,t,n){var r,i,o,a,s,u,l=y!==m?"nextSibling":"previousSibling",c=e.parentNode,f=x&&e.nodeName.toLowerCase(),p=!n&&!x,d=!1;if(c){if(y){while(l){a=e;while(a=a[l])if(x?a.nodeName.toLowerCase()===f:1===a.nodeType)return!1;u=l="only"===h&&!u&&"nextSibling"}return!0}if(u=[m?c.firstChild:c.lastChild],m&&p){d=(s=(r=(i=(o=(a=c)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1])&&r[2],a=s&&c.childNodes[s];while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if(1===a.nodeType&&++d&&a===e){i[h]=[k,s,d];break}}else if(p&&(d=s=(r=(i=(o=(a=e)[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]||[])[0]===k&&r[1]),!1===d)while(a=++s&&a&&a[l]||(d=s=0)||u.pop())if((x?a.nodeName.toLowerCase()===f:1===a.nodeType)&&++d&&(p&&((i=(o=a[S]||(a[S]={}))[a.uniqueID]||(o[a.uniqueID]={}))[h]=[k,d]),a===e))break;return(d-=v)===g||d%g==0&&0<=d/g}}},PSEUDO:function(e,o){var t,a=b.pseudos[e]||b.setFilters[e.toLowerCase()]||se.error("unsupported pseudo: "+e);return a[S]?a(o):1<a.length?(t=[e,e,"",o],b.setFilters.hasOwnProperty(e.toLowerCase())?le(function(e,t){var n,r=a(e,o),i=r.length;while(i--)e[n=P(e,r[i])]=!(t[n]=r[i])}):function(e){return a(e,0,t)}):a}},pseudos:{not:le(function(e){var r=[],i=[],s=f(e.replace($,"$1"));return s[S]?le(function(e,t,n,r){var i,o=s(e,null,r,[]),a=e.length;while(a--)(i=o[a])&&(e[a]=!(t[a]=i))}):function(e,t,n){return r[0]=e,s(r,null,n,i),r[0]=null,!i.pop()}}),has:le(function(t){return function(e){return 0<se(t,e).length}}),contains:le(function(t){return t=t.replace(te,ne),function(e){return-1<(e.textContent||o(e)).indexOf(t)}}),lang:le(function(n){return V.test(n||"")||se.error("unsupported lang: "+n),n=n.replace(te,ne).toLowerCase(),function(e){var t;do{if(t=E?e.lang:e.getAttribute("xml:lang")||e.getAttribute("lang"))return(t=t.toLowerCase())===n||0===t.indexOf(n+"-")}while((e=e.parentNode)&&1===e.nodeType);return!1}}),target:function(e){var t=n.location&&n.location.hash;return t&&t.slice(1)===e.id},root:function(e){return e===a},focus:function(e){return e===C.activeElement&&(!C.hasFocus||C.hasFocus())&&!!(e.type||e.href||~e.tabIndex)},enabled:ge(!1),disabled:ge(!0),checked:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&!!e.checked||"option"===t&&!!e.selected},selected:function(e){return e.parentNode&&e.parentNode.selectedIndex,!0===e.selected},empty:function(e){for(e=e.firstChild;e;e=e.nextSibling)if(e.nodeType<6)return!1;return!0},parent:function(e){return!b.pseudos.empty(e)},header:function(e){return J.test(e.nodeName)},input:function(e){return Q.test(e.nodeName)},button:function(e){var t=e.nodeName.toLowerCase();return"input"===t&&"button"===e.type||"button"===t},text:function(e){var t;return"input"===e.nodeName.toLowerCase()&&"text"===e.type&&(null==(t=e.getAttribute("type"))||"text"===t.toLowerCase())},first:ve(function(){return[0]}),last:ve(function(e,t){return[t-1]}),eq:ve(function(e,t,n){return[n<0?n+t:n]}),even:ve(function(e,t){for(var n=0;n<t;n+=2)e.push(n);return e}),odd:ve(function(e,t){for(var n=1;n<t;n+=2)e.push(n);return e}),lt:ve(function(e,t,n){for(var r=n<0?n+t:t<n?t:n;0<=--r;)e.push(r);return e}),gt:ve(function(e,t,n){for(var r=n<0?n+t:n;++r<t;)e.push(r);return e})}}).pseudos.nth=b.pseudos.eq,{radio:!0,checkbox:!0,file:!0,password:!0,image:!0})b.pseudos[e]=de(e);for(e in{submit:!0,reset:!0})b.pseudos[e]=he(e);function me(){}function xe(e){for(var t=0,n=e.length,r="";t<n;t++)r+=e[t].value;return r}function be(s,e,t){var u=e.dir,l=e.next,c=l||u,f=t&&"parentNode"===c,p=r++;return e.first?function(e,t,n){while(e=e[u])if(1===e.nodeType||f)return s(e,t,n);return!1}:function(e,t,n){var r,i,o,a=[k,p];if(n){while(e=e[u])if((1===e.nodeType||f)&&s(e,t,n))return!0}else while(e=e[u])if(1===e.nodeType||f)if(i=(o=e[S]||(e[S]={}))[e.uniqueID]||(o[e.uniqueID]={}),l&&l===e.nodeName.toLowerCase())e=e[u]||e;else{if((r=i[c])&&r[0]===k&&r[1]===p)return a[2]=r[2];if((i[c]=a)[2]=s(e,t,n))return!0}return!1}}function we(i){return 1<i.length?function(e,t,n){var r=i.length;while(r--)if(!i[r](e,t,n))return!1;return!0}:i[0]}function Te(e,t,n,r,i){for(var o,a=[],s=0,u=e.length,l=null!=t;s<u;s++)(o=e[s])&&(n&&!n(o,r,i)||(a.push(o),l&&t.push(s)));return a}function Ce(d,h,g,v,y,e){return v&&!v[S]&&(v=Ce(v)),y&&!y[S]&&(y=Ce(y,e)),le(function(e,t,n,r){var i,o,a,s=[],u=[],l=t.length,c=e||function(e,t,n){for(var r=0,i=t.length;r<i;r++)se(e,t[r],n);return n}(h||"*",n.nodeType?[n]:n,[]),f=!d||!e&&h?c:Te(c,s,d,n,r),p=g?y||(e?d:l||v)?[]:t:f;if(g&&g(f,p,n,r),v){i=Te(p,u),v(i,[],n,r),o=i.length;while(o--)(a=i[o])&&(p[u[o]]=!(f[u[o]]=a))}if(e){if(y||d){if(y){i=[],o=p.length;while(o--)(a=p[o])&&i.push(f[o]=a);y(null,p=[],i,r)}o=p.length;while(o--)(a=p[o])&&-1<(i=y?P(e,a):s[o])&&(e[i]=!(t[i]=a))}}else p=Te(p===t?p.splice(l,p.length):p),y?y(null,t,p,r):H.apply(t,p)})}function Ee(e){for(var i,t,n,r=e.length,o=b.relative[e[0].type],a=o||b.relative[" "],s=o?1:0,u=be(function(e){return e===i},a,!0),l=be(function(e){return-1<P(i,e)},a,!0),c=[function(e,t,n){var r=!o&&(n||t!==w)||((i=t).nodeType?u(e,t,n):l(e,t,n));return i=null,r}];s<r;s++)if(t=b.relative[e[s].type])c=[be(we(c),t)];else{if((t=b.filter[e[s].type].apply(null,e[s].matches))[S]){for(n=++s;n<r;n++)if(b.relative[e[n].type])break;return Ce(1<s&&we(c),1<s&&xe(e.slice(0,s-1).concat({value:" "===e[s-2].type?"*":""})).replace($,"$1"),t,s<n&&Ee(e.slice(s,n)),n<r&&Ee(e=e.slice(n)),n<r&&xe(e))}c.push(t)}return we(c)}return me.prototype=b.filters=b.pseudos,b.setFilters=new me,h=se.tokenize=function(e,t){var n,r,i,o,a,s,u,l=x[e+" "];if(l)return t?0:l.slice(0);a=e,s=[],u=b.preFilter;while(a){for(o in n&&!(r=_.exec(a))||(r&&(a=a.slice(r[0].length)||a),s.push(i=[])),n=!1,(r=z.exec(a))&&(n=r.shift(),i.push({value:n,type:r[0].replace($," ")}),a=a.slice(n.length)),b.filter)!(r=G[o].exec(a))||u[o]&&!(r=u[o](r))||(n=r.shift(),i.push({value:n,type:o,matches:r}),a=a.slice(n.length));if(!n)break}return t?a.length:a?se.error(e):x(e,s).slice(0)},f=se.compile=function(e,t){var n,v,y,m,x,r,i=[],o=[],a=A[e+" "];if(!a){t||(t=h(e)),n=t.length;while(n--)(a=Ee(t[n]))[S]?i.push(a):o.push(a);(a=A(e,(v=o,m=0<(y=i).length,x=0<v.length,r=function(e,t,n,r,i){var o,a,s,u=0,l="0",c=e&&[],f=[],p=w,d=e||x&&b.find.TAG("*",i),h=k+=null==p?1:Math.random()||.1,g=d.length;for(i&&(w=t==C||t||i);l!==g&&null!=(o=d[l]);l++){if(x&&o){a=0,t||o.ownerDocument==C||(T(o),n=!E);while(s=v[a++])if(s(o,t||C,n)){r.push(o);break}i&&(k=h)}m&&((o=!s&&o)&&u--,e&&c.push(o))}if(u+=l,m&&l!==u){a=0;while(s=y[a++])s(c,f,t,n);if(e){if(0<u)while(l--)c[l]||f[l]||(f[l]=q.call(r));f=Te(f)}H.apply(r,f),i&&!e&&0<f.length&&1<u+y.length&&se.uniqueSort(r)}return i&&(k=h,w=p),c},m?le(r):r))).selector=e}return a},g=se.select=function(e,t,n,r){var i,o,a,s,u,l="function"==typeof e&&e,c=!r&&h(e=l.selector||e);if(n=n||[],1===c.length){if(2<(o=c[0]=c[0].slice(0)).length&&"ID"===(a=o[0]).type&&9===t.nodeType&&E&&b.relative[o[1].type]){if(!(t=(b.find.ID(a.matches[0].replace(te,ne),t)||[])[0]))return n;l&&(t=t.parentNode),e=e.slice(o.shift().value.length)}i=G.needsContext.test(e)?0:o.length;while(i--){if(a=o[i],b.relative[s=a.type])break;if((u=b.find[s])&&(r=u(a.matches[0].replace(te,ne),ee.test(o[0].type)&&ye(t.parentNode)||t))){if(o.splice(i,1),!(e=r.length&&xe(o)))return H.apply(n,r),n;break}}}return(l||f(e,c))(r,t,!E,n,!t||ee.test(e)&&ye(t.parentNode)||t),n},d.sortStable=S.split("").sort(D).join("")===S,d.detectDuplicates=!!l,T(),d.sortDetached=ce(function(e){return 1&e.compareDocumentPosition(C.createElement("fieldset"))}),ce(function(e){return e.innerHTML="<a href='#'></a>","#"===e.firstChild.getAttribute("href")})||fe("type|href|height|width",function(e,t,n){if(!n)return e.getAttribute(t,"type"===t.toLowerCase()?1:2)}),d.attributes&&ce(function(e){return e.innerHTML="<input/>",e.firstChild.setAttribute("value",""),""===e.firstChild.getAttribute("value")})||fe("value",function(e,t,n){if(!n&&"input"===e.nodeName.toLowerCase())return e.defaultValue}),ce(function(e){return null==e.getAttribute("disabled")})||fe(R,function(e,t,n){var r;if(!n)return!0===e[t]?t.toLowerCase():(r=e.getAttributeNode(t))&&r.specified?r.value:null}),se}(C);S.find=d,S.expr=d.selectors,S.expr[":"]=S.expr.pseudos,S.uniqueSort=S.unique=d.uniqueSort,S.text=d.getText,S.isXMLDoc=d.isXML,S.contains=d.contains,S.escapeSelector=d.escape;var h=function(e,t,n){var r=[],i=void 0!==n;while((e=e[t])&&9!==e.nodeType)if(1===e.nodeType){if(i&&S(e).is(n))break;r.push(e)}return r},T=function(e,t){for(var n=[];e;e=e.nextSibling)1===e.nodeType&&e!==t&&n.push(e);return n},k=S.expr.match.needsContext;function A(e,t){return e.nodeName&&e.nodeName.toLowerCase()===t.toLowerCase()}var N=/^<([a-z][^\/\0>:\x20\t\r\n\f]*)[\x20\t\r\n\f]*\/?>(?:<\/\1>|)$/i;function D(e,n,r){return m(n)?S.grep(e,function(e,t){return!!n.call(e,t,e)!==r}):n.nodeType?S.grep(e,function(e){return e===n!==r}):"string"!=typeof n?S.grep(e,function(e){return-1<i.call(n,e)!==r}):S.filter(n,e,r)}S.filter=function(e,t,n){var r=t[0];return n&&(e=":not("+e+")"),1===t.length&&1===r.nodeType?S.find.matchesSelector(r,e)?[r]:[]:S.find.matches(e,S.grep(t,function(e){return 1===e.nodeType}))},S.fn.extend({find:function(e){var t,n,r=this.length,i=this;if("string"!=typeof e)return this.pushStack(S(e).filter(function(){for(t=0;t<r;t++)if(S.contains(i[t],this))return!0}));for(n=this.pushStack([]),t=0;t<r;t++)S.find(e,i[t],n);return 1<r?S.uniqueSort(n):n},filter:function(e){return this.pushStack(D(this,e||[],!1))},not:function(e){return this.pushStack(D(this,e||[],!0))},is:function(e){return!!D(this,"string"==typeof e&&k.test(e)?S(e):e||[],!1).length}});var j,q=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]+))$/;(S.fn.init=function(e,t,n){var r,i;if(!e)return this;if(n=n||j,"string"==typeof e){if(!(r="<"===e[0]&&">"===e[e.length-1]&&3<=e.length?[null,e,null]:q.exec(e))||!r[1]&&t)return!t||t.jquery?(t||n).find(e):this.constructor(t).find(e);if(r[1]){if(t=t instanceof S?t[0]:t,S.merge(this,S.parseHTML(r[1],t&&t.nodeType?t.ownerDocument||t:E,!0)),N.test(r[1])&&S.isPlainObject(t))for(r in t)m(this[r])?this[r](t[r]):this.attr(r,t[r]);return this}return(i=E.getElementById(r[2]))&&(this[0]=i,this.length=1),this}return e.nodeType?(this[0]=e,this.length=1,this):m(e)?void 0!==n.ready?n.ready(e):e(S):S.makeArray(e,this)}).prototype=S.fn,j=S(E);var L=/^(?:parents|prev(?:Until|All))/,H={children:!0,contents:!0,next:!0,prev:!0};function O(e,t){while((e=e[t])&&1!==e.nodeType);return e}S.fn.extend({has:function(e){var t=S(e,this),n=t.length;return this.filter(function(){for(var e=0;e<n;e++)if(S.contains(this,t[e]))return!0})},closest:function(e,t){var n,r=0,i=this.length,o=[],a="string"!=typeof e&&S(e);if(!k.test(e))for(;r<i;r++)for(n=this[r];n&&n!==t;n=n.parentNode)if(n.nodeType<11&&(a?-1<a.index(n):1===n.nodeType&&S.find.matchesSelector(n,e))){o.push(n);break}return this.pushStack(1<o.length?S.uniqueSort(o):o)},index:function(e){return e?"string"==typeof e?i.call(S(e),this[0]):i.call(this,e.jquery?e[0]:e):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(e,t){return this.pushStack(S.uniqueSort(S.merge(this.get(),S(e,t))))},addBack:function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}}),S.each({parent:function(e){var t=e.parentNode;return t&&11!==t.nodeType?t:null},parents:function(e){return h(e,"parentNode")},parentsUntil:function(e,t,n){return h(e,"parentNode",n)},next:function(e){return O(e,"nextSibling")},prev:function(e){return O(e,"previousSibling")},nextAll:function(e){return h(e,"nextSibling")},prevAll:function(e){return h(e,"previousSibling")},nextUntil:function(e,t,n){return h(e,"nextSibling",n)},prevUntil:function(e,t,n){return h(e,"previousSibling",n)},siblings:function(e){return T((e.parentNode||{}).firstChild,e)},children:function(e){return T(e.firstChild)},contents:function(e){return null!=e.contentDocument&&r(e.contentDocument)?e.contentDocument:(A(e,"template")&&(e=e.content||e),S.merge([],e.childNodes))}},function(r,i){S.fn[r]=function(e,t){var n=S.map(this,i,e);return"Until"!==r.slice(-5)&&(t=e),t&&"string"==typeof t&&(n=S.filter(t,n)),1<this.length&&(H[r]||S.uniqueSort(n),L.test(r)&&n.reverse()),this.pushStack(n)}});var P=/[^\x20\t\r\n\f]+/g;function R(e){return e}function M(e){throw e}function I(e,t,n,r){var i;try{e&&m(i=e.promise)?i.call(e).done(t).fail(n):e&&m(i=e.then)?i.call(e,t,n):t.apply(void 0,[e].slice(r))}catch(e){n.apply(void 0,[e])}}S.Callbacks=function(r){var e,n;r="string"==typeof r?(e=r,n={},S.each(e.match(P)||[],function(e,t){n[t]=!0}),n):S.extend({},r);var i,t,o,a,s=[],u=[],l=-1,c=function(){for(a=a||r.once,o=i=!0;u.length;l=-1){t=u.shift();while(++l<s.length)!1===s[l].apply(t[0],t[1])&&r.stopOnFalse&&(l=s.length,t=!1)}r.memory||(t=!1),i=!1,a&&(s=t?[]:"")},f={add:function(){return s&&(t&&!i&&(l=s.length-1,u.push(t)),function n(e){S.each(e,function(e,t){m(t)?r.unique&&f.has(t)||s.push(t):t&&t.length&&"string"!==w(t)&&n(t)})}(arguments),t&&!i&&c()),this},remove:function(){return S.each(arguments,function(e,t){var n;while(-1<(n=S.inArray(t,s,n)))s.splice(n,1),n<=l&&l--}),this},has:function(e){return e?-1<S.inArray(e,s):0<s.length},empty:function(){return s&&(s=[]),this},disable:function(){return a=u=[],s=t="",this},disabled:function(){return!s},lock:function(){return a=u=[],t||i||(s=t=""),this},locked:function(){return!!a},fireWith:function(e,t){return a||(t=[e,(t=t||[]).slice?t.slice():t],u.push(t),i||c()),this},fire:function(){return f.fireWith(this,arguments),this},fired:function(){return!!o}};return f},S.extend({Deferred:function(e){var o=[["notify","progress",S.Callbacks("memory"),S.Callbacks("memory"),2],["resolve","done",S.Callbacks("once memory"),S.Callbacks("once memory"),0,"resolved"],["reject","fail",S.Callbacks("once memory"),S.Callbacks("once memory"),1,"rejected"]],i="pending",a={state:function(){return i},always:function(){return s.done(arguments).fail(arguments),this},"catch":function(e){return a.then(null,e)},pipe:function(){var i=arguments;return S.Deferred(function(r){S.each(o,function(e,t){var n=m(i[t[4]])&&i[t[4]];s[t[1]](function(){var e=n&&n.apply(this,arguments);e&&m(e.promise)?e.promise().progress(r.notify).done(r.resolve).fail(r.reject):r[t[0]+"With"](this,n?[e]:arguments)})}),i=null}).promise()},then:function(t,n,r){var u=0;function l(i,o,a,s){return function(){var n=this,r=arguments,e=function(){var e,t;if(!(i<u)){if((e=a.apply(n,r))===o.promise())throw new TypeError("Thenable self-resolution");t=e&&("object"==typeof e||"function"==typeof e)&&e.then,m(t)?s?t.call(e,l(u,o,R,s),l(u,o,M,s)):(u++,t.call(e,l(u,o,R,s),l(u,o,M,s),l(u,o,R,o.notifyWith))):(a!==R&&(n=void 0,r=[e]),(s||o.resolveWith)(n,r))}},t=s?e:function(){try{e()}catch(e){S.Deferred.exceptionHook&&S.Deferred.exceptionHook(e,t.stackTrace),u<=i+1&&(a!==M&&(n=void 0,r=[e]),o.rejectWith(n,r))}};i?t():(S.Deferred.getStackHook&&(t.stackTrace=S.Deferred.getStackHook()),C.setTimeout(t))}}return S.Deferred(function(e){o[0][3].add(l(0,e,m(r)?r:R,e.notifyWith)),o[1][3].add(l(0,e,m(t)?t:R)),o[2][3].add(l(0,e,m(n)?n:M))}).promise()},promise:function(e){return null!=e?S.extend(e,a):a}},s={};return S.each(o,function(e,t){var n=t[2],r=t[5];a[t[1]]=n.add,r&&n.add(function(){i=r},o[3-e][2].disable,o[3-e][3].disable,o[0][2].lock,o[0][3].lock),n.add(t[3].fire),s[t[0]]=function(){return s[t[0]+"With"](this===s?void 0:this,arguments),this},s[t[0]+"With"]=n.fireWith}),a.promise(s),e&&e.call(s,s),s},when:function(e){var n=arguments.length,t=n,r=Array(t),i=s.call(arguments),o=S.Deferred(),a=function(t){return function(e){r[t]=this,i[t]=1<arguments.length?s.call(arguments):e,--n||o.resolveWith(r,i)}};if(n<=1&&(I(e,o.done(a(t)).resolve,o.reject,!n),"pending"===o.state()||m(i[t]&&i[t].then)))return o.then();while(t--)I(i[t],a(t),o.reject);return o.promise()}});var W=/^(Eval|Internal|Range|Reference|Syntax|Type|URI)Error$/;S.Deferred.exceptionHook=function(e,t){C.console&&C.console.warn&&e&&W.test(e.name)&&C.console.warn("jQuery.Deferred exception: "+e.message,e.stack,t)},S.readyException=function(e){C.setTimeout(function(){throw e})};var F=S.Deferred();function B(){E.removeEventListener("DOMContentLoaded",B),C.removeEventListener("load",B),S.ready()}S.fn.ready=function(e){return F.then(e)["catch"](function(e){S.readyException(e)}),this},S.extend({isReady:!1,readyWait:1,ready:function(e){(!0===e?--S.readyWait:S.isReady)||(S.isReady=!0)!==e&&0<--S.readyWait||F.resolveWith(E,[S])}}),S.ready.then=F.then,"complete"===E.readyState||"loading"!==E.readyState&&!E.documentElement.doScroll?C.setTimeout(S.ready):(E.addEventListener("DOMContentLoaded",B),C.addEventListener("load",B));var $=function(e,t,n,r,i,o,a){var s=0,u=e.length,l=null==n;if("object"===w(n))for(s in i=!0,n)$(e,t,s,n[s],!0,o,a);else if(void 0!==r&&(i=!0,m(r)||(a=!0),l&&(a?(t.call(e,r),t=null):(l=t,t=function(e,t,n){return l.call(S(e),n)})),t))for(;s<u;s++)t(e[s],n,a?r:r.call(e[s],s,t(e[s],n)));return i?e:l?t.call(e):u?t(e[0],n):o},_=/^-ms-/,z=/-([a-z])/g;function U(e,t){return t.toUpperCase()}function X(e){return e.replace(_,"ms-").replace(z,U)}var V=function(e){return 1===e.nodeType||9===e.nodeType||!+e.nodeType};function G(){this.expando=S.expando+G.uid++}G.uid=1,G.prototype={cache:function(e){var t=e[this.expando];return t||(t={},V(e)&&(e.nodeType?e[this.expando]=t:Object.defineProperty(e,this.expando,{value:t,configurable:!0}))),t},set:function(e,t,n){var r,i=this.cache(e);if("string"==typeof t)i[X(t)]=n;else for(r in t)i[X(r)]=t[r];return i},get:function(e,t){return void 0===t?this.cache(e):e[this.expando]&&e[this.expando][X(t)]},access:function(e,t,n){return void 0===t||t&&"string"==typeof t&&void 0===n?this.get(e,t):(this.set(e,t,n),void 0!==n?n:t)},remove:function(e,t){var n,r=e[this.expando];if(void 0!==r){if(void 0!==t){n=(t=Array.isArray(t)?t.map(X):(t=X(t))in r?[t]:t.match(P)||[]).length;while(n--)delete r[t[n]]}(void 0===t||S.isEmptyObject(r))&&(e.nodeType?e[this.expando]=void 0:delete e[this.expando])}},hasData:function(e){var t=e[this.expando];return void 0!==t&&!S.isEmptyObject(t)}};var Y=new G,Q=new G,J=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,K=/[A-Z]/g;function Z(e,t,n){var r,i;if(void 0===n&&1===e.nodeType)if(r="data-"+t.replace(K,"-$&").toLowerCase(),"string"==typeof(n=e.getAttribute(r))){try{n="true"===(i=n)||"false"!==i&&("null"===i?null:i===+i+""?+i:J.test(i)?JSON.parse(i):i)}catch(e){}Q.set(e,t,n)}else n=void 0;return n}S.extend({hasData:function(e){return Q.hasData(e)||Y.hasData(e)},data:function(e,t,n){return Q.access(e,t,n)},removeData:function(e,t){Q.remove(e,t)},_data:function(e,t,n){return Y.access(e,t,n)},_removeData:function(e,t){Y.remove(e,t)}}),S.fn.extend({data:function(n,e){var t,r,i,o=this[0],a=o&&o.attributes;if(void 0===n){if(this.length&&(i=Q.get(o),1===o.nodeType&&!Y.get(o,"hasDataAttrs"))){t=a.length;while(t--)a[t]&&0===(r=a[t].name).indexOf("data-")&&(r=X(r.slice(5)),Z(o,r,i[r]));Y.set(o,"hasDataAttrs",!0)}return i}return"object"==typeof n?this.each(function(){Q.set(this,n)}):$(this,function(e){var t;if(o&&void 0===e)return void 0!==(t=Q.get(o,n))?t:void 0!==(t=Z(o,n))?t:void 0;this.each(function(){Q.set(this,n,e)})},null,e,1<arguments.length,null,!0)},removeData:function(e){return this.each(function(){Q.remove(this,e)})}}),S.extend({queue:function(e,t,n){var r;if(e)return t=(t||"fx")+"queue",r=Y.get(e,t),n&&(!r||Array.isArray(n)?r=Y.access(e,t,S.makeArray(n)):r.push(n)),r||[]},dequeue:function(e,t){t=t||"fx";var n=S.queue(e,t),r=n.length,i=n.shift(),o=S._queueHooks(e,t);"inprogress"===i&&(i=n.shift(),r--),i&&("fx"===t&&n.unshift("inprogress"),delete o.stop,i.call(e,function(){S.dequeue(e,t)},o)),!r&&o&&o.empty.fire()},_queueHooks:function(e,t){var n=t+"queueHooks";return Y.get(e,n)||Y.access(e,n,{empty:S.Callbacks("once memory").add(function(){Y.remove(e,[t+"queue",n])})})}}),S.fn.extend({queue:function(t,n){var e=2;return"string"!=typeof t&&(n=t,t="fx",e--),arguments.length<e?S.queue(this[0],t):void 0===n?this:this.each(function(){var e=S.queue(this,t,n);S._queueHooks(this,t),"fx"===t&&"inprogress"!==e[0]&&S.dequeue(this,t)})},dequeue:function(e){return this.each(function(){S.dequeue(this,e)})},clearQueue:function(e){return this.queue(e||"fx",[])},promise:function(e,t){var n,r=1,i=S.Deferred(),o=this,a=this.length,s=function(){--r||i.resolveWith(o,[o])};"string"!=typeof e&&(t=e,e=void 0),e=e||"fx";while(a--)(n=Y.get(o[a],e+"queueHooks"))&&n.empty&&(r++,n.empty.add(s));return s(),i.promise(t)}});var ee=/[+-]?(?:\d*\.|)\d+(?:[eE][+-]?\d+|)/.source,te=new RegExp("^(?:([+-])=|)("+ee+")([a-z%]*)$","i"),ne=["Top","Right","Bottom","Left"],re=E.documentElement,ie=function(e){return S.contains(e.ownerDocument,e)},oe={composed:!0};re.getRootNode&&(ie=function(e){return S.contains(e.ownerDocument,e)||e.getRootNode(oe)===e.ownerDocument});var ae=function(e,t){return"none"===(e=t||e).style.display||""===e.style.display&&ie(e)&&"none"===S.css(e,"display")};function se(e,t,n,r){var i,o,a=20,s=r?function(){return r.cur()}:function(){return S.css(e,t,"")},u=s(),l=n&&n[3]||(S.cssNumber[t]?"":"px"),c=e.nodeType&&(S.cssNumber[t]||"px"!==l&&+u)&&te.exec(S.css(e,t));if(c&&c[3]!==l){u/=2,l=l||c[3],c=+u||1;while(a--)S.style(e,t,c+l),(1-o)*(1-(o=s()/u||.5))<=0&&(a=0),c/=o;c*=2,S.style(e,t,c+l),n=n||[]}return n&&(c=+c||+u||0,i=n[1]?c+(n[1]+1)*n[2]:+n[2],r&&(r.unit=l,r.start=c,r.end=i)),i}var ue={};function le(e,t){for(var n,r,i,o,a,s,u,l=[],c=0,f=e.length;c<f;c++)(r=e[c]).style&&(n=r.style.display,t?("none"===n&&(l[c]=Y.get(r,"display")||null,l[c]||(r.style.display="")),""===r.style.display&&ae(r)&&(l[c]=(u=a=o=void 0,a=(i=r).ownerDocument,s=i.nodeName,(u=ue[s])||(o=a.body.appendChild(a.createElement(s)),u=S.css(o,"display"),o.parentNode.removeChild(o),"none"===u&&(u="block"),ue[s]=u)))):"none"!==n&&(l[c]="none",Y.set(r,"display",n)));for(c=0;c<f;c++)null!=l[c]&&(e[c].style.display=l[c]);return e}S.fn.extend({show:function(){return le(this,!0)},hide:function(){return le(this)},toggle:function(e){return"boolean"==typeof e?e?this.show():this.hide():this.each(function(){ae(this)?S(this).show():S(this).hide()})}});var ce,fe,pe=/^(?:checkbox|radio)$/i,de=/<([a-z][^\/\0>\x20\t\r\n\f]*)/i,he=/^$|^module$|\/(?:java|ecma)script/i;ce=E.createDocumentFragment().appendChild(E.createElement("div")),(fe=E.createElement("input")).setAttribute("type","radio"),fe.setAttribute("checked","checked"),fe.setAttribute("name","t"),ce.appendChild(fe),y.checkClone=ce.cloneNode(!0).cloneNode(!0).lastChild.checked,ce.innerHTML="<textarea>x</textarea>",y.noCloneChecked=!!ce.cloneNode(!0).lastChild.defaultValue,ce.innerHTML="<option></option>",y.option=!!ce.lastChild;var ge={thead:[1,"<table>","</table>"],col:[2,"<table><colgroup>","</colgroup></table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],_default:[0,"",""]};function ve(e,t){var n;return n="undefined"!=typeof e.getElementsByTagName?e.getElementsByTagName(t||"*"):"undefined"!=typeof e.querySelectorAll?e.querySelectorAll(t||"*"):[],void 0===t||t&&A(e,t)?S.merge([e],n):n}function ye(e,t){for(var n=0,r=e.length;n<r;n++)Y.set(e[n],"globalEval",!t||Y.get(t[n],"globalEval"))}ge.tbody=ge.tfoot=ge.colgroup=ge.caption=ge.thead,ge.th=ge.td,y.option||(ge.optgroup=ge.option=[1,"<select multiple='multiple'>","</select>"]);var me=/<|&#?\w+;/;function xe(e,t,n,r,i){for(var o,a,s,u,l,c,f=t.createDocumentFragment(),p=[],d=0,h=e.length;d<h;d++)if((o=e[d])||0===o)if("object"===w(o))S.merge(p,o.nodeType?[o]:o);else if(me.test(o)){a=a||f.appendChild(t.createElement("div")),s=(de.exec(o)||["",""])[1].toLowerCase(),u=ge[s]||ge._default,a.innerHTML=u[1]+S.htmlPrefilter(o)+u[2],c=u[0];while(c--)a=a.lastChild;S.merge(p,a.childNodes),(a=f.firstChild).textContent=""}else p.push(t.createTextNode(o));f.textContent="",d=0;while(o=p[d++])if(r&&-1<S.inArray(o,r))i&&i.push(o);else if(l=ie(o),a=ve(f.appendChild(o),"script"),l&&ye(a),n){c=0;while(o=a[c++])he.test(o.type||"")&&n.push(o)}return f}var be=/^key/,we=/^(?:mouse|pointer|contextmenu|drag|drop)|click/,Te=/^([^.]*)(?:\.(.+)|)/;function Ce(){return!0}function Ee(){return!1}function Se(e,t){return e===function(){try{return E.activeElement}catch(e){}}()==("focus"===t)}function ke(e,t,n,r,i,o){var a,s;if("object"==typeof t){for(s in"string"!=typeof n&&(r=r||n,n=void 0),t)ke(e,s,n,r,t[s],o);return e}if(null==r&&null==i?(i=n,r=n=void 0):null==i&&("string"==typeof n?(i=r,r=void 0):(i=r,r=n,n=void 0)),!1===i)i=Ee;else if(!i)return e;return 1===o&&(a=i,(i=function(e){return S().off(e),a.apply(this,arguments)}).guid=a.guid||(a.guid=S.guid++)),e.each(function(){S.event.add(this,t,i,r,n)})}function Ae(e,i,o){o?(Y.set(e,i,!1),S.event.add(e,i,{namespace:!1,handler:function(e){var t,n,r=Y.get(this,i);if(1&e.isTrigger&&this[i]){if(r.length)(S.event.special[i]||{}).delegateType&&e.stopPropagation();else if(r=s.call(arguments),Y.set(this,i,r),t=o(this,i),this[i](),r!==(n=Y.get(this,i))||t?Y.set(this,i,!1):n={},r!==n)return e.stopImmediatePropagation(),e.preventDefault(),n.value}else r.length&&(Y.set(this,i,{value:S.event.trigger(S.extend(r[0],S.Event.prototype),r.slice(1),this)}),e.stopImmediatePropagation())}})):void 0===Y.get(e,i)&&S.event.add(e,i,Ce)}S.event={global:{},add:function(t,e,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.get(t);if(V(t)){n.handler&&(n=(o=n).handler,i=o.selector),i&&S.find.matchesSelector(re,i),n.guid||(n.guid=S.guid++),(u=v.events)||(u=v.events=Object.create(null)),(a=v.handle)||(a=v.handle=function(e){return"undefined"!=typeof S&&S.event.triggered!==e.type?S.event.dispatch.apply(t,arguments):void 0}),l=(e=(e||"").match(P)||[""]).length;while(l--)d=g=(s=Te.exec(e[l])||[])[1],h=(s[2]||"").split(".").sort(),d&&(f=S.event.special[d]||{},d=(i?f.delegateType:f.bindType)||d,f=S.event.special[d]||{},c=S.extend({type:d,origType:g,data:r,handler:n,guid:n.guid,selector:i,needsContext:i&&S.expr.match.needsContext.test(i),namespace:h.join(".")},o),(p=u[d])||((p=u[d]=[]).delegateCount=0,f.setup&&!1!==f.setup.call(t,r,h,a)||t.addEventListener&&t.addEventListener(d,a)),f.add&&(f.add.call(t,c),c.handler.guid||(c.handler.guid=n.guid)),i?p.splice(p.delegateCount++,0,c):p.push(c),S.event.global[d]=!0)}},remove:function(e,t,n,r,i){var o,a,s,u,l,c,f,p,d,h,g,v=Y.hasData(e)&&Y.get(e);if(v&&(u=v.events)){l=(t=(t||"").match(P)||[""]).length;while(l--)if(d=g=(s=Te.exec(t[l])||[])[1],h=(s[2]||"").split(".").sort(),d){f=S.event.special[d]||{},p=u[d=(r?f.delegateType:f.bindType)||d]||[],s=s[2]&&new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"),a=o=p.length;while(o--)c=p[o],!i&&g!==c.origType||n&&n.guid!==c.guid||s&&!s.test(c.namespace)||r&&r!==c.selector&&("**"!==r||!c.selector)||(p.splice(o,1),c.selector&&p.delegateCount--,f.remove&&f.remove.call(e,c));a&&!p.length&&(f.teardown&&!1!==f.teardown.call(e,h,v.handle)||S.removeEvent(e,d,v.handle),delete u[d])}else for(d in u)S.event.remove(e,d+t[l],n,r,!0);S.isEmptyObject(u)&&Y.remove(e,"handle events")}},dispatch:function(e){var t,n,r,i,o,a,s=new Array(arguments.length),u=S.event.fix(e),l=(Y.get(this,"events")||Object.create(null))[u.type]||[],c=S.event.special[u.type]||{};for(s[0]=u,t=1;t<arguments.length;t++)s[t]=arguments[t];if(u.delegateTarget=this,!c.preDispatch||!1!==c.preDispatch.call(this,u)){a=S.event.handlers.call(this,u,l),t=0;while((i=a[t++])&&!u.isPropagationStopped()){u.currentTarget=i.elem,n=0;while((o=i.handlers[n++])&&!u.isImmediatePropagationStopped())u.rnamespace&&!1!==o.namespace&&!u.rnamespace.test(o.namespace)||(u.handleObj=o,u.data=o.data,void 0!==(r=((S.event.special[o.origType]||{}).handle||o.handler).apply(i.elem,s))&&!1===(u.result=r)&&(u.preventDefault(),u.stopPropagation()))}return c.postDispatch&&c.postDispatch.call(this,u),u.result}},handlers:function(e,t){var n,r,i,o,a,s=[],u=t.delegateCount,l=e.target;if(u&&l.nodeType&&!("click"===e.type&&1<=e.button))for(;l!==this;l=l.parentNode||this)if(1===l.nodeType&&("click"!==e.type||!0!==l.disabled)){for(o=[],a={},n=0;n<u;n++)void 0===a[i=(r=t[n]).selector+" "]&&(a[i]=r.needsContext?-1<S(i,this).index(l):S.find(i,this,null,[l]).length),a[i]&&o.push(r);o.length&&s.push({elem:l,handlers:o})}return l=this,u<t.length&&s.push({elem:l,handlers:t.slice(u)}),s},addProp:function(t,e){Object.defineProperty(S.Event.prototype,t,{enumerable:!0,configurable:!0,get:m(e)?function(){if(this.originalEvent)return e(this.originalEvent)}:function(){if(this.originalEvent)return this.originalEvent[t]},set:function(e){Object.defineProperty(this,t,{enumerable:!0,configurable:!0,writable:!0,value:e})}})},fix:function(e){return e[S.expando]?e:new S.Event(e)},special:{load:{noBubble:!0},click:{setup:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click",Ce),!1},trigger:function(e){var t=this||e;return pe.test(t.type)&&t.click&&A(t,"input")&&Ae(t,"click"),!0},_default:function(e){var t=e.target;return pe.test(t.type)&&t.click&&A(t,"input")&&Y.get(t,"click")||A(t,"a")}},beforeunload:{postDispatch:function(e){void 0!==e.result&&e.originalEvent&&(e.originalEvent.returnValue=e.result)}}}},S.removeEvent=function(e,t,n){e.removeEventListener&&e.removeEventListener(t,n)},S.Event=function(e,t){if(!(this instanceof S.Event))return new S.Event(e,t);e&&e.type?(this.originalEvent=e,this.type=e.type,this.isDefaultPrevented=e.defaultPrevented||void 0===e.defaultPrevented&&!1===e.returnValue?Ce:Ee,this.target=e.target&&3===e.target.nodeType?e.target.parentNode:e.target,this.currentTarget=e.currentTarget,this.relatedTarget=e.relatedTarget):this.type=e,t&&S.extend(this,t),this.timeStamp=e&&e.timeStamp||Date.now(),this[S.expando]=!0},S.Event.prototype={constructor:S.Event,isDefaultPrevented:Ee,isPropagationStopped:Ee,isImmediatePropagationStopped:Ee,isSimulated:!1,preventDefault:function(){var e=this.originalEvent;this.isDefaultPrevented=Ce,e&&!this.isSimulated&&e.preventDefault()},stopPropagation:function(){var e=this.originalEvent;this.isPropagationStopped=Ce,e&&!this.isSimulated&&e.stopPropagation()},stopImmediatePropagation:function(){var e=this.originalEvent;this.isImmediatePropagationStopped=Ce,e&&!this.isSimulated&&e.stopImmediatePropagation(),this.stopPropagation()}},S.each({altKey:!0,bubbles:!0,cancelable:!0,changedTouches:!0,ctrlKey:!0,detail:!0,eventPhase:!0,metaKey:!0,pageX:!0,pageY:!0,shiftKey:!0,view:!0,"char":!0,code:!0,charCode:!0,key:!0,keyCode:!0,button:!0,buttons:!0,clientX:!0,clientY:!0,offsetX:!0,offsetY:!0,pointerId:!0,pointerType:!0,screenX:!0,screenY:!0,targetTouches:!0,toElement:!0,touches:!0,which:function(e){var t=e.button;return null==e.which&&be.test(e.type)?null!=e.charCode?e.charCode:e.keyCode:!e.which&&void 0!==t&&we.test(e.type)?1&t?1:2&t?3:4&t?2:0:e.which}},S.event.addProp),S.each({focus:"focusin",blur:"focusout"},function(e,t){S.event.special[e]={setup:function(){return Ae(this,e,Se),!1},trigger:function(){return Ae(this,e),!0},delegateType:t}}),S.each({mouseenter:"mouseover",mouseleave:"mouseout",pointerenter:"pointerover",pointerleave:"pointerout"},function(e,i){S.event.special[e]={delegateType:i,bindType:i,handle:function(e){var t,n=e.relatedTarget,r=e.handleObj;return n&&(n===this||S.contains(this,n))||(e.type=r.origType,t=r.handler.apply(this,arguments),e.type=i),t}}}),S.fn.extend({on:function(e,t,n,r){return ke(this,e,t,n,r)},one:function(e,t,n,r){return ke(this,e,t,n,r,1)},off:function(e,t,n){var r,i;if(e&&e.preventDefault&&e.handleObj)return r=e.handleObj,S(e.delegateTarget).off(r.namespace?r.origType+"."+r.namespace:r.origType,r.selector,r.handler),this;if("object"==typeof e){for(i in e)this.off(i,t,e[i]);return this}return!1!==t&&"function"!=typeof t||(n=t,t=void 0),!1===n&&(n=Ee),this.each(function(){S.event.remove(this,e,n,t)})}});var Ne=/<script|<style|<link/i,De=/checked\s*(?:[^=]|=\s*.checked.)/i,je=/^\s*<!(?:\[CDATA\[|--)|(?:\]\]|--)>\s*$/g;function qe(e,t){return A(e,"table")&&A(11!==t.nodeType?t:t.firstChild,"tr")&&S(e).children("tbody")[0]||e}function Le(e){return e.type=(null!==e.getAttribute("type"))+"/"+e.type,e}function He(e){return"true/"===(e.type||"").slice(0,5)?e.type=e.type.slice(5):e.removeAttribute("type"),e}function Oe(e,t){var n,r,i,o,a,s;if(1===t.nodeType){if(Y.hasData(e)&&(s=Y.get(e).events))for(i in Y.remove(t,"handle events"),s)for(n=0,r=s[i].length;n<r;n++)S.event.add(t,i,s[i][n]);Q.hasData(e)&&(o=Q.access(e),a=S.extend({},o),Q.set(t,a))}}function Pe(n,r,i,o){r=g(r);var e,t,a,s,u,l,c=0,f=n.length,p=f-1,d=r[0],h=m(d);if(h||1<f&&"string"==typeof d&&!y.checkClone&&De.test(d))return n.each(function(e){var t=n.eq(e);h&&(r[0]=d.call(this,e,t.html())),Pe(t,r,i,o)});if(f&&(t=(e=xe(r,n[0].ownerDocument,!1,n,o)).firstChild,1===e.childNodes.length&&(e=t),t||o)){for(s=(a=S.map(ve(e,"script"),Le)).length;c<f;c++)u=e,c!==p&&(u=S.clone(u,!0,!0),s&&S.merge(a,ve(u,"script"))),i.call(n[c],u,c);if(s)for(l=a[a.length-1].ownerDocument,S.map(a,He),c=0;c<s;c++)u=a[c],he.test(u.type||"")&&!Y.access(u,"globalEval")&&S.contains(l,u)&&(u.src&&"module"!==(u.type||"").toLowerCase()?S._evalUrl&&!u.noModule&&S._evalUrl(u.src,{nonce:u.nonce||u.getAttribute("nonce")},l):b(u.textContent.replace(je,""),u,l))}return n}function Re(e,t,n){for(var r,i=t?S.filter(t,e):e,o=0;null!=(r=i[o]);o++)n||1!==r.nodeType||S.cleanData(ve(r)),r.parentNode&&(n&&ie(r)&&ye(ve(r,"script")),r.parentNode.removeChild(r));return e}S.extend({htmlPrefilter:function(e){return e},clone:function(e,t,n){var r,i,o,a,s,u,l,c=e.cloneNode(!0),f=ie(e);if(!(y.noCloneChecked||1!==e.nodeType&&11!==e.nodeType||S.isXMLDoc(e)))for(a=ve(c),r=0,i=(o=ve(e)).length;r<i;r++)s=o[r],u=a[r],void 0,"input"===(l=u.nodeName.toLowerCase())&&pe.test(s.type)?u.checked=s.checked:"input"!==l&&"textarea"!==l||(u.defaultValue=s.defaultValue);if(t)if(n)for(o=o||ve(e),a=a||ve(c),r=0,i=o.length;r<i;r++)Oe(o[r],a[r]);else Oe(e,c);return 0<(a=ve(c,"script")).length&&ye(a,!f&&ve(e,"script")),c},cleanData:function(e){for(var t,n,r,i=S.event.special,o=0;void 0!==(n=e[o]);o++)if(V(n)){if(t=n[Y.expando]){if(t.events)for(r in t.events)i[r]?S.event.remove(n,r):S.removeEvent(n,r,t.handle);n[Y.expando]=void 0}n[Q.expando]&&(n[Q.expando]=void 0)}}}),S.fn.extend({detach:function(e){return Re(this,e,!0)},remove:function(e){return Re(this,e)},text:function(e){return $(this,function(e){return void 0===e?S.text(this):this.empty().each(function(){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||(this.textContent=e)})},null,e,arguments.length)},append:function(){return Pe(this,arguments,function(e){1!==this.nodeType&&11!==this.nodeType&&9!==this.nodeType||qe(this,e).appendChild(e)})},prepend:function(){return Pe(this,arguments,function(e){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var t=qe(this,e);t.insertBefore(e,t.firstChild)}})},before:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this)})},after:function(){return Pe(this,arguments,function(e){this.parentNode&&this.parentNode.insertBefore(e,this.nextSibling)})},empty:function(){for(var e,t=0;null!=(e=this[t]);t++)1===e.nodeType&&(S.cleanData(ve(e,!1)),e.textContent="");return this},clone:function(e,t){return e=null!=e&&e,t=null==t?e:t,this.map(function(){return S.clone(this,e,t)})},html:function(e){return $(this,function(e){var t=this[0]||{},n=0,r=this.length;if(void 0===e&&1===t.nodeType)return t.innerHTML;if("string"==typeof e&&!Ne.test(e)&&!ge[(de.exec(e)||["",""])[1].toLowerCase()]){e=S.htmlPrefilter(e);try{for(;n<r;n++)1===(t=this[n]||{}).nodeType&&(S.cleanData(ve(t,!1)),t.innerHTML=e);t=0}catch(e){}}t&&this.empty().append(e)},null,e,arguments.length)},replaceWith:function(){var n=[];return Pe(this,arguments,function(e){var t=this.parentNode;S.inArray(this,n)<0&&(S.cleanData(ve(this)),t&&t.replaceChild(e,this))},n)}}),S.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(e,a){S.fn[e]=function(e){for(var t,n=[],r=S(e),i=r.length-1,o=0;o<=i;o++)t=o===i?this:this.clone(!0),S(r[o])[a](t),u.apply(n,t.get());return this.pushStack(n)}});var Me=new RegExp("^("+ee+")(?!px)[a-z%]+$","i"),Ie=function(e){var t=e.ownerDocument.defaultView;return t&&t.opener||(t=C),t.getComputedStyle(e)},We=function(e,t,n){var r,i,o={};for(i in t)o[i]=e.style[i],e.style[i]=t[i];for(i in r=n.call(e),t)e.style[i]=o[i];return r},Fe=new RegExp(ne.join("|"),"i");function Be(e,t,n){var r,i,o,a,s=e.style;return(n=n||Ie(e))&&(""!==(a=n.getPropertyValue(t)||n[t])||ie(e)||(a=S.style(e,t)),!y.pixelBoxStyles()&&Me.test(a)&&Fe.test(t)&&(r=s.width,i=s.minWidth,o=s.maxWidth,s.minWidth=s.maxWidth=s.width=a,a=n.width,s.width=r,s.minWidth=i,s.maxWidth=o)),void 0!==a?a+"":a}function $e(e,t){return{get:function(){if(!e())return(this.get=t).apply(this,arguments);delete this.get}}}!function(){function e(){if(l){u.style.cssText="position:absolute;left:-11111px;width:60px;margin-top:1px;padding:0;border:0",l.style.cssText="position:relative;display:block;box-sizing:border-box;overflow:scroll;margin:auto;border:1px;padding:1px;width:60%;top:1%",re.appendChild(u).appendChild(l);var e=C.getComputedStyle(l);n="1%"!==e.top,s=12===t(e.marginLeft),l.style.right="60%",o=36===t(e.right),r=36===t(e.width),l.style.position="absolute",i=12===t(l.offsetWidth/3),re.removeChild(u),l=null}}function t(e){return Math.round(parseFloat(e))}var n,r,i,o,a,s,u=E.createElement("div"),l=E.createElement("div");l.style&&(l.style.backgroundClip="content-box",l.cloneNode(!0).style.backgroundClip="",y.clearCloneStyle="content-box"===l.style.backgroundClip,S.extend(y,{boxSizingReliable:function(){return e(),r},pixelBoxStyles:function(){return e(),o},pixelPosition:function(){return e(),n},reliableMarginLeft:function(){return e(),s},scrollboxSize:function(){return e(),i},reliableTrDimensions:function(){var e,t,n,r;return null==a&&(e=E.createElement("table"),t=E.createElement("tr"),n=E.createElement("div"),e.style.cssText="position:absolute;left:-11111px",t.style.height="1px",n.style.height="9px",re.appendChild(e).appendChild(t).appendChild(n),r=C.getComputedStyle(t),a=3<parseInt(r.height),re.removeChild(e)),a}}))}();var _e=["Webkit","Moz","ms"],ze=E.createElement("div").style,Ue={};function Xe(e){var t=S.cssProps[e]||Ue[e];return t||(e in ze?e:Ue[e]=function(e){var t=e[0].toUpperCase()+e.slice(1),n=_e.length;while(n--)if((e=_e[n]+t)in ze)return e}(e)||e)}var Ve=/^(none|table(?!-c[ea]).+)/,Ge=/^--/,Ye={position:"absolute",visibility:"hidden",display:"block"},Qe={letterSpacing:"0",fontWeight:"400"};function Je(e,t,n){var r=te.exec(t);return r?Math.max(0,r[2]-(n||0))+(r[3]||"px"):t}function Ke(e,t,n,r,i,o){var a="width"===t?1:0,s=0,u=0;if(n===(r?"border":"content"))return 0;for(;a<4;a+=2)"margin"===n&&(u+=S.css(e,n+ne[a],!0,i)),r?("content"===n&&(u-=S.css(e,"padding"+ne[a],!0,i)),"margin"!==n&&(u-=S.css(e,"border"+ne[a]+"Width",!0,i))):(u+=S.css(e,"padding"+ne[a],!0,i),"padding"!==n?u+=S.css(e,"border"+ne[a]+"Width",!0,i):s+=S.css(e,"border"+ne[a]+"Width",!0,i));return!r&&0<=o&&(u+=Math.max(0,Math.ceil(e["offset"+t[0].toUpperCase()+t.slice(1)]-o-u-s-.5))||0),u}function Ze(e,t,n){var r=Ie(e),i=(!y.boxSizingReliable()||n)&&"border-box"===S.css(e,"boxSizing",!1,r),o=i,a=Be(e,t,r),s="offset"+t[0].toUpperCase()+t.slice(1);if(Me.test(a)){if(!n)return a;a="auto"}return(!y.boxSizingReliable()&&i||!y.reliableTrDimensions()&&A(e,"tr")||"auto"===a||!parseFloat(a)&&"inline"===S.css(e,"display",!1,r))&&e.getClientRects().length&&(i="border-box"===S.css(e,"boxSizing",!1,r),(o=s in e)&&(a=e[s])),(a=parseFloat(a)||0)+Ke(e,t,n||(i?"border":"content"),o,r,a)+"px"}function et(e,t,n,r,i){return new et.prototype.init(e,t,n,r,i)}S.extend({cssHooks:{opacity:{get:function(e,t){if(t){var n=Be(e,"opacity");return""===n?"1":n}}}},cssNumber:{animationIterationCount:!0,columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,gridArea:!0,gridColumn:!0,gridColumnEnd:!0,gridColumnStart:!0,gridRow:!0,gridRowEnd:!0,gridRowStart:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{},style:function(e,t,n,r){if(e&&3!==e.nodeType&&8!==e.nodeType&&e.style){var i,o,a,s=X(t),u=Ge.test(t),l=e.style;if(u||(t=Xe(s)),a=S.cssHooks[t]||S.cssHooks[s],void 0===n)return a&&"get"in a&&void 0!==(i=a.get(e,!1,r))?i:l[t];"string"===(o=typeof n)&&(i=te.exec(n))&&i[1]&&(n=se(e,t,i),o="number"),null!=n&&n==n&&("number"!==o||u||(n+=i&&i[3]||(S.cssNumber[s]?"":"px")),y.clearCloneStyle||""!==n||0!==t.indexOf("background")||(l[t]="inherit"),a&&"set"in a&&void 0===(n=a.set(e,n,r))||(u?l.setProperty(t,n):l[t]=n))}},css:function(e,t,n,r){var i,o,a,s=X(t);return Ge.test(t)||(t=Xe(s)),(a=S.cssHooks[t]||S.cssHooks[s])&&"get"in a&&(i=a.get(e,!0,n)),void 0===i&&(i=Be(e,t,r)),"normal"===i&&t in Qe&&(i=Qe[t]),""===n||n?(o=parseFloat(i),!0===n||isFinite(o)?o||0:i):i}}),S.each(["height","width"],function(e,u){S.cssHooks[u]={get:function(e,t,n){if(t)return!Ve.test(S.css(e,"display"))||e.getClientRects().length&&e.getBoundingClientRect().width?Ze(e,u,n):We(e,Ye,function(){return Ze(e,u,n)})},set:function(e,t,n){var r,i=Ie(e),o=!y.scrollboxSize()&&"absolute"===i.position,a=(o||n)&&"border-box"===S.css(e,"boxSizing",!1,i),s=n?Ke(e,u,n,a,i):0;return a&&o&&(s-=Math.ceil(e["offset"+u[0].toUpperCase()+u.slice(1)]-parseFloat(i[u])-Ke(e,u,"border",!1,i)-.5)),s&&(r=te.exec(t))&&"px"!==(r[3]||"px")&&(e.style[u]=t,t=S.css(e,u)),Je(0,t,s)}}}),S.cssHooks.marginLeft=$e(y.reliableMarginLeft,function(e,t){if(t)return(parseFloat(Be(e,"marginLeft"))||e.getBoundingClientRect().left-We(e,{marginLeft:0},function(){return e.getBoundingClientRect().left}))+"px"}),S.each({margin:"",padding:"",border:"Width"},function(i,o){S.cssHooks[i+o]={expand:function(e){for(var t=0,n={},r="string"==typeof e?e.split(" "):[e];t<4;t++)n[i+ne[t]+o]=r[t]||r[t-2]||r[0];return n}},"margin"!==i&&(S.cssHooks[i+o].set=Je)}),S.fn.extend({css:function(e,t){return $(this,function(e,t,n){var r,i,o={},a=0;if(Array.isArray(t)){for(r=Ie(e),i=t.length;a<i;a++)o[t[a]]=S.css(e,t[a],!1,r);return o}return void 0!==n?S.style(e,t,n):S.css(e,t)},e,t,1<arguments.length)}}),((S.Tween=et).prototype={constructor:et,init:function(e,t,n,r,i,o){this.elem=e,this.prop=n,this.easing=i||S.easing._default,this.options=t,this.start=this.now=this.cur(),this.end=r,this.unit=o||(S.cssNumber[n]?"":"px")},cur:function(){var e=et.propHooks[this.prop];return e&&e.get?e.get(this):et.propHooks._default.get(this)},run:function(e){var t,n=et.propHooks[this.prop];return this.options.duration?this.pos=t=S.easing[this.easing](e,this.options.duration*e,0,1,this.options.duration):this.pos=t=e,this.now=(this.end-this.start)*t+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),n&&n.set?n.set(this):et.propHooks._default.set(this),this}}).init.prototype=et.prototype,(et.propHooks={_default:{get:function(e){var t;return 1!==e.elem.nodeType||null!=e.elem[e.prop]&&null==e.elem.style[e.prop]?e.elem[e.prop]:(t=S.css(e.elem,e.prop,""))&&"auto"!==t?t:0},set:function(e){S.fx.step[e.prop]?S.fx.step[e.prop](e):1!==e.elem.nodeType||!S.cssHooks[e.prop]&&null==e.elem.style[Xe(e.prop)]?e.elem[e.prop]=e.now:S.style(e.elem,e.prop,e.now+e.unit)}}}).scrollTop=et.propHooks.scrollLeft={set:function(e){e.elem.nodeType&&e.elem.parentNode&&(e.elem[e.prop]=e.now)}},S.easing={linear:function(e){return e},swing:function(e){return.5-Math.cos(e*Math.PI)/2},_default:"swing"},S.fx=et.prototype.init,S.fx.step={};var tt,nt,rt,it,ot=/^(?:toggle|show|hide)$/,at=/queueHooks$/;function st(){nt&&(!1===E.hidden&&C.requestAnimationFrame?C.requestAnimationFrame(st):C.setTimeout(st,S.fx.interval),S.fx.tick())}function ut(){return C.setTimeout(function(){tt=void 0}),tt=Date.now()}function lt(e,t){var n,r=0,i={height:e};for(t=t?1:0;r<4;r+=2-t)i["margin"+(n=ne[r])]=i["padding"+n]=e;return t&&(i.opacity=i.width=e),i}function ct(e,t,n){for(var r,i=(ft.tweeners[t]||[]).concat(ft.tweeners["*"]),o=0,a=i.length;o<a;o++)if(r=i[o].call(n,t,e))return r}function ft(o,e,t){var n,a,r=0,i=ft.prefilters.length,s=S.Deferred().always(function(){delete u.elem}),u=function(){if(a)return!1;for(var e=tt||ut(),t=Math.max(0,l.startTime+l.duration-e),n=1-(t/l.duration||0),r=0,i=l.tweens.length;r<i;r++)l.tweens[r].run(n);return s.notifyWith(o,[l,n,t]),n<1&&i?t:(i||s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l]),!1)},l=s.promise({elem:o,props:S.extend({},e),opts:S.extend(!0,{specialEasing:{},easing:S.easing._default},t),originalProperties:e,originalOptions:t,startTime:tt||ut(),duration:t.duration,tweens:[],createTween:function(e,t){var n=S.Tween(o,l.opts,e,t,l.opts.specialEasing[e]||l.opts.easing);return l.tweens.push(n),n},stop:function(e){var t=0,n=e?l.tweens.length:0;if(a)return this;for(a=!0;t<n;t++)l.tweens[t].run(1);return e?(s.notifyWith(o,[l,1,0]),s.resolveWith(o,[l,e])):s.rejectWith(o,[l,e]),this}}),c=l.props;for(!function(e,t){var n,r,i,o,a;for(n in e)if(i=t[r=X(n)],o=e[n],Array.isArray(o)&&(i=o[1],o=e[n]=o[0]),n!==r&&(e[r]=o,delete e[n]),(a=S.cssHooks[r])&&"expand"in a)for(n in o=a.expand(o),delete e[r],o)n in e||(e[n]=o[n],t[n]=i);else t[r]=i}(c,l.opts.specialEasing);r<i;r++)if(n=ft.prefilters[r].call(l,o,c,l.opts))return m(n.stop)&&(S._queueHooks(l.elem,l.opts.queue).stop=n.stop.bind(n)),n;return S.map(c,ct,l),m(l.opts.start)&&l.opts.start.call(o,l),l.progress(l.opts.progress).done(l.opts.done,l.opts.complete).fail(l.opts.fail).always(l.opts.always),S.fx.timer(S.extend(u,{elem:o,anim:l,queue:l.opts.queue})),l}S.Animation=S.extend(ft,{tweeners:{"*":[function(e,t){var n=this.createTween(e,t);return se(n.elem,e,te.exec(t),n),n}]},tweener:function(e,t){m(e)?(t=e,e=["*"]):e=e.match(P);for(var n,r=0,i=e.length;r<i;r++)n=e[r],ft.tweeners[n]=ft.tweeners[n]||[],ft.tweeners[n].unshift(t)},prefilters:[function(e,t,n){var r,i,o,a,s,u,l,c,f="width"in t||"height"in t,p=this,d={},h=e.style,g=e.nodeType&&ae(e),v=Y.get(e,"fxshow");for(r in n.queue||(null==(a=S._queueHooks(e,"fx")).unqueued&&(a.unqueued=0,s=a.empty.fire,a.empty.fire=function(){a.unqueued||s()}),a.unqueued++,p.always(function(){p.always(function(){a.unqueued--,S.queue(e,"fx").length||a.empty.fire()})})),t)if(i=t[r],ot.test(i)){if(delete t[r],o=o||"toggle"===i,i===(g?"hide":"show")){if("show"!==i||!v||void 0===v[r])continue;g=!0}d[r]=v&&v[r]||S.style(e,r)}if((u=!S.isEmptyObject(t))||!S.isEmptyObject(d))for(r in f&&1===e.nodeType&&(n.overflow=[h.overflow,h.overflowX,h.overflowY],null==(l=v&&v.display)&&(l=Y.get(e,"display")),"none"===(c=S.css(e,"display"))&&(l?c=l:(le([e],!0),l=e.style.display||l,c=S.css(e,"display"),le([e]))),("inline"===c||"inline-block"===c&&null!=l)&&"none"===S.css(e,"float")&&(u||(p.done(function(){h.display=l}),null==l&&(c=h.display,l="none"===c?"":c)),h.display="inline-block")),n.overflow&&(h.overflow="hidden",p.always(function(){h.overflow=n.overflow[0],h.overflowX=n.overflow[1],h.overflowY=n.overflow[2]})),u=!1,d)u||(v?"hidden"in v&&(g=v.hidden):v=Y.access(e,"fxshow",{display:l}),o&&(v.hidden=!g),g&&le([e],!0),p.done(function(){for(r in g||le([e]),Y.remove(e,"fxshow"),d)S.style(e,r,d[r])})),u=ct(g?v[r]:0,r,p),r in v||(v[r]=u.start,g&&(u.end=u.start,u.start=0))}],prefilter:function(e,t){t?ft.prefilters.unshift(e):ft.prefilters.push(e)}}),S.speed=function(e,t,n){var r=e&&"object"==typeof e?S.extend({},e):{complete:n||!n&&t||m(e)&&e,duration:e,easing:n&&t||t&&!m(t)&&t};return S.fx.off?r.duration=0:"number"!=typeof r.duration&&(r.duration in S.fx.speeds?r.duration=S.fx.speeds[r.duration]:r.duration=S.fx.speeds._default),null!=r.queue&&!0!==r.queue||(r.queue="fx"),r.old=r.complete,r.complete=function(){m(r.old)&&r.old.call(this),r.queue&&S.dequeue(this,r.queue)},r},S.fn.extend({fadeTo:function(e,t,n,r){return this.filter(ae).css("opacity",0).show().end().animate({opacity:t},e,n,r)},animate:function(t,e,n,r){var i=S.isEmptyObject(t),o=S.speed(e,n,r),a=function(){var e=ft(this,S.extend({},t),o);(i||Y.get(this,"finish"))&&e.stop(!0)};return a.finish=a,i||!1===o.queue?this.each(a):this.queue(o.queue,a)},stop:function(i,e,o){var a=function(e){var t=e.stop;delete e.stop,t(o)};return"string"!=typeof i&&(o=e,e=i,i=void 0),e&&this.queue(i||"fx",[]),this.each(function(){var e=!0,t=null!=i&&i+"queueHooks",n=S.timers,r=Y.get(this);if(t)r[t]&&r[t].stop&&a(r[t]);else for(t in r)r[t]&&r[t].stop&&at.test(t)&&a(r[t]);for(t=n.length;t--;)n[t].elem!==this||null!=i&&n[t].queue!==i||(n[t].anim.stop(o),e=!1,n.splice(t,1));!e&&o||S.dequeue(this,i)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var e,t=Y.get(this),n=t[a+"queue"],r=t[a+"queueHooks"],i=S.timers,o=n?n.length:0;for(t.finish=!0,S.queue(this,a,[]),r&&r.stop&&r.stop.call(this,!0),e=i.length;e--;)i[e].elem===this&&i[e].queue===a&&(i[e].anim.stop(!0),i.splice(e,1));for(e=0;e<o;e++)n[e]&&n[e].finish&&n[e].finish.call(this);delete t.finish})}}),S.each(["toggle","show","hide"],function(e,r){var i=S.fn[r];S.fn[r]=function(e,t,n){return null==e||"boolean"==typeof e?i.apply(this,arguments):this.animate(lt(r,!0),e,t,n)}}),S.each({slideDown:lt("show"),slideUp:lt("hide"),slideToggle:lt("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(e,r){S.fn[e]=function(e,t,n){return this.animate(r,e,t,n)}}),S.timers=[],S.fx.tick=function(){var e,t=0,n=S.timers;for(tt=Date.now();t<n.length;t++)(e=n[t])()||n[t]!==e||n.splice(t--,1);n.length||S.fx.stop(),tt=void 0},S.fx.timer=function(e){S.timers.push(e),S.fx.start()},S.fx.interval=13,S.fx.start=function(){nt||(nt=!0,st())},S.fx.stop=function(){nt=null},S.fx.speeds={slow:600,fast:200,_default:400},S.fn.delay=function(r,e){return r=S.fx&&S.fx.speeds[r]||r,e=e||"fx",this.queue(e,function(e,t){var n=C.setTimeout(e,r);t.stop=function(){C.clearTimeout(n)}})},rt=E.createElement("input"),it=E.createElement("select").appendChild(E.createElement("option")),rt.type="checkbox",y.checkOn=""!==rt.value,y.optSelected=it.selected,(rt=E.createElement("input")).value="t",rt.type="radio",y.radioValue="t"===rt.value;var pt,dt=S.expr.attrHandle;S.fn.extend({attr:function(e,t){return $(this,S.attr,e,t,1<arguments.length)},removeAttr:function(e){return this.each(function(){S.removeAttr(this,e)})}}),S.extend({attr:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return"undefined"==typeof e.getAttribute?S.prop(e,t,n):(1===o&&S.isXMLDoc(e)||(i=S.attrHooks[t.toLowerCase()]||(S.expr.match.bool.test(t)?pt:void 0)),void 0!==n?null===n?void S.removeAttr(e,t):i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:(e.setAttribute(t,n+""),n):i&&"get"in i&&null!==(r=i.get(e,t))?r:null==(r=S.find.attr(e,t))?void 0:r)},attrHooks:{type:{set:function(e,t){if(!y.radioValue&&"radio"===t&&A(e,"input")){var n=e.value;return e.setAttribute("type",t),n&&(e.value=n),t}}}},removeAttr:function(e,t){var n,r=0,i=t&&t.match(P);if(i&&1===e.nodeType)while(n=i[r++])e.removeAttribute(n)}}),pt={set:function(e,t,n){return!1===t?S.removeAttr(e,n):e.setAttribute(n,n),n}},S.each(S.expr.match.bool.source.match(/\w+/g),function(e,t){var a=dt[t]||S.find.attr;dt[t]=function(e,t,n){var r,i,o=t.toLowerCase();return n||(i=dt[o],dt[o]=r,r=null!=a(e,t,n)?o:null,dt[o]=i),r}});var ht=/^(?:input|select|textarea|button)$/i,gt=/^(?:a|area)$/i;function vt(e){return(e.match(P)||[]).join(" ")}function yt(e){return e.getAttribute&&e.getAttribute("class")||""}function mt(e){return Array.isArray(e)?e:"string"==typeof e&&e.match(P)||[]}S.fn.extend({prop:function(e,t){return $(this,S.prop,e,t,1<arguments.length)},removeProp:function(e){return this.each(function(){delete this[S.propFix[e]||e]})}}),S.extend({prop:function(e,t,n){var r,i,o=e.nodeType;if(3!==o&&8!==o&&2!==o)return 1===o&&S.isXMLDoc(e)||(t=S.propFix[t]||t,i=S.propHooks[t]),void 0!==n?i&&"set"in i&&void 0!==(r=i.set(e,n,t))?r:e[t]=n:i&&"get"in i&&null!==(r=i.get(e,t))?r:e[t]},propHooks:{tabIndex:{get:function(e){var t=S.find.attr(e,"tabindex");return t?parseInt(t,10):ht.test(e.nodeName)||gt.test(e.nodeName)&&e.href?0:-1}}},propFix:{"for":"htmlFor","class":"className"}}),y.optSelected||(S.propHooks.selected={get:function(e){var t=e.parentNode;return t&&t.parentNode&&t.parentNode.selectedIndex,null},set:function(e){var t=e.parentNode;t&&(t.selectedIndex,t.parentNode&&t.parentNode.selectedIndex)}}),S.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){S.propFix[this.toLowerCase()]=this}),S.fn.extend({addClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).addClass(t.call(this,e,yt(this)))});if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])r.indexOf(" "+o+" ")<0&&(r+=o+" ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},removeClass:function(t){var e,n,r,i,o,a,s,u=0;if(m(t))return this.each(function(e){S(this).removeClass(t.call(this,e,yt(this)))});if(!arguments.length)return this.attr("class","");if((e=mt(t)).length)while(n=this[u++])if(i=yt(n),r=1===n.nodeType&&" "+vt(i)+" "){a=0;while(o=e[a++])while(-1<r.indexOf(" "+o+" "))r=r.replace(" "+o+" "," ");i!==(s=vt(r))&&n.setAttribute("class",s)}return this},toggleClass:function(i,t){var o=typeof i,a="string"===o||Array.isArray(i);return"boolean"==typeof t&&a?t?this.addClass(i):this.removeClass(i):m(i)?this.each(function(e){S(this).toggleClass(i.call(this,e,yt(this),t),t)}):this.each(function(){var e,t,n,r;if(a){t=0,n=S(this),r=mt(i);while(e=r[t++])n.hasClass(e)?n.removeClass(e):n.addClass(e)}else void 0!==i&&"boolean"!==o||((e=yt(this))&&Y.set(this,"__className__",e),this.setAttribute&&this.setAttribute("class",e||!1===i?"":Y.get(this,"__className__")||""))})},hasClass:function(e){var t,n,r=0;t=" "+e+" ";while(n=this[r++])if(1===n.nodeType&&-1<(" "+vt(yt(n))+" ").indexOf(t))return!0;return!1}});var xt=/\r/g;S.fn.extend({val:function(n){var r,e,i,t=this[0];return arguments.length?(i=m(n),this.each(function(e){var t;1===this.nodeType&&(null==(t=i?n.call(this,e,S(this).val()):n)?t="":"number"==typeof t?t+="":Array.isArray(t)&&(t=S.map(t,function(e){return null==e?"":e+""})),(r=S.valHooks[this.type]||S.valHooks[this.nodeName.toLowerCase()])&&"set"in r&&void 0!==r.set(this,t,"value")||(this.value=t))})):t?(r=S.valHooks[t.type]||S.valHooks[t.nodeName.toLowerCase()])&&"get"in r&&void 0!==(e=r.get(t,"value"))?e:"string"==typeof(e=t.value)?e.replace(xt,""):null==e?"":e:void 0}}),S.extend({valHooks:{option:{get:function(e){var t=S.find.attr(e,"value");return null!=t?t:vt(S.text(e))}},select:{get:function(e){var t,n,r,i=e.options,o=e.selectedIndex,a="select-one"===e.type,s=a?null:[],u=a?o+1:i.length;for(r=o<0?u:a?o:0;r<u;r++)if(((n=i[r]).selected||r===o)&&!n.disabled&&(!n.parentNode.disabled||!A(n.parentNode,"optgroup"))){if(t=S(n).val(),a)return t;s.push(t)}return s},set:function(e,t){var n,r,i=e.options,o=S.makeArray(t),a=i.length;while(a--)((r=i[a]).selected=-1<S.inArray(S.valHooks.option.get(r),o))&&(n=!0);return n||(e.selectedIndex=-1),o}}}}),S.each(["radio","checkbox"],function(){S.valHooks[this]={set:function(e,t){if(Array.isArray(t))return e.checked=-1<S.inArray(S(e).val(),t)}},y.checkOn||(S.valHooks[this].get=function(e){return null===e.getAttribute("value")?"on":e.value})}),y.focusin="onfocusin"in C;var bt=/^(?:focusinfocus|focusoutblur)$/,wt=function(e){e.stopPropagation()};S.extend(S.event,{trigger:function(e,t,n,r){var i,o,a,s,u,l,c,f,p=[n||E],d=v.call(e,"type")?e.type:e,h=v.call(e,"namespace")?e.namespace.split("."):[];if(o=f=a=n=n||E,3!==n.nodeType&&8!==n.nodeType&&!bt.test(d+S.event.triggered)&&(-1<d.indexOf(".")&&(d=(h=d.split(".")).shift(),h.sort()),u=d.indexOf(":")<0&&"on"+d,(e=e[S.expando]?e:new S.Event(d,"object"==typeof e&&e)).isTrigger=r?2:3,e.namespace=h.join("."),e.rnamespace=e.namespace?new RegExp("(^|\\.)"+h.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,e.result=void 0,e.target||(e.target=n),t=null==t?[e]:S.makeArray(t,[e]),c=S.event.special[d]||{},r||!c.trigger||!1!==c.trigger.apply(n,t))){if(!r&&!c.noBubble&&!x(n)){for(s=c.delegateType||d,bt.test(s+d)||(o=o.parentNode);o;o=o.parentNode)p.push(o),a=o;a===(n.ownerDocument||E)&&p.push(a.defaultView||a.parentWindow||C)}i=0;while((o=p[i++])&&!e.isPropagationStopped())f=o,e.type=1<i?s:c.bindType||d,(l=(Y.get(o,"events")||Object.create(null))[e.type]&&Y.get(o,"handle"))&&l.apply(o,t),(l=u&&o[u])&&l.apply&&V(o)&&(e.result=l.apply(o,t),!1===e.result&&e.preventDefault());return e.type=d,r||e.isDefaultPrevented()||c._default&&!1!==c._default.apply(p.pop(),t)||!V(n)||u&&m(n[d])&&!x(n)&&((a=n[u])&&(n[u]=null),S.event.triggered=d,e.isPropagationStopped()&&f.addEventListener(d,wt),n[d](),e.isPropagationStopped()&&f.removeEventListener(d,wt),S.event.triggered=void 0,a&&(n[u]=a)),e.result}},simulate:function(e,t,n){var r=S.extend(new S.Event,n,{type:e,isSimulated:!0});S.event.trigger(r,null,t)}}),S.fn.extend({trigger:function(e,t){return this.each(function(){S.event.trigger(e,t,this)})},triggerHandler:function(e,t){var n=this[0];if(n)return S.event.trigger(e,t,n,!0)}}),y.focusin||S.each({focus:"focusin",blur:"focusout"},function(n,r){var i=function(e){S.event.simulate(r,e.target,S.event.fix(e))};S.event.special[r]={setup:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r);t||e.addEventListener(n,i,!0),Y.access(e,r,(t||0)+1)},teardown:function(){var e=this.ownerDocument||this.document||this,t=Y.access(e,r)-1;t?Y.access(e,r,t):(e.removeEventListener(n,i,!0),Y.remove(e,r))}}});var Tt=C.location,Ct={guid:Date.now()},Et=/\?/;S.parseXML=function(e){var t;if(!e||"string"!=typeof e)return null;try{t=(new C.DOMParser).parseFromString(e,"text/xml")}catch(e){t=void 0}return t&&!t.getElementsByTagName("parsererror").length||S.error("Invalid XML: "+e),t};var St=/\[\]$/,kt=/\r?\n/g,At=/^(?:submit|button|image|reset|file)$/i,Nt=/^(?:input|select|textarea|keygen)/i;function Dt(n,e,r,i){var t;if(Array.isArray(e))S.each(e,function(e,t){r||St.test(n)?i(n,t):Dt(n+"["+("object"==typeof t&&null!=t?e:"")+"]",t,r,i)});else if(r||"object"!==w(e))i(n,e);else for(t in e)Dt(n+"["+t+"]",e[t],r,i)}S.param=function(e,t){var n,r=[],i=function(e,t){var n=m(t)?t():t;r[r.length]=encodeURIComponent(e)+"="+encodeURIComponent(null==n?"":n)};if(null==e)return"";if(Array.isArray(e)||e.jquery&&!S.isPlainObject(e))S.each(e,function(){i(this.name,this.value)});else for(n in e)Dt(n,e[n],t,i);return r.join("&")},S.fn.extend({serialize:function(){return S.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var e=S.prop(this,"elements");return e?S.makeArray(e):this}).filter(function(){var e=this.type;return this.name&&!S(this).is(":disabled")&&Nt.test(this.nodeName)&&!At.test(e)&&(this.checked||!pe.test(e))}).map(function(e,t){var n=S(this).val();return null==n?null:Array.isArray(n)?S.map(n,function(e){return{name:t.name,value:e.replace(kt,"\r\n")}}):{name:t.name,value:n.replace(kt,"\r\n")}}).get()}});var jt=/%20/g,qt=/#.*$/,Lt=/([?&])_=[^&]*/,Ht=/^(.*?):[ \t]*([^\r\n]*)$/gm,Ot=/^(?:GET|HEAD)$/,Pt=/^\/\//,Rt={},Mt={},It="*/".concat("*"),Wt=E.createElement("a");function Ft(o){return function(e,t){"string"!=typeof e&&(t=e,e="*");var n,r=0,i=e.toLowerCase().match(P)||[];if(m(t))while(n=i[r++])"+"===n[0]?(n=n.slice(1)||"*",(o[n]=o[n]||[]).unshift(t)):(o[n]=o[n]||[]).push(t)}}function Bt(t,i,o,a){var s={},u=t===Mt;function l(e){var r;return s[e]=!0,S.each(t[e]||[],function(e,t){var n=t(i,o,a);return"string"!=typeof n||u||s[n]?u?!(r=n):void 0:(i.dataTypes.unshift(n),l(n),!1)}),r}return l(i.dataTypes[0])||!s["*"]&&l("*")}function $t(e,t){var n,r,i=S.ajaxSettings.flatOptions||{};for(n in t)void 0!==t[n]&&((i[n]?e:r||(r={}))[n]=t[n]);return r&&S.extend(!0,e,r),e}Wt.href=Tt.href,S.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:Tt.href,type:"GET",isLocal:/^(?:about|app|app-storage|.+-extension|file|res|widget):$/.test(Tt.protocol),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":It,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/\bxml\b/,html:/\bhtml/,json:/\bjson\b/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":JSON.parse,"text xml":S.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(e,t){return t?$t($t(e,S.ajaxSettings),t):$t(S.ajaxSettings,e)},ajaxPrefilter:Ft(Rt),ajaxTransport:Ft(Mt),ajax:function(e,t){"object"==typeof e&&(t=e,e=void 0),t=t||{};var c,f,p,n,d,r,h,g,i,o,v=S.ajaxSetup({},t),y=v.context||v,m=v.context&&(y.nodeType||y.jquery)?S(y):S.event,x=S.Deferred(),b=S.Callbacks("once memory"),w=v.statusCode||{},a={},s={},u="canceled",T={readyState:0,getResponseHeader:function(e){var t;if(h){if(!n){n={};while(t=Ht.exec(p))n[t[1].toLowerCase()+" "]=(n[t[1].toLowerCase()+" "]||[]).concat(t[2])}t=n[e.toLowerCase()+" "]}return null==t?null:t.join(", ")},getAllResponseHeaders:function(){return h?p:null},setRequestHeader:function(e,t){return null==h&&(e=s[e.toLowerCase()]=s[e.toLowerCase()]||e,a[e]=t),this},overrideMimeType:function(e){return null==h&&(v.mimeType=e),this},statusCode:function(e){var t;if(e)if(h)T.always(e[T.status]);else for(t in e)w[t]=[w[t],e[t]];return this},abort:function(e){var t=e||u;return c&&c.abort(t),l(0,t),this}};if(x.promise(T),v.url=((e||v.url||Tt.href)+"").replace(Pt,Tt.protocol+"//"),v.type=t.method||t.type||v.method||v.type,v.dataTypes=(v.dataType||"*").toLowerCase().match(P)||[""],null==v.crossDomain){r=E.createElement("a");try{r.href=v.url,r.href=r.href,v.crossDomain=Wt.protocol+"//"+Wt.host!=r.protocol+"//"+r.host}catch(e){v.crossDomain=!0}}if(v.data&&v.processData&&"string"!=typeof v.data&&(v.data=S.param(v.data,v.traditional)),Bt(Rt,v,t,T),h)return T;for(i in(g=S.event&&v.global)&&0==S.active++&&S.event.trigger("ajaxStart"),v.type=v.type.toUpperCase(),v.hasContent=!Ot.test(v.type),f=v.url.replace(qt,""),v.hasContent?v.data&&v.processData&&0===(v.contentType||"").indexOf("application/x-www-form-urlencoded")&&(v.data=v.data.replace(jt,"+")):(o=v.url.slice(f.length),v.data&&(v.processData||"string"==typeof v.data)&&(f+=(Et.test(f)?"&":"?")+v.data,delete v.data),!1===v.cache&&(f=f.replace(Lt,"$1"),o=(Et.test(f)?"&":"?")+"_="+Ct.guid+++o),v.url=f+o),v.ifModified&&(S.lastModified[f]&&T.setRequestHeader("If-Modified-Since",S.lastModified[f]),S.etag[f]&&T.setRequestHeader("If-None-Match",S.etag[f])),(v.data&&v.hasContent&&!1!==v.contentType||t.contentType)&&T.setRequestHeader("Content-Type",v.contentType),T.setRequestHeader("Accept",v.dataTypes[0]&&v.accepts[v.dataTypes[0]]?v.accepts[v.dataTypes[0]]+("*"!==v.dataTypes[0]?", "+It+"; q=0.01":""):v.accepts["*"]),v.headers)T.setRequestHeader(i,v.headers[i]);if(v.beforeSend&&(!1===v.beforeSend.call(y,T,v)||h))return T.abort();if(u="abort",b.add(v.complete),T.done(v.success),T.fail(v.error),c=Bt(Mt,v,t,T)){if(T.readyState=1,g&&m.trigger("ajaxSend",[T,v]),h)return T;v.async&&0<v.timeout&&(d=C.setTimeout(function(){T.abort("timeout")},v.timeout));try{h=!1,c.send(a,l)}catch(e){if(h)throw e;l(-1,e)}}else l(-1,"No Transport");function l(e,t,n,r){var i,o,a,s,u,l=t;h||(h=!0,d&&C.clearTimeout(d),c=void 0,p=r||"",T.readyState=0<e?4:0,i=200<=e&&e<300||304===e,n&&(s=function(e,t,n){var r,i,o,a,s=e.contents,u=e.dataTypes;while("*"===u[0])u.shift(),void 0===r&&(r=e.mimeType||t.getResponseHeader("Content-Type"));if(r)for(i in s)if(s[i]&&s[i].test(r)){u.unshift(i);break}if(u[0]in n)o=u[0];else{for(i in n){if(!u[0]||e.converters[i+" "+u[0]]){o=i;break}a||(a=i)}o=o||a}if(o)return o!==u[0]&&u.unshift(o),n[o]}(v,T,n)),!i&&-1<S.inArray("script",v.dataTypes)&&(v.converters["text script"]=function(){}),s=function(e,t,n,r){var i,o,a,s,u,l={},c=e.dataTypes.slice();if(c[1])for(a in e.converters)l[a.toLowerCase()]=e.converters[a];o=c.shift();while(o)if(e.responseFields[o]&&(n[e.responseFields[o]]=t),!u&&r&&e.dataFilter&&(t=e.dataFilter(t,e.dataType)),u=o,o=c.shift())if("*"===o)o=u;else if("*"!==u&&u!==o){if(!(a=l[u+" "+o]||l["* "+o]))for(i in l)if((s=i.split(" "))[1]===o&&(a=l[u+" "+s[0]]||l["* "+s[0]])){!0===a?a=l[i]:!0!==l[i]&&(o=s[0],c.unshift(s[1]));break}if(!0!==a)if(a&&e["throws"])t=a(t);else try{t=a(t)}catch(e){return{state:"parsererror",error:a?e:"No conversion from "+u+" to "+o}}}return{state:"success",data:t}}(v,s,T,i),i?(v.ifModified&&((u=T.getResponseHeader("Last-Modified"))&&(S.lastModified[f]=u),(u=T.getResponseHeader("etag"))&&(S.etag[f]=u)),204===e||"HEAD"===v.type?l="nocontent":304===e?l="notmodified":(l=s.state,o=s.data,i=!(a=s.error))):(a=l,!e&&l||(l="error",e<0&&(e=0))),T.status=e,T.statusText=(t||l)+"",i?x.resolveWith(y,[o,l,T]):x.rejectWith(y,[T,l,a]),T.statusCode(w),w=void 0,g&&m.trigger(i?"ajaxSuccess":"ajaxError",[T,v,i?o:a]),b.fireWith(y,[T,l]),g&&(m.trigger("ajaxComplete",[T,v]),--S.active||S.event.trigger("ajaxStop")))}return T},getJSON:function(e,t,n){return S.get(e,t,n,"json")},getScript:function(e,t){return S.get(e,void 0,t,"script")}}),S.each(["get","post"],function(e,i){S[i]=function(e,t,n,r){return m(t)&&(r=r||n,n=t,t=void 0),S.ajax(S.extend({url:e,type:i,dataType:r,data:t,success:n},S.isPlainObject(e)&&e))}}),S.ajaxPrefilter(function(e){var t;for(t in e.headers)"content-type"===t.toLowerCase()&&(e.contentType=e.headers[t]||"")}),S._evalUrl=function(e,t,n){return S.ajax({url:e,type:"GET",dataType:"script",cache:!0,async:!1,global:!1,converters:{"text script":function(){}},dataFilter:function(e){S.globalEval(e,t,n)}})},S.fn.extend({wrapAll:function(e){var t;return this[0]&&(m(e)&&(e=e.call(this[0])),t=S(e,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&t.insertBefore(this[0]),t.map(function(){var e=this;while(e.firstElementChild)e=e.firstElementChild;return e}).append(this)),this},wrapInner:function(n){return m(n)?this.each(function(e){S(this).wrapInner(n.call(this,e))}):this.each(function(){var e=S(this),t=e.contents();t.length?t.wrapAll(n):e.append(n)})},wrap:function(t){var n=m(t);return this.each(function(e){S(this).wrapAll(n?t.call(this,e):t)})},unwrap:function(e){return this.parent(e).not("body").each(function(){S(this).replaceWith(this.childNodes)}),this}}),S.expr.pseudos.hidden=function(e){return!S.expr.pseudos.visible(e)},S.expr.pseudos.visible=function(e){return!!(e.offsetWidth||e.offsetHeight||e.getClientRects().length)},S.ajaxSettings.xhr=function(){try{return new C.XMLHttpRequest}catch(e){}};var _t={0:200,1223:204},zt=S.ajaxSettings.xhr();y.cors=!!zt&&"withCredentials"in zt,y.ajax=zt=!!zt,S.ajaxTransport(function(i){var o,a;if(y.cors||zt&&!i.crossDomain)return{send:function(e,t){var n,r=i.xhr();if(r.open(i.type,i.url,i.async,i.username,i.password),i.xhrFields)for(n in i.xhrFields)r[n]=i.xhrFields[n];for(n in i.mimeType&&r.overrideMimeType&&r.overrideMimeType(i.mimeType),i.crossDomain||e["X-Requested-With"]||(e["X-Requested-With"]="XMLHttpRequest"),e)r.setRequestHeader(n,e[n]);o=function(e){return function(){o&&(o=a=r.onload=r.onerror=r.onabort=r.ontimeout=r.onreadystatechange=null,"abort"===e?r.abort():"error"===e?"number"!=typeof r.status?t(0,"error"):t(r.status,r.statusText):t(_t[r.status]||r.status,r.statusText,"text"!==(r.responseType||"text")||"string"!=typeof r.responseText?{binary:r.response}:{text:r.responseText},r.getAllResponseHeaders()))}},r.onload=o(),a=r.onerror=r.ontimeout=o("error"),void 0!==r.onabort?r.onabort=a:r.onreadystatechange=function(){4===r.readyState&&C.setTimeout(function(){o&&a()})},o=o("abort");try{r.send(i.hasContent&&i.data||null)}catch(e){if(o)throw e}},abort:function(){o&&o()}}}),S.ajaxPrefilter(function(e){e.crossDomain&&(e.contents.script=!1)}),S.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/\b(?:java|ecma)script\b/},converters:{"text script":function(e){return S.globalEval(e),e}}}),S.ajaxPrefilter("script",function(e){void 0===e.cache&&(e.cache=!1),e.crossDomain&&(e.type="GET")}),S.ajaxTransport("script",function(n){var r,i;if(n.crossDomain||n.scriptAttrs)return{send:function(e,t){r=S("<script>").attr(n.scriptAttrs||{}).prop({charset:n.scriptCharset,src:n.url}).on("load error",i=function(e){r.remove(),i=null,e&&t("error"===e.type?404:200,e.type)}),E.head.appendChild(r[0])},abort:function(){i&&i()}}});var Ut,Xt=[],Vt=/(=)\?(?=&|$)|\?\?/;S.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var e=Xt.pop()||S.expando+"_"+Ct.guid++;return this[e]=!0,e}}),S.ajaxPrefilter("json jsonp",function(e,t,n){var r,i,o,a=!1!==e.jsonp&&(Vt.test(e.url)?"url":"string"==typeof e.data&&0===(e.contentType||"").indexOf("application/x-www-form-urlencoded")&&Vt.test(e.data)&&"data");if(a||"jsonp"===e.dataTypes[0])return r=e.jsonpCallback=m(e.jsonpCallback)?e.jsonpCallback():e.jsonpCallback,a?e[a]=e[a].replace(Vt,"$1"+r):!1!==e.jsonp&&(e.url+=(Et.test(e.url)?"&":"?")+e.jsonp+"="+r),e.converters["script json"]=function(){return o||S.error(r+" was not called"),o[0]},e.dataTypes[0]="json",i=C[r],C[r]=function(){o=arguments},n.always(function(){void 0===i?S(C).removeProp(r):C[r]=i,e[r]&&(e.jsonpCallback=t.jsonpCallback,Xt.push(r)),o&&m(i)&&i(o[0]),o=i=void 0}),"script"}),y.createHTMLDocument=((Ut=E.implementation.createHTMLDocument("").body).innerHTML="<form></form><form></form>",2===Ut.childNodes.length),S.parseHTML=function(e,t,n){return"string"!=typeof e?[]:("boolean"==typeof t&&(n=t,t=!1),t||(y.createHTMLDocument?((r=(t=E.implementation.createHTMLDocument("")).createElement("base")).href=E.location.href,t.head.appendChild(r)):t=E),o=!n&&[],(i=N.exec(e))?[t.createElement(i[1])]:(i=xe([e],t,o),o&&o.length&&S(o).remove(),S.merge([],i.childNodes)));var r,i,o},S.fn.load=function(e,t,n){var r,i,o,a=this,s=e.indexOf(" ");return-1<s&&(r=vt(e.slice(s)),e=e.slice(0,s)),m(t)?(n=t,t=void 0):t&&"object"==typeof t&&(i="POST"),0<a.length&&S.ajax({url:e,type:i||"GET",dataType:"html",data:t}).done(function(e){o=arguments,a.html(r?S("<div>").append(S.parseHTML(e)).find(r):e)}).always(n&&function(e,t){a.each(function(){n.apply(this,o||[e.responseText,t,e])})}),this},S.expr.pseudos.animated=function(t){return S.grep(S.timers,function(e){return t===e.elem}).length},S.offset={setOffset:function(e,t,n){var r,i,o,a,s,u,l=S.css(e,"position"),c=S(e),f={};"static"===l&&(e.style.position="relative"),s=c.offset(),o=S.css(e,"top"),u=S.css(e,"left"),("absolute"===l||"fixed"===l)&&-1<(o+u).indexOf("auto")?(a=(r=c.position()).top,i=r.left):(a=parseFloat(o)||0,i=parseFloat(u)||0),m(t)&&(t=t.call(e,n,S.extend({},s))),null!=t.top&&(f.top=t.top-s.top+a),null!=t.left&&(f.left=t.left-s.left+i),"using"in t?t.using.call(e,f):("number"==typeof f.top&&(f.top+="px"),"number"==typeof f.left&&(f.left+="px"),c.css(f))}},S.fn.extend({offset:function(t){if(arguments.length)return void 0===t?this:this.each(function(e){S.offset.setOffset(this,t,e)});var e,n,r=this[0];return r?r.getClientRects().length?(e=r.getBoundingClientRect(),n=r.ownerDocument.defaultView,{top:e.top+n.pageYOffset,left:e.left+n.pageXOffset}):{top:0,left:0}:void 0},position:function(){if(this[0]){var e,t,n,r=this[0],i={top:0,left:0};if("fixed"===S.css(r,"position"))t=r.getBoundingClientRect();else{t=this.offset(),n=r.ownerDocument,e=r.offsetParent||n.documentElement;while(e&&(e===n.body||e===n.documentElement)&&"static"===S.css(e,"position"))e=e.parentNode;e&&e!==r&&1===e.nodeType&&((i=S(e).offset()).top+=S.css(e,"borderTopWidth",!0),i.left+=S.css(e,"borderLeftWidth",!0))}return{top:t.top-i.top-S.css(r,"marginTop",!0),left:t.left-i.left-S.css(r,"marginLeft",!0)}}},offsetParent:function(){return this.map(function(){var e=this.offsetParent;while(e&&"static"===S.css(e,"position"))e=e.offsetParent;return e||re})}}),S.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(t,i){var o="pageYOffset"===i;S.fn[t]=function(e){return $(this,function(e,t,n){var r;if(x(e)?r=e:9===e.nodeType&&(r=e.defaultView),void 0===n)return r?r[i]:e[t];r?r.scrollTo(o?r.pageXOffset:n,o?n:r.pageYOffset):e[t]=n},t,e,arguments.length)}}),S.each(["top","left"],function(e,n){S.cssHooks[n]=$e(y.pixelPosition,function(e,t){if(t)return t=Be(e,n),Me.test(t)?S(e).position()[n]+"px":t})}),S.each({Height:"height",Width:"width"},function(a,s){S.each({padding:"inner"+a,content:s,"":"outer"+a},function(r,o){S.fn[o]=function(e,t){var n=arguments.length&&(r||"boolean"!=typeof e),i=r||(!0===e||!0===t?"margin":"border");return $(this,function(e,t,n){var r;return x(e)?0===o.indexOf("outer")?e["inner"+a]:e.document.documentElement["client"+a]:9===e.nodeType?(r=e.documentElement,Math.max(e.body["scroll"+a],r["scroll"+a],e.body["offset"+a],r["offset"+a],r["client"+a])):void 0===n?S.css(e,t,i):S.style(e,t,n,i)},s,n?e:void 0,n)}})}),S.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(e,t){S.fn[t]=function(e){return this.on(t,e)}}),S.fn.extend({bind:function(e,t,n){return this.on(e,null,t,n)},unbind:function(e,t){return this.off(e,null,t)},delegate:function(e,t,n,r){return this.on(t,e,n,r)},undelegate:function(e,t,n){return 1===arguments.length?this.off(e,"**"):this.off(t,e||"**",n)},hover:function(e,t){return this.mouseenter(e).mouseleave(t||e)}}),S.each("blur focus focusin focusout resize scroll click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup contextmenu".split(" "),function(e,n){S.fn[n]=function(e,t){return 0<arguments.length?this.on(n,null,e,t):this.trigger(n)}});var Gt=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g;S.proxy=function(e,t){var n,r,i;if("string"==typeof t&&(n=e[t],t=e,e=n),m(e))return r=s.call(arguments,2),(i=function(){return e.apply(t||this,r.concat(s.call(arguments)))}).guid=e.guid=e.guid||S.guid++,i},S.holdReady=function(e){e?S.readyWait++:S.ready(!0)},S.isArray=Array.isArray,S.parseJSON=JSON.parse,S.nodeName=A,S.isFunction=m,S.isWindow=x,S.camelCase=X,S.type=w,S.now=Date.now,S.isNumeric=function(e){var t=S.type(e);return("number"===t||"string"===t)&&!isNaN(e-parseFloat(e))},S.trim=function(e){return null==e?"":(e+"").replace(Gt,"")},"function"==typeof define&&define.amd&&define("jquery",[],function(){return S});var Yt=C.jQuery,Qt=C.$;return S.noConflict=function(e){return C.$===S&&(C.$=Qt),e&&C.jQuery===S&&(C.jQuery=Yt),S},"undefined"==typeof e&&(C.jQuery=C.$=S),S});
diff --git a/static/debug_toolbar/css/print.css b/static/debug_toolbar/css/print.css
new file mode 100644
index 00000000..cde64990
--- /dev/null
+++ b/static/debug_toolbar/css/print.css
@@ -0,0 +1,3 @@
+#djDebug {
+  display: none !important;
+}
diff --git a/static/debug_toolbar/css/toolbar.css b/static/debug_toolbar/css/toolbar.css
new file mode 100644
index 00000000..eaaacf6c
--- /dev/null
+++ b/static/debug_toolbar/css/toolbar.css
@@ -0,0 +1,646 @@
+/* http://www.positioniseverything.net/easyclearing.html */
+#djDebug .djdt-clearfix:after {
+    content: ".";
+    display: block;
+    height: 0;
+    clear: both;
+    visibility: hidden;
+}
+#djDebug .djdt-clearfix {display: inline-block;}
+/* Hides from IE-mac \*/
+#djDebug .djdt-clearfix {display: block;}
+* html #djDebug .djdt-clearfix {height: 1%;}
+/* end hide from IE-mac */
+
+/* Debug Toolbar CSS Reset, adapted from Eric Meyer's CSS Reset */
+#djDebug {color:#000;background:#FFF;}
+#djDebug, #djDebug div, #djDebug span, #djDebug applet, #djDebug object, #djDebug iframe,
+#djDebug h1, #djDebug h2, #djDebug h3, #djDebug h4, #djDebug h5, #djDebug h6, #djDebug p, #djDebug blockquote, #djDebug pre,
+#djDebug a, #djDebug abbr, #djDebug acronym, #djDebug address, #djDebug big, #djDebug cite, #djDebug code,
+#djDebug del, #djDebug dfn, #djDebug em, #djDebug font, #djDebug img, #djDebug ins, #djDebug kbd, #djDebug q, #djDebug s, #djDebug samp,
+#djDebug small, #djDebug strike, #djDebug strong, #djDebug sub, #djDebug sup, #djDebug tt, #djDebug var,
+#djDebug b, #djDebug u, #djDebug i, #djDebug center,
+#djDebug dl, #djDebug dt, #djDebug dd, #djDebug ol, #djDebug ul, #djDebug li,
+#djDebug fieldset, #djDebug form, #djDebug label, #djDebug legend,
+#djDebug table, #djDebug caption, #djDebug tbody, #djDebug tfoot, #djDebug thead, #djDebug tr, #djDebug th, #djDebug td,
+#djDebug button {
+	margin:0;
+	padding:0;
+	min-width:0;
+	width:auto;
+	border:0;
+	outline:0;
+	font-size:12px;
+	line-height:1.5em;
+	color:#000;
+	vertical-align:baseline;
+	background-color:transparent;
+	font-family:sans-serif;
+	text-align:left;
+	text-shadow: none;
+	white-space: normal;
+	-webkit-transition: none;
+    -moz-transition: none;
+    -o-transition: none;
+    transition: none;
+}
+
+#djDebug button, #djDebug a.button {
+	background-color: #eee;
+	background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eee), color-stop(100%, #cccccc));
+	background-image: -webkit-linear-gradient(top, #eee, #cccccc);
+	background-image: -moz-linear-gradient(top, #eee, #cccccc);
+	background-image: -ms-linear-gradient(top, #eee, #cccccc);
+	background-image: -o-linear-gradient(top, #eee, #cccccc);
+	background-image: linear-gradient(top, #eee, #cccccc);
+	border: 1px solid #ccc;
+	border-bottom: 1px solid #bbb;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	color: #333;
+	line-height: 1;
+	padding: 0 8px;
+	text-align: center;
+	text-shadow: 0 1px 0 #eee;
+}
+
+#djDebug button:hover, #djDebug a.button:hover {
+    background-color: #ddd;
+    background-image: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ddd), color-stop(100%, #bbb));
+    background-image: -webkit-linear-gradient(top, #ddd, #bbb);
+    background-image: -moz-linear-gradient(top, #ddd, #bbb);
+    background-image: -ms-linear-gradient(top, #ddd, #bbb);
+    background-image: -o-linear-gradient(top, #ddd, #bbb);
+    background-image: linear-gradient(top, #ddd, #bbb);
+    border-color: #bbb;
+    border-bottom-color: #999;
+    cursor: pointer;
+    text-shadow: 0 1px 0 #ddd;
+}
+
+#djDebug button:active, #djDebug a.button:active {
+    border: 1px solid #aaa;
+    border-bottom: 1px solid #888;
+    -webkit-box-shadow: inset 0 0 5px 2px #aaa, 0 1px 0 0 #eee;
+    -moz-box-shadow: inset 0 0 5px 2px #aaa, 0 1px 0 0 #eee;
+    box-shadow: inset 0 0 5px 2px #aaa, 0 1px 0 0 #eee;
+}
+
+#djDebug #djDebugToolbar {
+	background-color:#111;
+	width:200px;
+	z-index:100000000;
+	position:fixed;
+	top:0;
+	bottom:0;
+	right:0;
+	opacity:0.9;
+	overflow-y: auto;
+}
+
+#djDebug #djDebugToolbar small {
+	color:#999;
+}
+
+#djDebug #djDebugToolbar ul {
+	margin:0;
+	padding:0;
+	list-style:none;
+}
+
+#djDebug #djDebugToolbar li {
+	border-bottom:1px solid #222;
+	color:#fff;
+	display:block;
+	font-weight:bold;
+	float:none;
+	margin:0;
+	padding:0;
+	position:relative;
+	width:auto;
+}
+
+#djDebug #djDebugToolbar input[type=checkbox] {
+	float: right;
+	margin: 10px;
+}
+
+#djDebug #djDebugToolbar li>a,
+#djDebug #djDebugToolbar li>div.djdt-contentless  {
+	font-weight:normal;
+	font-style:normal;
+	text-decoration:none;
+	display:block;
+	font-size:16px;
+	padding:10px 10px 5px 25px;
+	color:#fff;
+}
+#djDebug #djDebugToolbar li>div.djdt-disabled {
+	font-style: italic;
+	color: #999;
+}
+
+#djDebug #djDebugToolbar li a:hover {
+	color:#111;
+	background-color:#ffc;
+}
+
+#djDebug #djDebugToolbar li.djdt-active {
+	background: #333 no-repeat left center;
+	background-image: url(../img/indicator.png);
+	padding-left:10px;
+}
+
+#djDebug #djDebugToolbar li.djdt-active a:hover {
+	color:#b36a60;
+	background-color:transparent;
+}
+
+#djDebug #djDebugToolbar li small {
+	font-size:12px;
+	color:#999;
+	font-style:normal;
+	text-decoration:none;
+	font-variant:small-caps;
+}
+
+#djDebug #djDebugToolbarHandle {
+	position:fixed;
+	background-color:#fff;
+	border:1px solid #111;
+	top:30px;
+	right:0;
+	z-index:100000000;
+	opacity:0.75;
+}
+
+#djDebug #djShowToolBarButton {
+	display:block;
+	height:75px;
+	width:30px;
+	border-right:none;
+	border-bottom:4px solid #fff;
+	border-top:4px solid #fff;
+	border-left:4px solid #fff;
+	color:#fff;
+	font-size:10px;
+	font-weight:bold;
+	text-decoration:none;
+	text-align:center;
+	text-indent:-999999px;
+	background: #000 no-repeat left center;
+	background-image: url(../img/djdt_vertical.png);
+	opacity:0.5;
+}
+
+#djDebug #djShowToolBarButton:hover {
+	background-color:#111;
+	border-top-color:#FFE761;
+	border-left-color:#FFE761;
+	border-bottom-color:#FFE761;
+	cursor:move;
+	opacity:1.0;
+}
+
+#djDebug code {
+	display:block;
+	font-family:Consolas, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", monospace;
+	font-size: 12px;
+	white-space:pre;
+	overflow:auto;
+}
+
+#djDebug .djDebugOdd {
+	background-color:#f5f5f5;
+}
+
+#djDebug .djdt-panelContent {
+	display:none;
+	position:fixed;
+	margin:0;
+	top:0;
+	right:200px;
+	bottom:0;
+	left:0px;
+	background-color:#eee;
+	color:#666;
+	z-index:100000000;
+}
+
+#djDebug .djdt-panelContent > div {
+	border-bottom:1px solid #ddd;
+}
+
+#djDebug .djDebugPanelTitle {
+	position:absolute;
+	background-color:#ffc;
+	color:#666;
+	padding-left:20px;
+	top:0;
+	right:0;
+	left:0;
+	height:50px;
+}
+
+#djDebug .djDebugPanelTitle code {
+	display:inline;
+	font-size:inherit;
+}
+
+#djDebug .djDebugPanelContent {
+	position:absolute;
+	top:50px;
+	right:0;
+	bottom:0;
+	left:0;
+	height:auto;
+	padding:5px 0 0 20px;
+}
+
+#djDebug .djDebugPanelContent .djdt-loader {
+	display:block;
+	margin:80px auto;
+}
+
+#djDebug .djDebugPanelContent .djdt-scroll {
+	height:100%;
+	overflow:auto;
+	display:block;
+	padding:0 10px 0 0;
+}
+
+#djDebug h3 {
+	font-size:24px;
+	font-weight:normal;
+	line-height:50px;
+}
+
+#djDebug h4 {
+	font-size:20px;
+	font-weight:bold;
+	margin-top:0.8em;
+}
+
+#djDebug .djdt-panelContent table {
+	border:1px solid #ccc;
+	border-collapse:collapse;
+	width:100%;
+	background-color:#fff;
+	display:table;
+	margin-top:0.8em;
+	overflow: auto;
+}
+#djDebug .djdt-panelContent tbody td,
+#djDebug .djdt-panelContent tbody th {
+	vertical-align:top;
+	padding:2px 3px;
+}
+#djDebug .djdt-panelContent tbody td.djdt-time {
+    text-align: center;
+}
+
+#djDebug .djdt-panelContent thead th {
+	padding:1px 6px 1px 3px;
+	text-align:left;
+	font-weight:bold;
+	font-size:14px;
+    white-space: nowrap;
+}
+#djDebug .djdt-panelContent tbody th {
+	width:12em;
+	text-align:right;
+	color:#666;
+	padding-right:.5em;
+}
+
+#djDebug .djTemplateContext {
+	background-color:#fff;
+}
+
+/*
+#djDebug .djdt-panelContent p a:hover, #djDebug .djdt-panelContent dd a:hover {
+	color:#111;
+	background-color:#ffc;
+}
+
+#djDebug .djdt-panelContent p {
+	padding:0 5px;
+}
+
+#djDebug .djdt-panelContent p, #djDebug .djdt-panelContent table, #djDebug .djdt-panelContent ol, #djDebug .djdt-panelContent ul, #djDebug .djdt-panelContent dl {
+	margin:5px 0 15px;
+	background-color:#fff;
+}
+#djDebug .djdt-panelContent table {
+	clear:both;
+	border:0;
+	padding:0;
+	margin:0;
+	border-collapse:collapse;
+	border-spacing:0;
+}
+
+#djDebug .djdt-panelContent table a {
+	color:#000;
+	padding:2px 4px;
+}
+#djDebug .djdt-panelContent table a:hover {
+	background-color:#ffc;
+}
+
+#djDebug .djdt-panelContent table th {
+	background-color:#333;
+	font-weight:bold;
+	color:#fff;
+	padding:3px 7px 3px;
+	text-align:left;
+	cursor:pointer;
+}
+#djDebug .djdt-panelContent table td {
+	padding:5px 10px;
+	font-size:14px;
+	background-color:#fff;
+	color:#000;
+	vertical-align:top;
+	border:0;
+}
+#djDebug .djdt-panelContent table tr.djDebugOdd td {
+  background-color:#eee;
+}
+*/
+
+#djDebug .djdt-panelContent .djDebugClose {
+	display:block;
+	position:absolute;
+	top:4px;
+	right:15px;
+	height:40px;
+	width:40px;
+	background: no-repeat center center;
+	background-image: url(../img/close.png);
+}
+
+#djDebug .djdt-panelContent .djDebugClose:hover {
+	background-image: url(../img/close_hover.png);
+}
+
+#djDebug .djdt-panelContent .djDebugClose.djDebugBack {
+	background-image: url(../img/back.png);
+}
+
+#djDebug .djdt-panelContent .djDebugClose.djDebugBack:hover  {
+	background-image: url(../img/back_hover.png);
+}
+
+#djDebug .djdt-panelContent dt, #djDebug .djdt-panelContent dd {
+	display:block;
+}
+
+#djDebug .djdt-panelContent dt {
+	margin-top:0.75em;
+}
+
+#djDebug .djdt-panelContent dd {
+	margin-left:10px;
+}
+
+#djDebug a.toggleTemplate {
+	padding:4px;
+	background-color:#bbb;
+	-webkit-border-radius:3px;
+	-moz-border-radius:3px;
+	border-radius:3px;
+}
+
+#djDebug a.toggleTemplate:hover {
+	padding:4px;
+	background-color:#444;
+	color:#ffe761;
+	-webkit-border-radius:3px;
+	-moz-border-radius:3px;
+	border-radius:3px;
+}
+
+
+#djDebug .djDebugSqlWrap {
+	position:relative;
+}
+
+#djDebug .djDebugCollapsed {
+    display: none;
+    text-decoration: none;
+    color: #333;
+}
+
+#djDebug .djDebugUncollapsed {
+    color: #333;
+    text-decoration: none;
+}
+
+#djDebug .djUnselected {
+    display: none;
+}
+#djDebug tr.djHiddenByDefault {
+    display: none;
+}
+#djDebug tr.djSelected {
+    display: table-row;
+}
+
+#djDebug .djDebugSql {
+	word-break:break-word;
+	z-index:100000002;
+}
+
+#djDebug .djSQLDetailsDiv tbody th {
+	text-align: left;
+}
+
+#djDebug .djSqlExplain td {
+	white-space: pre;
+}
+
+#djDebug span.djDebugLineChart {
+	background-color:#777;
+	height:3px;
+	position:absolute;
+	bottom:0;
+	top:0;
+	left:0;
+	display:block;
+	z-index:1000000001;
+}
+#djDebug span.djDebugLineChartWarning {
+	background-color:#900;
+}
+
+#djDebug .highlight  { color:#000; }
+#djDebug .highlight .err { color:#000; } /* Error */
+#djDebug .highlight .g { color:#000; } /* Generic */
+#djDebug .highlight .k { color:#000; font-weight:bold } /* Keyword */
+#djDebug .highlight .o { color:#000; } /* Operator */
+#djDebug .highlight .n { color:#000; } /* Name */
+#djDebug .highlight .mi { color:#000; font-weight:bold } /* Literal.Number.Integer */
+#djDebug .highlight .l { color:#000; } /* Literal */
+#djDebug .highlight .x { color:#000; } /* Other */
+#djDebug .highlight .p { color:#000; } /* Punctuation */
+#djDebug .highlight .m { color:#000; font-weight:bold } /* Literal.Number */
+#djDebug .highlight .s { color:#333 } /* Literal.String */
+#djDebug .highlight .w { color:#888888 } /* Text.Whitespace */
+#djDebug .highlight .il { color:#000; font-weight:bold } /* Literal.Number.Integer.Long */
+#djDebug .highlight .na { color:#333 } /* Name.Attribute */
+#djDebug .highlight .nt { color:#000; font-weight:bold } /* Name.Tag */
+#djDebug .highlight .nv { color:#333 } /* Name.Variable */
+#djDebug .highlight .s2 { color:#333 } /* Literal.String.Double */
+#djDebug .highlight .cp { color:#333 } /* Comment.Preproc */
+
+#djDebug .djdt-timeline {
+    width: 30%;
+}
+#djDebug .djDebugTimeline {
+    position: relative;
+    height: 100%;
+    min-height: 100%;
+}
+#djDebug div.djDebugLineChart {
+    position: absolute;
+    left: 0;
+    right: 0;
+    top: 0;
+    bottom: 0;
+    vertical-align: middle;
+}
+#djDebug div.djDebugLineChart strong {
+    text-indent: -10000em;
+    display: block;
+    font-weight: normal;
+    vertical-align: middle;
+    background-color:#ccc;
+}
+
+#djDebug div.djDebugLineChartWarning strong {
+    background-color:#900;
+}
+
+#djDebug .djDebugInTransaction div.djDebugLineChart strong {
+    background-color: #d3ff82;
+}
+#djDebug .djDebugStartTransaction div.djDebugLineChart strong {
+    border-left: 1px solid #94b24d;
+}
+#djDebug .djDebugEndTransaction div.djDebugLineChart strong {
+    border-right: 1px solid #94b24d;
+}
+
+#djDebug .djdt-panelContent ul.djdt-stats {
+    position: relative;
+    list-style-type: none;
+}
+#djDebug .djdt-panelContent ul.djdt-stats li {
+    width: 30%;
+    float: left;
+}
+#djDebug .djdt-panelContent ul.djdt-stats li strong.djdt-label {
+    display: block;
+}
+#djDebug .djdt-panelContent ul.djdt-stats li span.djdt-color {
+    height: 12px;
+    width: 3px;
+    display: inline-block;
+}
+#djDebug .djdt-panelContent ul.djdt-stats li span.djdt-info {
+    display: block;
+    padding-left: 5px;
+}
+
+#djDebug .djdt-panelContent thead th {
+    white-space: nowrap;
+}
+#djDebug .djDebugRowWarning .djdt-time {
+    color: red;
+}
+#djdebug .djdt-panelContent table .djdt-toggle {
+    width: 14px;
+    padding-top: 3px;
+}
+#djDebug .djdt-panelContent table .djdt-actions {
+    min-width: 70px;
+    white-space: nowrap;
+}
+#djdebug .djdt-panelContent table .djdt-color {
+    width: 3px;
+}
+#djdebug .djdt-panelContent table .djdt-color span {
+    width: 3px;
+    height: 12px;
+    overflow: hidden;
+    padding: 0;
+}
+#djDebug .djToggleSwitch {
+    text-decoration: none;
+    border: 1px solid #999;
+    height: 12px;
+    width: 12px;
+    line-height: 12px;
+    text-align: center;
+    color: #777;
+    display: inline-block;
+    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFF', endColorstr='#DCDCDC'); /* for IE */
+    background: -webkit-gradient(linear, left top, left bottom, from(#FFF), to(#DCDCDC)); /* for webkit browsers */
+    background:-moz-linear-gradient(center top , #FFFFFF 0pt, #DCDCDC 100%) repeat scroll 0 0 transparent;
+}
+#djDebug .djNoToggleSwitch {
+    height: 14px;
+    width: 14px;
+    display: inline-block;
+}
+
+#djDebug .djSQLDetailsDiv {
+    margin-top:0.8em;
+}
+#djDebug pre {
+	white-space: -moz-pre-wrap;  /* Mozilla, since 1999    */
+	white-space: -pre-wrap;      /* Opera 4-6              */
+	white-space: -o-pre-wrap;    /* Opera 7                */
+	white-space: pre-wrap;       /* CSS-3                  */
+	word-wrap: break-word;       /* Internet Explorer 5.5+ */
+    color: #555;
+    border:1px solid #ccc;
+    border-collapse:collapse;
+    background-color:#fff;
+    display:block;
+    overflow: auto;
+    padding:2px 3px;
+    margin-bottom: 3px;
+    font-family:Consolas, Monaco, "Bitstream Vera Sans Mono", "Lucida Console", monospace;
+}
+#djDebug .djdt-stack span {
+    color: #000;
+    font-weight: bold;
+}
+#djDebug .djdt-stack span.djdt-path,
+#djDebug .djdt-stack pre.djdt-locals,
+#djDebug .djdt-stack pre.djdt-locals span {
+    color: #777;
+    font-weight: normal;
+}
+#djDebug .djdt-stack span.djdt-code {
+    font-weight: normal;
+}
+#djDebug .djdt-stack pre.djdt-locals {
+	margin: 0 27px 27px 27px;
+}
+
+#djDebug .djdt-width-20 {
+    width: 20%;
+}
+#djDebug .djdt-width-60 {
+    width: 60%;
+}
+#djDebug .djdt-highlighted {
+    background-color: lightgrey;
+}
+.djdt-hidden {
+    display: none;
+}
diff --git a/static/debug_toolbar/img/ajax-loader.gif b/static/debug_toolbar/img/ajax-loader.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a7c3f2bacbe630950c16f53e3c27dd840f2e8622
GIT binary patch
literal 404
zcmZ?wbhEHb)Mnsj_{hNU?%lhzw6s;LRsl)He^Smxsfi`2DGKG8B^e5dS&0=n`H3ld
znR#jX42nNl7`PZ17!?0=`?-b$J39ur8tEA@GXjNlfS3VfAOn+8OCQJSX*X{)e?H13
zeJ||u>DC8kZ4r?R)6{G4&Dyt|CtcU`diyE8Uq?3owA-;j!N^AxXd>8TMr31bj{uEP
z;7?56IIHFOnwrlu67PNQNtrQY{;7pt&RzvNJJ_?&Ze06Pg>MsMs)$s6#HZT6Q+}5p
z&C*E<I=&ueA`^;<Acq+MO<XxEEBa3UBYrO7?UfHJdzM^TuwobAGVVjKeUi;OpPxMU
z@@LSj8EZ_>81%TGdiiN4(8Lw%U?wsno9F=b>WnG7*rn?>{@R)9v%+M)yIi1FiTcrX
vD}VECG@HG3ZvWp+k0+)$$G&~0?NxTdRajt8g3>tw(O*m=3=Gzwa03GXAUBr*

literal 0
HcmV?d00001

diff --git a/static/debug_toolbar/img/back.png b/static/debug_toolbar/img/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..aef96c126ed416459c614d62341490584aba1bd2
GIT binary patch
literal 574
zcmV-E0>S->P)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_00067Nkl<Zcmds*
z(Q4vA6o!3>-0s!BgwG)4cHdyZ+r`D(g+726eE=V)7rhXKw$ijF24d2vP-zowHDz{w
z=ztC<8FLt`bl|7snVfSzCNn29ZE)LoJa(jhNVyRDpSA`^bsdoKQfee6N`x^y;~oR#
zw^WQoH5J3x21rY4zyQ!SL@X{y2SF^WQx~LX3hMiQF_}!ZNs<&0`mh}U(>oO8Usa$q
zP2cl87iA4&c*X$JHG#Ng&eQ2MBLOOa;yBJKU|LlmH<Z(SJ}(5b!IuU>E*hlGhhW3B
zDG<F*U}|55rG{8!ozXykQN;S1SZ_9}Yp~O6hRT85yC8jPcj&>Mo|ob_jD+5nSq{6{
z79W)`CA+D=3*wn(LxEh~d1B~?DyafdcFa!QS@9HzqYnl_us0ieLTK<1sHFJ2XV2De
zr7(z1z&HSD>H|>}t>I*XxxRk{gtFtevX{ajHUZKENQ>Alm0K1`R8j!!+A$-r<26zZ
zv8m#AMj-rGgQV78js3-{?2N^FF58zbXtUYOdO<@>x}X_K{A#tbR^k!MRN|Eu`a?;Q
zyd3$Xx1hehe@<`=_)CF6-WMK>My#VErj~J3RIh`QTLl7Loc8d{xK4y&xKY;$^le`!
zlt3*ktING|y4uN}E5vYZT*BK@DFYyd@3;K71SLo6ClW&F!^VyGAE;taIbhOiVE_OC
M07*qoM6N<$f}|Y*7ytkO

literal 0
HcmV?d00001

diff --git a/static/debug_toolbar/img/back_hover.png b/static/debug_toolbar/img/back_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ce3edaf8007361915f4f6824f1488749182dda5
GIT binary patch
literal 613
zcmV-r0-F7aP)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_0006kNkl<Zcmds*
zPs<Wf6vq7!vu)Lv@G}UrZPzleWlXq}NP>zYs1M*Sia-mBu&}anp^HRwY+k1%+6a=g
zh@wT%?LN=}yFD{E50{Vz9^UcXd!F-S{@gkDt!R(cY86=>vx*^{|B6*K+BX3OZ&+nk
zh6`hugSp{BPFby4VUO0x4FOWKnkWEV&ETa4NnjFK$-W@hyr%imyq!<YqThpXj+h??
z-hT;luFNQXc+ZTlUND2xC#f)oIUbmX4<s&1K6?4YjIOje01@V9FZyLLwK9;DCB5$6
zhPg_}<shiVLFz1F*1097dYHR+I1FmKAZ(q;o<D|B2*Hc4GcL#pM(jQlqh=!K{y2GN
zSPj(P1!=Rl!!=vpY@1J6`bT_r{SxA4nAA&Q3f`vnE=W$V1_8nG`NMlDDj*W4SI2Wz
zasi3l!FNY*elQ~`h~wMGjTFV--{P+>HVa|kO<*E`RNaB)c<2~#nD1Y|07ByUE%8Da
zcoUE+Kx*#5;_0K(dyOJe6ac$%ToD|&jU*S|ba6W<5bdo&(SWxm{KJahiih=ZUSGbT
z&F^<YFKF<j3z~n4zkEK_5)Uu$5--}ild@;Ma38$^eOtEd>w8As2IzZ|vkU~v|6ya4
zX<9|}6Z^M{(t~itzUH~b5=HX|U2pS@Ir`>Vv7N}L6WLDSJot7(1Zopl4egdQW}Ur4
zDZD~#!s}KW1;7Tm|KYzSxFW0LC<x&kF|FTEN8)OI1uc7c00000NkvXXu0mjfjN}_;

literal 0
HcmV?d00001

diff --git a/static/debug_toolbar/img/close.png b/static/debug_toolbar/img/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce4317f2f71859e3c7a015d14430ffe5e7a06b5d
GIT binary patch
literal 498
zcmV<O0S*3%P)<h;3K|Lk000e1NJLTq001HY001Hg1ONa4kWRx%0005GNkl<ZcmchZ
zUFsS!6vbx|^XikEa18@_bq9rcEf!x3U4Rc=fJ-VA1_a@1TXoX$gO=*}$C`S2!DezD
zO=fDL=RhzY{77!@+!%#KF?C3>JNzs1+c%-;JxvJ06CP3RA+IPWc%1WWBP5{@ga&`4
zBm@}{T6*AvjOt5g=F?dl&F#$GVMdQ2Zwb=Hsf1L?BQ?yh4pDM?b&voF$`1tL<Q9^-
zsf|HE8+ouyLec;tj7ckq%Zq%EX7MVQHx|-&<PvREf}HzT$k^QoDjDqX4HvMu{f;fp
za1u8)zCxyt_EB7qhYMSS*!uBaro@ogcIT&?@YyIq+kHZ6?)DN#)U%!C3xs}Q2@+nw
zK!{gYbG?X?>She!!+fbBz^h%#1t1&?m&3ROAl~B$gblIxINreSs#q*+E_(y(z2dJn
zoK<Xc{}sz*TZ_G%uwsz;6XJq<^0aH2Z1uE1qK%ICY0uu;A^qboKftZ~ieEon3f{<~
zG<~WlO#<aH-+RmBo*=C1h5FsU7i!Ow@%g7Vn%m|l!+A((>0#&@Rg^UXGE&VCdP;>C
oP*D0G|5`Z5)Fs94hX3UJ23oH|sU6@<nE(I)07*qoM6N<$g8h-^0{{R3

literal 0
HcmV?d00001

diff --git a/static/debug_toolbar/img/close_hover.png b/static/debug_toolbar/img/close_hover.png
new file mode 100644
index 0000000000000000000000000000000000000000..6b4d96e86d979c7edaf054c6d7c6eabe02d4ea57
GIT binary patch
literal 706
zcmV;z0zLhSP)<h;3K|Lk000e1NJLTq001HY001Hg1^@s6I!6n_0007sNkl<Zcmds*
z&uSA<6o>l|v+c^4=ra^%+noy$F^USdS{Djp(S=mH@Bz9KDuqVHKdmKdQ)_8UOgkp&
zB$JNTXd<mCt^c+j?+<ce$ef$WJ&Z0q@WC)M=kPH(bLZR)NFxkGM=_{yI}CQt4M?y}
za20nIzJd(+oqOEBA#zI5QjjGr<fb7qtSH(FFnFjX6&X`d%8c2HOeGc#YE&<6Q6;wk
zaEx>P$V~Msa=llf^0SAue&;4FojJ~dYq%##W;{v6H6>SHzo50r30{B!_xj7ZUNXbI
zM9N&!yX<`wmw;T8NZBNk;S#*L8C_H^^I+B_lZlCN>x7?QM4>c5Eq<Np5*gu)nVyh>
zTBfHm5*3+d-VV0l>XmcUSbR!hc7~QOoYdzjfBpp3XYbLc+&rya8|89MZ_{*CB<S~P
z>=)KZ$6>Vs8AwpudrLYFDxS?#3ABjQeQ~F{{oC}2oB13?<FK|(?b0Si1G1)k)MjKH
zhzxaKsI9LU3$2Wvrtcp@GR3dfXL@t_tT7+88Id9VVWTLOm(O*gS!VZrT;fYpOBg|I
zZgCTdpeGK>9(Bi2y^5X@i&*_Mx-ku*8(8quST^g&`A4yy_|e#<NT8tw&1(7je%&mP
zj-Sm2dLq`qcq)?DmtD|GkLTE8g<DtYXs1T|#SKVA8<_SsR_R+<r{d%dE*CWu7c_o}
zzs(esfm(@6yrv!d=)GD<O~hYf-<CG_^}Q$`1H?1QB~Anc|8Ow!MWZ6-3F}c&&mcUm
zNklWDAQPo0*~H-)_sEB5!FD3pD(dY7j#J-GXkbk#GcMh7y4++h05#k+HsKk?o<IOO
ong8-{2@XebOyPFGu_LYb2MbPr1vbzMkpKVy07*qoM6N<$f-dJllK=n!

literal 0
HcmV?d00001

diff --git a/static/debug_toolbar/img/djdt_vertical.png b/static/debug_toolbar/img/djdt_vertical.png
new file mode 100644
index 0000000000000000000000000000000000000000..a05d3afa3a7001098f84daaef1afa8027b83b770
GIT binary patch
literal 882
zcmV-&1C9KNP)<h;3K|Lk000e1NJLTq001Ze002t}0ssI2jr>y10009yNkl<ZcmeH}
zQD{<M9LJ}d{>zDm8c75ZG9Mxwgi$zJ4@Kn~4(eqxU8G~PK`50A+m@6pY%*)s(oL2G
zHAyovRs;ry=;U7+lODteeGz=|!C^@DpmyM{!(~HJc2t7<;rHbIaz2;e{hf1cBOo9k
zAlLx{fk35FX*8O_!9g00);zJrVk!TntE;OyQbMd$D$mydpU+1uu92msrPhd7S65pj
zcDvn(#kpK=qXvvd<G(c3gxG90W7cA^$m8+aS__#>=5RP%E|*HBHp3?r3T-x9EEX%3
zO0fUwblT-|NhFenDCu-M*q!C7ghC<E1C&<K&u}<gu7PAS$zU*$iA^R`xn`_ZD;g_{
z#meXNWgI@A&tNdf<#MT1s@LniUN8QW7YYS7n~gxMP$=+6rdTZAo)L*eV8rmZCjzm<
z;eacu)#^$ynM?*_cDo&c7|beMk;!CMicu&OaKd1*Kp=oX40bKtuho;OR0>N*qfrFn
zL?VGLm(6C!s*=fMuw*<QM<52TU#^o#B!WO33<m2J`~7|dVvomDuh{8yA`t6zy7fBI
zYPCD}5-?buY%XI<vGy^@?c~Oa?SY%$%8T1;?bnl+-=~JIpCOS*O%=nMdpq75F{qRM
zf(DAizZX7lJi;pQ(}EYztc)~Jd}nzW|NH(!oOj6??9uc8b<Gn4^p4BeqgOxl=*8gs
zjq3YHrZ05&@U}dfe}4@V&w5mi`$JFK!=Zy6Ordtb9}n>MN)$bc$-bkf_=tUng$Hlj
zhF-_+el6MHD1A)N8eOBkl5UhH2#x;V1NRuvRH<j73D5(SR?tsJ_!bmYDKOZbj9tjY
zYSX1!tXS!+L&$E0VE!?F>8C!;Rl`7^{KPrwF)-m~?>PRGuN4-U>`nw?FsN|RKyF?n
zKC(R{5b?l>!PtPZ2Z0zK3!tRx)0JX<vg0r|WtSrmgIR?u(wVy}#X2bMUy7Rz2d5hX
zG1#?mzgACvNExxDGdhhx>`iPQ{r>F3i(|c2>QiP8OTLNULm&pP4_jShy@*UA5HANO
z>J=~gZy*qZtEOJ@edh=Q@fDqTWqrD?8rGg|BOo9kAZQeS09~?fgUxpE)Bpeg07*qo
IM6N<$g4PV2Q~&?~

literal 0
HcmV?d00001

diff --git a/static/debug_toolbar/img/indicator.png b/static/debug_toolbar/img/indicator.png
new file mode 100644
index 0000000000000000000000000000000000000000..828a6c01c4bbcdcceade3d7987573dbc44582fc3
GIT binary patch
literal 436
zcmV;l0ZaagP)<h;3K|Lk000e1NJLTq000yK000yS1ONa4CxF$40004dNkl<ZcmZva
zJ4-`B5QWd?#wQUJtgP$=8yo+C*ocLl5G%p|pn_m)Y3Tz|jGaY_6oOWkMlgt2NDv<&
zVv)zaG0Ba|ZnBP(u*oi-!(ML4m)Xpj5g0-Q9srG2*ZkR16n$imV2vhQ(jm-6Bij>H
zGlmg%jNS+7hfxT2kG$mLbT;*kVFCsiiJ&cQgQBRlyggb>L7;^OYN(<@&mTxA{<qqI
zAiZan4__(-hA5*%CuCGIsCz&l$giIy-%us2h=9;4p$#+%wLw6t#Kp!neB@Dp&sFP?
zHfVJBu#zZzB1dou6|UJ%m3p)^J9D$SG>QIBwk9GMB#n(POaY8Ild<FnTgT@aj;6`|
z{trGq$Im{#I{iw6+MsTwF4wLI3QUUaXtV`}{?5T()&$P|@?`9*bD7oMblHsXFYKDB
z*actr=T6HW1QaCd2nphukaf@1_wo5O<rd|AR0Pzy5#_G0z$mY-;0;%7r;ScU9+Cw3
e3j&-gjeY^Gj@@8oq9@w`0000<MNUMnLSTZ>dcdLp

literal 0
HcmV?d00001

diff --git a/static/debug_toolbar/js/redirect.js b/static/debug_toolbar/js/redirect.js
new file mode 100644
index 00000000..f73d9e52
--- /dev/null
+++ b/static/debug_toolbar/js/redirect.js
@@ -0,0 +1 @@
+document.getElementById('redirect_to').focus();
diff --git a/static/debug_toolbar/js/toolbar.js b/static/debug_toolbar/js/toolbar.js
new file mode 100644
index 00000000..76839f26
--- /dev/null
+++ b/static/debug_toolbar/js/toolbar.js
@@ -0,0 +1,324 @@
+(function () {
+    var $$ = {
+        on: function(root, eventName, selector, fn) {
+            root.addEventListener(eventName, function(event) {
+                var target = event.target.closest(selector);
+                if (root.contains(target)) {
+                    fn.call(target, event);
+                }
+            });
+        },
+        show: function(element) {
+            element.style.display = 'block';
+        },
+        hide: function(element) {
+            element.style.display = 'none';
+        },
+        toggle: function(element, value) {
+            if (value) {
+                $$.show(element);
+            } else {
+                $$.hide(element);
+            }
+        },
+        visible: function(element) {
+            style = getComputedStyle(element);
+            return style.display !== 'none';
+        },
+        executeScripts: function(root) {
+            root.querySelectorAll('script').forEach(function(e) {
+                var clone = document.createElement('script');
+                clone.src = e.src;
+                root.appendChild(clone);
+            });
+        },
+    };
+
+    var onKeyDown = function(event) {
+        if (event.keyCode == 27) {
+            djdt.hide_one_level();
+        }
+    };
+
+    var ajax = function(url, init) {
+        init = Object.assign({credentials: 'same-origin'}, init);
+        return fetch(url, init).then(function(response) {
+            if (response.ok) {
+                return response.text();
+            } else {
+                var win = document.querySelector('#djDebugWindow');
+                win.innerHTML = '<div class="djDebugPanelTitle"><a class="djDebugClose djDebugBack" href=""></a><h3>'+response.status+': '+response.statusText+'</h3></div>';
+                $$.show(win);
+                return Promise.reject();
+            }
+        });
+    };
+
+    var djdt = {
+        handleDragged: false,
+        events: {
+            ready: []
+        },
+        isReady: false,
+        init: function() {
+            var djDebug = document.querySelector('#djDebug');
+            $$.show(djDebug);
+            $$.on(djDebug.querySelector('#djDebugPanelList'), 'click', 'li a', function(event) {
+                event.preventDefault();
+                if (!this.className) {
+                    return;
+                }
+                var current = djDebug.querySelector('#' + this.className);
+                if ($$.visible(current)) {
+                    djdt.hide_panels();
+                } else {
+                    djdt.hide_panels();
+
+                    $$.show(current);
+                    this.parentElement.classList.add('djdt-active');
+
+                    var inner = current.querySelector('.djDebugPanelContent .djdt-scroll'),
+                        store_id = djDebug.dataset.storeId;
+                    if (store_id && inner.children.length === 0) {
+                        var url = djDebug.dataset.renderPanelUrl;
+                        var url_params = new URLSearchParams();
+                        url_params.append('store_id', store_id);
+                        url_params.append('panel_id', this.className);
+                        url += '?' + url_params.toString();
+                        ajax(url).then(function(body) {
+                            inner.previousElementSibling.remove();  // Remove AJAX loader
+                            inner.innerHTML = body;
+                            $$.executeScripts(inner);
+                        });
+                    }
+                }
+            });
+            $$.on(djDebug, 'click', 'a.djDebugClose', function(event) {
+                event.preventDefault();
+                djdt.hide_one_level();
+            });
+            $$.on(djDebug, 'click', '.djDebugPanelButton input[type=checkbox]', function() {
+                djdt.cookie.set(this.dataset.cookie, this.checked ? 'on' : 'off', {
+                    path: '/',
+                    expires: 10
+                });
+            });
+
+            // Used by the SQL and template panels
+            $$.on(djDebug, 'click', '.remoteCall', function(event) {
+                event.preventDefault();
+
+                var name = this.tagName.toLowerCase();
+                var ajax_data = {};
+
+                if (name == 'button') {
+                    var form = this.closest('form');
+                    ajax_data.url = this.getAttribute('formaction');
+
+                    if (form) {
+                        ajax_data.body = new FormData(form);
+                        ajax_data.method = form.getAttribute('method') || 'POST';
+                    }
+                }
+
+                if (name == 'a') {
+                    ajax_data.url = this.getAttribute('href');
+                }
+
+                ajax(ajax_data.url, ajax_data).then(function(body) {
+                    var win = djDebug.querySelector('#djDebugWindow');
+                    win.innerHTML = body;
+                    $$.executeScripts(win);
+                    $$.show(win);
+                });
+            });
+
+            // Used by the cache, profiling and SQL panels
+            $$.on(djDebug, 'click', 'a.djToggleSwitch', function(event) {
+                event.preventDefault();
+                var self = this;
+                var id = this.dataset.toggleId;
+                var open_me = this.textContent == this.dataset.toggleOpen;
+                if (id === '' || !id) {
+                    return;
+                }
+                var name = this.dataset.toggleName;
+                var container = this.closest('.djDebugPanelContent').querySelector('#' + name + '_' + id);
+                container.querySelectorAll('.djDebugCollapsed').forEach(function(e) {
+                    $$.toggle(e, open_me);
+                });
+                container.querySelectorAll('.djDebugUncollapsed').forEach(function(e) {
+                    $$.toggle(e, !open_me);
+                });
+                this.closest('.djDebugPanelContent').querySelectorAll('.djToggleDetails_' + id).forEach(function(e) {
+                    if (open_me) {
+                        e.classList.add('djSelected');
+                        e.classList.remove('djUnselected');
+                        self.textContent = self.dataset.toggleClose;
+                    } else {
+                        e.classList.remove('djSelected');
+                        e.classList.add('djUnselected');
+                        self.textContent = self.dataset.toggleOpen;
+                    }
+                    var switch_ = e.querySelector('.djToggleSwitch')
+                    if (switch_) switch_.textContent = self.textContent;
+                });
+            });
+
+            djDebug.querySelector('#djHideToolBarButton').addEventListener('click', function(event) {
+                event.preventDefault();
+                djdt.hide_toolbar(true);
+            });
+            djDebug.querySelector('#djShowToolBarButton').addEventListener('click', function(event) {
+                event.preventDefault();
+                if (!djdt.handleDragged) {
+                    djdt.show_toolbar();
+                }
+            });
+            var startPageY, baseY;
+            var handle = document.querySelector('#djDebugToolbarHandle');
+            var onHandleMove = function(event) {
+                // Chrome can send spurious mousemove events, so don't do anything unless the
+                // cursor really moved.  Otherwise, it will be impossible to expand the toolbar
+                // due to djdt.handleDragged being set to true.
+                if (djdt.handleDragged || event.pageY != startPageY) {
+                    var top = baseY + event.pageY;
+
+                    if (top < 0) {
+                        top = 0;
+                    } else if (top + handle.offsetHeight > window.innerHeight) {
+                        top = window.innerHeight - handle.offsetHeight;
+                    }
+
+                    handle.style.top = top + 'px';
+                    djdt.handleDragged = true;
+                }
+            };
+            djDebug.querySelector('#djShowToolBarButton').addEventListener('mousedown', function(event) {
+                event.preventDefault();
+                startPageY = event.pageY;
+                baseY = handle.offsetTop - startPageY;
+                document.addEventListener('mousemove', onHandleMove);
+            });
+            document.addEventListener('mouseup', function (event) {
+                document.removeEventListener('mousemove', onHandleMove);
+                if (djdt.handleDragged) {
+                    event.preventDefault();
+                    djdt.cookie.set('djdttop', handle.offsetTop, {
+                        path: '/',
+                        expires: 10
+                    });
+                    setTimeout(function () {
+                        djdt.handleDragged = false;
+                    }, 10);
+                }
+            });
+            if (djdt.cookie.get('djdt') == 'hide') {
+                djdt.hide_toolbar(false);
+            } else {
+                djdt.show_toolbar();
+            }
+            djdt.isReady = true;
+            djdt.events.ready.forEach(function(callback) {
+                callback(djdt);
+            });
+        },
+        hide_panels: function() {
+            $$.hide(djDebug.querySelector('#djDebugWindow'));
+            djDebug.querySelectorAll('.djdt-panelContent').forEach(function(e) {
+                $$.hide(e);
+            });
+            djDebug.querySelectorAll('#djDebugToolbar li').forEach(function(e) {
+                e.classList.remove('djdt-active');
+            });
+        },
+        hide_toolbar: function(setCookie) {
+            djdt.hide_panels();
+            $$.hide(djDebug.querySelector('#djDebugToolbar'));
+
+            var handle = document.querySelector('#djDebugToolbarHandle');
+            $$.show(handle);
+            // set handle position
+            var handleTop = djdt.cookie.get('djdttop');
+            if (handleTop) {
+                handleTop = Math.min(handleTop, window.innerHeight - handle.offsetHeight);
+                handle.style.top = handleTop + 'px';
+            }
+
+            document.removeEventListener('keydown', onKeyDown);
+
+            if (setCookie) {
+                djdt.cookie.set('djdt', 'hide', {
+                    path: '/',
+                    expires: 10
+                });
+            }
+        },
+        hide_one_level: function(skipDebugWindow) {
+            if ($$.visible(djDebug.querySelector('#djDebugWindow'))) {
+                $$.hide(djDebug.querySelector('#djDebugWindow'));
+            } else if (djDebug.querySelector('#djDebugToolbar li.djdt-active')) {
+                djdt.hide_panels();
+            } else {
+                djdt.hide_toolbar(true);
+            }
+        },
+        show_toolbar: function() {
+            document.addEventListener('keydown', onKeyDown);
+            $$.hide(djDebug.querySelector('#djDebugToolbarHandle'));
+            $$.show(djDebug.querySelector('#djDebugToolbar'));
+            djdt.cookie.set('djdt', 'show', {
+                path: '/',
+                expires: 10
+            });
+        },
+        ready: function(callback){
+            if (djdt.isReady) {
+                callback(djdt);
+            } else {
+                djdt.events.ready.push(callback);
+            }
+        },
+        cookie: {
+            get: function(key){
+                if (document.cookie.indexOf(key) === -1) return null;
+
+                var cookieArray = document.cookie.split('; '),
+                    cookies = {};
+
+                cookieArray.forEach(function(e){
+                    var parts = e.split('=');
+                    cookies[ parts[0] ] = parts[1];
+                });
+
+                return cookies[ key ];
+            },
+            set: function(key, value, options){
+                options = options || {};
+
+                if (typeof options.expires === 'number') {
+                    var days = options.expires, t = options.expires = new Date();
+                    t.setDate(t.getDate() + days);
+                }
+
+                document.cookie = [
+                    encodeURIComponent(key) + '=' + String(value),
+                    options.expires ? '; expires=' + options.expires.toUTCString() : '',
+                    options.path    ? '; path=' + options.path : '',
+                    options.domain  ? '; domain=' + options.domain : '',
+                    options.secure  ? '; secure' : ''
+                ].join('');
+
+                return value;
+            }
+        },
+    };
+    window.djdt = {
+        show_toolbar: djdt.show_toolbar,
+        hide_toolbar: djdt.hide_toolbar,
+        init: djdt.init,
+        close: djdt.hide_one_level,
+        cookie: djdt.cookie,
+    };
+    document.addEventListener('DOMContentLoaded', djdt.init);
+})();
diff --git a/static/debug_toolbar/js/toolbar.timer.js b/static/debug_toolbar/js/toolbar.timer.js
new file mode 100644
index 00000000..b6959948
--- /dev/null
+++ b/static/debug_toolbar/js/toolbar.timer.js
@@ -0,0 +1,52 @@
+(function () {
+    // Browser timing remains hidden unless we can successfully access the performance object
+    var perf = window.performance || window.msPerformance ||
+               window.webkitPerformance || window.mozPerformance;
+    if (!perf)
+        return;
+
+    var rowCount = 0,
+        timingOffset = perf.timing.navigationStart,
+        timingEnd = perf.timing.loadEventEnd,
+        totalTime = timingEnd - timingOffset;
+    function getLeft(stat) {
+        return ((perf.timing[stat] - timingOffset) / (totalTime)) * 100.0;
+    }
+    function getCSSWidth(stat, endStat) {
+        var width = ((perf.timing[endStat] - perf.timing[stat]) / (totalTime)) * 100.0;
+        // Calculate relative percent (same as sql panel logic)
+        width = 100.0 * width / (100.0 - getLeft(stat));
+        return (width < 1) ? "2px" : width + "%";
+    }
+    function addRow(stat, endStat) {
+        rowCount++;
+        var row = document.createElement('tr');
+        row.className = (rowCount % 2) ? 'djDebugOdd' : 'djDebugEven';
+        if (endStat) {
+            // Render a start through end bar
+            row.innerHTML = '<td>' + stat.replace('Start', '') + '</td>' +
+                            '<td class="djdt-timeline"><div class="djDebugTimeline"><div class="djDebugLineChart"><strong>&#160;</strong></div></div></td>' +
+                            '<td>' + (perf.timing[stat] - timingOffset) + ' (+' + (perf.timing[endStat] - perf.timing[stat]) + ')</td>';
+            row.querySelector('strong').style.width = getCSSWidth(stat, endStat);
+        } else {
+            // Render a point in time
+            row.innerHTML = '<td>' + stat + '</td>' +
+                            '<td class="djdt-timeline"><div class="djDebugTimeline"><div class="djDebugLineChart"><strong>&#160;</strong></div></div></td>' +
+                            '<td>' + (perf.timing[stat] - timingOffset) + '</td>';
+            row.querySelector('strong').style.width = '2px';
+        }
+        row.querySelector('.djDebugLineChart').style.left = getLeft(stat) + '%';
+        document.querySelector('#djDebugBrowserTimingTableBody').appendChild(row);
+    }
+
+    // This is a reasonably complete and ordered set of timing periods (2 params) and events (1 param)
+    addRow('domainLookupStart', 'domainLookupEnd');
+    addRow('connectStart', 'connectEnd');
+    addRow('requestStart', 'responseEnd'); // There is no requestEnd
+    addRow('responseStart', 'responseEnd');
+    addRow('domLoading', 'domComplete'); // Spans the events below
+    addRow('domInteractive');
+    addRow('domContentLoadedEventStart', 'domContentLoadedEventEnd');
+    addRow('loadEventStart', 'loadEventEnd');
+    document.querySelector('#djDebugBrowserTiming').classList.remove('djdt-hidden');
+})();
diff --git a/templates/base.html b/templates/base.html
index ddc2398f..e5546451 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -98,7 +98,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                         <a class="nav-link" href="{% url 'note:transfer' %}"><i class="fas fa-exchange-alt"></i>{% trans 'Transfer' %} </a>
                     </li>
                 {% endif %}
-                {% if "auth.user"|model_list|length >= 2 %}
+                {% if "auth.user"|model_list_length >= 2 %}
                     <li class="nav-item active">
                         <a class="nav-link" href="{% url 'member:user_list' %}"><i class="fas fa-user"></i> {% trans 'Users' %}</a>
                     </li>
diff --git a/templates/note/conso_form.html b/templates/note/conso_form.html
index 451d8a27..005e3e05 100644
--- a/templates/note/conso_form.html
+++ b/templates/note/conso_form.html
@@ -68,15 +68,15 @@
             <div class="card shadow mb-4">
                 <div class="card-header">
                     <p class="card-text font-weight-bold">
-                        {% trans "Most used buttons" %}
+                        {% trans "Highlighted buttons" %}
                     </p>
                 </div>
                 <div class="card-body text-nowrap" style="overflow:auto hidden">
-                    <div class="d-inline-flex flex-wrap justify-content-center" id="most_used">
-                        {% for button in most_used %}
+                    <div class="d-inline-flex flex-wrap justify-content-center" id="highlighted">
+                        {% for button in highlighted %}
                             {% if button.display %}
                                 <button class="btn btn-outline-dark rounded-0 flex-fill"
-                                        id="most_used_button{{ button.id }}" name="button" value="{{ button.name }}">
+                                        id="highlighted_button{{ button.id }}" name="button" value="{{ button.name }}">
                                     {{ button.name }} ({{ button.amount | pretty_money }})
                                 </button>
                             {% endif %}
@@ -86,7 +86,7 @@
             </div>
 
             {# Regroup buttons under categories #}
-            {% regroup transaction_templates by category as categories %}
+	    {# {% regroup transaction_templates by category as categories %} #}
 
             <div class="card border-primary text-center shadow mb-4">
                 {# Tabs for button categories #}
@@ -94,8 +94,8 @@
                     <ul class="nav nav-tabs nav-fill card-header-tabs">
                         {% for category in categories %}
                             <li class="nav-item">
-                                <a class="nav-link font-weight-bold" data-toggle="tab" href="#{{ category.grouper|slugify }}">
-                                    {{ category.grouper }}
+                                <a class="nav-link font-weight-bold" data-toggle="tab" href="#{{ category.name|slugify }}">
+                                    {{ category.name }}
                                 </a>
                             </li>
                         {% endfor %}
@@ -106,9 +106,9 @@
                 <div class="card-body">
                     <div class="tab-content">
                         {% for category in categories %}
-                            <div class="tab-pane" id="{{ category.grouper|slugify }}">
+                            <div class="tab-pane" id="{{ category.name|slugify }}">
                                 <div class="d-inline-flex flex-wrap justify-content-center">
-                                    {% for button in category.list %}
+                                    {% for button in category.templates_filtered %}
                                         {% if button.display %}
                                             <button class="btn btn-outline-dark rounded-0 flex-fill"
                                                     id="button{{ button.id }}" name="button" value="{{ button.name }}">
@@ -157,24 +157,26 @@
 {% block extrajavascript %}
     <script type="text/javascript" src="{% static "js/consos.js" %}"></script>
     <script type="text/javascript">
-        {% for button in most_used %}
+        {% for button in highlighted %}
             {% if button.display %}
-                $("#most_used_button{{ button.id }}").click(function() {
-                    addConso({{ button.destination.id }}, {{ button.amount }},
-                        {{ polymorphic_ctype }}, {{ button.category.id }}, "{{ button.category.name }}",
+                $("#highlighted_button{{ button.id }}").click(function() {
+                    addConso({{ button.destination_id }}, {{ button.amount }},
+                        {{ polymorphic_ctype }}, {{ button.category_id }}, "{{ button.category.name }}",
                         {{ button.id }}, "{{ button.name }}");
                 });
             {% endif %}
         {% endfor %}
 
-        {% for button in transaction_templates %}
+        {% for category in categories %}
+            {% for button in category.templates_filtered %}
             {% if button.display %}
                 $("#button{{ button.id }}").click(function() {
-                    addConso({{ button.destination.id }}, {{ button.amount }},
-                        {{ polymorphic_ctype }}, {{ button.category.id }}, "{{ button.category.name }}",
+                    addConso({{ button.destination_id }}, {{ button.amount }},
+                        {{ polymorphic_ctype }}, {{ button.category_id }}, "{{ button.category.name }}",
                         {{ button.id }}, "{{ button.name }}");
                 });
             {% endif %}
+            {% endfor %}
         {% endfor %}
     </script>
 {% endblock %}
diff --git a/templates/treasury/remittance_list.html b/templates/treasury/remittance_list.html
index 916c47d8..be8e806e 100644
--- a/templates/treasury/remittance_list.html
+++ b/templates/treasury/remittance_list.html
@@ -55,5 +55,11 @@
     <hr>
 
     <h2>{% trans "Closed remittances" %}</h2>
-    {% render_table closed_remittances %}
+    {% if closed_remittances.data %}
+        {% render_table closed_remittances %}
+    {% else %}
+        <div class="alert alert-warning">
+            {% trans "There is no closed remittance yet." %}
+        </div>
+    {% endif %}
 {% endblock %}

From 3fea17c5559fd864015a6ed874b69d9799df6262 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 25 Jul 2020 17:36:37 +0200
Subject: [PATCH 05/77] :bug: Fix Ansible script

---
 .gitignore                                 | 3 +++
 ansible/roles/2-nk20/tasks/main.yml        | 5 ++++-
 ansible/roles/2-nk20/templates/env_example | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)
 create mode 120000 ansible/roles/2-nk20/templates/env_example

diff --git a/.gitignore b/.gitignore
index f9082403..2372bf46 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,8 +36,11 @@ coverage
 
 # Local data
 secrets.py
+.env
+map.json
 *.log
 media/
+
 # Virtualenv
 env/
 venv/
diff --git a/ansible/roles/2-nk20/tasks/main.yml b/ansible/roles/2-nk20/tasks/main.yml
index 0c6d0213..d150a1b6 100644
--- a/ansible/roles/2-nk20/tasks/main.yml
+++ b/ansible/roles/2-nk20/tasks/main.yml
@@ -15,7 +15,10 @@
     force: true
 
 - name: Use default env vars (should be updated!)
-  command: cp /var/www/note_kfet/.env_example /var/www/note_kfet/.env
+  template:
+    src: "env_example"
+    dest: "/var/www/note_kfet/.env"
+    mode: 0644
 
 - name: Update permissions for note_kfet dir
   file:
diff --git a/ansible/roles/2-nk20/templates/env_example b/ansible/roles/2-nk20/templates/env_example
new file mode 120000
index 00000000..d48f3549
--- /dev/null
+++ b/ansible/roles/2-nk20/templates/env_example
@@ -0,0 +1 @@
+../../../../.env_example
\ No newline at end of file

From b212bf4093d27c733425a12667addd69017cae4f Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 25 Jul 2020 17:42:32 +0200
Subject: [PATCH 06/77] Fix linters

---
 apps/treasury/forms.py | 1 -
 apps/treasury/views.py | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/treasury/forms.py b/apps/treasury/forms.py
index 85beaadc..4c761ef2 100644
--- a/apps/treasury/forms.py
+++ b/apps/treasury/forms.py
@@ -8,7 +8,6 @@ from crispy_forms.layout import Submit
 from django import forms
 from django.utils.translation import gettext_lazy as _
 from note_kfet.inputs import DatePickerInput, AmountInput
-from permission.backends import PermissionBackend
 
 from .models import Invoice, Product, Remittance, SpecialTransactionProxy
 
diff --git a/apps/treasury/views.py b/apps/treasury/views.py
index 4e64ce94..1ab87f09 100644
--- a/apps/treasury/views.py
+++ b/apps/treasury/views.py
@@ -241,7 +241,7 @@ class RemittanceListView(LoginRequiredMixin, TemplateView):
         no_remittance_tr = SpecialTransactionTable(
             data=SpecialTransaction.objects.filter(source__in=NoteSpecial.objects.filter(~Q(remittancetype=None)),
                                                    specialtransactionproxy__remittance=None).filter(
-                 PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all(),
+                PermissionBackend.filter_queryset(self.request.user, Remittance, "view")).all(),
             exclude=('remittance_remove', ),
             prefix="no-remittance-",
         )

From afb35d7ae038a22432faa1106aab355a5a329b6f Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 25 Jul 2020 17:42:44 +0200
Subject: [PATCH 07/77] Fix linters

---
 apps/scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/scripts b/apps/scripts
index 580948fe..441c8b96 160000
--- a/apps/scripts
+++ b/apps/scripts
@@ -1 +1 @@
-Subproject commit 580948fe1da1904ba6418daafb48a0a64824a11b
+Subproject commit 441c8b9659df820d4c1c5f310898571b0bbde520

From b2e1777fe0832a1a913ec85bb86f0581e8295362 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 25 Jul 2020 17:44:38 +0200
Subject: [PATCH 08/77] Update Django CAS Server

---
 requirements/cas.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements/cas.txt b/requirements/cas.txt
index c7c696fb..8a0baa85 100644
--- a/requirements/cas.txt
+++ b/requirements/cas.txt
@@ -1 +1 @@
-django-cas-server==1.1.0
+django-cas-server==1.2.0

From f0bca6982568a7c623180158da98d45795765792 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 25 Jul 2020 18:18:53 +0200
Subject: [PATCH 09/77] :bug: Minor fixes

---
 apps/member/views.py             | 2 +-
 apps/registration/views.py       | 2 +-
 apps/wei/forms/registration.py   | 2 +-
 apps/wei/models.py               | 1 +
 apps/wei/tables.py               | 2 +-
 apps/wei/views.py                | 2 +-
 templates/wei/weilist_sample.tex | 1 +
 7 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/member/views.py b/apps/member/views.py
index 37f04304..40e0fb0c 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -303,7 +303,7 @@ class ClubListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
         """
         Filter the user list with the given pattern.
         """
-        qs = super().get_queryset().filter()
+        qs = super().get_queryset().distinct()
         if "search" in self.request.GET:
             pattern = self.request.GET["search"]
 
diff --git a/apps/registration/views.py b/apps/registration/views.py
index 2c91a604..a0e62202 100644
--- a/apps/registration/views.py
+++ b/apps/registration/views.py
@@ -164,7 +164,7 @@ class FutureUserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableVi
         :param kwargs:
         :return:
         """
-        qs = super().get_queryset().filter(profile__registration_valid=False)
+        qs = super().get_queryset().distinct().filter(profile__registration_valid=False)
         if "search" in self.request.GET:
             pattern = self.request.GET["search"]
 
diff --git a/apps/wei/forms/registration.py b/apps/wei/forms/registration.py
index 96555372..9ce3a350 100644
--- a/apps/wei/forms/registration.py
+++ b/apps/wei/forms/registration.py
@@ -96,7 +96,7 @@ class WEIMembershipForm(forms.ModelForm):
 class BusForm(forms.ModelForm):
     class Meta:
         model = Bus
-        fields = '__all__'
+        exclude = ('information_json',)
         widgets = {
             "wei": Autocomplete(
                 WEIClub,
diff --git a/apps/wei/models.py b/apps/wei/models.py
index 9cee0d61..6153a870 100644
--- a/apps/wei/models.py
+++ b/apps/wei/models.py
@@ -113,6 +113,7 @@ class BusTeam(models.Model):
 
     name = models.CharField(
         max_length=255,
+        verbose_name=_("name"),
     )
 
     color = models.PositiveIntegerField(  # Use a color picker to get the hexa code
diff --git a/apps/wei/tables.py b/apps/wei/tables.py
index 36d09342..e4d09fec 100644
--- a/apps/wei/tables.py
+++ b/apps/wei/tables.py
@@ -144,7 +144,7 @@ class BusTable(tables.Table):
     )
 
     def render_teams(self, value):
-        return ", ".join(team.name for team in value.all())
+        return ", ".join(team.name for team in value.order_by('name').all())
 
     def render_count(self, value):
         return str(value) + " " + (str(_("members")) if value > 0 else str(_("member")))
diff --git a/apps/wei/views.py b/apps/wei/views.py
index 597a44d4..76a01fae 100644
--- a/apps/wei/views.py
+++ b/apps/wei/views.py
@@ -330,7 +330,7 @@ class BusManageView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
 
         bus = self.object
         teams = BusTeam.objects.filter(PermissionBackend.filter_queryset(self.request.user, BusTeam, "view")) \
-            .filter(bus=bus).annotate(count=Count("memberships"))
+            .filter(bus=bus).annotate(count=Count("memberships")).order_by("name")
         teams_table = BusTeamTable(data=teams, prefix="team-")
         context["teams"] = teams_table
 
diff --git a/templates/wei/weilist_sample.tex b/templates/wei/weilist_sample.tex
index a2ff0755..19eb0cdc 100644
--- a/templates/wei/weilist_sample.tex
+++ b/templates/wei/weilist_sample.tex
@@ -5,6 +5,7 @@
 \usepackage[french]{babel}
 
 \usepackage[margin=1.5cm]{geometry}
+\usepackage{lmodern}
 \usepackage{ltablex}
 \usepackage{tabularx}
 

From 18bdc8044bfa396f5ce00e46e4a1109f9710e1b0 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 25 Jul 2020 18:26:18 +0200
Subject: [PATCH 10/77] :bug: Minor fixes

---
 apps/wei/tables.py | 4 ++--
 apps/wei/views.py  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/wei/tables.py b/apps/wei/tables.py
index e4d09fec..a6bc25c6 100644
--- a/apps/wei/tables.py
+++ b/apps/wei/tables.py
@@ -147,7 +147,7 @@ class BusTable(tables.Table):
         return ", ".join(team.name for team in value.order_by('name').all())
 
     def render_count(self, value):
-        return str(value) + " " + (str(_("members")) if value > 0 else str(_("member")))
+        return str(value) + " " + (str(_("members")) if value > 1 else str(_("member")))
 
     class Meta:
         attrs = {
@@ -178,7 +178,7 @@ class BusTeamTable(tables.Table):
     )
 
     def render_count(self, value):
-        return str(value) + " " + (str(_("members")) if value > 0 else str(_("member")))
+        return str(value) + " " + (str(_("members")) if value > 1 else str(_("member")))
 
     count = tables.Column(
         verbose_name=_("Members count"),
diff --git a/apps/wei/views.py b/apps/wei/views.py
index 76a01fae..3accb804 100644
--- a/apps/wei/views.py
+++ b/apps/wei/views.py
@@ -177,7 +177,7 @@ class WEIMembershipsView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableVi
         return super().dispatch(request, *args, **kwargs)
 
     def get_queryset(self, **kwargs):
-        qs = super().get_queryset(**kwargs).filter(club=self.club)
+        qs = super().get_queryset(**kwargs).filter(club=self.club).distinct()
 
         pattern = self.request.GET.get("search", "")
 
@@ -214,7 +214,7 @@ class WEIRegistrationsView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTable
         return super().dispatch(request, *args, **kwargs)
 
     def get_queryset(self, **kwargs):
-        qs = super().get_queryset(**kwargs).filter(wei=self.club, membership=None)
+        qs = super().get_queryset(**kwargs).filter(wei=self.club, membership=None).distinct()
 
         pattern = self.request.GET.get("search", "")
 

From 0b6cb4ef19fd34d8f26acab8a15dd74b14b423fc Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 25 Jul 2020 19:14:27 +0200
Subject: [PATCH 11/77] Production is not debug

---
 note_kfet/settings/production.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/note_kfet/settings/production.py b/note_kfet/settings/production.py
index f5e133b1..b7b8856e 100644
--- a/note_kfet/settings/production.py
+++ b/note_kfet/settings/production.py
@@ -25,7 +25,7 @@ DATABASES = {
 }
 
 # Break it, fix it!
-DEBUG = True
+DEBUG = False
 
 # Mandatory !
 ALLOWED_HOSTS = [os.environ.get('NOTE_URL', 'localhost')]
@@ -36,7 +36,7 @@ SECRET_KEY = os.environ.get('DJANGO_SECRET_KEY', 'CHANGE_ME_IN_ENV_SETTINGS')
 EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_USE_SSL = False
 EMAIL_HOST = os.getenv('EMAIL_HOST', 'smtp.example.org')
-EMAIL_PORT = os.getenv('EMAIL_PORT', 443)
+EMAIL_PORT = os.getenv('EMAIL_PORT', 465)
 EMAIL_HOST_USER = os.getenv('EMAIL_USER', 'change_me')
 EMAIL_HOST_PASSWORD = os.getenv('EMAIL_PASSWORD', 'change_me')
 

From fb5e2578af620e74c724f4c7618f9e14a26ec0e9 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 25 Jul 2020 19:40:30 +0200
Subject: [PATCH 12/77] Merge Role and RolePermissions

---
 apps/member/admin.py                  |   3 +-
 apps/member/api/serializers.py        |  13 +-
 apps/member/api/urls.py               |   3 +-
 apps/member/api/views.py              |  16 +-
 apps/member/forms.py                  |   4 +-
 apps/member/models.py                 |  20 +-
 apps/member/views.py                  |   3 +-
 apps/permission/admin.py              |  10 +-
 apps/permission/api/serializers.py    |  10 +-
 apps/permission/api/urls.py           |   4 +-
 apps/permission/api/views.py          |  10 +-
 apps/permission/backends.py           |  10 +-
 apps/permission/fixtures/initial.json | 280 +++++++++-----------------
 apps/permission/models.py             |  14 +-
 apps/permission/views.py              |   3 +-
 apps/registration/views.py            |   3 +-
 apps/wei/models.py                    |   3 +-
 17 files changed, 135 insertions(+), 274 deletions(-)

diff --git a/apps/member/admin.py b/apps/member/admin.py
index c7c3ead3..2e50e8dc 100644
--- a/apps/member/admin.py
+++ b/apps/member/admin.py
@@ -6,7 +6,7 @@ from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.models import User
 
 from .forms import ProfileForm
-from .models import Club, Membership, Profile, Role
+from .models import Club, Membership, Profile
 
 
 class ProfileInline(admin.StackedInline):
@@ -39,4 +39,3 @@ admin.site.register(User, CustomUserAdmin)
 # Add other models
 admin.site.register(Club)
 admin.site.register(Membership)
-admin.site.register(Role)
diff --git a/apps/member/api/serializers.py b/apps/member/api/serializers.py
index a956a46b..19b2ff67 100644
--- a/apps/member/api/serializers.py
+++ b/apps/member/api/serializers.py
@@ -3,7 +3,7 @@
 
 from rest_framework import serializers
 
-from ..models import Profile, Club, Role, Membership
+from ..models import Profile, Club, Membership
 
 
 class ProfileSerializer(serializers.ModelSerializer):
@@ -29,17 +29,6 @@ class ClubSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
 
-class RoleSerializer(serializers.ModelSerializer):
-    """
-    REST API Serializer for Roles.
-    The djangorestframework plugin will analyse the model `Role` and parse all fields in the API.
-    """
-
-    class Meta:
-        model = Role
-        fields = '__all__'
-
-
 class MembershipSerializer(serializers.ModelSerializer):
     """
     REST API Serializer for Memberships.
diff --git a/apps/member/api/urls.py b/apps/member/api/urls.py
index 15bb83ca..5fa54472 100644
--- a/apps/member/api/urls.py
+++ b/apps/member/api/urls.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from .views import ProfileViewSet, ClubViewSet, RoleViewSet, MembershipViewSet
+from .views import ProfileViewSet, ClubViewSet, MembershipViewSet
 
 
 def register_members_urls(router, path):
@@ -10,5 +10,4 @@ def register_members_urls(router, path):
     """
     router.register(path + '/profile', ProfileViewSet)
     router.register(path + '/club', ClubViewSet)
-    router.register(path + '/role', RoleViewSet)
     router.register(path + '/membership', MembershipViewSet)
diff --git a/apps/member/api/views.py b/apps/member/api/views.py
index 57c216a1..3dc07fe1 100644
--- a/apps/member/api/views.py
+++ b/apps/member/api/views.py
@@ -4,8 +4,8 @@
 from rest_framework.filters import SearchFilter
 from api.viewsets import ReadProtectedModelViewSet
 
-from .serializers import ProfileSerializer, ClubSerializer, RoleSerializer, MembershipSerializer
-from ..models import Profile, Club, Role, Membership
+from .serializers import ProfileSerializer, ClubSerializer, MembershipSerializer
+from ..models import Profile, Club, Membership
 
 
 class ProfileViewSet(ReadProtectedModelViewSet):
@@ -30,18 +30,6 @@ class ClubViewSet(ReadProtectedModelViewSet):
     search_fields = ['$name', ]
 
 
-class RoleViewSet(ReadProtectedModelViewSet):
-    """
-    REST API View set.
-    The djangorestframework plugin will get all `Role` objects, serialize it to JSON with the given serializer,
-    then render it on /api/members/role/
-    """
-    queryset = Role.objects.all()
-    serializer_class = RoleSerializer
-    filter_backends = [SearchFilter]
-    search_fields = ['$name', ]
-
-
 class MembershipViewSet(ReadProtectedModelViewSet):
     """
     REST API View set.
diff --git a/apps/member/forms.py b/apps/member/forms.py
index e546d652..4bf3b738 100644
--- a/apps/member/forms.py
+++ b/apps/member/forms.py
@@ -7,9 +7,9 @@ from django.contrib.auth.models import User
 from django.utils.translation import gettext_lazy as _
 from note.models import NoteSpecial
 from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput
-from permission.models import PermissionMask
+from permission.models import PermissionMask, Role
 
-from .models import Profile, Club, Membership, Role
+from .models import Profile, Club, Membership
 
 
 class CustomAuthenticationForm(AuthenticationForm):
diff --git a/apps/member/models.py b/apps/member/models.py
index 17b8f044..1972002d 100644
--- a/apps/member/models.py
+++ b/apps/member/models.py
@@ -247,24 +247,6 @@ class Club(models.Model):
         return reverse_lazy('member:club_detail', args=(self.pk,))
 
 
-class Role(models.Model):
-    """
-    Role that an :model:`auth.User` can have in a :model:`member.Club`
-    """
-    name = models.CharField(
-        verbose_name=_('name'),
-        max_length=255,
-        unique=True,
-    )
-
-    class Meta:
-        verbose_name = _('role')
-        verbose_name_plural = _('roles')
-
-    def __str__(self):
-        return str(self.name)
-
-
 class Membership(models.Model):
     """
     Register the membership of a user to a club, including roles and membership duration.
@@ -284,7 +266,7 @@ class Membership(models.Model):
     )
 
     roles = models.ManyToManyField(
-        Role,
+        "permission.Role",
         verbose_name=_("roles"),
     )
 
diff --git a/apps/member/views.py b/apps/member/views.py
index 40e0fb0c..ddd5d084 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -22,10 +22,11 @@ from note.models import Alias, NoteUser
 from note.models.transactions import Transaction, SpecialTransaction
 from note.tables import HistoryTable, AliasTable
 from permission.backends import PermissionBackend
+from permission.models import Role
 from permission.views import ProtectQuerysetMixin
 
 from .forms import ProfileForm, ClubForm, MembershipForm, CustomAuthenticationForm
-from .models import Club, Membership, Role
+from .models import Club, Membership
 from .tables import ClubTable, UserTable, MembershipTable
 
 
diff --git a/apps/permission/admin.py b/apps/permission/admin.py
index 4312f4b0..41e59695 100644
--- a/apps/permission/admin.py
+++ b/apps/permission/admin.py
@@ -3,7 +3,7 @@
 
 from django.contrib import admin
 
-from .models import Permission, PermissionMask, RolePermissions
+from .models import Permission, PermissionMask, Role
 
 
 @admin.register(PermissionMask)
@@ -22,9 +22,9 @@ class PermissionAdmin(admin.ModelAdmin):
     list_display = ('type', 'model', 'field', 'mask', 'description', )
 
 
-@admin.register(RolePermissions)
-class RolePermissionsAdmin(admin.ModelAdmin):
+@admin.register(Role)
+class RoleAdmin(admin.ModelAdmin):
     """
-    Admin customisation for RolePermissions
+    Admin customisation for Role
     """
-    list_display = ('role', )
+    list_display = ('name', )
diff --git a/apps/permission/api/serializers.py b/apps/permission/api/serializers.py
index e30ed7dc..d0823e19 100644
--- a/apps/permission/api/serializers.py
+++ b/apps/permission/api/serializers.py
@@ -3,7 +3,7 @@
 
 from rest_framework import serializers
 
-from ..models import Permission, RolePermissions
+from ..models import Permission, Role
 
 
 class PermissionSerializer(serializers.ModelSerializer):
@@ -17,12 +17,12 @@ class PermissionSerializer(serializers.ModelSerializer):
         fields = '__all__'
 
 
-class RolePermissionsSerializer(serializers.ModelSerializer):
+class RoleSerializer(serializers.ModelSerializer):
     """
-    REST API Serializer for RolePermissions types.
-    The djangorestframework plugin will analyse the model `RolePermissions` and parse all fields in the API.
+    REST API Serializer for Role types.
+    The djangorestframework plugin will analyse the model `Role` and parse all fields in the API.
     """
 
     class Meta:
-        model = RolePermissions
+        model = Role
         fields = '__all__'
diff --git a/apps/permission/api/urls.py b/apps/permission/api/urls.py
index b5d53466..b1fdb199 100644
--- a/apps/permission/api/urls.py
+++ b/apps/permission/api/urls.py
@@ -1,7 +1,7 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from .views import PermissionViewSet, RolePermissionsViewSet
+from .views import PermissionViewSet, RoleViewSet
 
 
 def register_permission_urls(router, path):
@@ -9,4 +9,4 @@ def register_permission_urls(router, path):
     Configure router for permission REST API.
     """
     router.register(path + "/permission", PermissionViewSet)
-    router.register(path + "/roles", RolePermissionsViewSet)
+    router.register(path + "/roles", RoleViewSet)
diff --git a/apps/permission/api/views.py b/apps/permission/api/views.py
index 6a068225..1ec67aa3 100644
--- a/apps/permission/api/views.py
+++ b/apps/permission/api/views.py
@@ -4,8 +4,8 @@
 from django_filters.rest_framework import DjangoFilterBackend
 from api.viewsets import ReadOnlyProtectedModelViewSet
 
-from .serializers import PermissionSerializer, RolePermissionsSerializer
-from ..models import Permission, RolePermissions
+from .serializers import PermissionSerializer, RoleSerializer
+from ..models import Permission, Role
 
 
 class PermissionViewSet(ReadOnlyProtectedModelViewSet):
@@ -20,13 +20,13 @@ class PermissionViewSet(ReadOnlyProtectedModelViewSet):
     filterset_fields = ['model', 'type', ]
 
 
-class RolePermissionsViewSet(ReadOnlyProtectedModelViewSet):
+class RoleViewSet(ReadOnlyProtectedModelViewSet):
     """
     REST API View set.
     The djangorestframework plugin will get all `RolePermission` objects, serialize it to JSON with the given serializer
     then render it on /api/permission/roles/
     """
-    queryset = RolePermissions.objects.all()
-    serializer_class = RolePermissionsSerializer
+    queryset = Role.objects.all()
+    serializer_class = RoleSerializer
     filter_backends = [DjangoFilterBackend]
     filterset_fields = ['role', ]
diff --git a/apps/permission/backends.py b/apps/permission/backends.py
index 2446f211..9dc69d3d 100644
--- a/apps/permission/backends.py
+++ b/apps/permission/backends.py
@@ -37,17 +37,17 @@ class PermissionBackend(ModelBackend):
             return Permission.objects.none()
 
         qs = Permission.objects.annotate(
-            club=F("rolepermissions__role__membership__club"),
-            membership=F("rolepermissions__role__membership"),
+            club=F("role__role__membership__club"),
+            membership=F("role__role__membership"),
         ).filter(
             (
                 Q(
-                    rolepermissions__role__membership__date_start__lte=timezone.now().today(),
-                    rolepermissions__role__membership__date_end__gte=timezone.now().today(),
+                    role__role__membership__date_start__lte=timezone.now().today(),
+                    role__role__membership__date_end__gte=timezone.now().today(),
                 )
                 | Q(permanent=True)
             )
-            & Q(rolepermissions__role__membership__user=user)
+            & Q(role__role__membership__user=user)
             & Q(type=t)
             & Q(mask__rank__lte=get_current_session().get("permission_mask", 0))
         )
diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index 25509b56..0b2df73e 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -1,165 +1,4 @@
 [
-	{
-		"model": "member.role",
-		"pk": 1,
-		"fields": {
-			"name": "Adh\u00e9rent BDE"
-		}
-	},
-	{
-		"model": "member.role",
-		"pk": 2,
-		"fields": {
-			"name": "Adh\u00e9rent Kfet"
-		}
-	},
-	{
-		"model": "member.role",
-		"pk": 3,
-		"fields": {
-			"name": "Membre de club"
-		}
-	},
-	{
-		"model": "member.role",
-		"pk": 4,
-		"fields": {
-			"name": "Bureau de club"
-		}
-	},
-	{
-		"model": "member.role",
-		"pk": 5,
-		"fields": {
-			"name": "Pr\u00e9sident\u00b7e de club"
-		}
-	},
-	{
-		"model": "member.role",
-		"pk": 6,
-		"fields": {
-			"name": "Tr\u00e9sorier\u00b7\u00e8re de club"
-		}
-	},
-	{
-		"model": "member.role",
-		"pk": 7,
-		"fields": {
-			"name": "Pr\u00e9sident\u00b7e BDE"
-		}
-	},
-	{
-		"model": "member.role",
-		"pk": 8,
-		"fields": {
-			"name": "Tr\u00e9sorier\u00b7\u00e8re BDE"
-		}
-	},
-	{
-		"model": "member.role",
-		"pk": 9,
-		"fields": {
-			"name": "Respo info"
-		}
-	},
-	{
-		"model": "member.role",
-		"pk": 10,
-		"fields": {
-			"name": "GC Kfet"
-		}
-	},
-	{
-		"model": "member.role",
-		"pk": 11,
-		"fields": {
-			"name": "Res[pot]"
-		}
-	},
-	{
-		"model": "member.role",
-		"pk": 12,
-		"fields": {
-			"name": "GC WEI"
-		}
-	},
-	{
-		"model": "member.role",
-		"pk": 13,
-		"fields": {
-			"name": "Chef de bus"
-		}
-	},
-	{
-		"model": "member.role",
-		"pk": 14,
-		"fields": {
-			"name": "Chef d'\u00e9quipe"
-		}
-	},
-	{
-		"model": "member.role",
-		"pk": 15,
-		"fields": {
-			"name": "\u00c9lectron libre"
-		}
-	},
-	{
-		"model": "member.role",
-		"pk": 16,
-		"fields": {
-			"name": "\u00c9lectron libre (avec perm)"
-		}
-	},
-	{
-		"model": "member.role",
-		"pk": 17,
-		"fields": {
-			"name": "1A"
-		}
-	},
-	{
-		"model": "member.role",
-		"pk": 18,
-		"fields": {
-			"name": "Adhérent WEI"
-		}
-	},
-	{
-		"model": "wei.weirole",
-		"pk": 12,
-		"fields": {}
-	},
-	{
-		"model": "wei.weirole",
-		"pk": 13,
-		"fields": {}
-	},
-	{
-		"model": "wei.weirole",
-		"pk": 14,
-		"fields": {}
-	},
-	{
-		"model": "wei.weirole",
-		"pk": 15,
-		"fields": {}
-	},
-	{
-		"model": "wei.weirole",
-		"pk": 16,
-		"fields": {}
-	},
-	{
-		"model": "wei.weirole",
-		"pk": 17,
-		"fields": {}
-	},
-	{
-		"model": "wei.weirole",
-		"pk": 18,
-		"fields": {}
-	},
 	{
 		"model": "permission.permissionmask",
 		"pk": 1,
@@ -2217,10 +2056,10 @@
 		}
 	},
 	{
-		"model": "permission.rolepermissions",
+		"model": "permission.role",
 		"pk": 1,
 		"fields": {
-			"role": 1,
+			"name": "Adh\u00e9rent BDE",
 			"permissions": [
 				1,
 				2,
@@ -2241,10 +2080,10 @@
 		}
 	},
 	{
-		"model": "permission.rolepermissions",
+		"model": "permission.role",
 		"pk": 2,
 		"fields": {
-			"role": 2,
+			"name": "Adh\u00e9rent Kfet",
 			"permissions": [
 				34,
 				35,
@@ -2267,10 +2106,17 @@
 		}
 	},
 	{
-		"model": "permission.rolepermissions",
+		"model": "permission.role",
+		"pk": 3,
+		"fields": {
+			"name": "Membre de club"
+		}
+	},
+	{
+		"model": "permission.role",
 		"pk": 4,
 		"fields": {
-			"role": 4,
+			"name": "Bureau de club",
 			"permissions": [
 				22,
 				47,
@@ -2279,10 +2125,10 @@
 		}
 	},
 	{
-		"model": "permission.rolepermissions",
+		"model": "permission.role",
 		"pk": 5,
 		"fields": {
-			"role": 5,
+			"name": "Pr\u00e9sident\u00b7e de club",
 			"permissions": [
 				50,
 				51,
@@ -2291,10 +2137,10 @@
 		}
 	},
 	{
-		"model": "permission.rolepermissions",
+		"model": "permission.role",
 		"pk": 6,
 		"fields": {
-			"role": 6,
+			"name": "Tr\u00e9sorier\u00b7\u00e8re de club",
 			"permissions": [
 				59,
 				19,
@@ -2309,10 +2155,10 @@
 		}
 	},
 	{
-		"model": "permission.rolepermissions",
+		"model": "permission.role",
 		"pk": 7,
 		"fields": {
-			"role": 7,
+			"name": "Pr\u00e9sident\u00b7e BDE",
 			"permissions": [
 				24,
 				25,
@@ -2323,10 +2169,10 @@
 		}
 	},
 	{
-		"model": "permission.rolepermissions",
+		"model": "permission.role",
 		"pk": 8,
 		"fields": {
-			"role": 8,
+			"name": "Tr\u00e9sorier\u00b7\u00e8re BDE",
 			"permissions": [
 				23,
 				24,
@@ -2359,10 +2205,10 @@
 		}
 	},
 	{
-		"model": "permission.rolepermissions",
+		"model": "permission.role",
 		"pk": 9,
 		"fields": {
-			"role": 9,
+			"name": "Respo info",
 			"permissions": [
 				1,
 				2,
@@ -2494,10 +2340,10 @@
 		}
 	},
 	{
-		"model": "permission.rolepermissions",
+		"model": "permission.role",
 		"pk": 10,
 		"fields": {
-			"role": 10,
+			"name": "GC Kfet",
 			"permissions": [
 				32,
 				33,
@@ -2521,10 +2367,10 @@
 		}
 	},
 	{
-		"model": "permission.rolepermissions",
+		"model": "permission.role",
 		"pk": 11,
 		"fields": {
-			"role": 11,
+			"name": "Res[pot]",
 			"permissions": [
 				37,
 				38,
@@ -2538,10 +2384,10 @@
 		}
 	},
 	{
-		"model": "permission.rolepermissions",
+		"model": "permission.role",
 		"pk": 12,
 		"fields": {
-			"role": 12,
+			"name": "GC WEI",
 			"permissions": [
 				76,
 				80,
@@ -2571,10 +2417,10 @@
 		}
 	},
 	{
-		"model": "permission.rolepermissions",
+		"model": "permission.role",
 		"pk": 13,
 		"fields": {
-			"role": 13,
+			"name": "Chef de bus",
 			"permissions": [
 				117,
 				118,
@@ -2586,10 +2432,10 @@
 		}
 	},
 	{
-		"model": "permission.rolepermissions",
+		"model": "permission.role",
 		"pk": 14,
 		"fields": {
-			"role": 14,
+			"name": "Chef d'\u00e9quipe",
 			"permissions": [
 				116,
 				123,
@@ -2599,10 +2445,31 @@
 		}
 	},
 	{
-		"model": "permission.rolepermissions",
+		"model": "permission.role",
+		"pk": 15,
+		"fields": {
+			"name": "\u00c9lectron libre"
+		}
+	},
+	{
+		"model": "permission.role",
 		"pk": 16,
 		"fields": {
-			"role": 18,
+			"name": "\u00c9lectron libre (avec perm)"
+		}
+	},
+	{
+		"model": "permission.role",
+		"pk": 17,
+		"fields": {
+			"name": "1A"
+		}
+	},
+	{
+		"model": "permission.role",
+		"pk": 18,
+		"fields": {
+			"name": "Adhérent WEI",
 			"permissions": [
 				97,
 				99,
@@ -2618,5 +2485,40 @@
 				95
 			]
 		}
+	},
+	{
+		"model": "wei.weirole",
+		"pk": 12,
+		"fields": {}
+	},
+	{
+		"model": "wei.weirole",
+		"pk": 13,
+		"fields": {}
+	},
+	{
+		"model": "wei.weirole",
+		"pk": 14,
+		"fields": {}
+	},
+	{
+		"model": "wei.weirole",
+		"pk": 15,
+		"fields": {}
+	},
+	{
+		"model": "wei.weirole",
+		"pk": 16,
+		"fields": {}
+	},
+	{
+		"model": "wei.weirole",
+		"pk": 17,
+		"fields": {}
+	},
+	{
+		"model": "wei.weirole",
+		"pk": 18,
+		"fields": {}
 	}
 ]
diff --git a/apps/permission/models.py b/apps/permission/models.py
index ed4a90d0..77aacff7 100644
--- a/apps/permission/models.py
+++ b/apps/permission/models.py
@@ -10,7 +10,6 @@ from django.core.exceptions import ValidationError
 from django.db import models
 from django.db.models import F, Q, Model
 from django.utils.translation import gettext_lazy as _
-from member.models import Role
 
 
 class InstancedPermission:
@@ -307,23 +306,22 @@ class Permission(models.Model):
         return self.description
 
 
-class RolePermissions(models.Model):
+class Role(models.Model):
     """
     Permissions associated with a Role
     """
-    role = models.OneToOneField(
-        Role,
-        on_delete=models.PROTECT,
-        related_name='permissions',
-        verbose_name=_('role'),
+    name = models.CharField(
+        max_length=255,
+        verbose_name=_("name"),
     )
+
     permissions = models.ManyToManyField(
         Permission,
         verbose_name=_("permissions"),
     )
 
     def __str__(self):
-        return str(self.role)
+        return self.name
 
     class Meta:
         verbose_name = _("role permissions")
diff --git a/apps/permission/views.py b/apps/permission/views.py
index cbd26a19..f3ed5641 100644
--- a/apps/permission/views.py
+++ b/apps/permission/views.py
@@ -5,9 +5,10 @@ from datetime import date
 from django.forms import HiddenInput
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import UpdateView, TemplateView
-from member.models import Role, Membership
+from member.models import Membership
 
 from .backends import PermissionBackend
+from .models import Role
 
 
 class ProtectQuerysetMixin:
diff --git a/apps/registration/views.py b/apps/registration/views.py
index a0e62202..bca0d217 100644
--- a/apps/registration/views.py
+++ b/apps/registration/views.py
@@ -15,10 +15,11 @@ from django.views.generic import CreateView, TemplateView, DetailView
 from django.views.generic.edit import FormMixin
 from django_tables2 import SingleTableView
 from member.forms import ProfileForm
-from member.models import Membership, Club, Role
+from member.models import Membership, Club
 from note.models import SpecialTransaction
 from note.templatetags.pretty_money import pretty_money
 from permission.backends import PermissionBackend
+from permission.models import Role
 from permission.views import ProtectQuerysetMixin
 
 from .forms import SignUpForm, ValidationForm
diff --git a/apps/wei/models.py b/apps/wei/models.py
index 6153a870..d2afa57f 100644
--- a/apps/wei/models.py
+++ b/apps/wei/models.py
@@ -8,8 +8,9 @@ from django.conf import settings
 from django.contrib.auth.models import User
 from django.db import models
 from django.utils.translation import gettext_lazy as _
-from member.models import Role, Club, Membership
+from member.models import Club, Membership
 from note.models import MembershipTransaction
+from permission.models import Role
 
 
 class WEIClub(Club):

From 55bc288deb11ad29449c2c343eae831b2f239b9f Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 25 Jul 2020 19:59:04 +0200
Subject: [PATCH 13/77] Some roles can only be given in some clubs

---
 apps/member/models.py                 |   8 +
 apps/member/views.py                  |  10 ++
 apps/permission/fixtures/initial.json |  30 +++-
 apps/permission/models.py             |   8 +
 locale/de/LC_MESSAGES/django.po       | 223 +++++++++++++------------
 locale/fr/LC_MESSAGES/django.po       | 229 +++++++++++++-------------
 6 files changed, 285 insertions(+), 223 deletions(-)

diff --git a/apps/member/models.py b/apps/member/models.py
index 1972002d..0384bf79 100644
--- a/apps/member/models.py
+++ b/apps/member/models.py
@@ -284,6 +284,7 @@ class Membership(models.Model):
         verbose_name=_('fee'),
     )
 
+    @property
     def valid(self):
         """
         A membership is valid if today is between the start and the end date.
@@ -301,6 +302,13 @@ class Membership(models.Model):
             if not Membership.objects.filter(user=self.user, club=self.club.parent_club).exists():
                 raise ValidationError(_('User is not a member of the parent club') + ' ' + self.club.parent_club.name)
 
+        for role in self.roles.all():
+            club = role.for_club
+            if club is not None:
+                if club.pk != self.club_id:
+                    raise ValidationError(_('The role {role} does not apply to the club {club}.')
+                                          .format(role=role.name, club=club.name))
+
         created = not self.pk
         if created:
             if Membership.objects.filter(
diff --git a/apps/member/views.py b/apps/member/views.py
index ddd5d084..614c5bc1 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -24,6 +24,7 @@ from note.tables import HistoryTable, AliasTable
 from permission.backends import PermissionBackend
 from permission.models import Role
 from permission.views import ProtectQuerysetMixin
+from wei.models import WEIClub
 
 from .forms import ProfileForm, ClubForm, MembershipForm, CustomAuthenticationForm
 from .models import Club, Membership
@@ -426,6 +427,8 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
             club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\
                 .get(pk=self.kwargs["club_pk"], weiclub=None)
             form.fields['credit_amount'].initial = club.membership_fee_paid
+            form.fields['roles'].queryset = Role.objects.filter(Q(weirole__isnull=not isinstance(club, WEIClub))
+                                                                & (Q(for_club__isnull=True) | Q(for_club=club))).all()
             form.fields['roles'].initial = Role.objects.filter(name="Membre de club").all()
 
             # If the concerned club is the BDE, then we add the option that Société générale pays the membership.
@@ -445,6 +448,8 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
             user = old_membership.user
             form.fields['user'].initial = user
             form.fields['user'].disabled = True
+            form.fields['roles'].queryset = Role.objects.filter(Q(weirole__isnull=not isinstance(club, WEIClub))
+                                                                & (Q(for_club__isnull=True) | Q(for_club=club))).all()
             form.fields['roles'].initial = old_membership.roles.all()
             form.fields['date_start'].initial = old_membership.date_end + timedelta(days=1)
             form.fields['credit_amount'].initial = club.membership_fee_paid if user.profile.paid \
@@ -635,6 +640,11 @@ class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
         del form.fields['last_name']
         del form.fields['first_name']
         del form.fields['bank']
+
+        club = self.object.club
+        form.fields['roles'].queryset = Role.objects.filter(Q(weirole__isnull=isinstance(club, WEIClub))
+                                                            & (Q(for_club__isnull=True) | Q(for_club=club))).all()
+
         return form
 
     def get_success_url(self):
diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index 0b2df73e..a426ab89 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -2059,6 +2059,7 @@
 		"model": "permission.role",
 		"pk": 1,
 		"fields": {
+			"for_club": 1,
 			"name": "Adh\u00e9rent BDE",
 			"permissions": [
 				1,
@@ -2083,6 +2084,7 @@
 		"model": "permission.role",
 		"pk": 2,
 		"fields": {
+			"for_club": 2,
 			"name": "Adh\u00e9rent Kfet",
 			"permissions": [
 				34,
@@ -2109,13 +2111,16 @@
 		"model": "permission.role",
 		"pk": 3,
 		"fields": {
-			"name": "Membre de club"
+			"for_club": null,
+			"name": "Membre de club",
+			"permissions": []
 		}
 	},
 	{
 		"model": "permission.role",
 		"pk": 4,
 		"fields": {
+			"for_club": null,
 			"name": "Bureau de club",
 			"permissions": [
 				22,
@@ -2128,6 +2133,7 @@
 		"model": "permission.role",
 		"pk": 5,
 		"fields": {
+			"for_club": null,
 			"name": "Pr\u00e9sident\u00b7e de club",
 			"permissions": [
 				50,
@@ -2140,6 +2146,7 @@
 		"model": "permission.role",
 		"pk": 6,
 		"fields": {
+			"for_club": null,
 			"name": "Tr\u00e9sorier\u00b7\u00e8re de club",
 			"permissions": [
 				59,
@@ -2158,6 +2165,7 @@
 		"model": "permission.role",
 		"pk": 7,
 		"fields": {
+			"for_club": 1,
 			"name": "Pr\u00e9sident\u00b7e BDE",
 			"permissions": [
 				24,
@@ -2172,6 +2180,7 @@
 		"model": "permission.role",
 		"pk": 8,
 		"fields": {
+			"for_club": 1,
 			"name": "Tr\u00e9sorier\u00b7\u00e8re BDE",
 			"permissions": [
 				23,
@@ -2208,6 +2217,7 @@
 		"model": "permission.role",
 		"pk": 9,
 		"fields": {
+			"for_club": 1,
 			"name": "Respo info",
 			"permissions": [
 				1,
@@ -2343,6 +2353,7 @@
 		"model": "permission.role",
 		"pk": 10,
 		"fields": {
+			"for_club": 2,
 			"name": "GC Kfet",
 			"permissions": [
 				32,
@@ -2370,6 +2381,7 @@
 		"model": "permission.role",
 		"pk": 11,
 		"fields": {
+			"for_club": 2,
 			"name": "Res[pot]",
 			"permissions": [
 				37,
@@ -2387,6 +2399,7 @@
 		"model": "permission.role",
 		"pk": 12,
 		"fields": {
+			"for_club": null,
 			"name": "GC WEI",
 			"permissions": [
 				76,
@@ -2420,6 +2433,7 @@
 		"model": "permission.role",
 		"pk": 13,
 		"fields": {
+			"for_club": null,
 			"name": "Chef de bus",
 			"permissions": [
 				117,
@@ -2435,6 +2449,7 @@
 		"model": "permission.role",
 		"pk": 14,
 		"fields": {
+			"for_club": null,
 			"name": "Chef d'\u00e9quipe",
 			"permissions": [
 				116,
@@ -2448,27 +2463,34 @@
 		"model": "permission.role",
 		"pk": 15,
 		"fields": {
-			"name": "\u00c9lectron libre"
+			"for_club": null,
+			"name": "\u00c9lectron libre",
+			"permissions": []
 		}
 	},
 	{
 		"model": "permission.role",
 		"pk": 16,
 		"fields": {
-			"name": "\u00c9lectron libre (avec perm)"
+			"for_club": null,
+			"name": "\u00c9lectron libre (avec perm)",
+			"permissions": []
 		}
 	},
 	{
 		"model": "permission.role",
 		"pk": 17,
 		"fields": {
-			"name": "1A"
+			"for_club": null,
+			"name": "1A",
+			"permissions": []
 		}
 	},
 	{
 		"model": "permission.role",
 		"pk": 18,
 		"fields": {
+			"for_club": null,
 			"name": "Adhérent WEI",
 			"permissions": [
 				97,
diff --git a/apps/permission/models.py b/apps/permission/models.py
index 77aacff7..56ca9685 100644
--- a/apps/permission/models.py
+++ b/apps/permission/models.py
@@ -320,6 +320,14 @@ class Role(models.Model):
         verbose_name=_("permissions"),
     )
 
+    for_club = models.ForeignKey(
+        "member.Club",
+        verbose_name=_("for club"),
+        on_delete=models.PROTECT,
+        null=True,
+        default=None,
+    )
+
     def __str__(self):
         return self.name
 
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 915cfbfb..8874f620 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-25 16:50+0200\n"
+"POT-Creation-Date: 2020-07-25 19:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -44,11 +44,11 @@ msgid "You can't invite more than 3 people to this activity."
 msgstr ""
 
 #: apps/activity/models.py:23 apps/activity/models.py:48
-#: apps/member/models.py:151 apps/member/models.py:255
-#: apps/note/models/notes.py:188 apps/note/models/transactions.py:25
-#: apps/note/models/transactions.py:45 apps/note/models/transactions.py:261
-#: apps/wei/models.py:64 templates/member/club_info.html:13
-#: templates/member/profile_info.html:14
+#: apps/member/models.py:151 apps/note/models/notes.py:188
+#: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45
+#: apps/note/models/transactions.py:261 apps/permission/models.py:315
+#: apps/wei/models.py:65 apps/wei/models.py:117
+#: templates/member/club_info.html:13 templates/member/profile_info.html:14
 #: templates/registration/future_profile_detail.html:16
 #: templates/wei/weiclub_info.html:13 templates/wei/weimembership_form.html:18
 msgid "name"
@@ -71,21 +71,21 @@ msgid "activity types"
 msgstr ""
 
 #: apps/activity/models.py:53 apps/note/models/transactions.py:81
-#: apps/permission/models.py:103 apps/permission/models.py:182
-#: apps/wei/models.py:70 apps/wei/models.py:126
+#: apps/permission/models.py:102 apps/permission/models.py:181
+#: apps/wei/models.py:71 apps/wei/models.py:128
 #: templates/activity/activity_detail.html:16
 msgid "description"
 msgstr ""
 
 #: apps/activity/models.py:60 apps/note/models/notes.py:164
-#: apps/note/models/transactions.py:66 apps/permission/models.py:157
+#: apps/note/models/transactions.py:66 apps/permission/models.py:156
 #: templates/activity/activity_detail.html:19
 msgid "type"
 msgstr ""
 
-#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:277
+#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:259
 #: apps/note/models/notes.py:117 apps/treasury/models.py:221
-#: apps/wei/models.py:157 templates/treasury/sogecredit_detail.html:14
+#: apps/wei/models.py:159 templates/treasury/sogecredit_detail.html:14
 #: templates/wei/survey.html:16
 msgid "user"
 msgstr ""
@@ -187,12 +187,12 @@ msgid "Type"
 msgstr ""
 
 #: apps/activity/tables.py:77 apps/member/forms.py:83
-#: apps/registration/forms.py:64 apps/treasury/forms.py:121
+#: apps/registration/forms.py:64 apps/treasury/forms.py:120
 msgid "Last name"
 msgstr ""
 
 #: apps/activity/tables.py:79 apps/member/forms.py:88
-#: apps/registration/forms.py:69 apps/treasury/forms.py:123
+#: apps/registration/forms.py:69 apps/treasury/forms.py:122
 #: templates/note/transaction_form.html:126
 msgid "First name"
 msgstr ""
@@ -225,7 +225,7 @@ msgstr ""
 msgid "IP Address"
 msgstr ""
 
-#: apps/logs/models.py:35 apps/permission/models.py:127
+#: apps/logs/models.py:35 apps/permission/models.py:126
 msgid "model"
 msgstr ""
 
@@ -304,7 +304,7 @@ msgid "Credit amount"
 msgstr ""
 
 #: apps/member/forms.py:93 apps/registration/forms.py:74
-#: apps/treasury/forms.py:125 templates/note/transaction_form.html:132
+#: apps/treasury/forms.py:124 templates/note/transaction_form.html:132
 msgid "Bank"
 msgstr ""
 
@@ -480,7 +480,7 @@ msgid ""
 "members can renew their membership."
 msgstr ""
 
-#: apps/member/models.py:240 apps/member/models.py:283
+#: apps/member/models.py:240 apps/member/models.py:265
 #: apps/note/models/notes.py:139
 msgid "club"
 msgstr ""
@@ -489,44 +489,45 @@ msgstr ""
 msgid "clubs"
 msgstr ""
 
-#: apps/member/models.py:261 apps/permission/models.py:318
-msgid "role"
-msgstr ""
-
-#: apps/member/models.py:262 apps/member/models.py:288
+#: apps/member/models.py:270
 msgid "roles"
 msgstr ""
 
-#: apps/member/models.py:293
+#: apps/member/models.py:275
 msgid "membership starts on"
 msgstr ""
 
-#: apps/member/models.py:297
+#: apps/member/models.py:279
 msgid "membership ends on"
 msgstr ""
 
-#: apps/member/models.py:302
+#: apps/member/models.py:284
 msgid "fee"
 msgstr ""
 
-#: apps/member/models.py:320 apps/member/views.py:521 apps/wei/views.py:768
+#: apps/member/models.py:303 apps/member/views.py:527 apps/wei/views.py:768
 msgid "User is not a member of the parent club"
 msgstr ""
 
-#: apps/member/models.py:330 apps/member/views.py:530
+#: apps/member/models.py:309
+#, python-brace-format
+msgid "The role {role} does not apply to the club {club}."
+msgstr ""
+
+#: apps/member/models.py:320 apps/member/views.py:536
 msgid "User is already a member of the club"
 msgstr ""
 
-#: apps/member/models.py:381
+#: apps/member/models.py:371
 #, python-brace-format
 msgid "Membership of {user} for the club {club}"
 msgstr ""
 
-#: apps/member/models.py:384
+#: apps/member/models.py:374
 msgid "membership"
 msgstr ""
 
-#: apps/member/models.py:385
+#: apps/member/models.py:375
 msgid "memberships"
 msgstr ""
 
@@ -534,41 +535,41 @@ msgstr ""
 msgid "Renew"
 msgstr ""
 
-#: apps/member/views.py:62 apps/registration/forms.py:23
+#: apps/member/views.py:64 apps/registration/forms.py:23
 msgid "This address must be valid."
 msgstr ""
 
-#: apps/member/views.py:65 templates/member/profile_info.html:47
+#: apps/member/views.py:67 templates/member/profile_info.html:47
 #: templates/registration/future_profile_detail.html:48
 #: templates/wei/weimembership_form.html:124
 msgid "Update Profile"
 msgstr ""
 
-#: apps/member/views.py:75
+#: apps/member/views.py:77
 msgid "An alias with a similar name already exists."
 msgstr ""
 
-#: apps/member/views.py:181
+#: apps/member/views.py:183
 msgid "Search user"
 msgstr ""
 
-#: apps/member/views.py:516 apps/wei/views.py:759
+#: apps/member/views.py:522 apps/wei/views.py:759
 msgid ""
 "This user don't have enough money to join this club, and can't have a "
 "negative balance."
 msgstr ""
 
-#: apps/member/views.py:534
+#: apps/member/views.py:540
 msgid "The membership must start after {:%m-%d-%Y}."
 msgstr ""
 
-#: apps/member/views.py:539
+#: apps/member/views.py:545
 msgid "The membership must begin before {:%m-%d-%Y}."
 msgstr ""
 
-#: apps/member/views.py:556 apps/member/views.py:558 apps/member/views.py:560
-#: apps/registration/views.py:289 apps/registration/views.py:291
-#: apps/registration/views.py:293
+#: apps/member/views.py:562 apps/member/views.py:564 apps/member/views.py:566
+#: apps/registration/views.py:290 apps/registration/views.py:292
+#: apps/registration/views.py:294
 msgid "This field is required."
 msgstr ""
 
@@ -834,63 +835,67 @@ msgstr ""
 msgid "Consumptions"
 msgstr ""
 
-#: apps/permission/models.py:82
+#: apps/permission/models.py:81
 #, python-brace-format
 msgid "Can {type} {model}.{field} in {query}"
 msgstr ""
 
-#: apps/permission/models.py:84
+#: apps/permission/models.py:83
 #, python-brace-format
 msgid "Can {type} {model} in {query}"
 msgstr ""
 
-#: apps/permission/models.py:97
+#: apps/permission/models.py:96
 msgid "rank"
 msgstr ""
 
-#: apps/permission/models.py:110
+#: apps/permission/models.py:109
 msgid "permission mask"
 msgstr ""
 
-#: apps/permission/models.py:111
+#: apps/permission/models.py:110
 msgid "permission masks"
 msgstr ""
 
-#: apps/permission/models.py:151
+#: apps/permission/models.py:150
 msgid "query"
 msgstr ""
 
-#: apps/permission/models.py:164
+#: apps/permission/models.py:163
 msgid "mask"
 msgstr ""
 
-#: apps/permission/models.py:170
+#: apps/permission/models.py:169
 msgid "field"
 msgstr ""
 
-#: apps/permission/models.py:175
+#: apps/permission/models.py:174
 msgid ""
 "Tells if the permission should be granted even if the membership of the user "
 "is expired."
 msgstr ""
 
-#: apps/permission/models.py:176 templates/permission/all_rights.html:26
+#: apps/permission/models.py:175 templates/permission/all_rights.html:26
 msgid "permanent"
 msgstr ""
 
-#: apps/permission/models.py:187
+#: apps/permission/models.py:186
 msgid "permission"
 msgstr ""
 
-#: apps/permission/models.py:188 apps/permission/models.py:322
+#: apps/permission/models.py:187 apps/permission/models.py:320
 msgid "permissions"
 msgstr ""
 
-#: apps/permission/models.py:193
+#: apps/permission/models.py:192
 msgid "Specifying field applies only to view and change permission types."
 msgstr ""
 
-#: apps/permission/models.py:329 apps/permission/models.py:330
+#: apps/permission/models.py:325
+msgid "for club"
+msgstr ""
+
+#: apps/permission/models.py:335 apps/permission/models.py:336
 msgid "role permissions"
 msgstr ""
 
@@ -915,7 +920,7 @@ msgid ""
 "{model_name}."
 msgstr ""
 
-#: apps/permission/views.py:47
+#: apps/permission/views.py:48
 msgid "All rights"
 msgstr ""
 
@@ -941,31 +946,31 @@ msgstr ""
 msgid "Join Kfet Club"
 msgstr ""
 
-#: apps/registration/views.py:78
+#: apps/registration/views.py:79
 msgid "Email validation"
 msgstr ""
 
-#: apps/registration/views.py:124
+#: apps/registration/views.py:125
 msgid "Email validation unsuccessful"
 msgstr ""
 
-#: apps/registration/views.py:135
+#: apps/registration/views.py:136
 msgid "Email validation email sent"
 msgstr ""
 
-#: apps/registration/views.py:188
+#: apps/registration/views.py:189
 msgid "Unregistered users"
 msgstr ""
 
-#: apps/registration/views.py:255
+#: apps/registration/views.py:256
 msgid "You must join the BDE."
 msgstr ""
 
-#: apps/registration/views.py:277
+#: apps/registration/views.py:278
 msgid "You must join BDE club before joining Kfet club."
 msgstr ""
 
-#: apps/registration/views.py:282
+#: apps/registration/views.py:283
 msgid ""
 "The entered amount is not enough for the memberships, should be at least {}"
 msgstr ""
@@ -974,7 +979,7 @@ msgstr ""
 msgid "Treasury"
 msgstr ""
 
-#: apps/treasury/forms.py:85 apps/treasury/forms.py:133
+#: apps/treasury/forms.py:84 apps/treasury/forms.py:132
 #: templates/activity/activity_form.html:9
 #: templates/activity/activity_invite.html:8
 #: templates/django_filters/rest_framework/form.html:5
@@ -986,19 +991,19 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: apps/treasury/forms.py:87
+#: apps/treasury/forms.py:86
 msgid "Close"
 msgstr ""
 
-#: apps/treasury/forms.py:96
+#: apps/treasury/forms.py:95
 msgid "Remittance is already closed."
 msgstr ""
 
-#: apps/treasury/forms.py:101
+#: apps/treasury/forms.py:100
 msgid "You can't change the type of the remittance."
 msgstr ""
 
-#: apps/treasury/forms.py:127 apps/treasury/tables.py:47
+#: apps/treasury/forms.py:126 apps/treasury/tables.py:47
 #: apps/treasury/tables.py:113 templates/note/transaction_form.html:95
 #: templates/treasury/remittance_form.html:18
 msgid "Amount"
@@ -1167,13 +1172,13 @@ msgstr ""
 msgid "No"
 msgstr ""
 
-#: apps/wei/apps.py:10 apps/wei/models.py:47 apps/wei/models.py:48
-#: apps/wei/models.py:59 apps/wei/models.py:164 templates/base.html:130
+#: apps/wei/apps.py:10 apps/wei/models.py:48 apps/wei/models.py:49
+#: apps/wei/models.py:60 apps/wei/models.py:166 templates/base.html:130
 msgid "WEI"
 msgstr ""
 
-#: apps/wei/forms/registration.py:47 apps/wei/models.py:111
-#: apps/wei/models.py:273
+#: apps/wei/forms/registration.py:47 apps/wei/models.py:112
+#: apps/wei/models.py:275
 msgid "bus"
 msgstr ""
 
@@ -1194,7 +1199,7 @@ msgid ""
 msgstr ""
 
 #: apps/wei/forms/registration.py:61 apps/wei/forms/registration.py:67
-#: apps/wei/models.py:145
+#: apps/wei/models.py:147
 msgid "WEI Roles"
 msgstr ""
 
@@ -1206,151 +1211,151 @@ msgstr ""
 msgid "This team doesn't belong to the given bus."
 msgstr ""
 
-#: apps/wei/models.py:22 templates/wei/weiclub_info.html:23
+#: apps/wei/models.py:23 templates/wei/weiclub_info.html:23
 msgid "year"
 msgstr ""
 
-#: apps/wei/models.py:26 templates/wei/weiclub_info.html:17
+#: apps/wei/models.py:27 templates/wei/weiclub_info.html:17
 msgid "date start"
 msgstr ""
 
-#: apps/wei/models.py:30 templates/wei/weiclub_info.html:20
+#: apps/wei/models.py:31 templates/wei/weiclub_info.html:20
 msgid "date end"
 msgstr ""
 
-#: apps/wei/models.py:75
+#: apps/wei/models.py:76
 msgid "survey information"
 msgstr ""
 
-#: apps/wei/models.py:76
+#: apps/wei/models.py:77
 msgid "Information about the survey for new members, encoded in JSON"
 msgstr ""
 
-#: apps/wei/models.py:98
+#: apps/wei/models.py:99
 msgid "Bus"
 msgstr ""
 
-#: apps/wei/models.py:99 templates/wei/weiclub_tables.html:79
+#: apps/wei/models.py:100 templates/wei/weiclub_tables.html:79
 msgid "Buses"
 msgstr ""
 
-#: apps/wei/models.py:119
+#: apps/wei/models.py:121
 msgid "color"
 msgstr ""
 
-#: apps/wei/models.py:120
+#: apps/wei/models.py:122
 msgid "The color of the T-Shirt, stored with its number equivalent"
 msgstr ""
 
-#: apps/wei/models.py:134
+#: apps/wei/models.py:136
 msgid "Bus team"
 msgstr ""
 
-#: apps/wei/models.py:135
+#: apps/wei/models.py:137
 msgid "Bus teams"
 msgstr ""
 
-#: apps/wei/models.py:144
+#: apps/wei/models.py:146
 msgid "WEI Role"
 msgstr ""
 
-#: apps/wei/models.py:169
+#: apps/wei/models.py:171
 msgid "Credit from Société générale"
 msgstr ""
 
-#: apps/wei/models.py:174
+#: apps/wei/models.py:176
 msgid "Caution check given"
 msgstr ""
 
-#: apps/wei/models.py:178 templates/wei/weimembership_form.html:62
+#: apps/wei/models.py:180 templates/wei/weimembership_form.html:62
 msgid "birth date"
 msgstr ""
 
-#: apps/wei/models.py:184
+#: apps/wei/models.py:186
 msgid "Male"
 msgstr ""
 
-#: apps/wei/models.py:185
+#: apps/wei/models.py:187
 msgid "Female"
 msgstr ""
 
-#: apps/wei/models.py:186
+#: apps/wei/models.py:188
 msgid "Non binary"
 msgstr ""
 
-#: apps/wei/models.py:188 templates/wei/weimembership_form.html:59
+#: apps/wei/models.py:190 templates/wei/weimembership_form.html:59
 msgid "gender"
 msgstr ""
 
-#: apps/wei/models.py:194 templates/wei/weimembership_form.html:65
+#: apps/wei/models.py:196 templates/wei/weimembership_form.html:65
 msgid "health issues"
 msgstr ""
 
-#: apps/wei/models.py:199 templates/wei/weimembership_form.html:68
+#: apps/wei/models.py:201 templates/wei/weimembership_form.html:68
 msgid "emergency contact name"
 msgstr ""
 
-#: apps/wei/models.py:204 templates/wei/weimembership_form.html:71
+#: apps/wei/models.py:206 templates/wei/weimembership_form.html:71
 msgid "emergency contact phone"
 msgstr ""
 
-#: apps/wei/models.py:209 templates/wei/weimembership_form.html:74
+#: apps/wei/models.py:211 templates/wei/weimembership_form.html:74
 msgid ""
 "Register on the mailing list to stay informed of the events of the campus (1 "
 "mail/week)"
 msgstr ""
 
-#: apps/wei/models.py:214 templates/wei/weimembership_form.html:77
+#: apps/wei/models.py:216 templates/wei/weimembership_form.html:77
 msgid ""
 "Register on the mailing list to stay informed of the sport events of the "
 "campus (1 mail/week)"
 msgstr ""
 
-#: apps/wei/models.py:219 templates/wei/weimembership_form.html:80
+#: apps/wei/models.py:221 templates/wei/weimembership_form.html:80
 msgid ""
 "Register on the mailing list to stay informed of the art events of the "
 "campus (1 mail/week)"
 msgstr ""
 
-#: apps/wei/models.py:224 templates/wei/weimembership_form.html:56
+#: apps/wei/models.py:226 templates/wei/weimembership_form.html:56
 msgid "first year"
 msgstr ""
 
-#: apps/wei/models.py:225
+#: apps/wei/models.py:227
 msgid "Tells if the user is new in the school."
 msgstr ""
 
-#: apps/wei/models.py:230
+#: apps/wei/models.py:232
 msgid "registration information"
 msgstr ""
 
-#: apps/wei/models.py:231
+#: apps/wei/models.py:233
 msgid ""
 "Information about the registration (buses for old members, survey fot the "
 "new members), encoded in JSON"
 msgstr ""
 
-#: apps/wei/models.py:262
+#: apps/wei/models.py:264
 msgid "WEI User"
 msgstr ""
 
-#: apps/wei/models.py:263
+#: apps/wei/models.py:265
 msgid "WEI Users"
 msgstr ""
 
-#: apps/wei/models.py:283
+#: apps/wei/models.py:285
 msgid "team"
 msgstr ""
 
-#: apps/wei/models.py:293
+#: apps/wei/models.py:295
 msgid "WEI registration"
 msgstr ""
 
-#: apps/wei/models.py:297
+#: apps/wei/models.py:299
 msgid "WEI membership"
 msgstr ""
 
-#: apps/wei/models.py:298
+#: apps/wei/models.py:300
 msgid "WEI memberships"
 msgstr ""
 
@@ -1420,15 +1425,15 @@ msgstr ""
 msgid "Survey WEI"
 msgstr ""
 
-#: note_kfet/settings/base.py:154
+#: note_kfet/settings/base.py:155
 msgid "German"
 msgstr ""
 
-#: note_kfet/settings/base.py:155
+#: note_kfet/settings/base.py:156
 msgid "English"
 msgstr ""
 
-#: note_kfet/settings/base.py:156
+#: note_kfet/settings/base.py:157
 msgid "French"
 msgstr ""
 
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 86072e23..9657513b 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-25 16:50+0200\n"
+"POT-Creation-Date: 2020-07-25 19:55+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -45,11 +45,11 @@ msgid "You can't invite more than 3 people to this activity."
 msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité."
 
 #: apps/activity/models.py:23 apps/activity/models.py:48
-#: apps/member/models.py:151 apps/member/models.py:255
-#: apps/note/models/notes.py:188 apps/note/models/transactions.py:25
-#: apps/note/models/transactions.py:45 apps/note/models/transactions.py:261
-#: apps/wei/models.py:64 templates/member/club_info.html:13
-#: templates/member/profile_info.html:14
+#: apps/member/models.py:151 apps/note/models/notes.py:188
+#: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45
+#: apps/note/models/transactions.py:261 apps/permission/models.py:315
+#: apps/wei/models.py:65 apps/wei/models.py:117
+#: templates/member/club_info.html:13 templates/member/profile_info.html:14
 #: templates/registration/future_profile_detail.html:16
 #: templates/wei/weiclub_info.html:13 templates/wei/weimembership_form.html:18
 msgid "name"
@@ -72,21 +72,21 @@ msgid "activity types"
 msgstr "types d'activité"
 
 #: apps/activity/models.py:53 apps/note/models/transactions.py:81
-#: apps/permission/models.py:103 apps/permission/models.py:182
-#: apps/wei/models.py:70 apps/wei/models.py:126
+#: apps/permission/models.py:102 apps/permission/models.py:181
+#: apps/wei/models.py:71 apps/wei/models.py:128
 #: templates/activity/activity_detail.html:16
 msgid "description"
 msgstr "description"
 
 #: apps/activity/models.py:60 apps/note/models/notes.py:164
-#: apps/note/models/transactions.py:66 apps/permission/models.py:157
+#: apps/note/models/transactions.py:66 apps/permission/models.py:156
 #: templates/activity/activity_detail.html:19
 msgid "type"
 msgstr "type"
 
-#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:277
+#: apps/activity/models.py:66 apps/logs/models.py:21 apps/member/models.py:259
 #: apps/note/models/notes.py:117 apps/treasury/models.py:221
-#: apps/wei/models.py:157 templates/treasury/sogecredit_detail.html:14
+#: apps/wei/models.py:159 templates/treasury/sogecredit_detail.html:14
 #: templates/wei/survey.html:16
 msgid "user"
 msgstr "utilisateur"
@@ -188,12 +188,12 @@ msgid "Type"
 msgstr "Type"
 
 #: apps/activity/tables.py:77 apps/member/forms.py:83
-#: apps/registration/forms.py:64 apps/treasury/forms.py:121
+#: apps/registration/forms.py:64 apps/treasury/forms.py:120
 msgid "Last name"
 msgstr "Nom de famille"
 
 #: apps/activity/tables.py:79 apps/member/forms.py:88
-#: apps/registration/forms.py:69 apps/treasury/forms.py:123
+#: apps/registration/forms.py:69 apps/treasury/forms.py:122
 #: templates/note/transaction_form.html:126
 msgid "First name"
 msgstr "Prénom"
@@ -226,7 +226,7 @@ msgstr "Logs"
 msgid "IP Address"
 msgstr "Adresse IP"
 
-#: apps/logs/models.py:35 apps/permission/models.py:127
+#: apps/logs/models.py:35 apps/permission/models.py:126
 msgid "model"
 msgstr "Modèle"
 
@@ -305,7 +305,7 @@ msgid "Credit amount"
 msgstr "Montant à créditer"
 
 #: apps/member/forms.py:93 apps/registration/forms.py:74
-#: apps/treasury/forms.py:125 templates/note/transaction_form.html:132
+#: apps/treasury/forms.py:124 templates/note/transaction_form.html:132
 msgid "Bank"
 msgstr "Banque"
 
@@ -485,7 +485,7 @@ msgstr ""
 "Combien de temps l'adhésion peut durer après le 1er Janvier de l'année "
 "suivante avant que les adhérents peuvent renouveler leur adhésion."
 
-#: apps/member/models.py:240 apps/member/models.py:283
+#: apps/member/models.py:240 apps/member/models.py:265
 #: apps/note/models/notes.py:139
 msgid "club"
 msgstr "club"
@@ -494,44 +494,45 @@ msgstr "club"
 msgid "clubs"
 msgstr "clubs"
 
-#: apps/member/models.py:261 apps/permission/models.py:318
-msgid "role"
-msgstr "rôle"
-
-#: apps/member/models.py:262 apps/member/models.py:288
+#: apps/member/models.py:270
 msgid "roles"
 msgstr "rôles"
 
-#: apps/member/models.py:293
+#: apps/member/models.py:275
 msgid "membership starts on"
 msgstr "l'adhésion commence le"
 
-#: apps/member/models.py:297
+#: apps/member/models.py:279
 msgid "membership ends on"
 msgstr "l'adhésion finit le"
 
-#: apps/member/models.py:302
+#: apps/member/models.py:284
 msgid "fee"
 msgstr "cotisation"
 
-#: apps/member/models.py:320 apps/member/views.py:521 apps/wei/views.py:768
+#: apps/member/models.py:303 apps/member/views.py:527 apps/wei/views.py:768
 msgid "User is not a member of the parent club"
 msgstr "L'utilisateur n'est pas membre du club parent"
 
-#: apps/member/models.py:330 apps/member/views.py:530
+#: apps/member/models.py:309
+#, python-brace-format
+msgid "The role {role} does not apply to the club {club}."
+msgstr "Le rôle {role} ne s'applique pas au club {club}."
+
+#: apps/member/models.py:320 apps/member/views.py:536
 msgid "User is already a member of the club"
 msgstr "L'utilisateur est déjà membre du club"
 
-#: apps/member/models.py:381
+#: apps/member/models.py:371
 #, python-brace-format
 msgid "Membership of {user} for the club {club}"
 msgstr "Adhésion de {user} pour le club {club}"
 
-#: apps/member/models.py:384
+#: apps/member/models.py:374
 msgid "membership"
 msgstr "adhésion"
 
-#: apps/member/models.py:385
+#: apps/member/models.py:375
 msgid "memberships"
 msgstr "adhésions"
 
@@ -539,25 +540,25 @@ msgstr "adhésions"
 msgid "Renew"
 msgstr "Renouveler"
 
-#: apps/member/views.py:62 apps/registration/forms.py:23
+#: apps/member/views.py:64 apps/registration/forms.py:23
 msgid "This address must be valid."
 msgstr "Cette adresse doit être valide."
 
-#: apps/member/views.py:65 templates/member/profile_info.html:47
+#: apps/member/views.py:67 templates/member/profile_info.html:47
 #: templates/registration/future_profile_detail.html:48
 #: templates/wei/weimembership_form.html:124
 msgid "Update Profile"
 msgstr "Modifier le profil"
 
-#: apps/member/views.py:75
+#: apps/member/views.py:77
 msgid "An alias with a similar name already exists."
 msgstr "Un alias avec un nom similaire existe déjà."
 
-#: apps/member/views.py:181
+#: apps/member/views.py:183
 msgid "Search user"
 msgstr "Chercher un utilisateur"
 
-#: apps/member/views.py:516 apps/wei/views.py:759
+#: apps/member/views.py:522 apps/wei/views.py:759
 msgid ""
 "This user don't have enough money to join this club, and can't have a "
 "negative balance."
@@ -565,17 +566,17 @@ msgstr ""
 "Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne peut pas "
 "avoir un solde négatif."
 
-#: apps/member/views.py:534
+#: apps/member/views.py:540
 msgid "The membership must start after {:%m-%d-%Y}."
 msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}."
 
-#: apps/member/views.py:539
+#: apps/member/views.py:545
 msgid "The membership must begin before {:%m-%d-%Y}."
 msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}."
 
-#: apps/member/views.py:556 apps/member/views.py:558 apps/member/views.py:560
-#: apps/registration/views.py:289 apps/registration/views.py:291
-#: apps/registration/views.py:293
+#: apps/member/views.py:562 apps/member/views.py:564 apps/member/views.py:566
+#: apps/registration/views.py:290 apps/registration/views.py:292
+#: apps/registration/views.py:294
 msgid "This field is required."
 msgstr "Ce champ est requis."
 
@@ -724,7 +725,7 @@ msgstr "afficher"
 
 #: apps/note/models/transactions.py:77
 msgid "highlighted"
-msgstr ""
+msgstr "mis en avant"
 
 #: apps/note/models/transactions.py:87
 msgid "transaction template"
@@ -765,6 +766,8 @@ msgid ""
 "The transaction can't be saved since the source note or the destination note "
 "is not active."
 msgstr ""
+"La transaction ne peut pas être sauvegardée puisque la note source ou la note "
+"de destination n'est pas active."
 
 #: apps/note/models/transactions.py:228
 #: templates/activity/activity_entry.html:13 templates/base.html:98
@@ -800,6 +803,8 @@ msgid ""
 "A special transaction is only possible between a Note associated to a "
 "payment method and a User or a Club"
 msgstr ""
+"Une transaction spéciale n'est possible que entre une note associée à "
+"un mode de paiement et un utilisateur ou un club."
 
 #: apps/note/models/transactions.py:305 apps/note/models/transactions.py:310
 msgid "membership transaction"
@@ -842,41 +847,41 @@ msgstr "Transférer de l'argent"
 msgid "Consumptions"
 msgstr "Consommations"
 
-#: apps/permission/models.py:82
+#: apps/permission/models.py:81
 #, python-brace-format
 msgid "Can {type} {model}.{field} in {query}"
 msgstr "Can {type} {model}.{field} in {query}"
 
-#: apps/permission/models.py:84
+#: apps/permission/models.py:83
 #, python-brace-format
 msgid "Can {type} {model} in {query}"
 msgstr "Can {type} {model} in {query}"
 
-#: apps/permission/models.py:97
+#: apps/permission/models.py:96
 msgid "rank"
 msgstr "Rang"
 
-#: apps/permission/models.py:110
+#: apps/permission/models.py:109
 msgid "permission mask"
 msgstr "masque de permissions"
 
-#: apps/permission/models.py:111
+#: apps/permission/models.py:110
 msgid "permission masks"
 msgstr "masques de permissions"
 
-#: apps/permission/models.py:151
+#: apps/permission/models.py:150
 msgid "query"
 msgstr "requête"
 
-#: apps/permission/models.py:164
+#: apps/permission/models.py:163
 msgid "mask"
 msgstr "masque"
 
-#: apps/permission/models.py:170
+#: apps/permission/models.py:169
 msgid "field"
 msgstr "champ"
 
-#: apps/permission/models.py:175
+#: apps/permission/models.py:174
 msgid ""
 "Tells if the permission should be granted even if the membership of the user "
 "is expired."
@@ -884,25 +889,29 @@ msgstr ""
 "Indique si la permission doit être attribuée même si l'adhésion de "
 "l'utilisateur est expirée."
 
-#: apps/permission/models.py:176 templates/permission/all_rights.html:26
+#: apps/permission/models.py:175 templates/permission/all_rights.html:26
 msgid "permanent"
 msgstr "permanent"
 
-#: apps/permission/models.py:187
+#: apps/permission/models.py:186
 msgid "permission"
 msgstr "permission"
 
-#: apps/permission/models.py:188 apps/permission/models.py:322
+#: apps/permission/models.py:187 apps/permission/models.py:320
 msgid "permissions"
 msgstr "permissions"
 
-#: apps/permission/models.py:193
+#: apps/permission/models.py:192
 msgid "Specifying field applies only to view and change permission types."
 msgstr ""
 "Spécifie le champ concerné, ne fonctionne que pour les permissions view et "
 "change."
 
-#: apps/permission/models.py:329 apps/permission/models.py:330
+#: apps/permission/models.py:325
+msgid "for club"
+msgstr "s'applique au club"
+
+#: apps/permission/models.py:335 apps/permission/models.py:336
 msgid "role permissions"
 msgstr "Permissions par rôles"
 
@@ -933,7 +942,7 @@ msgstr ""
 "Vous n'avez pas la permission de supprimer cette instance du modèle "
 "{app_label}.{model_name}."
 
-#: apps/permission/views.py:47
+#: apps/permission/views.py:48
 msgid "All rights"
 msgstr "Tous les droits"
 
@@ -962,31 +971,31 @@ msgstr "Adhérer au club BDE"
 msgid "Join Kfet Club"
 msgstr "Adhérer au club Kfet"
 
-#: apps/registration/views.py:78
+#: apps/registration/views.py:79
 msgid "Email validation"
 msgstr "Validation de l'adresse mail"
 
-#: apps/registration/views.py:124
+#: apps/registration/views.py:125
 msgid "Email validation unsuccessful"
 msgstr " La validation de l'adresse mail a échoué"
 
-#: apps/registration/views.py:135
+#: apps/registration/views.py:136
 msgid "Email validation email sent"
 msgstr "L'email de vérification de l'adresse email a bien été envoyé."
 
-#: apps/registration/views.py:188
+#: apps/registration/views.py:189
 msgid "Unregistered users"
 msgstr "Utilisateurs en attente d'inscription"
 
-#: apps/registration/views.py:255
+#: apps/registration/views.py:256
 msgid "You must join the BDE."
 msgstr "Vous devez adhérer au BDE."
 
-#: apps/registration/views.py:277
+#: apps/registration/views.py:278
 msgid "You must join BDE club before joining Kfet club."
 msgstr "Vous devez adhérer au club BDE avant d'adhérer au club Kfet."
 
-#: apps/registration/views.py:282
+#: apps/registration/views.py:283
 msgid ""
 "The entered amount is not enough for the memberships, should be at least {}"
 msgstr ""
@@ -997,7 +1006,7 @@ msgstr ""
 msgid "Treasury"
 msgstr "Trésorerie"
 
-#: apps/treasury/forms.py:85 apps/treasury/forms.py:133
+#: apps/treasury/forms.py:84 apps/treasury/forms.py:132
 #: templates/activity/activity_form.html:9
 #: templates/activity/activity_invite.html:8
 #: templates/django_filters/rest_framework/form.html:5
@@ -1009,19 +1018,19 @@ msgstr "Trésorerie"
 msgid "Submit"
 msgstr "Envoyer"
 
-#: apps/treasury/forms.py:87
+#: apps/treasury/forms.py:86
 msgid "Close"
 msgstr "Fermer"
 
-#: apps/treasury/forms.py:96
+#: apps/treasury/forms.py:95
 msgid "Remittance is already closed."
 msgstr "La remise est déjà fermée."
 
-#: apps/treasury/forms.py:101
+#: apps/treasury/forms.py:100
 msgid "You can't change the type of the remittance."
 msgstr "Vous ne pouvez pas changer le type de la remise."
 
-#: apps/treasury/forms.py:127 apps/treasury/tables.py:47
+#: apps/treasury/forms.py:126 apps/treasury/tables.py:47
 #: apps/treasury/tables.py:113 templates/note/transaction_form.html:95
 #: templates/treasury/remittance_form.html:18
 msgid "Amount"
@@ -1192,13 +1201,13 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
-#: apps/wei/apps.py:10 apps/wei/models.py:47 apps/wei/models.py:48
-#: apps/wei/models.py:59 apps/wei/models.py:164 templates/base.html:130
+#: apps/wei/apps.py:10 apps/wei/models.py:48 apps/wei/models.py:49
+#: apps/wei/models.py:60 apps/wei/models.py:166 templates/base.html:130
 msgid "WEI"
 msgstr "WEI"
 
-#: apps/wei/forms/registration.py:47 apps/wei/models.py:111
-#: apps/wei/models.py:273
+#: apps/wei/forms/registration.py:47 apps/wei/models.py:112
+#: apps/wei/models.py:275
 msgid "bus"
 msgstr "Bus"
 
@@ -1224,7 +1233,7 @@ msgstr ""
 "bus ou électron libre)"
 
 #: apps/wei/forms/registration.py:61 apps/wei/forms/registration.py:67
-#: apps/wei/models.py:145
+#: apps/wei/models.py:147
 msgid "WEI Roles"
 msgstr "Rôles au WEI"
 
@@ -1236,97 +1245,97 @@ msgstr "Sélectionnez les rôles qui vous intéressent."
 msgid "This team doesn't belong to the given bus."
 msgstr "Cette équipe n'appartient pas à ce bus."
 
-#: apps/wei/models.py:22 templates/wei/weiclub_info.html:23
+#: apps/wei/models.py:23 templates/wei/weiclub_info.html:23
 msgid "year"
 msgstr "année"
 
-#: apps/wei/models.py:26 templates/wei/weiclub_info.html:17
+#: apps/wei/models.py:27 templates/wei/weiclub_info.html:17
 msgid "date start"
 msgstr "début"
 
-#: apps/wei/models.py:30 templates/wei/weiclub_info.html:20
+#: apps/wei/models.py:31 templates/wei/weiclub_info.html:20
 msgid "date end"
 msgstr "fin"
 
-#: apps/wei/models.py:75
+#: apps/wei/models.py:76
 msgid "survey information"
 msgstr "informations sur le questionnaire"
 
-#: apps/wei/models.py:76
+#: apps/wei/models.py:77
 msgid "Information about the survey for new members, encoded in JSON"
 msgstr ""
 "Informations sur le sondage pour les nouveaux membres, encodées en JSON"
 
-#: apps/wei/models.py:98
+#: apps/wei/models.py:99
 msgid "Bus"
 msgstr "Bus"
 
-#: apps/wei/models.py:99 templates/wei/weiclub_tables.html:79
+#: apps/wei/models.py:100 templates/wei/weiclub_tables.html:79
 msgid "Buses"
 msgstr "Bus"
 
-#: apps/wei/models.py:119
+#: apps/wei/models.py:121
 msgid "color"
 msgstr "couleur"
 
-#: apps/wei/models.py:120
+#: apps/wei/models.py:122
 msgid "The color of the T-Shirt, stored with its number equivalent"
 msgstr ""
 "La couleur du T-Shirt, stocké sous la forme de son équivalent numérique"
 
-#: apps/wei/models.py:134
+#: apps/wei/models.py:136
 msgid "Bus team"
 msgstr "Équipe de bus"
 
-#: apps/wei/models.py:135
+#: apps/wei/models.py:137
 msgid "Bus teams"
 msgstr "Équipes de bus"
 
-#: apps/wei/models.py:144
+#: apps/wei/models.py:146
 msgid "WEI Role"
 msgstr "Rôle au WEI"
 
-#: apps/wei/models.py:169
+#: apps/wei/models.py:171
 msgid "Credit from Société générale"
 msgstr "Crédit de la Société générale"
 
-#: apps/wei/models.py:174
+#: apps/wei/models.py:176
 msgid "Caution check given"
 msgstr "Chèque de caution donné"
 
-#: apps/wei/models.py:178 templates/wei/weimembership_form.html:62
+#: apps/wei/models.py:180 templates/wei/weimembership_form.html:62
 msgid "birth date"
 msgstr "date de naissance"
 
-#: apps/wei/models.py:184
+#: apps/wei/models.py:186
 msgid "Male"
 msgstr "Homme"
 
-#: apps/wei/models.py:185
+#: apps/wei/models.py:187
 msgid "Female"
 msgstr "Femme"
 
-#: apps/wei/models.py:186
+#: apps/wei/models.py:188
 msgid "Non binary"
 msgstr "Non-binaire"
 
-#: apps/wei/models.py:188 templates/wei/weimembership_form.html:59
+#: apps/wei/models.py:190 templates/wei/weimembership_form.html:59
 msgid "gender"
 msgstr "genre"
 
-#: apps/wei/models.py:194 templates/wei/weimembership_form.html:65
+#: apps/wei/models.py:196 templates/wei/weimembership_form.html:65
 msgid "health issues"
 msgstr "problèmes de santé"
 
-#: apps/wei/models.py:199 templates/wei/weimembership_form.html:68
+#: apps/wei/models.py:201 templates/wei/weimembership_form.html:68
 msgid "emergency contact name"
 msgstr "Nom du contact en cas d'urgence"
 
-#: apps/wei/models.py:204 templates/wei/weimembership_form.html:71
+#: apps/wei/models.py:206 templates/wei/weimembership_form.html:71
 msgid "emergency contact phone"
 msgstr "Téléphone du contact en cas d'urgence"
 
-#: apps/wei/models.py:209 templates/wei/weimembership_form.html:74
+#: apps/wei/models.py:211 templates/wei/weimembership_form.html:74
 msgid ""
 "Register on the mailing list to stay informed of the events of the campus (1 "
 "mail/week)"
@@ -1334,7 +1343,7 @@ msgstr ""
 "S'inscrire sur la liste de diffusion pour rester informé des événements sur "
 "le campus (1 mail par semaine)"
 
-#: apps/wei/models.py:214 templates/wei/weimembership_form.html:77
+#: apps/wei/models.py:216 templates/wei/weimembership_form.html:77
 msgid ""
 "Register on the mailing list to stay informed of the sport events of the "
 "campus (1 mail/week)"
@@ -1342,7 +1351,7 @@ msgstr ""
 "S'inscrire sur la liste de diffusion pour rester informé des actualités "
 "sportives sur le campus (1 mail par semaine)"
 
-#: apps/wei/models.py:219 templates/wei/weimembership_form.html:80
+#: apps/wei/models.py:221 templates/wei/weimembership_form.html:80
 msgid ""
 "Register on the mailing list to stay informed of the art events of the "
 "campus (1 mail/week)"
@@ -1350,19 +1359,19 @@ msgstr ""
 "S'inscrire sur la liste de diffusion pour rester informé des actualités "
 "artistiques sur le campus (1 mail par semaine)"
 
-#: apps/wei/models.py:224 templates/wei/weimembership_form.html:56
+#: apps/wei/models.py:226 templates/wei/weimembership_form.html:56
 msgid "first year"
 msgstr "première année"
 
-#: apps/wei/models.py:225
+#: apps/wei/models.py:227
 msgid "Tells if the user is new in the school."
 msgstr "Indique si l'utilisateur est nouveau dans l'école."
 
-#: apps/wei/models.py:230
+#: apps/wei/models.py:232
 msgid "registration information"
 msgstr "informations sur l'inscription"
 
-#: apps/wei/models.py:231
+#: apps/wei/models.py:233
 msgid ""
 "Information about the registration (buses for old members, survey fot the "
 "new members), encoded in JSON"
@@ -1370,27 +1379,27 @@ msgstr ""
 "Informations sur l'inscription (bus pour les 2A+, questionnaire pour les "
 "1A), encodées en JSON"
 
-#: apps/wei/models.py:262
+#: apps/wei/models.py:264
 msgid "WEI User"
 msgstr "Participant au WEI"
 
-#: apps/wei/models.py:263
+#: apps/wei/models.py:265
 msgid "WEI Users"
 msgstr "Participants au WEI"
 
-#: apps/wei/models.py:283
+#: apps/wei/models.py:285
 msgid "team"
 msgstr "équipe"
 
-#: apps/wei/models.py:293
+#: apps/wei/models.py:295
 msgid "WEI registration"
 msgstr "inscription au WEI"
 
-#: apps/wei/models.py:297
+#: apps/wei/models.py:299
 msgid "WEI membership"
 msgstr "adhésion au WEI"
 
-#: apps/wei/models.py:298
+#: apps/wei/models.py:300
 msgid "WEI memberships"
 msgstr "adhésions au WEI"
 
@@ -1462,15 +1471,15 @@ msgstr "Cet utilisateur n'a pas donné son chèque de caution."
 msgid "Survey WEI"
 msgstr "Questionnaire WEI"
 
-#: note_kfet/settings/base.py:154
+#: note_kfet/settings/base.py:155
 msgid "German"
 msgstr "Allemand"
 
-#: note_kfet/settings/base.py:155
+#: note_kfet/settings/base.py:156
 msgid "English"
 msgstr "Anglais"
 
-#: note_kfet/settings/base.py:156
+#: note_kfet/settings/base.py:157
 msgid "French"
 msgstr "Français"
 

From 4c29d855d288ea091f27031083fe1afc5f40a859 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 25 Jul 2020 20:07:45 +0200
Subject: [PATCH 14/77] Fix RolePermissions merge

---
 apps/permission/backends.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/permission/backends.py b/apps/permission/backends.py
index 9dc69d3d..99f1b2da 100644
--- a/apps/permission/backends.py
+++ b/apps/permission/backends.py
@@ -37,17 +37,17 @@ class PermissionBackend(ModelBackend):
             return Permission.objects.none()
 
         qs = Permission.objects.annotate(
-            club=F("role__role__membership__club"),
-            membership=F("role__role__membership"),
+            club=F("role__membership__club"),
+            membership=F("role__membership"),
         ).filter(
             (
                 Q(
-                    role__role__membership__date_start__lte=timezone.now().today(),
-                    role__role__membership__date_end__gte=timezone.now().today(),
+                    role__membership__date_start__lte=timezone.now().today(),
+                    role__membership__date_end__gte=timezone.now().today(),
                 )
                 | Q(permanent=True)
             )
-            & Q(role__role__membership__user=user)
+            & Q(role__membership__user=user)
             & Q(type=t)
             & Q(mask__rank__lte=get_current_session().get("permission_mask", 0))
         )

From ab5d5a6e94edf44781709c777ab6a49285ddf288 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 25 Jul 2020 20:15:26 +0200
Subject: [PATCH 15/77] Display the associated club of the role in the
 permission page

---
 templates/permission/all_rights.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/permission/all_rights.html b/templates/permission/all_rights.html
index 293e3386..80337134 100644
--- a/templates/permission/all_rights.html
+++ b/templates/permission/all_rights.html
@@ -15,14 +15,14 @@
     {% regroup active_memberships by roles as memberships_per_role %}
     {% for role in roles %}
         <li class="{% if not role.clubs %}no-club{% endif %}">
-            {{ role }} {% if role.weirole %}(<em>Pour le WEI</em>){% endif %}
+            {{ role }} {% if role.weirole %}(<em>Pour le WEI</em>){% endif %} {% if role.for_club %}(<em>Pour le club {{ role.for_club }} uniquement</em>){% endif %}
             {% if role.clubs %}
                 <div class="alert alert-success">
                     {% trans "Own this role in the clubs" %} {{ role.clubs|join:", " }}
                 </div>
             {% endif %}
             <ul>
-            {% for permission in role.permissions.permissions.all %}
+            {% for permission in role.permissions.all %}
                 <li data-toggle="tooltip" title="{% trans "Query:" %} {{ permission.query }}">{{ permission }} ({{ permission.type }} {{ permission.model }}{% if permission.permanent %}, {% trans "permanent" %}{% endif %})</li>
             {% empty %}
                 <em>{% trans "No associated permission" %}</em>

From 8cde94c5f59e49ee084646ac68c304f6d6a8bffc Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sun, 26 Jul 2020 01:01:21 +0200
Subject: [PATCH 16/77] Import remittances

---
 apps/scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/scripts b/apps/scripts
index 441c8b96..85568dd4 160000
--- a/apps/scripts
+++ b/apps/scripts
@@ -1 +1 @@
-Subproject commit 441c8b9659df820d4c1c5f310898571b0bbde520
+Subproject commit 85568dd4f5e24770fb2e3321100aeddcc28580a7

From b8d4fb9df1c881a6471e3a582ba0bc71a33f84ea Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sun, 26 Jul 2020 09:06:08 +0200
Subject: [PATCH 17/77] :bug: Don't import only the last remittance...

---
 apps/scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/scripts b/apps/scripts
index 85568dd4..748ad7eb 160000
--- a/apps/scripts
+++ b/apps/scripts
@@ -1 +1 @@
-Subproject commit 85568dd4f5e24770fb2e3321100aeddcc28580a7
+Subproject commit 748ad7eb4813f2bb2f273a5e29cadeda1d58c3a1

From 0335a47667c714f5292872d7f9e13bdebbb357c1 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sun, 26 Jul 2020 12:05:41 +0200
Subject: [PATCH 18/77] Anonymize data, fix remittance import, better Ansible

---
 ansible/roles/2-nk20/tasks/main.yml           |  3 +-
 ansible/roles/4-nginx/tasks/main.yml          |  5 ++
 .../roles/4-nginx/templates/nginx_note.conf   | 50 +++++++++++++++++++
 apps/scripts                                  |  2 +-
 4 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 ansible/roles/4-nginx/templates/nginx_note.conf

diff --git a/ansible/roles/2-nk20/tasks/main.yml b/ansible/roles/2-nk20/tasks/main.yml
index d150a1b6..2aca0698 100644
--- a/ansible/roles/2-nk20/tasks/main.yml
+++ b/ansible/roles/2-nk20/tasks/main.yml
@@ -11,7 +11,7 @@
   git:
     repo: https://gitlab.crans.org/bde/nk20.git
     dest: /var/www/note_kfet
-    version: beta-soon
+    version: master
     force: true
 
 - name: Use default env vars (should be updated!)
@@ -19,6 +19,7 @@
     src: "env_example"
     dest: "/var/www/note_kfet/.env"
     mode: 0644
+    force: false
 
 - name: Update permissions for note_kfet dir
   file:
diff --git a/ansible/roles/4-nginx/tasks/main.yml b/ansible/roles/4-nginx/tasks/main.yml
index 427fe1df..32fa651a 100644
--- a/ansible/roles/4-nginx/tasks/main.yml
+++ b/ansible/roles/4-nginx/tasks/main.yml
@@ -15,6 +15,11 @@
     group: www-data
     state: link
 
+- name: Disable default Nginx site
+  file:
+    dest: /etc/nginx/sites-enabled/default
+    state: absent
+
 - name: Copy conf of UWSGI
   file:
     src: /var/www/note_kfet/uwsgi_note.ini
diff --git a/ansible/roles/4-nginx/templates/nginx_note.conf b/ansible/roles/4-nginx/templates/nginx_note.conf
new file mode 100644
index 00000000..8a84c03c
--- /dev/null
+++ b/ansible/roles/4-nginx/templates/nginx_note.conf
@@ -0,0 +1,50 @@
+# the upstream component nginx needs to connect to
+upstream note{
+    server unix:///var/www/note_kfet/note_kfet.sock; # file socket
+}
+
+# configuration of the server
+server {
+    # the port your site will be served on
+    # the domain name it will serve for
+    server_name nk20-beta.crans.org; # substitute your machine's IP address or FQDN
+    charset     utf-8;
+
+    # max upload size
+    client_max_body_size 75M;   # adjust to taste
+
+    # Django media
+    location /media  {
+        alias /var/www/note_kfet/media;  # your Django project's media files - amend as required
+    }
+
+    location /static {
+        alias /var/www/note_kfet/static; # your Django project's static files - amend as required
+    }
+
+    # Finally, send all non-media requests to the Django server.
+    location / {
+        uwsgi_pass note;
+        include     /var/www/note_kfet/uwsgi_params; # the uwsgi_params file you installed
+    }
+
+    listen 443 ssl;
+    ssl_certificate /etc/letsencrypt/live/nk20-beta.crans.org/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/nk20-beta.crans.org/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+
+}
+
+server {
+    if ($host = nk20-beta.crans.org) {
+        return 301 https://$host$request_uri;
+    }
+
+
+    listen      80;
+    server_name nk20-beta.crans.org;
+    return 404;
+
+
+}
diff --git a/apps/scripts b/apps/scripts
index 748ad7eb..126e5fa1 160000
--- a/apps/scripts
+++ b/apps/scripts
@@ -1 +1 @@
-Subproject commit 748ad7eb4813f2bb2f273a5e29cadeda1d58c3a1
+Subproject commit 126e5fa1e468298133f582b1dd1d380092b1eec8

From e163f86f6965739fdcb0553e0b79905713ff0c42 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sun, 26 Jul 2020 12:11:17 +0200
Subject: [PATCH 19/77] Section is not importable yet

---
 apps/scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/scripts b/apps/scripts
index 126e5fa1..03dc6f98 160000
--- a/apps/scripts
+++ b/apps/scripts
@@ -1 +1 @@
-Subproject commit 126e5fa1e468298133f582b1dd1d380092b1eec8
+Subproject commit 03dc6f98c8cb8eb3879914366eca89a23b9a644a

From 2f334e07076ce2978b15df8647abc87a2e5caad5 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sun, 26 Jul 2020 23:59:18 +0200
Subject: [PATCH 20/77] Fix remittance import

---
 apps/scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/scripts b/apps/scripts
index 03dc6f98..c19a0582 160000
--- a/apps/scripts
+++ b/apps/scripts
@@ -1 +1 @@
-Subproject commit 03dc6f98c8cb8eb3879914366eca89a23b9a644a
+Subproject commit c19a0582bd73f2e0bd14d2e4524d127b680c9e79

From 09027ea35e887231f4edcd2a30806114eb4d9f45 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Mon, 27 Jul 2020 00:16:28 +0200
Subject: [PATCH 21/77] Store transactions by default

---
 apps/scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/scripts b/apps/scripts
index c19a0582..fc29147c 160000
--- a/apps/scripts
+++ b/apps/scripts
@@ -1 +1 @@
-Subproject commit c19a0582bd73f2e0bd14d2e4524d127b680c9e79
+Subproject commit fc29147c876c33d4cf41a86d46d736ff69d176ff

From 84e8b02594f5455d80c9c901d449d19dfd570a68 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Tue, 28 Jul 2020 15:25:08 +0200
Subject: [PATCH 22/77] :bug: Calculating permissions faster

---
 apps/activity/views.py      |  3 +++
 apps/member/views.py        |  2 +-
 apps/permission/backends.py | 50 +++++++++++++------------------------
 3 files changed, 21 insertions(+), 34 deletions(-)

diff --git a/apps/activity/views.py b/apps/activity/views.py
index df3f00ea..7bc8def5 100644
--- a/apps/activity/views.py
+++ b/apps/activity/views.py
@@ -38,6 +38,9 @@ class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView
     table_class = ActivityTable
     ordering = ('-date_start',)
 
+    def get_queryset(self):
+        return super().get_queryset().distinct()
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
diff --git a/apps/member/views.py b/apps/member/views.py
index 614c5bc1..9d6b34e5 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -642,7 +642,7 @@ class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
         del form.fields['bank']
 
         club = self.object.club
-        form.fields['roles'].queryset = Role.objects.filter(Q(weirole__isnull=isinstance(club, WEIClub))
+        form.fields['roles'].queryset = Role.objects.filter(Q(weirole__isnull=not isinstance(club, WEIClub))
                                                             & (Q(for_club__isnull=True) | Q(for_club=club))).all()
 
         return form
diff --git a/apps/permission/backends.py b/apps/permission/backends.py
index 99f1b2da..374e67e6 100644
--- a/apps/permission/backends.py
+++ b/apps/permission/backends.py
@@ -36,27 +36,20 @@ class PermissionBackend(ModelBackend):
             # Unauthenticated users have no permissions
             return Permission.objects.none()
 
-        qs = Permission.objects.annotate(
-            club=F("role__membership__club"),
-            membership=F("role__membership"),
-        ).filter(
-            (
-                Q(
-                    role__membership__date_start__lte=timezone.now().today(),
-                    role__membership__date_end__gte=timezone.now().today(),
-                )
-                | Q(permanent=True)
-            )
-            & Q(role__membership__user=user)
-            & Q(type=t)
-            & Q(mask__rank__lte=get_current_session().get("permission_mask", 0))
-        )
+        memberships = Membership.objects.filter(user=user).all()
+        
+        perms = []
+
+        for membership in memberships:
+            for role in membership.roles.all():
+                for perm in role.permissions.filter(type=t, mask__rank__lte=get_current_session().get("permission_mask", 42)).all():
+                    if not perm.permanent:
+                        if membership.date_start > timezone.now().date() or membership.date_end < timezone.now().date():
+                            continue
+                    perm.membership = membership
+                    perms.append(perm)
+        return perms
 
-        if settings.DATABASES[qs.db]["ENGINE"] == 'django.db.backends.postgresql_psycopg2':
-            qs = qs.distinct('pk', 'club')
-        else:  # SQLite doesn't support distinct fields.
-            qs = qs.distinct()
-        return qs
 
     @staticmethod
     def permissions(user, model, type):
@@ -67,22 +60,13 @@ class PermissionBackend(ModelBackend):
         :param type: The type of the permissions: view, change, add or delete
         :return: A generator of the requested permissions
         """
-        clubs = {}
-        memberships = {}
 
         for permission in PermissionBackend.get_raw_permissions(user, type):
-            if not isinstance(model.model_class()(), permission.model.model_class()) or not permission.club:
+            if not isinstance(model.model_class()(), permission.model.model_class()) or not permission.membership:
                 continue
 
-            if permission.club not in clubs:
-                clubs[permission.club] = club = Club.objects.get(pk=permission.club)
-            else:
-                club = clubs[permission.club]
-
-            if permission.membership not in memberships:
-                memberships[permission.membership] = membership = Membership.objects.get(pk=permission.membership)
-            else:
-                membership = memberships[permission.membership]
+            membership = permission.membership
+            club = membership.club
 
             permission = permission.about(
                 user=user,
@@ -113,7 +97,6 @@ class PermissionBackend(ModelBackend):
         :param field: The field of the model to test, if concerned
         :return: A query that corresponds to the filter to give to a queryset
         """
-
         if user is None or isinstance(user, AnonymousUser):
             # Anonymous users can't do anything
             return Q(pk=-1)
@@ -163,6 +146,7 @@ class PermissionBackend(ModelBackend):
         perm = perm.split('.')[-1].split('_', 2)
         perm_type = perm[0]
         perm_field = perm[2] if len(perm) == 3 else None
+
         ct = ContentType.objects.get_for_model(obj)
         if any(permission.applies(obj, perm_type, perm_field)
                for permission in PermissionBackend.permissions(user_obj, ct, perm_type)):

From 0bfc3b945481bb6c5b186d71abb843c6eb6d5028 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Tue, 28 Jul 2020 18:09:43 +0200
Subject: [PATCH 23/77] Not-yet-registered WEI members can see their
 registrations

---
 apps/permission/fixtures/initial.json | 26 ++++++++++++++++----------
 apps/scripts                          |  1 -
 apps/wei/views.py                     |  2 ++
 3 files changed, 18 insertions(+), 11 deletions(-)
 delete mode 160000 apps/scripts

diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index a426ab89..79311eb9 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -2094,8 +2094,6 @@
 				39,
 				40,
 				70,
-				108,
-				109,
 				14,
 				15,
 				16,
@@ -2103,7 +2101,15 @@
 				18,
 				78,
 				79,
-				83
+				83,
+				90,
+				93,
+				95,
+				97,
+				99,
+				101,
+				108,
+				109
 			]
 		}
 	},
@@ -2493,18 +2499,18 @@
 			"for_club": null,
 			"name": "Adhérent WEI",
 			"permissions": [
-				97,
-				99,
-				101,
-				108,
 				77,
-				109,
-				114,
 				84,
 				87,
 				90,
 				93,
-				95
+				95,
+				97,
+				99,
+				101,
+				108,
+				109,
+				114
 			]
 		}
 	},
diff --git a/apps/scripts b/apps/scripts
deleted file mode 160000
index fc29147c..00000000
--- a/apps/scripts
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit fc29147c876c33d4cf41a86d46d736ff69d176ff
diff --git a/apps/wei/views.py b/apps/wei/views.py
index 3accb804..be73370f 100644
--- a/apps/wei/views.py
+++ b/apps/wei/views.py
@@ -132,6 +132,7 @@ class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
         else:
             # Check if the user has the right to create a registration of a random first year member.
             empty_fy_registration = WEIRegistration(
+                wei=club,
                 user=random_user,
                 first_year=True,
                 birth_date="1970-01-01",
@@ -144,6 +145,7 @@ class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
 
             # Check if the user has the right to create a registration of a random old member.
             empty_old_registration = WEIRegistration(
+                wei=club,
                 user=User.objects.filter(~Q(wei__wei__in=[club])).first(),
                 first_year=False,
                 birth_date="1970-01-01",

From 7b3512c0be0151136114106d6c9967e241be742a Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Tue, 28 Jul 2020 18:27:25 +0200
Subject: [PATCH 24/77] Add banner for beta

---
 templates/base.html | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/templates/base.html b/templates/base.html
index e5546451..bf3def59 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -178,6 +178,16 @@ SPDX-License-Identifier: GPL-3.0-or-later
             </div>
         {% endif %}
         {% block contenttitle %}<h1>{{ title }}</h1>{% endblock %}
+        <div class="alert alert-warning">
+            Attention : la Note Kfet 2020 est en phase de beta. Des fonctionnalités pourront être rajoutées d'ici à la version
+            finale, et des bugs peuvent survenir. Pour tout problème, merci d'envoyer un mail à l'adresse
+            <a href="mailto:&#110;&#111;&#116;&#101;&#107;&#102;&#101;&#116;&#50;&#48;&#50;&#48;&commat;&#108;&#105;&#115;&#116;&#115;&period;&#99;&#114;&#97;&#110;&#115;&period;&#111;&#114;&#103;">
+                &#110;&#111;&#116;&#101;&#107;&#102;&#101;&#116;&#50;&#48;&#50;&#48;&commat;&#108;&#105;&#115;&#116;&#115;&period;&#99;&#114;&#97;&#110;&#115;&period;&#111;&#114;&#103;</a>,
+            ou bien levez une issue sur le dépôt <a href="https://gitlab.crans.org/bde/nk20/-/issues">Gitlab</a>,
+            ou encore posez un commentaire sur le <a href="https://pad.crans.org/p/todoNK20">pad</a>.<br><br>
+
+            Certaines données ont été anonymisées afin de limiter les fuites de données, et peuvent ne pas correspondre avec vos données réelles.
+        </div>
         <div id="messages"></div>
         {% block content %}
             <p>Default content...</p>

From 76a6260b1823fcd1ab24f632024b6a99a753fd54 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Tue, 28 Jul 2020 18:59:34 +0200
Subject: [PATCH 25/77] SMTP user and password are None by default, add From
 Email tag

---
 note_kfet/settings/production.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/note_kfet/settings/production.py b/note_kfet/settings/production.py
index b7b8856e..c22bca60 100644
--- a/note_kfet/settings/production.py
+++ b/note_kfet/settings/production.py
@@ -37,10 +37,11 @@ EMAIL_BACKEND = 'django.core.mail.backends.smtp.EmailBackend'
 EMAIL_USE_SSL = False
 EMAIL_HOST = os.getenv('EMAIL_HOST', 'smtp.example.org')
 EMAIL_PORT = os.getenv('EMAIL_PORT', 465)
-EMAIL_HOST_USER = os.getenv('EMAIL_USER', 'change_me')
-EMAIL_HOST_PASSWORD = os.getenv('EMAIL_PASSWORD', 'change_me')
+EMAIL_HOST_USER = os.getenv('EMAIL_USER', None)
+EMAIL_HOST_PASSWORD = os.getenv('EMAIL_PASSWORD', None)
 
 SERVER_EMAIL = os.getenv("NOTE_MAIL", "notekfet@example.com")
+DEFAULT_FROM_EMAIL = "NoteKfet2020 <" + SERVER_EMAIL + ">"
 
 # Security settings
 SECURE_CONTENT_TYPE_NOSNIFF = False

From 12ebf9d12affe64b0638c5ad6c71514da5a22488 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Tue, 28 Jul 2020 19:38:25 +0200
Subject: [PATCH 26/77] Before checking membership roles, we wait before the
 creation of the membership

---
 apps/member/models.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/member/models.py b/apps/member/models.py
index 0384bf79..e1960a5a 100644
--- a/apps/member/models.py
+++ b/apps/member/models.py
@@ -302,12 +302,13 @@ class Membership(models.Model):
             if not Membership.objects.filter(user=self.user, club=self.club.parent_club).exists():
                 raise ValidationError(_('User is not a member of the parent club') + ' ' + self.club.parent_club.name)
 
-        for role in self.roles.all():
-            club = role.for_club
-            if club is not None:
-                if club.pk != self.club_id:
-                    raise ValidationError(_('The role {role} does not apply to the club {club}.')
-                                          .format(role=role.name, club=club.name))
+        if self.pk:
+            for role in self.roles.all():
+                club = role.for_club
+                if club is not None:
+                    if club.pk != self.club_id:
+                        raise ValidationError(_('The role {role} does not apply to the club {club}.')
+                                              .format(role=role.name, club=club.name))
 
         created = not self.pk
         if created:

From 7c6bab88f48474ff213a035121b5b7844130cb2b Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Tue, 28 Jul 2020 20:22:10 +0200
Subject: [PATCH 27/77] Update permissions to see buses

---
 apps/permission/fixtures/initial.json | 4 ++--
 apps/permission/models.py             | 8 +++++++-
 apps/permission/test.py               | 2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index 79311eb9..1b740419 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -1743,7 +1743,7 @@
 				"wei",
 				"bus"
 			],
-			"query": "[\"AND\", {\"wei\": [\"club\"]}, [\"OR\", [\"NOT\", [\"membership\", \"registration\", \"first_year\"]], {\"wei__date_end__lte\": [\"today\"]}]]",
+			"query": "[\"AND\", {\"wei\": [\"club\"]}, [\"OR\", [\"NOT\", [\"membership\", \"weimembership\", \"registration\", \"first_year\"]], {\"wei__date_end__lte\": [\"today\"]}]]",
 			"type": "view",
 			"mask": 1,
 			"field": "",
@@ -1759,7 +1759,7 @@
 				"wei",
 				"busteam"
 			],
-			"query": "[\"AND\", {\"bus__wei\": [\"club\"]}, [\"OR\", [\"NOT\", [\"membership\", \"registration\", \"first_year\"]], {\"bus__wei__date_end__lte\": [\"today\"]}]]",
+			"query": "[\"AND\", {\"bus__wei\": [\"club\"]}, [\"OR\", [\"NOT\", [\"membership\", \"weimembership\", \"registration\", \"first_year\"]], {\"bus__wei__date_end__lte\": [\"today\"]}]]",
 			"type": "view",
 			"mask": 1,
 			"field": "",
diff --git a/apps/permission/models.py b/apps/permission/models.py
index 56ca9685..12db9135 100644
--- a/apps/permission/models.py
+++ b/apps/permission/models.py
@@ -238,6 +238,9 @@ class Permission(models.Model):
                     field = Permission.compute_param(value[i], **kwargs)
                     continue
 
+                if not hasattr(field, value[i][0]):
+                    return False
+
                 field = getattr(field, value[i][0])
                 params = []
                 call_kwargs = {}
@@ -251,6 +254,9 @@ class Permission(models.Model):
                         params.append(param)
                 field = field(*params, **call_kwargs)
             else:
+                if not hasattr(field, value[i]):
+                    return False
+
                 field = getattr(field, value[i])
         return field
 
@@ -275,7 +281,7 @@ class Permission(models.Model):
             elif query[0] == 'NOT':
                 return ~Permission._about(query[1], **kwargs)
             else:
-                return Q(pk=F("pk"))
+                return Q(pk=F("pk")) if Permission.compute_param(query, **kwargs) else ~Q(pk=F("pk"))
         elif isinstance(query, dict):
             q_kwargs = {}
             for key in query:
diff --git a/apps/permission/test.py b/apps/permission/test.py
index de46d5aa..e728e9a6 100644
--- a/apps/permission/test.py
+++ b/apps/permission/test.py
@@ -76,7 +76,7 @@ class PermissionQueryTestCase(TestCase):
                 model = perm.model.model_class()
                 model.objects.filter(query).all()
                 # print("Good query for permission", perm)
-            except (FieldError, AttributeError, ValueError):
+            except (FieldError, AttributeError, ValueError, TypeError):
                 print("Query error for permission", perm)
                 print("Query:", perm.query)
                 if instanced.query:

From 54ce157019f520dfc705ee2b054a6e069d9853dd Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Tue, 28 Jul 2020 20:49:32 +0200
Subject: [PATCH 28/77] Store clothing cut and size in WEI registration

---
 apps/permission/fixtures/initial.json |  64 ++++++++++++++++
 apps/wei/models.py                    |  22 ++++++
 locale/de/LC_MESSAGES/django.po       |  94 +++++++++++++-----------
 locale/fr/LC_MESSAGES/django.po       | 102 ++++++++++++++------------
 templates/wei/weimembership_form.html |   6 ++
 5 files changed, 198 insertions(+), 90 deletions(-)

diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index 1b740419..59c9a560 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -2055,6 +2055,70 @@
 			"description": "Update validation status of a club transaction if possible"
 		}
 	},
+	{
+		"model": "permission.permission",
+		"pk": 128,
+		"fields": {
+			"model": [
+				"wei",
+				"weiregistration"
+			],
+			"query": "{\"wei\": [\"club\"], \"wei__membership_end__gte\": [\"today\"]}",
+			"type": "change",
+			"mask": 1,
+			"field": "clothing_cut",
+			"permanent": false,
+			"description": "Update the clothing cut field of any WEI Registration"
+		}
+	},
+	{
+		"model": "permission.permission",
+		"pk": 129,
+		"fields": {
+			"model": [
+				"wei",
+				"weiregistration"
+			],
+			"query": "[\"AND\", {\"user\": [\"user\"], \"wei__membership_start__lte\": [\"today\"], \"wei__membership_end__gte\": [\"today\"]}, [\"OR\", {\"wei\": [\"club\"]}, {\"wei__year\": [\"today\", \"year\"], \"membership\": null}]]",
+			"type": "change",
+			"mask": 1,
+			"field": "clothing_cut",
+			"permanent": false,
+			"description": "Update the clothing cut field of my own WEI Registration"
+		}
+	},
+	{
+		"model": "permission.permission",
+		"pk": 130,
+		"fields": {
+			"model": [
+				"wei",
+				"weiregistration"
+			],
+			"query": "{\"wei\": [\"club\"], \"wei__membership_end__gte\": [\"today\"]}",
+			"type": "change",
+			"mask": 1,
+			"field": "clothing_size",
+			"permanent": false,
+			"description": "Update the clothing size field of any WEI Registration"
+		}
+	},
+	{
+		"model": "permission.permission",
+		"pk": 131,
+		"fields": {
+			"model": [
+				"wei",
+				"weiregistration"
+			],
+			"query": "[\"AND\", {\"user\": [\"user\"], \"wei__membership_start__lte\": [\"today\"], \"wei__membership_end__gte\": [\"today\"]}, [\"OR\", {\"wei\": [\"club\"]}, {\"wei__year\": [\"today\", \"year\"], \"membership\": null}]]",
+			"type": "change",
+			"mask": 1,
+			"field": "clothing_size",
+			"permanent": false,
+			"description": "Update the clothing size field of my own WEI Registration"
+		}
+	},
 	{
 		"model": "permission.role",
 		"pk": 1,
diff --git a/apps/wei/models.py b/apps/wei/models.py
index d2afa57f..1b19a60a 100644
--- a/apps/wei/models.py
+++ b/apps/wei/models.py
@@ -190,6 +190,28 @@ class WEIRegistration(models.Model):
         verbose_name=_("gender"),
     )
 
+    clothing_cut = models.CharField(
+        max_length=16,
+        choices=(
+            ('male', _("Male")),
+            ('female', _("Female")),
+        ),
+        verbose_name=_("clothing cut"),
+    )
+
+    clothing_size = models.CharField(
+        max_length=4,
+        choices=(
+            ('XS',"XS"),
+            ('S', "S"),
+            ('M', "M"),
+            ('L', "L"),
+            ('XL', "XL"),
+            ('XXL', "XXL"),
+        ),
+        verbose_name=_("clothing size"),
+    )
+
     health_issues = models.TextField(
         blank=True,
         default="",
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 8874f620..b9d24fd5 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-25 19:55+0200\n"
+"POT-Creation-Date: 2020-07-28 20:42+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -46,7 +46,7 @@ msgstr ""
 #: apps/activity/models.py:23 apps/activity/models.py:48
 #: apps/member/models.py:151 apps/note/models/notes.py:188
 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45
-#: apps/note/models/transactions.py:261 apps/permission/models.py:315
+#: apps/note/models/transactions.py:261 apps/permission/models.py:321
 #: apps/wei/models.py:65 apps/wei/models.py:117
 #: templates/member/club_info.html:13 templates/member/profile_info.html:14
 #: templates/registration/future_profile_detail.html:16
@@ -205,11 +205,11 @@ msgstr ""
 msgid "Balance"
 msgstr ""
 
-#: apps/activity/views.py:44 templates/base.html:120
+#: apps/activity/views.py:47 templates/base.html:120
 msgid "Activities"
 msgstr ""
 
-#: apps/activity/views.py:160
+#: apps/activity/views.py:163
 msgid "Entry for activity \"{}\""
 msgstr ""
 
@@ -505,29 +505,29 @@ msgstr ""
 msgid "fee"
 msgstr ""
 
-#: apps/member/models.py:303 apps/member/views.py:527 apps/wei/views.py:768
+#: apps/member/models.py:303 apps/member/views.py:527 apps/wei/views.py:770
 msgid "User is not a member of the parent club"
 msgstr ""
 
-#: apps/member/models.py:309
+#: apps/member/models.py:310
 #, python-brace-format
 msgid "The role {role} does not apply to the club {club}."
 msgstr ""
 
-#: apps/member/models.py:320 apps/member/views.py:536
+#: apps/member/models.py:321 apps/member/views.py:536
 msgid "User is already a member of the club"
 msgstr ""
 
-#: apps/member/models.py:371
+#: apps/member/models.py:372
 #, python-brace-format
 msgid "Membership of {user} for the club {club}"
 msgstr ""
 
-#: apps/member/models.py:374
+#: apps/member/models.py:375
 msgid "membership"
 msgstr ""
 
-#: apps/member/models.py:375
+#: apps/member/models.py:376
 msgid "memberships"
 msgstr ""
 
@@ -553,7 +553,7 @@ msgstr ""
 msgid "Search user"
 msgstr ""
 
-#: apps/member/views.py:522 apps/wei/views.py:759
+#: apps/member/views.py:522 apps/wei/views.py:761
 msgid ""
 "This user don't have enough money to join this club, and can't have a "
 "negative balance."
@@ -883,7 +883,7 @@ msgstr ""
 msgid "permission"
 msgstr ""
 
-#: apps/permission/models.py:187 apps/permission/models.py:320
+#: apps/permission/models.py:187 apps/permission/models.py:326
 msgid "permissions"
 msgstr ""
 
@@ -891,11 +891,11 @@ msgstr ""
 msgid "Specifying field applies only to view and change permission types."
 msgstr ""
 
-#: apps/permission/models.py:325
+#: apps/permission/models.py:331
 msgid "for club"
 msgstr ""
 
-#: apps/permission/models.py:335 apps/permission/models.py:336
+#: apps/permission/models.py:341 apps/permission/models.py:342
 msgid "role permissions"
 msgstr ""
 
@@ -1178,7 +1178,7 @@ msgid "WEI"
 msgstr ""
 
 #: apps/wei/forms/registration.py:47 apps/wei/models.py:112
-#: apps/wei/models.py:275
+#: apps/wei/models.py:297
 msgid "bus"
 msgstr ""
 
@@ -1271,11 +1271,11 @@ msgstr ""
 msgid "birth date"
 msgstr ""
 
-#: apps/wei/models.py:186
+#: apps/wei/models.py:186 apps/wei/models.py:196
 msgid "Male"
 msgstr ""
 
-#: apps/wei/models.py:187
+#: apps/wei/models.py:187 apps/wei/models.py:197
 msgid "Female"
 msgstr ""
 
@@ -1287,75 +1287,83 @@ msgstr ""
 msgid "gender"
 msgstr ""
 
-#: apps/wei/models.py:196 templates/wei/weimembership_form.html:65
+#: apps/wei/models.py:199
+msgid "clothing cut"
+msgstr ""
+
+#: apps/wei/models.py:212
+msgid "clothing size"
+msgstr ""
+
+#: apps/wei/models.py:218 templates/wei/weimembership_form.html:65
 msgid "health issues"
 msgstr ""
 
-#: apps/wei/models.py:201 templates/wei/weimembership_form.html:68
+#: apps/wei/models.py:223 templates/wei/weimembership_form.html:68
 msgid "emergency contact name"
 msgstr ""
 
-#: apps/wei/models.py:206 templates/wei/weimembership_form.html:71
+#: apps/wei/models.py:228 templates/wei/weimembership_form.html:71
 msgid "emergency contact phone"
 msgstr ""
 
-#: apps/wei/models.py:211 templates/wei/weimembership_form.html:74
+#: apps/wei/models.py:233 templates/wei/weimembership_form.html:74
 msgid ""
 "Register on the mailing list to stay informed of the events of the campus (1 "
 "mail/week)"
 msgstr ""
 
-#: apps/wei/models.py:216 templates/wei/weimembership_form.html:77
+#: apps/wei/models.py:238 templates/wei/weimembership_form.html:77
 msgid ""
 "Register on the mailing list to stay informed of the sport events of the "
 "campus (1 mail/week)"
 msgstr ""
 
-#: apps/wei/models.py:221 templates/wei/weimembership_form.html:80
+#: apps/wei/models.py:243 templates/wei/weimembership_form.html:80
 msgid ""
 "Register on the mailing list to stay informed of the art events of the "
 "campus (1 mail/week)"
 msgstr ""
 
-#: apps/wei/models.py:226 templates/wei/weimembership_form.html:56
+#: apps/wei/models.py:248 templates/wei/weimembership_form.html:56
 msgid "first year"
 msgstr ""
 
-#: apps/wei/models.py:227
+#: apps/wei/models.py:249
 msgid "Tells if the user is new in the school."
 msgstr ""
 
-#: apps/wei/models.py:232
+#: apps/wei/models.py:254
 msgid "registration information"
 msgstr ""
 
-#: apps/wei/models.py:233
+#: apps/wei/models.py:255
 msgid ""
 "Information about the registration (buses for old members, survey fot the "
 "new members), encoded in JSON"
 msgstr ""
 
-#: apps/wei/models.py:264
+#: apps/wei/models.py:286
 msgid "WEI User"
 msgstr ""
 
-#: apps/wei/models.py:265
+#: apps/wei/models.py:287
 msgid "WEI Users"
 msgstr ""
 
-#: apps/wei/models.py:285
+#: apps/wei/models.py:307
 msgid "team"
 msgstr ""
 
-#: apps/wei/models.py:295
+#: apps/wei/models.py:317
 msgid "WEI registration"
 msgstr ""
 
-#: apps/wei/models.py:299
+#: apps/wei/models.py:321
 msgid "WEI membership"
 msgstr ""
 
-#: apps/wei/models.py:300
+#: apps/wei/models.py:322
 msgid "WEI memberships"
 msgstr ""
 
@@ -1381,45 +1389,45 @@ msgstr ""
 msgid "members"
 msgstr ""
 
-#: apps/wei/views.py:201
+#: apps/wei/views.py:203
 msgid "Find WEI Membership"
 msgstr ""
 
-#: apps/wei/views.py:236
+#: apps/wei/views.py:238
 msgid "Find WEI Registration"
 msgstr ""
 
-#: apps/wei/views.py:445 templates/wei/weiclub_info.html:62
+#: apps/wei/views.py:447 templates/wei/weiclub_info.html:62
 msgid "Register 1A"
 msgstr ""
 
-#: apps/wei/views.py:466 apps/wei/views.py:535
+#: apps/wei/views.py:468 apps/wei/views.py:537
 msgid "This user is already registered to this WEI."
 msgstr ""
 
-#: apps/wei/views.py:471
+#: apps/wei/views.py:473
 msgid ""
 "This user can't be in her/his first year since he/she has already participed "
 "to a WEI."
 msgstr ""
 
-#: apps/wei/views.py:499 templates/wei/weiclub_info.html:65
+#: apps/wei/views.py:501 templates/wei/weiclub_info.html:65
 msgid "Register 2A+"
 msgstr ""
 
-#: apps/wei/views.py:517 apps/wei/views.py:604
+#: apps/wei/views.py:519 apps/wei/views.py:606
 msgid "You already opened an account in the Société générale."
 msgstr ""
 
-#: apps/wei/views.py:664
+#: apps/wei/views.py:666
 msgid "You don't have the right to delete this WEI registration."
 msgstr ""
 
-#: apps/wei/views.py:763
+#: apps/wei/views.py:765
 msgid "This user didn't give her/his caution check."
 msgstr ""
 
-#: apps/wei/views.py:837 apps/wei/views.py:857 apps/wei/views.py:867
+#: apps/wei/views.py:839 apps/wei/views.py:859 apps/wei/views.py:869
 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12
 #: templates/wei/survey_end.html:12
 msgid "Survey WEI"
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 9657513b..62abc447 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-25 19:55+0200\n"
+"POT-Creation-Date: 2020-07-28 20:42+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,7 +47,7 @@ msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité."
 #: apps/activity/models.py:23 apps/activity/models.py:48
 #: apps/member/models.py:151 apps/note/models/notes.py:188
 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45
-#: apps/note/models/transactions.py:261 apps/permission/models.py:315
+#: apps/note/models/transactions.py:261 apps/permission/models.py:321
 #: apps/wei/models.py:65 apps/wei/models.py:117
 #: templates/member/club_info.html:13 templates/member/profile_info.html:14
 #: templates/registration/future_profile_detail.html:16
@@ -206,11 +206,11 @@ msgstr "Note"
 msgid "Balance"
 msgstr "Solde du compte"
 
-#: apps/activity/views.py:44 templates/base.html:120
+#: apps/activity/views.py:47 templates/base.html:120
 msgid "Activities"
 msgstr "Activités"
 
-#: apps/activity/views.py:160
+#: apps/activity/views.py:163
 msgid "Entry for activity \"{}\""
 msgstr "Entrées pour l'activité « {} »"
 
@@ -510,29 +510,29 @@ msgstr "l'adhésion finit le"
 msgid "fee"
 msgstr "cotisation"
 
-#: apps/member/models.py:303 apps/member/views.py:527 apps/wei/views.py:768
+#: apps/member/models.py:303 apps/member/views.py:527 apps/wei/views.py:770
 msgid "User is not a member of the parent club"
 msgstr "L'utilisateur n'est pas membre du club parent"
 
-#: apps/member/models.py:309
+#: apps/member/models.py:310
 #, python-brace-format
 msgid "The role {role} does not apply to the club {club}."
 msgstr "Le rôle {role} ne s'applique pas au club {club}."
 
-#: apps/member/models.py:320 apps/member/views.py:536
+#: apps/member/models.py:321 apps/member/views.py:536
 msgid "User is already a member of the club"
 msgstr "L'utilisateur est déjà membre du club"
 
-#: apps/member/models.py:371
+#: apps/member/models.py:372
 #, python-brace-format
 msgid "Membership of {user} for the club {club}"
 msgstr "Adhésion de {user} pour le club {club}"
 
-#: apps/member/models.py:374
+#: apps/member/models.py:375
 msgid "membership"
 msgstr "adhésion"
 
-#: apps/member/models.py:375
+#: apps/member/models.py:376
 msgid "memberships"
 msgstr "adhésions"
 
@@ -558,7 +558,7 @@ msgstr "Un alias avec un nom similaire existe déjà."
 msgid "Search user"
 msgstr "Chercher un utilisateur"
 
-#: apps/member/views.py:522 apps/wei/views.py:759
+#: apps/member/views.py:522 apps/wei/views.py:761
 msgid ""
 "This user don't have enough money to join this club, and can't have a "
 "negative balance."
@@ -766,8 +766,8 @@ msgid ""
 "The transaction can't be saved since the source note or the destination note "
 "is not active."
 msgstr ""
-"La transaction ne peut pas être sauvegardée puisque la note source ou la note "
-"de destination n'est pas active."
+"La transaction ne peut pas être sauvegardée puisque la note source ou la "
+"note de destination n'est pas active."
 
 #: apps/note/models/transactions.py:228
 #: templates/activity/activity_entry.html:13 templates/base.html:98
@@ -803,8 +803,8 @@ msgid ""
 "A special transaction is only possible between a Note associated to a "
 "payment method and a User or a Club"
 msgstr ""
-"Une transaction spéciale n'est possible que entre une note associée à "
-"un mode de paiement et un utilisateur ou un club."
+"Une transaction spéciale n'est possible que entre une note associée à un "
+"mode de paiement et un utilisateur ou un club."
 
 #: apps/note/models/transactions.py:305 apps/note/models/transactions.py:310
 msgid "membership transaction"
@@ -897,7 +897,7 @@ msgstr "permanent"
 msgid "permission"
 msgstr "permission"
 
-#: apps/permission/models.py:187 apps/permission/models.py:320
+#: apps/permission/models.py:187 apps/permission/models.py:326
 msgid "permissions"
 msgstr "permissions"
 
@@ -907,11 +907,11 @@ msgstr ""
 "Spécifie le champ concerné, ne fonctionne que pour les permissions view et "
 "change."
 
-#: apps/permission/models.py:325
+#: apps/permission/models.py:331
 msgid "for club"
 msgstr "s'applique au club"
 
-#: apps/permission/models.py:335 apps/permission/models.py:336
+#: apps/permission/models.py:341 apps/permission/models.py:342
 msgid "role permissions"
 msgstr "Permissions par rôles"
 
@@ -1207,7 +1207,7 @@ msgid "WEI"
 msgstr "WEI"
 
 #: apps/wei/forms/registration.py:47 apps/wei/models.py:112
-#: apps/wei/models.py:275
+#: apps/wei/models.py:297
 msgid "bus"
 msgstr "Bus"
 
@@ -1307,11 +1307,11 @@ msgstr "Chèque de caution donné"
 msgid "birth date"
 msgstr "date de naissance"
 
-#: apps/wei/models.py:186
+#: apps/wei/models.py:186 apps/wei/models.py:196
 msgid "Male"
 msgstr "Homme"
 
-#: apps/wei/models.py:187
+#: apps/wei/models.py:187 apps/wei/models.py:197
 msgid "Female"
 msgstr "Femme"
 
@@ -1323,19 +1323,27 @@ msgstr "Non-binaire"
 msgid "gender"
 msgstr "genre"
 
-#: apps/wei/models.py:196 templates/wei/weimembership_form.html:65
+#: apps/wei/models.py:199
+msgid "clothing cut"
+msgstr "coupe de vêtement"
+
+#: apps/wei/models.py:212
+msgid "clothing size"
+msgstr "taille de vêtement"
+
+#: apps/wei/models.py:218 templates/wei/weimembership_form.html:65
 msgid "health issues"
 msgstr "problèmes de santé"
 
-#: apps/wei/models.py:201 templates/wei/weimembership_form.html:68
+#: apps/wei/models.py:223 templates/wei/weimembership_form.html:68
 msgid "emergency contact name"
 msgstr "Nom du contact en cas d'urgence"
 
-#: apps/wei/models.py:206 templates/wei/weimembership_form.html:71
+#: apps/wei/models.py:228 templates/wei/weimembership_form.html:71
 msgid "emergency contact phone"
 msgstr "Téléphone du contact en cas d'urgence"
 
-#: apps/wei/models.py:211 templates/wei/weimembership_form.html:74
+#: apps/wei/models.py:233 templates/wei/weimembership_form.html:74
 msgid ""
 "Register on the mailing list to stay informed of the events of the campus (1 "
 "mail/week)"
@@ -1343,7 +1351,7 @@ msgstr ""
 "S'inscrire sur la liste de diffusion pour rester informé des événements sur "
 "le campus (1 mail par semaine)"
 
-#: apps/wei/models.py:216 templates/wei/weimembership_form.html:77
+#: apps/wei/models.py:238 templates/wei/weimembership_form.html:77
 msgid ""
 "Register on the mailing list to stay informed of the sport events of the "
 "campus (1 mail/week)"
@@ -1351,7 +1359,7 @@ msgstr ""
 "S'inscrire sur la liste de diffusion pour rester informé des actualités "
 "sportives sur le campus (1 mail par semaine)"
 
-#: apps/wei/models.py:221 templates/wei/weimembership_form.html:80
+#: apps/wei/models.py:243 templates/wei/weimembership_form.html:80
 msgid ""
 "Register on the mailing list to stay informed of the art events of the "
 "campus (1 mail/week)"
@@ -1359,19 +1367,19 @@ msgstr ""
 "S'inscrire sur la liste de diffusion pour rester informé des actualités "
 "artistiques sur le campus (1 mail par semaine)"
 
-#: apps/wei/models.py:226 templates/wei/weimembership_form.html:56
+#: apps/wei/models.py:248 templates/wei/weimembership_form.html:56
 msgid "first year"
 msgstr "première année"
 
-#: apps/wei/models.py:227
+#: apps/wei/models.py:249
 msgid "Tells if the user is new in the school."
 msgstr "Indique si l'utilisateur est nouveau dans l'école."
 
-#: apps/wei/models.py:232
+#: apps/wei/models.py:254
 msgid "registration information"
 msgstr "informations sur l'inscription"
 
-#: apps/wei/models.py:233
+#: apps/wei/models.py:255
 msgid ""
 "Information about the registration (buses for old members, survey fot the "
 "new members), encoded in JSON"
@@ -1379,27 +1387,27 @@ msgstr ""
 "Informations sur l'inscription (bus pour les 2A+, questionnaire pour les "
 "1A), encodées en JSON"
 
-#: apps/wei/models.py:264
+#: apps/wei/models.py:286
 msgid "WEI User"
 msgstr "Participant au WEI"
 
-#: apps/wei/models.py:265
+#: apps/wei/models.py:287
 msgid "WEI Users"
 msgstr "Participants au WEI"
 
-#: apps/wei/models.py:285
+#: apps/wei/models.py:307
 msgid "team"
 msgstr "équipe"
 
-#: apps/wei/models.py:295
+#: apps/wei/models.py:317
 msgid "WEI registration"
 msgstr "inscription au WEI"
 
-#: apps/wei/models.py:299
+#: apps/wei/models.py:321
 msgid "WEI membership"
 msgstr "adhésion au WEI"
 
-#: apps/wei/models.py:300
+#: apps/wei/models.py:322
 msgid "WEI memberships"
 msgstr "adhésions au WEI"
 
@@ -1425,23 +1433,23 @@ msgstr "Nombre de membres"
 msgid "members"
 msgstr "adhérents"
 
-#: apps/wei/views.py:201
+#: apps/wei/views.py:203
 msgid "Find WEI Membership"
 msgstr "Trouver une adhésion au WEI"
 
-#: apps/wei/views.py:236
+#: apps/wei/views.py:238
 msgid "Find WEI Registration"
 msgstr "Trouver une inscription au WEI"
 
-#: apps/wei/views.py:445 templates/wei/weiclub_info.html:62
+#: apps/wei/views.py:447 templates/wei/weiclub_info.html:62
 msgid "Register 1A"
 msgstr "Inscrire un 1A"
 
-#: apps/wei/views.py:466 apps/wei/views.py:535
+#: apps/wei/views.py:468 apps/wei/views.py:537
 msgid "This user is already registered to this WEI."
 msgstr "Cette personne est déjà inscrite au WEI."
 
-#: apps/wei/views.py:471
+#: apps/wei/views.py:473
 msgid ""
 "This user can't be in her/his first year since he/she has already participed "
 "to a WEI."
@@ -1449,23 +1457,23 @@ msgstr ""
 "Cet utilisateur ne peut pas être en première année puisqu'iel a déjà "
 "participé à un WEI."
 
-#: apps/wei/views.py:499 templates/wei/weiclub_info.html:65
+#: apps/wei/views.py:501 templates/wei/weiclub_info.html:65
 msgid "Register 2A+"
 msgstr "Inscrire un 2A+"
 
-#: apps/wei/views.py:517 apps/wei/views.py:604
+#: apps/wei/views.py:519 apps/wei/views.py:606
 msgid "You already opened an account in the Société générale."
 msgstr "Vous avez déjà ouvert un compte auprès de la société générale."
 
-#: apps/wei/views.py:664
+#: apps/wei/views.py:666
 msgid "You don't have the right to delete this WEI registration."
 msgstr "Vous n'avez pas la permission de supprimer cette inscription au WEI."
 
-#: apps/wei/views.py:763
+#: apps/wei/views.py:765
 msgid "This user didn't give her/his caution check."
 msgstr "Cet utilisateur n'a pas donné son chèque de caution."
 
-#: apps/wei/views.py:837 apps/wei/views.py:857 apps/wei/views.py:867
+#: apps/wei/views.py:839 apps/wei/views.py:859 apps/wei/views.py:869
 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12
 #: templates/wei/survey_end.html:12
 msgid "Survey WEI"
diff --git a/templates/wei/weimembership_form.html b/templates/wei/weimembership_form.html
index 995b6c1a..d33c3de7 100644
--- a/templates/wei/weimembership_form.html
+++ b/templates/wei/weimembership_form.html
@@ -59,6 +59,12 @@
                 <dt class="col-xl-6">{% trans 'gender'|capfirst %}</dt>
                 <dd class="col-xl-6">{{ registration.gender }}</dd>
 
+                <dt class="col-xl-6">{% trans 'clothing cut'|capfirst %}</dt>
+                <dd class="col-xl-6">{{ registration.clothing_cut }}</dd>
+
+                <dt class="col-xl-6">{% trans 'clothing size'|capfirst %}</dt>
+                <dd class="col-xl-6">{{ registration.clothing_size }}</dd>
+
                 <dt class="col-xl-6">{% trans 'birth date'|capfirst %}</dt>
                 <dd class="col-xl-6">{{ registration.birth_date }}</dd>
 

From 3a4145e4d9bfcdb443ff7c9da7c39efa7b947bbb Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Tue, 28 Jul 2020 20:56:22 +0200
Subject: [PATCH 29/77] Woops, roles didn't have the permissions

---
 apps/permission/fixtures/initial.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index 59c9a560..2131ee7b 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -2495,7 +2495,9 @@
 				110,
 				111,
 				112,
-				113
+				113,
+				130,
+				131
 			]
 		}
 	},
@@ -2574,7 +2576,9 @@
 				101,
 				108,
 				109,
-				114
+				114,
+				128,
+				130
 			]
 		}
 	},

From f597b6dbd89ee63bcfef91b917d34f5e2842f782 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Tue, 28 Jul 2020 23:16:38 +0200
Subject: [PATCH 30/77] Prevent creating club when there exists an alias that
 is similar to the name of the club

---
 apps/member/forms.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/member/forms.py b/apps/member/forms.py
index 4bf3b738..9dc818b4 100644
--- a/apps/member/forms.py
+++ b/apps/member/forms.py
@@ -5,7 +5,7 @@ from django import forms
 from django.contrib.auth.forms import AuthenticationForm
 from django.contrib.auth.models import User
 from django.utils.translation import gettext_lazy as _
-from note.models import NoteSpecial
+from note.models import NoteSpecial, Alias
 from note_kfet.inputs import Autocomplete, AmountInput, DatePickerInput
 from permission.models import PermissionMask, Role
 
@@ -38,6 +38,15 @@ class ProfileForm(forms.ModelForm):
 
 
 class ClubForm(forms.ModelForm):
+    def clean(self):
+        cleaned_data = super().clean()
+
+        if not self.instance.pk:    # Creating a club
+            if Alias.objects.filter(normalized_name=Alias.normalize(self.cleaned_data["name"])).exists():
+                self.add_error('name', _("An alias with a similar name already exists."))
+
+        return cleaned_data
+
     class Meta:
         model = Club
         fields = '__all__'

From d455c5c53372e517957c0c167c08eb31a2273220 Mon Sep 17 00:00:00 2001
From: Alexandre Iooss <erdnaxe@crans.org>
Date: Wed, 29 Jul 2020 10:14:57 +0200
Subject: [PATCH 31/77] Add banner to warn when debug mode is active

---
 templates/base.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/base.html b/templates/base.html
index bf3def59..872fde06 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -77,6 +77,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
     {% block extracss %}{% endblock %}
 </head>
 <body class="d-flex w-100 h-100 flex-column">
+{% if debug %}<div style="background:#ffeeba;text-align:center">Mode DEBUG activé.</div>{% endif %}
 <main class="mb-auto">
     <nav class="navbar navbar-expand-md navbar-light bg-light fixed-navbar shadow-sm">
         <a class="navbar-brand" href="/">{{ request.site.name }}</a>

From b8a88eeda4e9e5b58883ecd2ae473aff71de6f53 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Wed, 29 Jul 2020 11:38:59 +0200
Subject: [PATCH 32/77] Only staff with good permission mask can visit Django
 Admin

---
 apps/member/admin.py                  |   8 +-
 apps/note/admin.py                    |  20 +++--
 apps/permission/admin.py              |   7 +-
 apps/permission/backends.py           |   6 +-
 apps/permission/templatetags/perms.py |  17 ++--
 apps/treasury/admin.py                |   7 +-
 apps/wei/admin.py                     |  15 ++--
 locale/de/LC_MESSAGES/django.po       | 119 ++++++++++++-------------
 locale/fr/LC_MESSAGES/django.po       | 122 +++++++++++++-------------
 note_kfet/admin.py                    |  25 ++++++
 note_kfet/urls.py                     |   5 +-
 templates/base.html                   |   2 +-
 templates/registration/login.html     |   5 +-
 13 files changed, 196 insertions(+), 162 deletions(-)
 create mode 100644 note_kfet/admin.py

diff --git a/apps/member/admin.py b/apps/member/admin.py
index 2e50e8dc..76edb762 100644
--- a/apps/member/admin.py
+++ b/apps/member/admin.py
@@ -5,6 +5,7 @@ from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.models import User
 
+from note_kfet.admin import admin_site
 from .forms import ProfileForm
 from .models import Club, Membership, Profile
 
@@ -33,9 +34,8 @@ class CustomUserAdmin(UserAdmin):
 
 
 # Update Django User with profile
-admin.site.unregister(User)
-admin.site.register(User, CustomUserAdmin)
+admin_site.register(User, CustomUserAdmin)
 
 # Add other models
-admin.site.register(Club)
-admin.site.register(Membership)
+admin_site.register(Club)
+admin_site.register(Membership)
diff --git a/apps/note/admin.py b/apps/note/admin.py
index dc6470d2..96823d2b 100644
--- a/apps/note/admin.py
+++ b/apps/note/admin.py
@@ -6,6 +6,8 @@ from django.utils.translation import gettext_lazy as _
 from polymorphic.admin import PolymorphicChildModelAdmin, \
     PolymorphicChildModelFilter, PolymorphicParentModelAdmin
 
+from note_kfet.admin import admin_site
+
 from .models.notes import Alias, Note, NoteClub, NoteSpecial, NoteUser
 from .models.transactions import Transaction, TemplateCategory, TransactionTemplate, \
     RecurrentTransaction, MembershipTransaction, SpecialTransaction
@@ -19,7 +21,7 @@ class AliasInlines(admin.TabularInline):
     model = Alias
 
 
-@admin.register(Note)
+@admin.register(Note, site=admin_site)
 class NoteAdmin(PolymorphicParentModelAdmin):
     """
     Parent regrouping all note types as children
@@ -42,7 +44,7 @@ class NoteAdmin(PolymorphicParentModelAdmin):
     search_fields = ['alias__name']
 
 
-@admin.register(NoteClub)
+@admin.register(NoteClub, site=admin_site)
 class NoteClubAdmin(PolymorphicChildModelAdmin):
     """
     Child for a club note, see NoteAdmin
@@ -66,7 +68,7 @@ class NoteClubAdmin(PolymorphicChildModelAdmin):
         return False
 
 
-@admin.register(NoteSpecial)
+@admin.register(NoteSpecial, site=admin_site)
 class NoteSpecialAdmin(PolymorphicChildModelAdmin):
     """
     Child for a special note, see NoteAdmin
@@ -74,7 +76,7 @@ class NoteSpecialAdmin(PolymorphicChildModelAdmin):
     readonly_fields = ('balance',)
 
 
-@admin.register(NoteUser)
+@admin.register(NoteUser, site=admin_site)
 class NoteUserAdmin(PolymorphicChildModelAdmin):
     """
     Child for an user note, see NoteAdmin
@@ -97,7 +99,7 @@ class NoteUserAdmin(PolymorphicChildModelAdmin):
         return False
 
 
-@admin.register(Transaction)
+@admin.register(Transaction, site=admin_site)
 class TransactionAdmin(PolymorphicParentModelAdmin):
     """
     Admin customisation for Transaction
@@ -138,21 +140,21 @@ class TransactionAdmin(PolymorphicParentModelAdmin):
         return []
 
 
-@admin.register(MembershipTransaction)
+@admin.register(MembershipTransaction, site=admin_site)
 class MembershipTransactionAdmin(PolymorphicChildModelAdmin):
     """
     Admin customisation for MembershipTransaction
     """
 
 
-@admin.register(SpecialTransaction)
+@admin.register(SpecialTransaction, site=admin_site)
 class SpecialTransactionAdmin(PolymorphicChildModelAdmin):
     """
     Admin customisation for SpecialTransaction
     """
 
 
-@admin.register(TransactionTemplate)
+@admin.register(TransactionTemplate, site=admin_site)
 class TransactionTemplateAdmin(admin.ModelAdmin):
     """
     Admin customisation for TransactionTemplate
@@ -170,7 +172,7 @@ class TransactionTemplateAdmin(admin.ModelAdmin):
     poly_destination.short_description = _('destination')
 
 
-@admin.register(TemplateCategory)
+@admin.register(TemplateCategory, site=admin_site)
 class TemplateCategoryAdmin(admin.ModelAdmin):
     """
     Admin customisation for TransactionTemplate
diff --git a/apps/permission/admin.py b/apps/permission/admin.py
index 41e59695..7d189c94 100644
--- a/apps/permission/admin.py
+++ b/apps/permission/admin.py
@@ -3,10 +3,11 @@
 
 from django.contrib import admin
 
+from note_kfet.admin import admin_site
 from .models import Permission, PermissionMask, Role
 
 
-@admin.register(PermissionMask)
+@admin.register(PermissionMask, site=admin_site)
 class PermissionMaskAdmin(admin.ModelAdmin):
     """
     Admin customisation for PermissionMask
@@ -14,7 +15,7 @@ class PermissionMaskAdmin(admin.ModelAdmin):
     list_display = ('description', 'rank', )
 
 
-@admin.register(Permission)
+@admin.register(Permission, site=admin_site)
 class PermissionAdmin(admin.ModelAdmin):
     """
     Admin customisation for Permission
@@ -22,7 +23,7 @@ class PermissionAdmin(admin.ModelAdmin):
     list_display = ('type', 'model', 'field', 'mask', 'description', )
 
 
-@admin.register(Role)
+@admin.register(Role, site=admin_site)
 class RoleAdmin(admin.ModelAdmin):
     """
     Admin customisation for Role
diff --git a/apps/permission/backends.py b/apps/permission/backends.py
index 374e67e6..c1291a2f 100644
--- a/apps/permission/backends.py
+++ b/apps/permission/backends.py
@@ -42,7 +42,7 @@ class PermissionBackend(ModelBackend):
 
         for membership in memberships:
             for role in membership.roles.all():
-                for perm in role.permissions.filter(type=t, mask__rank__lte=get_current_session().get("permission_mask", 42)).all():
+                for perm in role.permissions.filter(type=t, mask__rank__lte=get_current_session().get("permission_mask", -1)).all():
                     if not perm.permanent:
                         if membership.date_start > timezone.now().date() or membership.date_end < timezone.now().date():
                             continue
@@ -101,7 +101,7 @@ class PermissionBackend(ModelBackend):
             # Anonymous users can't do anything
             return Q(pk=-1)
 
-        if user.is_superuser and get_current_session().get("permission_mask", 42) >= 42:
+        if user.is_superuser and get_current_session().get("permission_mask", -1) >= 42:
             # Superusers have all rights
             return Q()
 
@@ -137,7 +137,7 @@ class PermissionBackend(ModelBackend):
         if sess is not None and sess.session_key is None:
             return False
 
-        if user_obj.is_superuser and get_current_session().get("permission_mask", 42) >= 42:
+        if user_obj.is_superuser and get_current_session().get("permission_mask", -1) >= 42:
             return True
 
         if obj is None:
diff --git a/apps/permission/templatetags/perms.py b/apps/permission/templatetags/perms.py
index 101be6e7..335721a1 100644
--- a/apps/permission/templatetags/perms.py
+++ b/apps/permission/templatetags/perms.py
@@ -1,6 +1,7 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+from django.contrib.auth.models import AnonymousUser
 from django.contrib.contenttypes.models import ContentType
 from django.template.defaultfilters import stringfilter
 from django import template
@@ -16,9 +17,9 @@ def not_empty_model_list(model_name):
     """
     user = get_current_authenticated_user()
     session = get_current_session()
-    if user is None:
+    if user is None or isinstance(user, AnonymousUser):
         return False
-    elif user.is_superuser and session.get("permission_mask", 0) >= 42:
+    elif user.is_superuser and session.get("permission_mask", -1) >= 42:
         return True
     qs = model_list(model_name)
     return qs.exists()
@@ -31,9 +32,9 @@ def not_empty_model_change_list(model_name):
     """
     user = get_current_authenticated_user()
     session = get_current_session()
-    if user is None:
+    if user is None or isinstance(user, AnonymousUser):
         return False
-    elif user.is_superuser and session.get("permission_mask", 0) >= 42:
+    elif user.is_superuser and session.get("permission_mask", -1) >= 42:
         return True
     qs = model_list(model_name, "change")
     return qs.exists()
@@ -45,11 +46,11 @@ def model_list(model_name, t="view", fetch=True):
     Return the queryset of all visible instances of the given model.
     """
     user = get_current_authenticated_user()
-    if user is None:
-        return False
     spl = model_name.split(".")
     ct = ContentType.objects.get(app_label=spl[0], model=spl[1])
     qs = ct.model_class().objects.filter(PermissionBackend.filter_queryset(user, ct, t))
+    if user is None or isinstance(user, AnonymousUser):
+        return qs.none()
     if fetch:
         qs = qs.all()
     return qs
@@ -73,9 +74,9 @@ def can_create_transaction():
     """
     user = get_current_authenticated_user()
     session = get_current_session()
-    if user is None:
+    if user is None or isinstance(user, AnonymousUser):
         return False
-    elif user.is_superuser and session.get("permission_mask", 0) >= 42:
+    elif user.is_superuser and session.get("permission_mask", -1) >= 42:
         return True
     if session.get("can_create_transaction", None):
         return session.get("can_create_transaction", None) == 1
diff --git a/apps/treasury/admin.py b/apps/treasury/admin.py
index 9c8aaf2e..e1b597b9 100644
--- a/apps/treasury/admin.py
+++ b/apps/treasury/admin.py
@@ -3,10 +3,11 @@
 
 from django.contrib import admin
 
+from note_kfet.admin import admin_site
 from .models import RemittanceType, Remittance, SogeCredit
 
 
-@admin.register(RemittanceType)
+@admin.register(RemittanceType, site=admin_site)
 class RemittanceTypeAdmin(admin.ModelAdmin):
     """
     Admin customisation for RemiitanceType
@@ -14,7 +15,7 @@ class RemittanceTypeAdmin(admin.ModelAdmin):
     list_display = ('note', )
 
 
-@admin.register(Remittance)
+@admin.register(Remittance, site=admin_site)
 class RemittanceAdmin(admin.ModelAdmin):
     """
     Admin customisation for Remittance
@@ -27,4 +28,4 @@ class RemittanceAdmin(admin.ModelAdmin):
         return not obj.closed and super().has_change_permission(request, obj)
 
 
-admin.site.register(SogeCredit)
+admin_site.register(SogeCredit)
diff --git a/apps/wei/admin.py b/apps/wei/admin.py
index f93a44ed..a3e1d546 100644
--- a/apps/wei/admin.py
+++ b/apps/wei/admin.py
@@ -1,13 +1,12 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from django.contrib import admin
-
+from note_kfet.admin import admin_site
 from .models import WEIClub, WEIRegistration, WEIMembership, WEIRole, Bus, BusTeam
 
-admin.site.register(WEIClub)
-admin.site.register(WEIRegistration)
-admin.site.register(WEIMembership)
-admin.site.register(WEIRole)
-admin.site.register(Bus)
-admin.site.register(BusTeam)
+admin_site.register(WEIClub)
+admin_site.register(WEIRegistration)
+admin_site.register(WEIMembership)
+admin_site.register(WEIRole)
+admin_site.register(Bus)
+admin_site.register(BusTeam)
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index b9d24fd5..1e22bacd 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-28 20:42+0200\n"
+"POT-Creation-Date: 2020-07-29 10:56+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -186,12 +186,12 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: apps/activity/tables.py:77 apps/member/forms.py:83
+#: apps/activity/tables.py:77 apps/member/forms.py:92
 #: apps/registration/forms.py:64 apps/treasury/forms.py:120
 msgid "Last name"
 msgstr ""
 
-#: apps/activity/tables.py:79 apps/member/forms.py:88
+#: apps/activity/tables.py:79 apps/member/forms.py:97
 #: apps/registration/forms.py:69 apps/treasury/forms.py:122
 #: templates/note/transaction_form.html:126
 msgid "First name"
@@ -205,7 +205,7 @@ msgstr ""
 msgid "Balance"
 msgstr ""
 
-#: apps/activity/views.py:47 templates/base.html:120
+#: apps/activity/views.py:47 templates/base.html:121
 msgid "Activities"
 msgstr ""
 
@@ -279,31 +279,35 @@ msgstr ""
 msgid "member"
 msgstr ""
 
-#: apps/member/forms.py:62 apps/registration/forms.py:44
+#: apps/member/forms.py:46 apps/member/views.py:77
+msgid "An alias with a similar name already exists."
+msgstr ""
+
+#: apps/member/forms.py:71 apps/registration/forms.py:44
 msgid "Inscription paid by Société Générale"
 msgstr ""
 
-#: apps/member/forms.py:64 apps/registration/forms.py:46
+#: apps/member/forms.py:73 apps/registration/forms.py:46
 msgid "Check this case is the Société Générale paid the inscription."
 msgstr ""
 
-#: apps/member/forms.py:69 apps/registration/forms.py:51
+#: apps/member/forms.py:78 apps/registration/forms.py:51
 msgid "Credit type"
 msgstr ""
 
-#: apps/member/forms.py:70 apps/registration/forms.py:52
+#: apps/member/forms.py:79 apps/registration/forms.py:52
 msgid "No credit"
 msgstr ""
 
-#: apps/member/forms.py:72
+#: apps/member/forms.py:81
 msgid "You can credit the note of the user."
 msgstr ""
 
-#: apps/member/forms.py:76 apps/registration/forms.py:57
+#: apps/member/forms.py:85 apps/registration/forms.py:57
 msgid "Credit amount"
 msgstr ""
 
-#: apps/member/forms.py:93 apps/registration/forms.py:74
+#: apps/member/forms.py:102 apps/registration/forms.py:74
 #: apps/treasury/forms.py:124 templates/note/transaction_form.html:132
 msgid "Bank"
 msgstr ""
@@ -541,14 +545,10 @@ msgstr ""
 
 #: apps/member/views.py:67 templates/member/profile_info.html:47
 #: templates/registration/future_profile_detail.html:48
-#: templates/wei/weimembership_form.html:124
+#: templates/wei/weimembership_form.html:130
 msgid "Update Profile"
 msgstr ""
 
-#: apps/member/views.py:77
-msgid "An alias with a similar name already exists."
-msgstr ""
-
 #: apps/member/views.py:183
 msgid "Search user"
 msgstr ""
@@ -760,7 +760,7 @@ msgid ""
 msgstr ""
 
 #: apps/note/models/transactions.py:228
-#: templates/activity/activity_entry.html:13 templates/base.html:98
+#: templates/activity/activity_entry.html:13 templates/base.html:99
 #: templates/note/transaction_form.html:19
 #: templates/note/transaction_form.html:140
 msgid "Transfer"
@@ -831,7 +831,7 @@ msgstr ""
 msgid "Transfer money"
 msgstr ""
 
-#: apps/note/views.py:140 templates/base.html:93
+#: apps/note/views.py:140 templates/base.html:94
 msgid "Consumptions"
 msgstr ""
 
@@ -975,7 +975,7 @@ msgid ""
 "The entered amount is not enough for the memberships, should be at least {}"
 msgstr ""
 
-#: apps/treasury/apps.py:12 templates/base.html:125
+#: apps/treasury/apps.py:12 templates/base.html:126
 msgid "Treasury"
 msgstr ""
 
@@ -1173,7 +1173,7 @@ msgid "No"
 msgstr ""
 
 #: apps/wei/apps.py:10 apps/wei/models.py:48 apps/wei/models.py:49
-#: apps/wei/models.py:60 apps/wei/models.py:166 templates/base.html:130
+#: apps/wei/models.py:60 apps/wei/models.py:166 templates/base.html:131
 msgid "WEI"
 msgstr ""
 
@@ -1267,7 +1267,7 @@ msgstr ""
 msgid "Caution check given"
 msgstr ""
 
-#: apps/wei/models.py:180 templates/wei/weimembership_form.html:62
+#: apps/wei/models.py:180 templates/wei/weimembership_form.html:68
 msgid "birth date"
 msgstr ""
 
@@ -1287,39 +1287,39 @@ msgstr ""
 msgid "gender"
 msgstr ""
 
-#: apps/wei/models.py:199
+#: apps/wei/models.py:199 templates/wei/weimembership_form.html:62
 msgid "clothing cut"
 msgstr ""
 
-#: apps/wei/models.py:212
+#: apps/wei/models.py:212 templates/wei/weimembership_form.html:65
 msgid "clothing size"
 msgstr ""
 
-#: apps/wei/models.py:218 templates/wei/weimembership_form.html:65
+#: apps/wei/models.py:218 templates/wei/weimembership_form.html:71
 msgid "health issues"
 msgstr ""
 
-#: apps/wei/models.py:223 templates/wei/weimembership_form.html:68
+#: apps/wei/models.py:223 templates/wei/weimembership_form.html:74
 msgid "emergency contact name"
 msgstr ""
 
-#: apps/wei/models.py:228 templates/wei/weimembership_form.html:71
+#: apps/wei/models.py:228 templates/wei/weimembership_form.html:77
 msgid "emergency contact phone"
 msgstr ""
 
-#: apps/wei/models.py:233 templates/wei/weimembership_form.html:74
+#: apps/wei/models.py:233 templates/wei/weimembership_form.html:80
 msgid ""
 "Register on the mailing list to stay informed of the events of the campus (1 "
 "mail/week)"
 msgstr ""
 
-#: apps/wei/models.py:238 templates/wei/weimembership_form.html:77
+#: apps/wei/models.py:238 templates/wei/weimembership_form.html:83
 msgid ""
 "Register on the mailing list to stay informed of the sport events of the "
 "campus (1 mail/week)"
 msgstr ""
 
-#: apps/wei/models.py:243 templates/wei/weimembership_form.html:80
+#: apps/wei/models.py:243 templates/wei/weimembership_form.html:86
 msgid ""
 "Register on the mailing list to stay informed of the art events of the "
 "campus (1 mail/week)"
@@ -1550,27 +1550,27 @@ msgstr ""
 msgid "The ENS Paris-Saclay BDE note."
 msgstr ""
 
-#: templates/base.html:103
+#: templates/base.html:104
 msgid "Users"
 msgstr ""
 
-#: templates/base.html:108
+#: templates/base.html:109
 msgid "Clubs"
 msgstr ""
 
-#: templates/base.html:114
+#: templates/base.html:115
 msgid "Registrations"
 msgstr ""
 
-#: templates/base.html:134
+#: templates/base.html:135
 msgid "Rights"
 msgstr ""
 
-#: templates/base.html:138
+#: templates/base.html:139
 msgid "Administration"
 msgstr ""
 
-#: templates/base.html:177
+#: templates/base.html:178
 msgid ""
 "Your e-mail address is not validated. Please check your mail inbox and click "
 "on the validation link."
@@ -1850,8 +1850,8 @@ msgid "Validate account"
 msgstr ""
 
 #: templates/registration/future_profile_detail.html:64
-#: templates/wei/weimembership_form.html:134
-#: templates/wei/weimembership_form.html:192
+#: templates/wei/weimembership_form.html:140
+#: templates/wei/weimembership_form.html:198
 msgid "Validate registration"
 msgstr ""
 
@@ -1872,7 +1872,7 @@ msgid "Log in again"
 msgstr ""
 
 #: templates/registration/login.html:7 templates/registration/login.html:8
-#: templates/registration/login.html:21
+#: templates/registration/login.html:22
 #: templates/registration/password_reset_complete.html:10
 msgid "Log in"
 msgstr ""
@@ -1881,10 +1881,11 @@ msgstr ""
 #, python-format
 msgid ""
 "You are authenticated as %(username)s, but are not authorized to access this "
-"page. Would you like to login to a different account?"
+"page. Would you like to login to a different account, or with a higher "
+"permission mask?"
 msgstr ""
 
-#: templates/registration/login.html:22
+#: templates/registration/login.html:23
 msgid "Forgotten your password or username?"
 msgstr ""
 
@@ -2204,64 +2205,64 @@ msgstr ""
 msgid "ENS year"
 msgstr ""
 
-#: templates/wei/weimembership_form.html:83
+#: templates/wei/weimembership_form.html:89
 msgid "Payment from Société générale"
 msgstr ""
 
-#: templates/wei/weimembership_form.html:87
+#: templates/wei/weimembership_form.html:93
 msgid "Suggested bus from the survey:"
 msgstr ""
 
-#: templates/wei/weimembership_form.html:92
+#: templates/wei/weimembership_form.html:98
 msgid "Raw survey information"
 msgstr ""
 
-#: templates/wei/weimembership_form.html:102
+#: templates/wei/weimembership_form.html:108
 msgid "The algorithm didn't run."
 msgstr ""
 
-#: templates/wei/weimembership_form.html:105
+#: templates/wei/weimembership_form.html:111
 msgid "caution check given"
 msgstr ""
 
-#: templates/wei/weimembership_form.html:109
+#: templates/wei/weimembership_form.html:115
 msgid "preferred bus"
 msgstr ""
 
-#: templates/wei/weimembership_form.html:112
+#: templates/wei/weimembership_form.html:118
 msgid "preferred team"
 msgstr ""
 
-#: templates/wei/weimembership_form.html:115
+#: templates/wei/weimembership_form.html:121
 msgid "preferred roles"
 msgstr ""
 
-#: templates/wei/weimembership_form.html:122
+#: templates/wei/weimembership_form.html:128
 #: templates/wei/weiregistration_confirm_delete.html:31
 msgid "Update registration"
 msgstr ""
 
-#: templates/wei/weimembership_form.html:138
+#: templates/wei/weimembership_form.html:144
 msgid "The registration is already validated and can't be unvalidated."
 msgstr ""
 
-#: templates/wei/weimembership_form.html:139
+#: templates/wei/weimembership_form.html:145
 msgid "The user joined the bus"
 msgstr ""
 
-#: templates/wei/weimembership_form.html:140
+#: templates/wei/weimembership_form.html:146
 msgid "in the team"
 msgstr ""
 
-#: templates/wei/weimembership_form.html:141
+#: templates/wei/weimembership_form.html:147
 msgid "in no team (staff)"
 msgstr ""
 
-#: templates/wei/weimembership_form.html:141
+#: templates/wei/weimembership_form.html:147
 msgid "with the following roles:"
 msgstr ""
 
-#: templates/wei/weimembership_form.html:146
+#: templates/wei/weimembership_form.html:152
 msgid ""
 "\n"
 "                            The WEI will be paid by Société générale. The "
@@ -2273,7 +2274,7 @@ msgid ""
 "                        "
 msgstr ""
 
-#: templates/wei/weimembership_form.html:156
+#: templates/wei/weimembership_form.html:162
 #, python-format
 msgid ""
 "\n"
@@ -2282,15 +2283,15 @@ msgid ""
 "                            "
 msgstr ""
 
-#: templates/wei/weimembership_form.html:163
+#: templates/wei/weimembership_form.html:169
 msgid "The note has enough money, the registration is possible."
 msgstr ""
 
-#: templates/wei/weimembership_form.html:170
+#: templates/wei/weimembership_form.html:176
 msgid "The user didn't give her/his caution check."
 msgstr ""
 
-#: templates/wei/weimembership_form.html:178
+#: templates/wei/weimembership_form.html:184
 #, python-format
 msgid ""
 "\n"
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 62abc447..b53f558a 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-28 20:42+0200\n"
+"POT-Creation-Date: 2020-07-29 10:56+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -187,12 +187,12 @@ msgstr "supprimer"
 msgid "Type"
 msgstr "Type"
 
-#: apps/activity/tables.py:77 apps/member/forms.py:83
+#: apps/activity/tables.py:77 apps/member/forms.py:92
 #: apps/registration/forms.py:64 apps/treasury/forms.py:120
 msgid "Last name"
 msgstr "Nom de famille"
 
-#: apps/activity/tables.py:79 apps/member/forms.py:88
+#: apps/activity/tables.py:79 apps/member/forms.py:97
 #: apps/registration/forms.py:69 apps/treasury/forms.py:122
 #: templates/note/transaction_form.html:126
 msgid "First name"
@@ -206,7 +206,7 @@ msgstr "Note"
 msgid "Balance"
 msgstr "Solde du compte"
 
-#: apps/activity/views.py:47 templates/base.html:120
+#: apps/activity/views.py:47 templates/base.html:121
 msgid "Activities"
 msgstr "Activités"
 
@@ -280,31 +280,35 @@ msgstr "journaux de modifications"
 msgid "member"
 msgstr "adhérent"
 
-#: apps/member/forms.py:62 apps/registration/forms.py:44
+#: apps/member/forms.py:46 apps/member/views.py:77
+msgid "An alias with a similar name already exists."
+msgstr "Un alias avec un nom similaire existe déjà."
+
+#: apps/member/forms.py:71 apps/registration/forms.py:44
 msgid "Inscription paid by Société Générale"
 msgstr "Inscription payée par la Société générale"
 
-#: apps/member/forms.py:64 apps/registration/forms.py:46
+#: apps/member/forms.py:73 apps/registration/forms.py:46
 msgid "Check this case is the Société Générale paid the inscription."
 msgstr "Cochez cette case si la Société Générale a payé l'inscription."
 
-#: apps/member/forms.py:69 apps/registration/forms.py:51
+#: apps/member/forms.py:78 apps/registration/forms.py:51
 msgid "Credit type"
 msgstr "Type de rechargement"
 
-#: apps/member/forms.py:70 apps/registration/forms.py:52
+#: apps/member/forms.py:79 apps/registration/forms.py:52
 msgid "No credit"
 msgstr "Pas de rechargement"
 
-#: apps/member/forms.py:72
+#: apps/member/forms.py:81
 msgid "You can credit the note of the user."
 msgstr "Vous pouvez créditer la note de l'utisateur avant l'adhésion."
 
-#: apps/member/forms.py:76 apps/registration/forms.py:57
+#: apps/member/forms.py:85 apps/registration/forms.py:57
 msgid "Credit amount"
 msgstr "Montant à créditer"
 
-#: apps/member/forms.py:93 apps/registration/forms.py:74
+#: apps/member/forms.py:102 apps/registration/forms.py:74
 #: apps/treasury/forms.py:124 templates/note/transaction_form.html:132
 msgid "Bank"
 msgstr "Banque"
@@ -546,14 +550,10 @@ msgstr "Cette adresse doit être valide."
 
 #: apps/member/views.py:67 templates/member/profile_info.html:47
 #: templates/registration/future_profile_detail.html:48
-#: templates/wei/weimembership_form.html:124
+#: templates/wei/weimembership_form.html:130
 msgid "Update Profile"
 msgstr "Modifier le profil"
 
-#: apps/member/views.py:77
-msgid "An alias with a similar name already exists."
-msgstr "Un alias avec un nom similaire existe déjà."
-
 #: apps/member/views.py:183
 msgid "Search user"
 msgstr "Chercher un utilisateur"
@@ -770,7 +770,7 @@ msgstr ""
 "note de destination n'est pas active."
 
 #: apps/note/models/transactions.py:228
-#: templates/activity/activity_entry.html:13 templates/base.html:98
+#: templates/activity/activity_entry.html:13 templates/base.html:99
 #: templates/note/transaction_form.html:19
 #: templates/note/transaction_form.html:140
 msgid "Transfer"
@@ -843,7 +843,7 @@ msgstr "Éditer"
 msgid "Transfer money"
 msgstr "Transférer de l'argent"
 
-#: apps/note/views.py:140 templates/base.html:93
+#: apps/note/views.py:140 templates/base.html:94
 msgid "Consumptions"
 msgstr "Consommations"
 
@@ -1002,7 +1002,7 @@ msgstr ""
 "Le montant crédité est trop faible pour adhérer, il doit être au minimum de "
 "{}"
 
-#: apps/treasury/apps.py:12 templates/base.html:125
+#: apps/treasury/apps.py:12 templates/base.html:126
 msgid "Treasury"
 msgstr "Trésorerie"
 
@@ -1202,7 +1202,7 @@ msgid "No"
 msgstr "Non"
 
 #: apps/wei/apps.py:10 apps/wei/models.py:48 apps/wei/models.py:49
-#: apps/wei/models.py:60 apps/wei/models.py:166 templates/base.html:130
+#: apps/wei/models.py:60 apps/wei/models.py:166 templates/base.html:131
 msgid "WEI"
 msgstr "WEI"
 
@@ -1303,7 +1303,7 @@ msgstr "Crédit de la Société générale"
 msgid "Caution check given"
 msgstr "Chèque de caution donné"
 
-#: apps/wei/models.py:180 templates/wei/weimembership_form.html:62
+#: apps/wei/models.py:180 templates/wei/weimembership_form.html:68
 msgid "birth date"
 msgstr "date de naissance"
 
@@ -1323,27 +1323,27 @@ msgstr "Non-binaire"
 msgid "gender"
 msgstr "genre"
 
-#: apps/wei/models.py:199
+#: apps/wei/models.py:199 templates/wei/weimembership_form.html:62
 msgid "clothing cut"
 msgstr "coupe de vêtement"
 
-#: apps/wei/models.py:212
+#: apps/wei/models.py:212 templates/wei/weimembership_form.html:65
 msgid "clothing size"
 msgstr "taille de vêtement"
 
-#: apps/wei/models.py:218 templates/wei/weimembership_form.html:65
+#: apps/wei/models.py:218 templates/wei/weimembership_form.html:71
 msgid "health issues"
 msgstr "problèmes de santé"
 
-#: apps/wei/models.py:223 templates/wei/weimembership_form.html:68
+#: apps/wei/models.py:223 templates/wei/weimembership_form.html:74
 msgid "emergency contact name"
 msgstr "Nom du contact en cas d'urgence"
 
-#: apps/wei/models.py:228 templates/wei/weimembership_form.html:71
+#: apps/wei/models.py:228 templates/wei/weimembership_form.html:77
 msgid "emergency contact phone"
 msgstr "Téléphone du contact en cas d'urgence"
 
-#: apps/wei/models.py:233 templates/wei/weimembership_form.html:74
+#: apps/wei/models.py:233 templates/wei/weimembership_form.html:80
 msgid ""
 "Register on the mailing list to stay informed of the events of the campus (1 "
 "mail/week)"
@@ -1351,7 +1351,7 @@ msgstr ""
 "S'inscrire sur la liste de diffusion pour rester informé des événements sur "
 "le campus (1 mail par semaine)"
 
-#: apps/wei/models.py:238 templates/wei/weimembership_form.html:77
+#: apps/wei/models.py:238 templates/wei/weimembership_form.html:83
 msgid ""
 "Register on the mailing list to stay informed of the sport events of the "
 "campus (1 mail/week)"
@@ -1359,7 +1359,7 @@ msgstr ""
 "S'inscrire sur la liste de diffusion pour rester informé des actualités "
 "sportives sur le campus (1 mail par semaine)"
 
-#: apps/wei/models.py:243 templates/wei/weimembership_form.html:80
+#: apps/wei/models.py:243 templates/wei/weimembership_form.html:86
 msgid ""
 "Register on the mailing list to stay informed of the art events of the "
 "campus (1 mail/week)"
@@ -1605,29 +1605,29 @@ msgstr "Toutes les activités"
 msgid "The ENS Paris-Saclay BDE note."
 msgstr "La note du BDE de l'ENS Paris-Saclay."
 
-#: templates/base.html:103
+#: templates/base.html:104
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: templates/base.html:108
+#: templates/base.html:109
 msgid "Clubs"
 msgstr "Clubs"
 
-#: templates/base.html:114
+#: templates/base.html:115
 msgid "Registrations"
 msgstr "Inscriptions"
 
-#: templates/base.html:134
+#: templates/base.html:135
 msgid "Rights"
 msgstr "Droits"
 
-#: templates/base.html:138
+#: templates/base.html:139
 #, fuzzy
 #| msgid "registration"
 msgid "Administration"
 msgstr "inscription"
 
-#: templates/base.html:177
+#: templates/base.html:178
 msgid ""
 "Your e-mail address is not validated. Please check your mail inbox and click "
 "on the validation link."
@@ -1916,8 +1916,8 @@ msgid "Validate account"
 msgstr "Valider le compte"
 
 #: templates/registration/future_profile_detail.html:64
-#: templates/wei/weimembership_form.html:134
-#: templates/wei/weimembership_form.html:192
+#: templates/wei/weimembership_form.html:140
+#: templates/wei/weimembership_form.html:198
 msgid "Validate registration"
 msgstr "Valider l'inscription"
 
@@ -1938,7 +1938,7 @@ msgid "Log in again"
 msgstr "Se connecter à nouveau"
 
 #: templates/registration/login.html:7 templates/registration/login.html:8
-#: templates/registration/login.html:21
+#: templates/registration/login.html:22
 #: templates/registration/password_reset_complete.html:10
 msgid "Log in"
 msgstr "Se connecter"
@@ -1947,12 +1947,14 @@ msgstr "Se connecter"
 #, python-format
 msgid ""
 "You are authenticated as %(username)s, but are not authorized to access this "
-"page. Would you like to login to a different account?"
+"page. Would you like to login to a different account, or with a higher "
+"permission mask?"
 msgstr ""
 "Vous êtes connecté en tant que %(username)s, mais vous n'avez le droit "
-"d'accéder à cette page. Voulez vous essayer avec un autre compte ?"
+"d'accéder à cette page. Voulez-vous essayer avec un autre compte, ou avec "
+"un masque de permissions plus fort ?"
 
-#: templates/registration/login.html:22
+#: templates/registration/login.html:23
 msgid "Forgotten your password or username?"
 msgstr "Mot de passe ou pseudo oublié ?"
 
@@ -2309,64 +2311,64 @@ msgstr "Vérifier l'inscription"
 msgid "ENS year"
 msgstr "Année à l'ENS"
 
-#: templates/wei/weimembership_form.html:83
+#: templates/wei/weimembership_form.html:89
 msgid "Payment from Société générale"
 msgstr "Paiement de la Société générale"
 
-#: templates/wei/weimembership_form.html:87
+#: templates/wei/weimembership_form.html:93
 msgid "Suggested bus from the survey:"
 msgstr "Bus suggéré par le sondage :"
 
-#: templates/wei/weimembership_form.html:92
+#: templates/wei/weimembership_form.html:98
 msgid "Raw survey information"
 msgstr "Informations brutes du sondage"
 
-#: templates/wei/weimembership_form.html:102
+#: templates/wei/weimembership_form.html:108
 msgid "The algorithm didn't run."
 msgstr "L'algorithme n'a pas été exécuté."
 
-#: templates/wei/weimembership_form.html:105
+#: templates/wei/weimembership_form.html:111
 msgid "caution check given"
 msgstr "chèque de caution donné"
 
-#: templates/wei/weimembership_form.html:109
+#: templates/wei/weimembership_form.html:115
 msgid "preferred bus"
 msgstr "bus préféré"
 
-#: templates/wei/weimembership_form.html:112
+#: templates/wei/weimembership_form.html:118
 msgid "preferred team"
 msgstr "équipe préférée"
 
-#: templates/wei/weimembership_form.html:115
+#: templates/wei/weimembership_form.html:121
 msgid "preferred roles"
 msgstr "rôles préférés"
 
-#: templates/wei/weimembership_form.html:122
+#: templates/wei/weimembership_form.html:128
 #: templates/wei/weiregistration_confirm_delete.html:31
 msgid "Update registration"
 msgstr "Mettre à jour l'inscription"
 
-#: templates/wei/weimembership_form.html:138
+#: templates/wei/weimembership_form.html:144
 msgid "The registration is already validated and can't be unvalidated."
 msgstr "L'inscription a déjà été validée et ne peut pas être dévalidée."
 
-#: templates/wei/weimembership_form.html:139
+#: templates/wei/weimembership_form.html:145
 msgid "The user joined the bus"
 msgstr "L'utilisateur a rejoint le bus"
 
-#: templates/wei/weimembership_form.html:140
+#: templates/wei/weimembership_form.html:146
 msgid "in the team"
 msgstr "dans l'équipe"
 
-#: templates/wei/weimembership_form.html:141
+#: templates/wei/weimembership_form.html:147
 msgid "in no team (staff)"
 msgstr "dans aucune équipe (staff)"
 
-#: templates/wei/weimembership_form.html:141
+#: templates/wei/weimembership_form.html:147
 msgid "with the following roles:"
 msgstr "avec les rôles suivants :"
 
-#: templates/wei/weimembership_form.html:146
+#: templates/wei/weimembership_form.html:152
 msgid ""
 "\n"
 "                            The WEI will be paid by Société générale. The "
@@ -2385,7 +2387,7 @@ msgstr ""
 "aura validé la création du compte, ou bien changer de moyen de paiement.\n"
 "                    "
 
-#: templates/wei/weimembership_form.html:156
+#: templates/wei/weimembership_form.html:162
 #, python-format
 msgid ""
 "\n"
@@ -2398,15 +2400,15 @@ msgstr ""
 "L'inscription va échouer.\n"
 "                            "
 
-#: templates/wei/weimembership_form.html:163
+#: templates/wei/weimembership_form.html:169
 msgid "The note has enough money, the registration is possible."
 msgstr "La note a assez d'argent, l'inscription est possible."
 
-#: templates/wei/weimembership_form.html:170
+#: templates/wei/weimembership_form.html:176
 msgid "The user didn't give her/his caution check."
 msgstr "L'utilisateur n'a pas donné son chèque de caution."
 
-#: templates/wei/weimembership_form.html:178
+#: templates/wei/weimembership_form.html:184
 #, python-format
 msgid ""
 "\n"
diff --git a/note_kfet/admin.py b/note_kfet/admin.py
new file mode 100644
index 00000000..67ac872e
--- /dev/null
+++ b/note_kfet/admin.py
@@ -0,0 +1,25 @@
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from django.contrib.admin import AdminSite
+from django.contrib.sites.admin import Site, SiteAdmin
+
+from member.views import CustomLoginView
+from .middlewares import get_current_session
+
+
+class StrongAdminSite(AdminSite):
+    def has_permission(self, request):
+        """
+        Authorize only staff that have the correct permission mask
+        """
+        session = get_current_session()
+        return request.user.is_active and request.user.is_staff and session.get("permission_mask", -1) >= 42
+
+    def login(self, request, extra_context=None):
+        return CustomLoginView.as_view()(request)
+
+
+# Instantiate admin site and register some defaults
+admin_site = StrongAdminSite()
+admin_site.register(Site, SiteAdmin)
diff --git a/note_kfet/urls.py b/note_kfet/urls.py
index 9717087a..24ab075d 100644
--- a/note_kfet/urls.py
+++ b/note_kfet/urls.py
@@ -3,13 +3,14 @@
 
 from django.conf import settings
 from django.conf.urls.static import static
-from django.contrib import admin
 from django.urls import path, include
 from django.views.defaults import bad_request, permission_denied, page_not_found, server_error
 from django.views.generic import RedirectView
 
 from member.views import CustomLoginView
 
+from .admin import admin_site
+
 urlpatterns = [
     # Dev so redirect to something random
     path('', RedirectView.as_view(pattern_name='note:transfer'), name='index'),
@@ -25,7 +26,7 @@ urlpatterns = [
     # Include Django Contrib and Core routers
     path('i18n/', include('django.conf.urls.i18n')),
     path('admin/doc/', include('django.contrib.admindocs.urls')),
-    path('admin/', admin.site.urls, name="admin"),
+    path('admin/', admin_site.urls, name="admin"),
     path('accounts/login/', CustomLoginView.as_view()),
     path('accounts/', include('django.contrib.auth.urls')),
     path('api/', include('api.urls')),
diff --git a/templates/base.html b/templates/base.html
index 872fde06..9aa34437 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -134,7 +134,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 <li class="nav-item active">
                     <a class="nav-link" href="{% url 'permission:rights' %}"><i class="fas fa-balance-scale"></i> {% trans 'Rights' %}</a>
                 </li>
-                {% if user.is_staff %}
+                {% if user.is_staff and ""|has_perm:user %}
                     <li class="nav-item active">
                         <a data-turbolinks="false" class="nav-link" href="{% url 'admin:index' %}"><i class="fas fa-user-cog"></i> {% trans 'Administration' %}</a>
                     </li>
diff --git a/templates/registration/login.html b/templates/registration/login.html
index 32e54e00..87354721 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -10,9 +10,10 @@ SPDX-License-Identifier: GPL-2.0-or-later
 {% block content %}
     {% if user.is_authenticated %}
         <p class="errornote">
-            {% blocktrans trimmed %}
+            {% blocktrans trimmed with username=request.user.username %}
                 You are authenticated as {{ username }}, but are not authorized to
-                access this page. Would you like to login to a different account?
+                access this page. Would you like to login to a different account,
+                or with a higher permission mask?
             {% endblocktrans %}
         </p>
     {% endif %}

From 5c933013585e4c6165cf52d1e634c79ade55a67b Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Wed, 29 Jul 2020 11:42:27 +0200
Subject: [PATCH 33/77] Beta banner is dismissible

---
 templates/base.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/templates/base.html b/templates/base.html
index 9aa34437..744a8714 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -179,7 +179,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
             </div>
         {% endif %}
         {% block contenttitle %}<h1>{{ title }}</h1>{% endblock %}
-        <div class="alert alert-warning">
+        <div class="alert alert-warning alert-dismissible">
+            <button type="button" class="close" data-dismiss="alert" aria-hidden="true">&#215;</button>
             Attention : la Note Kfet 2020 est en phase de beta. Des fonctionnalités pourront être rajoutées d'ici à la version
             finale, et des bugs peuvent survenir. Pour tout problème, merci d'envoyer un mail à l'adresse
             <a href="mailto:&#110;&#111;&#116;&#101;&#107;&#102;&#101;&#116;&#50;&#48;&#50;&#48;&commat;&#108;&#105;&#115;&#116;&#115;&period;&#99;&#114;&#97;&#110;&#115;&period;&#111;&#114;&#103;">

From 750bdcb2c55ee239e7270b6ebc8c8784ca58a52a Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Wed, 29 Jul 2020 12:25:53 +0200
Subject: [PATCH 34/77] Treasurers can of course click on buttons. Fix PATCH
 requests on the API

---
 apps/permission/fixtures/initial.json | 27 +++++++++++++++++++++++++--
 apps/permission/permissions.py        |  4 ++--
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index 2131ee7b..0c128f5c 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -2119,6 +2119,22 @@
 			"description": "Update the clothing size field of my own WEI Registration"
 		}
 	},
+	{
+		"model": "permission.permission",
+		"pk": 132,
+		"fields": {
+			"model": [
+				"note",
+				"recurrenttransaction"
+			],
+			"query": "{}",
+			"type": "add",
+			"mask": 2,
+			"field": "",
+			"permanent": false,
+			"description": "Create any recurrent transaction"
+		}
+	},
 	{
 		"model": "permission.role",
 		"pk": 1,
@@ -2279,7 +2295,8 @@
 				69,
 				71,
 				72,
-				73
+				73,
+				132
 			]
 		}
 	},
@@ -2415,7 +2432,13 @@
 				123,
 				124,
 				125,
-				126
+				126,
+				127,
+				128,
+				129,
+				130,
+				131,
+				132
 			]
 		}
 	},
diff --git a/apps/permission/permissions.py b/apps/permission/permissions.py
index 40321567..03f07992 100644
--- a/apps/permission/permissions.py
+++ b/apps/permission/permissions.py
@@ -19,8 +19,8 @@ class StrongDjangoObjectPermissions(DjangoObjectPermissions):
         'OPTIONS': [],
         'HEAD': [],
         'POST': ['%(app_label)s.add_%(model_name)s'],
-        'PUT': ['%(app_label)s.change_%(model_name)s'],
-        'PATCH': ['%(app_label)s.change_%(model_name)s'],
+        'PUT': [],      # ['%(app_label)s.change_%(model_name)s'],
+        'PATCH': [],    # ['%(app_label)s.change_%(model_name)s'],
         'DELETE': ['%(app_label)s.delete_%(model_name)s'],
     }
 

From 4549255198b8ad8215ac50be0c4f7ee45ae897ec Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Wed, 29 Jul 2020 17:42:06 +0200
Subject: [PATCH 35/77] Treasurers can update invalidity reason

---
 apps/permission/fixtures/initial.json | 42 +++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index 0c128f5c..ac0ae0eb 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -2135,6 +2135,38 @@
 			"description": "Create any recurrent transaction"
 		}
 	},
+	{
+		"model": "permission.permission",
+		"pk": 133,
+		"fields": {
+			"model": [
+				"note",
+				"transaction"
+			],
+			"query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], [\"OR\", {\"amount__lte\": {\"F\": [\"ADD\", [\"F\", \"source__balance\"], 5000]}}, {\"valid\": true}]]",
+			"type": "change",
+			"mask": 1,
+			"field": "invalidity_reason",
+			"permanent": false,
+			"description": "Update invalidity reason of a club transaction if possible"
+		}
+	},
+	{
+		"model": "permission.permission",
+		"pk": 134,
+		"fields": {
+			"model": [
+				"note",
+				"transaction"
+			],
+			"query": "{}",
+			"type": "change",
+			"mask": 1,
+			"field": "invalidity_reason",
+			"permanent": false,
+			"description": "Update invalidity reason of a transaction"
+		}
+	},
 	{
 		"model": "permission.role",
 		"pk": 1,
@@ -2243,7 +2275,8 @@
 				60,
 				61,
 				62,
-				127
+				127,
+				133
 			]
 		}
 	},
@@ -2296,7 +2329,8 @@
 				71,
 				72,
 				73,
-				132
+				132,
+				134
 			]
 		}
 	},
@@ -2438,7 +2472,9 @@
 				129,
 				130,
 				131,
-				132
+				132,
+				133,
+				134
 			]
 		}
 	},

From fa9159bb28402df92e954dbe2f3cac1ce9cd0eca Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Wed, 29 Jul 2020 17:50:14 +0200
Subject: [PATCH 36/77] Alias pk != Note pk

---
 apps/note/api/serializers.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/note/api/serializers.py b/apps/note/api/serializers.py
index c61ccd42..c6681ee7 100644
--- a/apps/note/api/serializers.py
+++ b/apps/note/api/serializers.py
@@ -118,9 +118,8 @@ class ConsumerSerializer(serializers.ModelSerializer):
         """
         # If the user has no right to see the note, then we only display the note identifier
         if PermissionBackend.check_perm(get_current_authenticated_user(), "note.view_note", obj.note):
-            print(obj.pk)
             return NotePolymorphicSerializer().to_representation(obj.note)
-        return dict(id=obj.id)
+        return dict(id=obj.note.id)
 
     def get_email_confirmed(self, obj):
         if isinstance(obj.note, NoteUser):

From 5a91cac08d478d0f9156fe8290deab661a26a403 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Wed, 29 Jul 2020 18:37:42 +0200
Subject: [PATCH 37/77] Add permissions to see clubs and users

---
 apps/permission/fixtures/initial.json | 136 +++++++++++++++++++++++++-
 1 file changed, 131 insertions(+), 5 deletions(-)

diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index ac0ae0eb..0372fa3e 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -131,7 +131,7 @@
 			"type": "change",
 			"mask": 1,
 			"field": "last_login",
-			"permanent": false,
+			"permanent": true,
 			"description": "Change myself's last login"
 		}
 	},
@@ -211,7 +211,7 @@
 			"type": "delete",
 			"mask": 1,
 			"field": "",
-			"permanent": false,
+			"permanent": true,
 			"description": "Delete API Token"
 		}
 	},
@@ -369,7 +369,7 @@
 			],
 			"query": "{\"pk\": [\"club\", \"pk\"]}",
 			"type": "view",
-			"mask": 1,
+			"mask": 3,
 			"field": "",
 			"permanent": false,
 			"description": "View club infos"
@@ -2167,6 +2167,118 @@
 			"description": "Update invalidity reason of a transaction"
 		}
 	},
+	{
+		"model": "permission.permission",
+		"pk": 135,
+		"fields": {
+			"model": [
+				"auth",
+				"user"
+			],
+			"query": "{}",
+			"type": "view",
+			"mask": 3,
+			"field": "",
+			"permanent": false,
+			"description": "View any user"
+		}
+	},
+	{
+		"model": "permission.permission",
+		"pk": 136,
+		"fields": {
+			"model": [
+				"auth",
+				"user"
+			],
+			"query": "{}",
+			"type": "change",
+			"mask": 3,
+			"field": "",
+			"permanent": false,
+			"description": "Change any user"
+		}
+	},
+	{
+		"model": "permission.permission",
+		"pk": 137,
+		"fields": {
+			"model": [
+				"member",
+				"profile"
+			],
+			"query": "{}",
+			"type": "view",
+			"mask": 3,
+			"field": "",
+			"permanent": false,
+			"description": "View any profile"
+		}
+	},
+	{
+		"model": "permission.permission",
+		"pk": 138,
+		"fields": {
+			"model": [
+				"member",
+				"profile"
+			],
+			"query": "{}",
+			"type": "change",
+			"mask": 3,
+			"field": "",
+			"permanent": false,
+			"description": "Change any profile"
+		}
+	},
+	{
+		"model": "permission.permission",
+		"pk": 139,
+		"fields": {
+			"model": [
+				"member",
+				"club"
+			],
+			"query": "{}",
+			"type": "view",
+			"mask": 3,
+			"field": "",
+			"permanent": false,
+			"description": "View any club"
+		}
+	},
+	{
+		"model": "permission.permission",
+		"pk": 140,
+		"fields": {
+			"model": [
+				"member",
+				"club"
+			],
+			"query": "{}",
+			"type": "change",
+			"mask": 3,
+			"field": "",
+			"permanent": false,
+			"description": "Change any club"
+		}
+	},
+	{
+		"model": "permission.permission",
+		"pk": 141,
+		"fields": {
+			"model": [
+				"member",
+				"club"
+			],
+			"query": "{}",
+			"type": "add",
+			"mask": 3,
+			"field": "",
+			"permanent": false,
+			"description": "Create any club"
+		}
+	},
 	{
 		"model": "permission.role",
 		"pk": 1,
@@ -2330,7 +2442,14 @@
 				72,
 				73,
 				132,
-				134
+				134,
+				135,
+				136,
+				137,
+				138,
+				139,
+				140,
+				141
 			]
 		}
 	},
@@ -2474,7 +2593,14 @@
 				131,
 				132,
 				133,
-				134
+				134,
+				135,
+				136,
+				137,
+				138,
+				139,
+				140,
+				141
 			]
 		}
 	},

From 20011db37ed2558bc6edb6d54fd64884b7d8dd4d Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Wed, 29 Jul 2020 19:03:11 +0200
Subject: [PATCH 38/77] Order aliases by name

---
 apps/note/api/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/note/api/views.py b/apps/note/api/views.py
index d5ad8129..22470461 100644
--- a/apps/note/api/views.py
+++ b/apps/note/api/views.py
@@ -109,7 +109,7 @@ class ConsumerViewSet(ReadOnlyProtectedModelViewSet):
         queryset = queryset.filter(
             Q(name__regex="^" + alias)
             | Q(normalized_name__regex="^" + Alias.normalize(alias))
-            | Q(normalized_name__regex="^" + alias.lower()))
+            | Q(normalized_name__regex="^" + alias.lower())).order_by('name')
 
         return queryset
 

From c9e68ca66b50844288c70a5ca401dfbd180c7593 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Wed, 29 Jul 2020 19:12:16 +0200
Subject: [PATCH 39/77] Duplicated permission

---
 apps/permission/fixtures/initial.json | 30 ++++++---------------------
 1 file changed, 6 insertions(+), 24 deletions(-)

diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index 0372fa3e..29b99066 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -2186,22 +2186,6 @@
 	{
 		"model": "permission.permission",
 		"pk": 136,
-		"fields": {
-			"model": [
-				"auth",
-				"user"
-			],
-			"query": "{}",
-			"type": "change",
-			"mask": 3,
-			"field": "",
-			"permanent": false,
-			"description": "Change any user"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 137,
 		"fields": {
 			"model": [
 				"member",
@@ -2217,7 +2201,7 @@
 	},
 	{
 		"model": "permission.permission",
-		"pk": 138,
+		"pk": 137,
 		"fields": {
 			"model": [
 				"member",
@@ -2233,7 +2217,7 @@
 	},
 	{
 		"model": "permission.permission",
-		"pk": 139,
+		"pk": 138,
 		"fields": {
 			"model": [
 				"member",
@@ -2249,7 +2233,7 @@
 	},
 	{
 		"model": "permission.permission",
-		"pk": 140,
+		"pk": 139,
 		"fields": {
 			"model": [
 				"member",
@@ -2265,7 +2249,7 @@
 	},
 	{
 		"model": "permission.permission",
-		"pk": 141,
+		"pk": 140,
 		"fields": {
 			"model": [
 				"member",
@@ -2448,8 +2432,7 @@
 				137,
 				138,
 				139,
-				140,
-				141
+				140
 			]
 		}
 	},
@@ -2599,8 +2582,7 @@
 				137,
 				138,
 				139,
-				140,
-				141
+				140
 			]
 		}
 	},

From cbd36f110af81dea4f1222190cfa8f8bb4bb7d88 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Wed, 29 Jul 2020 19:13:29 +0200
Subject: [PATCH 40/77] Another uplicated permission

---
 apps/permission/fixtures/initial.json | 26 ++++----------------------
 1 file changed, 4 insertions(+), 22 deletions(-)

diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index 29b99066..0391c095 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -2202,22 +2202,6 @@
 	{
 		"model": "permission.permission",
 		"pk": 137,
-		"fields": {
-			"model": [
-				"member",
-				"profile"
-			],
-			"query": "{}",
-			"type": "change",
-			"mask": 3,
-			"field": "",
-			"permanent": false,
-			"description": "Change any profile"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 138,
 		"fields": {
 			"model": [
 				"member",
@@ -2233,7 +2217,7 @@
 	},
 	{
 		"model": "permission.permission",
-		"pk": 139,
+		"pk": 138,
 		"fields": {
 			"model": [
 				"member",
@@ -2249,7 +2233,7 @@
 	},
 	{
 		"model": "permission.permission",
-		"pk": 140,
+		"pk": 139,
 		"fields": {
 			"model": [
 				"member",
@@ -2431,8 +2415,7 @@
 				136,
 				137,
 				138,
-				139,
-				140
+				139
 			]
 		}
 	},
@@ -2581,8 +2564,7 @@
 				136,
 				137,
 				138,
-				139,
-				140
+				139
 			]
 		}
 	},

From 224ef5b2f034a14f6c4064eb147b5c97860383a2 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Wed, 29 Jul 2020 19:37:40 +0200
Subject: [PATCH 41/77] Allow users to have complicated username

---
 apps/member/forms.py | 13 +++++++++++++
 apps/member/views.py |  5 +++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/apps/member/forms.py b/apps/member/forms.py
index 9dc818b4..49537838 100644
--- a/apps/member/forms.py
+++ b/apps/member/forms.py
@@ -20,6 +20,19 @@ class CustomAuthenticationForm(AuthenticationForm):
     )
 
 
+class UserForm(forms.ModelForm):
+    def _get_validation_exclusions(self):
+        # Django usernames can only contain letters, numbers, @, ., +, - and _.
+        # We want to allow users to have uncommon and unpractical usernames:
+        # That is their problem, and we have normalized aliases for us.
+        return super()._get_validation_exclusions() + ["username"]
+
+    class Meta:
+        model = User
+        fields = ('first_name', 'last_name', 'username', 'email',)
+
+
+
 class ProfileForm(forms.ModelForm):
     """
     A form for the extras field provided by the :model:`member.Profile` model.
diff --git a/apps/member/views.py b/apps/member/views.py
index 9d6b34e5..02cf69db 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -26,7 +26,7 @@ from permission.models import Role
 from permission.views import ProtectQuerysetMixin
 from wei.models import WEIClub
 
-from .forms import ProfileForm, ClubForm, MembershipForm, CustomAuthenticationForm
+from .forms import ProfileForm, ClubForm, MembershipForm, CustomAuthenticationForm, UserForm
 from .models import Club, Membership
 from .tables import ClubTable, UserTable, MembershipTable
 
@@ -47,9 +47,10 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
     Update the user information.
     """
     model = User
-    fields = ['first_name', 'last_name', 'username', 'email']
+    form_class = UserForm
     template_name = 'member/profile_update.html'
     context_object_name = 'user_object'
+
     profile_form = ProfileForm
 
     def get_context_data(self, **kwargs):

From da1063862ee72bd807a479b331709cd35eaca565 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Wed, 29 Jul 2020 22:55:12 +0200
Subject: [PATCH 42/77] Merge gift + transfer interfaces

---
 locale/de/LC_MESSAGES/django.po      | 62 ++++++++---------
 locale/fr/LC_MESSAGES/django.po      | 68 +++++++++----------
 static/js/base.js                    |  2 +
 static/js/transfer.js                | 99 +++++++++-------------------
 templates/note/transaction_form.html | 10 +--
 5 files changed, 104 insertions(+), 137 deletions(-)

diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 1e22bacd..8618d9e5 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-29 10:56+0200\n"
+"POT-Creation-Date: 2020-07-29 22:54+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -186,12 +186,12 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: apps/activity/tables.py:77 apps/member/forms.py:92
+#: apps/activity/tables.py:77 apps/member/forms.py:105
 #: apps/registration/forms.py:64 apps/treasury/forms.py:120
 msgid "Last name"
 msgstr ""
 
-#: apps/activity/tables.py:79 apps/member/forms.py:97
+#: apps/activity/tables.py:79 apps/member/forms.py:110
 #: apps/registration/forms.py:69 apps/treasury/forms.py:122
 #: templates/note/transaction_form.html:126
 msgid "First name"
@@ -279,35 +279,35 @@ msgstr ""
 msgid "member"
 msgstr ""
 
-#: apps/member/forms.py:46 apps/member/views.py:77
+#: apps/member/forms.py:59 apps/member/views.py:78
 msgid "An alias with a similar name already exists."
 msgstr ""
 
-#: apps/member/forms.py:71 apps/registration/forms.py:44
+#: apps/member/forms.py:84 apps/registration/forms.py:44
 msgid "Inscription paid by Société Générale"
 msgstr ""
 
-#: apps/member/forms.py:73 apps/registration/forms.py:46
+#: apps/member/forms.py:86 apps/registration/forms.py:46
 msgid "Check this case is the Société Générale paid the inscription."
 msgstr ""
 
-#: apps/member/forms.py:78 apps/registration/forms.py:51
+#: apps/member/forms.py:91 apps/registration/forms.py:51
 msgid "Credit type"
 msgstr ""
 
-#: apps/member/forms.py:79 apps/registration/forms.py:52
+#: apps/member/forms.py:92 apps/registration/forms.py:52
 msgid "No credit"
 msgstr ""
 
-#: apps/member/forms.py:81
+#: apps/member/forms.py:94
 msgid "You can credit the note of the user."
 msgstr ""
 
-#: apps/member/forms.py:85 apps/registration/forms.py:57
+#: apps/member/forms.py:98 apps/registration/forms.py:57
 msgid "Credit amount"
 msgstr ""
 
-#: apps/member/forms.py:102 apps/registration/forms.py:74
+#: apps/member/forms.py:115 apps/registration/forms.py:74
 #: apps/treasury/forms.py:124 templates/note/transaction_form.html:132
 msgid "Bank"
 msgstr ""
@@ -509,7 +509,7 @@ msgstr ""
 msgid "fee"
 msgstr ""
 
-#: apps/member/models.py:303 apps/member/views.py:527 apps/wei/views.py:770
+#: apps/member/models.py:303 apps/member/views.py:528 apps/wei/views.py:770
 msgid "User is not a member of the parent club"
 msgstr ""
 
@@ -518,7 +518,7 @@ msgstr ""
 msgid "The role {role} does not apply to the club {club}."
 msgstr ""
 
-#: apps/member/models.py:321 apps/member/views.py:536
+#: apps/member/models.py:321 apps/member/views.py:537
 msgid "User is already a member of the club"
 msgstr ""
 
@@ -539,45 +539,45 @@ msgstr ""
 msgid "Renew"
 msgstr ""
 
-#: apps/member/views.py:64 apps/registration/forms.py:23
+#: apps/member/views.py:65 apps/registration/forms.py:23
 msgid "This address must be valid."
 msgstr ""
 
-#: apps/member/views.py:67 templates/member/profile_info.html:47
+#: apps/member/views.py:68 templates/member/profile_info.html:47
 #: templates/registration/future_profile_detail.html:48
 #: templates/wei/weimembership_form.html:130
 msgid "Update Profile"
 msgstr ""
 
-#: apps/member/views.py:183
+#: apps/member/views.py:184
 msgid "Search user"
 msgstr ""
 
-#: apps/member/views.py:522 apps/wei/views.py:761
+#: apps/member/views.py:523 apps/wei/views.py:761
 msgid ""
 "This user don't have enough money to join this club, and can't have a "
 "negative balance."
 msgstr ""
 
-#: apps/member/views.py:540
+#: apps/member/views.py:541
 msgid "The membership must start after {:%m-%d-%Y}."
 msgstr ""
 
-#: apps/member/views.py:545
+#: apps/member/views.py:546
 msgid "The membership must begin before {:%m-%d-%Y}."
 msgstr ""
 
-#: apps/member/views.py:562 apps/member/views.py:564 apps/member/views.py:566
+#: apps/member/views.py:563 apps/member/views.py:565 apps/member/views.py:567
 #: apps/registration/views.py:290 apps/registration/views.py:292
 #: apps/registration/views.py:294
 msgid "This field is required."
 msgstr ""
 
-#: apps/note/admin.py:120 apps/note/models/transactions.py:106
+#: apps/note/admin.py:122 apps/note/models/transactions.py:106
 msgid "source"
 msgstr ""
 
-#: apps/note/admin.py:128 apps/note/admin.py:170
+#: apps/note/admin.py:130 apps/note/admin.py:172
 #: apps/note/models/transactions.py:55 apps/note/models/transactions.py:119
 msgid "destination"
 msgstr ""
@@ -761,7 +761,7 @@ msgstr ""
 
 #: apps/note/models/transactions.py:228
 #: templates/activity/activity_entry.html:13 templates/base.html:99
-#: templates/note/transaction_form.html:19
+#: templates/note/transaction_form.html:15
 #: templates/note/transaction_form.html:140
 msgid "Transfer"
 msgstr ""
@@ -780,11 +780,11 @@ msgstr ""
 
 #: apps/note/models/transactions.py:277
 #: templates/activity/activity_entry.html:17
-#: templates/note/transaction_form.html:24
+#: templates/note/transaction_form.html:20
 msgid "Credit"
 msgstr ""
 
-#: apps/note/models/transactions.py:277 templates/note/transaction_form.html:28
+#: apps/note/models/transactions.py:277 templates/note/transaction_form.html:24
 msgid "Debit"
 msgstr ""
 
@@ -1522,7 +1522,7 @@ msgid "Guests list"
 msgstr ""
 
 #: templates/activity/activity_entry.html:22
-#: templates/note/transaction_form.html:33
+#: templates/note/transaction_form.html:29
 msgid "Entries"
 msgstr ""
 
@@ -1707,7 +1707,7 @@ msgstr ""
 msgid "Consum"
 msgstr ""
 
-#: templates/note/conso_form.html:39 templates/note/transaction_form.html:61
+#: templates/note/conso_form.html:39 templates/note/transaction_form.html:57
 #: templates/note/transaction_form.html:76
 msgid "Name or alias..."
 msgstr ""
@@ -1736,12 +1736,12 @@ msgstr ""
 msgid "Recent transactions history"
 msgstr ""
 
-#: templates/note/transaction_form.html:15
-msgid "Gift"
+#: templates/note/transaction_form.html:51
+msgid "Select emitters"
 msgstr ""
 
-#: templates/note/transaction_form.html:55
-msgid "Select emitters"
+#: templates/note/transaction_form.html:60
+msgid "I am the emitter"
 msgstr ""
 
 #: templates/note/transaction_form.html:70
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index b53f558a..16548d3b 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-29 10:56+0200\n"
+"POT-Creation-Date: 2020-07-29 22:54+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -187,12 +187,12 @@ msgstr "supprimer"
 msgid "Type"
 msgstr "Type"
 
-#: apps/activity/tables.py:77 apps/member/forms.py:92
+#: apps/activity/tables.py:77 apps/member/forms.py:105
 #: apps/registration/forms.py:64 apps/treasury/forms.py:120
 msgid "Last name"
 msgstr "Nom de famille"
 
-#: apps/activity/tables.py:79 apps/member/forms.py:97
+#: apps/activity/tables.py:79 apps/member/forms.py:110
 #: apps/registration/forms.py:69 apps/treasury/forms.py:122
 #: templates/note/transaction_form.html:126
 msgid "First name"
@@ -280,35 +280,35 @@ msgstr "journaux de modifications"
 msgid "member"
 msgstr "adhérent"
 
-#: apps/member/forms.py:46 apps/member/views.py:77
+#: apps/member/forms.py:59 apps/member/views.py:78
 msgid "An alias with a similar name already exists."
 msgstr "Un alias avec un nom similaire existe déjà."
 
-#: apps/member/forms.py:71 apps/registration/forms.py:44
+#: apps/member/forms.py:84 apps/registration/forms.py:44
 msgid "Inscription paid by Société Générale"
 msgstr "Inscription payée par la Société générale"
 
-#: apps/member/forms.py:73 apps/registration/forms.py:46
+#: apps/member/forms.py:86 apps/registration/forms.py:46
 msgid "Check this case is the Société Générale paid the inscription."
 msgstr "Cochez cette case si la Société Générale a payé l'inscription."
 
-#: apps/member/forms.py:78 apps/registration/forms.py:51
+#: apps/member/forms.py:91 apps/registration/forms.py:51
 msgid "Credit type"
 msgstr "Type de rechargement"
 
-#: apps/member/forms.py:79 apps/registration/forms.py:52
+#: apps/member/forms.py:92 apps/registration/forms.py:52
 msgid "No credit"
 msgstr "Pas de rechargement"
 
-#: apps/member/forms.py:81
+#: apps/member/forms.py:94
 msgid "You can credit the note of the user."
 msgstr "Vous pouvez créditer la note de l'utisateur avant l'adhésion."
 
-#: apps/member/forms.py:85 apps/registration/forms.py:57
+#: apps/member/forms.py:98 apps/registration/forms.py:57
 msgid "Credit amount"
 msgstr "Montant à créditer"
 
-#: apps/member/forms.py:102 apps/registration/forms.py:74
+#: apps/member/forms.py:115 apps/registration/forms.py:74
 #: apps/treasury/forms.py:124 templates/note/transaction_form.html:132
 msgid "Bank"
 msgstr "Banque"
@@ -514,7 +514,7 @@ msgstr "l'adhésion finit le"
 msgid "fee"
 msgstr "cotisation"
 
-#: apps/member/models.py:303 apps/member/views.py:527 apps/wei/views.py:770
+#: apps/member/models.py:303 apps/member/views.py:528 apps/wei/views.py:770
 msgid "User is not a member of the parent club"
 msgstr "L'utilisateur n'est pas membre du club parent"
 
@@ -523,7 +523,7 @@ msgstr "L'utilisateur n'est pas membre du club parent"
 msgid "The role {role} does not apply to the club {club}."
 msgstr "Le rôle {role} ne s'applique pas au club {club}."
 
-#: apps/member/models.py:321 apps/member/views.py:536
+#: apps/member/models.py:321 apps/member/views.py:537
 msgid "User is already a member of the club"
 msgstr "L'utilisateur est déjà membre du club"
 
@@ -544,21 +544,21 @@ msgstr "adhésions"
 msgid "Renew"
 msgstr "Renouveler"
 
-#: apps/member/views.py:64 apps/registration/forms.py:23
+#: apps/member/views.py:65 apps/registration/forms.py:23
 msgid "This address must be valid."
 msgstr "Cette adresse doit être valide."
 
-#: apps/member/views.py:67 templates/member/profile_info.html:47
+#: apps/member/views.py:68 templates/member/profile_info.html:47
 #: templates/registration/future_profile_detail.html:48
 #: templates/wei/weimembership_form.html:130
 msgid "Update Profile"
 msgstr "Modifier le profil"
 
-#: apps/member/views.py:183
+#: apps/member/views.py:184
 msgid "Search user"
 msgstr "Chercher un utilisateur"
 
-#: apps/member/views.py:522 apps/wei/views.py:761
+#: apps/member/views.py:523 apps/wei/views.py:761
 msgid ""
 "This user don't have enough money to join this club, and can't have a "
 "negative balance."
@@ -566,25 +566,25 @@ msgstr ""
 "Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne peut pas "
 "avoir un solde négatif."
 
-#: apps/member/views.py:540
+#: apps/member/views.py:541
 msgid "The membership must start after {:%m-%d-%Y}."
 msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}."
 
-#: apps/member/views.py:545
+#: apps/member/views.py:546
 msgid "The membership must begin before {:%m-%d-%Y}."
 msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}."
 
-#: apps/member/views.py:562 apps/member/views.py:564 apps/member/views.py:566
+#: apps/member/views.py:563 apps/member/views.py:565 apps/member/views.py:567
 #: apps/registration/views.py:290 apps/registration/views.py:292
 #: apps/registration/views.py:294
 msgid "This field is required."
 msgstr "Ce champ est requis."
 
-#: apps/note/admin.py:120 apps/note/models/transactions.py:106
+#: apps/note/admin.py:122 apps/note/models/transactions.py:106
 msgid "source"
 msgstr "source"
 
-#: apps/note/admin.py:128 apps/note/admin.py:170
+#: apps/note/admin.py:130 apps/note/admin.py:172
 #: apps/note/models/transactions.py:55 apps/note/models/transactions.py:119
 msgid "destination"
 msgstr "destination"
@@ -771,7 +771,7 @@ msgstr ""
 
 #: apps/note/models/transactions.py:228
 #: templates/activity/activity_entry.html:13 templates/base.html:99
-#: templates/note/transaction_form.html:19
+#: templates/note/transaction_form.html:15
 #: templates/note/transaction_form.html:140
 msgid "Transfer"
 msgstr "Virement"
@@ -790,11 +790,11 @@ msgstr "banque"
 
 #: apps/note/models/transactions.py:277
 #: templates/activity/activity_entry.html:17
-#: templates/note/transaction_form.html:24
+#: templates/note/transaction_form.html:20
 msgid "Credit"
 msgstr "Crédit"
 
-#: apps/note/models/transactions.py:277 templates/note/transaction_form.html:28
+#: apps/note/models/transactions.py:277 templates/note/transaction_form.html:24
 msgid "Debit"
 msgstr "Débit"
 
@@ -1577,7 +1577,7 @@ msgid "Guests list"
 msgstr "Liste des invités"
 
 #: templates/activity/activity_entry.html:22
-#: templates/note/transaction_form.html:33
+#: templates/note/transaction_form.html:29
 msgid "Entries"
 msgstr "Entrées"
 
@@ -1769,7 +1769,7 @@ msgstr "Il n'y a pas d'utilisateur trouvé avec cette entrée."
 msgid "Consum"
 msgstr "Consommer"
 
-#: templates/note/conso_form.html:39 templates/note/transaction_form.html:61
+#: templates/note/conso_form.html:39 templates/note/transaction_form.html:57
 #: templates/note/transaction_form.html:76
 msgid "Name or alias..."
 msgstr "Pseudo ou alias ..."
@@ -1798,14 +1798,14 @@ msgstr "Consommations doubles"
 msgid "Recent transactions history"
 msgstr "Historique des transactions récentes"
 
-#: templates/note/transaction_form.html:15
-msgid "Gift"
-msgstr "Don"
-
-#: templates/note/transaction_form.html:55
+#: templates/note/transaction_form.html:51
 msgid "Select emitters"
 msgstr "Sélection des émetteurs"
 
+#: templates/note/transaction_form.html:60
+msgid "I am the emitter"
+msgstr "Je suis l'émetteur"
+
 #: templates/note/transaction_form.html:70
 msgid "Select receivers"
 msgstr "Sélection des destinataires"
@@ -1951,8 +1951,8 @@ msgid ""
 "permission mask?"
 msgstr ""
 "Vous êtes connecté en tant que %(username)s, mais vous n'avez le droit "
-"d'accéder à cette page. Voulez-vous essayer avec un autre compte, ou avec "
-"un masque de permissions plus fort ?"
+"d'accéder à cette page. Voulez-vous essayer avec un autre compte, ou avec un "
+"masque de permissions plus fort ?"
 
 #: templates/registration/login.html:23
 msgid "Forgotten your password or username?"
diff --git a/static/js/base.js b/static/js/base.js
index 87a79af2..b03c1359 100644
--- a/static/js/base.js
+++ b/static/js/base.js
@@ -223,7 +223,9 @@ function autoCompleteNote(field_id, note_list_id, notes, notes_display, alias_pr
 
     // When the user type "Enter", the first alias is clicked
     field.keypress(function (event) {
+            console.log(notes);
         if (event.originalEvent.charCode === 13 && notes.length > 0) {
+            console.log(42);
             let li_obj = field.parent().find("ul li").first();
             displayNote(notes[0], li_obj.text(), user_note_field, profile_pic_field);
             li_obj.trigger("click");
diff --git a/static/js/transfer.js b/static/js/transfer.js
index 78a8ca08..97dad879 100644
--- a/static/js/transfer.js
+++ b/static/js/transfer.js
@@ -71,16 +71,6 @@ $(document).ready(function() {
     let source = $("#source_note");
     let dest = $("#dest_note");
 
-    $("#type_gift").click(function() {
-        $("#special_transaction_div").addClass('d-none');
-        source.attr('disabled', true);
-        source.val(username);
-        source.tooltip('hide');
-        $("#source_note_list").addClass('d-none');
-        dest.attr('disabled', false);
-        $("#dest_note_list").removeClass('d-none');
-    });
-
     $("#type_transfer").click(function() {
         $("#special_transaction_div").addClass('d-none');
         source.attr('disabled', false);
@@ -131,13 +121,11 @@ $(document).ready(function() {
                 dest.val(type);
         });
 
-    // Ensure we begin in gift mode. Removing these lines may cause problems when reloading.
-    let type_gift = $("#type_gift"); // Default mode
-    type_gift.removeAttr('checked');
-    $("#type_transfer").removeAttr('checked');
+    // Ensure we begin in transfer mode. Removing these lines may cause problems when reloading.
+    let type_transfer = $("#type_transfer"); // Default mode
+    type_transfer.removeAttr('checked');
     $("#type_credit").removeAttr('checked');
     $("#type_debit").removeAttr('checked');
-    $("label[for='type_gift']").attr('class', 'btn btn-sm btn-outline-primary');
     $("label[for='type_transfer']").attr('class', 'btn btn-sm btn-outline-primary');
     $("label[for='type_credit']").attr('class', 'btn btn-sm btn-outline-primary');
     $("label[for='type_debit']").attr('class', 'btn btn-sm btn-outline-primary');
@@ -145,62 +133,39 @@ $(document).ready(function() {
     if (location.hash)
         $("#type_" + location.hash.substr(1)).click();
     else
-        type_gift.click();
+        type_transfer.click();
     location.hash = "";
+
+    $("#source_me").click(function() {
+        // Shortcut to set the current user as the only emitter
+        reset();
+
+        let source_note = $("#source_note");
+        source_note.focus();
+        source_note.val(username);
+        let event = jQuery.Event("keyup");
+        event.originalEvent = {charCode: 0};
+        source_note.trigger(event);
+        console.log(sources.length);
+        let fill_note = function() {
+            if (sources.length === 0) {
+                setTimeout(fill_note, 100);
+                return;
+            }
+            event = jQuery.Event("keypress");
+            event.originalEvent = {charCode: 13};
+            source_note.trigger(event);
+
+            source_note.tooltip('hide');
+            source_note.val('');
+            $("#dest_note").focus();
+        };
+        fill_note();
+    });
 });
 
 $("#btn_transfer").click(function() {
-    if ($("#type_gift").is(':checked')) {
-        dests_notes_display.forEach(function (dest) {
-            $.post("/api/note/transaction/transaction/",
-                {
-                    "csrfmiddlewaretoken": CSRF_TOKEN,
-                    "quantity": dest.quantity,
-                    "amount": 100 * $("#amount").val(),
-                    "reason": $("#reason").val(),
-                    "valid": true,
-                    "polymorphic_ctype": TRANSFER_POLYMORPHIC_CTYPE,
-                    "resourcetype": "Transaction",
-                    "source": user_id,
-                    "destination": dest.note.id,
-                    "destination_alias": dest.name
-                }).done(function () {
-                    addMsg("Le transfert de "
-                        + pretty_money(dest.quantity * 100 * $("#amount").val()) + " de votre note "
-                        + " vers la note " + dest.name + " a été fait avec succès !", "success");
-
-                    reset();
-                }).fail(function () { // do it again but valid = false
-                    $.post("/api/note/transaction/transaction/",
-                    {
-                        "csrfmiddlewaretoken": CSRF_TOKEN,
-                        "quantity": dest.quantity,
-                        "amount": 100 * $("#amount").val(),
-                        "reason": $("#reason").val(),
-                        "valid": false,
-                        "invalidity_reason": "Solde insuffisant",
-                        "polymorphic_ctype": TRANSFER_POLYMORPHIC_CTYPE,
-                        "resourcetype": "Transaction",
-                        "source": user_id,
-                        "destination": dest.note.id,
-                        "destination_alias": dest.name
-                    }).done(function () {
-                        addMsg("Le transfert de "
-                            + pretty_money(dest.quantity * 100 * $("#amount").val()) + " de votre note "
-                            + " vers la note " + dest.name + " a échoué : Solde insuffisant", "danger");
-
-                        reset();
-                    }).fail(function (err) {
-                        addMsg("Le transfert de "
-                            + pretty_money(dest.quantity * 100 * $("#amount").val()) + " de votre note "
-                            + " vers la note " + dest.name + " a échoué : " + err.responseText, "danger");
-
-                    reset();
-                });
-            });
-        });
-    }
-    else if ($("#type_transfer").is(':checked')) {
+    if ($("#type_transfer").is(':checked')) {
         sources_notes_display.forEach(function (source) {
             dests_notes_display.forEach(function (dest) {
                 $.post("/api/note/transaction/transaction/",
diff --git a/templates/note/transaction_form.html b/templates/note/transaction_form.html
index c252f636..7757bad1 100644
--- a/templates/note/transaction_form.html
+++ b/templates/note/transaction_form.html
@@ -10,11 +10,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
     <div class="row">
         <div class="col-xl-12">
             <div class="btn-group btn-group-toggle" style="width: 100%; padding: 0 0 2em 0" data-toggle="buttons">
-                <label for="type_gift" class="btn btn-sm btn-outline-primary active">
-                    <input type="radio" name="transaction_type" id="type_gift" checked>
-                    {% trans "Gift" %}
-                </label>
-                <label for="type_transfer" class="btn btn-sm btn-outline-primary">
+                <label for="type_transfer" class="btn btn-sm btn-outline-primary active">
                     <input type="radio" name="transaction_type" id="type_transfer">
                     {% trans "Transfer" %}
                 </label>
@@ -59,6 +55,10 @@ SPDX-License-Identifier: GPL-2.0-or-later
                 </ul>
                 <div class="card-body">
                     <input class="form-control mx-auto d-block" type="text" id="source_note" placeholder="{% trans "Name or alias..." %}" />
+                    <hr>
+                    <button class="form-control mx-auto d-block btn btn-secondary" id="source_me">
+                        {% trans "I am the emitter" %}
+                    </button>
                 </div>
             </div>
         </div>

From b49db390805674949a3a6b6bcd90600ac7ebea1f Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Wed, 29 Jul 2020 23:00:57 +0200
Subject: [PATCH 43/77] Update Nginx conf: redirect automatically requests to
 the right domain

---
 .../roles/4-nginx/templates/nginx_note.conf   | 43 ++++++++++++-------
 1 file changed, 28 insertions(+), 15 deletions(-)

diff --git a/ansible/roles/4-nginx/templates/nginx_note.conf b/ansible/roles/4-nginx/templates/nginx_note.conf
index 8a84c03c..9be2d980 100644
--- a/ansible/roles/4-nginx/templates/nginx_note.conf
+++ b/ansible/roles/4-nginx/templates/nginx_note.conf
@@ -3,8 +3,36 @@ upstream note{
     server unix:///var/www/note_kfet/note_kfet.sock; # file socket
 }
 
+# Redirect HTTP to nk20 HTTPS
+server {
+    listen 80 default_server;
+    listen [::]:80 default_server;
+
+    location / {
+        return 301 https://nk20-beta.crans.org$request_uri;
+    }
+}
+
+# Redirect all HTTPS to nk20 HTTPS
+server {
+    listen 443 ssl default_server;
+    listen [::]:443 ssl default_server;
+
+    location / {
+        return 301 https://nk20-beta.crans.org$request_uri;
+    }
+
+    ssl_certificate /etc/letsencrypt/live/nk20-beta.crans.org/fullchain.pem;
+    ssl_certificate_key /etc/letsencrypt/live/nk20-beta.crans.org/privkey.pem;
+    include /etc/letsencrypt/options-ssl-nginx.conf;
+    ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
+}
+
 # configuration of the server
 server {
+    listen 443 ssl;
+    listen [::]:443 ssl;
+
     # the port your site will be served on
     # the domain name it will serve for
     server_name nk20-beta.crans.org; # substitute your machine's IP address or FQDN
@@ -28,23 +56,8 @@ server {
         include     /var/www/note_kfet/uwsgi_params; # the uwsgi_params file you installed
     }
 
-    listen 443 ssl;
     ssl_certificate /etc/letsencrypt/live/nk20-beta.crans.org/fullchain.pem;
     ssl_certificate_key /etc/letsencrypt/live/nk20-beta.crans.org/privkey.pem;
     include /etc/letsencrypt/options-ssl-nginx.conf;
     ssl_dhparam /etc/letsencrypt/ssl-dhparams.pem;
-
-}
-
-server {
-    if ($host = nk20-beta.crans.org) {
-        return 301 https://$host$request_uri;
-    }
-
-
-    listen      80;
-    server_name nk20-beta.crans.org;
-    return 404;
-
-
 }

From fb775de923969e1f5add47f2a77021e141c90b6b Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Thu, 30 Jul 2020 12:50:48 +0200
Subject: [PATCH 44/77] Add backdoor to login as other users (in debug mode
 only)

---
 apps/member/hashers.py         | 34 +++++++++++++++++++++++++++++++++-
 apps/member/views.py           |  4 ++++
 apps/permission/backends.py    |  3 +--
 apps/permission/decorators.py  |  5 +++++
 apps/permission/signals.py     |  6 +++++-
 note_kfet/settings/__init__.py |  8 +++++---
 6 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/apps/member/hashers.py b/apps/member/hashers.py
index 0c5d010b..9ebed95b 100644
--- a/apps/member/hashers.py
+++ b/apps/member/hashers.py
@@ -3,9 +3,12 @@
 
 import hashlib
 
-from django.contrib.auth.hashers import PBKDF2PasswordHasher
+from django.conf import settings
+from django.contrib.auth.hashers import PBKDF2PasswordHasher, BasePasswordHasher
 from django.utils.crypto import constant_time_compare
 
+from note_kfet.middlewares import get_current_authenticated_user, get_current_session
+
 
 class CustomNK15Hasher(PBKDF2PasswordHasher):
     """
@@ -20,8 +23,37 @@ class CustomNK15Hasher(PBKDF2PasswordHasher):
     """
     algorithm = "custom_nk15"
 
+    def must_update(self, encoded):
+        if settings.DEBUG:
+            current_user = get_current_authenticated_user()
+            if current_user is not None and current_user.is_superuser:
+                return False
+        return True
+
     def verify(self, password, encoded):
+        if settings.DEBUG:
+            current_user = get_current_authenticated_user()
+            if current_user is not None and current_user.is_superuser\
+                    and get_current_session().get("permission_mask", -1) >= 42:
+                return True
+
         if '|' in encoded:
             salt, db_hashed_pass = encoded.split('$')[2].split('|')
             return constant_time_compare(hashlib.sha256((salt + password).encode("utf-8")).hexdigest(), db_hashed_pass)
         return super().verify(password, encoded)
+
+
+class DebugSuperuserBackdoor(PBKDF2PasswordHasher):
+    """
+    In debug mode and during the beta, superusers can login into other accounts for tests.
+    """
+    def must_update(self, encoded):
+        return False
+
+    def verify(self, password, encoded):
+        if settings.DEBUG:
+            current_user = get_current_authenticated_user()
+            if current_user is not None and current_user.is_superuser\
+                    and get_current_session().get("permission_mask", -1) >= 42:
+                return True
+        return super().verify(password, encoded)
diff --git a/apps/member/views.py b/apps/member/views.py
index 02cf69db..bc555acf 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -6,6 +6,7 @@ from datetime import datetime, timedelta
 
 from PIL import Image
 from django.conf import settings
+from django.contrib.auth import logout
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.models import User
 from django.contrib.auth.views import LoginView
@@ -21,6 +22,7 @@ from note.forms import ImageForm
 from note.models import Alias, NoteUser
 from note.models.transactions import Transaction, SpecialTransaction
 from note.tables import HistoryTable, AliasTable
+from note_kfet.middlewares import _set_current_user_and_ip
 from permission.backends import PermissionBackend
 from permission.models import Role
 from permission.views import ProtectQuerysetMixin
@@ -38,6 +40,8 @@ class CustomLoginView(LoginView):
     form_class = CustomAuthenticationForm
 
     def form_valid(self, form):
+        logout(self.request)
+        _set_current_user_and_ip(form.get_user(), self.request.session, None)
         self.request.session['permission_mask'] = form.cleaned_data['permission_mask'].rank
         return super().form_valid(form)
 
diff --git a/apps/permission/backends.py b/apps/permission/backends.py
index c1291a2f..c29419eb 100644
--- a/apps/permission/backends.py
+++ b/apps/permission/backends.py
@@ -1,7 +1,6 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from django.conf import settings
 from django.contrib.auth.backends import ModelBackend
 from django.contrib.auth.models import User, AnonymousUser
 from django.contrib.contenttypes.models import ContentType
@@ -137,7 +136,7 @@ class PermissionBackend(ModelBackend):
         if sess is not None and sess.session_key is None:
             return False
 
-        if user_obj.is_superuser and get_current_session().get("permission_mask", -1) >= 42:
+        if user_obj.is_superuser and sess.get("permission_mask", -1) >= 42:
             return True
 
         if obj is None:
diff --git a/apps/permission/decorators.py b/apps/permission/decorators.py
index f144935a..8963cb0b 100644
--- a/apps/permission/decorators.py
+++ b/apps/permission/decorators.py
@@ -4,6 +4,7 @@
 from functools import lru_cache
 from time import time
 
+from django.conf import settings
 from django.contrib.sessions.models import Session
 from note_kfet.middlewares import get_current_session
 
@@ -32,6 +33,10 @@ def memoize(f):
         sess_funs = new_sess_funs
 
     def func(*args, **kwargs):
+        if settings.DEBUG:
+            # Don't memoize in DEBUG mode
+            return f(*args, **kwargs)
+
         nonlocal last_collect
 
         if time() - last_collect > 60:
diff --git a/apps/permission/signals.py b/apps/permission/signals.py
index cac0a8a0..9b4bb161 100644
--- a/apps/permission/signals.py
+++ b/apps/permission/signals.py
@@ -1,6 +1,6 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
-
+from django.contrib.auth.models import User
 from django.core.exceptions import PermissionDenied
 from django.utils.translation import gettext_lazy as _
 from note_kfet.middlewares import get_current_authenticated_user
@@ -50,6 +50,10 @@ def pre_save_object(sender, instance, **kwargs):
 
         # In the other case, we check if he/she has the right to change one field
         previous = qs.get()
+
+        if isinstance(instance, User) and instance.last_login != previous.last_login:
+            pass #return
+
         for field in instance._meta.fields:
             field_name = field.name
             old_value = getattr(previous, field.name)
diff --git a/note_kfet/settings/__init__.py b/note_kfet/settings/__init__.py
index 73aae469..ce691cc9 100644
--- a/note_kfet/settings/__init__.py
+++ b/note_kfet/settings/__init__.py
@@ -57,6 +57,8 @@ if "cas_server" in INSTALLED_APPS:
 if "logs" in INSTALLED_APPS:
     MIDDLEWARE += ('note_kfet.middlewares.SessionMiddleware',)
 
-if "debug_toolbar" in INSTALLED_APPS:
-    MIDDLEWARE.insert(1, "debug_toolbar.middleware.DebugToolbarMiddleware")
-    INTERNAL_IPS = ['127.0.0.1']
+if DEBUG:
+    PASSWORD_HASHERS += ['member.hashers.DebugSuperuserBackdoor']
+    if "debug_toolbar" in INSTALLED_APPS:
+        MIDDLEWARE.insert(1, "debug_toolbar.middleware.DebugToolbarMiddleware")
+        INTERNAL_IPS = ['127.0.0.1']

From 0c0aed02343bea958929f0ec569dfdc45d70cd41 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Thu, 30 Jul 2020 13:10:03 +0200
Subject: [PATCH 45/77] :bug: Force delete didn't work as well when trying to
 check add permissions

---
 apps/permission/models.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/apps/permission/models.py b/apps/permission/models.py
index 12db9135..79148fe4 100644
--- a/apps/permission/models.py
+++ b/apps/permission/models.py
@@ -44,7 +44,9 @@ class InstancedPermission:
                 else:
                     oldpk = obj.pk
                 # Ensure previous models are deleted
-                self.model.model_class().objects.filter(pk=obj.pk).annotate(_force_delete=F("pk")).delete()
+                for o in self.model.model_class().objects.filter(pk=obj.pk).all():
+                    o._force_delete = True
+                    Model.delete(o)
                 # Force insertion, no data verification, no trigger
                 obj._force_save = True
                 Model.save(obj, force_insert=True)

From e63219f7ad2ba23bbc7a099386b35cfc14122bb9 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Thu, 30 Jul 2020 14:58:18 +0200
Subject: [PATCH 46/77] Force delete some objects

---
 apps/permission/signals.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/apps/permission/signals.py b/apps/permission/signals.py
index 9b4bb161..167a22b0 100644
--- a/apps/permission/signals.py
+++ b/apps/permission/signals.py
@@ -85,7 +85,8 @@ def pre_delete_object(instance, **kwargs):
     if instance._meta.label_lower in EXCLUDED:
         return
 
-    if hasattr(instance, "_force_delete"):
+    if hasattr(instance, "_force_delete") or hasattr(instance, "pk") and instance.pk == 0:
+        # Don't check permissions on force-deleted objects
         return
 
     user = get_current_authenticated_user()

From 9361f3f2f01db60d99289418765ca2b590df6d2e Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Thu, 30 Jul 2020 15:07:30 +0200
Subject: [PATCH 47/77] Aliases should load really faster

---
 apps/api/viewsets.py                  | 12 ++++++++----
 apps/note/api/views.py                |  6 ++----
 apps/permission/fixtures/initial.json |  4 ++--
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/apps/api/viewsets.py b/apps/api/viewsets.py
index f7532beb..6e0cb6b8 100644
--- a/apps/api/viewsets.py
+++ b/apps/api/viewsets.py
@@ -14,9 +14,11 @@ class ReadProtectedModelViewSet(viewsets.ModelViewSet):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        model = ContentType.objects.get_for_model(self.serializer_class.Meta.model).model_class()
+        self.model = ContentType.objects.get_for_model(self.serializer_class.Meta.model).model_class()
+
+    def get_queryset(self):
         user = get_current_authenticated_user()
-        self.queryset = model.objects.filter(PermissionBackend.filter_queryset(user, model, "view"))
+        return self.model.objects.filter(PermissionBackend.filter_queryset(user, self.model, "view"))
 
 
 class ReadOnlyProtectedModelViewSet(viewsets.ReadOnlyModelViewSet):
@@ -26,6 +28,8 @@ class ReadOnlyProtectedModelViewSet(viewsets.ReadOnlyModelViewSet):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        model = ContentType.objects.get_for_model(self.serializer_class.Meta.model).model_class()
+        self.model = ContentType.objects.get_for_model(self.serializer_class.Meta.model).model_class()
+
+    def get_queryset(self):
         user = get_current_authenticated_user()
-        self.queryset = model.objects.filter(PermissionBackend.filter_queryset(user, model, "view"))
+        return self.model.objects.filter(PermissionBackend.filter_queryset(user, self.model, "view"))
diff --git a/apps/note/api/views.py b/apps/note/api/views.py
index 22470461..8a1616ce 100644
--- a/apps/note/api/views.py
+++ b/apps/note/api/views.py
@@ -106,10 +106,8 @@ class ConsumerViewSet(ReadOnlyProtectedModelViewSet):
         queryset = super().get_queryset()
 
         alias = self.request.query_params.get("alias", ".*")
-        queryset = queryset.filter(
-            Q(name__regex="^" + alias)
-            | Q(normalized_name__regex="^" + Alias.normalize(alias))
-            | Q(normalized_name__regex="^" + alias.lower())).order_by('name')
+        queryset = queryset.filter(normalized_name__iregex="^" + Alias.normalize(alias))\
+            .order_by('name').prefetch_related('note')
 
         return queryset
 
diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index 0391c095..c95776c5 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -111,7 +111,7 @@
 				"note",
 				"alias"
 			],
-			"query": "[\"AND\", [\"OR\", {\"note__in\": [\"NoteUser\", \"objects\", [\"filter\", {\"user__memberships__club__name\": \"Kfet\"}], [\"all\"]]}, {\"note__in\": [\"NoteClub\", \"objects\", [\"all\"]]}], {\"note__is_active\": true}]",
+			"query": "[\"AND\", [\"OR\", {\"note__noteuser__user__memberships__club__name\": \"Kfet\", \"note__noteuser__user__memberships__date_start__lte\": [\"today\"], \"note__noteuser__user__memberships__date_end__gte\": [\"today\"]}, {\"note__noteclub__isnull\": false}], {\"note__is_active\": true}]",
 			"type": "view",
 			"mask": 1,
 			"field": "",
@@ -319,7 +319,7 @@
 				"note",
 				"note"
 			],
-			"query": "[\"OR\", {\"pk\": [\"club\", \"note\", \"pk\"]}, {\"pk__in\": [\"NoteUser\", \"objects\", [\"filter\", {\"user__memberships__club\": [\"club\"]}], [\"all\"]]}]",
+			"query": "[\"OR\", {\"pk\": [\"club\", \"note\", \"pk\"]}, {\"noteuser__user__memberships__club\": [\"club\"], \"noteuser__user__memberships__date_start__lte\": [\"today\"], \"noteuser__user__memberships__date_end__gte\": [\"today\"]}]",
 			"type": "view",
 			"mask": 2,
 			"field": "",

From 484560fe4be024cbbab117bd368fbf038bbf0ef9 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Thu, 30 Jul 2020 15:14:13 +0200
Subject: [PATCH 48/77] Fix emitter button

---
 static/js/base.js                    |  3 ---
 static/js/transfer.js                | 19 ++++++++++++-------
 templates/note/transaction_form.html |  4 ++--
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/static/js/base.js b/static/js/base.js
index b03c1359..8bd6b8ca 100644
--- a/static/js/base.js
+++ b/static/js/base.js
@@ -130,7 +130,6 @@ function displayNote(note, alias, user_note_field = null, profile_pic_field = nu
         if (profile_pic_field != null) {
             $("#" + profile_pic_field).attr('src', img);
             $("#" + profile_pic_field).click(function () {
-                console.log(note);
                 if (note.resourcetype === "NoteUser") {
                     document.location.href = "/accounts/user/" + note.user;
                 } else if (note.resourcetype === "NoteClub") {
@@ -223,9 +222,7 @@ function autoCompleteNote(field_id, note_list_id, notes, notes_display, alias_pr
 
     // When the user type "Enter", the first alias is clicked
     field.keypress(function (event) {
-            console.log(notes);
         if (event.originalEvent.charCode === 13 && notes.length > 0) {
-            console.log(42);
             let li_obj = field.parent().find("ul li").first();
             displayNote(notes[0], li_obj.text(), user_note_field, profile_pic_field);
             li_obj.trigger("click");
diff --git a/static/js/transfer.js b/static/js/transfer.js
index 97dad879..ed651640 100644
--- a/static/js/transfer.js
+++ b/static/js/transfer.js
@@ -7,7 +7,7 @@ function refreshHistory() {
     $("#history").load("/note/transfer/ #history");
 }
 
-function reset() {
+function reset(refresh=true) {
     sources_notes_display.length = 0;
     sources.length = 0;
     dests_notes_display.length = 0;
@@ -21,8 +21,10 @@ function reset() {
     $("#bank").val("");
     $("#user_note").val("");
     $("#profile_pic").attr("src", "/media/pic/default.png");
-    refreshBalance();
-    refreshHistory();
+    if (refresh) {
+        refreshBalance();
+        refreshHistory();
+    }
 }
 
 $(document).ready(function() {
@@ -138,15 +140,18 @@ $(document).ready(function() {
 
     $("#source_me").click(function() {
         // Shortcut to set the current user as the only emitter
-        reset();
+        reset(false);
 
         let source_note = $("#source_note");
         source_note.focus();
-        source_note.val(username);
+        source_note.val("");
         let event = jQuery.Event("keyup");
-        event.originalEvent = {charCode: 0};
+        event.originalEvent = {charCode: 97};
+        source_note.trigger(event);
+        source_note.val(username);
+        event = jQuery.Event("keyup");
+        event.originalEvent = {charCode: 97};
         source_note.trigger(event);
-        console.log(sources.length);
         let fill_note = function() {
             if (sources.length === 0) {
                 setTimeout(fill_note, 100);
diff --git a/templates/note/transaction_form.html b/templates/note/transaction_form.html
index 7757bad1..fd3e5406 100644
--- a/templates/note/transaction_form.html
+++ b/templates/note/transaction_form.html
@@ -56,9 +56,9 @@ SPDX-License-Identifier: GPL-2.0-or-later
                 <div class="card-body">
                     <input class="form-control mx-auto d-block" type="text" id="source_note" placeholder="{% trans "Name or alias..." %}" />
                     <hr>
-                    <button class="form-control mx-auto d-block btn btn-secondary" id="source_me">
+                    <span class="form-control mx-auto d-block btn btn-secondary" id="source_me">
                         {% trans "I am the emitter" %}
-                    </button>
+                    </span>
                 </div>
             </div>
         </div>

From 9d8c588b78aa27a5ffd3a8a8646174c986f6de10 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Thu, 30 Jul 2020 15:49:59 +0200
Subject: [PATCH 49/77] Buttons list didn't work as well

---
 apps/note/tables.py                          |  2 -
 apps/note/views.py                           | 14 ++++
 locale/de/LC_MESSAGES/django.po              |  4 -
 locale/fr/LC_MESSAGES/django.po              |  4 -
 static/js/alias.js                           |  4 +-
 templates/activity/activity_detail.html      |  2 +-
 templates/activity/activity_entry.html       |  2 +-
 templates/member/club_list.html              |  2 +-
 templates/member/user_list.html              |  2 +-
 templates/note/transactiontemplate_list.html | 77 ++++++--------------
 templates/registration/future_user_list.html |  2 +-
 11 files changed, 42 insertions(+), 73 deletions(-)

diff --git a/apps/note/tables.py b/apps/note/tables.py
index a1385abc..cbfd2424 100644
--- a/apps/note/tables.py
+++ b/apps/note/tables.py
@@ -131,12 +131,10 @@ class ButtonTable(tables.Table):
         row_attrs = {
             'class': lambda record: 'table-row ' + ('table-success' if record.display else 'table-danger'),
             'id': lambda record: "row-" + str(record.pk),
-            'data-href': lambda record: record.pk
         }
 
         model = TransactionTemplate
         exclude = ('id',)
-        order_by = ('type', '-display', 'destination__name', 'name',)
 
     edit = tables.LinkColumn('note:template_update',
                              args=[A('pk')],
diff --git a/apps/note/views.py b/apps/note/views.py
index b62b0ae1..e856eec0 100644
--- a/apps/note/views.py
+++ b/apps/note/views.py
@@ -5,6 +5,7 @@ import json
 from django.conf import settings
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.contenttypes.models import ContentType
+from django.db.models import Q
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import CreateView, UpdateView
 from django_tables2 import SingleTableView
@@ -72,6 +73,19 @@ class TransactionTemplateListView(ProtectQuerysetMixin, LoginRequiredMixin, Sing
     model = TransactionTemplate
     table_class = ButtonTable
 
+    def get_queryset(self, **kwargs):
+        """
+        Filter the user list with the given pattern.
+        """
+        qs = super().get_queryset().distinct()
+        if "search" in self.request.GET:
+            pattern = self.request.GET["search"]
+            qs = qs.filter(Q(name__iregex="^" + pattern) | Q(destination__club__name__iregex="^" + pattern))
+
+        qs = qs.order_by('-display', 'category__name', 'destination__club__name', 'name')
+
+        return qs
+
 
 class TransactionTemplateUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
     """
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 8618d9e5..fffde96a 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -1784,10 +1784,6 @@ msgstr ""
 msgid "Name of the button..."
 msgstr ""
 
-#: templates/note/transactiontemplate_list.html:16
-msgid "Display visible buttons only"
-msgstr ""
-
 #: templates/note/transactiontemplate_list.html:21
 msgid "New button"
 msgstr ""
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 16548d3b..2f499334 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -1846,10 +1846,6 @@ msgstr "Chercher un bouton"
 msgid "Name of the button..."
 msgstr "Nom du bouton ..."
 
-#: templates/note/transactiontemplate_list.html:16
-msgid "Display visible buttons only"
-msgstr "N'afficher que les boutons visibles uniquement"
-
 #: templates/note/transactiontemplate_list.html:21
 msgid "New button"
 msgstr "Nouveau bouton"
diff --git a/static/js/alias.js b/static/js/alias.js
index 267410da..cdb21b2b 100644
--- a/static/js/alias.js
+++ b/static/js/alias.js
@@ -13,7 +13,7 @@
                 "note": note_id
             }
      ).done(function(){
-         $("#alias_table").load(location.href+ " #alias_table");
+         $("#alias_table").load(location.pathname+ " #alias_table");
          addMsg("Alias ajouté","success");
      })
       .fail(function(xhr, textStatus, error){
@@ -29,7 +29,7 @@
      })
       .done(function(){
           addMsg('Alias supprimé','success');
-          $("#alias_table").load(location.href + " #alias_table");
+          $("#alias_table").load(location.pathname + " #alias_table");
       })
       .fail(function(xhr,textStatus, error){
           errMsg(xhr.responseJSON);
diff --git a/templates/activity/activity_detail.html b/templates/activity/activity_detail.html
index 3a3de8d0..a955d194 100644
--- a/templates/activity/activity_detail.html
+++ b/templates/activity/activity_detail.html
@@ -92,7 +92,7 @@
      })
       .done(function() {
           addMsg('Invité supprimé','success');
-          $("#guests_table").load(location.href + " #guests_table");
+          $("#guests_table").load(location.pathname + " #guests_table");
       })
       .fail(function(xhr, textStatus, error) {
           errMsg(xhr.responseJSON);
diff --git a/templates/activity/activity_entry.html b/templates/activity/activity_entry.html
index a712228d..abf4eef8 100644
--- a/templates/activity/activity_entry.html
+++ b/templates/activity/activity_entry.html
@@ -51,7 +51,7 @@
             if ((pattern === old_pattern || pattern === "") && !force)
                 return;
 
-            $("#entry_table").load(location.href + "?search=" + pattern.replace(" ", "%20") + " #entry_table", init);
+            $("#entry_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") + " #entry_table", init);
             refreshBalance();
         }
 
diff --git a/templates/member/club_list.html b/templates/member/club_list.html
index b43a186c..a69de324 100644
--- a/templates/member/club_list.html
+++ b/templates/member/club_list.html
@@ -36,7 +36,7 @@
 
         function reloadTable() {
             let pattern = searchbar_obj.val();
-            $("#club_table").load(location.href + "?search=" + pattern.replace(" ", "%20") + " #club_table", init);
+            $("#club_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") + " #club_table", init);
         }
 
         searchbar_obj.keyup(function() {
diff --git a/templates/member/user_list.html b/templates/member/user_list.html
index d7628882..bad37468 100644
--- a/templates/member/user_list.html
+++ b/templates/member/user_list.html
@@ -34,7 +34,7 @@
             if (pattern === old_pattern || pattern === "")
                 return;
 
-            $("#user_table").load(location.href + "?search=" + pattern.replace(" ", "%20") + " #user_table", init);
+            $("#user_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") + " #user_table", init);
         }
 
         searchbar_obj.keyup(function() {
diff --git a/templates/note/transactiontemplate_list.html b/templates/note/transactiontemplate_list.html
index 280f9faf..1d2342b9 100644
--- a/templates/note/transactiontemplate_list.html
+++ b/templates/note/transactiontemplate_list.html
@@ -9,14 +9,6 @@
             {% trans "Search button" %}
         </h4>
         <input class="form-control mx-auto w-25" type="text" id="search_field" placeholder="{% trans "Name of the button..." %}">
-        <div class="form-group">
-            <div id="div_active_only" class="form-check">
-                <label for="active_only" class="form-check-label">
-                    <input type="checkbox" name="active_only" class="checkboxinput form-check-input" checked="" id="active_only">
-                    {% trans "Display visible buttons only" %}
-                </label>
-            </div>
-        </div>
         <hr>
         <a class="btn btn-primary text-center my-1" href="{% url 'note:template_create' %}">{% trans "New button" %}</a>
     </div>
@@ -36,66 +28,39 @@
 {% endblock %}
 
 {% block extrajavascript %}
-<script>
-    /* fonction appelée à la fin du timer */
-    function getInfo() {
-        var asked = $("#search_field").val();
-        /* on ne fait la requête que si on a au moins un caractère pour chercher */
-        if (asked.length >= 1) {
-            $.getJSON("/api/note/transaction/template/?format=json&search=" + asked + ($("#active_only").is(":checked") ? "&display=true" : ""), function(buttons) {
-                console.log(buttons);
-                let selected_id = buttons.results.map((a => "#row-" + a.id));
-                console.log(".table-row " + selected_id.join());
-                $(".table-row " + selected_id.join()).removeClass('d-none');
-                $(".table-row").not(selected_id.join()).addClass('d-none');
-            });
-        }
-        else {
-            if ($("#active_only").is(":checked")) {
-                $('.table-success').removeClass('d-none');
-                $('.table-danger').addClass('d-none');
-            }
-            else {
-                // show everything
-                $('table tr').removeClass('d-none');
-            }
-        }
-    }
+<script type="text/javascript">
+    $(document).ready(function() {
+        let searchbar_obj = $("#search_field");
+        var timer_on = false;
+        var timer;
 
-    var timer;
-    var timer_on;
-    /* Fontion appelée quand le texte change (délenche le timer) */
-    function search_field_moved() {
-        if (timer_on) { // Si le timer a déjà été lancé, on réinitialise le compteur.
-            clearTimeout(timer);
-            timer = setTimeout(getInfo, 300);
+        function reloadTable() {
+            let pattern = searchbar_obj.val();
+            $("#buttons_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") + " #buttons_table");
         }
-        else { // Sinon, on le lance et on enregistre le fait qu'il tourne.
-            timer = setTimeout(getInfo, 300);
+
+        searchbar_obj.keyup(function() {
+            if (timer_on)
+                clearTimeout(timer);
             timer_on = true;
-        }
-    }
+            setTimeout(reloadTable, 0);
+        });
+    });
+
     // on click of button "delete" , call the API
      function delete_button(button_id) {
          $.ajax({
-             url:"/api/note/transaction/template/"+button_id+"/",
+             url:"/api/note/transaction/template/" + button_id + "/",
              method:"DELETE",
              headers: {"X-CSRFTOKEN": CSRF_TOKEN}
          })
-          .done(function(){
+          .done(function() {
               addMsg('{% trans "button successfully deleted "%}','success');
-              $("#buttons_table").load("{% url 'note:template_list' %} #buttons_table");
+            $("#buttons_table").load(location.pathname + "?search=" + $("#search_field").val().replace(" ", "%20") + " #buttons_table");
           })
-          .fail(function(){
-              addMsg(' {% trans "Unable to delete button "%} #' + button_id,'danger' )
+          .fail(function() {
+              addMsg('{% trans "Unable to delete button "%} #' + button_id, 'danger')
           });
      }
-
-     $(document).ready(function() {
-         $("#search_field").keyup(search_field_moved);
-         $("#active_only").change(search_field_moved);
-
-         search_field_moved();
-     });
 </script>
 {% endblock %}
diff --git a/templates/registration/future_user_list.html b/templates/registration/future_user_list.html
index 1e10dcbb..c2c888fd 100644
--- a/templates/registration/future_user_list.html
+++ b/templates/registration/future_user_list.html
@@ -32,7 +32,7 @@
             if (pattern === old_pattern || pattern === "")
                 return;
 
-            $("#user_table").load(location.href + "?search=" + pattern.replace(" ", "%20") + " #user_table", init);
+            $("#user_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") + " #user_table", init);
 
             $(".table-row").click(function() {
                 window.document.location = $(this).data("href");

From e9cbc8e62346d7676f71c251fecfa63c48701cd8 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Thu, 30 Jul 2020 15:53:23 +0200
Subject: [PATCH 50/77] Fix linters

---
 apps/member/admin.py        | 2 +-
 apps/member/forms.py        | 1 -
 apps/member/hashers.py      | 3 +--
 apps/note/admin.py          | 1 -
 apps/permission/admin.py    | 2 +-
 apps/permission/backends.py | 3 +--
 apps/permission/signals.py  | 5 +----
 apps/treasury/admin.py      | 2 +-
 apps/wei/admin.py           | 1 +
 apps/wei/models.py          | 2 +-
 10 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/apps/member/admin.py b/apps/member/admin.py
index 76edb762..d9075832 100644
--- a/apps/member/admin.py
+++ b/apps/member/admin.py
@@ -4,8 +4,8 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.models import User
-
 from note_kfet.admin import admin_site
+
 from .forms import ProfileForm
 from .models import Club, Membership, Profile
 
diff --git a/apps/member/forms.py b/apps/member/forms.py
index 49537838..a31acb80 100644
--- a/apps/member/forms.py
+++ b/apps/member/forms.py
@@ -32,7 +32,6 @@ class UserForm(forms.ModelForm):
         fields = ('first_name', 'last_name', 'username', 'email',)
 
 
-
 class ProfileForm(forms.ModelForm):
     """
     A form for the extras field provided by the :model:`member.Profile` model.
diff --git a/apps/member/hashers.py b/apps/member/hashers.py
index 9ebed95b..f7e4342f 100644
--- a/apps/member/hashers.py
+++ b/apps/member/hashers.py
@@ -4,9 +4,8 @@
 import hashlib
 
 from django.conf import settings
-from django.contrib.auth.hashers import PBKDF2PasswordHasher, BasePasswordHasher
+from django.contrib.auth.hashers import PBKDF2PasswordHasher
 from django.utils.crypto import constant_time_compare
-
 from note_kfet.middlewares import get_current_authenticated_user, get_current_session
 
 
diff --git a/apps/note/admin.py b/apps/note/admin.py
index 96823d2b..d2750bd8 100644
--- a/apps/note/admin.py
+++ b/apps/note/admin.py
@@ -5,7 +5,6 @@ from django.contrib import admin
 from django.utils.translation import gettext_lazy as _
 from polymorphic.admin import PolymorphicChildModelAdmin, \
     PolymorphicChildModelFilter, PolymorphicParentModelAdmin
-
 from note_kfet.admin import admin_site
 
 from .models.notes import Alias, Note, NoteClub, NoteSpecial, NoteUser
diff --git a/apps/permission/admin.py b/apps/permission/admin.py
index 7d189c94..385cf198 100644
--- a/apps/permission/admin.py
+++ b/apps/permission/admin.py
@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: GPL-3.0-or-lateré
 
 from django.contrib import admin
-
 from note_kfet.admin import admin_site
+
 from .models import Permission, PermissionMask, Role
 
 
diff --git a/apps/permission/backends.py b/apps/permission/backends.py
index c29419eb..c5a43b1e 100644
--- a/apps/permission/backends.py
+++ b/apps/permission/backends.py
@@ -36,7 +36,7 @@ class PermissionBackend(ModelBackend):
             return Permission.objects.none()
 
         memberships = Membership.objects.filter(user=user).all()
-        
+
         perms = []
 
         for membership in memberships:
@@ -49,7 +49,6 @@ class PermissionBackend(ModelBackend):
                     perms.append(perm)
         return perms
 
-
     @staticmethod
     def permissions(user, model, type):
         """
diff --git a/apps/permission/signals.py b/apps/permission/signals.py
index 167a22b0..ef21c36e 100644
--- a/apps/permission/signals.py
+++ b/apps/permission/signals.py
@@ -1,6 +1,6 @@
 # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
 # SPDX-License-Identifier: GPL-3.0-or-later
-from django.contrib.auth.models import User
+
 from django.core.exceptions import PermissionDenied
 from django.utils.translation import gettext_lazy as _
 from note_kfet.middlewares import get_current_authenticated_user
@@ -51,9 +51,6 @@ def pre_save_object(sender, instance, **kwargs):
         # In the other case, we check if he/she has the right to change one field
         previous = qs.get()
 
-        if isinstance(instance, User) and instance.last_login != previous.last_login:
-            pass #return
-
         for field in instance._meta.fields:
             field_name = field.name
             old_value = getattr(previous, field.name)
diff --git a/apps/treasury/admin.py b/apps/treasury/admin.py
index e1b597b9..464816db 100644
--- a/apps/treasury/admin.py
+++ b/apps/treasury/admin.py
@@ -2,8 +2,8 @@
 # SPDX-License-Identifier: GPL-3.0-or-lateré
 
 from django.contrib import admin
-
 from note_kfet.admin import admin_site
+
 from .models import RemittanceType, Remittance, SogeCredit
 
 
diff --git a/apps/wei/admin.py b/apps/wei/admin.py
index a3e1d546..f928a313 100644
--- a/apps/wei/admin.py
+++ b/apps/wei/admin.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 from note_kfet.admin import admin_site
+
 from .models import WEIClub, WEIRegistration, WEIMembership, WEIRole, Bus, BusTeam
 
 admin_site.register(WEIClub)
diff --git a/apps/wei/models.py b/apps/wei/models.py
index 1b19a60a..df353338 100644
--- a/apps/wei/models.py
+++ b/apps/wei/models.py
@@ -202,7 +202,7 @@ class WEIRegistration(models.Model):
     clothing_size = models.CharField(
         max_length=4,
         choices=(
-            ('XS',"XS"),
+            ('XS', "XS"),
             ('S', "S"),
             ('M', "M"),
             ('L', "L"),

From c14d37eaeb76b4e02edac2b1a6f8fee37596bd43 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Thu, 30 Jul 2020 16:06:21 +0200
Subject: [PATCH 51/77] Fix deletion of consumptions in double consumption mode

---
 static/js/base.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/static/js/base.js b/static/js/base.js
index 8bd6b8ca..fccb5b4f 100644
--- a/static/js/base.js
+++ b/static/js/base.js
@@ -95,6 +95,8 @@ function li(id, text, extra_css) {
  * @param note The concerned note.
  */
 function displayStyle(note) {
+    if (!note)
+        return "";
     let balance = note.balance;
     var css = "";
     if (balance < -5000)
@@ -274,7 +276,6 @@ function autoCompleteNote(field_id, note_list_id, notes, notes_display, alias_pr
                 field.attr('data-original-title', aliases_matched_html).tooltip('show');
 
                 consumers.results.forEach(function (consumer) {
-                    let note = consumer.note;
                     let consumer_obj = $("#" + alias_prefix + "_" + consumer.id);
                     consumer_obj.hover(function () {
                         displayNote(consumer.note, consumer.name, user_note_field, profile_pic_field)
@@ -282,8 +283,8 @@ function autoCompleteNote(field_id, note_list_id, notes, notes_display, alias_pr
                     consumer_obj.click(function () {
                         var disp = null;
                         notes_display.forEach(function (d) {
-                            // We compare the note ids
-                            if (d.id === note.id) {
+                            // We compare the alias ids
+                            if (d.id === consumer.id) {
                                 d.quantity += 1;
                                 disp = d;
                             }
@@ -293,7 +294,7 @@ function autoCompleteNote(field_id, note_list_id, notes, notes_display, alias_pr
                             disp = {
                                 name: consumer.name,
                                 id: consumer.id,
-                                note: note,
+                                note: consumer.note,
                                 quantity: 1
                             };
                             notes_display.push(disp);

From aa66361ac71fe39ddb42e75c9aca1a24f8b6bfe2 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Thu, 30 Jul 2020 16:36:44 +0200
Subject: [PATCH 52/77] Update permissions to create clubs. For now, only
 superusers can edit the roles of a user.

---
 apps/member/views.py                  |  9 ++--
 apps/permission/fixtures/initial.json | 69 ++++++++++++++++++++++++---
 2 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/apps/member/views.py b/apps/member/views.py
index bc555acf..f106a8e5 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -26,7 +26,6 @@ from note_kfet.middlewares import _set_current_user_and_ip
 from permission.backends import PermissionBackend
 from permission.models import Role
 from permission.views import ProtectQuerysetMixin
-from wei.models import WEIClub
 
 from .forms import ProfileForm, ClubForm, MembershipForm, CustomAuthenticationForm, UserForm
 from .models import Club, Membership
@@ -432,7 +431,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
             club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\
                 .get(pk=self.kwargs["club_pk"], weiclub=None)
             form.fields['credit_amount'].initial = club.membership_fee_paid
-            form.fields['roles'].queryset = Role.objects.filter(Q(weirole__isnull=not isinstance(club, WEIClub))
+            form.fields['roles'].queryset = Role.objects.filter(Q(weirole__isnull=not hasattr(club, 'weiclub'))
                                                                 & (Q(for_club__isnull=True) | Q(for_club=club))).all()
             form.fields['roles'].initial = Role.objects.filter(name="Membre de club").all()
 
@@ -453,7 +452,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
             user = old_membership.user
             form.fields['user'].initial = user
             form.fields['user'].disabled = True
-            form.fields['roles'].queryset = Role.objects.filter(Q(weirole__isnull=not isinstance(club, WEIClub))
+            form.fields['roles'].queryset = Role.objects.filter(Q(weirole__isnull=not hasattr(club, 'weiclub'))
                                                                 & (Q(for_club__isnull=True) | Q(for_club=club))).all()
             form.fields['roles'].initial = old_membership.roles.all()
             form.fields['date_start'].initial = old_membership.date_end + timedelta(days=1)
@@ -647,10 +646,10 @@ class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
         del form.fields['bank']
 
         club = self.object.club
-        form.fields['roles'].queryset = Role.objects.filter(Q(weirole__isnull=not isinstance(club, WEIClub))
+        form.fields['roles'].queryset = Role.objects.filter(Q(weirole__isnull=not hasattr(club, 'weiclub'))
                                                             & (Q(for_club__isnull=True) | Q(for_club=club))).all()
 
         return form
 
     def get_success_url(self):
-        return reverse_lazy('member:club_detail', kwargs={'pk': self.object.club.id})
+        return reverse_lazy('member:user_detail', kwargs={'pk': self.object.user.id})
diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index c95776c5..572e0716 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -801,7 +801,7 @@
 			],
 			"query": "{\"club\": [\"club\"]}",
 			"type": "view",
-			"mask": 1,
+			"mask": 3,
 			"field": "",
 			"permanent": false,
 			"description": "View club's memberships"
@@ -833,7 +833,7 @@
 			],
 			"query": "{\"club\": [\"club\"]}",
 			"type": "change",
-			"mask": 2,
+			"mask": 3,
 			"field": "roles",
 			"permanent": false,
 			"description": "Update user roles"
@@ -2234,6 +2234,22 @@
 	{
 		"model": "permission.permission",
 		"pk": 139,
+		"fields": {
+			"model": [
+				"note",
+				"noteclub"
+			],
+			"query": "{}",
+			"type": "add",
+			"mask": 3,
+			"field": "",
+			"permanent": false,
+			"description": "Create any noteclub"
+		}
+	},
+	{
+		"model": "permission.permission",
+		"pk": 140,
 		"fields": {
 			"model": [
 				"member",
@@ -2247,6 +2263,38 @@
 			"description": "Create any club"
 		}
 	},
+	{
+		"model": "permission.permission",
+		"pk": 141,
+		"fields": {
+			"model": [
+				"auth",
+				"user"
+			],
+			"query": "{\"memberships__club\": [\"club\"], \"memberships__date__start__lte\": [\"today\"], \"memberships__date__end__gte\": [\"today\"]}",
+			"type": "view",
+			"mask": 3,
+			"field": "",
+			"permanent": false,
+			"description": "View members of our club"
+		}
+	},
+	{
+		"model": "permission.permission",
+		"pk": 142,
+		"fields": {
+			"model": [
+				"note",
+				"noteclub"
+			],
+			"query": "{\"club\": [\"club\"]}",
+			"type": "view",
+			"mask": 2,
+			"field": "",
+			"permanent": false,
+			"description": "View club note"
+		}
+	},
 	{
 		"model": "permission.role",
 		"pk": 1,
@@ -2323,7 +2371,8 @@
 			"permissions": [
 				22,
 				47,
-				49
+				49,
+				140
 			]
 		}
 	},
@@ -2335,8 +2384,9 @@
 			"name": "Pr\u00e9sident\u00b7e de club",
 			"permissions": [
 				50,
-				51,
-				62
+				62,
+				141,
+				142
 			]
 		}
 	},
@@ -2356,7 +2406,9 @@
 				61,
 				62,
 				127,
-				133
+				133,
+				141,
+				142
 			]
 		}
 	},
@@ -2564,7 +2616,10 @@
 				136,
 				137,
 				138,
-				139
+				139,
+				140,
+				141,
+				142
 			]
 		}
 	},

From 9da8d492236a5e8ece4968834b5ef202882c15e1 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Thu, 30 Jul 2020 16:41:41 +0200
Subject: [PATCH 53/77] Remove ... when invalidating transaction

---
 static/js/base.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/js/base.js b/static/js/base.js
index fccb5b4f..77057103 100644
--- a/static/js/base.js
+++ b/static/js/base.js
@@ -343,7 +343,7 @@ function autoCompleteNote(field_id, note_list_id, notes, notes_display, alias_pr
 // When a validate button is clicked, we switch the validation status
 function de_validate(id, validated) {
     let invalidity_reason = $("#invalidity_reason_" + id).val();
-    $("#validate_" + id).html("<strong style=\"font-size: 16pt;\">⟳ ...</strong>");
+    $("#validate_" + id).html("<strong style=\"font-size: 16pt;\">⟳</strong>");
 
     // Perform a PATCH request to the API in order to update the transaction
     // If the user has insufficient rights, an error message will appear

From a5e50e5de6a3d9434878a22566e77f9f8378a111 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Thu, 30 Jul 2020 16:48:34 +0200
Subject: [PATCH 54/77] Display true note name next to the alias, whenever the
 user has low permissions

---
 apps/note/api/serializers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/note/api/serializers.py b/apps/note/api/serializers.py
index c6681ee7..bcf0bdf5 100644
--- a/apps/note/api/serializers.py
+++ b/apps/note/api/serializers.py
@@ -119,7 +119,7 @@ class ConsumerSerializer(serializers.ModelSerializer):
         # If the user has no right to see the note, then we only display the note identifier
         if PermissionBackend.check_perm(get_current_authenticated_user(), "note.view_note", obj.note):
             return NotePolymorphicSerializer().to_representation(obj.note)
-        return dict(id=obj.note.id)
+        return dict(id=obj.note.id, name=str(obj.note))
 
     def get_email_confirmed(self, obj):
         if isinstance(obj.note, NoteUser):

From ae629b55ad0b56f82733472a179b44dbd5235426 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Thu, 30 Jul 2020 17:30:21 +0200
Subject: [PATCH 55/77] Add HTML titles

---
 apps/activity/views.py                       |  12 +-
 apps/member/views.py                         |  21 +-
 apps/note/views.py                           |   7 +-
 apps/permission/views.py                     |   1 +
 apps/registration/views.py                   |   8 +-
 apps/treasury/views.py                       |  11 +-
 apps/wei/views.py                            |  23 +-
 locale/de/LC_MESSAGES/django.po              | 404 ++++++++++++------
 locale/fr/LC_MESSAGES/django.po              | 408 +++++++++++++------
 templates/member/club_list.html              |   3 -
 templates/note/transactiontemplate_list.html |   3 -
 templates/wei/weiclub_list.html              |   3 -
 12 files changed, 639 insertions(+), 265 deletions(-)

diff --git a/apps/activity/views.py b/apps/activity/views.py
index 7bc8def5..cac7f183 100644
--- a/apps/activity/views.py
+++ b/apps/activity/views.py
@@ -23,6 +23,7 @@ from .tables import ActivityTable, GuestTable, EntryTable
 class ActivityCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
     model = Activity
     form_class = ActivityForm
+    extra_context = {"title": _("Create new activity")}
 
     def form_valid(self, form):
         form.instance.creater = self.request.user
@@ -37,6 +38,7 @@ class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView
     model = Activity
     table_class = ActivityTable
     ordering = ('-date_start',)
+    extra_context = {"title": _("Activities")}
 
     def get_queryset(self):
         return super().get_queryset().distinct()
@@ -44,8 +46,6 @@ class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        context['title'] = _("Activities")
-
         upcoming_activities = Activity.objects.filter(date_end__gt=datetime.now())
         context['upcoming'] = ActivityTable(
             data=upcoming_activities.filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view")),
@@ -58,6 +58,7 @@ class ActivityListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView
 class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     model = Activity
     context_object_name = "activity"
+    extra_context = {"title": _("Activity detail")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data()
@@ -74,6 +75,7 @@ class ActivityDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
 class ActivityUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
     model = Activity
     form_class = ActivityForm
+    extra_context = {"title": _("Update activity")}
 
     def get_success_url(self, **kwargs):
         return reverse_lazy('activity:activity_detail', kwargs={"pk": self.kwargs["pk"]})
@@ -84,6 +86,12 @@ class ActivityInviteView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
     form_class = GuestForm
     template_name = "activity/activity_invite.html"
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        activity = context["form"].activity
+        context["title"] = _('Invite guest to the activity "{}"').format(activity.name)
+        return context
+
     def get_form(self, form_class=None):
         form = super().get_form(form_class)
         form.activity = Activity.objects.filter(PermissionBackend.filter_queryset(self.request.user, Activity, "view"))\
diff --git a/apps/member/views.py b/apps/member/views.py
index f106a8e5..bc0ed3dd 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -53,6 +53,7 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
     form_class = UserForm
     template_name = 'member/profile_update.html'
     context_object_name = 'user_object'
+    extra_context = {"title": _("Update Profile")}
 
     profile_form = ProfileForm
 
@@ -68,7 +69,6 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
         form.fields['email'].help_text = _("This address must be valid.")
 
         context['profile_form'] = self.profile_form(instance=context['user_object'].profile)
-        context['title'] = _("Update Profile")
         return context
 
     def form_valid(self, form):
@@ -123,6 +123,7 @@ class UserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     model = User
     context_object_name = "user_object"
     template_name = "member/profile_detail.html"
+    extra_context = {"title": _("Profile detail")}
 
     def get_queryset(self, **kwargs):
         """
@@ -156,6 +157,7 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
     model = User
     table_class = UserTable
     template_name = 'member/user_list.html'
+    extra_context = {"title": _("Search user")}
 
     def get_queryset(self, **kwargs):
         """
@@ -181,13 +183,6 @@ class UserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
 
         return qs[:20]
 
-    def get_context_data(self, **kwargs):
-        context = super().get_context_data(**kwargs)
-
-        context["title"] = _("Search user")
-
-        return context
-
 
 class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     """
@@ -196,6 +191,7 @@ class ProfileAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     model = User
     template_name = 'member/profile_alias.html'
     context_object_name = 'user_object'
+    extra_context = {"title": _("Note aliases")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -209,6 +205,7 @@ class PictureUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin, Det
     Update profile picture of the user note.
     """
     form_class = ImageForm
+    extra_context = {"title": _("Update note picture")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -266,6 +263,7 @@ class ManageAuthTokens(LoginRequiredMixin, TemplateView):
     """
     model = Token
     template_name = "member/manage_auth_tokens.html"
+    extra_context = {"title": _("Manage auth token")}
 
     def get(self, request, *args, **kwargs):
         if 'regenerate' in request.GET and Token.objects.filter(user=request.user).exists():
@@ -293,6 +291,7 @@ class ClubCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
     model = Club
     form_class = ClubForm
     success_url = reverse_lazy('member:club_list')
+    extra_context = {"title": _("Create new club")}
 
     def form_valid(self, form):
         return super().form_valid(form)
@@ -304,6 +303,7 @@ class ClubListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
     """
     model = Club
     table_class = ClubTable
+    extra_context = {"title": _("Search club")}
 
     def get_queryset(self, **kwargs):
         """
@@ -328,6 +328,7 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     """
     model = Club
     context_object_name = "club"
+    extra_context = {"title": _("Club detail")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -372,6 +373,7 @@ class ClubAliasView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     model = Club
     template_name = 'member/club_alias.html'
     context_object_name = 'club'
+    extra_context = {"title": _("Note aliases")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -388,6 +390,7 @@ class ClubUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
     context_object_name = "club"
     form_class = ClubForm
     template_name = "member/club_form.html"
+    extra_context = {"title": _("Update club")}
 
     def get_queryset(self, **kwargs):
         qs = super().get_queryset(**kwargs)
@@ -421,6 +424,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
     model = Membership
     form_class = MembershipForm
     template_name = 'member/add_members.html'
+    extra_context = {"title": _("Add new member to the club")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -627,6 +631,7 @@ class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
     model = Membership
     form_class = MembershipForm
     template_name = 'member/add_members.html'
+    extra_context = {"title": _("Manage roles of an user in the club")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
diff --git a/apps/note/views.py b/apps/note/views.py
index e856eec0..61b86e92 100644
--- a/apps/note/views.py
+++ b/apps/note/views.py
@@ -30,6 +30,7 @@ class TransactionCreateView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTabl
     model = Transaction
     # Transaction history table
     table_class = HistoryTable
+    extra_context = {"title": _("Transfer money")}
 
     def get_queryset(self, **kwargs):
         return super().get_queryset(**kwargs).order_by("-created_at").all()[:20]
@@ -39,7 +40,6 @@ class TransactionCreateView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTabl
         Add some context variables in template such as page title
         """
         context = super().get_context_data(**kwargs)
-        context['title'] = _('Transfer money')
         context['amount_widget'] = AmountInput(attrs={"id": "amount"})
         context['polymorphic_ctype'] = ContentType.objects.get_for_model(Transaction).pk
         context['special_polymorphic_ctype'] = ContentType.objects.get_for_model(SpecialTransaction).pk
@@ -64,6 +64,7 @@ class TransactionTemplateCreateView(ProtectQuerysetMixin, LoginRequiredMixin, Cr
     model = TransactionTemplate
     form_class = TransactionTemplateForm
     success_url = reverse_lazy('note:template_list')
+    extra_context = {"title": _("Create new button")}
 
 
 class TransactionTemplateListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
@@ -72,6 +73,7 @@ class TransactionTemplateListView(ProtectQuerysetMixin, LoginRequiredMixin, Sing
     """
     model = TransactionTemplate
     table_class = ButtonTable
+    extra_context = {"title": _("Search button")}
 
     def get_queryset(self, **kwargs):
         """
@@ -94,6 +96,7 @@ class TransactionTemplateUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, Up
     model = TransactionTemplate
     form_class = TransactionTemplateForm
     success_url = reverse_lazy('note:template_list')
+    extra_context = {"title": _("Update button")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -130,6 +133,7 @@ class ConsoView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
     """
     model = Transaction
     template_name = "note/conso_form.html"
+    extra_context = {"title": _("Consumptions")}
 
     # Transaction history table
     table_class = HistoryTable
@@ -151,7 +155,6 @@ class ConsoView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
         context['highlighted'] = TransactionTemplate.objects.filter(highlighted=True).filter(
             PermissionBackend().filter_queryset(self.request.user, TransactionTemplate, "view")
         ).order_by('name').all()
-        context['title'] = _("Consumptions")
         context['polymorphic_ctype'] = ContentType.objects.get_for_model(RecurrentTransaction).pk
 
         # select2 compatibility
diff --git a/apps/permission/views.py b/apps/permission/views.py
index f3ed5641..83deddac 100644
--- a/apps/permission/views.py
+++ b/apps/permission/views.py
@@ -41,6 +41,7 @@ class ProtectQuerysetMixin:
 
 class RightsView(TemplateView):
     template_name = "permission/all_rights.html"
+    extra_context = {"title": _("Rights")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
diff --git a/apps/registration/views.py b/apps/registration/views.py
index bca0d217..ec6bfd1c 100644
--- a/apps/registration/views.py
+++ b/apps/registration/views.py
@@ -35,6 +35,7 @@ class UserCreateView(CreateView):
     form_class = SignUpForm
     template_name = 'registration/signup.html'
     second_form = ProfileForm
+    extra_context = {"title": _("Register new user")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -78,6 +79,7 @@ class UserValidateView(TemplateView):
     """
     title = _("Email validation")
     template_name = 'registration/email_validation_complete.html'
+    extra_context = {"title": _("Validate a registration")}
 
     def get(self, *args, **kwargs):
         """
@@ -133,7 +135,7 @@ class UserValidationEmailSentView(TemplateView):
     Display the information that the validation link has been sent.
     """
     template_name = 'registration/email_validation_email_sent.html'
-    title = _('Email validation email sent')
+    extra_context = {"title": _('Email validation email sent')}
 
 
 class UserResendValidationEmailView(LoginRequiredMixin, ProtectQuerysetMixin, DetailView):
@@ -141,6 +143,7 @@ class UserResendValidationEmailView(LoginRequiredMixin, ProtectQuerysetMixin, De
     Rensend the email validation link.
     """
     model = User
+    extra_context = {"title": _("Resend email validation link")}
 
     def get(self, request, *args, **kwargs):
         user = self.get_object()
@@ -158,6 +161,7 @@ class FutureUserListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableVi
     model = User
     table_class = FutureUserTable
     template_name = 'registration/future_user_list.html'
+    extra_context = {"title": _("Pre-registered users list")}
 
     def get_queryset(self, **kwargs):
         """
@@ -199,6 +203,7 @@ class FutureUserDetailView(ProtectQuerysetMixin, LoginRequiredMixin, FormMixin,
     form_class = ValidationForm
     context_object_name = "user_object"
     template_name = "registration/future_profile_detail.html"
+    extra_context = {"title": _("Registration detail")}
 
     def post(self, request, *args, **kwargs):
         form = self.get_form()
@@ -355,6 +360,7 @@ class FutureUserInvalidateView(ProtectQuerysetMixin, LoginRequiredMixin, View):
     """
     Delete a pre-registered user.
     """
+    extra_context = {"title": _("Invalidate pre-registration")}
 
     def get(self, request, *args, **kwargs):
         """
diff --git a/apps/treasury/views.py b/apps/treasury/views.py
index 1ab87f09..07d480aa 100644
--- a/apps/treasury/views.py
+++ b/apps/treasury/views.py
@@ -15,6 +15,7 @@ from django.http import HttpResponse
 from django.shortcuts import redirect
 from django.template.loader import render_to_string
 from django.urls import reverse_lazy
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import CreateView, UpdateView, DetailView
 from django.views.generic.base import View, TemplateView
 from django.views.generic.edit import BaseFormView
@@ -35,6 +36,7 @@ class InvoiceCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
     """
     model = Invoice
     form_class = InvoiceForm
+    extra_context = {"title": _("Create new invoice")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -77,6 +79,7 @@ class InvoiceListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView)
     """
     model = Invoice
     table_class = InvoiceTable
+    extra_context = {"title": _("Invoices list")}
 
 
 class InvoiceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
@@ -85,6 +88,7 @@ class InvoiceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
     """
     model = Invoice
     form_class = InvoiceForm
+    extra_context = {"title": _("Update an invoice")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -198,6 +202,7 @@ class RemittanceCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView)
     """
     model = Remittance
     form_class = RemittanceForm
+    extra_context = {"title": _("Create a new remittance")}
 
     def get_success_url(self):
         return reverse_lazy('treasury:remittance_list')
@@ -218,6 +223,7 @@ class RemittanceListView(LoginRequiredMixin, TemplateView):
     List existing Remittances
     """
     template_name = "treasury/remittance_list.html"
+    extra_context = {"title": _("Remittances list")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -267,6 +273,7 @@ class RemittanceUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView)
     """
     model = Remittance
     form_class = RemittanceForm
+    extra_context = {"title": _("Update a remittance")}
 
     def get_success_url(self):
         return reverse_lazy('treasury:remittance_list')
@@ -289,9 +296,9 @@ class LinkTransactionToRemittanceView(ProtectQuerysetMixin, LoginRequiredMixin,
     """
     Attach a special transaction to a remittance
     """
-
     model = SpecialTransactionProxy
     form_class = LinkTransactionToRemittanceForm
+    extra_context = {"title": _("Attach a transaction to a remittance")}
 
     def get_success_url(self):
         return reverse_lazy('treasury:remittance_list')
@@ -335,6 +342,7 @@ class SogeCreditListView(LoginRequiredMixin, ProtectQuerysetMixin, SingleTableVi
     """
     model = SogeCredit
     table_class = SogeCreditTable
+    extra_context = {"title": _("List of credits from the Société générale")}
 
     def get_queryset(self, **kwargs):
         """
@@ -373,6 +381,7 @@ class SogeCreditManageView(LoginRequiredMixin, ProtectQuerysetMixin, BaseFormVie
     """
     model = SogeCredit
     form_class = Form
+    extra_context = {"title": _("Manage credits from the Société générale")}
 
     def form_valid(self, form):
         if "validate" in form.data:
diff --git a/apps/wei/views.py b/apps/wei/views.py
index be73370f..dde9fe78 100644
--- a/apps/wei/views.py
+++ b/apps/wei/views.py
@@ -52,6 +52,7 @@ class WEIListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
     model = WEIClub
     table_class = WEITable
     ordering = '-year'
+    extra_context = {"title": _("Search WEI")}
 
 
 class WEICreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
@@ -60,6 +61,7 @@ class WEICreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
     """
     model = WEIClub
     form_class = WEIForm
+    extra_context = {"title": _("Create WEI")}
 
     def form_valid(self, form):
         form.instance.requires_membership = True
@@ -79,6 +81,7 @@ class WEIDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     """
     model = WEIClub
     context_object_name = "club"
+    extra_context = {"title": _("WEI Detail")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -173,6 +176,7 @@ class WEIMembershipsView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableVi
     """
     model = WEIMembership
     table_class = WEIMembershipTable
+    extra_context = {"title": _("View members of the WEI")}
 
     def dispatch(self, request, *args, **kwargs):
         self.club = WEIClub.objects.get(pk=self.kwargs["pk"])
@@ -210,6 +214,7 @@ class WEIRegistrationsView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTable
     """
     model = WEIRegistration
     table_class = WEIRegistrationTable
+    extra_context = {"title": _("View registrations to the WEI")}
 
     def dispatch(self, request, *args, **kwargs):
         self.club = WEIClub.objects.get(pk=self.kwargs["pk"])
@@ -246,6 +251,7 @@ class WEIUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
     model = WEIClub
     context_object_name = "club"
     form_class = WEIForm
+    extra_context = {"title": _("Update the WEI")}
 
     def dispatch(self, request, *args, **kwargs):
         wei = self.get_object()
@@ -266,6 +272,7 @@ class BusCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
     """
     model = Bus
     form_class = BusForm
+    extra_context = {"title": _("Create new bus")}
 
     def dispatch(self, request, *args, **kwargs):
         wei = WEIClub.objects.get(pk=self.kwargs["pk"])
@@ -296,6 +303,7 @@ class BusUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
     """
     model = Bus
     form_class = BusForm
+    extra_context = {"title": _("Update bus")}
 
     def dispatch(self, request, *args, **kwargs):
         wei = self.get_object().wei
@@ -325,6 +333,7 @@ class BusManageView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     Manage Bus
     """
     model = Bus
+    extra_context = {"title": _("Manage bus")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -351,6 +360,7 @@ class BusTeamCreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
     """
     model = BusTeam
     form_class = BusTeamForm
+    extra_context = {"title": _("Create new team")}
 
     def dispatch(self, request, *args, **kwargs):
         wei = WEIClub.objects.get(buses__pk=self.kwargs["pk"])
@@ -382,6 +392,7 @@ class BusTeamUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
     """
     model = BusTeam
     form_class = BusTeamForm
+    extra_context = {"title": _("Update team")}
 
     def dispatch(self, request, *args, **kwargs):
         wei = self.get_object().bus.wei
@@ -412,6 +423,7 @@ class BusTeamManageView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
     Manage Bus team
     """
     model = BusTeam
+    extra_context = {"title": _("Manage WEI team")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -433,6 +445,7 @@ class WEIRegister1AView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
     """
     model = WEIRegistration
     form_class = WEIRegistrationForm
+    extra_context = {"title": _("Register first year student to the WEI")}
 
     def dispatch(self, request, *args, **kwargs):
         wei = WEIClub.objects.get(pk=self.kwargs["wei_pk"])
@@ -487,6 +500,7 @@ class WEIRegister2AView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
     """
     model = WEIRegistration
     form_class = WEIRegistrationForm
+    extra_context = {"title": _("Register old student to the WEI")}
 
     def dispatch(self, request, *args, **kwargs):
         wei = WEIClub.objects.get(pk=self.kwargs["wei_pk"])
@@ -564,6 +578,7 @@ class WEIUpdateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Update
     """
     model = WEIRegistration
     form_class = WEIRegistrationForm
+    extra_context = {"title": _("Update WEI Registration")}
 
     def get_queryset(self, **kwargs):
         return WEIRegistration.objects
@@ -653,6 +668,7 @@ class WEIDeleteRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Delete
     Delete a non-validated WEI registration
     """
     model = WEIRegistration
+    extra_context = {"title": _("Delete WEI registration")}
 
     def dispatch(self, request, *args, **kwargs):
         object = self.get_object()
@@ -682,6 +698,7 @@ class WEIValidateRegistrationView(ProtectQuerysetMixin, LoginRequiredMixin, Crea
     """
     model = WEIMembership
     form_class = WEIMembershipForm
+    extra_context = {"title": _("Validate WEI registration")}
 
     def dispatch(self, request, *args, **kwargs):
         wei = WEIRegistration.objects.get(pk=self.kwargs["pk"]).wei
@@ -799,6 +816,7 @@ class WEISurveyView(LoginRequiredMixin, BaseFormView, DetailView):
     model = WEIRegistration
     template_name = "wei/survey.html"
     survey = None
+    extra_context = {"title": _("Survey WEI")}
 
     def dispatch(self, request, *args, **kwargs):
         obj = self.get_object()
@@ -836,7 +854,6 @@ class WEISurveyView(LoginRequiredMixin, BaseFormView, DetailView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["club"] = self.object.wei
-        context["title"] = _("Survey WEI")
         return context
 
     def form_valid(self, form):
@@ -852,21 +869,21 @@ class WEISurveyView(LoginRequiredMixin, BaseFormView, DetailView):
 
 class WEISurveyEndView(LoginRequiredMixin, TemplateView):
     template_name = "wei/survey_end.html"
+    extra_context = {"title": _("Survey WEI")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["club"] = WEIRegistration.objects.get(pk=self.kwargs["pk"]).wei
-        context["title"] = _("Survey WEI")
         return context
 
 
 class WEIClosedView(LoginRequiredMixin, TemplateView):
     template_name = "wei/survey_closed.html"
+    extra_context = {"title": _("Survey WEI")}
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context["club"] = WEIClub.objects.get(pk=self.kwargs["pk"])
-        context["title"] = _("Survey WEI")
         return context
 
 
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index fffde96a..e4526352 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-29 22:54+0200\n"
+"POT-Creation-Date: 2020-07-30 17:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -46,7 +46,7 @@ msgstr ""
 #: apps/activity/models.py:23 apps/activity/models.py:48
 #: apps/member/models.py:151 apps/note/models/notes.py:188
 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45
-#: apps/note/models/transactions.py:261 apps/permission/models.py:321
+#: apps/note/models/transactions.py:261 apps/permission/models.py:323
 #: apps/wei/models.py:65 apps/wei/models.py:117
 #: templates/member/club_info.html:13 templates/member/profile_info.html:14
 #: templates/registration/future_profile_detail.html:16
@@ -71,14 +71,14 @@ msgid "activity types"
 msgstr ""
 
 #: apps/activity/models.py:53 apps/note/models/transactions.py:81
-#: apps/permission/models.py:102 apps/permission/models.py:181
+#: apps/permission/models.py:104 apps/permission/models.py:183
 #: apps/wei/models.py:71 apps/wei/models.py:128
 #: templates/activity/activity_detail.html:16
 msgid "description"
 msgstr ""
 
 #: apps/activity/models.py:60 apps/note/models/notes.py:164
-#: apps/note/models/transactions.py:66 apps/permission/models.py:156
+#: apps/note/models/transactions.py:66 apps/permission/models.py:158
 #: templates/activity/activity_detail.html:19
 msgid "type"
 msgstr ""
@@ -186,12 +186,12 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: apps/activity/tables.py:77 apps/member/forms.py:105
+#: apps/activity/tables.py:77 apps/member/forms.py:104
 #: apps/registration/forms.py:64 apps/treasury/forms.py:120
 msgid "Last name"
 msgstr ""
 
-#: apps/activity/tables.py:79 apps/member/forms.py:110
+#: apps/activity/tables.py:79 apps/member/forms.py:109
 #: apps/registration/forms.py:69 apps/treasury/forms.py:122
 #: templates/note/transaction_form.html:126
 msgid "First name"
@@ -205,11 +205,27 @@ msgstr ""
 msgid "Balance"
 msgstr ""
 
-#: apps/activity/views.py:47 templates/base.html:121
+#: apps/activity/views.py:26
+msgid "Create new activity"
+msgstr ""
+
+#: apps/activity/views.py:41 templates/base.html:121
 msgid "Activities"
 msgstr ""
 
-#: apps/activity/views.py:163
+#: apps/activity/views.py:61
+msgid "Activity detail"
+msgstr ""
+
+#: apps/activity/views.py:78
+msgid "Update activity"
+msgstr ""
+
+#: apps/activity/views.py:92
+msgid "Invite guest to the activity \"{}\""
+msgstr ""
+
+#: apps/activity/views.py:171
 msgid "Entry for activity \"{}\""
 msgstr ""
 
@@ -225,7 +241,7 @@ msgstr ""
 msgid "IP Address"
 msgstr ""
 
-#: apps/logs/models.py:35 apps/permission/models.py:126
+#: apps/logs/models.py:35 apps/permission/models.py:128
 msgid "model"
 msgstr ""
 
@@ -245,12 +261,12 @@ msgstr ""
 msgid "create"
 msgstr ""
 
-#: apps/logs/models.py:61 apps/note/tables.py:145
+#: apps/logs/models.py:61 apps/note/tables.py:143
 #: templates/activity/activity_detail.html:67
 msgid "edit"
 msgstr ""
 
-#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:150
+#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:148
 #: apps/wei/tables.py:65
 msgid "delete"
 msgstr ""
@@ -279,35 +295,35 @@ msgstr ""
 msgid "member"
 msgstr ""
 
-#: apps/member/forms.py:59 apps/member/views.py:78
+#: apps/member/forms.py:58 apps/member/views.py:81
 msgid "An alias with a similar name already exists."
 msgstr ""
 
-#: apps/member/forms.py:84 apps/registration/forms.py:44
+#: apps/member/forms.py:83 apps/registration/forms.py:44
 msgid "Inscription paid by Société Générale"
 msgstr ""
 
-#: apps/member/forms.py:86 apps/registration/forms.py:46
+#: apps/member/forms.py:85 apps/registration/forms.py:46
 msgid "Check this case is the Société Générale paid the inscription."
 msgstr ""
 
-#: apps/member/forms.py:91 apps/registration/forms.py:51
+#: apps/member/forms.py:90 apps/registration/forms.py:51
 msgid "Credit type"
 msgstr ""
 
-#: apps/member/forms.py:92 apps/registration/forms.py:52
+#: apps/member/forms.py:91 apps/registration/forms.py:52
 msgid "No credit"
 msgstr ""
 
-#: apps/member/forms.py:94
+#: apps/member/forms.py:93
 msgid "You can credit the note of the user."
 msgstr ""
 
-#: apps/member/forms.py:98 apps/registration/forms.py:57
+#: apps/member/forms.py:97 apps/registration/forms.py:57
 msgid "Credit amount"
 msgstr ""
 
-#: apps/member/forms.py:115 apps/registration/forms.py:74
+#: apps/member/forms.py:114 apps/registration/forms.py:74
 #: apps/treasury/forms.py:124 templates/note/transaction_form.html:132
 msgid "Bank"
 msgstr ""
@@ -509,7 +525,7 @@ msgstr ""
 msgid "fee"
 msgstr ""
 
-#: apps/member/models.py:303 apps/member/views.py:528 apps/wei/views.py:770
+#: apps/member/models.py:303 apps/member/views.py:535 apps/wei/views.py:787
 msgid "User is not a member of the parent club"
 msgstr ""
 
@@ -518,7 +534,7 @@ msgstr ""
 msgid "The role {role} does not apply to the club {club}."
 msgstr ""
 
-#: apps/member/models.py:321 apps/member/views.py:537
+#: apps/member/models.py:321 apps/member/views.py:544
 msgid "User is already a member of the club"
 msgstr ""
 
@@ -539,45 +555,85 @@ msgstr ""
 msgid "Renew"
 msgstr ""
 
-#: apps/member/views.py:65 apps/registration/forms.py:23
-msgid "This address must be valid."
-msgstr ""
-
-#: apps/member/views.py:68 templates/member/profile_info.html:47
+#: apps/member/views.py:56 templates/member/profile_info.html:47
 #: templates/registration/future_profile_detail.html:48
 #: templates/wei/weimembership_form.html:130
 msgid "Update Profile"
 msgstr ""
 
-#: apps/member/views.py:184
+#: apps/member/views.py:69 apps/registration/forms.py:23
+msgid "This address must be valid."
+msgstr ""
+
+#: apps/member/views.py:126
+msgid "Profile detail"
+msgstr ""
+
+#: apps/member/views.py:160
 msgid "Search user"
 msgstr ""
 
-#: apps/member/views.py:523 apps/wei/views.py:761
+#: apps/member/views.py:194 apps/member/views.py:376
+msgid "Note aliases"
+msgstr ""
+
+#: apps/member/views.py:208
+msgid "Update note picture"
+msgstr ""
+
+#: apps/member/views.py:266 templates/member/profile_info.html:43
+msgid "Manage auth token"
+msgstr ""
+
+#: apps/member/views.py:294
+msgid "Create new club"
+msgstr ""
+
+#: apps/member/views.py:306
+msgid "Search club"
+msgstr ""
+
+#: apps/member/views.py:331
+msgid "Club detail"
+msgstr ""
+
+#: apps/member/views.py:393
+msgid "Update club"
+msgstr ""
+
+#: apps/member/views.py:427
+msgid "Add new member to the club"
+msgstr ""
+
+#: apps/member/views.py:530 apps/wei/views.py:778
 msgid ""
 "This user don't have enough money to join this club, and can't have a "
 "negative balance."
 msgstr ""
 
-#: apps/member/views.py:541
+#: apps/member/views.py:548
 msgid "The membership must start after {:%m-%d-%Y}."
 msgstr ""
 
-#: apps/member/views.py:546
+#: apps/member/views.py:553
 msgid "The membership must begin before {:%m-%d-%Y}."
 msgstr ""
 
-#: apps/member/views.py:563 apps/member/views.py:565 apps/member/views.py:567
-#: apps/registration/views.py:290 apps/registration/views.py:292
-#: apps/registration/views.py:294
+#: apps/member/views.py:570 apps/member/views.py:572 apps/member/views.py:574
+#: apps/registration/views.py:295 apps/registration/views.py:297
+#: apps/registration/views.py:299
 msgid "This field is required."
 msgstr ""
 
-#: apps/note/admin.py:122 apps/note/models/transactions.py:106
+#: apps/member/views.py:634
+msgid "Manage roles of an user in the club"
+msgstr ""
+
+#: apps/note/admin.py:121 apps/note/models/transactions.py:106
 msgid "source"
 msgstr ""
 
-#: apps/note/admin.py:130 apps/note/admin.py:172
+#: apps/note/admin.py:129 apps/note/admin.py:171
 #: apps/note/models/transactions.py:55 apps/note/models/transactions.py:119
 msgid "destination"
 msgstr ""
@@ -814,113 +870,129 @@ msgstr ""
 msgid "No reason specified"
 msgstr ""
 
-#: apps/note/tables.py:122 apps/note/tables.py:152 apps/wei/tables.py:66
+#: apps/note/tables.py:122 apps/note/tables.py:150 apps/wei/tables.py:66
 #: templates/treasury/sogecredit_detail.html:59
 #: templates/wei/weiregistration_confirm_delete.html:32
 msgid "Delete"
 msgstr ""
 
-#: apps/note/tables.py:147 apps/wei/tables.py:42 apps/wei/tables.py:43
+#: apps/note/tables.py:145 apps/wei/tables.py:42 apps/wei/tables.py:43
 #: templates/member/club_info.html:67 templates/note/conso_form.html:128
 #: templates/wei/bus_tables.html:15 templates/wei/busteam_tables.html:15
 #: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:68
 msgid "Edit"
 msgstr ""
 
-#: apps/note/views.py:41
+#: apps/note/views.py:33
 msgid "Transfer money"
 msgstr ""
 
-#: apps/note/views.py:140 templates/base.html:94
-msgid "Consumptions"
+#: apps/note/views.py:67
+msgid "Create new button"
 msgstr ""
 
-#: apps/permission/models.py:81
-#, python-brace-format
-msgid "Can {type} {model}.{field} in {query}"
+#: apps/note/views.py:76
+msgid "Search button"
+msgstr ""
+
+#: apps/note/views.py:99
+msgid "Update button"
+msgstr ""
+
+#: apps/note/views.py:136 templates/base.html:94
+msgid "Consumptions"
 msgstr ""
 
 #: apps/permission/models.py:83
 #, python-brace-format
+msgid "Can {type} {model}.{field} in {query}"
+msgstr ""
+
+#: apps/permission/models.py:85
+#, python-brace-format
 msgid "Can {type} {model} in {query}"
 msgstr ""
 
-#: apps/permission/models.py:96
+#: apps/permission/models.py:98
 msgid "rank"
 msgstr ""
 
-#: apps/permission/models.py:109
+#: apps/permission/models.py:111
 msgid "permission mask"
 msgstr ""
 
-#: apps/permission/models.py:110
+#: apps/permission/models.py:112
 msgid "permission masks"
 msgstr ""
 
-#: apps/permission/models.py:150
+#: apps/permission/models.py:152
 msgid "query"
 msgstr ""
 
-#: apps/permission/models.py:163
+#: apps/permission/models.py:165
 msgid "mask"
 msgstr ""
 
-#: apps/permission/models.py:169
+#: apps/permission/models.py:171
 msgid "field"
 msgstr ""
 
-#: apps/permission/models.py:174
+#: apps/permission/models.py:176
 msgid ""
 "Tells if the permission should be granted even if the membership of the user "
 "is expired."
 msgstr ""
 
-#: apps/permission/models.py:175 templates/permission/all_rights.html:26
+#: apps/permission/models.py:177 templates/permission/all_rights.html:26
 msgid "permanent"
 msgstr ""
 
-#: apps/permission/models.py:186
+#: apps/permission/models.py:188
 msgid "permission"
 msgstr ""
 
-#: apps/permission/models.py:187 apps/permission/models.py:326
+#: apps/permission/models.py:189 apps/permission/models.py:328
 msgid "permissions"
 msgstr ""
 
-#: apps/permission/models.py:192
+#: apps/permission/models.py:194
 msgid "Specifying field applies only to view and change permission types."
 msgstr ""
 
-#: apps/permission/models.py:331
+#: apps/permission/models.py:333
 msgid "for club"
 msgstr ""
 
-#: apps/permission/models.py:341 apps/permission/models.py:342
+#: apps/permission/models.py:343 apps/permission/models.py:344
 msgid "role permissions"
 msgstr ""
 
-#: apps/permission/signals.py:62
+#: apps/permission/signals.py:63
 #, python-brace-format
 msgid ""
 "You don't have the permission to change the field {field} on this instance "
 "of model {app_label}.{model_name}."
 msgstr ""
 
-#: apps/permission/signals.py:72
+#: apps/permission/signals.py:73
 #, python-brace-format
 msgid ""
 "You don't have the permission to add this instance of model {app_label}."
 "{model_name}."
 msgstr ""
 
-#: apps/permission/signals.py:99
+#: apps/permission/signals.py:101
 #, python-brace-format
 msgid ""
 "You don't have the permission to delete this instance of model {app_label}."
 "{model_name}."
 msgstr ""
 
-#: apps/permission/views.py:48
+#: apps/permission/views.py:44 templates/base.html:135
+msgid "Rights"
+msgstr ""
+
+#: apps/permission/views.py:49
 msgid "All rights"
 msgstr ""
 
@@ -946,35 +1018,59 @@ msgstr ""
 msgid "Join Kfet Club"
 msgstr ""
 
-#: apps/registration/views.py:79
+#: apps/registration/views.py:38
+msgid "Register new user"
+msgstr ""
+
+#: apps/registration/views.py:80
 msgid "Email validation"
 msgstr ""
 
-#: apps/registration/views.py:125
+#: apps/registration/views.py:82
+msgid "Validate a registration"
+msgstr ""
+
+#: apps/registration/views.py:127
 msgid "Email validation unsuccessful"
 msgstr ""
 
-#: apps/registration/views.py:136
+#: apps/registration/views.py:138
 msgid "Email validation email sent"
 msgstr ""
 
-#: apps/registration/views.py:189
+#: apps/registration/views.py:146
+msgid "Resend email validation link"
+msgstr ""
+
+#: apps/registration/views.py:164
+msgid "Pre-registered users list"
+msgstr ""
+
+#: apps/registration/views.py:193
 msgid "Unregistered users"
 msgstr ""
 
-#: apps/registration/views.py:256
+#: apps/registration/views.py:206
+msgid "Registration detail"
+msgstr ""
+
+#: apps/registration/views.py:261
 msgid "You must join the BDE."
 msgstr ""
 
-#: apps/registration/views.py:278
+#: apps/registration/views.py:283
 msgid "You must join BDE club before joining Kfet club."
 msgstr ""
 
-#: apps/registration/views.py:283
+#: apps/registration/views.py:288
 msgid ""
 "The entered amount is not enough for the memberships, should be at least {}"
 msgstr ""
 
+#: apps/registration/views.py:363
+msgid "Invalidate pre-registration"
+msgstr ""
+
 #: apps/treasury/apps.py:12 templates/base.html:126
 msgid "Treasury"
 msgstr ""
@@ -1172,6 +1268,43 @@ msgstr ""
 msgid "No"
 msgstr ""
 
+#: apps/treasury/views.py:39
+msgid "Create new invoice"
+msgstr ""
+
+#: apps/treasury/views.py:82 templates/treasury/invoice_form.html:6
+msgid "Invoices list"
+msgstr ""
+
+#: apps/treasury/views.py:91
+msgid "Update an invoice"
+msgstr ""
+
+#: apps/treasury/views.py:205
+msgid "Create a new remittance"
+msgstr ""
+
+#: apps/treasury/views.py:226 templates/treasury/remittance_form.html:9
+#: templates/treasury/specialtransactionproxy_form.html:7
+msgid "Remittances list"
+msgstr ""
+
+#: apps/treasury/views.py:276
+msgid "Update a remittance"
+msgstr ""
+
+#: apps/treasury/views.py:301
+msgid "Attach a transaction to a remittance"
+msgstr ""
+
+#: apps/treasury/views.py:345
+msgid "List of credits from the Société générale"
+msgstr ""
+
+#: apps/treasury/views.py:384
+msgid "Manage credits from the Société générale"
+msgstr ""
+
 #: apps/wei/apps.py:10 apps/wei/models.py:48 apps/wei/models.py:49
 #: apps/wei/models.py:60 apps/wei/models.py:166 templates/base.html:131
 msgid "WEI"
@@ -1389,45 +1522,113 @@ msgstr ""
 msgid "members"
 msgstr ""
 
-#: apps/wei/views.py:203
+#: apps/wei/views.py:55
+msgid "Search WEI"
+msgstr ""
+
+#: apps/wei/views.py:64 templates/wei/weiclub_list.html:9
+msgid "Create WEI"
+msgstr ""
+
+#: apps/wei/views.py:84
+msgid "WEI Detail"
+msgstr ""
+
+#: apps/wei/views.py:179
+msgid "View members of the WEI"
+msgstr ""
+
+#: apps/wei/views.py:207
 msgid "Find WEI Membership"
 msgstr ""
 
-#: apps/wei/views.py:238
+#: apps/wei/views.py:217
+msgid "View registrations to the WEI"
+msgstr ""
+
+#: apps/wei/views.py:243
 msgid "Find WEI Registration"
 msgstr ""
 
-#: apps/wei/views.py:447 templates/wei/weiclub_info.html:62
+#: apps/wei/views.py:254
+msgid "Update the WEI"
+msgstr ""
+
+#: apps/wei/views.py:275
+msgid "Create new bus"
+msgstr ""
+
+#: apps/wei/views.py:306
+msgid "Update bus"
+msgstr ""
+
+#: apps/wei/views.py:336
+msgid "Manage bus"
+msgstr ""
+
+#: apps/wei/views.py:363
+msgid "Create new team"
+msgstr ""
+
+#: apps/wei/views.py:395
+msgid "Update team"
+msgstr ""
+
+#: apps/wei/views.py:426
+msgid "Manage WEI team"
+msgstr ""
+
+#: apps/wei/views.py:448
+msgid "Register first year student to the WEI"
+msgstr ""
+
+#: apps/wei/views.py:460 templates/wei/weiclub_info.html:62
 msgid "Register 1A"
 msgstr ""
 
-#: apps/wei/views.py:468 apps/wei/views.py:537
+#: apps/wei/views.py:481 apps/wei/views.py:551
 msgid "This user is already registered to this WEI."
 msgstr ""
 
-#: apps/wei/views.py:473
+#: apps/wei/views.py:486
 msgid ""
 "This user can't be in her/his first year since he/she has already participed "
 "to a WEI."
 msgstr ""
 
-#: apps/wei/views.py:501 templates/wei/weiclub_info.html:65
+#: apps/wei/views.py:503
+msgid "Register old student to the WEI"
+msgstr ""
+
+#: apps/wei/views.py:515 templates/wei/weiclub_info.html:65
 msgid "Register 2A+"
 msgstr ""
 
-#: apps/wei/views.py:519 apps/wei/views.py:606
+#: apps/wei/views.py:533 apps/wei/views.py:621
 msgid "You already opened an account in the Société générale."
 msgstr ""
 
-#: apps/wei/views.py:666
+#: apps/wei/views.py:581
+msgid "Update WEI Registration"
+msgstr ""
+
+#: apps/wei/views.py:671
+msgid "Delete WEI registration"
+msgstr ""
+
+#: apps/wei/views.py:682
 msgid "You don't have the right to delete this WEI registration."
 msgstr ""
 
-#: apps/wei/views.py:765
+#: apps/wei/views.py:701
+msgid "Validate WEI registration"
+msgstr ""
+
+#: apps/wei/views.py:782
 msgid "This user didn't give her/his caution check."
 msgstr ""
 
-#: apps/wei/views.py:839 apps/wei/views.py:859 apps/wei/views.py:869
+#: apps/wei/views.py:819 apps/wei/views.py:872 apps/wei/views.py:882
 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12
 #: templates/wei/survey_end.html:12
 msgid "Survey WEI"
@@ -1562,10 +1763,6 @@ msgstr ""
 msgid "Registrations"
 msgstr ""
 
-#: templates/base.html:135
-msgid "Rights"
-msgstr ""
-
 #: templates/base.html:139
 msgid "Administration"
 msgstr ""
@@ -1623,15 +1820,11 @@ msgstr ""
 msgid "View Profile"
 msgstr ""
 
-#: templates/member/club_list.html:8
-msgid "search clubs"
-msgstr ""
-
-#: templates/member/club_list.html:12
+#: templates/member/club_list.html:9
 msgid "Create club"
 msgstr ""
 
-#: templates/member/club_list.html:19
+#: templates/member/club_list.html:16
 msgid "Club listing"
 msgstr ""
 
@@ -1675,10 +1868,6 @@ msgstr ""
 msgid "Change password"
 msgstr ""
 
-#: templates/member/profile_info.html:43
-msgid "Manage auth token"
-msgstr ""
-
 #: templates/member/profile_tables.html:7
 #: templates/registration/future_profile_detail.html:28
 #: templates/wei/weimembership_form.html:30
@@ -1776,27 +1965,23 @@ msgstr ""
 msgid "Current price"
 msgstr ""
 
-#: templates/note/transactiontemplate_list.html:9
-msgid "Search button"
-msgstr ""
-
-#: templates/note/transactiontemplate_list.html:11
+#: templates/note/transactiontemplate_list.html:8
 msgid "Name of the button..."
 msgstr ""
 
-#: templates/note/transactiontemplate_list.html:21
+#: templates/note/transactiontemplate_list.html:10
 msgid "New button"
 msgstr ""
 
-#: templates/note/transactiontemplate_list.html:28
+#: templates/note/transactiontemplate_list.html:17
 msgid "buttons listing "
 msgstr ""
 
-#: templates/note/transactiontemplate_list.html:86
+#: templates/note/transactiontemplate_list.html:55
 msgid "button successfully deleted "
 msgstr ""
 
-#: templates/note/transactiontemplate_list.html:90
+#: templates/note/transactiontemplate_list.html:59
 msgid "Unable to delete button "
 msgstr ""
 
@@ -1981,10 +2166,6 @@ msgid ""
 "by following the link you received."
 msgstr ""
 
-#: templates/treasury/invoice_form.html:6
-msgid "Invoices list"
-msgstr ""
-
 #: templates/treasury/invoice_form.html:41
 msgid "Add product"
 msgstr ""
@@ -2007,11 +2188,6 @@ msgstr ""
 msgid "Remittance #"
 msgstr ""
 
-#: templates/treasury/remittance_form.html:9
-#: templates/treasury/specialtransactionproxy_form.html:7
-msgid "Remittances list"
-msgstr ""
-
 #: templates/treasury/remittance_form.html:12
 msgid "Count"
 msgstr ""
@@ -2161,15 +2337,7 @@ msgstr ""
 msgid "View WEI"
 msgstr ""
 
-#: templates/wei/weiclub_list.html:8
-msgid "search WEI"
-msgstr ""
-
-#: templates/wei/weiclub_list.html:12
-msgid "Create WEI"
-msgstr ""
-
-#: templates/wei/weiclub_list.html:19
+#: templates/wei/weiclub_list.html:16
 msgid "WEI listing"
 msgstr ""
 
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 2f499334..35ecff90 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-29 22:54+0200\n"
+"POT-Creation-Date: 2020-07-30 17:22+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,7 +47,7 @@ msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité."
 #: apps/activity/models.py:23 apps/activity/models.py:48
 #: apps/member/models.py:151 apps/note/models/notes.py:188
 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45
-#: apps/note/models/transactions.py:261 apps/permission/models.py:321
+#: apps/note/models/transactions.py:261 apps/permission/models.py:323
 #: apps/wei/models.py:65 apps/wei/models.py:117
 #: templates/member/club_info.html:13 templates/member/profile_info.html:14
 #: templates/registration/future_profile_detail.html:16
@@ -72,14 +72,14 @@ msgid "activity types"
 msgstr "types d'activité"
 
 #: apps/activity/models.py:53 apps/note/models/transactions.py:81
-#: apps/permission/models.py:102 apps/permission/models.py:181
+#: apps/permission/models.py:104 apps/permission/models.py:183
 #: apps/wei/models.py:71 apps/wei/models.py:128
 #: templates/activity/activity_detail.html:16
 msgid "description"
 msgstr "description"
 
 #: apps/activity/models.py:60 apps/note/models/notes.py:164
-#: apps/note/models/transactions.py:66 apps/permission/models.py:156
+#: apps/note/models/transactions.py:66 apps/permission/models.py:158
 #: templates/activity/activity_detail.html:19
 msgid "type"
 msgstr "type"
@@ -187,12 +187,12 @@ msgstr "supprimer"
 msgid "Type"
 msgstr "Type"
 
-#: apps/activity/tables.py:77 apps/member/forms.py:105
+#: apps/activity/tables.py:77 apps/member/forms.py:104
 #: apps/registration/forms.py:64 apps/treasury/forms.py:120
 msgid "Last name"
 msgstr "Nom de famille"
 
-#: apps/activity/tables.py:79 apps/member/forms.py:110
+#: apps/activity/tables.py:79 apps/member/forms.py:109
 #: apps/registration/forms.py:69 apps/treasury/forms.py:122
 #: templates/note/transaction_form.html:126
 msgid "First name"
@@ -206,11 +206,27 @@ msgstr "Note"
 msgid "Balance"
 msgstr "Solde du compte"
 
-#: apps/activity/views.py:47 templates/base.html:121
+#: apps/activity/views.py:26
+msgid "Create new activity"
+msgstr "Créer une nouvelle activité"
+
+#: apps/activity/views.py:41 templates/base.html:121
 msgid "Activities"
 msgstr "Activités"
 
-#: apps/activity/views.py:163
+#: apps/activity/views.py:61
+msgid "Activity detail"
+msgstr "Détails de l'activité"
+
+#: apps/activity/views.py:78
+msgid "Update activity"
+msgstr "Modifier l'activité"
+
+#: apps/activity/views.py:92
+msgid "Invite guest to the activity \"{}\""
+msgstr "Invitation pour l'activité « {} »"
+
+#: apps/activity/views.py:171
 msgid "Entry for activity \"{}\""
 msgstr "Entrées pour l'activité « {} »"
 
@@ -226,7 +242,7 @@ msgstr "Logs"
 msgid "IP Address"
 msgstr "Adresse IP"
 
-#: apps/logs/models.py:35 apps/permission/models.py:126
+#: apps/logs/models.py:35 apps/permission/models.py:128
 msgid "model"
 msgstr "Modèle"
 
@@ -246,12 +262,12 @@ msgstr "Nouvelles données"
 msgid "create"
 msgstr "Créer"
 
-#: apps/logs/models.py:61 apps/note/tables.py:145
+#: apps/logs/models.py:61 apps/note/tables.py:143
 #: templates/activity/activity_detail.html:67
 msgid "edit"
 msgstr "Modifier"
 
-#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:150
+#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:148
 #: apps/wei/tables.py:65
 msgid "delete"
 msgstr "Supprimer"
@@ -280,35 +296,35 @@ msgstr "journaux de modifications"
 msgid "member"
 msgstr "adhérent"
 
-#: apps/member/forms.py:59 apps/member/views.py:78
+#: apps/member/forms.py:58 apps/member/views.py:81
 msgid "An alias with a similar name already exists."
 msgstr "Un alias avec un nom similaire existe déjà."
 
-#: apps/member/forms.py:84 apps/registration/forms.py:44
+#: apps/member/forms.py:83 apps/registration/forms.py:44
 msgid "Inscription paid by Société Générale"
 msgstr "Inscription payée par la Société générale"
 
-#: apps/member/forms.py:86 apps/registration/forms.py:46
+#: apps/member/forms.py:85 apps/registration/forms.py:46
 msgid "Check this case is the Société Générale paid the inscription."
 msgstr "Cochez cette case si la Société Générale a payé l'inscription."
 
-#: apps/member/forms.py:91 apps/registration/forms.py:51
+#: apps/member/forms.py:90 apps/registration/forms.py:51
 msgid "Credit type"
 msgstr "Type de rechargement"
 
-#: apps/member/forms.py:92 apps/registration/forms.py:52
+#: apps/member/forms.py:91 apps/registration/forms.py:52
 msgid "No credit"
 msgstr "Pas de rechargement"
 
-#: apps/member/forms.py:94
+#: apps/member/forms.py:93
 msgid "You can credit the note of the user."
 msgstr "Vous pouvez créditer la note de l'utisateur avant l'adhésion."
 
-#: apps/member/forms.py:98 apps/registration/forms.py:57
+#: apps/member/forms.py:97 apps/registration/forms.py:57
 msgid "Credit amount"
 msgstr "Montant à créditer"
 
-#: apps/member/forms.py:115 apps/registration/forms.py:74
+#: apps/member/forms.py:114 apps/registration/forms.py:74
 #: apps/treasury/forms.py:124 templates/note/transaction_form.html:132
 msgid "Bank"
 msgstr "Banque"
@@ -514,7 +530,7 @@ msgstr "l'adhésion finit le"
 msgid "fee"
 msgstr "cotisation"
 
-#: apps/member/models.py:303 apps/member/views.py:528 apps/wei/views.py:770
+#: apps/member/models.py:303 apps/member/views.py:535 apps/wei/views.py:787
 msgid "User is not a member of the parent club"
 msgstr "L'utilisateur n'est pas membre du club parent"
 
@@ -523,7 +539,7 @@ msgstr "L'utilisateur n'est pas membre du club parent"
 msgid "The role {role} does not apply to the club {club}."
 msgstr "Le rôle {role} ne s'applique pas au club {club}."
 
-#: apps/member/models.py:321 apps/member/views.py:537
+#: apps/member/models.py:321 apps/member/views.py:544
 msgid "User is already a member of the club"
 msgstr "L'utilisateur est déjà membre du club"
 
@@ -544,21 +560,57 @@ msgstr "adhésions"
 msgid "Renew"
 msgstr "Renouveler"
 
-#: apps/member/views.py:65 apps/registration/forms.py:23
-msgid "This address must be valid."
-msgstr "Cette adresse doit être valide."
-
-#: apps/member/views.py:68 templates/member/profile_info.html:47
+#: apps/member/views.py:56 templates/member/profile_info.html:47
 #: templates/registration/future_profile_detail.html:48
 #: templates/wei/weimembership_form.html:130
 msgid "Update Profile"
 msgstr "Modifier le profil"
 
-#: apps/member/views.py:184
+#: apps/member/views.py:69 apps/registration/forms.py:23
+msgid "This address must be valid."
+msgstr "Cette adresse doit être valide."
+
+#: apps/member/views.py:126
+msgid "Profile detail"
+msgstr "Détails de l'utilisateur"
+
+#: apps/member/views.py:160
 msgid "Search user"
 msgstr "Chercher un utilisateur"
 
-#: apps/member/views.py:523 apps/wei/views.py:761
+#: apps/member/views.py:194 apps/member/views.py:376
+msgid "Note aliases"
+msgstr "Alias de la note"
+
+#: apps/member/views.py:208
+msgid "Update note picture"
+msgstr "Modifier la photo de la note"
+
+#: apps/member/views.py:266 templates/member/profile_info.html:43
+msgid "Manage auth token"
+msgstr "Gérer les jetons d'authentification"
+
+#: apps/member/views.py:294
+msgid "Create new club"
+msgstr "Créer un nouveau club"
+
+#: apps/member/views.py:306
+msgid "Search club"
+msgstr "Chercher un club"
+
+#: apps/member/views.py:331
+msgid "Club detail"
+msgstr "Détails du club"
+
+#: apps/member/views.py:393
+msgid "Update club"
+msgstr "Modifier le club"
+
+#: apps/member/views.py:427
+msgid "Add new member to the club"
+msgstr "Ajouter un nouveau membre au club"
+
+#: apps/member/views.py:530 apps/wei/views.py:778
 msgid ""
 "This user don't have enough money to join this club, and can't have a "
 "negative balance."
@@ -566,25 +618,29 @@ msgstr ""
 "Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne peut pas "
 "avoir un solde négatif."
 
-#: apps/member/views.py:541
+#: apps/member/views.py:548
 msgid "The membership must start after {:%m-%d-%Y}."
 msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}."
 
-#: apps/member/views.py:546
+#: apps/member/views.py:553
 msgid "The membership must begin before {:%m-%d-%Y}."
 msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}."
 
-#: apps/member/views.py:563 apps/member/views.py:565 apps/member/views.py:567
-#: apps/registration/views.py:290 apps/registration/views.py:292
-#: apps/registration/views.py:294
+#: apps/member/views.py:570 apps/member/views.py:572 apps/member/views.py:574
+#: apps/registration/views.py:295 apps/registration/views.py:297
+#: apps/registration/views.py:299
 msgid "This field is required."
 msgstr "Ce champ est requis."
 
-#: apps/note/admin.py:122 apps/note/models/transactions.py:106
+#: apps/member/views.py:634
+msgid "Manage roles of an user in the club"
+msgstr "Gérer les rôles d'un utilisateur dans le club"
+
+#: apps/note/admin.py:121 apps/note/models/transactions.py:106
 msgid "source"
 msgstr "source"
 
-#: apps/note/admin.py:130 apps/note/admin.py:172
+#: apps/note/admin.py:129 apps/note/admin.py:171
 #: apps/note/models/transactions.py:55 apps/note/models/transactions.py:119
 msgid "destination"
 msgstr "destination"
@@ -826,62 +882,74 @@ msgstr "Cliquez pour valider"
 msgid "No reason specified"
 msgstr "Pas de motif spécifié"
 
-#: apps/note/tables.py:122 apps/note/tables.py:152 apps/wei/tables.py:66
+#: apps/note/tables.py:122 apps/note/tables.py:150 apps/wei/tables.py:66
 #: templates/treasury/sogecredit_detail.html:59
 #: templates/wei/weiregistration_confirm_delete.html:32
 msgid "Delete"
 msgstr "Supprimer"
 
-#: apps/note/tables.py:147 apps/wei/tables.py:42 apps/wei/tables.py:43
+#: apps/note/tables.py:145 apps/wei/tables.py:42 apps/wei/tables.py:43
 #: templates/member/club_info.html:67 templates/note/conso_form.html:128
 #: templates/wei/bus_tables.html:15 templates/wei/busteam_tables.html:15
 #: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:68
 msgid "Edit"
 msgstr "Éditer"
 
-#: apps/note/views.py:41
+#: apps/note/views.py:33
 msgid "Transfer money"
 msgstr "Transférer de l'argent"
 
-#: apps/note/views.py:140 templates/base.html:94
+#: apps/note/views.py:67
+msgid "Create new button"
+msgstr "Créer un nouveau bouton"
+
+#: apps/note/views.py:76
+msgid "Search button"
+msgstr "Chercher un bouton"
+
+#: apps/note/views.py:99
+msgid "Update button"
+msgstr "Modifier le bouton"
+
+#: apps/note/views.py:136 templates/base.html:94
 msgid "Consumptions"
 msgstr "Consommations"
 
-#: apps/permission/models.py:81
+#: apps/permission/models.py:83
 #, python-brace-format
 msgid "Can {type} {model}.{field} in {query}"
 msgstr "Can {type} {model}.{field} in {query}"
 
-#: apps/permission/models.py:83
+#: apps/permission/models.py:85
 #, python-brace-format
 msgid "Can {type} {model} in {query}"
 msgstr "Can {type} {model} in {query}"
 
-#: apps/permission/models.py:96
+#: apps/permission/models.py:98
 msgid "rank"
 msgstr "Rang"
 
-#: apps/permission/models.py:109
+#: apps/permission/models.py:111
 msgid "permission mask"
 msgstr "masque de permissions"
 
-#: apps/permission/models.py:110
+#: apps/permission/models.py:112
 msgid "permission masks"
 msgstr "masques de permissions"
 
-#: apps/permission/models.py:150
+#: apps/permission/models.py:152
 msgid "query"
 msgstr "requête"
 
-#: apps/permission/models.py:163
+#: apps/permission/models.py:165
 msgid "mask"
 msgstr "masque"
 
-#: apps/permission/models.py:169
+#: apps/permission/models.py:171
 msgid "field"
 msgstr "champ"
 
-#: apps/permission/models.py:174
+#: apps/permission/models.py:176
 msgid ""
 "Tells if the permission should be granted even if the membership of the user "
 "is expired."
@@ -889,33 +957,33 @@ msgstr ""
 "Indique si la permission doit être attribuée même si l'adhésion de "
 "l'utilisateur est expirée."
 
-#: apps/permission/models.py:175 templates/permission/all_rights.html:26
+#: apps/permission/models.py:177 templates/permission/all_rights.html:26
 msgid "permanent"
 msgstr "permanent"
 
-#: apps/permission/models.py:186
+#: apps/permission/models.py:188
 msgid "permission"
 msgstr "permission"
 
-#: apps/permission/models.py:187 apps/permission/models.py:326
+#: apps/permission/models.py:189 apps/permission/models.py:328
 msgid "permissions"
 msgstr "permissions"
 
-#: apps/permission/models.py:192
+#: apps/permission/models.py:194
 msgid "Specifying field applies only to view and change permission types."
 msgstr ""
 "Spécifie le champ concerné, ne fonctionne que pour les permissions view et "
 "change."
 
-#: apps/permission/models.py:331
+#: apps/permission/models.py:333
 msgid "for club"
 msgstr "s'applique au club"
 
-#: apps/permission/models.py:341 apps/permission/models.py:342
+#: apps/permission/models.py:343 apps/permission/models.py:344
 msgid "role permissions"
 msgstr "Permissions par rôles"
 
-#: apps/permission/signals.py:62
+#: apps/permission/signals.py:63
 #, python-brace-format
 msgid ""
 "You don't have the permission to change the field {field} on this instance "
@@ -924,7 +992,7 @@ msgstr ""
 "Vous n'avez pas la permission de modifier le champ {field} sur l'instance du "
 "modèle {app_label}.{model_name}."
 
-#: apps/permission/signals.py:72
+#: apps/permission/signals.py:73
 #, python-brace-format
 msgid ""
 "You don't have the permission to add this instance of model {app_label}."
@@ -933,7 +1001,7 @@ msgstr ""
 "Vous n'avez pas la permission d'ajouter cette instance du modèle {app_label}."
 "{model_name}."
 
-#: apps/permission/signals.py:99
+#: apps/permission/signals.py:101
 #, python-brace-format
 msgid ""
 "You don't have the permission to delete this instance of model {app_label}."
@@ -942,7 +1010,11 @@ msgstr ""
 "Vous n'avez pas la permission de supprimer cette instance du modèle "
 "{app_label}.{model_name}."
 
-#: apps/permission/views.py:48
+#: apps/permission/views.py:44 templates/base.html:135
+msgid "Rights"
+msgstr "Droits"
+
+#: apps/permission/views.py:49
 msgid "All rights"
 msgstr "Tous les droits"
 
@@ -971,37 +1043,61 @@ msgstr "Adhérer au club BDE"
 msgid "Join Kfet Club"
 msgstr "Adhérer au club Kfet"
 
-#: apps/registration/views.py:79
+#: apps/registration/views.py:38
+msgid "Register new user"
+msgstr "Enregistrer un nouvel utilisateur"
+
+#: apps/registration/views.py:80
 msgid "Email validation"
 msgstr "Validation de l'adresse mail"
 
-#: apps/registration/views.py:125
+#: apps/registration/views.py:82
+msgid "Validate a registration"
+msgstr "Valider l'inscription"
+
+#: apps/registration/views.py:127
 msgid "Email validation unsuccessful"
 msgstr " La validation de l'adresse mail a échoué"
 
-#: apps/registration/views.py:136
+#: apps/registration/views.py:138
 msgid "Email validation email sent"
 msgstr "L'email de vérification de l'adresse email a bien été envoyé."
 
-#: apps/registration/views.py:189
+#: apps/registration/views.py:146
+msgid "Resend email validation link"
+msgstr "Renvoyer le lien de validation"
+
+#: apps/registration/views.py:164
+msgid "Pre-registered users list"
+msgstr "Liste des utilisateurs en attente d'inscription"
+
+#: apps/registration/views.py:193
 msgid "Unregistered users"
 msgstr "Utilisateurs en attente d'inscription"
 
-#: apps/registration/views.py:256
+#: apps/registration/views.py:206
+msgid "Registration detail"
+msgstr "Détails de l'inscription"
+
+#: apps/registration/views.py:261
 msgid "You must join the BDE."
 msgstr "Vous devez adhérer au BDE."
 
-#: apps/registration/views.py:278
+#: apps/registration/views.py:283
 msgid "You must join BDE club before joining Kfet club."
 msgstr "Vous devez adhérer au club BDE avant d'adhérer au club Kfet."
 
-#: apps/registration/views.py:283
+#: apps/registration/views.py:288
 msgid ""
 "The entered amount is not enough for the memberships, should be at least {}"
 msgstr ""
 "Le montant crédité est trop faible pour adhérer, il doit être au minimum de "
 "{}"
 
+#: apps/registration/views.py:363
+msgid "Invalidate pre-registration"
+msgstr "Invalider l'inscription"
+
 #: apps/treasury/apps.py:12 templates/base.html:126
 msgid "Treasury"
 msgstr "Trésorerie"
@@ -1201,6 +1297,43 @@ msgstr "Oui"
 msgid "No"
 msgstr "Non"
 
+#: apps/treasury/views.py:39
+msgid "Create new invoice"
+msgstr "Créer une nouvelle facture"
+
+#: apps/treasury/views.py:82 templates/treasury/invoice_form.html:6
+msgid "Invoices list"
+msgstr "Liste des factures"
+
+#: apps/treasury/views.py:91
+msgid "Update an invoice"
+msgstr "Modifier la facture"
+
+#: apps/treasury/views.py:205
+msgid "Create a new remittance"
+msgstr "Créer une nouvelle remise"
+
+#: apps/treasury/views.py:226 templates/treasury/remittance_form.html:9
+#: templates/treasury/specialtransactionproxy_form.html:7
+msgid "Remittances list"
+msgstr "Liste des remises"
+
+#: apps/treasury/views.py:276
+msgid "Update a remittance"
+msgstr "Modifier la remise"
+
+#: apps/treasury/views.py:301
+msgid "Attach a transaction to a remittance"
+msgstr "Joindre une transaction à une remise"
+
+#: apps/treasury/views.py:345
+msgid "List of credits from the Société générale"
+msgstr "Liste des crédits de la Société générale"
+
+#: apps/treasury/views.py:384
+msgid "Manage credits from the Société générale"
+msgstr "Gérer les crédits de la Société générale"
+
 #: apps/wei/apps.py:10 apps/wei/models.py:48 apps/wei/models.py:49
 #: apps/wei/models.py:60 apps/wei/models.py:166 templates/base.html:131
 msgid "WEI"
@@ -1433,23 +1566,75 @@ msgstr "Nombre de membres"
 msgid "members"
 msgstr "adhérents"
 
-#: apps/wei/views.py:203
+#: apps/wei/views.py:55
+msgid "Search WEI"
+msgstr "Chercher un WEI"
+
+#: apps/wei/views.py:64 templates/wei/weiclub_list.html:9
+msgid "Create WEI"
+msgstr "Créer un WEI"
+
+#: apps/wei/views.py:84
+msgid "WEI Detail"
+msgstr "Détails du WEI"
+
+#: apps/wei/views.py:179
+msgid "View members of the WEI"
+msgstr "Voir les membres du WEI"
+
+#: apps/wei/views.py:207
 msgid "Find WEI Membership"
 msgstr "Trouver une adhésion au WEI"
 
-#: apps/wei/views.py:238
+#: apps/wei/views.py:217
+msgid "View registrations to the WEI"
+msgstr "Voir les inscriptions au WEI"
+
+#: apps/wei/views.py:243
 msgid "Find WEI Registration"
 msgstr "Trouver une inscription au WEI"
 
-#: apps/wei/views.py:447 templates/wei/weiclub_info.html:62
+#: apps/wei/views.py:254
+msgid "Update the WEI"
+msgstr "Modifier le WEI"
+
+#: apps/wei/views.py:275
+msgid "Create new bus"
+msgstr "Ajouter un nouveau bus"
+
+#: apps/wei/views.py:306
+msgid "Update bus"
+msgstr "Modifier le bus"
+
+#: apps/wei/views.py:336
+msgid "Manage bus"
+msgstr "Gérer le bus"
+
+#: apps/wei/views.py:363
+msgid "Create new team"
+msgstr "Créer une nouvelle équipe"
+
+#: apps/wei/views.py:395
+msgid "Update team"
+msgstr "Modifier l'équipe"
+
+#: apps/wei/views.py:426
+msgid "Manage WEI team"
+msgstr "Gérer l'équipe WEI"
+
+#: apps/wei/views.py:448
+msgid "Register first year student to the WEI"
+msgstr "Inscrire un 1A au WEI"
+
+#: apps/wei/views.py:460 templates/wei/weiclub_info.html:62
 msgid "Register 1A"
 msgstr "Inscrire un 1A"
 
-#: apps/wei/views.py:468 apps/wei/views.py:537
+#: apps/wei/views.py:481 apps/wei/views.py:551
 msgid "This user is already registered to this WEI."
 msgstr "Cette personne est déjà inscrite au WEI."
 
-#: apps/wei/views.py:473
+#: apps/wei/views.py:486
 msgid ""
 "This user can't be in her/his first year since he/she has already participed "
 "to a WEI."
@@ -1457,23 +1642,39 @@ msgstr ""
 "Cet utilisateur ne peut pas être en première année puisqu'iel a déjà "
 "participé à un WEI."
 
-#: apps/wei/views.py:501 templates/wei/weiclub_info.html:65
+#: apps/wei/views.py:503
+msgid "Register old student to the WEI"
+msgstr "Inscrire un 2A+ au WEI"
+
+#: apps/wei/views.py:515 templates/wei/weiclub_info.html:65
 msgid "Register 2A+"
 msgstr "Inscrire un 2A+"
 
-#: apps/wei/views.py:519 apps/wei/views.py:606
+#: apps/wei/views.py:533 apps/wei/views.py:621
 msgid "You already opened an account in the Société générale."
 msgstr "Vous avez déjà ouvert un compte auprès de la société générale."
 
-#: apps/wei/views.py:666
+#: apps/wei/views.py:581
+msgid "Update WEI Registration"
+msgstr "Modifier l'inscription WEI"
+
+#: apps/wei/views.py:671
+msgid "Delete WEI registration"
+msgstr "Supprimer l'inscription WEI"
+
+#: apps/wei/views.py:682
 msgid "You don't have the right to delete this WEI registration."
 msgstr "Vous n'avez pas la permission de supprimer cette inscription au WEI."
 
-#: apps/wei/views.py:765
+#: apps/wei/views.py:701
+msgid "Validate WEI registration"
+msgstr "Valider l'inscription WEI"
+
+#: apps/wei/views.py:782
 msgid "This user didn't give her/his caution check."
 msgstr "Cet utilisateur n'a pas donné son chèque de caution."
 
-#: apps/wei/views.py:839 apps/wei/views.py:859 apps/wei/views.py:869
+#: apps/wei/views.py:819 apps/wei/views.py:872 apps/wei/views.py:882
 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12
 #: templates/wei/survey_end.html:12
 msgid "Survey WEI"
@@ -1617,15 +1818,9 @@ msgstr "Clubs"
 msgid "Registrations"
 msgstr "Inscriptions"
 
-#: templates/base.html:135
-msgid "Rights"
-msgstr "Droits"
-
 #: templates/base.html:139
-#, fuzzy
-#| msgid "registration"
 msgid "Administration"
-msgstr "inscription"
+msgstr "Administration"
 
 #: templates/base.html:178
 msgid ""
@@ -1685,15 +1880,11 @@ msgstr "Ajouter un membre"
 msgid "View Profile"
 msgstr "Voir le profil"
 
-#: templates/member/club_list.html:8
-msgid "search clubs"
-msgstr "Chercher un club"
-
-#: templates/member/club_list.html:12
+#: templates/member/club_list.html:9
 msgid "Create club"
 msgstr "Créer un club"
 
-#: templates/member/club_list.html:19
+#: templates/member/club_list.html:16
 msgid "Club listing"
 msgstr "Liste des clubs"
 
@@ -1737,10 +1928,6 @@ msgstr "mot de passe"
 msgid "Change password"
 msgstr "Changer le mot de passe"
 
-#: templates/member/profile_info.html:43
-msgid "Manage auth token"
-msgstr "Gérer les jetons d'authentification"
-
 #: templates/member/profile_tables.html:7
 #: templates/registration/future_profile_detail.html:28
 #: templates/wei/weimembership_form.html:30
@@ -1838,27 +2025,23 @@ msgstr "Obsolète depuis"
 msgid "Current price"
 msgstr "Prix actuel"
 
-#: templates/note/transactiontemplate_list.html:9
-msgid "Search button"
-msgstr "Chercher un bouton"
-
-#: templates/note/transactiontemplate_list.html:11
+#: templates/note/transactiontemplate_list.html:8
 msgid "Name of the button..."
 msgstr "Nom du bouton ..."
 
-#: templates/note/transactiontemplate_list.html:21
+#: templates/note/transactiontemplate_list.html:10
 msgid "New button"
 msgstr "Nouveau bouton"
 
-#: templates/note/transactiontemplate_list.html:28
+#: templates/note/transactiontemplate_list.html:17
 msgid "buttons listing "
 msgstr "Liste des boutons"
 
-#: templates/note/transactiontemplate_list.html:86
+#: templates/note/transactiontemplate_list.html:55
 msgid "button successfully deleted "
 msgstr "Le bouton a bien été supprimé"
 
-#: templates/note/transactiontemplate_list.html:90
+#: templates/note/transactiontemplate_list.html:59
 msgid "Unable to delete button "
 msgstr "Impossible de supprimer le bouton "
 
@@ -2073,10 +2256,6 @@ msgstr ""
 "Vous devez également valider votre adresse email en suivant le lien que vous "
 "avez reçu."
 
-#: templates/treasury/invoice_form.html:6
-msgid "Invoices list"
-msgstr "Liste des factures"
-
 #: templates/treasury/invoice_form.html:41
 msgid "Add product"
 msgstr "Ajouter produit"
@@ -2099,11 +2278,6 @@ msgstr "Nouvelle facture"
 msgid "Remittance #"
 msgstr "Remise n°"
 
-#: templates/treasury/remittance_form.html:9
-#: templates/treasury/specialtransactionproxy_form.html:7
-msgid "Remittances list"
-msgstr "Liste des remises"
-
 #: templates/treasury/remittance_form.html:12
 msgid "Count"
 msgstr "Nombre"
@@ -2267,15 +2441,7 @@ msgstr "Ajouter un bus"
 msgid "View WEI"
 msgstr "Voir le WEI"
 
-#: templates/wei/weiclub_list.html:8
-msgid "search WEI"
-msgstr "Chercher un WEI"
-
-#: templates/wei/weiclub_list.html:12
-msgid "Create WEI"
-msgstr "Créer un WEI"
-
-#: templates/wei/weiclub_list.html:19
+#: templates/wei/weiclub_list.html:16
 msgid "WEI listing"
 msgstr "Liste des WEI"
 
@@ -2289,7 +2455,7 @@ msgstr "M'inscrire au WEI ! – 2A+"
 
 #: templates/wei/weiclub_tables.html:67
 msgid "Update my registration"
-msgstr "Mettre à jour mon inscription"
+msgstr "Modifier mon inscription"
 
 #: templates/wei/weiclub_tables.html:92
 msgid "Members of the WEI"
@@ -2342,7 +2508,7 @@ msgstr "rôles préférés"
 #: templates/wei/weimembership_form.html:128
 #: templates/wei/weiregistration_confirm_delete.html:31
 msgid "Update registration"
-msgstr "Mettre à jour l'inscription"
+msgstr "Modifier l'inscription"
 
 #: templates/wei/weimembership_form.html:144
 msgid "The registration is already validated and can't be unvalidated."
diff --git a/templates/member/club_list.html b/templates/member/club_list.html
index a69de324..346cc623 100644
--- a/templates/member/club_list.html
+++ b/templates/member/club_list.html
@@ -4,9 +4,6 @@
 {% block content %}
 <div class="row justify-content-center mb-4">
     <div class="col-md-10 text-center">
-        <h4>
-            {% trans "search clubs" %}
-        </h4>
         <input class="form-control mx-auto w-25" type="text" id="search_field"/>
         <hr>
         <a class="btn btn-primary text-center my-4" href="{% url 'member:club_create' %}">{% trans "Create club" %}</a>
diff --git a/templates/note/transactiontemplate_list.html b/templates/note/transactiontemplate_list.html
index 1d2342b9..793b2278 100644
--- a/templates/note/transactiontemplate_list.html
+++ b/templates/note/transactiontemplate_list.html
@@ -5,9 +5,6 @@
 {% block content %}
 <div class="row justify-content-center mb-4">
     <div class="col-md-10 text-center">
-        <h4>
-            {% trans "Search button" %}
-        </h4>
         <input class="form-control mx-auto w-25" type="text" id="search_field" placeholder="{% trans "Name of the button..." %}">
         <hr>
         <a class="btn btn-primary text-center my-1" href="{% url 'note:template_create' %}">{% trans "New button" %}</a>
diff --git a/templates/wei/weiclub_list.html b/templates/wei/weiclub_list.html
index 0ed8e0ac..5390ade6 100644
--- a/templates/wei/weiclub_list.html
+++ b/templates/wei/weiclub_list.html
@@ -4,9 +4,6 @@
 {% block content %}
 <div class="row justify-content-center mb-4">
     <div class="col-md-10 text-center">
-        <h4>
-            {% trans "search WEI" %}
-        </h4>
         <input class="form-control mx-auto w-25" type="text" onkeyup="search_field_moved()" id="search_field"/>
         <hr>
         <a class="btn btn-primary text-center my-4" href="{% url 'wei:wei_create' %}">{% trans "Create WEI" %}</a>

From ad2cc2296443e0a892848ee19a6c70ace20858dd Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Thu, 30 Jul 2020 17:52:04 +0200
Subject: [PATCH 56/77] Transactions are not invalidable if the user doesn't
 have the right to

---
 apps/note/tables.py    | 28 +++++++++++++++++++++++-----
 apps/treasury/views.py |  2 +-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/apps/note/tables.py b/apps/note/tables.py
index cbfd2424..0048a0a5 100644
--- a/apps/note/tables.py
+++ b/apps/note/tables.py
@@ -8,6 +8,8 @@ from django.db.models import F
 from django.utils.html import format_html
 from django_tables2.utils import A
 from django.utils.translation import gettext_lazy as _
+from note_kfet.middlewares import get_current_authenticated_user
+from permission.backends import PermissionBackend
 
 from .models.notes import Alias
 from .models.transactions import Transaction, TransactionTemplate
@@ -52,14 +54,26 @@ class HistoryTable(tables.Table):
         attrs={
             "td": {
                 "id": lambda record: "validate_" + str(record.id),
-                "class": lambda record: str(record.valid).lower() + ' validate',
+                "class": lambda record:
+                str(record.valid).lower()
+                + (' validate' if PermissionBackend.check_perm(get_current_authenticated_user(),
+                                                               "note.change_transaction_invalidity_reason",
+                                                               record) else ''),
                 "data-toggle": "tooltip",
-                "title": lambda record: _("Click to invalidate") if record.valid else _("Click to validate"),
-                "onclick": lambda record: 'de_validate(' + str(record.id) + ', ' + str(record.valid).lower() + ')',
+                "title": lambda record: (_("Click to invalidate") if record.valid else _("Click to validate"))
+                if PermissionBackend.check_perm(get_current_authenticated_user(),
+                                                "note.change_transaction_invalidity_reason", record) else None,
+                "onclick": lambda record: 'de_validate(' + str(record.id) + ', ' + str(record.valid).lower() + ')'
+                if PermissionBackend.check_perm(get_current_authenticated_user(),
+                                                "note.change_transaction_invalidity_reason", record) else None,
                 "onmouseover": lambda record: '$("#invalidity_reason_'
                                               + str(record.id) + '").show();$("#invalidity_reason_'
-                                              + str(record.id) + '").focus();',
-                "onmouseout": lambda record: '$("#invalidity_reason_' + str(record.id) + '").hide()',
+                                              + str(record.id) + '").focus();'
+                if PermissionBackend.check_perm(get_current_authenticated_user(),
+                                                "note.change_transaction_invalidity_reason", record) else None,
+                "onmouseout": lambda record: '$("#invalidity_reason_' + str(record.id) + '").hide()'
+                if PermissionBackend.check_perm(get_current_authenticated_user(),
+                                                "note.change_transaction_invalidity_reason", record) else None,
             }
         }
     )
@@ -88,6 +102,10 @@ class HistoryTable(tables.Table):
         When the validation status is hovered, an input field is displayed to let the user specify an invalidity reason
         """
         val = "✔" if value else "✖"
+        if not PermissionBackend\
+                .check_perm(get_current_authenticated_user(), "note.change_transaction_invalidity_reason", record):
+            return val
+
         val += "<input type='text' class='form-control' id='invalidity_reason_" + str(record.id) \
                + "' value='" + (html.escape(record.invalidity_reason)
                                 if record.invalidity_reason else ("" if value else str(_("No reason specified")))) \
diff --git a/apps/treasury/views.py b/apps/treasury/views.py
index 07d480aa..22215254 100644
--- a/apps/treasury/views.py
+++ b/apps/treasury/views.py
@@ -171,7 +171,7 @@ class InvoiceRenderView(LoginRequiredMixin, View):
             del tex
 
             # The file has to be rendered twice
-            for _ in range(2):
+            for ignored in range(2):
                 error = subprocess.Popen(
                     ["pdflatex", "invoice-{}.tex".format(pk)],
                     cwd=tmp_dir,

From 2642ae3a1a282d52bd0ce6da1570194edd377630 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Thu, 30 Jul 2020 20:41:19 +0200
Subject: [PATCH 57/77] :bug: Scripts subproject has disappeared

---
 apps/scripts | 1 +
 1 file changed, 1 insertion(+)
 create mode 160000 apps/scripts

diff --git a/apps/scripts b/apps/scripts
new file mode 160000
index 00000000..9dcb2572
--- /dev/null
+++ b/apps/scripts
@@ -0,0 +1 @@
+Subproject commit 9dcb25723e1cf14c2344946a96e9d8f98cc4cf0e

From ad19b64b3ac051c3ec1d76620835a2bf5f679e58 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Thu, 30 Jul 2020 20:45:17 +0200
Subject: [PATCH 58/77] :green_heart: Add Python 3.8 to Gitlab CI

---
 .gitlab-ci.yml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 291ed490..152da589 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: python:3.6
+image: python:3.8
 
 stages:
   - test
@@ -17,8 +17,13 @@ py37-django22:
   stage: test
   script: tox -e py37-django22
 
+py38-django22:
+  image: python:3.8
+  stage: test
+  script: tox -e py38-django22
+
 linters:
-  image: python:3.6
+  image: python:3.8
   stage: quality-assurance
   script: tox -e linters
 

From cb38ceb2c6b3a52241c79664046f60a9336a5a1a Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Fri, 31 Jul 2020 09:41:22 +0200
Subject: [PATCH 59/77] New club members have only the role "Club member" by
 default and no other one

---
 apps/member/forms.py | 28 +++++++++++++++++++++++++---
 apps/member/views.py | 22 ++++++----------------
 2 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/apps/member/forms.py b/apps/member/forms.py
index a31acb80..c4849e2a 100644
--- a/apps/member/forms.py
+++ b/apps/member/forms.py
@@ -77,8 +77,6 @@ class ClubForm(forms.ModelForm):
 
 
 class MembershipForm(forms.ModelForm):
-    roles = forms.ModelMultipleChoiceField(queryset=Role.objects.filter(weirole=None).all())
-
     soge = forms.BooleanField(
         label=_("Inscription paid by Société Générale"),
         required=False,
@@ -117,7 +115,7 @@ class MembershipForm(forms.ModelForm):
 
     class Meta:
         model = Membership
-        fields = ('user', 'roles', 'date_start')
+        fields = ('user', 'date_start')
         # Le champ d'utilisateur est remplacé par un champ d'auto-complétion.
         # Quand des lettres sont tapées, une requête est envoyée sur l'API d'auto-complétion
         # et récupère les noms d'utilisateur valides
@@ -133,3 +131,27 @@ class MembershipForm(forms.ModelForm):
                 ),
             'date_start': DatePickerInput(),
         }
+
+class MembershipRolesForm(forms.ModelForm):
+    user = forms.ModelChoiceField(
+        queryset=User.objects,
+        label=_("User"),
+        disabled=True,
+        widget=Autocomplete(
+                    User,
+                    attrs={
+                        'api_url': '/api/user/',
+                        'name_field': 'username',
+                        'placeholder': 'Nom ...',
+                    },
+                ),
+    )
+
+    roles = forms.ModelMultipleChoiceField(
+        queryset=Role.objects.filter(weirole=None).all(),
+        label=_("Roles"),
+    )
+
+    class Meta:
+        model = Membership
+        fields = ('user', 'roles')
\ No newline at end of file
diff --git a/apps/member/views.py b/apps/member/views.py
index bc0ed3dd..8e5a0f68 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -27,7 +27,7 @@ from permission.backends import PermissionBackend
 from permission.models import Role
 from permission.views import ProtectQuerysetMixin
 
-from .forms import ProfileForm, ClubForm, MembershipForm, CustomAuthenticationForm, UserForm
+from .forms import ProfileForm, ClubForm, MembershipForm, CustomAuthenticationForm, UserForm, MembershipRolesForm
 from .models import Club, Membership
 from .tables import ClubTable, UserTable, MembershipTable
 
@@ -435,9 +435,6 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
             club = Club.objects.filter(PermissionBackend.filter_queryset(self.request.user, Club, "view"))\
                 .get(pk=self.kwargs["club_pk"], weiclub=None)
             form.fields['credit_amount'].initial = club.membership_fee_paid
-            form.fields['roles'].queryset = Role.objects.filter(Q(weirole__isnull=not hasattr(club, 'weiclub'))
-                                                                & (Q(for_club__isnull=True) | Q(for_club=club))).all()
-            form.fields['roles'].initial = Role.objects.filter(name="Membre de club").all()
 
             # If the concerned club is the BDE, then we add the option that Société générale pays the membership.
             if club.name != "BDE":
@@ -456,9 +453,6 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
             user = old_membership.user
             form.fields['user'].initial = user
             form.fields['user'].disabled = True
-            form.fields['roles'].queryset = Role.objects.filter(Q(weirole__isnull=not hasattr(club, 'weiclub'))
-                                                                & (Q(for_club__isnull=True) | Q(for_club=club))).all()
-            form.fields['roles'].initial = old_membership.roles.all()
             form.fields['date_start'].initial = old_membership.date_end + timedelta(days=1)
             form.fields['credit_amount'].initial = club.membership_fee_paid if user.profile.paid \
                 else club.membership_fee_unpaid
@@ -588,6 +582,10 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
 
         ret = super().form_valid(form)
 
+        member_role = Role.objects.filter(name="Membre de club").all()
+        form.instance.roles.set(member_role)
+        form.instance.save()
+
         # If Société générale pays, then we assume that this is the BDE membership, and we auto-renew the
         # Kfet membership.
         if soge:
@@ -629,7 +627,7 @@ class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
     Manage the roles of a user in a club
     """
     model = Membership
-    form_class = MembershipForm
+    form_class = MembershipRolesForm
     template_name = 'member/add_members.html'
     extra_context = {"title": _("Manage roles of an user in the club")}
 
@@ -641,14 +639,6 @@ class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
 
     def get_form(self, form_class=None):
         form = super().get_form(form_class)
-        # We don't create a full membership, we only update one field
-        form.fields['user'].disabled = True
-        del form.fields['date_start']
-        del form.fields['credit_type']
-        del form.fields['credit_amount']
-        del form.fields['last_name']
-        del form.fields['first_name']
-        del form.fields['bank']
 
         club = self.object.club
         form.fields['roles'].queryset = Role.objects.filter(Q(weirole__isnull=not hasattr(club, 'weiclub'))

From 72dcc931365f22c2271cc2becca1418aa8d3fd67 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Fri, 31 Jul 2020 09:49:43 +0200
Subject: [PATCH 60/77] Club managers can register new members to a club, even
 if they don't have the right to create a transaction

---
 apps/member/views.py                  | 6 +++++-
 apps/permission/fixtures/initial.json | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/member/views.py b/apps/member/views.py
index 8e5a0f68..51f31445 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -568,7 +568,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
                     form.add_error('bank', _("This field is required."))
                 return self.form_invalid(form)
 
-            SpecialTransaction.objects.create(
+            transaction = SpecialTransaction(
                 source=credit_type,
                 destination=user.note,
                 quantity=1,
@@ -579,11 +579,14 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
                 bank=bank,
                 valid=True,
             )
+            transaction._force_save = True
+            transaction.save()
 
         ret = super().form_valid(form)
 
         member_role = Role.objects.filter(name="Membre de club").all()
         form.instance.roles.set(member_role)
+        form.instance._force_save = True
         form.instance.save()
 
         # If Société générale pays, then we assume that this is the BDE membership, and we auto-renew the
@@ -607,6 +610,7 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
                 date_start=old_membership.get().date_end + timedelta(days=1)
                 if old_membership.exists() else form.instance.date_start,
             )
+            membership._force_save = True
             membership._soge = True
             membership.save()
             membership.refresh_from_db()
diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index 572e0716..2622ed1c 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -2372,6 +2372,7 @@
 				22,
 				47,
 				49,
+				50,
 				140
 			]
 		}

From bd35e4e21e6d90befeaf10a7156e921ab55c40ff Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Fri, 31 Jul 2020 13:17:16 +0200
Subject: [PATCH 61/77] Separate club members in a dedicated page (WIP)

---
 apps/member/urls.py                |  1 +
 apps/member/views.py               | 40 +++++++++++++++++++++++++++-
 locale/de/LC_MESSAGES/django.po    |  2 +-
 locale/fr/LC_MESSAGES/django.po    |  4 +--
 templates/member/club_info.html    |  2 +-
 templates/member/club_members.html | 42 ++++++++++++++++++++++++++++++
 templates/member/club_tables.html  |  4 +--
 7 files changed, 88 insertions(+), 7 deletions(-)
 create mode 100644 templates/member/club_members.html

diff --git a/apps/member/urls.py b/apps/member/urls.py
index 4be4ceae..359a8846 100644
--- a/apps/member/urls.py
+++ b/apps/member/urls.py
@@ -16,6 +16,7 @@ urlpatterns = [
     path('club/<int:pk>/update/', views.ClubUpdateView.as_view(), name="club_update"),
     path('club/<int:pk>/update_pic/', views.ClubPictureUpdateView.as_view(), name="club_update_pic"),
     path('club/<int:pk>/aliases/', views.ClubAliasView.as_view(), name="club_alias"),
+    path('club/<int:pk>/members/', views.ClubMembersListView.as_view(), name="club_members"),
 
     path('user/', views.UserListView.as_view(), name="user_list"),
     path('user/<int:pk>/', views.UserDetailView.as_view(), name="user_detail"),
diff --git a/apps/member/views.py b/apps/member/views.py
index 51f31445..1785d1ad 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -13,6 +13,7 @@ from django.contrib.auth.views import LoginView
 from django.db.models import Q
 from django.shortcuts import redirect
 from django.urls import reverse_lazy
+from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import CreateView, DetailView, UpdateView, TemplateView
 from django.views.generic.edit import FormMixin
@@ -349,7 +350,7 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
         ).filter(PermissionBackend.filter_queryset(self.request.user, Membership, "view"))
 
         membership_table = MembershipTable(data=club_member, prefix="membership-")
-        membership_table.paginate(per_page=20, page=self.request.GET.get('membership-page', 1))
+        membership_table.paginate(per_page=5, page=self.request.GET.get('membership-page', 1))
         context['member_list'] = membership_table
 
         # Check if the user has the right to create a membership, to display the button.
@@ -652,3 +653,40 @@ class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
 
     def get_success_url(self):
         return reverse_lazy('member:user_detail', kwargs={'pk': self.object.user.id})
+
+
+class ClubMembersListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
+    model = Membership
+    table_class = MembershipTable
+    template_name = "member/club_members.html"
+    extra_context = {"title": _("Members of the club")}
+
+    def get_queryset(self, **kwargs):
+        qs = super().get_queryset().filter(club_id=self.kwargs["pk"])
+
+        if 'search' in self.request.GET:
+            pattern = self.request.GET['search']
+            qs = qs.filter(
+                Q(user__first_name__iregex='^' + pattern) |
+                Q(user__last_name__iregex='^' + pattern) |
+                Q(user__note__alias__normalized_name__iregex='^' + Alias.normalize(pattern))
+            )
+
+        if 'only_active' in self.request.GET:
+            only_active = self.request.GET["only_active"] != '0'
+        else:
+            only_active = True
+
+        if only_active:
+            qs = qs.filter(date_start__lte=timezone.now().today(), date_end__gte=timezone.now().today())
+
+        qs = qs.order_by('-date_start', 'user__username')
+
+        return qs.distinct()
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["club"] = Club.objects.filter(
+            PermissionBackend.filter_queryset(self.request.user, Club, "view")
+        ).get(pk=self.kwargs["pk"])
+        return context
\ No newline at end of file
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index e4526352..c9ac11ba 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -1829,7 +1829,7 @@ msgid "Club listing"
 msgstr ""
 
 #: templates/member/club_tables.html:7
-msgid "Member of the Club"
+msgid "Club members"
 msgstr ""
 
 #: templates/member/club_tables.html:20 templates/member/profile_tables.html:28
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 35ecff90..c561abba 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -1889,8 +1889,8 @@ msgid "Club listing"
 msgstr "Liste des clubs"
 
 #: templates/member/club_tables.html:7
-msgid "Member of the Club"
-msgstr "Membre du club"
+msgid "Club members"
+msgstr "Membres du club"
 
 #: templates/member/club_tables.html:20 templates/member/profile_tables.html:28
 #: templates/wei/weiclub_tables.html:105
diff --git a/templates/member/club_info.html b/templates/member/club_info.html
index 18cfe631..e7974f77 100644
--- a/templates/member/club_info.html
+++ b/templates/member/club_info.html
@@ -11,7 +11,7 @@
     <div class="card-body" id="profile_infos">
         <dl class="row">
             <dt class="col-xl-6">{% trans 'name'|capfirst %}</dt>
-            <dd class="col-xl-6">{{ club.name}}</dd>
+            <dd class="col-xl-6">{{ club.name }}</dd>
 
             {% if club.parent_club %}
                 <dt class="col-xl-6"><a href="{% url 'member:club_detail' club.parent_club.pk %}">{% trans 'Club Parent'|capfirst %}</a></dt>
diff --git a/templates/member/club_members.html b/templates/member/club_members.html
new file mode 100644
index 00000000..fca6ec1c
--- /dev/null
+++ b/templates/member/club_members.html
@@ -0,0 +1,42 @@
+{% extends "member/noteowner_detail.html" %}
+{% load i18n %}
+{% load render_table from django_tables2 %}
+
+{% block profile_info %}
+{% include "member/club_info.html" %}
+{% endblock %}
+
+{% block profile_content %}
+    <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note ...">
+    <hr>
+
+    <div id="memberships_table">
+        {% if table.data %}
+            {% render_table table %}
+        {% else %}
+            <div class="alert alert-warning">
+                {% trans "There is no membership found with this pattern." %}
+            </div>
+        {% endif %}
+    </div>
+{% endblock %}
+
+{% block extrajavascript %}
+<script type="text/javascript">
+    $(document).ready(function() {
+        let old_pattern = null;
+        let searchbar_obj = $("#searchbar");
+
+        function reloadTable() {
+            let pattern = searchbar_obj.val();
+
+            if (pattern === old_pattern)
+                return;
+
+            $("#memberships_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") + " #memberships_table");
+        }
+
+        searchbar_obj.keyup(reloadTable);
+    });
+</script>
+{% endblock %}
diff --git a/templates/member/club_tables.html b/templates/member/club_tables.html
index e937fbe9..92d66425 100644
--- a/templates/member/club_tables.html
+++ b/templates/member/club_tables.html
@@ -3,8 +3,8 @@
 {% if member_list.data %}
     <div class="card">
         <div class="card-header position-relative" id="clubListHeading">
-            <a class="btn btn-link stretched-link font-weight-bold">
-                <i class="fa fa-users"></i> {% trans "Member of the Club" %}
+            <a class="btn btn-link stretched-link font-weight-bold" href="{% url 'member:club_members' pk=club.pk %}">
+                <i class="fa fa-users"></i> {% trans "Club members" %}
             </a>
         </div>
         {% render_table member_list %}

From fd705adb05b422b54ae2af177bdfda619c851136 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Fri, 31 Jul 2020 17:01:52 +0200
Subject: [PATCH 62/77] Filter members

---
 apps/member/tables.py              |  28 +++++++
 apps/member/views.py               |  28 +++++--
 locale/de/LC_MESSAGES/django.po    | 113 ++++++++++++++++++-----------
 locale/fr/LC_MESSAGES/django.po    | 113 ++++++++++++++++++-----------
 templates/member/club_members.html |  55 ++++++++++----
 templates/member/club_tables.html  |  13 ++++
 6 files changed, 242 insertions(+), 108 deletions(-)

diff --git a/apps/member/tables.py b/apps/member/tables.py
index 8f5ceb88..6242fa3b 100644
--- a/apps/member/tables.py
+++ b/apps/member/tables.py
@@ -130,3 +130,31 @@ class MembershipTable(tables.Table):
         template_name = 'django_tables2/bootstrap4.html'
         fields = ('user', 'club', 'date_start', 'date_end', 'roles', 'fee', )
         model = Membership
+
+
+class ClubManagerTable(tables.Table):
+    """
+    List managers of a club.
+    """
+
+    def render_user(self, value):
+        # If the user has the right, link the displayed user with the page of its detail.
+        s = value.username
+        if PermissionBackend.check_perm(get_current_authenticated_user(), "auth.view_user", value):
+            s = format_html("<a href={url}>{name}</a>",
+                            url=reverse_lazy('member:user_detail', kwargs={"pk": value.pk}), name=s)
+
+        return s
+
+    def render_roles(self, record):
+        roles = record.roles.all()
+        return ", ".join(str(role) for role in roles)
+
+    class Meta:
+        attrs = {
+            'class': 'table table-condensed table-striped table-hover',
+            'style': 'table-layout: fixed;'
+        }
+        template_name = 'django_tables2/bootstrap4.html'
+        fields = ('user', 'user.first_name', 'user.last_name', 'roles', )
+        model = Membership
diff --git a/apps/member/views.py b/apps/member/views.py
index 1785d1ad..57fe29e7 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -30,7 +30,7 @@ from permission.views import ProtectQuerysetMixin
 
 from .forms import ProfileForm, ClubForm, MembershipForm, CustomAuthenticationForm, UserForm, MembershipRolesForm
 from .models import Club, Membership
-from .tables import ClubTable, UserTable, MembershipTable
+from .tables import ClubTable, UserTable, MembershipTable, ClubManagerTable
 
 
 class CustomLoginView(LoginView):
@@ -338,6 +338,10 @@ class ClubDetailView(ProtectQuerysetMixin, LoginRequiredMixin, DetailView):
         if PermissionBackend.check_perm(self.request.user, "member.change_club_membership_start", club):
             club.update_membership_dates()
 
+        managers = Membership.objects.filter(club=self.object, roles__name="Bureau de club")\
+            .order_by('user__last_name').all()
+        context["managers"] = ClubManagerTable(data=managers, prefix="managers-")
+
         club_transactions = Transaction.objects.all().filter(Q(source=club.note) | Q(destination=club.note))\
             .filter(PermissionBackend.filter_queryset(self.request.user, Transaction, "view"))\
             .order_by('-created_at')
@@ -672,21 +676,33 @@ class ClubMembersListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableV
                 Q(user__note__alias__normalized_name__iregex='^' + Alias.normalize(pattern))
             )
 
-        if 'only_active' in self.request.GET:
-            only_active = self.request.GET["only_active"] != '0'
-        else:
-            only_active = True
+        only_active = "only_active" not in self.request.GET or self.request.GET["only_active"] != '0'
 
         if only_active:
             qs = qs.filter(date_start__lte=timezone.now().today(), date_end__gte=timezone.now().today())
 
+        if "roles" in self.request.GET:
+            if not self.request.GET["roles"]:
+                return qs.none()
+            roles_str = self.request.GET["roles"].replace(' ', '').split(',')
+            roles_int = map(int, roles_str)
+            qs = qs.filter(roles__in=roles_int)
+
         qs = qs.order_by('-date_start', 'user__username')
 
         return qs.distinct()
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["club"] = Club.objects.filter(
+        club = Club.objects.filter(
             PermissionBackend.filter_queryset(self.request.user, Club, "view")
         ).get(pk=self.kwargs["pk"])
+        context["club"] = club
+
+        applicable_roles = Role.objects.filter(Q(weirole__isnull=not hasattr(club, 'weiclub'))
+                                               & (Q(for_club__isnull=True) | Q(for_club=club))).all()
+        context["applicable_roles"] = applicable_roles
+
+        context["only_active"] = "only_active" not in self.request.GET or self.request.GET["only_active"] != '0'
+
         return context
\ No newline at end of file
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index c9ac11ba..f7b8412f 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-30 17:22+0200\n"
+"POT-Creation-Date: 2020-07-31 17:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -186,12 +186,12 @@ msgstr ""
 msgid "Type"
 msgstr ""
 
-#: apps/activity/tables.py:77 apps/member/forms.py:104
+#: apps/activity/tables.py:77 apps/member/forms.py:102
 #: apps/registration/forms.py:64 apps/treasury/forms.py:120
 msgid "Last name"
 msgstr ""
 
-#: apps/activity/tables.py:79 apps/member/forms.py:109
+#: apps/activity/tables.py:79 apps/member/forms.py:107
 #: apps/registration/forms.py:69 apps/treasury/forms.py:122
 #: templates/note/transaction_form.html:126
 msgid "First name"
@@ -261,12 +261,12 @@ msgstr ""
 msgid "create"
 msgstr ""
 
-#: apps/logs/models.py:61 apps/note/tables.py:143
+#: apps/logs/models.py:61 apps/note/tables.py:161
 #: templates/activity/activity_detail.html:67
 msgid "edit"
 msgstr ""
 
-#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:148
+#: apps/logs/models.py:62 apps/note/tables.py:138 apps/note/tables.py:166
 #: apps/wei/tables.py:65
 msgid "delete"
 msgstr ""
@@ -295,39 +295,47 @@ msgstr ""
 msgid "member"
 msgstr ""
 
-#: apps/member/forms.py:58 apps/member/views.py:81
+#: apps/member/forms.py:58 apps/member/views.py:82
 msgid "An alias with a similar name already exists."
 msgstr ""
 
-#: apps/member/forms.py:83 apps/registration/forms.py:44
+#: apps/member/forms.py:81 apps/registration/forms.py:44
 msgid "Inscription paid by Société Générale"
 msgstr ""
 
-#: apps/member/forms.py:85 apps/registration/forms.py:46
+#: apps/member/forms.py:83 apps/registration/forms.py:46
 msgid "Check this case is the Société Générale paid the inscription."
 msgstr ""
 
-#: apps/member/forms.py:90 apps/registration/forms.py:51
+#: apps/member/forms.py:88 apps/registration/forms.py:51
 msgid "Credit type"
 msgstr ""
 
-#: apps/member/forms.py:91 apps/registration/forms.py:52
+#: apps/member/forms.py:89 apps/registration/forms.py:52
 msgid "No credit"
 msgstr ""
 
-#: apps/member/forms.py:93
+#: apps/member/forms.py:91
 msgid "You can credit the note of the user."
 msgstr ""
 
-#: apps/member/forms.py:97 apps/registration/forms.py:57
+#: apps/member/forms.py:95 apps/registration/forms.py:57
 msgid "Credit amount"
 msgstr ""
 
-#: apps/member/forms.py:114 apps/registration/forms.py:74
+#: apps/member/forms.py:112 apps/registration/forms.py:74
 #: apps/treasury/forms.py:124 templates/note/transaction_form.html:132
 msgid "Bank"
 msgstr ""
 
+#: apps/member/forms.py:138
+msgid "User"
+msgstr ""
+
+#: apps/member/forms.py:152
+msgid "Roles"
+msgstr ""
+
 #: apps/member/models.py:34
 #: templates/registration/future_profile_detail.html:40
 #: templates/wei/weimembership_form.html:48
@@ -525,7 +533,7 @@ msgstr ""
 msgid "fee"
 msgstr ""
 
-#: apps/member/models.py:303 apps/member/views.py:535 apps/wei/views.py:787
+#: apps/member/models.py:303 apps/member/views.py:534 apps/wei/views.py:787
 msgid "User is not a member of the parent club"
 msgstr ""
 
@@ -534,7 +542,7 @@ msgstr ""
 msgid "The role {role} does not apply to the club {club}."
 msgstr ""
 
-#: apps/member/models.py:321 apps/member/views.py:544
+#: apps/member/models.py:321 apps/member/views.py:543
 msgid "User is already a member of the club"
 msgstr ""
 
@@ -555,80 +563,84 @@ msgstr ""
 msgid "Renew"
 msgstr ""
 
-#: apps/member/views.py:56 templates/member/profile_info.html:47
+#: apps/member/views.py:57 templates/member/profile_info.html:47
 #: templates/registration/future_profile_detail.html:48
 #: templates/wei/weimembership_form.html:130
 msgid "Update Profile"
 msgstr ""
 
-#: apps/member/views.py:69 apps/registration/forms.py:23
+#: apps/member/views.py:70 apps/registration/forms.py:23
 msgid "This address must be valid."
 msgstr ""
 
-#: apps/member/views.py:126
+#: apps/member/views.py:127
 msgid "Profile detail"
 msgstr ""
 
-#: apps/member/views.py:160
+#: apps/member/views.py:161
 msgid "Search user"
 msgstr ""
 
-#: apps/member/views.py:194 apps/member/views.py:376
+#: apps/member/views.py:195 apps/member/views.py:381
 msgid "Note aliases"
 msgstr ""
 
-#: apps/member/views.py:208
+#: apps/member/views.py:209
 msgid "Update note picture"
 msgstr ""
 
-#: apps/member/views.py:266 templates/member/profile_info.html:43
+#: apps/member/views.py:267 templates/member/profile_info.html:43
 msgid "Manage auth token"
 msgstr ""
 
-#: apps/member/views.py:294
+#: apps/member/views.py:295
 msgid "Create new club"
 msgstr ""
 
-#: apps/member/views.py:306
+#: apps/member/views.py:307
 msgid "Search club"
 msgstr ""
 
-#: apps/member/views.py:331
+#: apps/member/views.py:332
 msgid "Club detail"
 msgstr ""
 
-#: apps/member/views.py:393
+#: apps/member/views.py:398
 msgid "Update club"
 msgstr ""
 
-#: apps/member/views.py:427
+#: apps/member/views.py:432
 msgid "Add new member to the club"
 msgstr ""
 
-#: apps/member/views.py:530 apps/wei/views.py:778
+#: apps/member/views.py:529 apps/wei/views.py:778
 msgid ""
 "This user don't have enough money to join this club, and can't have a "
 "negative balance."
 msgstr ""
 
-#: apps/member/views.py:548
+#: apps/member/views.py:547
 msgid "The membership must start after {:%m-%d-%Y}."
 msgstr ""
 
-#: apps/member/views.py:553
+#: apps/member/views.py:552
 msgid "The membership must begin before {:%m-%d-%Y}."
 msgstr ""
 
-#: apps/member/views.py:570 apps/member/views.py:572 apps/member/views.py:574
+#: apps/member/views.py:569 apps/member/views.py:571 apps/member/views.py:573
 #: apps/registration/views.py:295 apps/registration/views.py:297
 #: apps/registration/views.py:299
 msgid "This field is required."
 msgstr ""
 
-#: apps/member/views.py:634
+#: apps/member/views.py:641
 msgid "Manage roles of an user in the club"
 msgstr ""
 
+#: apps/member/views.py:666
+msgid "Members of the club"
+msgstr ""
+
 #: apps/note/admin.py:121 apps/note/models/transactions.py:106
 msgid "source"
 msgstr ""
@@ -784,7 +796,7 @@ msgid "transaction templates"
 msgstr ""
 
 #: apps/note/models/transactions.py:112 apps/note/models/transactions.py:125
-#: apps/note/tables.py:33 apps/note/tables.py:42
+#: apps/note/tables.py:35 apps/note/tables.py:44
 msgid "used alias"
 msgstr ""
 
@@ -796,7 +808,7 @@ msgstr ""
 msgid "reason"
 msgstr ""
 
-#: apps/note/models/transactions.py:151 apps/note/tables.py:95
+#: apps/note/models/transactions.py:151 apps/note/tables.py:113
 msgid "invalidity reason"
 msgstr ""
 
@@ -858,25 +870,25 @@ msgstr ""
 msgid "membership transactions"
 msgstr ""
 
-#: apps/note/tables.py:57
+#: apps/note/tables.py:63
 msgid "Click to invalidate"
 msgstr ""
 
-#: apps/note/tables.py:57
+#: apps/note/tables.py:63
 msgid "Click to validate"
 msgstr ""
 
-#: apps/note/tables.py:93
+#: apps/note/tables.py:111
 msgid "No reason specified"
 msgstr ""
 
-#: apps/note/tables.py:122 apps/note/tables.py:150 apps/wei/tables.py:66
+#: apps/note/tables.py:140 apps/note/tables.py:168 apps/wei/tables.py:66
 #: templates/treasury/sogecredit_detail.html:59
 #: templates/wei/weiregistration_confirm_delete.html:32
 msgid "Delete"
 msgstr ""
 
-#: apps/note/tables.py:145 apps/wei/tables.py:42 apps/wei/tables.py:43
+#: apps/note/tables.py:163 apps/wei/tables.py:42 apps/wei/tables.py:43
 #: templates/member/club_info.html:67 templates/note/conso_form.html:128
 #: templates/wei/bus_tables.html:15 templates/wei/busteam_tables.html:15
 #: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:68
@@ -1828,11 +1840,28 @@ msgstr ""
 msgid "Club listing"
 msgstr ""
 
+#: templates/member/club_members.html:16
+msgid "Display only active memberships"
+msgstr ""
+
+#: templates/member/club_members.html:21
+msgid "Filter roles:"
+msgstr ""
+
+#: templates/member/club_members.html:37
+#: templates/wei/weimembership_list.html:18
+msgid "There is no membership found with this pattern."
+msgstr ""
+
 #: templates/member/club_tables.html:7
+msgid "Club managers"
+msgstr ""
+
+#: templates/member/club_tables.html:20
 msgid "Club members"
 msgstr ""
 
-#: templates/member/club_tables.html:20 templates/member/profile_tables.html:28
+#: templates/member/club_tables.html:33 templates/member/profile_tables.html:28
 #: templates/wei/weiclub_tables.html:105
 msgid "Transaction history"
 msgstr ""
@@ -2469,10 +2498,6 @@ msgid ""
 "                        "
 msgstr ""
 
-#: templates/wei/weimembership_list.html:18
-msgid "There is no membership found with this pattern."
-msgstr ""
-
 #: templates/wei/weimembership_list.html:24
 msgid "View unvalidated registrations..."
 msgstr ""
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index c561abba..91c6f1f7 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-30 17:22+0200\n"
+"POT-Creation-Date: 2020-07-31 17:00+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -187,12 +187,12 @@ msgstr "supprimer"
 msgid "Type"
 msgstr "Type"
 
-#: apps/activity/tables.py:77 apps/member/forms.py:104
+#: apps/activity/tables.py:77 apps/member/forms.py:102
 #: apps/registration/forms.py:64 apps/treasury/forms.py:120
 msgid "Last name"
 msgstr "Nom de famille"
 
-#: apps/activity/tables.py:79 apps/member/forms.py:109
+#: apps/activity/tables.py:79 apps/member/forms.py:107
 #: apps/registration/forms.py:69 apps/treasury/forms.py:122
 #: templates/note/transaction_form.html:126
 msgid "First name"
@@ -262,12 +262,12 @@ msgstr "Nouvelles données"
 msgid "create"
 msgstr "Créer"
 
-#: apps/logs/models.py:61 apps/note/tables.py:143
+#: apps/logs/models.py:61 apps/note/tables.py:161
 #: templates/activity/activity_detail.html:67
 msgid "edit"
 msgstr "Modifier"
 
-#: apps/logs/models.py:62 apps/note/tables.py:120 apps/note/tables.py:148
+#: apps/logs/models.py:62 apps/note/tables.py:138 apps/note/tables.py:166
 #: apps/wei/tables.py:65
 msgid "delete"
 msgstr "Supprimer"
@@ -296,39 +296,47 @@ msgstr "journaux de modifications"
 msgid "member"
 msgstr "adhérent"
 
-#: apps/member/forms.py:58 apps/member/views.py:81
+#: apps/member/forms.py:58 apps/member/views.py:82
 msgid "An alias with a similar name already exists."
 msgstr "Un alias avec un nom similaire existe déjà."
 
-#: apps/member/forms.py:83 apps/registration/forms.py:44
+#: apps/member/forms.py:81 apps/registration/forms.py:44
 msgid "Inscription paid by Société Générale"
 msgstr "Inscription payée par la Société générale"
 
-#: apps/member/forms.py:85 apps/registration/forms.py:46
+#: apps/member/forms.py:83 apps/registration/forms.py:46
 msgid "Check this case is the Société Générale paid the inscription."
 msgstr "Cochez cette case si la Société Générale a payé l'inscription."
 
-#: apps/member/forms.py:90 apps/registration/forms.py:51
+#: apps/member/forms.py:88 apps/registration/forms.py:51
 msgid "Credit type"
 msgstr "Type de rechargement"
 
-#: apps/member/forms.py:91 apps/registration/forms.py:52
+#: apps/member/forms.py:89 apps/registration/forms.py:52
 msgid "No credit"
 msgstr "Pas de rechargement"
 
-#: apps/member/forms.py:93
+#: apps/member/forms.py:91
 msgid "You can credit the note of the user."
 msgstr "Vous pouvez créditer la note de l'utisateur avant l'adhésion."
 
-#: apps/member/forms.py:97 apps/registration/forms.py:57
+#: apps/member/forms.py:95 apps/registration/forms.py:57
 msgid "Credit amount"
 msgstr "Montant à créditer"
 
-#: apps/member/forms.py:114 apps/registration/forms.py:74
+#: apps/member/forms.py:112 apps/registration/forms.py:74
 #: apps/treasury/forms.py:124 templates/note/transaction_form.html:132
 msgid "Bank"
 msgstr "Banque"
 
+#: apps/member/forms.py:138
+msgid "User"
+msgstr "Utilisateur"
+
+#: apps/member/forms.py:152
+msgid "Roles"
+msgstr "Rôles"
+
 #: apps/member/models.py:34
 #: templates/registration/future_profile_detail.html:40
 #: templates/wei/weimembership_form.html:48
@@ -530,7 +538,7 @@ msgstr "l'adhésion finit le"
 msgid "fee"
 msgstr "cotisation"
 
-#: apps/member/models.py:303 apps/member/views.py:535 apps/wei/views.py:787
+#: apps/member/models.py:303 apps/member/views.py:534 apps/wei/views.py:787
 msgid "User is not a member of the parent club"
 msgstr "L'utilisateur n'est pas membre du club parent"
 
@@ -539,7 +547,7 @@ msgstr "L'utilisateur n'est pas membre du club parent"
 msgid "The role {role} does not apply to the club {club}."
 msgstr "Le rôle {role} ne s'applique pas au club {club}."
 
-#: apps/member/models.py:321 apps/member/views.py:544
+#: apps/member/models.py:321 apps/member/views.py:543
 msgid "User is already a member of the club"
 msgstr "L'utilisateur est déjà membre du club"
 
@@ -560,57 +568,57 @@ msgstr "adhésions"
 msgid "Renew"
 msgstr "Renouveler"
 
-#: apps/member/views.py:56 templates/member/profile_info.html:47
+#: apps/member/views.py:57 templates/member/profile_info.html:47
 #: templates/registration/future_profile_detail.html:48
 #: templates/wei/weimembership_form.html:130
 msgid "Update Profile"
 msgstr "Modifier le profil"
 
-#: apps/member/views.py:69 apps/registration/forms.py:23
+#: apps/member/views.py:70 apps/registration/forms.py:23
 msgid "This address must be valid."
 msgstr "Cette adresse doit être valide."
 
-#: apps/member/views.py:126
+#: apps/member/views.py:127
 msgid "Profile detail"
 msgstr "Détails de l'utilisateur"
 
-#: apps/member/views.py:160
+#: apps/member/views.py:161
 msgid "Search user"
 msgstr "Chercher un utilisateur"
 
-#: apps/member/views.py:194 apps/member/views.py:376
+#: apps/member/views.py:195 apps/member/views.py:381
 msgid "Note aliases"
 msgstr "Alias de la note"
 
-#: apps/member/views.py:208
+#: apps/member/views.py:209
 msgid "Update note picture"
 msgstr "Modifier la photo de la note"
 
-#: apps/member/views.py:266 templates/member/profile_info.html:43
+#: apps/member/views.py:267 templates/member/profile_info.html:43
 msgid "Manage auth token"
 msgstr "Gérer les jetons d'authentification"
 
-#: apps/member/views.py:294
+#: apps/member/views.py:295
 msgid "Create new club"
 msgstr "Créer un nouveau club"
 
-#: apps/member/views.py:306
+#: apps/member/views.py:307
 msgid "Search club"
 msgstr "Chercher un club"
 
-#: apps/member/views.py:331
+#: apps/member/views.py:332
 msgid "Club detail"
 msgstr "Détails du club"
 
-#: apps/member/views.py:393
+#: apps/member/views.py:398
 msgid "Update club"
 msgstr "Modifier le club"
 
-#: apps/member/views.py:427
+#: apps/member/views.py:432
 msgid "Add new member to the club"
 msgstr "Ajouter un nouveau membre au club"
 
-#: apps/member/views.py:530 apps/wei/views.py:778
+#: apps/member/views.py:529 apps/wei/views.py:778
 msgid ""
 "This user don't have enough money to join this club, and can't have a "
 "negative balance."
@@ -618,24 +626,28 @@ msgstr ""
 "Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne peut pas "
 "avoir un solde négatif."
 
-#: apps/member/views.py:548
+#: apps/member/views.py:547
 msgid "The membership must start after {:%m-%d-%Y}."
 msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}."
 
-#: apps/member/views.py:553
+#: apps/member/views.py:552
 msgid "The membership must begin before {:%m-%d-%Y}."
 msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}."
 
-#: apps/member/views.py:570 apps/member/views.py:572 apps/member/views.py:574
+#: apps/member/views.py:569 apps/member/views.py:571 apps/member/views.py:573
 #: apps/registration/views.py:295 apps/registration/views.py:297
 #: apps/registration/views.py:299
 msgid "This field is required."
 msgstr "Ce champ est requis."
 
-#: apps/member/views.py:634
+#: apps/member/views.py:641
 msgid "Manage roles of an user in the club"
 msgstr "Gérer les rôles d'un utilisateur dans le club"
 
+#: apps/member/views.py:666
+msgid "Members of the club"
+msgstr "Membres du club"
+
 #: apps/note/admin.py:121 apps/note/models/transactions.py:106
 msgid "source"
 msgstr "source"
@@ -792,7 +804,7 @@ msgid "transaction templates"
 msgstr "modèles de transaction"
 
 #: apps/note/models/transactions.py:112 apps/note/models/transactions.py:125
-#: apps/note/tables.py:33 apps/note/tables.py:42
+#: apps/note/tables.py:35 apps/note/tables.py:44
 msgid "used alias"
 msgstr "alias utilisé"
 
@@ -804,7 +816,7 @@ msgstr "quantité"
 msgid "reason"
 msgstr "raison"
 
-#: apps/note/models/transactions.py:151 apps/note/tables.py:95
+#: apps/note/models/transactions.py:151 apps/note/tables.py:113
 msgid "invalidity reason"
 msgstr "Motif d'invalidité"
 
@@ -870,25 +882,25 @@ msgstr "Transaction d'adhésion"
 msgid "membership transactions"
 msgstr "Transactions d'adhésion"
 
-#: apps/note/tables.py:57
+#: apps/note/tables.py:63
 msgid "Click to invalidate"
 msgstr "Cliquez pour dévalider"
 
-#: apps/note/tables.py:57
+#: apps/note/tables.py:63
 msgid "Click to validate"
 msgstr "Cliquez pour valider"
 
-#: apps/note/tables.py:93
+#: apps/note/tables.py:111
 msgid "No reason specified"
 msgstr "Pas de motif spécifié"
 
-#: apps/note/tables.py:122 apps/note/tables.py:150 apps/wei/tables.py:66
+#: apps/note/tables.py:140 apps/note/tables.py:168 apps/wei/tables.py:66
 #: templates/treasury/sogecredit_detail.html:59
 #: templates/wei/weiregistration_confirm_delete.html:32
 msgid "Delete"
 msgstr "Supprimer"
 
-#: apps/note/tables.py:145 apps/wei/tables.py:42 apps/wei/tables.py:43
+#: apps/note/tables.py:163 apps/wei/tables.py:42 apps/wei/tables.py:43
 #: templates/member/club_info.html:67 templates/note/conso_form.html:128
 #: templates/wei/bus_tables.html:15 templates/wei/busteam_tables.html:15
 #: templates/wei/busteam_tables.html:33 templates/wei/weiclub_info.html:68
@@ -1888,11 +1900,28 @@ msgstr "Créer un club"
 msgid "Club listing"
 msgstr "Liste des clubs"
 
+#: templates/member/club_members.html:16
+msgid "Display only active memberships"
+msgstr "N'afficher que les adhésions encore valides"
+
+#: templates/member/club_members.html:21
+msgid "Filter roles:"
+msgstr "Filtrer par rôle :"
+
+#: templates/member/club_members.html:37
+#: templates/wei/weimembership_list.html:18
+msgid "There is no membership found with this pattern."
+msgstr "Il n'y a pas d'adhésion trouvée avec cette entrée."
+
 #: templates/member/club_tables.html:7
+msgid "Club managers"
+msgstr "Bureau du club"
+
+#: templates/member/club_tables.html:20
 msgid "Club members"
 msgstr "Membres du club"
 
-#: templates/member/club_tables.html:20 templates/member/profile_tables.html:28
+#: templates/member/club_tables.html:33 templates/member/profile_tables.html:28
 #: templates/wei/weiclub_tables.html:105
 msgid "Transaction history"
 msgstr "Historique des transactions"
@@ -2591,10 +2620,6 @@ msgstr ""
 "l'inscription au WEI.\n"
 "                        "
 
-#: templates/wei/weimembership_list.html:18
-msgid "There is no membership found with this pattern."
-msgstr "Il n'y a pas d'adhésion trouvée avec cette entrée."
-
 #: templates/wei/weimembership_list.html:24
 msgid "View unvalidated registrations..."
 msgstr "Voir les inscriptions non validées ..."
diff --git a/templates/member/club_members.html b/templates/member/club_members.html
index fca6ec1c..ed2debe4 100644
--- a/templates/member/club_members.html
+++ b/templates/member/club_members.html
@@ -3,11 +3,30 @@
 {% load render_table from django_tables2 %}
 
 {% block profile_info %}
-{% include "member/club_info.html" %}
+    {% include "member/club_info.html" %}
 {% endblock %}
 
 {% block profile_content %}
     <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note ...">
+    <div class="form-group">
+        <div class="form-check">
+            <label class="form-check-label" for="only_active">
+                <input type="checkbox" class="checkboxinput form-check-input" id="only_active"
+                       {% if only_active %}checked{% endif %}>
+                {% trans "Display only active memberships" %}
+            </label>
+        </div>
+    </div>
+    <div id="div_id_roles" class="form-group">
+        <label for="id_roles" class="col-form-label">{% trans "Filter roles:" %}</label>
+        <div class="">
+            <select name="roles" class="selectmultiple form-control" id="roles" multiple="">
+                {% for role in applicable_roles %}
+                    <option value="{{ role.id }}" selected>{{ role.name }}</option>
+                {% endfor %}
+            </select>
+        </div>
+    </div>
     <hr>
 
     <div id="memberships_table">
@@ -22,21 +41,29 @@
 {% endblock %}
 
 {% block extrajavascript %}
-<script type="text/javascript">
-    $(document).ready(function() {
-        let old_pattern = null;
-        let searchbar_obj = $("#searchbar");
+    <script type="text/javascript">
+        $(document).ready(function () {
+            let searchbar_obj = $("#searchbar");
+            let only_active_obj = $("#only_active");
+            let roles_obj = $("#roles");
 
-        function reloadTable() {
-            let pattern = searchbar_obj.val();
+            function reloadTable() {
+                let pattern = searchbar_obj.val();
 
-            if (pattern === old_pattern)
-                return;
+                let roles = [];
+                $("#roles option:selected").each(function() {
+                    roles.push($(this).val());
+                });
+                let roles_str = roles.join(',');
 
-            $("#memberships_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20") + " #memberships_table");
-        }
+                $("#memberships_table").load(location.pathname + "?search=" + pattern.replace(" ", "%20")
+                    + "&only_active=" + (only_active_obj.is(':checked') ? '1' : '0')
+                    + "&roles=" + roles_str + " #memberships_table");
+            }
 
-        searchbar_obj.keyup(reloadTable);
-    });
-</script>
+            searchbar_obj.keyup(reloadTable);
+            only_active_obj.change(reloadTable);
+            roles_obj.change(reloadTable);
+        });
+    </script>
 {% endblock %}
diff --git a/templates/member/club_tables.html b/templates/member/club_tables.html
index 92d66425..d4a9575b 100644
--- a/templates/member/club_tables.html
+++ b/templates/member/club_tables.html
@@ -1,5 +1,18 @@
 {% load render_table from django_tables2 %}
 {% load i18n %}
+{% if managers.data %}
+    <div class="card">
+        <div class="card-header position-relative" id="clubListHeading">
+            <a class="btn btn-link stretched-link font-weight-bold">
+                <i class="fa fa-users"></i> {% trans "Club managers" %}
+            </a>
+        </div>
+        {% render_table managers %}
+    </div>
+
+    <hr>
+{% endif %}
+
 {% if member_list.data %}
     <div class="card">
         <div class="card-header position-relative" id="clubListHeading">

From 9008baad3a40d20d37fc89ec763f36365aa3efb8 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Fri, 31 Jul 2020 17:07:14 +0200
Subject: [PATCH 63/77] Better alias research, closes #51

---
 apps/note/api/views.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/note/api/views.py b/apps/note/api/views.py
index 8a1616ce..a365c343 100644
--- a/apps/note/api/views.py
+++ b/apps/note/api/views.py
@@ -106,7 +106,10 @@ class ConsumerViewSet(ReadOnlyProtectedModelViewSet):
         queryset = super().get_queryset()
 
         alias = self.request.query_params.get("alias", ".*")
-        queryset = queryset.filter(normalized_name__iregex="^" + Alias.normalize(alias))\
+        queryset = queryset.filter(
+            Q(name__regex="^" + alias)
+            | Q(normalized_name__regex="^" + Alias.normalize(alias))
+            | Q(normalized_name__regex="^" + alias.lower()))\
             .order_by('name').prefetch_related('note')
 
         return queryset

From 8409ee4cc454328d5fb0071c6862244cb6a4ff44 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Fri, 31 Jul 2020 17:15:31 +0200
Subject: [PATCH 64/77] Display "Create WEI" button only for people that can
 create a WEI, see #53

---
 apps/wei/views.py               | 5 +++++
 templates/wei/weiclub_list.html | 6 ++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/wei/views.py b/apps/wei/views.py
index dde9fe78..f2ac40dc 100644
--- a/apps/wei/views.py
+++ b/apps/wei/views.py
@@ -54,6 +54,11 @@ class WEIListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
     ordering = '-year'
     extra_context = {"title": _("Search WEI")}
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context["can_create_wei"] = PermissionBackend.check_perm(self.request.user, "wei.add_weiclub", WEIClub())
+        return context
+
 
 class WEICreateView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
     """
diff --git a/templates/wei/weiclub_list.html b/templates/wei/weiclub_list.html
index 5390ade6..2739e5bf 100644
--- a/templates/wei/weiclub_list.html
+++ b/templates/wei/weiclub_list.html
@@ -5,8 +5,10 @@
 <div class="row justify-content-center mb-4">
     <div class="col-md-10 text-center">
         <input class="form-control mx-auto w-25" type="text" onkeyup="search_field_moved()" id="search_field"/>
-        <hr>
-        <a class="btn btn-primary text-center my-4" href="{% url 'wei:wei_create' %}">{% trans "Create WEI" %}</a>
+        {% if can_create_wei %}
+            <hr>
+            <a class="btn btn-primary text-center my-4" href="{% url 'wei:wei_create' %}">{% trans "Create WEI" %}</a>
+        {% endif %}
     </div>
 </div>
 <div class="row justify-content-center">   

From d8127e8936f4143992e8e0f084759bbcebb586d3 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Fri, 31 Jul 2020 19:00:19 +0200
Subject: [PATCH 65/77] Escape strings

---
 templates/note/conso_form.html       | 8 ++++----
 templates/note/transaction_form.html | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/templates/note/conso_form.html b/templates/note/conso_form.html
index 005e3e05..e6335c6e 100644
--- a/templates/note/conso_form.html
+++ b/templates/note/conso_form.html
@@ -161,8 +161,8 @@
             {% if button.display %}
                 $("#highlighted_button{{ button.id }}").click(function() {
                     addConso({{ button.destination_id }}, {{ button.amount }},
-                        {{ polymorphic_ctype }}, {{ button.category_id }}, "{{ button.category.name }}",
-                        {{ button.id }}, "{{ button.name }}");
+                        {{ polymorphic_ctype }}, {{ button.category_id }}, "{{ button.category.name|escapejs }}",
+                        {{ button.id }}, "{{ button.name|escapejs }}");
                 });
             {% endif %}
         {% endfor %}
@@ -172,8 +172,8 @@
             {% if button.display %}
                 $("#button{{ button.id }}").click(function() {
                     addConso({{ button.destination_id }}, {{ button.amount }},
-                        {{ polymorphic_ctype }}, {{ button.category_id }}, "{{ button.category.name }}",
-                        {{ button.id }}, "{{ button.name }}");
+                        {{ polymorphic_ctype }}, {{ button.category_id }}, "{{ button.category.name|escapejs }}",
+                        {{ button.id }}, "{{ button.name|escapejs }}");
                 });
             {% endif %}
             {% endfor %}
diff --git a/templates/note/transaction_form.html b/templates/note/transaction_form.html
index fd3e5406..cb7df094 100644
--- a/templates/note/transaction_form.html
+++ b/templates/note/transaction_form.html
@@ -160,7 +160,7 @@ SPDX-License-Identifier: GPL-2.0-or-later
         TRANSFER_POLYMORPHIC_CTYPE = {{ polymorphic_ctype }};
         SPECIAL_TRANSFER_POLYMORPHIC_CTYPE = {{ special_polymorphic_ctype }};
         user_id = {{ user.note.pk }};
-        username = "{{ user.username }}";
+        username = "{{ user.username|escapejs }}";
     </script>
     <script src="/static/js/transfer.js"></script>
 {% endblock %}

From 932a5462134584d6c70f22dc97331e73dab3876f Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Fri, 31 Jul 2020 19:43:03 +0200
Subject: [PATCH 66/77] Better error messages

---
 static/js/base.js     |  2 +-
 static/js/consos.js   |  4 ++--
 static/js/transfer.js | 15 +++++----------
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/static/js/base.js b/static/js/base.js
index 77057103..fdad58d7 100644
--- a/static/js/base.js
+++ b/static/js/base.js
@@ -369,7 +369,7 @@ function de_validate(id, validated) {
         },
         error: function (err) {
             addMsg("Une erreur est survenue lors de la validation/dévalidation " +
-                "de cette transaction : " + err.responseText, "danger");
+                "de cette transaction : " + JSON.parse(err.responseText)["detail"], "danger", 10000);
 
             refreshBalance();
             // error if this method doesn't exist. Please define it.
diff --git a/static/js/consos.js b/static/js/consos.js
index 2fa77249..268ddc95 100644
--- a/static/js/consos.js
+++ b/static/js/consos.js
@@ -207,10 +207,10 @@ function consume(source, source_alias, dest, quantity, amount, reason, type, cat
                 "template": template
             }).done(function() {
                 reset();
-                addMsg("La transaction n'a pas pu être validée pour cause de solde insuffisant.", "danger");
+                addMsg("La transaction n'a pas pu être validée pour cause de solde insuffisant.", "danger", 10000);
             }).fail(function () {
                 reset();
-                errMsg(e.responseJSON);
+                errMsg(e.responseJSON, 10000);
             });
     });
 }
diff --git a/static/js/transfer.js b/static/js/transfer.js
index ed651640..4234e775 100644
--- a/static/js/transfer.js
+++ b/static/js/transfer.js
@@ -189,7 +189,7 @@ $("#btn_transfer").click(function() {
                     }).done(function () {
                         addMsg("Le transfert de "
                             + pretty_money(source.quantity * dest.quantity * 100 * $("#amount").val()) + " de la note " + source.name
-                            + " vers la note " + dest.name + " a été fait avec succès !", "success");
+                            + " vers la note " + dest.name + " a été fait avec succès !", "success", 10000);
 
                         reset();
                     }).fail(function (err) { // do it again but valid = false
@@ -210,15 +210,11 @@ $("#btn_transfer").click(function() {
                         }).done(function () {
                             addMsg("Le transfert de "
                                 + pretty_money(source.quantity * dest.quantity * 100 * $("#amount").val()) + " de la note " + source.name
-                                + " vers la note " + dest.name + " a échoué : Solde insuffisant", "danger");
-
-                            reset();
+                                + " vers la note " + dest.name + " a échoué : Solde insuffisant", "danger", 10000);
                         }).fail(function (err) {
                             addMsg("Le transfert de "
                                 + pretty_money(source.quantity * dest.quantity * 100 * $("#amount").val()) + " de la note " + source.name
-                                + " vers la note " + dest.name + " a échoué : " + err.responseText, "danger");
-
-                            reset();
+                                + " vers la note " + dest.name + " a échoué : " + JSON.parse(err.responseText)["detail"], "danger", 10000);
                     });
                 });
             });
@@ -261,11 +257,10 @@ $("#btn_transfer").click(function() {
                 "first_name": $("#first_name").val(),
                 "bank": $("#bank").val()
             }).done(function () {
-                addMsg("Le crédit/retrait a bien été effectué !", "success");
+                addMsg("Le crédit/retrait a bien été effectué !", "success", 10000);
                 reset();
             }).fail(function (err) {
-                addMsg("Le crédit/retrait a échoué : " + err.responseText, "danger");
-                reset();
+                addMsg("Le crédit/retrait a échoué : " + JSON.parse(err.responseText)["detail"], "danger", 10000);
         });
     }
 });

From dca655949e1db3d740bbd47eba32aaee44bcb8b1 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Fri, 31 Jul 2020 21:24:23 +0200
Subject: [PATCH 67/77] Improve transfer UI

---
 apps/permission/models.py            |  9 ++++
 apps/wei/views.py                    |  7 ++-
 static/js/transfer.js                | 68 ++++++++++++++++++++++------
 templates/note/amount_input.html     |  1 +
 templates/note/transaction_form.html |  3 +-
 5 files changed, 71 insertions(+), 17 deletions(-)

diff --git a/apps/permission/models.py b/apps/permission/models.py
index 79148fe4..beace783 100644
--- a/apps/permission/models.py
+++ b/apps/permission/models.py
@@ -4,6 +4,7 @@
 import functools
 import json
 import operator
+from time import sleep
 
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ValidationError
@@ -44,6 +45,14 @@ class InstancedPermission:
                 else:
                     oldpk = obj.pk
                 # Ensure previous models are deleted
+                count = 0
+                while count < 1000:
+                    if self.model.model_class().objects.filter(pk=obj.pk).exists():
+                        # If the object exists, that means that one permission is currently checked.
+                        # We wait before the other permission, at most 1 second.
+                        sleep(1)
+                        continue
+                    break
                 for o in self.model.model_class().objects.filter(pk=obj.pk).all():
                     o._force_delete = True
                     Model.delete(o)
diff --git a/apps/wei/views.py b/apps/wei/views.py
index f2ac40dc..2210a347 100644
--- a/apps/wei/views.py
+++ b/apps/wei/views.py
@@ -17,6 +17,7 @@ from django.http import HttpResponse
 from django.shortcuts import redirect
 from django.template.loader import render_to_string
 from django.urls import reverse_lazy
+from django.utils import timezone
 from django.views import View
 from django.views.generic import DetailView, UpdateView, CreateView, RedirectView, TemplateView
 from django.utils.translation import gettext_lazy as _
@@ -56,7 +57,11 @@ class WEIListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context["can_create_wei"] = PermissionBackend.check_perm(self.request.user, "wei.add_weiclub", WEIClub())
+        context["can_create_wei"] = PermissionBackend.check_perm(self.request.user, "wei.add_weiclub", WEIClub(
+            year=0,
+            date_start=timezone.now().date(),
+            date_end=timezone.now().date(),
+        ))
         return context
 
 
diff --git a/static/js/transfer.js b/static/js/transfer.js
index 4234e775..ba0bf9e3 100644
--- a/static/js/transfer.js
+++ b/static/js/transfer.js
@@ -14,8 +14,14 @@ function reset(refresh=true) {
     dests.length = 0;
     $("#source_note_list").html("");
     $("#dest_note_list").html("");
-    $("#amount").val("");
-    $("#reason").val("");
+    let amount_field = $("#amount");
+    amount_field.val("");
+    amount_field.removeClass('is-invalid');
+    $("#amount-required").html("");
+    let reason_field = $("#reason");
+    reason_field.val("");
+    reason_field.removeClass('is-invalid');
+    $("#reason-required").html("");
     $("#last_name").val("");
     $("#first_name").val("");
     $("#bank").val("");
@@ -140,7 +146,9 @@ $(document).ready(function() {
 
     $("#source_me").click(function() {
         // Shortcut to set the current user as the only emitter
-        reset(false);
+        sources_notes_display.length = 0;
+        sources.length = 0;
+        $("#source_note_list").html("");
 
         let source_note = $("#source_note");
         source_note.focus();
@@ -170,15 +178,45 @@ $(document).ready(function() {
 });
 
 $("#btn_transfer").click(function() {
+    let error = false;
+
+    let amount_field = $("#amount");
+    amount_field.removeClass('is-invalid');
+    $("#amount-required").html("");
+
+    let reason_field = $("#reason");
+    reason_field.removeClass('is-invalid');
+    $("#reason-required").html("");
+
+    if (!amount_field.val() || isNaN(amount_field.val()) || amount_field.val() <= 0) {
+        amount_field.addClass('is-invalid');
+        $("#amount-required").html("<strong>Ce champ est requis et doit comporter un nombre décimal strictement positif.</strong>");
+        error = true;
+    }
+
+    if (!reason_field.val()) {
+        reason_field.addClass('is-invalid');
+        $("#reason-required").html("<strong>Ce champ est requis.</strong>");
+        error = true;
+    }
+
+    if (error)
+        return;
+
+    let amount = 100 * amount_field.val();
+    let reason = reason_field.val();
+
     if ($("#type_transfer").is(':checked')) {
-        sources_notes_display.forEach(function (source) {
-            dests_notes_display.forEach(function (dest) {
+
+        // We copy the arrays to ensure that transactions are well-processed even if the form is reset
+        [...sources_notes_display].forEach(function (source) {
+            [...dests_notes_display].forEach(function (dest) {
                 $.post("/api/note/transaction/transaction/",
                     {
                         "csrfmiddlewaretoken": CSRF_TOKEN,
                         "quantity": source.quantity * dest.quantity,
-                        "amount": 100 * $("#amount").val(),
-                        "reason": $("#reason").val(),
+                        "amount": amount,
+                        "reason": reason,
                         "valid": true,
                         "polymorphic_ctype": TRANSFER_POLYMORPHIC_CTYPE,
                         "resourcetype": "Transaction",
@@ -188,7 +226,7 @@ $("#btn_transfer").click(function() {
                         "destination_alias": dest.name
                     }).done(function () {
                         addMsg("Le transfert de "
-                            + pretty_money(source.quantity * dest.quantity * 100 * $("#amount").val()) + " de la note " + source.name
+                            + pretty_money(source.quantity * dest.quantity * amount) + " de la note " + source.name
                             + " vers la note " + dest.name + " a été fait avec succès !", "success", 10000);
 
                         reset();
@@ -197,8 +235,8 @@ $("#btn_transfer").click(function() {
                         {
                             "csrfmiddlewaretoken": CSRF_TOKEN,
                             "quantity": source.quantity * dest.quantity,
-                            "amount": 100 * $("#amount").val(),
-                            "reason": $("#reason").val(),
+                            "amount": amount,
+                            "reason": reason,
                             "valid": false,
                             "invalidity_reason": "Solde insuffisant",
                             "polymorphic_ctype": TRANSFER_POLYMORPHIC_CTYPE,
@@ -209,12 +247,12 @@ $("#btn_transfer").click(function() {
                             "destination_alias": dest.name
                         }).done(function () {
                             addMsg("Le transfert de "
-                                + pretty_money(source.quantity * dest.quantity * 100 * $("#amount").val()) + " de la note " + source.name
+                                + pretty_money(source.quantity * dest.quantity * amount) + " de la note " + source.name
                                 + " vers la note " + dest.name + " a échoué : Solde insuffisant", "danger", 10000);
                         }).fail(function (err) {
                             addMsg("Le transfert de "
-                                + pretty_money(source.quantity * dest.quantity * 100 * $("#amount").val()) + " de la note " + source.name
-                                + " vers la note " + dest.name + " a échoué : " + JSON.parse(err.responseText)["detail"], "danger", 10000);
+                                + pretty_money(source.quantity * dest.quantity * amount) + " de la note " + source.name
+                                + " vers la note " + dest.name + " a échoué : " + err.responseText, "danger");
                     });
                 });
             });
@@ -222,7 +260,7 @@ $("#btn_transfer").click(function() {
     } else if ($("#type_credit").is(':checked') || $("#type_debit").is(':checked')) {
         let special_note = $("#credit_type").val();
         let user_note;
-        let given_reason = $("#reason").val();
+        let given_reason = reason;
         let source, dest, reason;
         if ($("#type_credit").is(':checked')) {
             user_note = dests_notes_display[0].note.id;
@@ -244,7 +282,7 @@ $("#btn_transfer").click(function() {
             {
                 "csrfmiddlewaretoken": CSRF_TOKEN,
                 "quantity": 1,
-                "amount": 100 * $("#amount").val(),
+                "amount": amount,
                 "reason": reason,
                 "valid": true,
                 "polymorphic_ctype": SPECIAL_TRANSFER_POLYMORPHIC_CTYPE,
diff --git a/templates/note/amount_input.html b/templates/note/amount_input.html
index 6ef4a53a..cd8cd201 100644
--- a/templates/note/amount_input.html
+++ b/templates/note/amount_input.html
@@ -8,4 +8,5 @@
     <div class="input-group-append">
         <span class="input-group-text">€</span>
     </div>
+    <p id="amount-required" class="invalid-feedback"></p>
 </div>
\ No newline at end of file
diff --git a/templates/note/transaction_form.html b/templates/note/transaction_form.html
index cb7df094..b761490d 100644
--- a/templates/note/transaction_form.html
+++ b/templates/note/transaction_form.html
@@ -100,7 +100,8 @@ SPDX-License-Identifier: GPL-2.0-or-later
                     <div class="form-row">
                         <div class="col-md-12">
                             <label for="reason">{% trans "Reason" %} :</label>
-                            <input class="form-control mx-auto d-block" type="text" id="reason" required />
+                            <input class="form-control mx-auto d-block" type="text" id="reason" />
+                            <p id="reason-required" class="invalid-feedback"></p>
                         </div>
                     </div>
 

From d7b834d9089e647084944b37ae4e24f3a03e5a72 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Fri, 31 Jul 2020 22:29:23 +0200
Subject: [PATCH 68/77] Translate rights

---
 apps/note/models/transactions.py      |   2 +
 apps/permission/fixtures/initial.json | 400 ++++++++++++--------------
 apps/permission/models.py             |   8 +-
 locale/de/LC_MESSAGES/django.po       | 154 +++++-----
 locale/fr/LC_MESSAGES/django.po       | 154 +++++-----
 templates/base.html                   |   8 +-
 templates/permission/all_rights.html  |   2 +-
 7 files changed, 358 insertions(+), 370 deletions(-)

diff --git a/apps/note/models/transactions.py b/apps/note/models/transactions.py
index 8a7162c3..f504d8e1 100644
--- a/apps/note/models/transactions.py
+++ b/apps/note/models/transactions.py
@@ -208,7 +208,9 @@ class Transaction(PolymorphicModel):
         super().save(*args, **kwargs)
 
         # Save notes
+        self.source._force_save = True
         self.source.save()
+        self.destination._force_save = True
         self.destination.save()
 
     def delete(self, **kwargs):
diff --git a/apps/permission/fixtures/initial.json b/apps/permission/fixtures/initial.json
index 2622ed1c..5a3001da 100644
--- a/apps/permission/fixtures/initial.json
+++ b/apps/permission/fixtures/initial.json
@@ -36,7 +36,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": true,
-			"description": "View our User object"
+			"description": "Voir son compte utilisateur"
 		}
 	},
 	{
@@ -52,7 +52,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": true,
-			"description": "View our profile"
+			"description": "Voir son profil"
 		}
 	},
 	{
@@ -68,7 +68,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": true,
-			"description": "View our own note"
+			"description": "Vioir sa propre note d'utilisateur"
 		}
 	},
 	{
@@ -84,7 +84,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": true,
-			"description": "View our API token"
+			"description": "Voir son jeton d'authentification à l'API"
 		}
 	},
 	{
@@ -100,7 +100,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": true,
-			"description": "View our own transactions"
+			"description": "Voir ses propres transactions"
 		}
 	},
 	{
@@ -116,7 +116,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": true,
-			"description": "View aliases of clubs and members of Kfet club"
+			"description": "Voir les aliases des notes des clubs et des adhérents du club Kfet"
 		}
 	},
 	{
@@ -132,7 +132,7 @@
 			"mask": 1,
 			"field": "last_login",
 			"permanent": true,
-			"description": "Change myself's last login"
+			"description": "Modifier sa propre date de dernière connexion"
 		}
 	},
 	{
@@ -148,7 +148,7 @@
 			"mask": 1,
 			"field": "username",
 			"permanent": true,
-			"description": "Change myself's username"
+			"description": "Changer son propre pseudo"
 		}
 	},
 	{
@@ -164,7 +164,7 @@
 			"mask": 1,
 			"field": "first_name",
 			"permanent": true,
-			"description": "Change myself's first name"
+			"description": "Changer son propre prénom"
 		}
 	},
 	{
@@ -180,7 +180,7 @@
 			"mask": 1,
 			"field": "last_name",
 			"permanent": true,
-			"description": "Change myself's last name"
+			"description": "Changer son propre nom de famille"
 		}
 	},
 	{
@@ -196,7 +196,7 @@
 			"mask": 1,
 			"field": "email",
 			"permanent": true,
-			"description": "Change myself's email"
+			"description": "Changer sa propre adresse e-mail"
 		}
 	},
 	{
@@ -212,7 +212,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": true,
-			"description": "Delete API Token"
+			"description": "Supprimer son jeton d'authentification à l'API"
 		}
 	},
 	{
@@ -228,7 +228,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": true,
-			"description": "Create API Token"
+			"description": "Créer un jeton d'authentification à l'API"
 		}
 	},
 	{
@@ -244,7 +244,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "Remove alias"
+			"description": "Supprimer un alias à sa note"
 		}
 	},
 	{
@@ -260,7 +260,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "Add alias"
+			"description": "Ajouter un alias à sa note"
 		}
 	},
 	{
@@ -276,7 +276,7 @@
 			"mask": 1,
 			"field": "display_image",
 			"permanent": false,
-			"description": "Change myself's display image"
+			"description": "Changer l'image de sa note"
 		}
 	},
 	{
@@ -292,23 +292,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "Transfer from myself's note"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 18,
-		"fields": {
-			"model": [
-				"note",
-				"note"
-			],
-			"query": "{}",
-			"type": "change",
-			"mask": 1,
-			"field": "balance",
-			"permanent": false,
-			"description": "Update a note balance with a transaction"
+			"description": "Transférer de l'argent depuis sa propre note en restant positif"
 		}
 	},
 	{
@@ -324,7 +308,7 @@
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "View notes of club members"
+			"description": "Voir les notes des membres du club"
 		}
 	},
 	{
@@ -340,7 +324,7 @@
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "Create transactions with a club"
+			"description": "Créer une transaction de ou vers la note d'un club"
 		}
 	},
 	{
@@ -356,7 +340,7 @@
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "Create transactions from buttons with a club"
+			"description": "Créer une transaction en appuyant sur un bouton lié à un club"
 		}
 	},
 	{
@@ -372,7 +356,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "View club infos"
+			"description": "Voir les informations d'un club"
 		}
 	},
 	{
@@ -388,7 +372,7 @@
 			"mask": 1,
 			"field": "valid",
 			"permanent": false,
-			"description": "Update validation status of a transaction"
+			"description": "Mettre à jour le statut de validation d'une transaction"
 		}
 	},
 	{
@@ -404,7 +388,7 @@
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "View all transactions"
+			"description": "Voir toutes les transactions"
 		}
 	},
 	{
@@ -420,7 +404,7 @@
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "Display credit/debit interface"
+			"description": "Afficher l'interface crédit/retrait"
 		}
 	},
 	{
@@ -436,7 +420,7 @@
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "Create credit/debit transaction"
+			"description": "Créer un crédit ou un retrait quelconque"
 		}
 	},
 	{
@@ -452,7 +436,7 @@
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "View button categories"
+			"description": "Voir toutes les catégories de boutons"
 		}
 	},
 	{
@@ -468,7 +452,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Change button category"
+			"description": "Changer une catégorie de boutons"
 		}
 	},
 	{
@@ -484,7 +468,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Add button category"
+			"description": "Créer une catégorie de boutons"
 		}
 	},
 	{
@@ -500,7 +484,7 @@
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "View buttons"
+			"description": "Voir tous les boutons"
 		}
 	},
 	{
@@ -516,7 +500,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Add buttons"
+			"description": "Ajouter un bouton"
 		}
 	},
 	{
@@ -532,7 +516,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Update buttons"
+			"description": "Modifier un bouton"
 		}
 	},
 	{
@@ -548,7 +532,7 @@
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "Create any transaction"
+			"description": "Créer n'importe quelle transaction"
 		}
 	},
 	{
@@ -564,7 +548,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "View valid activites"
+			"description": "Voir toutes les activités valides"
 		}
 	},
 	{
@@ -580,7 +564,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "Change our activities"
+			"description": "Modifier les activités non validées dont on est l'auteur"
 		}
 	},
 	{
@@ -596,7 +580,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "Add activities"
+			"description": "Proposer des activités"
 		}
 	},
 	{
@@ -612,7 +596,7 @@
 			"mask": 2,
 			"field": "valid",
 			"permanent": false,
-			"description": "Validate activities"
+			"description": "Valider des activités"
 		}
 	},
 	{
@@ -628,7 +612,7 @@
 			"mask": 2,
 			"field": "open",
 			"permanent": false,
-			"description": "Open activities"
+			"description": "Ouvrir des activités"
 		}
 	},
 	{
@@ -644,7 +628,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "Invite people to activities"
+			"description": "Inviter des personnes à des activités"
 		}
 	},
 	{
@@ -660,7 +644,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "View invited people"
+			"description": "Voir les personnes qu'on a invitées"
 		}
 	},
 	{
@@ -676,7 +660,7 @@
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "View all activities"
+			"description": "Voir toutes les activités"
 		}
 	},
 	{
@@ -692,7 +676,7 @@
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "View all invited people"
+			"description": "Voir toutes les personnes invitées"
 		}
 	},
 	{
@@ -703,12 +687,12 @@
 				"activity",
 				"entry"
 			],
-			"query": "{}",
+			"query": "{\"activity__open\": true}",
 			"type": "add",
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "Manage entries"
+			"description": "Gérer les entrées d'une activité ouverte"
 		}
 	},
 	{
@@ -724,7 +708,7 @@
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "Add invitation transactions"
+			"description": "Créer une transaction d'invitation"
 		}
 	},
 	{
@@ -740,7 +724,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "View invitation transactions"
+			"description": "Voir toutes les transactions d'invitation"
 		}
 	},
 	{
@@ -756,7 +740,7 @@
 			"mask": 2,
 			"field": "valid",
 			"permanent": false,
-			"description": "Validate invitation transactions"
+			"description": "Valider les transactions d'invitation"
 		}
 	},
 	{
@@ -772,7 +756,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "Update club"
+			"description": "Modifier un club"
 		}
 	},
 	{
@@ -788,7 +772,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": true,
-			"description": "View our memberships"
+			"description": "Voir mes adhésions"
 		}
 	},
 	{
@@ -804,7 +788,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "View club's memberships"
+			"description": "Voir les adhérents du club"
 		}
 	},
 	{
@@ -820,7 +804,7 @@
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "Add a membership to a club"
+			"description": "Ajouter un membre à un club"
 		}
 	},
 	{
@@ -836,7 +820,7 @@
 			"mask": 3,
 			"field": "roles",
 			"permanent": false,
-			"description": "Update user roles"
+			"description": "Modifier les rôles d'un adhérent d'un club"
 		}
 	},
 	{
@@ -852,7 +836,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "Change own profile"
+			"description": "Modifier son profil"
 		}
 	},
 	{
@@ -865,10 +849,10 @@
 			],
 			"query": "{}",
 			"type": "change",
-			"mask": 2,
+			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Change any profile"
+			"description": "Modifier n'importe quel profil"
 		}
 	},
 	{
@@ -881,10 +865,10 @@
 			],
 			"query": "{}",
 			"type": "change",
-			"mask": 2,
+			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Change any user"
+			"description": "Modifier n'import quel utilisateur"
 		}
 	},
 	{
@@ -900,7 +884,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "Add user"
+			"description": "Ajouter un utilisateur"
 		}
 	},
 	{
@@ -916,7 +900,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "Add profile"
+			"description": "Ajouter un profil"
 		}
 	},
 	{
@@ -929,10 +913,10 @@
 			],
 			"query": "{\"profile__registration_valid\": false}",
 			"type": "delete",
-			"mask": 2,
+			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Delete pre-registered user"
+			"description": "Supprimer une pré-inscription"
 		}
 	},
 	{
@@ -945,10 +929,10 @@
 			],
 			"query": "{\"registration_valid\": false}",
 			"type": "delete",
-			"mask": 2,
+			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Delete pre-registered user profile"
+			"description": "Supprimer le profil d'une pré-inscription"
 		}
 	},
 	{
@@ -964,7 +948,7 @@
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "New club button"
+			"description": "Voir les boutons d'un club"
 		}
 	},
 	{
@@ -977,10 +961,10 @@
 			],
 			"query": "{\"destination\": [\"club\", \"note\"]}",
 			"type": "add",
-			"mask": 2,
+			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Create club button"
+			"description": "Créer un bouton d'un club"
 		}
 	},
 	{
@@ -996,7 +980,7 @@
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "Update club button"
+			"description": "Modifier le bouton d'un club"
 		}
 	},
 	{
@@ -1012,7 +996,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "View transactions of a club"
+			"description": "Voir les transactions d'un club"
 		}
 	},
 	{
@@ -1028,7 +1012,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "View invoices"
+			"description": "Voir les factures"
 		}
 	},
 	{
@@ -1044,7 +1028,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Add invoice"
+			"description": "Ajouter une facture"
 		}
 	},
 	{
@@ -1060,7 +1044,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Change invoice"
+			"description": "Modifier une facture"
 		}
 	},
 	{
@@ -1076,7 +1060,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "View products"
+			"description": "Voir les produits"
 		}
 	},
 	{
@@ -1092,7 +1076,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Add products"
+			"description": "Ajouter des produits"
 		}
 	},
 	{
@@ -1108,7 +1092,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Change product"
+			"description": "Modifier un produit"
 		}
 	},
 	{
@@ -1124,7 +1108,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Delete product"
+			"description": "Supprimer un produit"
 		}
 	},
 	{
@@ -1140,7 +1124,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "Add Soci\u00e9t\u00e9 g\u00e9n\u00e9rale credit"
+			"description": "Ajouter un crédit de la Soci\u00e9t\u00e9 g\u00e9n\u00e9rale"
 		}
 	},
 	{
@@ -1156,7 +1140,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "View all Soci\u00e9t\u00e9 g\u00e9n\u00e9rale credits"
+			"description": "Voir tous les crédits de la Soci\u00e9t\u00e9 g\u00e9n\u00e9rale"
 		}
 	},
 	{
@@ -1172,7 +1156,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "Update Soci\u00e9t\u00e9 g\u00e9n\u00e9rale credit"
+			"description": "Modifier un crédit de la Soci\u00e9t\u00e9 g\u00e9n\u00e9rale"
 		}
 	},
 	{
@@ -1188,7 +1172,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Delete Soci\u00e9t\u00e9 g\u00e9n\u00e9rale credit"
+			"description": "Supprimer un crédit de la Soci\u00e9t\u00e9 g\u00e9n\u00e9rale"
 		}
 	},
 	{
@@ -1204,7 +1188,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Create a WEI"
+			"description": "Créer un WEI"
 		}
 	},
 	{
@@ -1220,7 +1204,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Update all WEI"
+			"description": "Modifier tous les WEI"
 		}
 	},
 	{
@@ -1236,7 +1220,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Update this WEI"
+			"description": "Modifier ce WEI"
 		}
 	},
 	{
@@ -1252,7 +1236,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": true,
-			"description": "View my WEI"
+			"description": "Voir mon WEI"
 		}
 	},
 	{
@@ -1268,7 +1252,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "View last WEI"
+			"description": "Voir le dernier WEI"
 		}
 	},
 	{
@@ -1284,55 +1268,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "View WEI Roles"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 80,
-		"fields": {
-			"model": [
-				"wei",
-				"weirole"
-			],
-			"query": "{}",
-			"type": "add",
-			"mask": 3,
-			"field": "",
-			"permanent": false,
-			"description": "Add WEI Role"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 81,
-		"fields": {
-			"model": [
-				"wei",
-				"weirole"
-			],
-			"query": "{}",
-			"type": "change",
-			"mask": 3,
-			"field": "",
-			"permanent": false,
-			"description": "Change WEI Role"
-		}
-	},
-	{
-		"model": "permission.permission",
-		"pk": 82,
-		"fields": {
-			"model": [
-				"wei",
-				"weirole"
-			],
-			"query": "{}",
-			"type": "delete",
-			"mask": 3,
-			"field": "",
-			"permanent": false,
-			"description": "Delete WEI Role"
+			"description": "Voir les rôles pour le WEI"
 		}
 	},
 	{
@@ -1348,7 +1284,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "Register myself to the last WEI"
+			"description": "M'inscrire au dernier WEI"
 		}
 	},
 	{
@@ -1364,7 +1300,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "Register first year members to the last WEI"
+			"description": "Inscrire un 1A au WEI"
 		}
 	},
 	{
@@ -1380,7 +1316,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "Register anyone to this WEI"
+			"description": "Inscrire n'importe qui au WEI"
 		}
 	},
 	{
@@ -1396,7 +1332,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "Delete WEI registration"
+			"description": "Supprimer une inscription WEI"
 		}
 	},
 	{
@@ -1412,7 +1348,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "View my own WEI registration"
+			"description": "Voir ma propre inscription WEI"
 		}
 	},
 	{
@@ -1428,7 +1364,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": true,
-			"description": "View all WEI Registrations"
+			"description": "Voir toutes les inscriptions WEI"
 		}
 	},
 	{
@@ -1444,7 +1380,7 @@
 			"mask": 1,
 			"field": "soge_credit",
 			"permanent": false,
-			"description": "Update the soge credit field of any WEI Registration"
+			"description": "Indiquer si une inscription WEI est payée par la Société générale"
 		}
 	},
 	{
@@ -1460,7 +1396,7 @@
 			"mask": 1,
 			"field": "soge_credit",
 			"permanent": false,
-			"description": "Update the soge credit field of my own WEI Registration"
+			"description": "Indiquer si mon inscription WEI est payée par la Société générale tant qu'elle n'est pas validée"
 		}
 	},
 	{
@@ -1476,7 +1412,7 @@
 			"mask": 1,
 			"field": "caution_check",
 			"permanent": false,
-			"description": "Update the caution check field of any WEI Registration"
+			"description": "Dire si un chèque de caution est donné pour une inscription WEI"
 		}
 	},
 	{
@@ -1492,7 +1428,7 @@
 			"mask": 1,
 			"field": "birth_date",
 			"permanent": false,
-			"description": "Update the birth date of any WEI Registration"
+			"description": "Modifier la date de naissance d'une inscription WEI"
 		}
 	},
 	{
@@ -1508,7 +1444,7 @@
 			"mask": 1,
 			"field": "birth_date",
 			"permanent": false,
-			"description": "Update the birth date of my own WEI Registration"
+			"description": "Modifier la date de naissance de ma propre inscription WEI"
 		}
 	},
 	{
@@ -1524,7 +1460,7 @@
 			"mask": 1,
 			"field": "gender",
 			"permanent": false,
-			"description": "Update the gender of any WEI Registration"
+			"description": "Modifier le genre de toute inscription WEI"
 		}
 	},
 	{
@@ -1540,7 +1476,7 @@
 			"mask": 1,
 			"field": "gender",
 			"permanent": false,
-			"description": "Update the gender of my own WEI Registration"
+			"description": "Modifier le genre de ma propre inscription WEI"
 		}
 	},
 	{
@@ -1556,7 +1492,7 @@
 			"mask": 1,
 			"field": "health_issues",
 			"permanent": false,
-			"description": "Update the health issues of any WEI Registration"
+			"description": "Modifier les problèmes de santé de toutes les inscriptions WEI"
 		}
 	},
 	{
@@ -1572,7 +1508,7 @@
 			"mask": 1,
 			"field": "health_issues",
 			"permanent": false,
-			"description": "Update the health issues of my own WEI Registration"
+			"description": "Modifier mes problèmes de santé de mon inscription WEI"
 		}
 	},
 	{
@@ -1588,7 +1524,7 @@
 			"mask": 1,
 			"field": "emergency_contact_name",
 			"permanent": false,
-			"description": "Update the emergency contact name of any WEI Registration"
+			"description": "Modifier le nom du contact en cas d'urgence de toute inscription WEI"
 		}
 	},
 	{
@@ -1604,7 +1540,7 @@
 			"mask": 1,
 			"field": "emergency_contact_name",
 			"permanent": false,
-			"description": "Update the emergency contact name of my own WEI Registration"
+			"description": "Modifier le nom du contact en cas d'urgence de mon inscription WEI"
 		}
 	},
 	{
@@ -1620,7 +1556,7 @@
 			"mask": 1,
 			"field": "emergency_contact_phone",
 			"permanent": false,
-			"description": "Update the emergency contact phone of any WEI Registration"
+			"description": "Modifier le téléphone du contact en cas d'urgence de toute inscription WEI"
 		}
 	},
 	{
@@ -1636,7 +1572,7 @@
 			"mask": 1,
 			"field": "emergency_contact_phone",
 			"permanent": false,
-			"description": "Update the emergency contact phone of my own WEI Registration"
+			"description": "Modifier le nom du contact en cas d'urgence de mon inscription WEI"
 		}
 	},
 	{
@@ -1652,7 +1588,7 @@
 			"mask": 1,
 			"field": "information_json",
 			"permanent": false,
-			"description": "Update information of any WEI registration"
+			"description": "Modifier les informations (sondage 1A, ...) d'une inscription WEI"
 		}
 	},
 	{
@@ -1668,7 +1604,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Add a bus for the current WEI"
+			"description": "Ajouter un bus au WEI"
 		}
 	},
 	{
@@ -1684,7 +1620,7 @@
 			"mask": 3,
 			"field": "name",
 			"permanent": false,
-			"description": "Update the name of a bus for the last WEI"
+			"description": "Modifier le nom d'un bus d'un WEI"
 		}
 	},
 	{
@@ -1700,7 +1636,7 @@
 			"mask": 3,
 			"field": "description",
 			"permanent": false,
-			"description": "Update the description of a bus for the last WEI"
+			"description": "Modifier la description d'un bus d'un WEI"
 		}
 	},
 	{
@@ -1716,7 +1652,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Create a bus team for the last WEI"
+			"description": "Créer une équipe WEI"
 		}
 	},
 	{
@@ -1732,7 +1668,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Update a bus team for the last WEI"
+			"description": "Modifier une équipe WEI"
 		}
 	},
 	{
@@ -1748,7 +1684,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": true,
-			"description": "View buses of the last WEI"
+			"description": "Voir tous les bus WEI si on est en 2A+ ou que le WEI est terminé"
 		}
 	},
 	{
@@ -1764,7 +1700,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": true,
-			"description": "View bus teams of the last WEI"
+			"description": "Voir toutes les équipes WEI si on est en 2A+ ou que le WEI est terminé"
 		}
 	},
 	{
@@ -1780,7 +1716,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Create a WEI membership for the last WEI"
+			"description": "Créer une adhésion WEI pour le dernier WEI"
 		}
 	},
 	{
@@ -1796,7 +1732,7 @@
 			"mask": 1,
 			"field": "bus",
 			"permanent": false,
-			"description": "Update the bus of a WEI membership"
+			"description": "Modifier le bus d'une adhésion WEI"
 		}
 	},
 	{
@@ -1812,7 +1748,7 @@
 			"mask": 1,
 			"field": "team",
 			"permanent": false,
-			"description": "Update the team of a WEI membership"
+			"description": "Modifier l'équipe d'une adhésion WEI"
 		}
 	},
 	{
@@ -1828,7 +1764,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": true,
-			"description": "View all WEI Memberships for the last WEI"
+			"description": "Voir toutes les adhésions au WEI"
 		}
 	},
 	{
@@ -1839,12 +1775,12 @@
 				"wei",
 				"weimembership"
 			],
-			"query": "[\"AND\", {\"user\": [\"user\"], \"club\": [\"club\"]}, [\"OR\", {\"registration__first_year\": false, \"club__weiclub__date_end__lte\": [\"today\"]}]]",
+			"query": "[\"AND\", {\"user\": [\"user\"], \"club\": [\"club\"]}, [\"OR\", {\"registration__first_year\": false}, {\"club__weiclub__date_end__lte\": [\"today\"]}]]",
 			"type": "view",
 			"mask": 1,
 			"field": "",
 			"permanent": true,
-			"description": "View my own WEI membership if I am an old member or if the WEI is past"
+			"description": "Voir mes adhésions WEI passées"
 		}
 	},
 	{
@@ -1860,7 +1796,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": true,
-			"description": "View the members of the bus"
+			"description": "Voir les membres du bus"
 		}
 	},
 	{
@@ -1876,7 +1812,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": true,
-			"description": "View the members of the team"
+			"description": "Voir les membres de l'équipe"
 		}
 	},
 	{
@@ -1892,7 +1828,7 @@
 			"mask": 1,
 			"field": "name",
 			"permanent": false,
-			"description": "Update the name of my bus"
+			"description": "Modifier le nom du bus"
 		}
 	},
 	{
@@ -1908,7 +1844,7 @@
 			"mask": 1,
 			"field": "description",
 			"permanent": false,
-			"description": "Update the description of my bus"
+			"description": "Modifier la description du bus"
 		}
 	},
 	{
@@ -1924,7 +1860,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": false,
-			"description": "Add a team to my bus"
+			"description": "Ajouter une équipe à mon bus"
 		}
 	},
 	{
@@ -1940,7 +1876,7 @@
 			"mask": 1,
 			"field": "name",
 			"permanent": false,
-			"description": "Update the name of a team of my bus"
+			"description": "Modifier le nom d'une équipe de mon bus"
 		}
 	},
 	{
@@ -1956,7 +1892,7 @@
 			"mask": 1,
 			"field": "color",
 			"permanent": false,
-			"description": "Update the color of a team of my bus"
+			"description": "Modifier la couleur d'une équipe de mon bus"
 		}
 	},
 	{
@@ -1972,7 +1908,7 @@
 			"mask": 1,
 			"field": "description",
 			"permanent": false,
-			"description": "Update the description of a team of my bus"
+			"description": "Modifier la description d'une équipe de mon bus"
 		}
 	},
 	{
@@ -1988,7 +1924,7 @@
 			"mask": 1,
 			"field": "name",
 			"permanent": false,
-			"description": "Update the name of my team"
+			"description": "Modifier le nom de mon équipe"
 		}
 	},
 	{
@@ -2004,7 +1940,7 @@
 			"mask": 1,
 			"field": "color",
 			"permanent": false,
-			"description": "Update the color of my team"
+			"description": "Modifier la couleur de mon équipe"
 		}
 	},
 	{
@@ -2020,7 +1956,7 @@
 			"mask": 1,
 			"field": "description",
 			"permanent": false,
-			"description": "Update the description of my team"
+			"description": "Modifier la description de mon équipe"
 		}
 	},
 	{
@@ -2036,7 +1972,7 @@
 			"mask": 1,
 			"field": "",
 			"permanent": true,
-			"description": "View my past activities"
+			"description": "Voir mes activitées passées, même après la fin de l'adhésion BDE"
 		}
 	},
 	{
@@ -2049,10 +1985,10 @@
 			],
 			"query": "[\"AND\", [\"OR\", {\"source\": [\"club\", \"note\"]}, {\"destination\": [\"club\", \"note\"]}], [\"OR\", {\"amount__lte\": {\"F\": [\"ADD\", [\"F\", \"source__balance\"], 5000]}}, {\"valid\": true}]]",
 			"type": "change",
-			"mask": 1,
+			"mask": 2,
 			"field": "valid",
 			"permanent": false,
-			"description": "Update validation status of a club transaction if possible"
+			"description": "Modifier le statut de validation d'une transaction de club si c'est possible"
 		}
 	},
 	{
@@ -2068,7 +2004,7 @@
 			"mask": 1,
 			"field": "clothing_cut",
 			"permanent": false,
-			"description": "Update the clothing cut field of any WEI Registration"
+			"description": "Modifier la coupe de vêtements d'une inscription WEI"
 		}
 	},
 	{
@@ -2084,7 +2020,7 @@
 			"mask": 1,
 			"field": "clothing_cut",
 			"permanent": false,
-			"description": "Update the clothing cut field of my own WEI Registration"
+			"description": "Modifier ma coupe de vêtements de mon inscription WEI"
 		}
 	},
 	{
@@ -2100,7 +2036,7 @@
 			"mask": 1,
 			"field": "clothing_size",
 			"permanent": false,
-			"description": "Update the clothing size field of any WEI Registration"
+			"description": "Modifier la taille de vêtements d'une inscription WEI"
 		}
 	},
 	{
@@ -2116,7 +2052,7 @@
 			"mask": 1,
 			"field": "clothing_size",
 			"permanent": false,
-			"description": "Update the clothing size field of my own WEI Registration"
+			"description": "Modifier la taille de vêtements de mon inscription WEI"
 		}
 	},
 	{
@@ -2132,7 +2068,7 @@
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "Create any recurrent transaction"
+			"description": "Créer une transaction depuis un bouton"
 		}
 	},
 	{
@@ -2148,7 +2084,7 @@
 			"mask": 1,
 			"field": "invalidity_reason",
 			"permanent": false,
-			"description": "Update invalidity reason of a club transaction if possible"
+			"description": "Modifier la raison d'invalidité d'une transaction de club"
 		}
 	},
 	{
@@ -2164,7 +2100,7 @@
 			"mask": 1,
 			"field": "invalidity_reason",
 			"permanent": false,
-			"description": "Update invalidity reason of a transaction"
+			"description": "Modifier la raison d'invalidité d'une transaction"
 		}
 	},
 	{
@@ -2180,7 +2116,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "View any user"
+			"description": "Voir n'importe quel utilisateur"
 		}
 	},
 	{
@@ -2196,7 +2132,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "View any profile"
+			"description": "Voir n'importe quel profil"
 		}
 	},
 	{
@@ -2212,7 +2148,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "View any club"
+			"description": "Voir n'importe quel club"
 		}
 	},
 	{
@@ -2228,7 +2164,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Change any club"
+			"description": "Modifier n'importe quel club"
 		}
 	},
 	{
@@ -2244,7 +2180,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Create any noteclub"
+			"description": "Créer une note de club"
 		}
 	},
 	{
@@ -2260,7 +2196,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "Create any club"
+			"description": "Créer un club"
 		}
 	},
 	{
@@ -2276,7 +2212,7 @@
 			"mask": 3,
 			"field": "",
 			"permanent": false,
-			"description": "View members of our club"
+			"description": "Voir les membres de mon club"
 		}
 	},
 	{
@@ -2292,7 +2228,23 @@
 			"mask": 2,
 			"field": "",
 			"permanent": false,
-			"description": "View club note"
+			"description": "Voir la note de mon club"
+		}
+	},
+	{
+		"model": "permission.permission",
+		"pk": 143,
+		"fields": {
+			"model": [
+				"note",
+				"noteuser"
+			],
+			"query": "{}",
+			"type": "add",
+			"mask": 1,
+			"field": "",
+			"permanent": false,
+			"description": "Créer une note d'utilisateur"
 		}
 	},
 	{
@@ -2338,7 +2290,6 @@
 				15,
 				16,
 				17,
-				18,
 				78,
 				79,
 				83,
@@ -2468,7 +2419,8 @@
 				136,
 				137,
 				138,
-				139
+				139,
+				143
 			]
 		}
 	},
@@ -2496,7 +2448,6 @@
 				15,
 				16,
 				17,
-				18,
 				19,
 				20,
 				21,
@@ -2558,9 +2509,6 @@
 				77,
 				78,
 				79,
-				80,
-				81,
-				82,
 				83,
 				84,
 				85,
@@ -2620,7 +2568,8 @@
 				139,
 				140,
 				141,
-				142
+				142,
+				143
 			]
 		}
 	},
@@ -2648,7 +2597,8 @@
 				28,
 				29,
 				30,
-				31
+				31,
+				143
 			]
 		}
 	},
@@ -2678,9 +2628,6 @@
 			"name": "GC WEI",
 			"permissions": [
 				76,
-				80,
-				81,
-				82,
 				85,
 				86,
 				88,
@@ -2713,6 +2660,7 @@
 			"for_club": null,
 			"name": "Chef de bus",
 			"permissions": [
+				84,
 				117,
 				118,
 				120,
@@ -2729,6 +2677,7 @@
 			"for_club": null,
 			"name": "Chef d'\u00e9quipe",
 			"permissions": [
+				84,
 				116,
 				123,
 				124,
@@ -2742,7 +2691,9 @@
 		"fields": {
 			"for_club": null,
 			"name": "\u00c9lectron libre",
-			"permissions": []
+			"permissions": [
+				84
+			]
 		}
 	},
 	{
@@ -2751,7 +2702,9 @@
 		"fields": {
 			"for_club": null,
 			"name": "\u00c9lectron libre (avec perm)",
-			"permissions": []
+			"permissions": [
+				84
+			]
 		}
 	},
 	{
@@ -2771,7 +2724,6 @@
 			"name": "Adhérent WEI",
 			"permissions": [
 				77,
-				84,
 				87,
 				90,
 				93,
diff --git a/apps/permission/models.py b/apps/permission/models.py
index beace783..d2ac2195 100644
--- a/apps/permission/models.py
+++ b/apps/permission/models.py
@@ -124,10 +124,10 @@ class PermissionMask(models.Model):
 class Permission(models.Model):
 
     PERMISSION_TYPES = [
-        ('add', 'add'),
-        ('view', 'view'),
-        ('change', 'change'),
-        ('delete', 'delete')
+        ('add', _('add')),
+        ('view', _('view')),
+        ('change', _('change')),
+        ('delete', _('delete'))
     ]
 
     model = models.ForeignKey(
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index f7b8412f..6a8cb929 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-31 17:00+0200\n"
+"POT-Creation-Date: 2020-07-31 22:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -46,7 +46,7 @@ msgstr ""
 #: apps/activity/models.py:23 apps/activity/models.py:48
 #: apps/member/models.py:151 apps/note/models/notes.py:188
 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45
-#: apps/note/models/transactions.py:261 apps/permission/models.py:323
+#: apps/note/models/transactions.py:263 apps/permission/models.py:332
 #: apps/wei/models.py:65 apps/wei/models.py:117
 #: templates/member/club_info.html:13 templates/member/profile_info.html:14
 #: templates/registration/future_profile_detail.html:16
@@ -71,14 +71,14 @@ msgid "activity types"
 msgstr ""
 
 #: apps/activity/models.py:53 apps/note/models/transactions.py:81
-#: apps/permission/models.py:104 apps/permission/models.py:183
+#: apps/permission/models.py:113 apps/permission/models.py:192
 #: apps/wei/models.py:71 apps/wei/models.py:128
 #: templates/activity/activity_detail.html:16
 msgid "description"
 msgstr ""
 
 #: apps/activity/models.py:60 apps/note/models/notes.py:164
-#: apps/note/models/transactions.py:66 apps/permission/models.py:158
+#: apps/note/models/transactions.py:66 apps/permission/models.py:167
 #: templates/activity/activity_detail.html:19
 msgid "type"
 msgstr ""
@@ -193,7 +193,7 @@ msgstr ""
 
 #: apps/activity/tables.py:79 apps/member/forms.py:107
 #: apps/registration/forms.py:69 apps/treasury/forms.py:122
-#: templates/note/transaction_form.html:126
+#: templates/note/transaction_form.html:127
 msgid "First name"
 msgstr ""
 
@@ -241,7 +241,7 @@ msgstr ""
 msgid "IP Address"
 msgstr ""
 
-#: apps/logs/models.py:35 apps/permission/models.py:128
+#: apps/logs/models.py:35 apps/permission/models.py:137
 msgid "model"
 msgstr ""
 
@@ -267,7 +267,7 @@ msgid "edit"
 msgstr ""
 
 #: apps/logs/models.py:62 apps/note/tables.py:138 apps/note/tables.py:166
-#: apps/wei/tables.py:65
+#: apps/permission/models.py:130 apps/wei/tables.py:65
 msgid "delete"
 msgstr ""
 
@@ -324,7 +324,7 @@ msgid "Credit amount"
 msgstr ""
 
 #: apps/member/forms.py:112 apps/registration/forms.py:74
-#: apps/treasury/forms.py:124 templates/note/transaction_form.html:132
+#: apps/treasury/forms.py:124 templates/note/transaction_form.html:133
 msgid "Bank"
 msgstr ""
 
@@ -533,7 +533,7 @@ msgstr ""
 msgid "fee"
 msgstr ""
 
-#: apps/member/models.py:303 apps/member/views.py:534 apps/wei/views.py:787
+#: apps/member/models.py:303 apps/member/views.py:534 apps/wei/views.py:797
 msgid "User is not a member of the parent club"
 msgstr ""
 
@@ -613,7 +613,7 @@ msgstr ""
 msgid "Add new member to the club"
 msgstr ""
 
-#: apps/member/views.py:529 apps/wei/views.py:778
+#: apps/member/views.py:529 apps/wei/views.py:788
 msgid ""
 "This user don't have enough money to join this club, and can't have a "
 "negative balance."
@@ -827,46 +827,46 @@ msgid ""
 "is not active."
 msgstr ""
 
-#: apps/note/models/transactions.py:228
+#: apps/note/models/transactions.py:230
 #: templates/activity/activity_entry.html:13 templates/base.html:99
 #: templates/note/transaction_form.html:15
-#: templates/note/transaction_form.html:140
+#: templates/note/transaction_form.html:141
 msgid "Transfer"
 msgstr ""
 
-#: apps/note/models/transactions.py:251
+#: apps/note/models/transactions.py:253
 msgid "Template"
 msgstr ""
 
-#: apps/note/models/transactions.py:266
+#: apps/note/models/transactions.py:268
 msgid "first_name"
 msgstr ""
 
-#: apps/note/models/transactions.py:271
+#: apps/note/models/transactions.py:273
 msgid "bank"
 msgstr ""
 
-#: apps/note/models/transactions.py:277
+#: apps/note/models/transactions.py:279
 #: templates/activity/activity_entry.html:17
 #: templates/note/transaction_form.html:20
 msgid "Credit"
 msgstr ""
 
-#: apps/note/models/transactions.py:277 templates/note/transaction_form.html:24
+#: apps/note/models/transactions.py:279 templates/note/transaction_form.html:24
 msgid "Debit"
 msgstr ""
 
-#: apps/note/models/transactions.py:288
+#: apps/note/models/transactions.py:290
 msgid ""
 "A special transaction is only possible between a Note associated to a "
 "payment method and a User or a Club"
 msgstr ""
 
-#: apps/note/models/transactions.py:305 apps/note/models/transactions.py:310
+#: apps/note/models/transactions.py:307 apps/note/models/transactions.py:312
 msgid "membership transaction"
 msgstr ""
 
-#: apps/note/models/transactions.py:306 apps/treasury/models.py:227
+#: apps/note/models/transactions.py:308 apps/treasury/models.py:227
 msgid "membership transactions"
 msgstr ""
 
@@ -915,67 +915,79 @@ msgstr ""
 msgid "Consumptions"
 msgstr ""
 
-#: apps/permission/models.py:83
+#: apps/permission/models.py:92
 #, python-brace-format
 msgid "Can {type} {model}.{field} in {query}"
 msgstr ""
 
-#: apps/permission/models.py:85
+#: apps/permission/models.py:94
 #, python-brace-format
 msgid "Can {type} {model} in {query}"
 msgstr ""
 
-#: apps/permission/models.py:98
+#: apps/permission/models.py:107
 msgid "rank"
 msgstr ""
 
-#: apps/permission/models.py:111
+#: apps/permission/models.py:120
 msgid "permission mask"
 msgstr ""
 
-#: apps/permission/models.py:112
+#: apps/permission/models.py:121
 msgid "permission masks"
 msgstr ""
 
-#: apps/permission/models.py:152
+#: apps/permission/models.py:127
+msgid "add"
+msgstr ""
+
+#: apps/permission/models.py:128
+msgid "view"
+msgstr ""
+
+#: apps/permission/models.py:129
+msgid "change"
+msgstr ""
+
+#: apps/permission/models.py:161
 msgid "query"
 msgstr ""
 
-#: apps/permission/models.py:165
+#: apps/permission/models.py:174
 msgid "mask"
 msgstr ""
 
-#: apps/permission/models.py:171
+#: apps/permission/models.py:180
 msgid "field"
 msgstr ""
 
-#: apps/permission/models.py:176
+#: apps/permission/models.py:185
 msgid ""
 "Tells if the permission should be granted even if the membership of the user "
 "is expired."
 msgstr ""
 
-#: apps/permission/models.py:177 templates/permission/all_rights.html:26
+#: apps/permission/models.py:186 templates/permission/all_rights.html:26
 msgid "permanent"
 msgstr ""
 
-#: apps/permission/models.py:188
+#: apps/permission/models.py:197
 msgid "permission"
 msgstr ""
 
-#: apps/permission/models.py:189 apps/permission/models.py:328
+#: apps/permission/models.py:198 apps/permission/models.py:337
 msgid "permissions"
 msgstr ""
 
-#: apps/permission/models.py:194
+#: apps/permission/models.py:203
 msgid "Specifying field applies only to view and change permission types."
 msgstr ""
 
-#: apps/permission/models.py:333
+#: apps/permission/models.py:342
 msgid "for club"
 msgstr ""
 
-#: apps/permission/models.py:343 apps/permission/models.py:344
+#: apps/permission/models.py:352 apps/permission/models.py:353
 msgid "role permissions"
 msgstr ""
 
@@ -1000,7 +1012,7 @@ msgid ""
 "{model_name}."
 msgstr ""
 
-#: apps/permission/views.py:44 templates/base.html:135
+#: apps/permission/views.py:44 templates/base.html:136
 msgid "Rights"
 msgstr ""
 
@@ -1133,7 +1145,7 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: apps/treasury/models.py:48 templates/note/transaction_form.html:120
+#: apps/treasury/models.py:48 templates/note/transaction_form.html:121
 msgid "Name"
 msgstr ""
 
@@ -1534,113 +1546,113 @@ msgstr ""
 msgid "members"
 msgstr ""
 
-#: apps/wei/views.py:55
+#: apps/wei/views.py:56
 msgid "Search WEI"
 msgstr ""
 
-#: apps/wei/views.py:64 templates/wei/weiclub_list.html:9
+#: apps/wei/views.py:74 templates/wei/weiclub_list.html:10
 msgid "Create WEI"
 msgstr ""
 
-#: apps/wei/views.py:84
+#: apps/wei/views.py:94
 msgid "WEI Detail"
 msgstr ""
 
-#: apps/wei/views.py:179
+#: apps/wei/views.py:189
 msgid "View members of the WEI"
 msgstr ""
 
-#: apps/wei/views.py:207
+#: apps/wei/views.py:217
 msgid "Find WEI Membership"
 msgstr ""
 
-#: apps/wei/views.py:217
+#: apps/wei/views.py:227
 msgid "View registrations to the WEI"
 msgstr ""
 
-#: apps/wei/views.py:243
+#: apps/wei/views.py:253
 msgid "Find WEI Registration"
 msgstr ""
 
-#: apps/wei/views.py:254
+#: apps/wei/views.py:264
 msgid "Update the WEI"
 msgstr ""
 
-#: apps/wei/views.py:275
+#: apps/wei/views.py:285
 msgid "Create new bus"
 msgstr ""
 
-#: apps/wei/views.py:306
+#: apps/wei/views.py:316
 msgid "Update bus"
 msgstr ""
 
-#: apps/wei/views.py:336
+#: apps/wei/views.py:346
 msgid "Manage bus"
 msgstr ""
 
-#: apps/wei/views.py:363
+#: apps/wei/views.py:373
 msgid "Create new team"
 msgstr ""
 
-#: apps/wei/views.py:395
+#: apps/wei/views.py:405
 msgid "Update team"
 msgstr ""
 
-#: apps/wei/views.py:426
+#: apps/wei/views.py:436
 msgid "Manage WEI team"
 msgstr ""
 
-#: apps/wei/views.py:448
+#: apps/wei/views.py:458
 msgid "Register first year student to the WEI"
 msgstr ""
 
-#: apps/wei/views.py:460 templates/wei/weiclub_info.html:62
+#: apps/wei/views.py:470 templates/wei/weiclub_info.html:62
 msgid "Register 1A"
 msgstr ""
 
-#: apps/wei/views.py:481 apps/wei/views.py:551
+#: apps/wei/views.py:491 apps/wei/views.py:561
 msgid "This user is already registered to this WEI."
 msgstr ""
 
-#: apps/wei/views.py:486
+#: apps/wei/views.py:496
 msgid ""
 "This user can't be in her/his first year since he/she has already participed "
 "to a WEI."
 msgstr ""
 
-#: apps/wei/views.py:503
+#: apps/wei/views.py:513
 msgid "Register old student to the WEI"
 msgstr ""
 
-#: apps/wei/views.py:515 templates/wei/weiclub_info.html:65
+#: apps/wei/views.py:525 templates/wei/weiclub_info.html:65
 msgid "Register 2A+"
 msgstr ""
 
-#: apps/wei/views.py:533 apps/wei/views.py:621
+#: apps/wei/views.py:543 apps/wei/views.py:631
 msgid "You already opened an account in the Société générale."
 msgstr ""
 
-#: apps/wei/views.py:581
+#: apps/wei/views.py:591
 msgid "Update WEI Registration"
 msgstr ""
 
-#: apps/wei/views.py:671
+#: apps/wei/views.py:681
 msgid "Delete WEI registration"
 msgstr ""
 
-#: apps/wei/views.py:682
+#: apps/wei/views.py:692
 msgid "You don't have the right to delete this WEI registration."
 msgstr ""
 
-#: apps/wei/views.py:701
+#: apps/wei/views.py:711
 msgid "Validate WEI registration"
 msgstr ""
 
-#: apps/wei/views.py:782
+#: apps/wei/views.py:792
 msgid "This user didn't give her/his caution check."
 msgstr ""
 
-#: apps/wei/views.py:819 apps/wei/views.py:872 apps/wei/views.py:882
+#: apps/wei/views.py:829 apps/wei/views.py:882 apps/wei/views.py:892
 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12
 #: templates/wei/survey_end.html:12
 msgid "Survey WEI"
@@ -1775,11 +1787,11 @@ msgstr ""
 msgid "Registrations"
 msgstr ""
 
-#: templates/base.html:139
+#: templates/base.html:141
 msgid "Administration"
 msgstr ""
 
-#: templates/base.html:178
+#: templates/base.html:180
 msgid ""
 "Your e-mail address is not validated. Please check your mail inbox and click "
 "on the validation link."
@@ -1950,7 +1962,7 @@ msgstr ""
 msgid "Double consumptions"
 msgstr ""
 
-#: templates/note/conso_form.html:150 templates/note/transaction_form.html:151
+#: templates/note/conso_form.html:150 templates/note/transaction_form.html:152
 msgid "Recent transactions history"
 msgstr ""
 
@@ -1974,7 +1986,7 @@ msgstr ""
 msgid "Reason"
 msgstr ""
 
-#: templates/note/transaction_form.html:110
+#: templates/note/transaction_form.html:111
 msgid "Transfer type"
 msgstr ""
 
@@ -2022,6 +2034,10 @@ msgstr ""
 msgid "Own this role in the clubs"
 msgstr ""
 
+#: templates/permission/all_rights.html:26
+msgid "Mask:"
+msgstr ""
+
 #: templates/permission/all_rights.html:26
 msgid "Query:"
 msgstr ""
@@ -2366,7 +2382,7 @@ msgstr ""
 msgid "View WEI"
 msgstr ""
 
-#: templates/wei/weiclub_list.html:16
+#: templates/wei/weiclub_list.html:18
 msgid "WEI listing"
 msgstr ""
 
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 91c6f1f7..6f12391c 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-31 17:00+0200\n"
+"POT-Creation-Date: 2020-07-31 22:25+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -47,7 +47,7 @@ msgstr "Vous ne pouvez pas inviter plus de 3 personnes à cette activité."
 #: apps/activity/models.py:23 apps/activity/models.py:48
 #: apps/member/models.py:151 apps/note/models/notes.py:188
 #: apps/note/models/transactions.py:25 apps/note/models/transactions.py:45
-#: apps/note/models/transactions.py:261 apps/permission/models.py:323
+#: apps/note/models/transactions.py:263 apps/permission/models.py:332
 #: apps/wei/models.py:65 apps/wei/models.py:117
 #: templates/member/club_info.html:13 templates/member/profile_info.html:14
 #: templates/registration/future_profile_detail.html:16
@@ -72,14 +72,14 @@ msgid "activity types"
 msgstr "types d'activité"
 
 #: apps/activity/models.py:53 apps/note/models/transactions.py:81
-#: apps/permission/models.py:104 apps/permission/models.py:183
+#: apps/permission/models.py:113 apps/permission/models.py:192
 #: apps/wei/models.py:71 apps/wei/models.py:128
 #: templates/activity/activity_detail.html:16
 msgid "description"
 msgstr "description"
 
 #: apps/activity/models.py:60 apps/note/models/notes.py:164
-#: apps/note/models/transactions.py:66 apps/permission/models.py:158
+#: apps/note/models/transactions.py:66 apps/permission/models.py:167
 #: templates/activity/activity_detail.html:19
 msgid "type"
 msgstr "type"
@@ -194,7 +194,7 @@ msgstr "Nom de famille"
 
 #: apps/activity/tables.py:79 apps/member/forms.py:107
 #: apps/registration/forms.py:69 apps/treasury/forms.py:122
-#: templates/note/transaction_form.html:126
+#: templates/note/transaction_form.html:127
 msgid "First name"
 msgstr "Prénom"
 
@@ -242,7 +242,7 @@ msgstr "Logs"
 msgid "IP Address"
 msgstr "Adresse IP"
 
-#: apps/logs/models.py:35 apps/permission/models.py:128
+#: apps/logs/models.py:35 apps/permission/models.py:137
 msgid "model"
 msgstr "Modèle"
 
@@ -268,7 +268,7 @@ msgid "edit"
 msgstr "Modifier"
 
 #: apps/logs/models.py:62 apps/note/tables.py:138 apps/note/tables.py:166
-#: apps/wei/tables.py:65
+#: apps/permission/models.py:130 apps/wei/tables.py:65
 msgid "delete"
 msgstr "Supprimer"
 
@@ -325,7 +325,7 @@ msgid "Credit amount"
 msgstr "Montant à créditer"
 
 #: apps/member/forms.py:112 apps/registration/forms.py:74
-#: apps/treasury/forms.py:124 templates/note/transaction_form.html:132
+#: apps/treasury/forms.py:124 templates/note/transaction_form.html:133
 msgid "Bank"
 msgstr "Banque"
 
@@ -538,7 +538,7 @@ msgstr "l'adhésion finit le"
 msgid "fee"
 msgstr "cotisation"
 
-#: apps/member/models.py:303 apps/member/views.py:534 apps/wei/views.py:787
+#: apps/member/models.py:303 apps/member/views.py:534 apps/wei/views.py:797
 msgid "User is not a member of the parent club"
 msgstr "L'utilisateur n'est pas membre du club parent"
 
@@ -618,7 +618,7 @@ msgstr "Modifier le club"
 msgid "Add new member to the club"
 msgstr "Ajouter un nouveau membre au club"
 
-#: apps/member/views.py:529 apps/wei/views.py:778
+#: apps/member/views.py:529 apps/wei/views.py:788
 msgid ""
 "This user don't have enough money to join this club, and can't have a "
 "negative balance."
@@ -837,36 +837,36 @@ msgstr ""
 "La transaction ne peut pas être sauvegardée puisque la note source ou la "
 "note de destination n'est pas active."
 
-#: apps/note/models/transactions.py:228
+#: apps/note/models/transactions.py:230
 #: templates/activity/activity_entry.html:13 templates/base.html:99
 #: templates/note/transaction_form.html:15
-#: templates/note/transaction_form.html:140
+#: templates/note/transaction_form.html:141
 msgid "Transfer"
 msgstr "Virement"
 
-#: apps/note/models/transactions.py:251
+#: apps/note/models/transactions.py:253
 msgid "Template"
 msgstr "Bouton"
 
-#: apps/note/models/transactions.py:266
+#: apps/note/models/transactions.py:268
 msgid "first_name"
 msgstr "prénom"
 
-#: apps/note/models/transactions.py:271
+#: apps/note/models/transactions.py:273
 msgid "bank"
 msgstr "banque"
 
-#: apps/note/models/transactions.py:277
+#: apps/note/models/transactions.py:279
 #: templates/activity/activity_entry.html:17
 #: templates/note/transaction_form.html:20
 msgid "Credit"
 msgstr "Crédit"
 
-#: apps/note/models/transactions.py:277 templates/note/transaction_form.html:24
+#: apps/note/models/transactions.py:279 templates/note/transaction_form.html:24
 msgid "Debit"
 msgstr "Débit"
 
-#: apps/note/models/transactions.py:288
+#: apps/note/models/transactions.py:290
 msgid ""
 "A special transaction is only possible between a Note associated to a "
 "payment method and a User or a Club"
@@ -874,11 +874,11 @@ msgstr ""
 "Une transaction spéciale n'est possible que entre une note associée à un "
 "mode de paiement et un utilisateur ou un club."
 
-#: apps/note/models/transactions.py:305 apps/note/models/transactions.py:310
+#: apps/note/models/transactions.py:307 apps/note/models/transactions.py:312
 msgid "membership transaction"
 msgstr "Transaction d'adhésion"
 
-#: apps/note/models/transactions.py:306 apps/treasury/models.py:227
+#: apps/note/models/transactions.py:308 apps/treasury/models.py:227
 msgid "membership transactions"
 msgstr "Transactions d'adhésion"
 
@@ -927,41 +927,53 @@ msgstr "Modifier le bouton"
 msgid "Consumptions"
 msgstr "Consommations"
 
-#: apps/permission/models.py:83
+#: apps/permission/models.py:92
 #, python-brace-format
 msgid "Can {type} {model}.{field} in {query}"
 msgstr "Can {type} {model}.{field} in {query}"
 
-#: apps/permission/models.py:85
+#: apps/permission/models.py:94
 #, python-brace-format
 msgid "Can {type} {model} in {query}"
 msgstr "Can {type} {model} in {query}"
 
-#: apps/permission/models.py:98
+#: apps/permission/models.py:107
 msgid "rank"
 msgstr "Rang"
 
-#: apps/permission/models.py:111
+#: apps/permission/models.py:120
 msgid "permission mask"
 msgstr "masque de permissions"
 
-#: apps/permission/models.py:112
+#: apps/permission/models.py:121
 msgid "permission masks"
 msgstr "masques de permissions"
 
-#: apps/permission/models.py:152
+#: apps/permission/models.py:127
+msgid "add"
+msgstr "ajouter"
+
+#: apps/permission/models.py:128
+msgid "view"
+msgstr "voir"
+
+#: apps/permission/models.py:129
+msgid "change"
+msgstr "modifier"
+
+#: apps/permission/models.py:161
 msgid "query"
 msgstr "requête"
 
-#: apps/permission/models.py:165
+#: apps/permission/models.py:174
 msgid "mask"
 msgstr "masque"
 
-#: apps/permission/models.py:171
+#: apps/permission/models.py:180
 msgid "field"
 msgstr "champ"
 
-#: apps/permission/models.py:176
+#: apps/permission/models.py:185
 msgid ""
 "Tells if the permission should be granted even if the membership of the user "
 "is expired."
@@ -969,29 +981,29 @@ msgstr ""
 "Indique si la permission doit être attribuée même si l'adhésion de "
 "l'utilisateur est expirée."
 
-#: apps/permission/models.py:177 templates/permission/all_rights.html:26
+#: apps/permission/models.py:186 templates/permission/all_rights.html:26
 msgid "permanent"
 msgstr "permanent"
 
-#: apps/permission/models.py:188
+#: apps/permission/models.py:197
 msgid "permission"
 msgstr "permission"
 
-#: apps/permission/models.py:189 apps/permission/models.py:328
+#: apps/permission/models.py:198 apps/permission/models.py:337
 msgid "permissions"
 msgstr "permissions"
 
-#: apps/permission/models.py:194
+#: apps/permission/models.py:203
 msgid "Specifying field applies only to view and change permission types."
 msgstr ""
 "Spécifie le champ concerné, ne fonctionne que pour les permissions view et "
 "change."
 
-#: apps/permission/models.py:333
+#: apps/permission/models.py:342
 msgid "for club"
 msgstr "s'applique au club"
 
-#: apps/permission/models.py:343 apps/permission/models.py:344
+#: apps/permission/models.py:352 apps/permission/models.py:353
 msgid "role permissions"
 msgstr "Permissions par rôles"
 
@@ -1022,7 +1034,7 @@ msgstr ""
 "Vous n'avez pas la permission de supprimer cette instance du modèle "
 "{app_label}.{model_name}."
 
-#: apps/permission/views.py:44 templates/base.html:135
+#: apps/permission/views.py:44 templates/base.html:136
 msgid "Rights"
 msgstr "Droits"
 
@@ -1160,7 +1172,7 @@ msgstr "Objet"
 msgid "Description"
 msgstr "Description"
 
-#: apps/treasury/models.py:48 templates/note/transaction_form.html:120
+#: apps/treasury/models.py:48 templates/note/transaction_form.html:121
 msgid "Name"
 msgstr "Nom"
 
@@ -1578,75 +1590,75 @@ msgstr "Nombre de membres"
 msgid "members"
 msgstr "adhérents"
 
-#: apps/wei/views.py:55
+#: apps/wei/views.py:56
 msgid "Search WEI"
 msgstr "Chercher un WEI"
 
-#: apps/wei/views.py:64 templates/wei/weiclub_list.html:9
+#: apps/wei/views.py:74 templates/wei/weiclub_list.html:10
 msgid "Create WEI"
 msgstr "Créer un WEI"
 
-#: apps/wei/views.py:84
+#: apps/wei/views.py:94
 msgid "WEI Detail"
 msgstr "Détails du WEI"
 
-#: apps/wei/views.py:179
+#: apps/wei/views.py:189
 msgid "View members of the WEI"
 msgstr "Voir les membres du WEI"
 
-#: apps/wei/views.py:207
+#: apps/wei/views.py:217
 msgid "Find WEI Membership"
 msgstr "Trouver une adhésion au WEI"
 
-#: apps/wei/views.py:217
+#: apps/wei/views.py:227
 msgid "View registrations to the WEI"
 msgstr "Voir les inscriptions au WEI"
 
-#: apps/wei/views.py:243
+#: apps/wei/views.py:253
 msgid "Find WEI Registration"
 msgstr "Trouver une inscription au WEI"
 
-#: apps/wei/views.py:254
+#: apps/wei/views.py:264
 msgid "Update the WEI"
 msgstr "Modifier le WEI"
 
-#: apps/wei/views.py:275
+#: apps/wei/views.py:285
 msgid "Create new bus"
 msgstr "Ajouter un nouveau bus"
 
-#: apps/wei/views.py:306
+#: apps/wei/views.py:316
 msgid "Update bus"
 msgstr "Modifier le bus"
 
-#: apps/wei/views.py:336
+#: apps/wei/views.py:346
 msgid "Manage bus"
 msgstr "Gérer le bus"
 
-#: apps/wei/views.py:363
+#: apps/wei/views.py:373
 msgid "Create new team"
 msgstr "Créer une nouvelle équipe"
 
-#: apps/wei/views.py:395
+#: apps/wei/views.py:405
 msgid "Update team"
 msgstr "Modifier l'équipe"
 
-#: apps/wei/views.py:426
+#: apps/wei/views.py:436
 msgid "Manage WEI team"
 msgstr "Gérer l'équipe WEI"
 
-#: apps/wei/views.py:448
+#: apps/wei/views.py:458
 msgid "Register first year student to the WEI"
 msgstr "Inscrire un 1A au WEI"
 
-#: apps/wei/views.py:460 templates/wei/weiclub_info.html:62
+#: apps/wei/views.py:470 templates/wei/weiclub_info.html:62
 msgid "Register 1A"
 msgstr "Inscrire un 1A"
 
-#: apps/wei/views.py:481 apps/wei/views.py:551
+#: apps/wei/views.py:491 apps/wei/views.py:561
 msgid "This user is already registered to this WEI."
 msgstr "Cette personne est déjà inscrite au WEI."
 
-#: apps/wei/views.py:486
+#: apps/wei/views.py:496
 msgid ""
 "This user can't be in her/his first year since he/she has already participed "
 "to a WEI."
@@ -1654,39 +1666,39 @@ msgstr ""
 "Cet utilisateur ne peut pas être en première année puisqu'iel a déjà "
 "participé à un WEI."
 
-#: apps/wei/views.py:503
+#: apps/wei/views.py:513
 msgid "Register old student to the WEI"
 msgstr "Inscrire un 2A+ au WEI"
 
-#: apps/wei/views.py:515 templates/wei/weiclub_info.html:65
+#: apps/wei/views.py:525 templates/wei/weiclub_info.html:65
 msgid "Register 2A+"
 msgstr "Inscrire un 2A+"
 
-#: apps/wei/views.py:533 apps/wei/views.py:621
+#: apps/wei/views.py:543 apps/wei/views.py:631
 msgid "You already opened an account in the Société générale."
 msgstr "Vous avez déjà ouvert un compte auprès de la société générale."
 
-#: apps/wei/views.py:581
+#: apps/wei/views.py:591
 msgid "Update WEI Registration"
 msgstr "Modifier l'inscription WEI"
 
-#: apps/wei/views.py:671
+#: apps/wei/views.py:681
 msgid "Delete WEI registration"
 msgstr "Supprimer l'inscription WEI"
 
-#: apps/wei/views.py:682
+#: apps/wei/views.py:692
 msgid "You don't have the right to delete this WEI registration."
 msgstr "Vous n'avez pas la permission de supprimer cette inscription au WEI."
 
-#: apps/wei/views.py:701
+#: apps/wei/views.py:711
 msgid "Validate WEI registration"
 msgstr "Valider l'inscription WEI"
 
-#: apps/wei/views.py:782
+#: apps/wei/views.py:792
 msgid "This user didn't give her/his caution check."
 msgstr "Cet utilisateur n'a pas donné son chèque de caution."
 
-#: apps/wei/views.py:819 apps/wei/views.py:872 apps/wei/views.py:882
+#: apps/wei/views.py:829 apps/wei/views.py:882 apps/wei/views.py:892
 #: templates/wei/survey.html:12 templates/wei/survey_closed.html:12
 #: templates/wei/survey_end.html:12
 msgid "Survey WEI"
@@ -1830,11 +1842,11 @@ msgstr "Clubs"
 msgid "Registrations"
 msgstr "Inscriptions"
 
-#: templates/base.html:139
+#: templates/base.html:141
 msgid "Administration"
 msgstr "Administration"
 
-#: templates/base.html:178
+#: templates/base.html:180
 msgid ""
 "Your e-mail address is not validated. Please check your mail inbox and click "
 "on the validation link."
@@ -2010,7 +2022,7 @@ msgstr "Consommations simples"
 msgid "Double consumptions"
 msgstr "Consommations doubles"
 
-#: templates/note/conso_form.html:150 templates/note/transaction_form.html:151
+#: templates/note/conso_form.html:150 templates/note/transaction_form.html:152
 msgid "Recent transactions history"
 msgstr "Historique des transactions récentes"
 
@@ -2034,7 +2046,7 @@ msgstr "Action"
 msgid "Reason"
 msgstr "Raison"
 
-#: templates/note/transaction_form.html:110
+#: templates/note/transaction_form.html:111
 msgid "Transfer type"
 msgstr "Type de transfert"
 
@@ -2082,6 +2094,10 @@ msgstr "Filtrer les rôles que je possède dans au moins un club"
 msgid "Own this role in the clubs"
 msgstr "Possède ce rôle dans les clubs"
 
+#: templates/permission/all_rights.html:26
+msgid "Mask:"
+msgstr "Masque :"
+
 #: templates/permission/all_rights.html:26
 msgid "Query:"
 msgstr "Requête :"
@@ -2470,7 +2486,7 @@ msgstr "Ajouter un bus"
 msgid "View WEI"
 msgstr "Voir le WEI"
 
-#: templates/wei/weiclub_list.html:16
+#: templates/wei/weiclub_list.html:18
 msgid "WEI listing"
 msgstr "Liste des WEI"
 
diff --git a/templates/base.html b/templates/base.html
index 744a8714..2d940e2b 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -131,9 +131,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
                         <a class="nav-link" href="{% url 'wei:current_wei_detail' %}"><i class="fas fa-bus"></i> {% trans 'WEI' %}</a>
                     </li>
                 {% endif %}
-                <li class="nav-item active">
-                    <a class="nav-link" href="{% url 'permission:rights' %}"><i class="fas fa-balance-scale"></i> {% trans 'Rights' %}</a>
-                </li>
+                {% if user.is_authenticated %}
+                    <li class="nav-item active">
+                        <a class="nav-link" href="{% url 'permission:rights' %}"><i class="fas fa-balance-scale"></i> {% trans 'Rights' %}</a>
+                    </li>
+                {% endif %}
                 {% if user.is_staff and ""|has_perm:user %}
                     <li class="nav-item active">
                         <a data-turbolinks="false" class="nav-link" href="{% url 'admin:index' %}"><i class="fas fa-user-cog"></i> {% trans 'Administration' %}</a>
diff --git a/templates/permission/all_rights.html b/templates/permission/all_rights.html
index 80337134..9bb6faf5 100644
--- a/templates/permission/all_rights.html
+++ b/templates/permission/all_rights.html
@@ -23,7 +23,7 @@
             {% endif %}
             <ul>
             {% for permission in role.permissions.all %}
-                <li data-toggle="tooltip" title="{% trans "Query:" %} {{ permission.query }}">{{ permission }} ({{ permission.type }} {{ permission.model }}{% if permission.permanent %}, {% trans "permanent" %}{% endif %})</li>
+                <li data-toggle="tooltip" title="{% trans "Mask:" %} {{ permission.mask }}, {% trans "Query:" %} {{ permission.query }}">{{ permission }} ({{ permission.get_type_display }} {{ permission.model }}{% if permission.permanent %}, {% trans "permanent" %}{% endif %})</li>
             {% empty %}
                 <em>{% trans "No associated permission" %}</em>
             {% endfor %}

From 23b775447cb86782fc714940d212f220bcfa6e04 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 1 Aug 2020 10:48:17 +0200
Subject: [PATCH 69/77] :bug: Fix email validation link

---
 apps/member/models.py           |  2 +-
 apps/member/views.py            |  1 +
 apps/registration/tokens.py     |  3 +-
 apps/registration/views.py      |  9 ++--
 locale/de/LC_MESSAGES/django.po | 68 +++++++++++++++---------------
 locale/fr/LC_MESSAGES/django.po | 73 ++++++++++++++++++---------------
 6 files changed, 83 insertions(+), 73 deletions(-)

diff --git a/apps/member/models.py b/apps/member/models.py
index e1960a5a..efd8bf8c 100644
--- a/apps/member/models.py
+++ b/apps/member/models.py
@@ -131,7 +131,7 @@ class Profile(models.Model):
         return reverse('user_detail', args=(self.pk,))
 
     def send_email_validation_link(self):
-        subject = "Activate your Note Kfet account"
+        subject = _("Activate your Note Kfet account")
         message = loader.render_to_string('registration/mails/email_validation_email.html',
                                           {
                                               'user': self.user,
diff --git a/apps/member/views.py b/apps/member/views.py
index 57fe29e7..2826d11b 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -108,6 +108,7 @@ class UserUpdateView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
             if olduser.email != user.email:
                 # If the user changed her/his email, then it is unvalidated and a confirmation link is sent.
                 user.profile.email_confirmed = False
+                user.profile.save()
                 user.profile.send_email_validation_link()
 
         return super().form_valid(form)
diff --git a/apps/registration/tokens.py b/apps/registration/tokens.py
index c5ddc82b..0e7b20a5 100644
--- a/apps/registration/tokens.py
+++ b/apps/registration/tokens.py
@@ -24,7 +24,8 @@ class AccountActivationTokenGenerator(PasswordResetTokenGenerator):
         # Truncate microseconds so that tokens are consistent even if the
         # database doesn't support microseconds.
         login_timestamp = '' if user.last_login is None else user.last_login.replace(microsecond=0, tzinfo=None)
-        return str(user.pk) + str(user.profile.email_confirmed) + str(login_timestamp) + str(timestamp)
+        return str(user.pk) + str(user.email) + str(user.profile.email_confirmed)\
+               + str(login_timestamp) + str(timestamp)
 
 
 email_validation_token = AccountActivationTokenGenerator()
diff --git a/apps/registration/views.py b/apps/registration/views.py
index ec6bfd1c..804c9fa9 100644
--- a/apps/registration/views.py
+++ b/apps/registration/views.py
@@ -79,7 +79,7 @@ class UserValidateView(TemplateView):
     """
     title = _("Email validation")
     template_name = 'registration/email_validation_complete.html'
-    extra_context = {"title": _("Validate a registration")}
+    extra_context = {"title": _("Validate email")}
 
     def get(self, *args, **kwargs):
         """
@@ -93,16 +93,13 @@ class UserValidateView(TemplateView):
 
         # Validate the token
         if user is not None and email_validation_token.check_token(user, token):
-            self.validlink = True
             # The user must wait that someone validates the account before the user can be active and login.
+            self.validlink = True
             user.is_active = user.profile.registration_valid or user.is_superuser
             user.profile.email_confirmed = True
             user.save()
             user.profile.save()
-            return super().dispatch(*args, **kwargs)
-        else:
-            # Display the "Email validation unsuccessful" page.
-            return self.render_to_response(self.get_context_data())
+        return self.render_to_response(self.get_context_data())
 
     def get_user(self, uidb64):
         """
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 6a8cb929..4a7d3056 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-31 22:25+0200\n"
+"POT-Creation-Date: 2020-08-01 10:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -456,6 +456,10 @@ msgstr ""
 msgid "user profile"
 msgstr ""
 
+#: apps/member/models.py:134
+msgid "Activate your Note Kfet account"
+msgstr ""
+
 #: apps/member/models.py:156 templates/member/club_info.html:57
 #: templates/registration/future_profile_detail.html:22
 #: templates/wei/weiclub_info.html:52 templates/wei/weimembership_form.html:24
@@ -533,7 +537,7 @@ msgstr ""
 msgid "fee"
 msgstr ""
 
-#: apps/member/models.py:303 apps/member/views.py:534 apps/wei/views.py:797
+#: apps/member/models.py:303 apps/member/views.py:535 apps/wei/views.py:797
 msgid "User is not a member of the parent club"
 msgstr ""
 
@@ -542,7 +546,7 @@ msgstr ""
 msgid "The role {role} does not apply to the club {club}."
 msgstr ""
 
-#: apps/member/models.py:321 apps/member/views.py:543
+#: apps/member/models.py:321 apps/member/views.py:544
 msgid "User is already a member of the club"
 msgstr ""
 
@@ -573,71 +577,71 @@ msgstr ""
 msgid "This address must be valid."
 msgstr ""
 
-#: apps/member/views.py:127
+#: apps/member/views.py:128
 msgid "Profile detail"
 msgstr ""
 
-#: apps/member/views.py:161
+#: apps/member/views.py:162
 msgid "Search user"
 msgstr ""
 
-#: apps/member/views.py:195 apps/member/views.py:381
+#: apps/member/views.py:196 apps/member/views.py:382
 msgid "Note aliases"
 msgstr ""
 
-#: apps/member/views.py:209
+#: apps/member/views.py:210
 msgid "Update note picture"
 msgstr ""
 
-#: apps/member/views.py:267 templates/member/profile_info.html:43
+#: apps/member/views.py:268 templates/member/profile_info.html:43
 msgid "Manage auth token"
 msgstr ""
 
-#: apps/member/views.py:295
+#: apps/member/views.py:296
 msgid "Create new club"
 msgstr ""
 
-#: apps/member/views.py:307
+#: apps/member/views.py:308
 msgid "Search club"
 msgstr ""
 
-#: apps/member/views.py:332
+#: apps/member/views.py:333
 msgid "Club detail"
 msgstr ""
 
-#: apps/member/views.py:398
+#: apps/member/views.py:399
 msgid "Update club"
 msgstr ""
 
-#: apps/member/views.py:432
+#: apps/member/views.py:433
 msgid "Add new member to the club"
 msgstr ""
 
-#: apps/member/views.py:529 apps/wei/views.py:788
+#: apps/member/views.py:530 apps/wei/views.py:788
 msgid ""
 "This user don't have enough money to join this club, and can't have a "
 "negative balance."
 msgstr ""
 
-#: apps/member/views.py:547
+#: apps/member/views.py:548
 msgid "The membership must start after {:%m-%d-%Y}."
 msgstr ""
 
-#: apps/member/views.py:552
+#: apps/member/views.py:553
 msgid "The membership must begin before {:%m-%d-%Y}."
 msgstr ""
 
-#: apps/member/views.py:569 apps/member/views.py:571 apps/member/views.py:573
-#: apps/registration/views.py:295 apps/registration/views.py:297
-#: apps/registration/views.py:299
+#: apps/member/views.py:570 apps/member/views.py:572 apps/member/views.py:574
+#: apps/registration/views.py:292 apps/registration/views.py:294
+#: apps/registration/views.py:296
 msgid "This field is required."
 msgstr ""
 
-#: apps/member/views.py:641
+#: apps/member/views.py:642
 msgid "Manage roles of an user in the club"
 msgstr ""
 
-#: apps/member/views.py:666
+#: apps/member/views.py:667
 msgid "Members of the club"
 msgstr ""
 
@@ -1051,47 +1055,47 @@ msgid "Email validation"
 msgstr ""
 
 #: apps/registration/views.py:82
-msgid "Validate a registration"
+msgid "Validate email"
 msgstr ""
 
-#: apps/registration/views.py:127
+#: apps/registration/views.py:124
 msgid "Email validation unsuccessful"
 msgstr ""
 
-#: apps/registration/views.py:138
+#: apps/registration/views.py:135
 msgid "Email validation email sent"
 msgstr ""
 
-#: apps/registration/views.py:146
+#: apps/registration/views.py:143
 msgid "Resend email validation link"
 msgstr ""
 
-#: apps/registration/views.py:164
+#: apps/registration/views.py:161
 msgid "Pre-registered users list"
 msgstr ""
 
-#: apps/registration/views.py:193
+#: apps/registration/views.py:190
 msgid "Unregistered users"
 msgstr ""
 
-#: apps/registration/views.py:206
+#: apps/registration/views.py:203
 msgid "Registration detail"
 msgstr ""
 
-#: apps/registration/views.py:261
+#: apps/registration/views.py:258
 msgid "You must join the BDE."
 msgstr ""
 
-#: apps/registration/views.py:283
+#: apps/registration/views.py:280
 msgid "You must join BDE club before joining Kfet club."
 msgstr ""
 
-#: apps/registration/views.py:288
+#: apps/registration/views.py:285
 msgid ""
 "The entered amount is not enough for the memberships, should be at least {}"
 msgstr ""
 
-#: apps/registration/views.py:363
+#: apps/registration/views.py:360
 msgid "Invalidate pre-registration"
 msgstr ""
 
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 6f12391c..d4b464a0 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-07-31 22:25+0200\n"
+"POT-Creation-Date: 2020-08-01 10:47+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -457,6 +457,10 @@ msgstr "inscription valid"
 msgid "user profile"
 msgstr "profil utilisateur"
 
+#: apps/member/models.py:134
+msgid "Activate your Note Kfet account"
+msgstr "Activez votre compte Note Kfet"
+
 #: apps/member/models.py:156 templates/member/club_info.html:57
 #: templates/registration/future_profile_detail.html:22
 #: templates/wei/weiclub_info.html:52 templates/wei/weimembership_form.html:24
@@ -538,7 +542,7 @@ msgstr "l'adhésion finit le"
 msgid "fee"
 msgstr "cotisation"
 
-#: apps/member/models.py:303 apps/member/views.py:534 apps/wei/views.py:797
+#: apps/member/models.py:303 apps/member/views.py:535 apps/wei/views.py:797
 msgid "User is not a member of the parent club"
 msgstr "L'utilisateur n'est pas membre du club parent"
 
@@ -547,7 +551,7 @@ msgstr "L'utilisateur n'est pas membre du club parent"
 msgid "The role {role} does not apply to the club {club}."
 msgstr "Le rôle {role} ne s'applique pas au club {club}."
 
-#: apps/member/models.py:321 apps/member/views.py:543
+#: apps/member/models.py:321 apps/member/views.py:544
 msgid "User is already a member of the club"
 msgstr "L'utilisateur est déjà membre du club"
 
@@ -578,47 +582,47 @@ msgstr "Modifier le profil"
 msgid "This address must be valid."
 msgstr "Cette adresse doit être valide."
 
-#: apps/member/views.py:127
+#: apps/member/views.py:128
 msgid "Profile detail"
 msgstr "Détails de l'utilisateur"
 
-#: apps/member/views.py:161
+#: apps/member/views.py:162
 msgid "Search user"
 msgstr "Chercher un utilisateur"
 
-#: apps/member/views.py:195 apps/member/views.py:381
+#: apps/member/views.py:196 apps/member/views.py:382
 msgid "Note aliases"
 msgstr "Alias de la note"
 
-#: apps/member/views.py:209
+#: apps/member/views.py:210
 msgid "Update note picture"
 msgstr "Modifier la photo de la note"
 
-#: apps/member/views.py:267 templates/member/profile_info.html:43
+#: apps/member/views.py:268 templates/member/profile_info.html:43
 msgid "Manage auth token"
 msgstr "Gérer les jetons d'authentification"
 
-#: apps/member/views.py:295
+#: apps/member/views.py:296
 msgid "Create new club"
 msgstr "Créer un nouveau club"
 
-#: apps/member/views.py:307
+#: apps/member/views.py:308
 msgid "Search club"
 msgstr "Chercher un club"
 
-#: apps/member/views.py:332
+#: apps/member/views.py:333
 msgid "Club detail"
 msgstr "Détails du club"
 
-#: apps/member/views.py:398
+#: apps/member/views.py:399
 msgid "Update club"
 msgstr "Modifier le club"
 
-#: apps/member/views.py:432
+#: apps/member/views.py:433
 msgid "Add new member to the club"
 msgstr "Ajouter un nouveau membre au club"
 
-#: apps/member/views.py:529 apps/wei/views.py:788
+#: apps/member/views.py:530 apps/wei/views.py:788
 msgid ""
 "This user don't have enough money to join this club, and can't have a "
 "negative balance."
@@ -626,25 +630,25 @@ msgstr ""
 "Cet utilisateur n'a pas assez d'argent pour rejoindre ce club et ne peut pas "
 "avoir un solde négatif."
 
-#: apps/member/views.py:547
+#: apps/member/views.py:548
 msgid "The membership must start after {:%m-%d-%Y}."
 msgstr "L'adhésion doit commencer après le {:%d/%m/%Y}."
 
-#: apps/member/views.py:552
+#: apps/member/views.py:553
 msgid "The membership must begin before {:%m-%d-%Y}."
 msgstr "L'adhésion doit commencer avant le {:%d/%m/%Y}."
 
-#: apps/member/views.py:569 apps/member/views.py:571 apps/member/views.py:573
-#: apps/registration/views.py:295 apps/registration/views.py:297
-#: apps/registration/views.py:299
+#: apps/member/views.py:570 apps/member/views.py:572 apps/member/views.py:574
+#: apps/registration/views.py:292 apps/registration/views.py:294
+#: apps/registration/views.py:296
 msgid "This field is required."
 msgstr "Ce champ est requis."
 
-#: apps/member/views.py:641
+#: apps/member/views.py:642
 msgid "Manage roles of an user in the club"
 msgstr "Gérer les rôles d'un utilisateur dans le club"
 
-#: apps/member/views.py:666
+#: apps/member/views.py:667
 msgid "Members of the club"
 msgstr "Membres du club"
 
@@ -1076,49 +1080,49 @@ msgid "Email validation"
 msgstr "Validation de l'adresse mail"
 
 #: apps/registration/views.py:82
-msgid "Validate a registration"
-msgstr "Valider l'inscription"
+msgid "Validate email"
+msgstr "Valider l'adresse e-mail"
 
-#: apps/registration/views.py:127
+#: apps/registration/views.py:124
 msgid "Email validation unsuccessful"
 msgstr " La validation de l'adresse mail a échoué"
 
-#: apps/registration/views.py:138
+#: apps/registration/views.py:135
 msgid "Email validation email sent"
 msgstr "L'email de vérification de l'adresse email a bien été envoyé."
 
-#: apps/registration/views.py:146
+#: apps/registration/views.py:143
 msgid "Resend email validation link"
 msgstr "Renvoyer le lien de validation"
 
-#: apps/registration/views.py:164
+#: apps/registration/views.py:161
 msgid "Pre-registered users list"
 msgstr "Liste des utilisateurs en attente d'inscription"
 
-#: apps/registration/views.py:193
+#: apps/registration/views.py:190
 msgid "Unregistered users"
 msgstr "Utilisateurs en attente d'inscription"
 
-#: apps/registration/views.py:206
+#: apps/registration/views.py:203
 msgid "Registration detail"
 msgstr "Détails de l'inscription"
 
-#: apps/registration/views.py:261
+#: apps/registration/views.py:258
 msgid "You must join the BDE."
 msgstr "Vous devez adhérer au BDE."
 
-#: apps/registration/views.py:283
+#: apps/registration/views.py:280
 msgid "You must join BDE club before joining Kfet club."
 msgstr "Vous devez adhérer au club BDE avant d'adhérer au club Kfet."
 
-#: apps/registration/views.py:288
+#: apps/registration/views.py:285
 msgid ""
 "The entered amount is not enough for the memberships, should be at least {}"
 msgstr ""
 "Le montant crédité est trop faible pour adhérer, il doit être au minimum de "
 "{}"
 
-#: apps/registration/views.py:363
+#: apps/registration/views.py:360
 msgid "Invalidate pre-registration"
 msgstr "Invalider l'inscription"
 
@@ -2660,3 +2664,6 @@ msgstr "Il n'y a pas de pré-inscription en attente avec cette entrée."
 #: templates/wei/weiregistration_list.html:24
 msgid "View validated memberships..."
 msgstr "Voir les adhésions validées ..."
+
+#~ msgid "Validate a registration"
+#~ msgstr "Valider l'inscription"

From 82aa0182e3fa96606961af53e012e224e1dbff42 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 1 Aug 2020 10:58:21 +0200
Subject: [PATCH 70/77] :bug: Hide "I am the emitter" button on credit and
 debit interfaces

---
 static/js/transfer.js                |  3 +++
 templates/note/transaction_form.html | 10 ++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/static/js/transfer.js b/static/js/transfer.js
index ba0bf9e3..9f768c3b 100644
--- a/static/js/transfer.js
+++ b/static/js/transfer.js
@@ -80,6 +80,7 @@ $(document).ready(function() {
     let dest = $("#dest_note");
 
     $("#type_transfer").click(function() {
+        $("#source_me_div").removeClass('d-none');
         $("#special_transaction_div").addClass('d-none');
         source.attr('disabled', false);
         $("#source_note_list").removeClass('d-none');
@@ -88,6 +89,7 @@ $(document).ready(function() {
     });
 
     $("#type_credit").click(function() {
+        $("#source_me_div").addClass('d-none');
         $("#special_transaction_div").removeClass('d-none');
         $("#source_note_list").addClass('d-none');
         $("#dest_note_list").removeClass('d-none');
@@ -105,6 +107,7 @@ $(document).ready(function() {
     });
 
     $("#type_debit").click(function() {
+        $("#source_me_div").addClass('d-none');
         $("#special_transaction_div").removeClass('d-none');
         $("#source_note_list").removeClass('d-none');
         $("#dest_note_list").addClass('d-none');
diff --git a/templates/note/transaction_form.html b/templates/note/transaction_form.html
index b761490d..3549871f 100644
--- a/templates/note/transaction_form.html
+++ b/templates/note/transaction_form.html
@@ -55,10 +55,12 @@ SPDX-License-Identifier: GPL-2.0-or-later
                 </ul>
                 <div class="card-body">
                     <input class="form-control mx-auto d-block" type="text" id="source_note" placeholder="{% trans "Name or alias..." %}" />
-                    <hr>
-                    <span class="form-control mx-auto d-block btn btn-secondary" id="source_me">
-                        {% trans "I am the emitter" %}
-                    </span>
+                    <div id="source_me_div">
+                        <hr>
+                        <span class="form-control mx-auto d-block btn btn-secondary" id="source_me">
+                            {% trans "I am the emitter" %}
+                        </span>
+                    </div>
                 </div>
             </div>
         </div>

From 59bfdbbfc758b7cc246ccd26dba5d7bb69454a9c Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 1 Aug 2020 12:12:56 +0200
Subject: [PATCH 71/77] =?UTF-8?q?:lipstick:=20Warn=20users=20when=20a=20no?=
 =?UTF-8?q?te=20balance=20is=20bellow=200=20or=20-50=20=E2=82=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 static/js/consos.js   | 22 ++++++++++----
 static/js/transfer.js | 67 +++++++++++++++++++++++++++++++++++--------
 2 files changed, 72 insertions(+), 17 deletions(-)

diff --git a/static/js/consos.js b/static/js/consos.js
index 268ddc95..f0fd3458 100644
--- a/static/js/consos.js
+++ b/static/js/consos.js
@@ -156,7 +156,7 @@ function reset() {
 function consumeAll() {
     notes_display.forEach(function(note_display) {
         buttons.forEach(function(button) {
-            consume(note_display.note.id, note_display.name, button.dest, button.quantity * note_display.quantity, button.amount,
+            consume(note_display.note, note_display.name, button.dest, button.quantity * note_display.quantity, button.amount,
                 button.name + " (" + button.category_name + ")", button.type, button.category_id, button.id);
        });
     });
@@ -164,7 +164,7 @@ function consumeAll() {
 
 /**
  * Create a new transaction from a button through the API.
- * @param source The note that paid the item (type: int)
+ * @param source The note that paid the item (type: note)
  * @param source_alias The alias used for the source (type: str)
  * @param dest The note that sold the item (type: int)
  * @param quantity The quantity sold (type: int)
@@ -184,13 +184,25 @@ function consume(source, source_alias, dest, quantity, amount, reason, type, cat
             "valid": true,
             "polymorphic_ctype": type,
             "resourcetype": "RecurrentTransaction",
-            "source": source,
+            "source": source.id,
             "source_alias": source_alias,
             "destination": dest,
             "category": category,
             "template": template
-        }, reset).fail(function (e) {
-            $.post("/api/note/transaction/transaction/",
+        })
+        .done(function () {
+            if (!isNaN(source.balance)) {
+                let newBalance = source.balance - quantity * amount;
+                if (newBalance <= -5000)
+                    addMsg("Attention, la note émettrice " + source_alias + " passe en négatif sévère.",
+                        "danger", 10000);
+                else if (newBalance < 0)
+                    addMsg("Attention, la note émettrice " + source_alias + " passe en négatif.",
+                        "warning", 10000);
+            }
+            reset();
+        }).fail(function (e) {
+        $.post("/api/note/transaction/transaction/",
             {
                 "csrfmiddlewaretoken": CSRF_TOKEN,
                 "quantity": quantity,
diff --git a/static/js/transfer.js b/static/js/transfer.js
index 9f768c3b..5b577066 100644
--- a/static/js/transfer.js
+++ b/static/js/transfer.js
@@ -14,6 +14,14 @@ function reset(refresh=true) {
     dests.length = 0;
     $("#source_note_list").html("");
     $("#dest_note_list").html("");
+    let source_field = $("#source_note");
+    source_field.val("");
+    source_field.trigger("keyup");
+    source_field.removeClass('is-invalid');
+    let dest_field = $("#dest_note");
+    dest_field.val("");
+    dest_field.trigger("keyup");
+    dest_field.removeClass('is-invalid');
     let amount_field = $("#amount");
     amount_field.val("");
     amount_field.removeClass('is-invalid');
@@ -81,6 +89,8 @@ $(document).ready(function() {
 
     $("#type_transfer").click(function() {
         $("#source_me_div").removeClass('d-none');
+        $("#source_note").removeClass('is-invalid');
+        $("#dest_note").removeClass('is-invalid');
         $("#special_transaction_div").addClass('d-none');
         source.attr('disabled', false);
         $("#source_note_list").removeClass('d-none');
@@ -90,6 +100,8 @@ $(document).ready(function() {
 
     $("#type_credit").click(function() {
         $("#source_me_div").addClass('d-none');
+        $("#source_note").removeClass('is-invalid');
+        $("#dest_note").removeClass('is-invalid');
         $("#special_transaction_div").removeClass('d-none');
         $("#source_note_list").addClass('d-none');
         $("#dest_note_list").removeClass('d-none');
@@ -108,6 +120,8 @@ $(document).ready(function() {
 
     $("#type_debit").click(function() {
         $("#source_me_div").addClass('d-none');
+        $("#source_note").removeClass('is-invalid');
+        $("#dest_note").removeClass('is-invalid');
         $("#special_transaction_div").removeClass('d-none');
         $("#source_note_list").removeClass('d-none');
         $("#dest_note_list").addClass('d-none');
@@ -210,7 +224,6 @@ $("#btn_transfer").click(function() {
     let reason = reason_field.val();
 
     if ($("#type_transfer").is(':checked')) {
-
         // We copy the arrays to ensure that transactions are well-processed even if the form is reset
         [...sources_notes_display].forEach(function (source) {
             [...dests_notes_display].forEach(function (dest) {
@@ -228,12 +241,31 @@ $("#btn_transfer").click(function() {
                         "destination": dest.note.id,
                         "destination_alias": dest.name
                     }).done(function () {
+                        if (!isNaN(source.note.balance)) {
+                            let newBalance = source.note.balance - source.quantity * dest.quantity * amount;
+                            if (newBalance <= -5000) {
+                                addMsg("Le transfert de "
+                                    + pretty_money(source.quantity * dest.quantity * amount) + " de la note "
+                                    + source.name + " vers la note " + dest.name + " a été fait avec succès, " +
+                                    "mais la note émettrice passe en négatif sévère.", "danger", 10000);
+                                reset();
+                                return;
+                            }
+                            else if (newBalance < 0) {
+                                addMsg("Le transfert de "
+                                    + pretty_money(source.quantity * dest.quantity * amount) + " de la note "
+                                    + source.name + " vers la note " + dest.name + " a été fait avec succès, " +
+                                    "mais la note émettrice passe en négatif.", "warning", 10000);
+                                reset();
+                                return;
+                            }
+                        }
                         addMsg("Le transfert de "
                             + pretty_money(source.quantity * dest.quantity * amount) + " de la note " + source.name
                             + " vers la note " + dest.name + " a été fait avec succès !", "success", 10000);
 
                         reset();
-                    }).fail(function (err) { // do it again but valid = false
+                    }).fail(function () { // do it again but valid = false
                         $.post("/api/note/transaction/transaction/",
                         {
                             "csrfmiddlewaretoken": CSRF_TOKEN,
@@ -264,19 +296,29 @@ $("#btn_transfer").click(function() {
         let special_note = $("#credit_type").val();
         let user_note;
         let given_reason = reason;
-        let source, dest, reason;
+        let source_id, dest_id;
         if ($("#type_credit").is(':checked')) {
+            if (!dests_notes_display.length) {
+                $("#dest_note").addClass('is-invalid');
+                return;
+            }
+
             user_note = dests_notes_display[0].note.id;
-            source = special_note;
-            dest = user_note;
+            source_id = special_note;
+            dest_id = user_note;
             reason = "Crédit " + $("#credit_type option:selected").text().toLowerCase();
             if (given_reason.length > 0)
                 reason += " (" + given_reason + ")";
         }
         else {
+            if (!sources_notes_display.length) {
+                $("#source_note").addClass('is-invalid');
+                return;
+            }
+
             user_note = sources_notes_display[0].note.id;
-            source = user_note;
-            dest = special_note;
+            source_id = user_note;
+            dest_id = special_note;
             reason = "Retrait " + $("#credit_type option:selected").text().toLowerCase();
             if (given_reason.length > 0)
                 reason += " (" + given_reason + ")";
@@ -290,10 +332,10 @@ $("#btn_transfer").click(function() {
                 "valid": true,
                 "polymorphic_ctype": SPECIAL_TRANSFER_POLYMORPHIC_CTYPE,
                 "resourcetype": "SpecialTransaction",
-                "source": source,
-                "source_alias": source.name,
-                "destination": dest,
-                "destination_alias": dest.name,
+                "source": source_id,
+                "source_alias": sources_notes_display[0].name,
+                "destination": dest_id,
+                "destination_alias": dests_notes_display[0].name,
                 "last_name": $("#last_name").val(),
                 "first_name": $("#first_name").val(),
                 "bank": $("#bank").val()
@@ -301,7 +343,8 @@ $("#btn_transfer").click(function() {
                 addMsg("Le crédit/retrait a bien été effectué !", "success", 10000);
                 reset();
             }).fail(function (err) {
-                addMsg("Le crédit/retrait a échoué : " + JSON.parse(err.responseText)["detail"], "danger", 10000);
+                addMsg("Le crédit/retrait a échoué : " + JSON.parse(err.responseText)["detail"],
+                    "danger", 10000);
         });
     }
 });

From b6453ce03d3e8e621498b84be07c9fab531d9da9 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 1 Aug 2020 15:13:29 +0200
Subject: [PATCH 72/77] :lipstick: Improve Django Admin

---
 apps/member/admin.py              | 38 ++++++++++++--
 apps/note/admin.py                | 37 +++++++++++---
 apps/permission/admin.py          |  4 +-
 apps/treasury/admin.py            | 13 ++++-
 locale/de/LC_MESSAGES/django.po   | 81 ++++++++++++++++--------------
 locale/fr/LC_MESSAGES/django.po   | 83 +++++++++++++++++--------------
 templates/registration/login.html |  9 ++++
 7 files changed, 180 insertions(+), 85 deletions(-)

diff --git a/apps/member/admin.py b/apps/member/admin.py
index d9075832..26695b3b 100644
--- a/apps/member/admin.py
+++ b/apps/member/admin.py
@@ -4,6 +4,9 @@
 from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.models import User
+from django.utils.translation import gettext_lazy as _
+
+from note.templatetags.pretty_money import pretty_money
 from note_kfet.admin import admin_site
 
 from .forms import ProfileForm
@@ -18,6 +21,7 @@ class ProfileInline(admin.StackedInline):
     can_delete = False
 
 
+@admin.register(User, site=admin_site)
 class CustomUserAdmin(UserAdmin):
     inlines = (ProfileInline,)
     list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff')
@@ -33,9 +37,33 @@ class CustomUserAdmin(UserAdmin):
         return super().get_inline_instances(request, obj)
 
 
-# Update Django User with profile
-admin_site.register(User, CustomUserAdmin)
+@admin.register(Club, site=admin_site)
+class ClubAdmin(admin.ModelAdmin):
+    list_display = ('name', 'parent_club', 'email', 'require_memberships', 'pretty_fee_paid',
+                    'pretty_fee_unpaid', 'membership_start', 'membership_end',)
+    ordering = ('name',)
+    search_fields = ('name', 'email',)
 
-# Add other models
-admin_site.register(Club)
-admin_site.register(Membership)
+    def pretty_fee_paid(self, obj):
+        return pretty_money(obj.membership_fee_paid)
+
+    def pretty_fee_unpaid(self, obj):
+        return pretty_money(obj.membership_fee_unpaid)
+
+    pretty_fee_paid.short_description = _("membership fee (paid students)")
+    pretty_fee_unpaid.short_description = _("membership fee (unpaid students)")
+
+
+@admin.register(Membership, site=admin_site)
+class MembershipAdmin(admin.ModelAdmin):
+    list_display = ('user', 'club', 'date_start', 'date_end', 'view_roles', 'pretty_fee',)
+    ordering = ('-date_start', 'club')
+
+    def view_roles(self, obj):
+        return ", ".join(role.name for role in obj.roles.all())
+
+    def pretty_fee(self, obj):
+        return pretty_money(obj.fee)
+
+    view_roles.short_description = _("roles")
+    pretty_fee.short_description = _("fee")
diff --git a/apps/note/admin.py b/apps/note/admin.py
index d2750bd8..2d140daf 100644
--- a/apps/note/admin.py
+++ b/apps/note/admin.py
@@ -10,6 +10,7 @@ from note_kfet.admin import admin_site
 from .models.notes import Alias, Note, NoteClub, NoteSpecial, NoteUser
 from .models.transactions import Transaction, TemplateCategory, TransactionTemplate, \
     RecurrentTransaction, MembershipTransaction, SpecialTransaction
+from .templatetags.pretty_money import pretty_money
 
 
 class AliasInlines(admin.TabularInline):
@@ -37,7 +38,7 @@ class NoteAdmin(PolymorphicParentModelAdmin):
 
     # Organize notes by registration date
     date_hierarchy = 'created_at'
-    ordering = ['-created_at']
+    ordering = ['name']
 
     # Search by aliases
     search_fields = ['alias__name']
@@ -74,6 +75,18 @@ class NoteSpecialAdmin(PolymorphicChildModelAdmin):
     """
     readonly_fields = ('balance',)
 
+    def has_add_permission(self, request):
+        """
+        A club note should not be manually added
+        """
+        return False
+
+    def has_delete_permission(self, request, obj=None):
+        """
+        A club note should not be manually removed
+        """
+        return False
+
 
 @admin.register(NoteUser, site=admin_site)
 class NoteUserAdmin(PolymorphicChildModelAdmin):
@@ -103,11 +116,11 @@ class TransactionAdmin(PolymorphicParentModelAdmin):
     """
     Admin customisation for Transaction
     """
-    child_models = (RecurrentTransaction, MembershipTransaction, SpecialTransaction)
+    child_models = (Transaction, RecurrentTransaction, MembershipTransaction, SpecialTransaction)
     list_display = ('created_at', 'poly_source', 'poly_destination',
                     'quantity', 'amount', 'valid')
     list_filter = ('valid',)
-    autocomplete_fields = (
+    readonly_fields = (
         'source',
         'destination',
     )
@@ -146,6 +159,13 @@ class MembershipTransactionAdmin(PolymorphicChildModelAdmin):
     """
 
 
+@admin.register(RecurrentTransaction, site=admin_site)
+class RecurrentTransactionAdmin(PolymorphicChildModelAdmin):
+    """
+    Admin customisation for RecurrentTransaction
+    """
+
+
 @admin.register(SpecialTransaction, site=admin_site)
 class SpecialTransactionAdmin(PolymorphicChildModelAdmin):
     """
@@ -158,8 +178,9 @@ class TransactionTemplateAdmin(admin.ModelAdmin):
     """
     Admin customisation for TransactionTemplate
     """
-    list_display = ('name', 'poly_destination', 'amount', 'category', 'display',)
-    list_filter = ('category', 'display')
+    list_display = ('name', 'poly_destination', 'pretty_amount', 'category', 'display', 'highlighted',)
+    list_filter = ('category', 'display', 'highlighted',)
+    search_fields = ('name', 'destination__club__name', 'amount',)
     autocomplete_fields = ('destination',)
 
     def poly_destination(self, obj):
@@ -170,6 +191,11 @@ class TransactionTemplateAdmin(admin.ModelAdmin):
 
     poly_destination.short_description = _('destination')
 
+    def pretty_amount(self, obj):
+        return pretty_money(obj.amount)
+
+    pretty_amount.short_description = _("amount")
+
 
 @admin.register(TemplateCategory, site=admin_site)
 class TemplateCategoryAdmin(admin.ModelAdmin):
@@ -177,4 +203,3 @@ class TemplateCategoryAdmin(admin.ModelAdmin):
     Admin customisation for TransactionTemplate
     """
     list_display = ('name',)
-    list_filter = ('name',)
diff --git a/apps/permission/admin.py b/apps/permission/admin.py
index 385cf198..bfe3dc88 100644
--- a/apps/permission/admin.py
+++ b/apps/permission/admin.py
@@ -20,7 +20,9 @@ class PermissionAdmin(admin.ModelAdmin):
     """
     Admin customisation for Permission
     """
-    list_display = ('type', 'model', 'field', 'mask', 'description', )
+    list_display = ('description', 'type', 'model', 'field', 'mask', )
+    list_filter = ('type', 'mask', 'model',)
+    search_fields = ('description', 'field',)
 
 
 @admin.register(Role, site=admin_site)
diff --git a/apps/treasury/admin.py b/apps/treasury/admin.py
index 464816db..6e2d4304 100644
--- a/apps/treasury/admin.py
+++ b/apps/treasury/admin.py
@@ -28,4 +28,15 @@ class RemittanceAdmin(admin.ModelAdmin):
         return not obj.closed and super().has_change_permission(request, obj)
 
 
-admin_site.register(SogeCredit)
+@admin.register(SogeCredit, site=admin_site)
+class SogeCreditAdmin(admin.ModelAdmin):
+    """
+    Admin customisation for Remittance
+    """
+    list_display = ('user', 'valid',)
+    readonly_fields = ('transactions', 'credit_transaction',)
+
+    def has_add_permission(self, request):
+        # Don't create a credit manually
+        return False
+
diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index 4a7d3056..efacdfe2 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 10:47+0200\n"
+"POT-Creation-Date: 2020-08-01 15:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -193,7 +193,7 @@ msgstr ""
 
 #: apps/activity/tables.py:79 apps/member/forms.py:107
 #: apps/registration/forms.py:69 apps/treasury/forms.py:122
-#: templates/note/transaction_form.html:127
+#: templates/note/transaction_form.html:129
 msgid "First name"
 msgstr ""
 
@@ -291,6 +291,24 @@ msgstr ""
 msgid "changelogs"
 msgstr ""
 
+#: apps/member/admin.py:53 apps/member/models.py:178
+#: templates/member/club_info.html:41
+msgid "membership fee (paid students)"
+msgstr ""
+
+#: apps/member/admin.py:54 apps/member/models.py:183
+#: templates/member/club_info.html:44
+msgid "membership fee (unpaid students)"
+msgstr ""
+
+#: apps/member/admin.py:68 apps/member/models.py:270
+msgid "roles"
+msgstr ""
+
+#: apps/member/admin.py:69 apps/member/models.py:284
+msgid "fee"
+msgstr ""
+
 #: apps/member/apps.py:14 apps/wei/tables.py:150 apps/wei/tables.py:181
 msgid "member"
 msgstr ""
@@ -324,7 +342,7 @@ msgid "Credit amount"
 msgstr ""
 
 #: apps/member/forms.py:112 apps/registration/forms.py:74
-#: apps/treasury/forms.py:124 templates/note/transaction_form.html:133
+#: apps/treasury/forms.py:124 templates/note/transaction_form.html:135
 msgid "Bank"
 msgstr ""
 
@@ -478,14 +496,6 @@ msgstr ""
 msgid "Uncheck if this club don't require memberships."
 msgstr ""
 
-#: apps/member/models.py:178 templates/member/club_info.html:41
-msgid "membership fee (paid students)"
-msgstr ""
-
-#: apps/member/models.py:183 templates/member/club_info.html:44
-msgid "membership fee (unpaid students)"
-msgstr ""
-
 #: apps/member/models.py:189 templates/member/club_info.html:33
 msgid "membership duration"
 msgstr ""
@@ -521,10 +531,6 @@ msgstr ""
 msgid "clubs"
 msgstr ""
 
-#: apps/member/models.py:270
-msgid "roles"
-msgstr ""
-
 #: apps/member/models.py:275
 msgid "membership starts on"
 msgstr ""
@@ -533,10 +539,6 @@ msgstr ""
 msgid "membership ends on"
 msgstr ""
 
-#: apps/member/models.py:284
-msgid "fee"
-msgstr ""
-
 #: apps/member/models.py:303 apps/member/views.py:535 apps/wei/views.py:797
 msgid "User is not a member of the parent club"
 msgstr ""
@@ -645,15 +647,20 @@ msgstr ""
 msgid "Members of the club"
 msgstr ""
 
-#: apps/note/admin.py:121 apps/note/models/transactions.py:106
+#: apps/note/admin.py:134 apps/note/models/transactions.py:106
 msgid "source"
 msgstr ""
 
-#: apps/note/admin.py:129 apps/note/admin.py:171
+#: apps/note/admin.py:142 apps/note/admin.py:192
 #: apps/note/models/transactions.py:55 apps/note/models/transactions.py:119
 msgid "destination"
 msgstr ""
 
+#: apps/note/admin.py:197 apps/note/models/transactions.py:59
+#: apps/note/models/transactions.py:137
+msgid "amount"
+msgstr ""
+
 #: apps/note/forms.py:14
 msgid "select an image"
 msgstr ""
@@ -775,10 +782,6 @@ msgstr ""
 msgid "A template with this name already exist"
 msgstr ""
 
-#: apps/note/models/transactions.py:59 apps/note/models/transactions.py:137
-msgid "amount"
-msgstr ""
-
 #: apps/note/models/transactions.py:60
 msgid "in centimes"
 msgstr ""
@@ -834,7 +837,7 @@ msgstr ""
 #: apps/note/models/transactions.py:230
 #: templates/activity/activity_entry.html:13 templates/base.html:99
 #: templates/note/transaction_form.html:15
-#: templates/note/transaction_form.html:141
+#: templates/note/transaction_form.html:143
 msgid "Transfer"
 msgstr ""
 
@@ -1128,7 +1131,7 @@ msgid "You can't change the type of the remittance."
 msgstr ""
 
 #: apps/treasury/forms.py:126 apps/treasury/tables.py:47
-#: apps/treasury/tables.py:113 templates/note/transaction_form.html:95
+#: apps/treasury/tables.py:113 templates/note/transaction_form.html:97
 #: templates/treasury/remittance_form.html:18
 msgid "Amount"
 msgstr ""
@@ -1149,7 +1152,7 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: apps/treasury/models.py:48 templates/note/transaction_form.html:121
+#: apps/treasury/models.py:48 templates/note/transaction_form.html:123
 msgid "Name"
 msgstr ""
 
@@ -1942,7 +1945,7 @@ msgid "Consum"
 msgstr ""
 
 #: templates/note/conso_form.html:39 templates/note/transaction_form.html:57
-#: templates/note/transaction_form.html:76
+#: templates/note/transaction_form.html:78
 msgid "Name or alias..."
 msgstr ""
 
@@ -1966,7 +1969,7 @@ msgstr ""
 msgid "Double consumptions"
 msgstr ""
 
-#: templates/note/conso_form.html:150 templates/note/transaction_form.html:152
+#: templates/note/conso_form.html:150 templates/note/transaction_form.html:154
 msgid "Recent transactions history"
 msgstr ""
 
@@ -1974,23 +1977,23 @@ msgstr ""
 msgid "Select emitters"
 msgstr ""
 
-#: templates/note/transaction_form.html:60
+#: templates/note/transaction_form.html:61
 msgid "I am the emitter"
 msgstr ""
 
-#: templates/note/transaction_form.html:70
+#: templates/note/transaction_form.html:72
 msgid "Select receivers"
 msgstr ""
 
-#: templates/note/transaction_form.html:87
+#: templates/note/transaction_form.html:89
 msgid "Action"
 msgstr ""
 
-#: templates/note/transaction_form.html:102
+#: templates/note/transaction_form.html:104
 msgid "Reason"
 msgstr ""
 
-#: templates/note/transaction_form.html:111
+#: templates/note/transaction_form.html:113
 msgid "Transfer type"
 msgstr ""
 
@@ -2102,7 +2105,7 @@ msgid "Log in again"
 msgstr ""
 
 #: templates/registration/login.html:7 templates/registration/login.html:8
-#: templates/registration/login.html:22
+#: templates/registration/login.html:31
 #: templates/registration/password_reset_complete.html:10
 msgid "Log in"
 msgstr ""
@@ -2116,6 +2119,12 @@ msgid ""
 msgstr ""
 
 #: templates/registration/login.html:23
+msgid ""
+"You must be logged with a staff account with the higher mask to access "
+"Django Admin."
+msgstr ""
+
+#: templates/registration/login.html:32
 msgid "Forgotten your password or username?"
 msgstr ""
 
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index d4b464a0..25e68a4b 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-08-01 10:47+0200\n"
+"POT-Creation-Date: 2020-08-01 15:06+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -194,7 +194,7 @@ msgstr "Nom de famille"
 
 #: apps/activity/tables.py:79 apps/member/forms.py:107
 #: apps/registration/forms.py:69 apps/treasury/forms.py:122
-#: templates/note/transaction_form.html:127
+#: templates/note/transaction_form.html:129
 msgid "First name"
 msgstr "Prénom"
 
@@ -292,6 +292,24 @@ msgstr "journal de modification"
 msgid "changelogs"
 msgstr "journaux de modifications"
 
+#: apps/member/admin.py:53 apps/member/models.py:178
+#: templates/member/club_info.html:41
+msgid "membership fee (paid students)"
+msgstr "cotisation pour adhérer (normalien élève)"
+
+#: apps/member/admin.py:54 apps/member/models.py:183
+#: templates/member/club_info.html:44
+msgid "membership fee (unpaid students)"
+msgstr "cotisation pour adhérer (normalien étudiant)"
+
+#: apps/member/admin.py:68 apps/member/models.py:270
+msgid "roles"
+msgstr "rôles"
+
+#: apps/member/admin.py:69 apps/member/models.py:284
+msgid "fee"
+msgstr "cotisation"
+
 #: apps/member/apps.py:14 apps/wei/tables.py:150 apps/wei/tables.py:181
 msgid "member"
 msgstr "adhérent"
@@ -325,7 +343,7 @@ msgid "Credit amount"
 msgstr "Montant à créditer"
 
 #: apps/member/forms.py:112 apps/registration/forms.py:74
-#: apps/treasury/forms.py:124 templates/note/transaction_form.html:133
+#: apps/treasury/forms.py:124 templates/note/transaction_form.html:135
 msgid "Bank"
 msgstr "Banque"
 
@@ -479,14 +497,6 @@ msgstr "nécessite des adhésions"
 msgid "Uncheck if this club don't require memberships."
 msgstr "Décochez si ce club n'utilise pas d'adhésions."
 
-#: apps/member/models.py:178 templates/member/club_info.html:41
-msgid "membership fee (paid students)"
-msgstr "cotisation pour adhérer (normalien élève)"
-
-#: apps/member/models.py:183 templates/member/club_info.html:44
-msgid "membership fee (unpaid students)"
-msgstr "cotisation pour adhérer (normalien étudiant)"
-
 #: apps/member/models.py:189 templates/member/club_info.html:33
 msgid "membership duration"
 msgstr "durée de l'adhésion"
@@ -526,10 +536,6 @@ msgstr "club"
 msgid "clubs"
 msgstr "clubs"
 
-#: apps/member/models.py:270
-msgid "roles"
-msgstr "rôles"
-
 #: apps/member/models.py:275
 msgid "membership starts on"
 msgstr "l'adhésion commence le"
@@ -538,10 +544,6 @@ msgstr "l'adhésion commence le"
 msgid "membership ends on"
 msgstr "l'adhésion finit le"
 
-#: apps/member/models.py:284
-msgid "fee"
-msgstr "cotisation"
-
 #: apps/member/models.py:303 apps/member/views.py:535 apps/wei/views.py:797
 msgid "User is not a member of the parent club"
 msgstr "L'utilisateur n'est pas membre du club parent"
@@ -652,15 +654,20 @@ msgstr "Gérer les rôles d'un utilisateur dans le club"
 msgid "Members of the club"
 msgstr "Membres du club"
 
-#: apps/note/admin.py:121 apps/note/models/transactions.py:106
+#: apps/note/admin.py:134 apps/note/models/transactions.py:106
 msgid "source"
 msgstr "source"
 
-#: apps/note/admin.py:129 apps/note/admin.py:171
+#: apps/note/admin.py:142 apps/note/admin.py:192
 #: apps/note/models/transactions.py:55 apps/note/models/transactions.py:119
 msgid "destination"
 msgstr "destination"
 
+#: apps/note/admin.py:197 apps/note/models/transactions.py:59
+#: apps/note/models/transactions.py:137
+msgid "amount"
+msgstr "montant"
+
 #: apps/note/forms.py:14
 msgid "select an image"
 msgstr "Choisissez une image"
@@ -783,10 +790,6 @@ msgstr "catégories de transaction"
 msgid "A template with this name already exist"
 msgstr "Un modèle de transaction avec un nom similaire existe déjà."
 
-#: apps/note/models/transactions.py:59 apps/note/models/transactions.py:137
-msgid "amount"
-msgstr "montant"
-
 #: apps/note/models/transactions.py:60
 msgid "in centimes"
 msgstr "en centimes"
@@ -844,7 +847,7 @@ msgstr ""
 #: apps/note/models/transactions.py:230
 #: templates/activity/activity_entry.html:13 templates/base.html:99
 #: templates/note/transaction_form.html:15
-#: templates/note/transaction_form.html:141
+#: templates/note/transaction_form.html:143
 msgid "Transfer"
 msgstr "Virement"
 
@@ -1155,7 +1158,7 @@ msgid "You can't change the type of the remittance."
 msgstr "Vous ne pouvez pas changer le type de la remise."
 
 #: apps/treasury/forms.py:126 apps/treasury/tables.py:47
-#: apps/treasury/tables.py:113 templates/note/transaction_form.html:95
+#: apps/treasury/tables.py:113 templates/note/transaction_form.html:97
 #: templates/treasury/remittance_form.html:18
 msgid "Amount"
 msgstr "Montant"
@@ -1176,7 +1179,7 @@ msgstr "Objet"
 msgid "Description"
 msgstr "Description"
 
-#: apps/treasury/models.py:48 templates/note/transaction_form.html:121
+#: apps/treasury/models.py:48 templates/note/transaction_form.html:123
 msgid "Name"
 msgstr "Nom"
 
@@ -2002,7 +2005,7 @@ msgid "Consum"
 msgstr "Consommer"
 
 #: templates/note/conso_form.html:39 templates/note/transaction_form.html:57
-#: templates/note/transaction_form.html:76
+#: templates/note/transaction_form.html:78
 msgid "Name or alias..."
 msgstr "Pseudo ou alias ..."
 
@@ -2026,7 +2029,7 @@ msgstr "Consommations simples"
 msgid "Double consumptions"
 msgstr "Consommations doubles"
 
-#: templates/note/conso_form.html:150 templates/note/transaction_form.html:152
+#: templates/note/conso_form.html:150 templates/note/transaction_form.html:154
 msgid "Recent transactions history"
 msgstr "Historique des transactions récentes"
 
@@ -2034,23 +2037,23 @@ msgstr "Historique des transactions récentes"
 msgid "Select emitters"
 msgstr "Sélection des émetteurs"
 
-#: templates/note/transaction_form.html:60
+#: templates/note/transaction_form.html:61
 msgid "I am the emitter"
 msgstr "Je suis l'émetteur"
 
-#: templates/note/transaction_form.html:70
+#: templates/note/transaction_form.html:72
 msgid "Select receivers"
 msgstr "Sélection des destinataires"
 
-#: templates/note/transaction_form.html:87
+#: templates/note/transaction_form.html:89
 msgid "Action"
 msgstr "Action"
 
-#: templates/note/transaction_form.html:102
+#: templates/note/transaction_form.html:104
 msgid "Reason"
 msgstr "Raison"
 
-#: templates/note/transaction_form.html:111
+#: templates/note/transaction_form.html:113
 msgid "Transfer type"
 msgstr "Type de transfert"
 
@@ -2166,7 +2169,7 @@ msgid "Log in again"
 msgstr "Se connecter à nouveau"
 
 #: templates/registration/login.html:7 templates/registration/login.html:8
-#: templates/registration/login.html:22
+#: templates/registration/login.html:31
 #: templates/registration/password_reset_complete.html:10
 msgid "Log in"
 msgstr "Se connecter"
@@ -2183,6 +2186,14 @@ msgstr ""
 "masque de permissions plus fort ?"
 
 #: templates/registration/login.html:23
+msgid ""
+"You must be logged with a staff account with the higher mask to access "
+"Django Admin."
+msgstr ""
+"Vous devez être connecté avec un compte staff avec le masque le plus haut "
+"pour accéder à Django Admin."
+
+#: templates/registration/login.html:32
 msgid "Forgotten your password or username?"
 msgstr "Mot de passe ou pseudo oublié ?"
 
diff --git a/templates/registration/login.html b/templates/registration/login.html
index 87354721..e624631f 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -17,6 +17,15 @@ SPDX-License-Identifier: GPL-2.0-or-later
             {% endblocktrans %}
         </p>
     {% endif %}
+
+    {% if request.resolver_match.view_name == 'admin:login' %}
+        <div class="alert alert-info">
+            {% blocktrans trimmed %}
+                You must be logged with a staff account with the higher mask to access Django Admin.
+            {% endblocktrans %}
+        </div>
+    {% endif %}
+
     <form action="{{ app_path }}" method="post" id="login-form">{% csrf_token %}
         {{ form | crispy }}
         <input type="submit" value="{% trans 'Log in' %}" class="btn btn-primary">

From 7c369bd26407fb2622fc09eec95ec3f17d1645d4 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 1 Aug 2020 15:16:50 +0200
Subject: [PATCH 73/77] Update the balance of the Kfet club and import creation
 dates

---
 apps/scripts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/scripts b/apps/scripts
index 9dcb2572..dd8b48c3 160000
--- a/apps/scripts
+++ b/apps/scripts
@@ -1 +1 @@
-Subproject commit 9dcb25723e1cf14c2344946a96e9d8f98cc4cf0e
+Subproject commit dd8b48c31d4501d95b3afb00ac9b387397fca957

From f114265662c9e18a00983abbfa5e4c5de63ed872 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 1 Aug 2020 15:35:45 +0200
Subject: [PATCH 74/77] Remove btn btn-link on non-clickable table headers

---
 templates/member/club_tables.html    | 6 +++---
 templates/member/profile_tables.html | 4 ++--
 templates/wei/bus_tables.html        | 4 ++--
 templates/wei/busteam_tables.html    | 2 +-
 templates/wei/weiclub_tables.html    | 8 ++++----
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/templates/member/club_tables.html b/templates/member/club_tables.html
index d4a9575b..139d3abc 100644
--- a/templates/member/club_tables.html
+++ b/templates/member/club_tables.html
@@ -3,7 +3,7 @@
 {% if managers.data %}
     <div class="card">
         <div class="card-header position-relative" id="clubListHeading">
-            <a class="btn btn-link stretched-link font-weight-bold">
+            <a class="font-weight-bold">
                 <i class="fa fa-users"></i> {% trans "Club managers" %}
             </a>
         </div>
@@ -16,7 +16,7 @@
 {% if member_list.data %}
     <div class="card">
         <div class="card-header position-relative" id="clubListHeading">
-            <a class="btn btn-link stretched-link font-weight-bold" href="{% url 'member:club_members' pk=club.pk %}">
+            <a class="stretched-link font-weight-bold" href="{% url 'member:club_members' pk=club.pk %}">
                 <i class="fa fa-users"></i> {% trans "Club members" %}
             </a>
         </div>
@@ -29,7 +29,7 @@
 {% if history_list.data %}
     <div class="card">
         <div class="card-header position-relative" id="historyListHeading">
-            <a class="btn btn-link stretched-link font-weight-bold">
+            <a class="font-weight-bold">
                 <i class="fa fa-euro"></i> {% trans "Transaction history" %}
             </a>
         </div>
diff --git a/templates/member/profile_tables.html b/templates/member/profile_tables.html
index 9629ff14..4936cc26 100644
--- a/templates/member/profile_tables.html
+++ b/templates/member/profile_tables.html
@@ -11,7 +11,7 @@
 
 <div class="card">
     <div class="card-header position-relative" id="clubListHeading">
-        <a class="btn btn-link stretched-link font-weight-bold">
+        <a class="font-weight-bold">
             <i class="fa fa-users"></i> {% trans "View my memberships" %}
         </a>
     </div>
@@ -22,7 +22,7 @@
 
 <div class="card">
     <div class="card-header position-relative" id="historyListHeading">
-        <a class="btn btn-link stretched-link collapsed font-weight-bold"
+        <a class="collapsed font-weight-bold"
            data-toggle="collapse" data-target="#historyListCollapse"
            aria-expanded="true" aria-controls="historyListCollapse">
             <i class="fa fa-euro"></i> {% trans "Transaction history" %}
diff --git a/templates/wei/bus_tables.html b/templates/wei/bus_tables.html
index 50eccf6a..f0df7e44 100644
--- a/templates/wei/bus_tables.html
+++ b/templates/wei/bus_tables.html
@@ -22,7 +22,7 @@
 {% if teams.data %}
     <div class="card">
         <div class="card-header position-relative" id="clubListHeading">
-            <a class="btn btn-link stretched-link font-weight-bold">
+            <a class="font-weight-bold">
                 <i class="fa fa-bus"></i> {% trans "Teams" %}
             </a>
         </div>
@@ -35,7 +35,7 @@
 {% if memberships.data %}
     <div class="card">
         <div class="card-header position-relative" id="clubListHeading">
-            <a class="btn btn-link stretched-link font-weight-bold">
+            <a class="font-weight-bold">
                 <i class="fa fa-bus"></i> {% trans "Members" %}
             </a>
         </div>
diff --git a/templates/wei/busteam_tables.html b/templates/wei/busteam_tables.html
index 3135158f..c3e53bf7 100644
--- a/templates/wei/busteam_tables.html
+++ b/templates/wei/busteam_tables.html
@@ -39,7 +39,7 @@
 {% if memberships.data or True %}
     <div class="card">
         <div class="card-header position-relative" id="clubListHeading">
-            <a class="btn btn-link stretched-link font-weight-bold">
+            <a class="font-weight-bold">
                 <i class="fa fa-bus"></i> {% trans "Teams" %}
             </a>
         </div>
diff --git a/templates/wei/weiclub_tables.html b/templates/wei/weiclub_tables.html
index d5a8ff01..b97f5736 100644
--- a/templates/wei/weiclub_tables.html
+++ b/templates/wei/weiclub_tables.html
@@ -75,7 +75,7 @@
 {% if buses.data %}
     <div class="card">
         <div class="card-header position-relative" id="clubListHeading">
-            <a class="btn btn-link stretched-link font-weight-bold">
+            <a class="font-weight-bold">
                 <i class="fa fa-bus"></i> {% trans "Buses" %}
             </a>
         </div>
@@ -88,7 +88,7 @@
 {% if member_list.data %}
     <div class="card">
         <div class="card-header position-relative" id="clubListHeading">
-            <a class="btn btn-link stretched-link font-weight-bold" href="{% url "wei:wei_memberships" pk=club.pk %}">
+            <a class="stretched-link font-weight-bold" href="{% url "wei:wei_memberships" pk=club.pk %}">
                 <i class="fa fa-users"></i> {% trans "Members of the WEI" %}
             </a>
         </div>
@@ -101,7 +101,7 @@
 {% if history_list.data %}
     <div class="card">
         <div class="card-header position-relative" id="historyListHeading">
-            <a class="btn btn-link stretched-link font-weight-bold">
+            <a class="font-weight-bold">
                 <i class="fa fa-euro"></i> {% trans "Transaction history" %}
             </a>
         </div>
@@ -116,7 +116,7 @@
 {% if pre_registrations.data %}
     <div class="card">
         <div class="card-header position-relative" id="historyListHeading">
-            <a class="btn btn-link stretched-link font-weight-bold" href="{% url 'wei:wei_registrations' pk=club.pk %}">
+            <a class="stretched-link font-weight-bold" href="{% url 'wei:wei_registrations' pk=club.pk %}">
                 <i class="fa fa-user-plus"></i> {% trans "Unvalidated registrations" %}
             </a>
         </div>

From 1abb40953fb7863318f07233b0dd5cd4515475cf Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 1 Aug 2020 15:47:45 +0200
Subject: [PATCH 75/77] Reduce header width

---
 locale/de/LC_MESSAGES/django.po | 2 +-
 locale/fr/LC_MESSAGES/django.po | 4 ++--
 templates/base.html             | 9 +--------
 templates/member/user_list.html | 8 ++++++++
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po
index efacdfe2..bec7e726 100644
--- a/locale/de/LC_MESSAGES/django.po
+++ b/locale/de/LC_MESSAGES/django.po
@@ -1795,7 +1795,7 @@ msgid "Registrations"
 msgstr ""
 
 #: templates/base.html:141
-msgid "Administration"
+msgid "Admin"
 msgstr ""
 
 #: templates/base.html:180
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 25e68a4b..54c70c71 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -1850,8 +1850,8 @@ msgid "Registrations"
 msgstr "Inscriptions"
 
 #: templates/base.html:141
-msgid "Administration"
-msgstr "Administration"
+msgid "Admin"
+msgstr "Admin"
 
 #: templates/base.html:180
 msgid ""
diff --git a/templates/base.html b/templates/base.html
index 2d940e2b..9b1f463e 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -109,13 +109,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
                         <a class="nav-link" href="{% url 'member:club_list' %}"><i class="fas fa-users"></i> {% trans 'Clubs' %}</a>
                     </li>
                 {% endif %}
-                {% if "member.change_profile_registration_valid"|has_perm:user %}
-                    <li class="nav-item active">
-                        <a class="nav-link" href="{% url 'registration:future_user_list' %}">
-                            <i class="fas fa-user-plus"></i> {% trans "Registrations" %}
-                        </a>
-                    </li>
-                {% endif %}
                 {% if "activity.activity"|not_empty_model_list %}
                     <li class="nav-item active">
                         <a class="nav-link" href="{% url 'activity:activity_list' %}"><i class="fas fa-calendar"></i> {% trans 'Activities' %}</a>
@@ -138,7 +131,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 {% endif %}
                 {% if user.is_staff and ""|has_perm:user %}
                     <li class="nav-item active">
-                        <a data-turbolinks="false" class="nav-link" href="{% url 'admin:index' %}"><i class="fas fa-user-cog"></i> {% trans 'Administration' %}</a>
+                        <a data-turbolinks="false" class="nav-link" href="{% url 'admin:index' %}"><i class="fas fa-user-cog"></i> {% trans 'Admin' %}</a>
                     </li>
                 {% endif %}
             </ul>
diff --git a/templates/member/user_list.html b/templates/member/user_list.html
index bad37468..658292b0 100644
--- a/templates/member/user_list.html
+++ b/templates/member/user_list.html
@@ -2,6 +2,7 @@
 {% load render_table from django_tables2 %}
 {% load crispy_forms_tags %}
 {% load i18n %}
+{% load perms %}
 
 {% block content %}
     <input id="searchbar" type="text" class="form-control" placeholder="Nom/prénom/note/section ...">
@@ -18,6 +19,13 @@
         {% endif %}
     </div>
 
+    <hr>
+
+    {% if "member.change_profile_registration_valid"|has_perm:user %}
+        <a class="btn btn-block btn-secondary" href="{% url 'registration:future_user_list' %}">
+            <i class="fas fa-user-plus"></i> {% trans "Registrations" %}
+        </a>
+    {% endif %}
 {% endblock %}
 
 {% block extrajavascript %}

From 377397b3190ecefa91d21d43190e907bf11fae47 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 1 Aug 2020 15:59:39 +0200
Subject: [PATCH 76/77] :bug: Fix WEI tables

---
 apps/note/admin.py               | 1 -
 apps/wei/tables.py               | 2 +-
 templates/wei/weilist_sample.tex | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/note/admin.py b/apps/note/admin.py
index 2d140daf..433ef2dc 100644
--- a/apps/note/admin.py
+++ b/apps/note/admin.py
@@ -38,7 +38,6 @@ class NoteAdmin(PolymorphicParentModelAdmin):
 
     # Organize notes by registration date
     date_hierarchy = 'created_at'
-    ordering = ['name']
 
     # Search by aliases
     search_fields = ['alias__name']
diff --git a/apps/wei/tables.py b/apps/wei/tables.py
index a6bc25c6..41c35a47 100644
--- a/apps/wei/tables.py
+++ b/apps/wei/tables.py
@@ -103,7 +103,7 @@ class WEIMembershipTable(tables.Table):
 
     team = tables.LinkColumn(
         'wei:manage_bus_team',
-        args=[A('bus.pk')],
+        args=[A('team.pk')],
     )
 
     def render_year(self, record):
diff --git a/templates/wei/weilist_sample.tex b/templates/wei/weilist_sample.tex
index 19eb0cdc..09d3f6be 100644
--- a/templates/wei/weilist_sample.tex
+++ b/templates/wei/weilist_sample.tex
@@ -14,11 +14,11 @@
 \huge{Liste des inscrits \og {{ wei.name }} \fg{}}
 
 {% if bus %}
-\LARGE{Bus {{ bus.name }}}
+\LARGE{Bus {{ bus.name|safe }}}
 
 
 {% if team %}
-\Large{Équipe {{ team.name }}}
+\Large{Équipe {{ team.name|safe }}}
 {% endif %}
 {% endif %}
 \end{center}

From b5586c647bf41f87ab2c9b4039a58278074706c4 Mon Sep 17 00:00:00 2001
From: Yohann D'ANELLO <yohann.danello@gmail.com>
Date: Sat, 1 Aug 2020 16:07:47 +0200
Subject: [PATCH 77/77] :green_heart: Fix linters

---
 apps/member/admin.py   |  1 -
 apps/member/forms.py   | 17 +++++++++--------
 apps/member/views.py   |  8 ++++----
 apps/treasury/admin.py |  1 -
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/apps/member/admin.py b/apps/member/admin.py
index 26695b3b..bd29557b 100644
--- a/apps/member/admin.py
+++ b/apps/member/admin.py
@@ -5,7 +5,6 @@ from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.models import User
 from django.utils.translation import gettext_lazy as _
-
 from note.templatetags.pretty_money import pretty_money
 from note_kfet.admin import admin_site
 
diff --git a/apps/member/forms.py b/apps/member/forms.py
index c4849e2a..50fa9c47 100644
--- a/apps/member/forms.py
+++ b/apps/member/forms.py
@@ -132,19 +132,20 @@ class MembershipForm(forms.ModelForm):
             'date_start': DatePickerInput(),
         }
 
+
 class MembershipRolesForm(forms.ModelForm):
     user = forms.ModelChoiceField(
         queryset=User.objects,
         label=_("User"),
         disabled=True,
         widget=Autocomplete(
-                    User,
-                    attrs={
-                        'api_url': '/api/user/',
-                        'name_field': 'username',
-                        'placeholder': 'Nom ...',
-                    },
-                ),
+            User,
+            attrs={
+                'api_url': '/api/user/',
+                'name_field': 'username',
+                'placeholder': 'Nom ...',
+            },
+        ),
     )
 
     roles = forms.ModelMultipleChoiceField(
@@ -154,4 +155,4 @@ class MembershipRolesForm(forms.ModelForm):
 
     class Meta:
         model = Membership
-        fields = ('user', 'roles')
\ No newline at end of file
+        fields = ('user', 'roles')
diff --git a/apps/member/views.py b/apps/member/views.py
index 2826d11b..30fbb139 100644
--- a/apps/member/views.py
+++ b/apps/member/views.py
@@ -672,9 +672,9 @@ class ClubMembersListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableV
         if 'search' in self.request.GET:
             pattern = self.request.GET['search']
             qs = qs.filter(
-                Q(user__first_name__iregex='^' + pattern) |
-                Q(user__last_name__iregex='^' + pattern) |
-                Q(user__note__alias__normalized_name__iregex='^' + Alias.normalize(pattern))
+                Q(user__first_name__iregex='^' + pattern)
+                | Q(user__last_name__iregex='^' + pattern)
+                | Q(user__note__alias__normalized_name__iregex='^' + Alias.normalize(pattern))
             )
 
         only_active = "only_active" not in self.request.GET or self.request.GET["only_active"] != '0'
@@ -706,4 +706,4 @@ class ClubMembersListView(ProtectQuerysetMixin, LoginRequiredMixin, SingleTableV
 
         context["only_active"] = "only_active" not in self.request.GET or self.request.GET["only_active"] != '0'
 
-        return context
\ No newline at end of file
+        return context
diff --git a/apps/treasury/admin.py b/apps/treasury/admin.py
index 6e2d4304..33224ba7 100644
--- a/apps/treasury/admin.py
+++ b/apps/treasury/admin.py
@@ -39,4 +39,3 @@ class SogeCreditAdmin(admin.ModelAdmin):
     def has_add_permission(self, request):
         # Don't create a credit manually
         return False
-