diff --git a/public/scss/admin/general/dashboard.scss b/public/scss/admin/general/dashboard.scss index b21799e51c..5ad836cdd9 100644 --- a/public/scss/admin/general/dashboard.scss +++ b/public/scss/admin/general/dashboard.scss @@ -138,19 +138,6 @@ } } - .stats { - .formatted-number { - font-size: 22px; - } - - .stat { - text-transform: uppercase; - font-weight: 600; - font-size: 10px; - color: #999; - } - } - .updatePageviewsGraph.active { font-weight: bold; } diff --git a/public/src/admin/dashboard.js b/public/src/admin/dashboard.js index ab151a2bad..afead1ff13 100644 --- a/public/src/admin/dashboard.js +++ b/public/src/admin/dashboard.js @@ -2,8 +2,8 @@ define('admin/dashboard', [ - 'Chart', 'translator', 'benchpress', 'bootbox', 'alerts', -], function (Chart, translator, Benchpress, bootbox, alerts) { + 'Chart', 'translator', 'benchpress', 'bootbox', 'alerts', 'helpers', +], function (Chart, translator, Benchpress, bootbox, alerts, helpers) { const Admin = {}; const intervals = { rooms: false, @@ -63,20 +63,20 @@ define('admin/dashboard', [ graphData.rooms = data; const html = '
' + - '' + data.onlineRegisteredCount + '' + - '
[[admin/dashboard:active-users.users]]
' + + '' + helpers.formattedNumber(data.onlineRegisteredCount) + '' + + '
[[admin/dashboard:active-users.users]]
' + '
' + '
' + - '' + data.onlineGuestCount + '' + - '
[[admin/dashboard:active-users.guests]]
' + + '' + helpers.formattedNumber(data.onlineGuestCount) + '' + + '
[[admin/dashboard:active-users.guests]]
' + '
' + '
' + - '' + (data.onlineRegisteredCount + data.onlineGuestCount) + '' + - '
[[admin/dashboard:active-users.total]]
' + + '' + helpers.formattedNumber(data.onlineRegisteredCount + data.onlineGuestCount) + '' + + '
[[admin/dashboard:active-users.total]]
' + '
' + '
' + - '' + data.socketCount + '' + - '
[[admin/dashboard:active-users.connections]]
' + + '' + helpers.formattedNumber(data.socketCount) + '' + + '
[[admin/dashboard:active-users.connections]]
' + '
'; updateRegisteredGraph(data.onlineRegisteredCount, data.onlineGuestCount); diff --git a/public/src/modules/helpers.common.js b/public/src/modules/helpers.common.js index 123b5eccc6..8121ad171d 100644 --- a/public/src/modules/helpers.common.js +++ b/public/src/modules/helpers.common.js @@ -29,7 +29,8 @@ module.exports = function (utils, Benchpress, relative_path) { generateWrote, isoTimeToLocaleString, shouldHideReplyContainer, - + humanReadableNumber, + formattedNumber, register, __escape: identity, }; @@ -352,6 +353,14 @@ module.exports = function (utils, Benchpress, relative_path) { return false; } + function humanReadableNumber(number, toFixed = 1) { + return utils.makeNumberHumanReadable(number, toFixed); + } + + function formattedNumber(number) { + return utils.addCommas(number); + } + function register() { Object.keys(helpers).forEach(function (helperName) { Benchpress.registerHelper(helperName, helpers[helperName]); diff --git a/public/src/utils.common.js b/public/src/utils.common.js index f83b3924a2..5773fa1675 100644 --- a/public/src/utils.common.js +++ b/public/src/utils.common.js @@ -442,7 +442,7 @@ const utils = { makeNumberHumanReadable: function (num, toFixed = 1) { const n = parseInt(num, 10); if (!n) { - return num; + return String(num); } if (n > 999999) { return (n / 1000000).toFixed(toFixed) + 'm'; diff --git a/src/views/admin/advanced/database.tpl b/src/views/admin/advanced/database.tpl index 4e10d868d7..cdcf2a65ab 100644 --- a/src/views/admin/advanced/database.tpl +++ b/src/views/admin/advanced/database.tpl @@ -13,10 +13,10 @@
[[admin/advanced/database:mongo.version]] {mongo.version}
-
[[admin/advanced/database:uptime-seconds]] {mongo.uptime}
+
[[admin/advanced/database:uptime-seconds]] {formattedNumber(mongo.uptime)}
[[admin/advanced/database:mongo.storage-engine]] {mongo.storageEngine}
-
[[admin/advanced/database:mongo.collections]] {mongo.collections}
-
[[admin/advanced/database:mongo.objects]] {mongo.objects}
+
[[admin/advanced/database:mongo.collections]] {formattedNumber(mongo.collections)}
+
[[admin/advanced/database:mongo.objects]] {formattedNumber(mongo.objects)}
[[admin/advanced/database:mongo.avg-object-size]] [[admin/advanced/database:x-b, {mongo.avgObjSize}]]
[[admin/advanced/database:mongo.data-size]] [[admin/advanced/database:x-gb, {mongo.dataSize}]]
@@ -47,23 +47,23 @@
[[admin/advanced/database:redis.version]] {redis.redis_version}
-
[[admin/advanced/database:uptime-seconds]] {redis.uptime_in_seconds}
+
[[admin/advanced/database:uptime-seconds]] {formattedNumber(redis.uptime_in_seconds)}
[[admin/advanced/database:uptime-days]] {redis.uptime_in_days}
-
[[admin/advanced/database:redis.keys]] {redis.keys}
-
[[admin/advanced/database:redis.expires]] {redis.expires}
-
[[admin/advanced/database:redis.avg-ttl]] {redis.avg_ttl}
-
[[admin/advanced/database:redis.connected-clients]] {redis.connected_clients}
-
[[admin/advanced/database:redis.connected-slaves]] {redis.connected_slaves}
+
[[admin/advanced/database:redis.keys]] {formattedNumber(redis.keys)}
+
[[admin/advanced/database:redis.expires]] {formattedNumber(redis.expires)}
+
[[admin/advanced/database:redis.avg-ttl]] {formattedNumber(redis.avg_ttl)}
+
[[admin/advanced/database:redis.connected-clients]] {formattedNumber(redis.connected_clients)}
+
[[admin/advanced/database:redis.connected-slaves]] {formattedNumber(redis.connected_slaves)}
[[admin/advanced/database:redis.blocked-clients]] {redis.blocked_clients}
[[admin/advanced/database:redis.used-memory]] [[admin/advanced/database:x-gb, {redis.used_memory_human}]]
[[admin/advanced/database:redis.memory-frag-ratio]] {redis.mem_fragmentation_ratio}
-
[[admin/advanced/database:redis.total-connections-recieved]] {redis.total_connections_received}
-
[[admin/advanced/database:redis.total-commands-processed]] {redis.total_commands_processed}
-
[[admin/advanced/database:redis.iops]] {redis.instantaneous_ops_per_sec}
+
[[admin/advanced/database:redis.total-connections-recieved]] {formattedNumber(redis.total_connections_received)}
+
[[admin/advanced/database:redis.total-commands-processed]] {formattedNumber(redis.total_commands_processed)}
+
[[admin/advanced/database:redis.iops]] {formattedNumber(redis.instantaneous_ops_per_sec)}
[[admin/advanced/database:redis.iinput]] [[admin/advanced/database:x-mb, {redis.instantaneous_input}]]
[[admin/advanced/database:redis.ioutput]] [[admin/advanced/database:x-mb, {redis.instantaneous_output}]]
@@ -71,8 +71,8 @@
[[admin/advanced/database:redis.total-output]] [[admin/advanced/database:x-gb, {redis.total_net_output}]]
-
[[admin/advanced/database:redis.keyspace-hits]] {redis.keyspace_hits}
-
[[admin/advanced/database:redis.keyspace-misses]] {redis.keyspace_misses}
+
[[admin/advanced/database:redis.keyspace-hits]] {formattedNumber(redis.keyspace_hits)}
+
[[admin/advanced/database:redis.keyspace-misses]] {formattedNumber(redis.keyspace_misses)}
@@ -87,7 +87,7 @@
[[admin/advanced/database:postgres.version]] {postgres.version}
-
[[admin/advanced/database:uptime-seconds]] {postgres.uptime}
+
[[admin/advanced/database:uptime-seconds]] {formattedNumber(postgres.uptime)}
diff --git a/src/views/admin/manage/users.tpl b/src/views/admin/manage/users.tpl index b87faf0ea9..7d417e9b5b 100644 --- a/src/views/admin/manage/users.tpl +++ b/src/views/admin/manage/users.tpl @@ -151,8 +151,8 @@ {{{ end }}} - {users.postcount} - {users.reputation} + {formattedNumber(users.postcount)} + {formattedNumber(users.reputation)} {{{ if users.flags }}}{users.flags}{{{ else }}}0{{{ end }}} diff --git a/src/views/admin/partials/dashboard/stats.tpl b/src/views/admin/partials/dashboard/stats.tpl index b28e0ee9f6..abd4f9cd31 100644 --- a/src/views/admin/partials/dashboard/stats.tpl +++ b/src/views/admin/partials/dashboard/stats.tpl @@ -27,19 +27,19 @@ {{{ end }}} - {./yesterday} - {./today} + {formattedNumber(./yesterday)} + {formattedNumber(./today)} {./dayIncrease}% - {./lastweek} - {./thisweek} + {formattedNumber(./lastweek)} + {formattedNumber(./thisweek)} {./weekIncrease}% - {./lastmonth} - {./thismonth} + {formattedNumber(./lastmonth)} + {formattedNumber(./thismonth)} {./monthIncrease}% - {./alltime} + {formattedNumber(./alltime)} {{{ end }}}