From 562e4d6e439547167677cb6bce4743a2d1d7d77f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Sat, 15 Jul 2023 15:07:09 -0400 Subject: [PATCH] fix: #11802, fix anchor ids in acp settings --- .../language/en-GB/admin/settings/guest.json | 2 +- public/src/admin/settings.js | 15 ++++++++------- src/views/admin/settings/advanced.tpl | 14 +++++++------- src/views/admin/settings/chat.tpl | 2 +- src/views/admin/settings/cookies.tpl | 4 ++-- src/views/admin/settings/email.tpl | 12 ++++++------ src/views/admin/settings/general.tpl | 16 ++++++++-------- src/views/admin/settings/group.tpl | 4 ++-- src/views/admin/settings/notifications.tpl | 2 +- src/views/admin/settings/pagination.tpl | 2 +- src/views/admin/settings/post.tpl | 16 ++++++++-------- src/views/admin/settings/reputation.tpl | 6 +++--- src/views/admin/settings/sockets.tpl | 19 ------------------- src/views/admin/settings/tags.tpl | 4 ++-- src/views/admin/settings/uploads.tpl | 8 ++++---- src/views/admin/settings/user.tpl | 12 ++++++------ src/views/admin/settings/web-crawler.tpl | 4 ++-- 17 files changed, 62 insertions(+), 80 deletions(-) delete mode 100644 src/views/admin/settings/sockets.tpl diff --git a/public/language/en-GB/admin/settings/guest.json b/public/language/en-GB/admin/settings/guest.json index 44370e3668..a0062ef75a 100644 --- a/public/language/en-GB/admin/settings/guest.json +++ b/public/language/en-GB/admin/settings/guest.json @@ -1,6 +1,6 @@ { "settings": "Settings", - "guest-settings": "Guest settings", + "guest-settings": "Guest Settings", "handles.enabled": "Allow guest handles", "handles.enabled-help": "This option exposes a new field that allows guests to pick a name to associate with each post they make. If disabled, they will simply be called \"Guest\"", "topic-views.enabled": "Allow guests to increase topic view counts", diff --git a/public/src/admin/settings.js b/public/src/admin/settings.js index 591ad5d22b..de7cd48096 100644 --- a/public/src/admin/settings.js +++ b/public/src/admin/settings.js @@ -13,13 +13,14 @@ define('admin/settings', [ const mainHader = $('[component="settings/main/header"]'); if (headers.length > 1 && tocList.length) { - headers.each(function () { - const header = $(this).text(); - const anchor = header.toLowerCase() - .replace(/ /g, '-') - .replace(/&/g, '-') - .trim(); - $(this).parent().attr('id', anchor); + headers.each(function (i) { + const $this = $(this); + const header = $this.text(); + const anchor = $this.parent().attr('id') || `section${i + 1}`; + // for elements that don't have id use section{index} + if (anchor.startsWith('section')) { + $this.parent().attr('id', anchor); + } tocList.append(`${header}`); }); const offset = mainHader.outerHeight(true); diff --git a/src/views/admin/settings/advanced.tpl b/src/views/admin/settings/advanced.tpl index 8251181f9a..fc3fcc4b8f 100644 --- a/src/views/admin/settings/advanced.tpl +++ b/src/views/admin/settings/advanced.tpl @@ -3,7 +3,7 @@
-
+
[[admin/settings/advanced:maintenance-mode]]
@@ -33,7 +33,7 @@
-
+
[[admin/settings/advanced:headers]]
@@ -105,7 +105,7 @@
-
+
[[admin/settings/advanced:hsts]]
@@ -131,7 +131,7 @@
-
+
[[admin/settings/advanced:sockets.settings]]
@@ -146,7 +146,7 @@
-
+
[[admin/settings/advanced:analytics.settings]]
@@ -160,7 +160,7 @@
-
+
[[admin/settings/advanced:compression.settings]]
@@ -176,7 +176,7 @@
-
+
[[admin/settings/advanced:traffic-management]]

diff --git a/src/views/admin/settings/chat.tpl b/src/views/admin/settings/chat.tpl index 1eb12fe5c0..18e073e2ec 100644 --- a/src/views/admin/settings/chat.tpl +++ b/src/views/admin/settings/chat.tpl @@ -3,7 +3,7 @@

-
+
diff --git a/src/views/admin/settings/cookies.tpl b/src/views/admin/settings/cookies.tpl index 83d6d6d03d..56d3abb832 100644 --- a/src/views/admin/settings/cookies.tpl +++ b/src/views/admin/settings/cookies.tpl @@ -3,7 +3,7 @@
-
+