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 @@
{mongo.raw}
{redis.raw}
{postgres.raw}