Merge pull request #700 from stenington/677-name-consistency

Consistent user name display

controllers/auth.js

@@ -131,7 +131,8 @@ function extractUserData (user) {
     favorites: [],
     dependents: [],
     home: userHome,
-    underage: user.underage
+    underage: user.underage,
+    displayName: user.getDisplayName()
   };
 }
 

models/learner.js

@@ -108,7 +108,7 @@ module.exports = {
       return this.firstName + ' ' + this.lastName;
     },
     getDisplayName: function () {
-      return this.firstName || this.username;
+      return this.username;
     },
     getActivities: function (options, callback) {
       var learner = this;

views/user/backpack.html

@@ -32,7 +32,7 @@
 {% endblock %}
 
 {% block no_data %}
-<p>Welcome! It doesn't look like you've earned any Chicago Summer of Learning badges yet. Have no fear! You can check out cool projects in science, technology, engineering, art and math now on the <a href="/earn">Earn page</a>.<p>
+<p>Welcome {{ user.displayName }}! It doesn't look like you've earned any Chicago Summer of Learning badges yet. Have no fear! You can check out cool projects in science, technology, engineering, art and math now on the <a href="/earn">Earn page</a>.<p>
 {% endblock %}
 
 {% block finally %}

views/user/myplaylist.html

@@ -1,5 +1,5 @@
 {% extends 'layout.html' %}
-{% set pageTitle = user.username + '’s Playlist' %}
+{% set pageTitle = user.displayName + '’s Playlist' %}
 {% set bodyClass = 'myplaylist' %}
 {% set navItem = 'backpack' %}
 {% set subNavItem = 'playlist' %}