From bf5ab32fe919c4426cbad9360b6bcd558e3eb679 Mon Sep 17 00:00:00 2001
From: John O'Nolan <john@tryghost.org>
Date: Sun, 22 Sep 2013 23:06:12 +0200
Subject: [PATCH 1/2] Renamed user image data helper to make more sense

---
 core/server.js                        | 2 +-
 core/server/views/partials/navbar.hbs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/server.js b/core/server.js
index 25b4c3f4fe..c0de647805 100644
--- a/core/server.js
+++ b/core/server.js
@@ -112,7 +112,7 @@ function ghostLocals(req, res, next) {
             _.extend(res.locals,  {
                 currentUser: {
                     name: currentUser.attributes.name,
-                    profile: currentUser.attributes.image
+                    image: currentUser.attributes.image
                 }
             });
             next();
diff --git a/core/server/views/partials/navbar.hbs b/core/server/views/partials/navbar.hbs
index d9d7ab2430..ea1cc471f6 100644
--- a/core/server/views/partials/navbar.hbs
+++ b/core/server/views/partials/navbar.hbs
@@ -9,7 +9,7 @@
 
             <li id="usermenu" class="subnav">
                 <a href="#" data-toggle="ul" class="dropdown">
-                    <img class="avatar" src="{{#if currentUser.profile}}{{currentUser.profile}}{{else}}/shared/img/user-image.png{{/if}}" alt="Avatar" />
+                    <img class="avatar" src="{{#if currentUser.image}}{{currentUser.image}}{{else}}/shared/img/user-image.png{{/if}}" alt="Avatar" />
                     <span class="name">{{#if currentUser.name}}{{currentUser.name}}{{else}}Ghost{{/if}}</span>
                 </a>
                 <ul class="overlay">

From 78775f1976bd13f695c5aa9c8b8317927cf6737f Mon Sep 17 00:00:00 2001
From: John O'Nolan <john@tryghost.org>
Date: Sun, 22 Sep 2013 23:07:21 +0200
Subject: [PATCH 2/2] Added email to username if no name is given

Gets rid of generic "Ghost" - we know a user will always have an email address as it is a required field.
---
 core/server.js                        | 1 +
 core/server/views/partials/navbar.hbs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/server.js b/core/server.js
index c0de647805..e5633c4ef2 100644
--- a/core/server.js
+++ b/core/server.js
@@ -112,6 +112,7 @@ function ghostLocals(req, res, next) {
             _.extend(res.locals,  {
                 currentUser: {
                     name: currentUser.attributes.name,
+                    email: currentUser.attributes.email,
                     image: currentUser.attributes.image
                 }
             });
diff --git a/core/server/views/partials/navbar.hbs b/core/server/views/partials/navbar.hbs
index ea1cc471f6..ab4478f1b9 100644
--- a/core/server/views/partials/navbar.hbs
+++ b/core/server/views/partials/navbar.hbs
@@ -10,7 +10,7 @@
             <li id="usermenu" class="subnav">
                 <a href="#" data-toggle="ul" class="dropdown">
                     <img class="avatar" src="{{#if currentUser.image}}{{currentUser.image}}{{else}}/shared/img/user-image.png{{/if}}" alt="Avatar" />
-                    <span class="name">{{#if currentUser.name}}{{currentUser.name}}{{else}}Ghost{{/if}}</span>
+                    <span class="name">{{#if currentUser.name}}{{currentUser.name}}{{else}}{{currentUser.email}}{{/if}}</span>
                 </a>
                 <ul class="overlay">
                     <li class="usermenu-profile"><a href="/ghost/settings/user/">Your Profile</a></li>