fix to username, apply to main user

src/app/helpers.coffee

@@ -66,9 +66,12 @@ module.exports.viewHelpers = (view) ->
     else
       return "armor#{armor}_m.png"
 
-  view.fn "userName", (auth) ->
+  view.fn "username", (auth) ->
     if auth?.facebook?.displayName?
       auth.facebook.displayName
+    else if auth?.facebook?
+      fb = auth.facebook
+      if fb._raw then "#{fb.name.givenName} #{fb.name.familyName}" else fb.name
     else if auth?.local?
       auth.local.username
     else

src/app/index.coffee

@@ -49,12 +49,6 @@ get '/', (page, model, next) ->
 
     return page.redirect '/500.html' unless userObj? #this should never happen, but it is. Looking into it
 
-    # support legacy Everyauth schema (now using derby-auth, Passport)
-    if username = userObj.auth?.local?.username
-      _view.loginName = username
-    else if fb = userObj.auth?.facebook
-      _view.loginName = if fb._raw then "#{fb.name.givenName} #{fb.name.familyName}" else fb.name
-
     # Setup Item Store
     items = userObj.items
     _view.items =

views/app/index.html

@@ -142,7 +142,7 @@
         <a href="#" class="btn btn-small btn-info" data-target="#login-modal" data-toggle="modal">Login / Register</a>
       {else}
         <div class="btn-group">
-            <button class="btn btn-small">{_view.loginName}</button>
+            <button class="btn btn-small">{username(_user.auth)}</button>
             <button class="btn btn-small dropdown-toggle" data-toggle="dropdown">
                 <span class="caret"></span>
             </button>
@@ -192,7 +192,7 @@
               <!-- Party -->
               {#if _user.flags.partyEnabled}
                   {#each _friends as :friend}
-                    <td class="avatar friend-avatar" rel="tooltip" title="{userName(:friend.auth)}" data-placement="bottom" >
+                    <td class="avatar friend-avatar" rel="tooltip" title="{username(:friend.auth)}" data-placement="bottom" >
                         <div class='avatar-sprites'>
                             <img class='weapon weapon-{:friend.items.weapon}' src="/img/BrowserQuest/habitrpg_mods/weapon{:friend.items.weapon}.png" />
                             <img class='armor armor-{:friend.items.armor}' src="/img/BrowserQuest/habitrpg_mods/{currentArmor(:friend.preferences.gender, :friend.items.armor, :friend.preferences.armorSet)}" />