From 92d344818d28a96027e39a72cadf7214a16a1393 Mon Sep 17 00:00:00 2001
From: Steve Sutton <steve@gaslightmedia.com>
Date: Thu, 6 Jun 2013 15:49:40 +0000
Subject: [PATCH] If no city then no comma

---
 Toolkit/Members/libjs/google-map.js        | 6 +++++-
 Toolkit/Members/templates/memberDetail.tpl | 2 +-
 Toolkit/Members/templates/membersList.tpl  | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Toolkit/Members/libjs/google-map.js b/Toolkit/Members/libjs/google-map.js
index 064aa3a..292f33e 100644
--- a/Toolkit/Members/libjs/google-map.js
+++ b/Toolkit/Members/libjs/google-map.js
@@ -57,7 +57,11 @@ var Map = {
 
 			var html = '<table><tbody><tr>';
 			html += '<td><b>' + name + '</b><br>' +
-						street + '<br>' + city + ', ' + state + ' ' + zip;
+						street + '<br>';
+            if (city) {
+                html += city + ', ';
+            }
+            html += state + ' ' + zip;
 
 			if (phone != '') {
 				html += '<br>' + phone;
diff --git a/Toolkit/Members/templates/memberDetail.tpl b/Toolkit/Members/templates/memberDetail.tpl
index f77d464..5f00acd 100644
--- a/Toolkit/Members/templates/memberDetail.tpl
+++ b/Toolkit/Members/templates/memberDetail.tpl
@@ -22,7 +22,7 @@ catid="catid"
 			<div flexy:if="hasMailingAddy" class="type">Street Address</div>
 			<div class="street-address">{street:h}</div>
 			<div>
-				<span class="locality">{city:h}</span>,
+				<span class="locality" flexy:if="city">{city:h},</span>
 				<span class="region" title="{state_name:h}">
 					{state_abbr:h}
 				</span>
diff --git a/Toolkit/Members/templates/membersList.tpl b/Toolkit/Members/templates/membersList.tpl
index a3d0a31..2e6501f 100644
--- a/Toolkit/Members/templates/membersList.tpl
+++ b/Toolkit/Members/templates/membersList.tpl
@@ -43,7 +43,7 @@
     {end:}
 			<div class="search-result-location adr">
 				<div class="street-address">{row[street]:h}</div>
-				<span class="locality">{row[city]:h}</span>,
+				<span class="locality" flexy:if="city">{row[city]:h},</span>
 				<span class="region" title="{row[state]:h}">{row[state_abbr]:h}</span>
 				<span class="postal-code">{row[zip]:h}</span>
 				<div flexy:if="row[phone]" class="search-result-phones">
-- 
2.17.1