people: Move "My Calls" into sidebar

This allows us to have more space in the top navigation

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

diff --git a/src/templates/base.html b/src/templates/base.html
index 2980ffa9064b84bd66b6dd37d937377fae63bd3c..21d04691e030947ee6053c4c07fce49a6d3d3d06 100644 (file)
--- a/src/templates/base.html
+++ b/src/templates/base.html
@@ -170,18 +170,6 @@
                                                                                </a>
                                                                        </li>
 
-                                                                       {% if current_user.has_sip() %}
-                                                                               <li class="nav-item">
-                                                                                       <a class="nav-link {% if request.path.startswith("/users/%s/calls" % current_user.uid) %}active{% end %}" href="/users/{{ current_user.uid }}/calls">
-                                                                                               {{ _("My Calls") }}
-
-                                                                                               {% if current_user.sip_channels %}
-                                                                                                       <span class="badge badge-primary ml-2">{{ len(current_user.sip_channels) }}</span>
-                                                                                               {% end %}
-                                                                                       </a>
-                                                                               </li>
-                                                                       {% end %}
-
                                                                        {% if current_user.is_staff() %}
                                                                                <li class="nav-item">
                                                                                        <a class="nav-link {% if request.path == "/users" %}active{% end %}" href="/users">

diff --git a/src/templates/people/base.html b/src/templates/people/base.html
index 590bfd6207eded2fd22b8bf91befed4332bff20d..ac1c6c81e47aaf86bda02698529ca28609765edb 100644 (file)
--- a/src/templates/people/base.html
+++ b/src/templates/people/base.html
@@ -33,6 +33,16 @@
                                                </a>
                                        {% end %}
 
+                                       {% if current_user.has_sip() %}
+                                               <a class="btn btn-light btn-sm btn-block" href="/users/{{ current_user.uid }}/calls">
+                                                       <span class="fas fa-phone mr-2"></span> {{ _("My Calls") }}
+
+                                                       {% if current_user.sip_channels %}
+                                                               <span class="badge badge-success ml-1">{{ len(current_user.sip_channels) }}</span>
+                                                       {% end %}
+                                               </a>
+                                       {% end %}
+
                                        {% if account.can_be_managed_by(current_user) %}
                                                <a class="btn btn-warning btn-sm btn-block" href="/users/{{ account.uid }}/edit">
                                                        <span class="fas fa-edit mr-2"></span> {{ _("Edit") }}