From 018e57cd22a43b92afc8bfdc67e45d9906e5c47f Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 17 Oct 2018 14:27:24 +0100
Subject: [PATCH] people: Show SIP forwarding on SIP page

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 src/templates/people/sip.html  | 54 +++++++++++++++++++++-------------
 src/templates/people/user.html |  7 -----
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/src/templates/people/sip.html b/src/templates/people/sip.html
index eaf24e50..7424b995 100644
--- 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 a199fdc4..0d61715a 100644
--- 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">
-- 
2.47.3