diff --git a/public/scss/admin/admin.scss b/public/scss/admin/admin.scss index ef6d94a86a..88d02bc9eb 100644 --- a/public/scss/admin/admin.scss +++ b/public/scss/admin/admin.scss @@ -13,16 +13,9 @@ @import "./extend/plugins"; @import "./extend/rewards"; @import "./extend/widgets"; -// @import "./advanced/database"; -// @import "./advanced/events"; -// @import "./advanced/logs"; -// @import "./advanced/errors"; -// @import "./advanced/hooks"; -// @import "./development/info"; +@import "./advanced/database"; @import "./settings"; -// @import "../flags"; - @import "./modules/alerts"; @import "./modules/selectable"; @import "./modules/nprogress"; diff --git a/public/scss/admin/advanced/database.scss b/public/scss/admin/advanced/database.scss new file mode 100644 index 0000000000..a68332708c --- /dev/null +++ b/public/scss/admin/advanced/database.scss @@ -0,0 +1,6 @@ +.database-info { + span { + display:inline-block; + width:220px; + } +} diff --git a/public/src/admin/advanced/logs.js b/public/src/admin/advanced/logs.js index 15705bb8a0..9d3be96752 100644 --- a/public/src/admin/advanced/logs.js +++ b/public/src/admin/advanced/logs.js @@ -7,8 +7,6 @@ define('admin/advanced/logs', ['alerts'], function (alerts) { Logs.init = function () { const logsEl = $('.logs pre'); logsEl.scrollTop(logsEl.prop('scrollHeight')); - // Affix menu - $('.affix').affix(); $('.logs').find('button[data-action]').on('click', function () { const btnEl = $(this); @@ -16,21 +14,14 @@ define('admin/advanced/logs', ['alerts'], function (alerts) { switch (action) { case 'reload': - socket.emit('admin.logs.get', function (err, logs) { - if (!err) { - logsEl.text(logs); - logsEl.scrollTop(logsEl.prop('scrollHeight')); - } else { - alerts.error(err); - } - }); + loadLogs(); break; case 'clear': socket.emit('admin.logs.clear', function (err) { if (!err) { alerts.success('[[admin/advanced/logs:clear-success]]'); - btnEl.prev().click(); + loadLogs(); } else { alerts.error(err); } @@ -40,5 +31,17 @@ define('admin/advanced/logs', ['alerts'], function (alerts) { }); }; + function loadLogs() { + const logsEl = $('.logs pre'); + socket.emit('admin.logs.get', function (err, logs) { + if (!err) { + logsEl.text(logs); + logsEl.scrollTop(logsEl.prop('scrollHeight')); + } else { + alerts.error(err); + } + }); + } + return Logs; }); diff --git a/src/controllers/admin/hooks.js b/src/controllers/admin/hooks.js index 0f68a7e47e..c3511ebaf3 100644 --- a/src/controllers/admin/hooks.js +++ b/src/controllers/admin/hooks.js @@ -20,7 +20,7 @@ hooksController.get = function (req, res) { id: hookData.id, priority: hookData.priority, method: hookData.method ? validator.escape(hookData.method.toString()) : 'No plugin function!', - index: `${hookIndex}-code-${methodIndex}`, + index: `hook-${hookIndex}-code-${methodIndex}`, }); }); hooks.push(current); diff --git a/src/views/admin/advanced/cache.tpl b/src/views/admin/advanced/cache.tpl index c5a2dc2143..ae4c4cde32 100644 --- a/src/views/admin/advanced/cache.tpl +++ b/src/views/admin/advanced/cache.tpl @@ -4,41 +4,50 @@
{{{each caches}}}
-
-
[[admin/advanced/cache:{@key}-cache]]
-
-
+
+
[[admin/advanced/cache:{@key}-cache]]
+
+
- {{{if ../length}}}{../length}{{{else}}}{../itemCount}{{{end}}} / {{{if ../max}}}{../max}{{{else}}}{../maxSize}{{{end}}}
- -
+
{{{if ../length}}}{../length}{{{else}}}{../itemCount}{{{end}}} / {{{if ../max}}}{../max}{{{else}}}{../maxSize}{{{end}}}
+
[[admin/advanced/cache:percent-full, {../percentFull}]]
+
+ {../hits} +
+
+ {../misses} +
+
+ {../hitRatio} +
- {../hits}
- {../misses}
- {../hitRatio}
- {{{if ../ttl}}} {../ttl}
{{{end}}} + {{{if ../ttl}}} +
+ {../ttl} +
+ {{{end}}} {{{if (@key == "post")}}}
-
+
{{{end}}} - +
{{{end}}} -
diff --git a/src/views/admin/advanced/database.tpl b/src/views/admin/advanced/database.tpl index f63b77cb86..6646cc984f 100644 --- a/src/views/admin/advanced/database.tpl +++ b/src/views/admin/advanced/database.tpl @@ -7,32 +7,32 @@ {mongo.serverStatusError}
{{{ end }}} -
-
[[admin/advanced/database:mongo]]
-
+
+
[[admin/advanced/database:mongo]]
+
- [[admin/advanced/database:mongo.version]] {mongo.version}
+ [[admin/advanced/database:mongo.version]] {mongo.version}

- [[admin/advanced/database:uptime-seconds]] {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.avg-object-size]] [[admin/advanced/database:x-b, {mongo.avgObjSize}]]
+ [[admin/advanced/database:uptime-seconds]] {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.avg-object-size]] [[admin/advanced/database:x-b, {mongo.avgObjSize}]]

- [[admin/advanced/database:mongo.data-size]] [[admin/advanced/database:x-gb, {mongo.dataSize}]]
- [[admin/advanced/database:mongo.storage-size]] [[admin/advanced/database:x-gb, {mongo.storageSize}]]
- [[admin/advanced/database:mongo.index-size]] [[admin/advanced/database:x-gb, {mongo.indexSize}]]
+ [[admin/advanced/database:mongo.data-size]] [[admin/advanced/database:x-gb, {mongo.dataSize}]]
+ [[admin/advanced/database:mongo.storage-size]] [[admin/advanced/database:x-gb, {mongo.storageSize}]]
+ [[admin/advanced/database:mongo.index-size]] [[admin/advanced/database:x-gb, {mongo.indexSize}]]
- [[admin/advanced/database:mongo.file-size]] [[admin/advanced/database:x-gb, {mongo.fileSize}]]
+ [[admin/advanced/database:mongo.file-size]] [[admin/advanced/database:x-gb, {mongo.fileSize}]]

- [[admin/advanced/database:mongo.resident-memory]] [[admin/advanced/database:x-gb, {mongo.mem.resident}]]
- [[admin/advanced/database:mongo.virtual-memory]] [[admin/advanced/database:x-gb, {mongo.mem.virtual}]]
- [[admin/advanced/database:mongo.mapped-memory]] [[admin/advanced/database:x-gb, {mongo.mem.mapped}]]
+ [[admin/advanced/database:mongo.resident-memory]] [[admin/advanced/database:x-gb, {mongo.mem.resident}]]
+ [[admin/advanced/database:mongo.virtual-memory]] [[admin/advanced/database:x-gb, {mongo.mem.virtual}]]
+ [[admin/advanced/database:mongo.mapped-memory]] [[admin/advanced/database:x-gb, {mongo.mem.mapped}]]

- [[admin/advanced/database:mongo.bytes-in]] [[admin/advanced/database:x-gb, {mongo.network.bytesIn}]]
- [[admin/advanced/database:mongo.bytes-out]] [[admin/advanced/database:x-gb, {mongo.network.bytesOut}]]
- [[admin/advanced/database:mongo.num-requests]] {mongo.network.numRequests}
+ [[admin/advanced/database:mongo.bytes-in]] [[admin/advanced/database:x-gb, {mongo.network.bytesIn}]]
+ [[admin/advanced/database:mongo.bytes-out]] [[admin/advanced/database:x-gb, {mongo.network.bytesOut}]]
+ [[admin/advanced/database:mongo.num-requests]] {mongo.network.numRequests}
@@ -41,38 +41,38 @@ {{{ if redis }}}
-
-
[[admin/advanced/database:redis]]
-
+
+
[[admin/advanced/database:redis]]
+
- [[admin/advanced/database:redis.version]] {redis.redis_version}
+ [[admin/advanced/database:redis.version]] {redis.redis_version}

- [[admin/advanced/database:uptime-seconds]] {redis.uptime_in_seconds}
- [[admin/advanced/database:uptime-days]] {redis.uptime_in_days}
+ [[admin/advanced/database:uptime-seconds]] {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.blocked-clients]] {redis.blocked_clients}
+ [[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.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.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]] {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.iinput]] [[admin/advanced/database:x-mb, {redis.instantaneous_input}]]
- [[admin/advanced/database:redis.ioutput]] [[admin/advanced/database:x-mb, {redis.instantaneous_output}]]
- [[admin/advanced/database:redis.total-input]] [[admin/advanced/database:x-gb, {redis.total_net_input}]]
- [[admin/advanced/database:redis.total-output]] [[admin/advanced/database:x-gb, {redis.total_net_output}]]
+ [[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}]]
+ [[admin/advanced/database:redis.total-input]] [[admin/advanced/database:x-gb, {redis.total_net_input}]]
+ [[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]] {redis.keyspace_hits}
+ [[admin/advanced/database:redis.keyspace-misses]] {redis.keyspace_misses}
@@ -81,13 +81,13 @@ {{{ if postgres }}}
-
-
[[admin/advanced/database:postgres]]
-
+
+
[[admin/advanced/database:postgres]]
+
- [[admin/advanced/database:postgres.version]] {postgres.version}
+ [[admin/advanced/database:postgres.version]] {postgres.version}

- [[admin/advanced/database:uptime-seconds]] {postgres.uptime}
+ [[admin/advanced/database:uptime-seconds]] {postgres.uptime}
@@ -98,12 +98,12 @@
{{{ if mongo }}}
-
-
-

[[admin/advanced/database:mongo.raw-info]]

-
+
+
+ [[admin/advanced/database:mongo.raw-info]] +
-
+
{mongo.raw}
@@ -114,12 +114,12 @@ {{{ if redis }}}
-
-
-

[[admin/advanced/database:redis.raw-info]]

-
+
+
+ [[admin/advanced/database:redis.raw-info]] +
-
+
{redis.raw}
@@ -130,12 +130,12 @@ {{{ if postgres }}}
-
-
-

[[admin/advanced/database:postgres.raw-info]]

-
+
+
+ [[admin/advanced/database:postgres.raw-info]] +
-
+
{postgres.raw}
diff --git a/src/views/admin/advanced/errors.tpl b/src/views/admin/advanced/errors.tpl index f5f0838c31..5b84d04aeb 100644 --- a/src/views/admin/advanced/errors.tpl +++ b/src/views/admin/advanced/errors.tpl @@ -2,23 +2,23 @@
-
-
+
+
-
-
-
+
+
- @@ -26,10 +26,10 @@
-
-
[[admin/advanced/errors:manage-error-log]]
-
-
+
+
[[admin/advanced/errors:manage-error-log]]
+
+
-
-
-
+
+
+
[[admin/advanced/errors:error.404]]
-
+
diff --git a/src/views/admin/advanced/events.tpl b/src/views/admin/advanced/events.tpl index ccaca544b6..5e3403c158 100644 --- a/src/views/admin/advanced/events.tpl +++ b/src/views/admin/advanced/events.tpl @@ -1,68 +1,72 @@
-
-
[[admin/advanced/events:events]]
-
- -
[[admin/advanced/events:no-events]]
- -
- -
- #{events.eid} - {events.type} - uid {events.uid} - {events.ip} - - - - -
{events.user.icon:text}
- -
- {events.user.username} - - {events.timestampISO} -
{events.jsonString}
-
- - +
[[admin/advanced/events:events]]
+ {{{ if !events.length }}} +
[[admin/advanced/events:no-events]]
+ {{{ end }}} +
+ {{{ each events }}} +
+
+
+
+ #{events.eid} + {events.type} + uid {events.uid} + {events.ip} + + + + +
{events.user.icon:text}
+ +
+ {events.user.username} + + {events.timestampISO} +
+
{events.jsonString}
+
+ {{{ end }}} +
-
-
[[admin/advanced/events:filters]]
-
+
+
[[admin/advanced/events:filters]]
+
-
- -
-
- +
+
-
- +
+
-
- +
+
- +
+ +
-
-
-
diff --git a/src/views/admin/advanced/hooks.tpl b/src/views/admin/advanced/hooks.tpl index b9b2493b88..d137038ef6 100644 --- a/src/views/admin/advanced/hooks.tpl +++ b/src/views/admin/advanced/hooks.tpl @@ -1,27 +1,25 @@
{{{ each hooks }}} -
-
[[admin/advanced/errors:route]]
@@ -57,13 +57,12 @@ -
-
-

[[admin/development/info:info]]

-
- -
-
+
+
+ [[admin/development/info:info]] +
+
+
{infoJSON}
diff --git a/src/views/admin/development/logger.tpl b/src/views/admin/development/logger.tpl index 04e2004154..b5f6d658a4 100644 --- a/src/views/admin/development/logger.tpl +++ b/src/views/admin/development/logger.tpl @@ -1,9 +1,9 @@
-
-
[[admin/development/logger:logger-settings]]
-
+
+
[[admin/development/logger:logger-settings]]
+

[[admin/development/logger:description]]

@@ -14,7 +14,6 @@
-