From 0e7e512fb3ae9401cf3215999a8b76e9500f1e75 Mon Sep 17 00:00:00 2001
From: Andreas Granig <agranig@sipwise.com>
Date: Mon, 28 Apr 2014 18:03:02 +0200
Subject: [PATCH] MT#6789 Add password reset link to subscriber.

---
 share/templates/subscriber/edit_webpass.tt | 9 ++++++++-
 share/templates/subscriber/master.tt       | 2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/share/templates/subscriber/edit_webpass.tt b/share/templates/subscriber/edit_webpass.tt
index d6bafff92a..84b43e8d80 100644
--- a/share/templates/subscriber/edit_webpass.tt
+++ b/share/templates/subscriber/edit_webpass.tt
@@ -3,7 +3,11 @@
 <div class="row">
     <span class="pull-left" style="margin:0 5px 0 5px;">
         <a class="btn btn-primary btn-large" href="[% c.uri_for('/back') %]"><i class="icon-arrow-left"></i> [% c.loc('Back') %]</a>
-        <a class="btn btn-primary btn-large" href="[% c.uri_for_action('/subscriber/webpass_edit', [ subscriber.id ]) %]"><i class="icon-edit"></i> [% c.loc('Change Password') %]</a>
+        [% IF subscriber.contract.passreset_email_template -%]
+            <a class="btn btn-secondary btn-large" href="[% c.uri_for_action('/subscriber/reset_webpassword', [subscriber.id]) %]" data-confirm="Reset"><i class="icon-repeat"></i> [% c.loc('Reset Web Password') %]</a>
+        [% ELSE -%]
+            <a class="btn btn-primary btn-large" href="[% c.uri_for_action('/subscriber/webpass_edit', [ subscriber.id ]) %]"><i class="icon-edit"></i> [% c.loc('Change Password') %]</a>
+        [% END -%]
     </span>
 </div>
 [% back_created = 1 -%]
@@ -33,6 +37,9 @@
         
             elements = [];
 
+            IF subscriber.contact;
+                elements.push({ value = subscriber.contact.email, desc = c.loc('Email Address') });
+            END;
             elements.push({ value = subscriber.provisioning_voip_subscriber.webusername, desc = c.loc('Web Username') });
             elements.push({ value = '******', desc = c.loc('Web Password') });
             elements.push({ value = subscriber.username _ '@' _ subscriber.domain.domain, desc = c.loc('SIP URI') });
diff --git a/share/templates/subscriber/master.tt b/share/templates/subscriber/master.tt
index 27139bf95d..2003d4c025 100644
--- a/share/templates/subscriber/master.tt
+++ b/share/templates/subscriber/master.tt
@@ -51,7 +51,7 @@
                     <a class="btn btn-primary btn-large" href="[% href %]"><i class="icon-edit"></i> [% c.loc('Edit') %]</a>
                 [% END -%]
                 [% IF subscriber.contract.passreset_email_template -%]
-                    <a class="btn btn-primary btn-large" href="[% c.uri_for_action('/subscriber/reset_webpassword', [subscriber.id]) %]"><i class="icon-repeat"></i> [% c.loc('Reset Web Password') %]</a>
+                    <a class="btn btn-secondary btn-large" href="[% c.uri_for_action('/subscriber/reset_webpassword', [subscriber.id]) %]" data-confirm="Reset"><i class="icon-repeat"></i> [% c.loc('Reset Web Password') %]</a>
                 [% END -%]
                 
                 <div class="ngcp-separator"></div>