diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less index 46ea35d349..16c066aec6 100644 --- a/public/less/admin/admin.less +++ b/public/less/admin/admin.less @@ -158,7 +158,7 @@ transition: background, color 500ms ease-in; } - #unique-visitors { + #unique-visitors, #active-users { > div { min-width: 25%; } diff --git a/public/src/forum/admin/index.js b/public/src/forum/admin/index.js index 0d503dbaf3..c00fbc09c5 100644 --- a/public/src/forum/admin/index.js +++ b/public/src/forum/admin/index.js @@ -107,12 +107,24 @@ define('forum/admin/index', ['semver'], function(semver) { return app.alertError(err.message); } - var html = 'Online Users [ ' + data.onlineRegisteredCount + ' ]
' + - 'Online Guests [ ' + data.onlineGuestCount + ' ]
' + - 'Online Total [ ' + (data.onlineRegisteredCount + data.onlineGuestCount) + ' ]
' + - 'Socket Connections [ ' + data.socketCount + ' ]'; - - $('#active_users').html(html); + var html = '
' + + '
'+ data.onlineRegisteredCount +'
' + + '
Users
' + + '
' + + '
' + + '
'+ data.onlineGuestCount +'
' + + '
Guests
' + + '
' + + '
' + + '
'+ data.onlineRegisteredCount + data.onlineGuestCount +'
' + + '
Total
' + + '
' + + '
' + + '
'+ data.socketCount +'
' + + '
Socket
Connections
' + + '
'; + + $('#active-users').html(html); }; var graphs = { diff --git a/src/views/admin/index.tpl b/src/views/admin/index.tpl index 3ea35062e6..810722c29e 100644 --- a/src/views/admin/index.tpl +++ b/src/views/admin/index.tpl @@ -9,7 +9,7 @@
-
+
{stats.name}
@@ -36,11 +36,11 @@
-
+
Active Users
-
+