diff --git a/public/less/admin/admin.less b/public/less/admin/admin.less index 78d040bfda..1f5b33b71a 100644 --- a/public/less/admin/admin.less +++ b/public/less/admin/admin.less @@ -16,7 +16,6 @@ @import "./manage/registration"; @import "./manage/users"; @import "./manage/admins-mods"; -@import "../post-queue"; @import "./appearance/customise"; @import "./appearance/themes"; @import "./extend/plugins"; @@ -30,7 +29,6 @@ @import "./settings"; @import "../flags"; -@import "./manage/ip-blacklist"; @import "./modules/alerts"; @import "./modules/selectable"; diff --git a/public/less/admin/manage/ip-blacklist.less b/public/less/admin/manage/ip-blacklist.less deleted file mode 100644 index d3724d85c2..0000000000 --- a/public/less/admin/manage/ip-blacklist.less +++ /dev/null @@ -1,7 +0,0 @@ -#blacklist-rules { - width: 100%; - height: 357px; - display: block; - border: 1px solid #eee; - padding: 5px 10px; -} \ No newline at end of file diff --git a/public/less/post-queue.less b/public/less/post-queue.less deleted file mode 100644 index c59f6452a0..0000000000 --- a/public/less/post-queue.less +++ /dev/null @@ -1,19 +0,0 @@ -/* - Post queue page CSS - - Originally in ACP - - Now available in front-end for global mods as well -*/ -.posts-list { - .topic-title { - word-break: break-word; - } - .post-content { - word-break: break-word; - } - .post-content-editable { - textarea { - width: 100%; - height: 300px; - } - } -} diff --git a/src/controllers/globalmods.js b/src/controllers/globalmods.js index 71a1be2cc8..2ad0d54b4f 100644 --- a/src/controllers/globalmods.js +++ b/src/controllers/globalmods.js @@ -18,7 +18,7 @@ globalModsController.ipBlacklist = async function (req, res, next) { meta.blacklist.get(), analytics.getBlacklistAnalytics(), ]); - res.render('admin/manage/ip-blacklist', { + res.render('ip-blacklist', { title: '[[pages:ip-blacklist]]', rules: rules, analytics: analyticsData, diff --git a/src/controllers/mods.js b/src/controllers/mods.js index 777a12712d..16717e98d9 100644 --- a/src/controllers/mods.js +++ b/src/controllers/mods.js @@ -221,7 +221,7 @@ modsController.postQueue = async function (req, res, next) { const stop = start + postsPerPage - 1; postData = postData.slice(start, stop + 1); - res.render('admin/manage/post-queue', { + res.render('post-queue', { title: '[[pages:post-queue]]', posts: postData, allCategories: allCategories, diff --git a/src/meta/css.js b/src/meta/css.js index 7b20ac6ba4..97267497aa 100644 --- a/src/meta/css.js +++ b/src/meta/css.js @@ -29,8 +29,6 @@ var buildImports = { '@import (inline) "../public/vendor/colorpicker/colorpicker.css";', '@import (inline) "../node_modules/cropperjs/dist/cropper.css";', '@import "../../public/less/flags.less";', - '@import "../../public/less/post-queue.less";', - '@import "../../public/less/admin/manage/ip-blacklist.less";', '@import "../../public/less/generics.less";', '@import "../../public/less/mixins.less";', '@import "../../public/less/global.less";', diff --git a/src/views/admin/manage/ip-blacklist.tpl b/src/views/admin/manage/ip-blacklist.tpl deleted file mode 100644 index da3fea162b..0000000000 --- a/src/views/admin/manage/ip-blacklist.tpl +++ /dev/null @@ -1,56 +0,0 @@ - - -
- [[admin/manage/ip-blacklist:lead]] -
-- [[admin/manage/ip-blacklist:description]] -
- -- [[admin/manage/ip-blacklist:hint-1]] -
-- [[admin/manage/ip-blacklist:hint-2]] -
-- [[admin/manage/post-queue:description, {config.relative_path}/admin/settings/post#post-queue]] -
- - -[[admin/manage/post-queue:user]] | -[[admin/manage/post-queue:category]] | -[[admin/manage/post-queue:title]] | -[[admin/manage/post-queue:content]] | -[[admin/manage/post-queue:posted]] | -- |
---|---|---|---|---|---|
- - {posts.user.username} - - {posts.user.username} - - | -- {posts.category.name} - | -- - [[admin/manage/post-queue:reply-to, {posts.topic.title}]] - - {posts.data.title} - | - {{{if !posts.data.tid}}} - - {{{end}}} -{posts.data.content} | - -- - | -
-
-
-
-
- |
-