Merge branch 'master' of https://github.com/designcreateplay/NodeBB

public/src/app.js

@@ -34,6 +34,7 @@ var socket,
 					socket.on('event:connect', function (data) {
 						app.username = data.username;
 						app.uid = data.uid;
+						app.isAdmin = data.isAdmin;
 
 						app.showLoginMessage();
 						socket.emit('meta.updateHeader', {

public/templates/header.tpl

@@ -72,9 +72,11 @@
 					<li>
 						<a href="{relative_path}/users"><i class="fa fa-fw fa-users" title="[[global:header.users]]"></i><span class="visible-xs-inline"> [[global:header.users]]</span></a>
 					</li>
-					<li class="{adminDisplay}">
+					<!-- IF isAdmin -->
+					<li>
 						<a href="{relative_path}/admin"><i class="fa fa-fw fa-cogs" title="[[global:header.admin]]"></i><span class="visible-xs-inline"> [[global:header.admin]]</span></a>
 					</li>
+					<!-- ENDIF isAdmin -->
 
 					<li class="visible-xs">
 						<a id="mobile-search-button" href="{relative_path}/search"><i class="fa fa-search" title="[[global:header.search]]"></i> [[global:header.search]]</a>

src/socket.io/index.js

@@ -88,10 +88,22 @@ Sockets.init = function(server) {
 					db.sortedSetAdd('users:online', Date.now(), uid, function(err, data) {
 						socket.join('uid_' + uid);
 
-						user.getUserField(uid, 'username', function(err, username) {
+						async.parallel({
+							username: function(next) {
+								user.getUserField(uid, 'username', function(err, username) {
+									next(err, username);
+								});
+							},
+							isAdmin: function(next) {
+								user.isAdministrator(uid, function(err, isAdmin) {
+									next(err, isAdmin);
+								});
+							}
+						}, function(err, userData) {
 							socket.emit('event:connect', {
 								status: 1,
-								username: username,
+								username: userData.username,
+								isAdmin: userData.isAdmin,
 								uid: uid
 							});
 						});

src/webserver.js

@@ -154,7 +154,7 @@ module.exports.server = server;
 			}
 
 			user.isAdministrator(uid, function(err, isAdmin) {
-				templateValues.adminDisplay = isAdmin ? 'show' : 'hide';
+				templateValues.isAdmin = isAdmin;
 
 				translator.translate(templates.header.parse(templateValues), function(template) {
 					callback(null, template);