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

public/language/en_GB/global.json

@@ -56,5 +56,10 @@
 	"posted": "posted",
 	"in": "in",
 
-	"recentposts": "Recent Posts"
+	"recentposts": "Recent Posts",
+
+	"online": "Online",
+	"away": "Away",
+	"donotdisturb": "Do not disturb",
+	"invisible": "Invisible"
 }

public/src/app.js

@@ -501,7 +501,7 @@ var socket,
 					userLabel.find('img').attr('src', data.picture);
 				}
 				if (data.username) {
-					userLabel.find('span').html(data.username);
+					userLabel.find('#user-profile-link>span').html(data.username);
 				}
 
 				$('#logout-link').on('click', app.logout);

public/templates/header.tpl

@@ -132,6 +132,19 @@
 							<li id="logout-link">
 								<a href="#">[[global:logout]]</a>
 							</li>
+							<li role="presentation" class="divider"></li>
+							<li>
+								<a href="#"><i class="fa fa-circle state-online"></i><span> [[global:online]]</span></a>
+							</li>
+							<li>
+								<a href="#"><i class="fa fa-circle state-away"></i><span> [[global:away]]</span></a>
+							</li>
+							<li>
+								<a href="#"><i class="fa fa-circle state-dnd"></i><span> [[global:donotdisturb]]</span></a>
+							</li>
+							<li>
+								<a href="#"><i class="fa fa-circle state-invisible"></i><span> [[global:invisible]]</span></a>
+							</li>
 						</ul>
 					</li>