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

public/src/app.js

@@ -290,9 +290,14 @@ var socket,
 				var el = jQuery(this),
 					uid = el.parents('li').attr('data-uid');
 
-				if (uid && users[uid]) {
-					el.siblings('i').attr('class', 'fa fa-circle status ' + users[uid].status)
-				}
+				translator.translate('[[global:' + users[uid].status + ']]', function(translated) {
+					if (uid && users[uid]) {
+						el.siblings('i')
+							.attr('class', 'fa fa-circle status ' + users[uid].status)
+							.attr('title', translated)
+							.attr('data-original-title', translated);
+					}
+				});
 			});
 		});
 	};
@@ -325,6 +330,13 @@ var socket,
 		});
 	};
 
+	app.createStatusTooltips = function() {
+		$('body').tooltip({
+			selector:'.fa-circle.status',
+			placement: 'top'
+		});
+	}
+
 	app.makeNumbersHumanReadable = function(elements) {
 		elements.each(function() {
 			$(this).html(utils.makeNumberHumanReadable($(this).attr('title')));
@@ -343,6 +355,8 @@ var socket,
 
 		app.createUserTooltips();
 
+		app.createStatusTooltips();
+
 		setTimeout(function () {
 			window.scrollTo(0, 1); // rehide address bar on mobile after page load completes.
 		}, 100);

public/src/forum/account.js

@@ -89,7 +89,12 @@ define(['forum/accountheader'], function(header) {
 			return;
 		}
 
-		onlineStatus.attr('class', 'account-online-status fa fa-circle status ' + data.status);
+		translator.translate('[[global:' + data.status + ']]', function(translated) {
+			onlineStatus.attr('class', 'account-online-status fa fa-circle status ' + data.status)
+				.attr('title', translated)
+				.attr('data-original-title', translated);
+		});
+
 	};
 
 	return Account;

public/src/forum/users.js

@@ -111,12 +111,14 @@ define(function() {
 				users: users
 			});
 
-			if(emptyContainer) {
-				$('#users-container .registered-user').remove();
-			}
+			translator.translate(html, function(translated) {
+				if(emptyContainer) {
+					$('#users-container .registered-user').remove();
+				}
 
-			$('#users-container').append(html);
-			$('#users-container .anon-user').appendTo($('#users-container'));
+				$('#users-container').append(translated);
+				$('#users-container .anon-user').appendTo($('#users-container'));
+			});
 		}
 
 		function loadMoreUsers() {

public/src/modules/chat.js

@@ -91,7 +91,11 @@ define(['taskbar', 'string'], function(taskbar, S) {
 
 	function checkStatus(chatModal) {
 		socket.emit('user.isOnline', chatModal.touid, function(err, data) {
-			$('#chat-user-status').attr('class', 'fa fa-circle status ' + data.status);
+			translator.translate('[[global:' + data.status + ']]', function(translated) {
+				$('#chat-user-status').attr('class', 'fa fa-circle status ' + data.status)
+					.attr('title', translated)
+					.attr('data-original-title', translated);
+			});
 		});
 	}
 

public/templates/account.tpl

@@ -17,7 +17,7 @@
 					<div>
 						<div>
 							<span>
-								<i class="account-online-status fa fa-circle status offline"></i>
+								<i class="account-online-status fa fa-circle status offline" title="[[global:{status}]]"></i>
 								<span class="account-username"> {username}</span>
 							</span>
 						</div>

public/templates/category.tpl

@@ -43,7 +43,11 @@
 						todo: add a check for config.allowTopicsThumbnail if issue#1066 is a win
 					-->
 					<a href="../../user/{topics.userslug}" class="pull-left">
-						<img src="<!-- IF topics.thumb -->{topics.thumb}<!-- ELSE -->{topics.picture}<!-- ENDIF topics.thumb -->" class="img-rounded user-img" title="{topics.username}"/>
+						<!-- IF topics.thumb -->
+						<img src="{topics.thumb}" class="img-rounded user-img" title="{topics.username}"/>
+						<!-- ELSE -->
+						<img src="{topics.picture}" class="img-rounded user-img" title="{topics.username}"/>
+						<!-- ENDIF topics.thumb -->
 					</a>
 
 					<h3>

public/templates/chat.tpl

@@ -4,7 +4,7 @@
 		<div class="modal-content">
 			<div class="modal-header">
 
-				<h4>[[modules:chat.chatting_with]] <i id="chat-user-status" class="fa fa-circle status offline"></i></h4>
+				<h4>[[modules:chat.chatting_with]] <i id="chat-user-status" class="fa fa-circle status offline" title="[[global:offline]]"></i></h4>
 
 			</div>
 			<div class="modal-body">

public/templates/users.tpl

@@ -25,7 +25,7 @@
 			<br/>
 			<div class="user-info">
 				<span>
-					<i class="fa fa-circle status {users.status}"></i>
+					<i class="fa fa-circle status {users.status}" title="[[global:{users.status}]]"></i>
 					<a href="{relative_path}/user/{users.userslug}">{users.username}</a>
 				</span>
 				<br/>

src/install.js

@@ -339,7 +339,7 @@ var async = require('async'),
 					winston.info('Enabling default plugins');
 
 					var defaultEnabled = [
-						'nodebb-plugin-markdown', 'nodebb-plugin-mentions'
+						'nodebb-plugin-markdown', 'nodebb-plugin-mentions', 'nodebb-widget-essentials'
 					];
 
 					async.each(defaultEnabled, function (pluginId, next) {