Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-04 21:15:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

#2486

Browse Source 
various fixes for socket.io cluster
display user presence correctly
This commit is contained in:
barisusakli
2015-03-25 22:33:14 -04:00
parent 1a58ea6520
commit 77e956861a
7 changed files with 194 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/src/admin/general/dashboard.js
View File

@@ -141,10 +141,10 @@ define('admin/general/dashboard', ['semver'], function(semver) {
'<div>Connections</div>' +
'</div>';
var idle = data.socketCount - (data.users.home + data.users.topics + data.users.category);
var idle = data.socketCount - (data.users.categories + data.users.topics + data.users.category);
updateRegisteredGraph(data.onlineRegisteredCount, data.onlineGuestCount);
updatePresenceGraph(data.users.home, data.users.topics, data.users.category, idle);
updatePresenceGraph(data.users.categories, data.users.topics, data.users.category, idle);
updateTopicsGraph(data.topics);
$('#active-users').html(html);
@@ -266,7 +266,7 @@ define('admin/general/dashboard', ['semver'], function(semver) {
value: 1,
color:"#F7464A",
highlight: "#FF5A5E",
label: "On homepage"
label: "On categories list"
},
{
value: 1,
@@ -345,8 +345,8 @@ define('admin/general/dashboard', ['semver'], function(semver) {
graphs.registered.update();
}
function updatePresenceGraph(homepage, posts, topics, idle) {
graphs.presence.segments[0].value = homepage;
function updatePresenceGraph(categories, posts, topics, idle) {
graphs.presence.segments[0].value = categories;
graphs.presence.segments[1].value = posts;
graphs.presence.segments[2].value = topics;
graphs.presence.segments[3].value = idle;
@@ -424,6 +424,9 @@ define('admin/general/dashboard', ['semver'], function(semver) {
function buildTopicsLegend() {
var legend = $('#topics-legend').html('');
segments.sort(function(a, b) {
return b.value - a.value;
});
for (var i = 0, ii = segments.length; i < ii; i++) {
var topic = segments[i],
label = topic.tid === '0' ? topic.label : '<a title="' + topic.label + '"href="' + RELATIVE_PATH + '/topic/' + topic.tid + '" target="_blank"> ' + topic.label + '</a>';