From 74b5327dbe7a0c2079af3a784302a891d9b4155a Mon Sep 17 00:00:00 2001
From: Peter Zimon <peter.zimon@gmail.com>
Date: Thu, 27 Feb 2020 15:14:26 +0100
Subject: [PATCH] Member geolocation design refinements

no refs.
- refined copy and styles for member list
- added geolocation data for member detail screen
---
 .../components/gh-members-list-item.hbs        |  4 ++--
 ghost/admin/app/templates/member.hbs           | 18 ++++++++++++++----
 ghost/admin/public/assets/icons/pin.svg        | 10 +---------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/ghost/admin/app/templates/components/gh-members-list-item.hbs b/ghost/admin/app/templates/components/gh-members-list-item.hbs
index eea65d51e6..2b5c1e283b 100644
--- a/ghost/admin/app/templates/components/gh-members-list-item.hbs
+++ b/ghost/admin/app/templates/components/gh-members-list-item.hbs
@@ -19,12 +19,12 @@
                 {{@member.geolocation.country}}
             {{/if}}
         {{else}}
-            -
+            <span class="midlightgrey">Unknown</span>
         {{/if}}
     </LinkTo>
 
     <LinkTo @route="member" @model={{@member}} title="Member details" class="gh-list-data gh-members-list-subscribed-at gh-list-cellwidth-20 nowrap middarkgrey f8 {{if (not @member.name) "gh-members-subscribed-noname"}}">
-        {{moment-format @member.createdAtUTC "MMM DD, YYYY"}} <span class="midgrey-l2">({{this.memberSince}})</span>
+        {{moment-format @member.createdAtUTC "MMM DD, YYYY"}} <span class="midlightgrey">({{this.memberSince}})</span>
     </LinkTo>
 
     <LinkTo @route="member" @model={{@member}} title="Member details" class="gh-list-data gh-list-cellwidth-chevron gh-members-list-chevron">
diff --git a/ghost/admin/app/templates/member.hbs b/ghost/admin/app/templates/member.hbs
index 3e1fe5036b..77ae27617d 100644
--- a/ghost/admin/app/templates/member.hbs
+++ b/ghost/admin/app/templates/member.hbs
@@ -46,11 +46,21 @@
                     {{#if (and this.member.name this.member.email)}}
                         <span class="darkgrey fw5">{{this.member.email}}</span>
                     {{/if}}
-                    {{#unless this.member.isNew}}
-                        {{if (and this.member.name this.member.email) "–"}}
-                        Created on {{this.subscribedAt}}
-                    {{/unless}}
                 </p>
+                {{#unless this.member.isNew}}
+                <p class="f7 pa0 ma0 midgrey-d1 {{if this.member.name "nudge-bottom--2"}}">
+                    {{#if this.member.geolocation}}
+                        {{#if (eq this.member.geolocation.country_code "US")}}
+                            {{this.member.geolocation.region}}, US
+                        {{else}}
+                            {{this.member.geolocation.country}}
+                        {{/if}}
+                    {{else}}  
+                        Unknown location
+                    {{/if}}
+                    – Created on {{this.subscribedAt}}
+                </p>
+                {{/unless}}
             </div>
         </div>
 
diff --git a/ghost/admin/public/assets/icons/pin.svg b/ghost/admin/public/assets/icons/pin.svg
index ade2e597c8..fb34d1b0eb 100644
--- a/ghost/admin/public/assets/icons/pin.svg
+++ b/ghost/admin/public/assets/icons/pin.svg
@@ -1,9 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="22px" height="33px" viewBox="0 0 22 33" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 39.1 (31720) - http://www.bohemiancoding.com/sketch -->
-    <title>Slice 1</title>
-    <desc>Created with Sketch.</desc>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" stroke-linejoin="round">
-        <path d="M20.6875,11 C20.6875,16.5253333 10.84375,31.6666667 10.84375,31.6666667 C10.84375,31.6666667 1,16.5253333 1,11 C1,5.47733333 5.4060625,1 10.84375,1 C16.280125,1 20.6875,5.47733333 20.6875,11 Z M14.78125,11 C14.78125,13.2093333 13.01725,15 10.84375,15 C8.6689375,15 6.90625,13.2093333 6.90625,11 C6.90625,8.792 8.6689375,7 10.84375,7 C13.01725,7 14.78125,8.792 14.78125,11 Z" id="Combined-Shape" stroke="#394043" stroke-width="2" fill="#fff"></path>
-    </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><defs><style>.a{fill:none;stroke:currentColor;stroke-linecap:round;stroke-linejoin:round;stroke-width:1.5px}</style></defs><title>pin</title><circle class="a" cx="12" cy="8.25" r="3.75"/><path class="a" d="M12 .75a7.5 7.5 0 0 1 7.5 7.5c0 3.407-5.074 11.95-6.875 14.665a.75.75 0 0 1-1.25 0C9.574 20.2 4.5 11.657 4.5 8.25A7.5 7.5 0 0 1 12 .75z"/></svg>
\ No newline at end of file