Merge branch 'master' of gitlab.com:Isleward/isleward

src/client/ui/templates/death/death.js

@@ -24,7 +24,7 @@ define([
 		},
 
 		onLogout: function () {
-			$('.uiOptions').data('ui').charSelect();
+			$('.uiMainMenu').data('ui').charSelect();
 		},
 
 		onRespawn: function () {

src/client/ui/templates/online/online.js

@@ -90,6 +90,10 @@ define([
 		},
 
 		build: function () {
+			let headingText = this.el.find('.heading-text');
+			let playerCount = this.onlineList.length;
+			headingText.html(`online players (${playerCount})`);
+
 			let container = this.el.find('.list');
 			container
 				.children(':not(.heading)')

src/client/ui/templates/online/template.html

@@ -1,7 +1,7 @@
 <div class="uiOnline hasBorderShadow">
 	<div class="heading">
-			<div class="heading-text">online players</div>
-		</div>
+		<div class="heading-text">online players</div>
+	</div>
 	<div class="bottom">
 		<div class="list">
 			<div class="heading">

src/server/config/factionBase.js

@@ -1,7 +1,7 @@
 module.exports = {
 	id: 'example',
 	name: 'Example',
-	decription: 'An example faction.',
+	description: 'An example faction.',
 
 	initialRep: 1000,
 	tiers: [{