talk: Show different types of phone numbers

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/templates/talk/phonebook-contact.html b/templates/talk/phonebook-contact.html
index 59264474234f97dc2117ab0056a70c776764ae28..6d203f0f9cdbc4196eef19a39902813b15b993f9 100644 (file)
--- a/templates/talk/phonebook-contact.html
+++ b/templates/talk/phonebook-contact.html
@@ -22,6 +22,7 @@
                                                        <h4>
                                                                {% if account.uses_sip_forwarding() %}
                                                                        <span class="glyphicon glyphicon-earphone" title="{{ _("calls forwarded") }}"></span>
+                                                                       <a href="/call/{{ account.sip_id }}">{{ account.sip_id }}</a>
                                                                {% elif account.sip_is_online() %}
                                                                        <span class="glyphicon glyphicon-earphone text-success" title="{{ _("online") }}"></span>
                                                                        <a href="/call/{{ account.sip_id }}">{{ account.sip_id }}</a>
@@ -82,6 +83,13 @@
                                        <ul class="list-unstyled">
                                                {% for number in account.telephone_numbers %}
                                                        <li>
+                                                               {% if number in account.mobile_telephone_numbers %}
+                                                                       <span class="fa fa-mobile" title="{{ _("Mobile phone") }}"></span>
+                                                               {% elif number in account.home_telephone_numbers %}
+                                                                       <span class="fa fa-home" title="{{ _("Home telephone") }}"></span>
+                                                               {% else %}
+                                                                       <span class="fa fa-phone"></span>
+                                                               {% end %}
                                                                <a href="tel:{{ number }}">{{ number }}</a>
                                                        </li>
                                                {% end %}

diff --git a/webapp/backend/accounts.py b/webapp/backend/accounts.py
index a359a711518ea80fd5031634367f7bbf1be8451a..242cbf387dd3f9e60566466cf57b357dd7e8f0b6 100644 (file)
--- a/webapp/backend/accounts.py
+++ b/webapp/backend/accounts.py
@@ -279,7 +279,20 @@ class Account(Object):
 
        @property
        def telephone_numbers(self):
-               return self.attributes.get("telephoneNumber")
+               return self._telephone_numbers + self.mobile_telephone_numbers \
+                       + self.home_telephone_numbers
+
+       @property
+       def _telephone_numbers(self):
+               return self.attributes.get("telephoneNumber") or []
+
+       @property
+       def home_telephone_numbers(self):
+               return self.attributes.get("homePhone") or []
+
+       @property
+       def mobile_telephone_numbers(self):
+               return self.attributes.get("mobile") or []
 
        def avatar_url(self, size=None):
                if self.backend.debug: