From f679927c4376753da3228b61b1f9bf4c142972b6 Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 23 Aug 2018 11:38:37 -0400
Subject: [PATCH] Improve styling of address block on summary screen

---
 css/contactSummary.css                        | 8 ++++++--
 templates/CRM/Contact/Page/Inline/Address.tpl | 7 ++++++-
 templates/CRM/Contact/Page/View/Summary.js    | 2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/css/contactSummary.css b/css/contactSummary.css
index 0a912d1a05..2311dd8904 100644
--- a/css/contactSummary.css
+++ b/css/contactSummary.css
@@ -63,12 +63,12 @@ div#crm-contact-thumbnail {
   border-bottom-left-radius: 1em;
 }
 
-#crm-container .crm-inline-edit.add-new .crm-edit-help {
+#crm-container .crm-address-block+.crm-address-block .add-new .crm-edit-help {
   display: block;
   background-color: #EBEBEB;
 }
 
-#crm-container .crm-edit-ready .crm-inline-edit:hover .crm-edit-help {
+#crm-container .crm-edit-ready .crm-summary-block .crm-inline-edit:hover .crm-edit-help {
   display: block;
   background-color: #DFE1FF;
 }
@@ -77,6 +77,10 @@ div#crm-contact-thumbnail {
   display: none !important;
 }
 
+#crm-container .crm-address-block+.crm-address-block .add-new .crm-summary-row {
+  display: none;
+}
+
 #crm-container span.crm-custom-greeting {
   font-size: 9px;
 }
diff --git a/templates/CRM/Contact/Page/Inline/Address.tpl b/templates/CRM/Contact/Page/Inline/Address.tpl
index 10439c08e0..f847a9f41b 100644
--- a/templates/CRM/Contact/Page/Inline/Address.tpl
+++ b/templates/CRM/Contact/Page/Inline/Address.tpl
@@ -31,7 +31,12 @@
         <span class="crm-i fa-pencil"></span> {if $add}{ts}Edit address{/ts}{else}{ts}Add address{/ts}{/if}
       </div>
     {/if}
-    {if $add }
+    {if !$add}
+      <div class="crm-summary-row">
+        <div class="crm-label">{ts}Address{/ts}</div>
+        <div class="crm-content"></div>
+      </div>
+    {else}
       <div class="crm-summary-row {if $add.is_primary eq 1} primary{/if}">
         <div class="crm-label">
           {ts 1=$add.location_type}%1 Address{/ts}
diff --git a/templates/CRM/Contact/Page/View/Summary.js b/templates/CRM/Contact/Page/View/Summary.js
index 0bfa29b91b..95c2abe558 100644
--- a/templates/CRM/Contact/Page/View/Summary.js
+++ b/templates/CRM/Contact/Page/View/Summary.js
@@ -268,7 +268,7 @@
             CRM.api3('address', 'delete', {id: $block.data('edit-params').aid}, true)
               .done(function(data) {
                 $('.crm-inline-edit-container').addClass('crm-edit-ready');
-                $block.remove();
+                $block.closest('.crm-address-block').remove();
                 reloadBlock('.crm-inline-edit.address:not(.add-new)');
               });
             });
-- 
2.25.1