From 3203fea2f89179d4e68384449878da60070e8332 Mon Sep 17 00:00:00 2001 From: Armored-Dragon Date: Wed, 1 May 2024 05:32:07 -0500 Subject: [PATCH] Custom document head injection (#2) * Custom document header injection. Fixed manifest.json. Removed "Null minute read". Signed-off-by: Armored Dragon * Fixed manifest.json Signed-off-by: Armored Dragon * Fixed existing custom_header not being filled on the admin settings page. Signed-off-by: Armored Dragon --------- Signed-off-by: Armored Dragon --- backend/core/core.js | 2 +- frontend/views/themes/default/css/settings.css | 17 +++++++++++++++++ frontend/views/themes/default/css/settings.scss | 17 +++++++++++++++++ .../views/themes/default/ejs/admin-settings.ejs | 9 +++++++-- frontend/views/themes/default/ejs/author.ejs | 2 +- .../views/themes/default/ejs/authorEdit.ejs | 2 +- frontend/views/themes/default/ejs/index.ejs | 2 +- frontend/views/themes/default/ejs/login.ejs | 2 +- .../default/ejs/partials/document-head.ejs | 4 ++++ .../views/themes/default/ejs/partials/post.ejs | 1 - frontend/views/themes/default/ejs/post.ejs | 2 +- frontend/views/themes/default/ejs/postNew.ejs | 2 +- .../views/themes/default/ejs/postSearch.ejs | 2 +- frontend/views/themes/default/ejs/register.ejs | 2 +- frontend/views/themes/default/manifest.json | 5 ++++- 15 files changed, 58 insertions(+), 13 deletions(-) create mode 100644 frontend/views/themes/default/ejs/partials/document-head.ejs diff --git a/backend/core/core.js b/backend/core/core.js index 85d8a58..0ac804e 100644 --- a/backend/core/core.js +++ b/backend/core/core.js @@ -26,7 +26,7 @@ let settings = { CD_JSON: true, WEBSITE_NAME: "", - PLAUSIBLE_URL: "", + CUSTOM_HEADER: "", USER_MINIMUM_PASSWORD_LENGTH: 7, diff --git a/frontend/views/themes/default/css/settings.css b/frontend/views/themes/default/css/settings.css index 315aecc..3e651c2 100644 --- a/frontend/views/themes/default/css/settings.css +++ b/frontend/views/themes/default/css/settings.css @@ -42,6 +42,23 @@ text-align: right; font-size: 1rem; } +.page .page-center .setting-list .largeset { + flex-direction: column; + height: -moz-fit-content; + height: fit-content; +} +.page .page-center .setting-list .largeset .value { + width: 100%; + padding: 0.25rem; + box-sizing: border-box; +} +.page .page-center .setting-list .largeset .value textarea { + width: 100%; + margin: auto; + font-size: initial; + resize: vertical; + min-height: 3rem; +} .page .page-center .setting-list .setting.fit-column { flex-direction: column; width: 100%; diff --git a/frontend/views/themes/default/css/settings.scss b/frontend/views/themes/default/css/settings.scss index 0b90ee5..6679347 100644 --- a/frontend/views/themes/default/css/settings.scss +++ b/frontend/views/themes/default/css/settings.scss @@ -47,6 +47,23 @@ } } + .largeset { + flex-direction: column; + height: fit-content; + .value { + width: 100%; + padding: 0.25rem; + box-sizing: border-box; + textarea { + width: 100%; + margin: auto; + font-size: initial; + resize: vertical; + min-height: 3rem; + } + } + } + .setting.fit-column { flex-direction: column; width: 100%; diff --git a/frontend/views/themes/default/ejs/admin-settings.ejs b/frontend/views/themes/default/ejs/admin-settings.ejs index d545034..ec3f5b3 100644 --- a/frontend/views/themes/default/ejs/admin-settings.ejs +++ b/frontend/views/themes/default/ejs/admin-settings.ejs @@ -1,11 +1,10 @@ - + <%- include("partials/document-head.ejs") %> - Yet-Another-Blog <%- include("partials/header.ejs") %> @@ -61,6 +60,12 @@ +
+
Custom head
+
+ +
+
diff --git a/frontend/views/themes/default/ejs/author.ejs b/frontend/views/themes/default/ejs/author.ejs index 19a0cac..2c724b9 100644 --- a/frontend/views/themes/default/ejs/author.ejs +++ b/frontend/views/themes/default/ejs/author.ejs @@ -1,7 +1,7 @@ - + <%- include("partials/document-head.ejs") %> Yet-Another-Blog diff --git a/frontend/views/themes/default/ejs/authorEdit.ejs b/frontend/views/themes/default/ejs/authorEdit.ejs index 6482852..9bcf489 100644 --- a/frontend/views/themes/default/ejs/authorEdit.ejs +++ b/frontend/views/themes/default/ejs/authorEdit.ejs @@ -1,7 +1,7 @@ - + <%- include("partials/document-head.ejs") %> diff --git a/frontend/views/themes/default/ejs/index.ejs b/frontend/views/themes/default/ejs/index.ejs index 5715dc5..3c28108 100644 --- a/frontend/views/themes/default/ejs/index.ejs +++ b/frontend/views/themes/default/ejs/index.ejs @@ -1,7 +1,7 @@ - + <%- include("partials/document-head.ejs") %> Yet-Another-Blog diff --git a/frontend/views/themes/default/ejs/login.ejs b/frontend/views/themes/default/ejs/login.ejs index a98be78..62dc7c2 100644 --- a/frontend/views/themes/default/ejs/login.ejs +++ b/frontend/views/themes/default/ejs/login.ejs @@ -1,7 +1,7 @@ - + <%- include("partials/document-head.ejs") %> diff --git a/frontend/views/themes/default/ejs/partials/document-head.ejs b/frontend/views/themes/default/ejs/partials/document-head.ejs new file mode 100644 index 0000000..d107c80 --- /dev/null +++ b/frontend/views/themes/default/ejs/partials/document-head.ejs @@ -0,0 +1,4 @@ + +<%= website_name %> + +<% if (settings.CUSTOM_HEADER) { %> <%- settings.CUSTOM_HEADER %> <% } %> diff --git a/frontend/views/themes/default/ejs/partials/post.ejs b/frontend/views/themes/default/ejs/partials/post.ejs index 23a82e1..159dc56 100644 --- a/frontend/views/themes/default/ejs/partials/post.ejs +++ b/frontend/views/themes/default/ejs/partials/post.ejs @@ -5,7 +5,6 @@
<%= post.publish_date ? post.publish_date.toLocaleString('en-US', { dateStyle:'medium'}) : "Unknown Publish Date" %>
-
Null minute read
<% if (logged_in_user) { %>
<%= post.visibility %>
diff --git a/frontend/views/themes/default/ejs/post.ejs b/frontend/views/themes/default/ejs/post.ejs index 1f898a6..0a9efaf 100644 --- a/frontend/views/themes/default/ejs/post.ejs +++ b/frontend/views/themes/default/ejs/post.ejs @@ -1,11 +1,11 @@ + <%- include("partials/document-head.ejs") %> - Yet-Another-Blog <%- include("partials/header.ejs") %> diff --git a/frontend/views/themes/default/ejs/postNew.ejs b/frontend/views/themes/default/ejs/postNew.ejs index aebec79..241a417 100644 --- a/frontend/views/themes/default/ejs/postNew.ejs +++ b/frontend/views/themes/default/ejs/postNew.ejs @@ -1,7 +1,7 @@ - + <%- include("partials/document-head.ejs") %> diff --git a/frontend/views/themes/default/ejs/postSearch.ejs b/frontend/views/themes/default/ejs/postSearch.ejs index 9e8d863..e02a373 100644 --- a/frontend/views/themes/default/ejs/postSearch.ejs +++ b/frontend/views/themes/default/ejs/postSearch.ejs @@ -1,7 +1,7 @@ - + <%- include("partials/document-head.ejs") %> diff --git a/frontend/views/themes/default/ejs/register.ejs b/frontend/views/themes/default/ejs/register.ejs index cc1b408..c61052d 100644 --- a/frontend/views/themes/default/ejs/register.ejs +++ b/frontend/views/themes/default/ejs/register.ejs @@ -1,7 +1,7 @@ - + <%- include("partials/document-head.ejs") %> diff --git a/frontend/views/themes/default/manifest.json b/frontend/views/themes/default/manifest.json index 696fef9..0d22884 100644 --- a/frontend/views/themes/default/manifest.json +++ b/frontend/views/themes/default/manifest.json @@ -8,7 +8,10 @@ "register": "/ejs/register.ejs", "author": "/ejs/author.ejs", "post": "/ejs/post.ejs", + "postSearch": "/ejs/postSearch.ejs", + "postNew": "/ejs/postNew.ejs", "settings": "/ejs/login.ejs", - "user-settings": "/ejs/user-settings.ejs" + "user-settings": "/ejs/user-settings.ejs", + "admin-settings": "/ejs/admin-settings.ejs" } }