From d5e02b1722df40851ebb703c30f274233326eeec Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Wed, 25 Jan 2017 15:25:31 -0500
Subject: [PATCH] Update member detail and list for phone labels.

Update the Labels for phone to one Phone.
Remove the javascript for changing non numeric characters to dashes.
---
 views/front/members/detail.html | 9 +++++----
 views/front/members/list.html   | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/views/front/members/detail.html b/views/front/members/detail.html
index f6a1f731..4f0ff067 100644
--- a/views/front/members/detail.html
+++ b/views/front/members/detail.html
@@ -99,15 +99,16 @@
                         </div>
                     {/if}
                     <div class="glm-member-detail-phone-wrapper">
+                        {if ($member.phone && $settings.detail_show_phone) || ($member.toll_free && $settings.detail_show_tollfree)}
+                            <small class="glm-field-title">Phone</small>
+                        {/if}
                         {if $member.phone && $settings.detail_show_phone}
                             <div class="glm-member-detail-contact-phone">
-                                <small class="glm-field-title">Local </small>
                                 <div class="glm-field-value">{$member.phone}</div>
                             </div>
                         {/if}
                         {if $member.toll_free && $settings.detail_show_tollfree}
                             <div>
-                                <small class="glm-field-title">Toll Free </small>
                                 <div class="glm-field-value">{$member.toll_free}</div>
                             </div>
                         {/if}
@@ -345,8 +346,8 @@
 
             // Replace all non-number special characters in a phone number with the designated infix
             {if $settings.phone_infix}
-                var processedPhone = $('.glm-member-detail-contact-phone .glm-field-value').text().trim().replace(/[^a-zA-Z0-9 ]/g, '{$settings.phone_infix}');
-                $('.glm-member-detail-contact-phone .glm-field-value').text(processedPhone);
+                //var processedPhone = $('.glm-member-detail-contact-phone .glm-field-value').text().trim().replace(/[^a-zA-Z0-9 ]/g, '{$settings.phone_infix}');
+                //$('.glm-member-detail-contact-phone .glm-field-value').text(processedPhone);
             {/if}
 
             // Check a hidden field to see if this is a page refresh (doesn't detect forced reload)
diff --git a/views/front/members/list.html b/views/front/members/list.html
index 407704c6..7d2f7b52 100644
--- a/views/front/members/list.html
+++ b/views/front/members/list.html
@@ -222,7 +222,7 @@
                         <div class="glm-member-list-info">
                             <p>
                                 {if $member.phone && $settings.list_map_show_phone}<b>Phone:</b> {$member.phone}<br>{/if}
-                                {if $member.toll_free && $settings.list_map_show_tollfree}<b>Toll Free:</b> {$member.toll_free}<br>{/if}
+                                {if $member.toll_free && $settings.list_map_show_tollfree}{$member.toll_free}<br>{/if}
                                 {if $member.url && $settings.list_map_show_url}<b>Web site:</b> <a href="{$member.url}"{if $settings.list_map_show_url_newtarget} target="_blank"{/if}>{$member.url}</a><br>{/if}
                                 {if $member.email && $settings.list_map_show_email}<b>E-Mail Address:</b> <a href="mailto:{$member.email}">{$member.email}</a><br>{/if}
                                 {if $member.region && $settings.list_map_show_region}<b>Region:</b> {$member.region}{/if}
@@ -335,7 +335,7 @@
                     {if ($member.phone && $settings.list_show_phone) || ($member.toll_free && $settings.list_show_tollfree)}
                         <div>
                             {if $member.phone && $settings.list_show_phone}<span class="glm-member-db-phone">Phone: {$member.phone} </span>{/if}
-                            {if $member.toll_free && $settings.list_show_tollfree}<span class="glm-member-db-phone-tollfree"><b>Toll Free:</b> {$member.toll_free}</span>{/if}
+                            {if $member.toll_free && $settings.list_show_tollfree}<span class="glm-member-db-phone-tollfree">{$member.toll_free}</span>{/if}
                         </div>
                     {/if}
                     {if $member.region && $settings.list_show_region}<div><b>Region:</b> {$member.region}</div>{/if}
@@ -436,7 +436,7 @@
             <div class="glm-member-list-info">
                 <p>
                     {if $member.phone && $settings.list_map_show_phone}<b>Phone:</b> {$member.phone}<br>{/if}
-                    {if $member.toll_free && $settings.list_map_show_tollfree}<b>Toll Free:</b> {$member.toll_free}<br>{/if}
+                    {if $member.toll_free && $settings.list_map_show_tollfree}{$member.toll_free}<br>{/if}
                     {if $member.url && $settings.list_map_show_url}<b>Web site:</b> <a href="{$member.url}"{if $settings.list_map_show_url_newtarget} target="_blank"{/if}>{$member.url}</a><br>{/if}
                     {if $member.email && $settings.list_map_show_email}<b>E-Mail Address:</b> <a href="mailto:{$member.email}">{$member.email}</a><br>{/if}
                     {if $member.region && $settings.list_map_show_region}<b>Region:</b> {$member.region}{/if}
-- 
2.17.1