From 8d86feab0f8095a9b5cb64f1d2e7d1de12b85bf0 Mon Sep 17 00:00:00 2001
From: grisel-davy <grisel-davy@re2o-server.crans.org>
Date: Sun, 1 Jul 2018 15:33:16 +0200
Subject: [PATCH] =?UTF-8?q?fichiers=20oubli=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/base.html | 8 ++++++--
 users/models.py     | 4 ++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index 3755e1c2..85457292 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -130,8 +130,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
                                 </a>
                             </li>
                             {% acl_end %}
-                            <li>
-                                <a href="{% url 'about' %}"><i class="fa fa-info-circle"></i> {% trans "About" %}</a>
+                            <li class="dropdown">
+                                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><i class="fas fa-info"></i> {% trans "Info" %}<span class="caret"></span></a>
+                                <ul class="dropdown-menu">
+                                    <li><a href="{% url 'about' %}"><i class="fa fa-info-circle"></i> {% trans "About" %}</a></li>
+                                    <li><a href="{% url 'contact' %}"><i class="fas fa-at"></i> {% trans "Contact" %}</a></li>
+                                </ul>
                             </li>
                             {% if not request.user.is_authenticated %}
                             {% if var_sa %}
diff --git a/users/models.py b/users/models.py
index 20f640a4..4e1f4202 100644
--- a/users/models.py
+++ b/users/models.py
@@ -1649,6 +1649,10 @@ class MailAlias(RevMixin, AclMixin, models.Model):
     )
 
     def __str__(self):
+        return self.complete_mail
+
+    @cached_property
+    def complete_mail(self):
         return self.valeur + OptionalUser.get_cached_value('mail_extension')
 
     @staticmethod