Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-07 22:45:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #980

Browse Source
This commit is contained in:
Baris Soner Usakli
2014-02-23 21:50:02 -05:00
parent b8b83c2ec2
commit e3d01df6a2
7 changed files with 38 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
public/src/app.js
View File

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

7
public/src/forum/account.js
View File

@@ -89,7 +89,12 @@ define(['forum/accountheader'], function(header) {
return; 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; return Account;

12
public/src/forum/users.js
View File

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

6
public/src/modules/chat.js
View File

@@ -91,7 +91,11 @@ define(['taskbar', 'string'], function(taskbar, S) {
function checkStatus(chatModal) { function checkStatus(chatModal) {
socket.emit('user.isOnline', chatModal.touid, function(err, data) { 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);
});
}); });
} }

2
public/templates/account.tpl
View File

@@ -17,7 +17,7 @@
<div> <div>
<div> <div>
<span> <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 class="account-username"> {username}</span>
</span> </span>
</div> </div>

2
public/templates/chat.tpl
View File

@@ -4,7 +4,7 @@
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <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>
<div class="modal-body"> <div class="modal-body">

2
public/templates/users.tpl
View File

@@ -25,7 +25,7 @@
<br/> <br/>
<div class="user-info"> <div class="user-info">
<span> <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> <a href="{relative_path}/user/{users.userslug}">{users.username}</a>
</span> </span>
<br/> <br/>