From 2af9ce22284eba9989491801173ce38cd40a467a Mon Sep 17 00:00:00 2001
From: williamtheaker <willie@x201>
Date: Fri, 2 Jan 2015 22:29:50 -0800
Subject: [PATCH] CRM-14749 Add insert token to Address Display Format

---
 templates/CRM/Admin/Form/Preferences/Address.tpl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/templates/CRM/Admin/Form/Preferences/Address.tpl b/templates/CRM/Admin/Form/Preferences/Address.tpl
index c77d72df7a..441fb93177 100644
--- a/templates/CRM/Admin/Form/Preferences/Address.tpl
+++ b/templates/CRM/Admin/Form/Preferences/Address.tpl
@@ -44,8 +44,13 @@
         <table class="form-layout">
           <tr class="crm-preferences-address-form-block-address_format">
               <td class="label">{$form.address_format.label}<br />{help id='address-tokens'}</td>
-              <td>{$form.address_format.html|crmAddClass:huge12}<br />
-                  <span class="description">{ts}Format for displaying addresses in the Contact Summary and Event Information screens.{/ts}<br />{ts 1=&#123;contact.state_province&#125; 2=&#123;contact.state_province_name&#125;}Use %1 for state/province abbreviation or %2 for state province name.{/ts}</span>
+              <td>
+              <div class="helpIcon" id="helphtml">
+                <input class="crm-token-selector big" data-field="address_format" />
+                {help id="id-token-text" tplFile=$tplFile file="CRM/Contact/Form/Task/Email.hlp"}
+              </div>
+                {$form.address_format.html|crmAddClass:huge12}<br />
+                <span class="description">{ts}Format for displaying addresses in the Contact Summary and Event Information screens.{/ts}<br />{ts 1=&#123;contact.state_province&#125; 2=&#123;contact.state_province_name&#125;}Use %1 for state/province abbreviation or %2 for state province name.{/ts}</span>
               </td>
           </tr>
       </table>
-- 
2.25.1