From 8829ee187afd24d0b54f12c73a3b9df1f8612f68 Mon Sep 17 00:00:00 2001
From: tobi <31960611+tsmethurst@users.noreply.github.com>
Date: Thu, 20 Feb 2025 15:09:28 +0100
Subject: [feature] Add page-specific class per template (#3814)

* [feature] Add page-specific class per template

* cheeky bit cheaper
---
 web/template/confirm-email.tmpl   |  33 ++++++++
 web/template/confirm_email.tmpl   |  33 --------
 web/template/confirmed-email.tmpl |  30 ++++++++
 web/template/confirmed_email.tmpl |  30 --------
 web/template/login-info.tmpl      | 157 ++++++++++++++++++++++++++++++++++++++
 web/template/login_info.tmpl      | 157 --------------------------------------
 web/template/page.tmpl            |   4 +-
 7 files changed, 221 insertions(+), 223 deletions(-)
 create mode 100644 web/template/confirm-email.tmpl
 delete mode 100644 web/template/confirm_email.tmpl
 create mode 100644 web/template/confirmed-email.tmpl
 delete mode 100644 web/template/confirmed_email.tmpl
 create mode 100644 web/template/login-info.tmpl
 delete mode 100644 web/template/login_info.tmpl

(limited to 'web/template')

diff --git a/web/template/confirm-email.tmpl b/web/template/confirm-email.tmpl
new file mode 100644
index 000000000..d1932acd9
--- /dev/null
+++ b/web/template/confirm-email.tmpl
@@ -0,0 +1,33 @@
+{{- /*
+// GoToSocial
+// Copyright (C) GoToSocial Authors admin@gotosocial.org
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/ -}}
+
+{{- with . }}
+<main>
+    <section class="with-form" aria-labelledby="confirm">
+        <h2 id="confirm">Confirm email address</h2>
+        <form action="/confirm_email?token={{ .token }}" method="POST">
+            <p>
+                Hi <b>{{- .username -}}</b>!
+                Please click the button to confirm your email address <b>{{- .email -}}</b>.
+            </p>
+            <button type="submit" class="btn btn-success">Confirm</button>
+        </form>
+    </section>
+</main>
+{{- end }}
\ No newline at end of file
diff --git a/web/template/confirm_email.tmpl b/web/template/confirm_email.tmpl
deleted file mode 100644
index d1932acd9..000000000
--- a/web/template/confirm_email.tmpl
+++ /dev/null
@@ -1,33 +0,0 @@
-{{- /*
-// GoToSocial
-// Copyright (C) GoToSocial Authors admin@gotosocial.org
-// SPDX-License-Identifier: AGPL-3.0-or-later
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/ -}}
-
-{{- with . }}
-<main>
-    <section class="with-form" aria-labelledby="confirm">
-        <h2 id="confirm">Confirm email address</h2>
-        <form action="/confirm_email?token={{ .token }}" method="POST">
-            <p>
-                Hi <b>{{- .username -}}</b>!
-                Please click the button to confirm your email address <b>{{- .email -}}</b>.
-            </p>
-            <button type="submit" class="btn btn-success">Confirm</button>
-        </form>
-    </section>
-</main>
-{{- end }}
\ No newline at end of file
diff --git a/web/template/confirmed-email.tmpl b/web/template/confirmed-email.tmpl
new file mode 100644
index 000000000..2dc605e4b
--- /dev/null
+++ b/web/template/confirmed-email.tmpl
@@ -0,0 +1,30 @@
+{{- /*
+// GoToSocial
+// Copyright (C) GoToSocial Authors admin@gotosocial.org
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/ -}}
+
+{{- with . }}
+<main>
+    <section aria-labelledby="confirmed">
+        <h2 id="confirmed">Email address confirmed</h2>
+        <p>Email address <b>{{- .email -}}</b> is now confirmed!</p>
+        {{- if not .approved }}
+        <p>Once an admin has approved your sign-up, you will be able to log in and use your account.</p>
+        {{- end }}
+    </section>
+</main>
+{{- end }}
\ No newline at end of file
diff --git a/web/template/confirmed_email.tmpl b/web/template/confirmed_email.tmpl
deleted file mode 100644
index 2dc605e4b..000000000
--- a/web/template/confirmed_email.tmpl
+++ /dev/null
@@ -1,30 +0,0 @@
-{{- /*
-// GoToSocial
-// Copyright (C) GoToSocial Authors admin@gotosocial.org
-// SPDX-License-Identifier: AGPL-3.0-or-later
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/ -}}
-
-{{- with . }}
-<main>
-    <section aria-labelledby="confirmed">
-        <h2 id="confirmed">Email address confirmed</h2>
-        <p>Email address <b>{{- .email -}}</b> is now confirmed!</p>
-        {{- if not .approved }}
-        <p>Once an admin has approved your sign-up, you will be able to log in and use your account.</p>
-        {{- end }}
-    </section>
-</main>
-{{- end }}
\ No newline at end of file
diff --git a/web/template/login-info.tmpl b/web/template/login-info.tmpl
new file mode 100644
index 000000000..238e3e9d2
--- /dev/null
+++ b/web/template/login-info.tmpl
@@ -0,0 +1,157 @@
+{{- /*
+// GoToSocial
+// Copyright (C) GoToSocial Authors admin@gotosocial.org
+// SPDX-License-Identifier: AGPL-3.0-or-later
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/ -}}
+
+{{- with . }}
+<main class="about">
+    <section role="region" class="about-section settings">
+        <p class="settings-text">
+            Looking to configure your profile and other settings?
+        </p>
+        <a
+            class="settings-button button with-icon"
+            href="/settings"
+            alt="Log in to the GoToSocial settings panel"
+            title="Log in to the GoToSocial settings panel"
+        >
+            Settings
+        </a>
+    </section>
+    <section role="region" class="about-section apps" aria-labelledby="apps">
+        <h3 id="apps">Client applications</h3>
+        <div class="about-section-contents">
+            <p>
+                Want to log in and start posting? 
+                Unlike other ActivityPub softwares, GoToSocial does not provide its own
+                webclient. Instead it implements the Mastodon client API, so you can use
+                a variety of third-party clients to log in to your account here:
+            </p>
+            <ul class="applist nodot" role="group">
+                <li class="applist-entry">
+                    <div class="applist-text">
+                        <p><strong>Pinafore</strong> is a web client designed for speed and simplicity.</p>
+                        <a
+                            href="https://pinafore.social/"
+                            rel="nofollow noreferrer noopener"
+                            target="_blank"
+                        >
+                            Use Pinafore
+                        </a>
+                    </div>
+                    <svg
+                        role="img"
+                        aria-labelledby="pinafore-title pinafore-desc"
+                        class="applist-logo redraw"
+                        xmlns="http://www.w3.org/2000/svg"
+                        viewBox="0 0 10000 10000"
+                        width="100"
+                        height="100"
+                    >
+                        <title id="pinafore-title">The Pinafore logo</title>
+                        <desc id="pinafore-desc">A sailboat</desc>
+                        <path d="M9212 5993H5987V823c1053 667 2747 2177 3225 5170zM3100 2690A12240 12240 0 01939 6035h2161zm676 7210h2448a3067 3067 0 003067-3067H5052V627a527 527 0 00-1052 0v6206H709a3067 3067 0 003067 3067z"></path>
+                    </svg>
+                </li>
+                <li class="applist-entry">
+                    <div class="applist-text">
+                        <p><strong>Tusky</strong> is a lightweight mobile client for Android.</p>
+                        <a
+                            href="https://tusky.app"
+                            rel="nofollow noreferrer noopener"
+                            target="_blank"
+                        >
+                            Get Tusky
+                        </a>
+                    </div>
+                    <img
+                        class="applist-logo"
+                        src="/assets/tusky.svg"
+                        alt="The Tusky mascot, a cartoon elephant tooting happily"
+                        title="The Tusky mascot, a cartoon elephant tooting happily"
+                        width="100"
+                        height="100"
+                    />
+                </li>
+                <li class="applist-entry">
+                    <div class="applist-text">
+                        <p><strong>Feditext</strong> (beta) is a beautiful client for iOS, iPadOS and macOS.</p>
+                        <a
+                            href="https://github.com/feditext/feditext"
+                            rel="nofollow noreferrer noopener"
+                            target="_blank"
+                        >
+                            Get Feditext
+                        </a>
+                    </div>
+                    <img
+                        class="applist-logo"
+                        src="/assets/feditext.svg"
+                        alt="The Feditext logo, the characters 'ft' at a slight angle"
+                        title="The Feditext logo, the characters 'ft' at a slight angle"
+                        width="100"
+                        height="100"
+                    />
+                </li>
+                <li class="applist-entry">
+                    <div class="applist-text">
+                        <p>
+                            <strong>Masto-FE (🦥 flavour)</strong> is an (experimental!) client based on
+                            the Mastodon Glitch web frontend, with some small changes specific to GoToSocial.
+                        </p>
+                        <a
+                            href="https://masto-fe.superseriousbusiness.org"
+                            rel="nofollow noreferrer noopener"
+                            target="_blank"
+                        >
+                            Try Masto-FE (🦥 flavour)
+                        </a>
+                    </div>
+                    <img
+                        class="applist-logo"
+                        src="/assets/mastodon.svg"
+                        alt="The Mastodon logo, the character 'M' in a speech bubble"
+                        title="The Mastodon logo, the character 'M' in a speech bubble"
+                        width="100"
+                        height="100"
+                    />
+                </li>
+                <li class="applist-entry">
+                    <div class="applist-text">
+                        <p>Or try one of the <strong>Mastodon clients</strong> listed on the official Mastodon page.</p>
+                        <a
+                            href="https://joinmastodon.org/apps"
+                            rel="nofollow noreferrer noopener"
+                            target="_blank"
+                        >
+                            Browse Mastodon apps
+                        </a>
+                    </div>
+                    <img
+                        class="applist-logo"
+                        src="/assets/ellipsis.svg"
+                        alt="Three ellipses in a row, MIT license svgrepo.com"
+                        title="Three ellipses in a row, MIT license svgrepo.com"
+                        width="100"
+                        height="100"
+                    />
+                </li>
+            </ul>
+        </div>
+    </section>
+</main>
+{{- end }}
\ No newline at end of file
diff --git a/web/template/login_info.tmpl b/web/template/login_info.tmpl
deleted file mode 100644
index 238e3e9d2..000000000
--- a/web/template/login_info.tmpl
+++ /dev/null
@@ -1,157 +0,0 @@
-{{- /*
-// GoToSocial
-// Copyright (C) GoToSocial Authors admin@gotosocial.org
-// SPDX-License-Identifier: AGPL-3.0-or-later
-//
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU Affero General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU Affero General Public License for more details.
-//
-// You should have received a copy of the GNU Affero General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/ -}}
-
-{{- with . }}
-<main class="about">
-    <section role="region" class="about-section settings">
-        <p class="settings-text">
-            Looking to configure your profile and other settings?
-        </p>
-        <a
-            class="settings-button button with-icon"
-            href="/settings"
-            alt="Log in to the GoToSocial settings panel"
-            title="Log in to the GoToSocial settings panel"
-        >
-            Settings
-        </a>
-    </section>
-    <section role="region" class="about-section apps" aria-labelledby="apps">
-        <h3 id="apps">Client applications</h3>
-        <div class="about-section-contents">
-            <p>
-                Want to log in and start posting? 
-                Unlike other ActivityPub softwares, GoToSocial does not provide its own
-                webclient. Instead it implements the Mastodon client API, so you can use
-                a variety of third-party clients to log in to your account here:
-            </p>
-            <ul class="applist nodot" role="group">
-                <li class="applist-entry">
-                    <div class="applist-text">
-                        <p><strong>Pinafore</strong> is a web client designed for speed and simplicity.</p>
-                        <a
-                            href="https://pinafore.social/"
-                            rel="nofollow noreferrer noopener"
-                            target="_blank"
-                        >
-                            Use Pinafore
-                        </a>
-                    </div>
-                    <svg
-                        role="img"
-                        aria-labelledby="pinafore-title pinafore-desc"
-                        class="applist-logo redraw"
-                        xmlns="http://www.w3.org/2000/svg"
-                        viewBox="0 0 10000 10000"
-                        width="100"
-                        height="100"
-                    >
-                        <title id="pinafore-title">The Pinafore logo</title>
-                        <desc id="pinafore-desc">A sailboat</desc>
-                        <path d="M9212 5993H5987V823c1053 667 2747 2177 3225 5170zM3100 2690A12240 12240 0 01939 6035h2161zm676 7210h2448a3067 3067 0 003067-3067H5052V627a527 527 0 00-1052 0v6206H709a3067 3067 0 003067 3067z"></path>
-                    </svg>
-                </li>
-                <li class="applist-entry">
-                    <div class="applist-text">
-                        <p><strong>Tusky</strong> is a lightweight mobile client for Android.</p>
-                        <a
-                            href="https://tusky.app"
-                            rel="nofollow noreferrer noopener"
-                            target="_blank"
-                        >
-                            Get Tusky
-                        </a>
-                    </div>
-                    <img
-                        class="applist-logo"
-                        src="/assets/tusky.svg"
-                        alt="The Tusky mascot, a cartoon elephant tooting happily"
-                        title="The Tusky mascot, a cartoon elephant tooting happily"
-                        width="100"
-                        height="100"
-                    />
-                </li>
-                <li class="applist-entry">
-                    <div class="applist-text">
-                        <p><strong>Feditext</strong> (beta) is a beautiful client for iOS, iPadOS and macOS.</p>
-                        <a
-                            href="https://github.com/feditext/feditext"
-                            rel="nofollow noreferrer noopener"
-                            target="_blank"
-                        >
-                            Get Feditext
-                        </a>
-                    </div>
-                    <img
-                        class="applist-logo"
-                        src="/assets/feditext.svg"
-                        alt="The Feditext logo, the characters 'ft' at a slight angle"
-                        title="The Feditext logo, the characters 'ft' at a slight angle"
-                        width="100"
-                        height="100"
-                    />
-                </li>
-                <li class="applist-entry">
-                    <div class="applist-text">
-                        <p>
-                            <strong>Masto-FE (🦥 flavour)</strong> is an (experimental!) client based on
-                            the Mastodon Glitch web frontend, with some small changes specific to GoToSocial.
-                        </p>
-                        <a
-                            href="https://masto-fe.superseriousbusiness.org"
-                            rel="nofollow noreferrer noopener"
-                            target="_blank"
-                        >
-                            Try Masto-FE (🦥 flavour)
-                        </a>
-                    </div>
-                    <img
-                        class="applist-logo"
-                        src="/assets/mastodon.svg"
-                        alt="The Mastodon logo, the character 'M' in a speech bubble"
-                        title="The Mastodon logo, the character 'M' in a speech bubble"
-                        width="100"
-                        height="100"
-                    />
-                </li>
-                <li class="applist-entry">
-                    <div class="applist-text">
-                        <p>Or try one of the <strong>Mastodon clients</strong> listed on the official Mastodon page.</p>
-                        <a
-                            href="https://joinmastodon.org/apps"
-                            rel="nofollow noreferrer noopener"
-                            target="_blank"
-                        >
-                            Browse Mastodon apps
-                        </a>
-                    </div>
-                    <img
-                        class="applist-logo"
-                        src="/assets/ellipsis.svg"
-                        alt="Three ellipses in a row, MIT license svgrepo.com"
-                        title="Three ellipses in a row, MIT license svgrepo.com"
-                        width="100"
-                        height="100"
-                    />
-                </li>
-            </ul>
-        </div>
-    </section>
-</main>
-{{- end }}
\ No newline at end of file
diff --git a/web/template/page.tmpl b/web/template/page.tmpl
index fad0fc3b9..7dccc7469 100644
--- a/web/template/page.tmpl
+++ b/web/template/page.tmpl
@@ -71,9 +71,8 @@ image/webp
         {{- end }}
         <title>{{- template "instanceTitle" . -}}</title>
     </head>
-    <body>
+    <body class="page{{- if .pageClass }} {{ .pageClass }}-page{{- end -}}">
         {{- include "login_button.tmpl" . | indent 3 }}
-        <div class="page">
         <header class="page-header">
             {{- include "page_header.tmpl" . | indent 3 }}
         </header>
@@ -83,6 +82,5 @@ image/webp
         <footer class="page-footer">
             {{- include "page_footer.tmpl" . | indent 3 }}
         </footer>
-        </div>
     </body>
 </html>
\ No newline at end of file
-- 
cgit v1.2.3