showing the connected server name, rather than handle / guid for the page nav server menu trigger item

Author: rmisio

js/templates/pageNav.html

@@ -69,7 +69,7 @@ <h3 class="margin0 marginTop25"><%= polyglot.t('Discover') %></h3>
 <div class="js-navProfileMenu popMenu popMenu-navBar">
   <div class="popMenu-navBarSubMenu popMenu-navBarSubMenu-pageNav">
     <a class="js-serverSubmenuTrigger">
-      <div class="noOverflow inlineBlock" style="max-width: 171px"><%= ob.handle || ob.guid %></div>
+      <div class="noOverflow inlineBlock" style="max-width: 171px"><%= ob.connectedServer.name %></div>
       <span class="pull-right txt-muted ion-arrow-right-b positionRelative" style="top: 4px"></span>
     </a>
     <a href="#userPage">

js/views/pageNavVw.js

@@ -256,7 +256,11 @@ module.exports = baseVw.extend({
     this.model.set('avatar_hash', this.userProfile.get('profile').avatar_hash);
     this.model.set('version', pjson.version);
     loadTemplate('./js/templates/pageNav.html', function(loadedTemplate) {
-      self.$el.html(loadedTemplate(self.model.toJSON()));
+      var connectedServer = app.serverConnectModal.getConnectedServer();
+
+      self.$el.html(loadedTemplate(
+        __.extend(self.model.toJSON(), { connectedServer: connectedServer && connectedServer.toJSON() })
+      ));
 
       self.$notifMenu = self.$('.js-navNotificationsMenu');
       self.$navNotif = self.$('.js-navNotifications');