From 0d3548ff5d5d4c7497fec0a7c142f86b78d58811 Mon Sep 17 00:00:00 2001 From: f0x Date: Tue, 30 Jul 2024 17:07:45 +0200 Subject: [PATCH] reflect about.html changes in templates --- internal/web/about.go | 1 + web/assets/static-pages/about.html | 204 ----------------------------- web/template/about.tmpl | 78 +++++------ web/template/page.tmpl | 4 +- 4 files changed, 42 insertions(+), 245 deletions(-) delete mode 100644 web/assets/static-pages/about.html diff --git a/internal/web/about.go b/internal/web/about.go index 6d77d25fc..ac6b8ab67 100644 --- a/internal/web/about.go +++ b/internal/web/about.go @@ -59,6 +59,7 @@ func (m *Module) aboutGETHandler(c *gin.Context) { "showStrap": true, "blocklistExposed": config.GetInstanceExposeSuspendedWeb(), "languages": config.GetInstanceLanguages().DisplayStrs(), + "pageType": "with-sidebar", }, } diff --git a/web/assets/static-pages/about.html b/web/assets/static-pages/about.html deleted file mode 100644 index e86c3fdd1..000000000 --- a/web/assets/static-pages/about.html +++ /dev/null @@ -1,204 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - GoToSocial Testrig Instance - GoToSocial - - - - -
- - - Instance Logo - -

GoToSocial Testrig Instance

- - -
-
- -
-
-

About GoToSocial Testrig Instance

-
-

Here's a fuller description of the GoToSocial testrig instance.

-

This instance is for testing purposes only. It doesn't federate at all. Go check out https://github.com/superseriousbusiness/gotosocial/tree/main/testrig and https://github.com/superseriousbusiness/gotosocial/blob/main/CONTRIBUTING.md#testing -

-

Users on this instance:

- -

If you need to edit the models for the testrig, you can do so at internal/testmodels.go.

-
-
-
-

Admin Contact

-
- -

Email: admin@example.org

-
-
-
-

Instance Features

-
-
    -
  • Statuses can contain up to - 5000 characters, and - 6 media attachments.
    • -
  • Polls can have up to - 6 options, with - 50 characters per option.
    • -
  • Custom CSS is enabled on account profiles.
    • -
-
-
-
-

Languages

-
-

This instance prefers the following languages:

-
    -
  1. Nederlands
    2. -
  2. Engels (British English)
    3. -
-
-
-
-

Register an Account on GoToSocial Testrig Instance

-
-

New account registration is currently open.

-

To register a new account, please first read the rules and terms.

-

Then, use the sign-up page to register an account.

-

Manual admin approval is required for new accounts.

-
-
-
-

Instance Rules

-
-

This instance has the following rules:

-
    -
  1. Be gay
    2. -
  2. Do crime
    3. -
-
-
-
-

Terms and Conditions

-
-

This is where a list of terms and conditions might go.

-

For example:

-

If you want to sign up on this instance, you oughta know that we:

-
    -
  1. Will sell your data to whoever offers.
    2. -
  2. Secure the server with password password wherever possible.
    3. -
-
-
-
-

Moderated servers

-
-

- ActivityPub instances federate with other instances by exchanging data with them over the network. - Exchanged data includes things like accounts, statuses, likes, boosts, and media attachments. - This exchange of data can prevented for instances on specific domains via a domain block created - by an instance admin. When an instance is domain blocked by another instance: -

-
    -
  • Any existing data from the blocked instance is deleted from the storage of the instance doing the - blocking.
    • -
  • Interaction between the two instances is cut off in both directions; neither instance can interact with - the other.
    • -
  • No new data from the blocked instance will be created on the instance that blocks it.
    • -
-

- View the list of domains blocked by this instance -

-
-
-
-
- - - - \ No newline at end of file diff --git a/web/template/about.tmpl b/web/template/about.tmpl index 4cacaf66e..70c3ffae2 100644 --- a/web/template/about.tmpl +++ b/web/template/about.tmpl @@ -83,43 +83,43 @@ Polls can have up to {{- end -}} {{- with . }} -
- -
-

About {{ .instance.Title -}}

-
+ +
+
+

About {{ .instance.Title -}}

+
{{- with . }} {{- include "description" . | indent 3 }} {{- end }}
-
-

Admin Contact

-
+
+

Admin Contact

+
-
-

Instance Features

-
+
+

Instance Features

+
  • {{- template "statusLimits" . -}}
  • {{- template "pollLimits" . -}}
    • @@ -142,34 +142,34 @@ Polls can have up to
-
-

Languages

-
+
+

Languages

+
{{- with . }} {{- include "languages" . | indent 3 }} {{- end }}
{{- include "index_register.tmpl" . | indent 1 }} -
-

Instance Rules

-
+
+

Instance Rules

+
{{- with . }} {{- include "rules" . | indent 3 }} {{- end }}
-
-

Terms and Conditions

-
+
+

Terms and Conditions

+
{{- with . }} {{- include "termsAndConditions" . | indent 3 }} {{- end }}
-
-

Moderated servers

-
+
+

Moderated servers

+

ActivityPub instances federate with other instances by exchanging data with them over the network. Exchanged data includes things like accounts, statuses, likes, boosts, and media attachments. diff --git a/web/template/page.tmpl b/web/template/page.tmpl index 06c20b04b..19f3e0d60 100644 --- a/web/template/page.tmpl +++ b/web/template/page.tmpl @@ -75,10 +75,10 @@ image/webp -

+
{{- include "page_header.tmpl" . | indent 3 }}
-
+
{{- include .pageContent . | indent 3 | outdentPre }}