people: Show SIP forwarding on SIP page

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

diff --git a/src/templates/people/sip.html b/src/templates/people/sip.html
index eaf24e50c5d877f39b8ed20abbc02db7ecfa275a..7424b9953557f86cce67ba286bfc6bc71040cc8f 100644 (file)
--- a/src/templates/people/sip.html
+++ b/src/templates/people/sip.html
@@ -7,28 +7,40 @@
 
        {% module Registrations(account) %}
 
-       <div class="card">
-               <div class="card-body">
-                       <h6 class="card-title">{{ _("SIP Credentials") }}</h6>
-
-                       <p>
-                               {{ _("Use these credentials to connect a SIP client to our SIP server") }}
-                       </p>
-
-                       <div class="row justify-content-center">
-                               <div class="col-12 col-sm-8 col-md-6">
-                                       <dl class="row mb-0">
-                                               <dt class="col-sm-6">{{ _("SIP Server") }}</dt>
-                                               <dd class="col-sm-6">ipfire.org</dd>
-
-                                               <dt class="col-sm-6">{{ _("Username") }}</dt>
-                                               <dd class="col-sm-6">{{ account.sip_id }}</dd>
-
-                                               <dt class="col-sm-6">{{ _("Password") }}</dt>
-                                               <dd class="col-sm-6 text-monospace text-nowrap">{{ account.sip_password }}</dd>
-                                       </dl>
+       {% if account.uses_sip_forwarding() %}
+               <div class="card">
+                       <div class="card-body">
+                               <h6 class="card-title">{{ _("SIP Forwarding Enabled") }}</h6>
+
+                               <p class="card-text">
+                                       {{ _("All calls to %s will be forwarded to %s") % (account.sip_id, format_phone_number(account.sip_routing_address)) }}
+                               </p>
+                       </div>
+               </div>
+       {% else %}
+               <div class="card">
+                       <div class="card-body">
+                               <h6 class="card-title">{{ _("SIP Credentials") }}</h6>
+
+                               <p>
+                                       {{ _("Use these credentials to connect a SIP client to our SIP server") }}
+                               </p>
+
+                               <div class="row justify-content-center">
+                                       <div class="col-12 col-sm-8 col-md-6">
+                                               <dl class="row mb-0">
+                                                       <dt class="col-sm-6">{{ _("SIP Server") }}</dt>
+                                                       <dd class="col-sm-6">ipfire.org</dd>
+
+                                                       <dt class="col-sm-6">{{ _("Username") }}</dt>
+                                                       <dd class="col-sm-6">{{ account.sip_id }}</dd>
+
+                                                       <dt class="col-sm-6">{{ _("Password") }}</dt>
+                                                       <dd class="col-sm-6 text-monospace text-nowrap">{{ account.sip_password }}</dd>
+                                               </dl>
+                                       </div>
                                </div>
                        </div>
                </div>
-       </div>
+       {% end %}
 {% end block %}

diff --git a/src/templates/people/user.html b/src/templates/people/user.html
index a199fdc444670b183cc69bfb60d3df3b6fc1a88c..0d61715a670eccab10f8c138f2f67b29263d5787 100644 (file)
--- a/src/templates/people/user.html
+++ b/src/templates/people/user.html
@@ -72,13 +72,6 @@
                                                {% end %}
                                        </div>
 
-                                       {% if (current_user == account or current_user.is_admin()) and account.uses_sip_forwarding() %}
-                                               <p class="text-muted mb-0">
-                                                       {{ _("All calls are forwarded to") }}
-                                                       <a href="sip:{{ account.sip_routing_address }}">{{ account.sip_routing_address }}</a>
-                                               </p>
-                                       {% end %}
-
                                        {% if account.can_be_managed_by(current_user) %}
                                                <div class="btn-toolbar justify-content-center">
                                                        <a class="btn btn-warning" href="/users/{{ account.uid }}/edit">