![\":rainbow:\"](\"http://localhost:8080/fileserver/01AY6P665V14JJR0AFVRT7311Y/emoji/original/01F8MH9H8E4VG3KDYJR9EGPXCQ.png\" "\\":rainbow:\\"")
!", item.Content)
+ suite.Equal("hello world! #welcome ! first post on the instance
- {{.Domain}}
-
-
-
- - {{.PublicComment}} -
--
+
- Display name +
- + {account.display_name.trim().length > 0 ? account.display_name : account.username} + +
- Username +
- @{account.username} +
{toot.spoiler_text?.length > 0
@@ -164,8 +169,17 @@ function ReportedToot({ toot }) {
diff --git a/web/source/settings/components/fake-profile.jsx b/web/source/settings/components/fake-profile.jsx
index d1f28f36c..6cb8d0187 100644
--- a/web/source/settings/components/fake-profile.jsx
+++ b/web/source/settings/components/fake-profile.jsx
@@ -22,24 +22,29 @@ const React = require("react");
module.exports = function FakeProfile({ avatar, header, display_name, username, role }) {
return ( // Keep in sync with web/template/profile.tmpl
-
- {{ if .javascript }}
- {{ range .javascript }}
-
- {{ end }}
- {{ end }}
-
-
-
-
- 
-
- {account.display_name.trim().length > 0 ? account.display_name : account.username}
- .
-
- @{account.username}
-
-
-
+
+
+
+
+
+
+
diff --git a/web/source/settings/style.css b/web/source/settings/style.css
index 524f5e4ab..13642dd0c 100644
--- a/web/source/settings/style.css
+++ b/web/source/settings/style.css
@@ -20,26 +20,14 @@ body {
grid-template-rows: auto 1fr;
}
-.content {
+.page-content {
grid-column: 1 / span 3; /* stretch entire width, to fit panel + sidebar nav */
width: 100%;
}
-header {
- justify-content: start;
-
- a {
- margin: 1.5rem;
- gap: 1rem;
-
- h1 {
- font-size: 1.5rem;
- }
-
- img {
- height: 3rem;
- }
- }
+/* Don't inherit orange dot from base.css. */
+ul li::before {
+ content: initial;
}
#root {
@@ -1007,7 +995,7 @@ button.with-padding {
grid-template-columns: 1fr auto;
gap: 0.5rem;
- .status {
+ .report-status {
color: $border-accent;
}
}
@@ -1029,7 +1017,7 @@ button.with-padding {
color: $fg-reduced;
border-left: 0.4rem solid $bg;
- .byline .status {
+ .byline .report-status {
color: $fg-reduced;
}
@@ -1141,11 +1129,62 @@ button.with-padding {
}
}
+.instance-rules {
+ list-style-position: inside;
+ margin: 0;
+ padding: 0;
+
+ a.rule {
+ display: grid;
+ grid-template-columns: 1fr auto;
+ align-items: center;
+ color: $fg;
+ text-decoration: none;
+ background: $status-bg;
+ padding: 1rem;
+ margin: 0.5rem 0;
+ border-radius: $br;
+ line-height: 2rem;
+ position: relative;
+
+ &:hover {
+ color: $fg-accent;
+
+ .edit-icon {
+ display: inline;
+ }
+ }
+
+ .edit-icon {
+ display: none;
+ font-size: 1rem;
+ line-height: 1.5rem;
+ }
+
+ li {
+ font-size: 1.75rem;
+ padding: 0;
+ margin: 0;
+
+ h2 {
+ margin: 0;
+ margin-top: 0 !important;
+ display: inline-block;
+ font-size: 1.5rem;
+ }
+ }
+
+ span {
+ color: $fg-reduced;
+ }
+ }
+}
+
@media screen and (orientation: portrait) {
.reports .report .byline {
grid-template-columns: 1fr;
- .status {
+ .report-status {
grid-row: 1;
}
}
@@ -1162,4 +1201,14 @@ button.with-padding {
to {
opacity: 0;
}
-}
\ No newline at end of file
+}
+
+@media (prefers-reduced-motion) {
+ .fa-spin {
+ animation: none;
+ }
+}
+
+.monospace {
+ font-family: monospace;
+}
diff --git a/web/template/404.tmpl b/web/template/404.tmpl
index 2269d667b..cbad36091 100644
--- a/web/template/404.tmpl
+++ b/web/template/404.tmpl
@@ -17,23 +17,27 @@
// along with this program. If not, see
-
-
+
+
-
-{{ template "footer.tmpl" .}}
\ No newline at end of file
+{{- end }}
\ No newline at end of file
diff --git a/web/template/about.tmpl b/web/template/about.tmpl
index 6579f492f..a23dfa953 100644
--- a/web/template/about.tmpl
+++ b/web/template/about.tmpl
@@ -17,105 +17,133 @@
// along with this program. If not, see
-
-
+ {{- if .instance.ApprovalRequired -}} + Admin approval is required for new registrations. + {{- else -}} + Admin approval is not required for registrations; new signups will be automatically approved (pending email confirmation). + {{- end -}} +{{- else -}} + Registration is disabled; new signups are currently closed for this instance. +{{- end -}} +{{- end -}} -
+{{- with . }}
+
+
+
+
+ 
+
+
+
+
+
+
+
+
+
-{{ template "footer.tmpl" .}}
\ No newline at end of file
+{{- end }}
\ No newline at end of file
diff --git a/web/template/authorize.tmpl b/web/template/authorize.tmpl
index ada078968..9be094137 100644
--- a/web/template/authorize.tmpl
+++ b/web/template/authorize.tmpl
@@ -17,26 +17,24 @@
// along with this program. If not, see
-
-
-{{ template "footer.tmpl" .}}
\ No newline at end of file
+{{- with . }}
+
+
+
+{{- end }}
\ No newline at end of file
diff --git a/web/template/confirmed.tmpl b/web/template/confirmed.tmpl
index 3cf5b7ac9..c1633a8fb 100644
--- a/web/template/confirmed.tmpl
+++ b/web/template/confirmed.tmpl
@@ -17,12 +17,11 @@
// along with this program. If not, see
-
-
+
+
-
-{{ template "footer.tmpl" .}}
\ No newline at end of file
+{{- end }}
\ No newline at end of file
diff --git a/web/template/domain-blocklist.tmpl b/web/template/domain-blocklist.tmpl
index def1b990e..9a21796f9 100644
--- a/web/template/domain-blocklist.tmpl
+++ b/web/template/domain-blocklist.tmpl
@@ -17,36 +17,36 @@
// along with this program. If not, see
-
-
+
+
-{{ template "footer.tmpl" .}}
\ No newline at end of file
+{{- end }}
\ No newline at end of file
diff --git a/web/template/error.tmpl b/web/template/error.tmpl
index dc0713e43..816062e27 100644
--- a/web/template/error.tmpl
+++ b/web/template/error.tmpl
@@ -17,16 +17,16 @@
// along with this program. If not, see
-
-
+
+
-{{ template "footer.tmpl" .}}
\ No newline at end of file
+{{- end }}
\ No newline at end of file
diff --git a/web/template/finalize.tmpl b/web/template/finalize.tmpl
index e0d880db7..56ab677e5 100644
--- a/web/template/finalize.tmpl
+++ b/web/template/finalize.tmpl
@@ -17,34 +17,31 @@
// along with this program. If not, see
-
-
-{{ template "footer.tmpl" .}}
+{{- with . }}
+
+
+
+{{- end }}
\ No newline at end of file
diff --git a/web/template/footer.tmpl b/web/template/footer.tmpl
deleted file mode 100644
index 028a27ffb..000000000
--- a/web/template/footer.tmpl
+++ /dev/null
@@ -1,46 +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
-
-
+
diff --git a/web/source/settings/components/fake-toot.jsx b/web/source/settings/components/fake-toot.jsx
index 7c2e40454..08f806008 100644
--- a/web/source/settings/components/fake-toot.jsx
+++ b/web/source/settings/components/fake-toot.jsx
@@ -29,20 +29,27 @@ module.exports = function FakeToot({ children }) {
} } = query.useVerifyCredentialsQuery();
return (
-
+
-
+
- Display name +
- + {account.display_name.trim().length > 0 ? account.display_name : account.username} + +
- Username +
- @{account.username} +
- {children}
+
+ {children}
+
404: Page Not Found
-- GoToSocial only serves Public statuses via the web. - If you reached this page by clicking on a status link, - it's possible that the status is not Public, has been - deleted by the author, you don't have permission to see - it, or it just doesn't exist at all. -
-
- If you believe this 404 was an error, you can contact
- the instance admin. Provide them with the following request
- Request ID: {{.requestID}}.
-
404: Not Found
++ GoToSocial only serves Public statuses via the web. +
++ If you reached this page by clicking on a status link, + it's likely that the status is not Public. You can try + entering the status URL in your client's search bar, + to view the status from your account. If that doesn't + work, it's possible that the status has been deleted by + the author, you don't have permission to view it, or it + doesn't exist at all. +
+
+ If you believe this 404 was an error, you can contact
+ the instance admin. Provide them with the following
+ request ID: {{- .requestID -}}.
+
About
-
- {{.instance.Description |noescape}}
-
+{{- define "description" -}}
+{{- if .instance.Description }}
+{{ .instance.Description | noescape }}
+{{- else }}
+No description has yet been set for this instance.
+{{- end }} +{{- end -}} -
-
+{{- define "registrationLimits" -}}
+{{- if .instance.Registrations -}}
+ Registration is enabled; new signups can be submitted to this instance.Languages
-- {{ if .languages }} - This instance prefers the following languages: -
-
- {{range .languages}}
-
- {{.}} - {{end}} -
+ {{- if .instance.ApprovalRequired -}} + Admin approval is required for new registrations. + {{- else -}} + Admin approval is not required for registrations; new signups will be automatically approved (pending email confirmation). + {{- end -}} +{{- else -}} + Registration is disabled; new signups are currently closed for this instance. +{{- end -}} +{{- end -}} -
- 
-
- {{end}} - {{if .instance.Email}} - Email: {{.instance.Email}} - {{end}} -
+{{- define "customCSSLimits" -}}
+{{- if .instance.Configuration.Accounts.AllowCustomCSS -}}
+Users are allowed to set Custom CSS for their profiles.
+{{- else -}}
+Custom CSS is not enabled for user profiles.
+{{- end -}}
+{{- end -}}
- Admin Contact
- {{if .instance.ContactAccount}} - -- {{if .instance.ContactAccount.DisplayName}}{{emojify .instance.ContactAccount.Emojis (escape .instance.ContactAccount.DisplayName)}}{{else}}{{.instance.ContactAccount.Username}}{{end}} -
- @{{.instance.ContactAccount.Username}} -- {{end}} - {{if .instance.Email}} - Email: {{.instance.Email}} - {{end}} -
-
+{{- define "statusLimits" -}}
+Statuses can contain up to
+{{- .instance.Configuration.Statuses.MaxCharacters }} characters, and
+{{- .instance.Configuration.Statuses.MaxMediaAttachments }} media attachments.
+{{- end -}}
- Rules
--
- {{range .instance.Rules}}
-
- {{.Text}} - {{end}} -
-
+{{- define "pollLimits" -}}
+Polls can have up to
+{{- .instance.Configuration.Polls.MaxOptions }} options, with
+{{- .instance.Configuration.Polls.MaxCharactersPerOption }} characters per option.
+{{- end -}}
- Features
--
-
- - Registration is - {{if .instance.Registrations}} - enabled{{if .instance.ApprovalRequired}}, but requires admin approval{{end}}. - {{else}} - disabled. - {{end}} - - {{if .instance.Configuration.Accounts.AllowCustomCSS}} -
- - Users are allowed to set Custom CSS for their profiles. - - {{end}} -
- - Toots can contain up to {{.instance.Configuration.Statuses.MaxCharacters}} characters and - {{.instance.Configuration.Statuses.MaxMediaAttachments}} media attachments. - -
- - Polls can have up to {{.instance.Configuration.Polls.MaxOptions}} options, with - {{.instance.Configuration.Polls.MaxCharactersPerOption}} characters each. - -
-
-
- Moderated servers
-- ActivityPub instances exchange (federate) data with other instances, including accounts and toots. - This can be prevented for specific domains by suspending them. None of their content is stored, - and interaction with their users is blocked both ways. - {{if .blocklistExposed}} - View the list of suspended domains - {{else}} - This instance does not publically share this list. - {{end}} -
-
-
- Instance Statistics
--
-
- Users: {{.instance.Stats.user_count}} -
- Posts: {{.instance.Stats.status_count}} -
- Federates with: {{.instance.Stats.domain_count}} instances -
About {{ .instance.Title -}}
+ {{- with . }} + {{- include "description" . | indent 2 }} + {{- end }} +Admin Contact
+ {{- if .instance.ContactAccount }} + ++ {{- if .instance.ContactAccount.DisplayName -}} + {{- emojify .instance.ContactAccount.Emojis (escape .instance.ContactAccount.DisplayName) -}} + {{- else -}} + {{- .instance.ContactAccount.Username -}} + {{- end -}} +
+ @{{- .instance.ContactAccount.Username -}} + + {{- else }} +This instance has not yet set a contact account.
+ {{- end }} + {{- if .instance.Email }} +Email: {{- .instance.Email -}}
+ {{- else }} +This instance has not yet set a contact email address.
+ {{- end }} +Languages
+ {{- if .languages }} +This instance prefers the following languages:
+-
+ {{- range .languages }}
+
- {{- . -}} + {{- end }} +
This instance does not have any preferred languages.
+ {{- end }} +Instance Rules
+This instance has the following rules:
+ {{- if .instance.Rules }} +-
+ {{- range .instance.Rules }}
+
- {{- .Text -}} + {{- end }} +
This instance has not yet set any rules.
+ {{- end }} +Instance Features
+-
+
- {{- template "registrationLimits" . -}} +
- {{- template "customCSSLimits" . -}} +
- {{- template "statusLimits" . -}} +
- {{- template "pollLimits" . -}} +
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. +
+ {{- if .blocklistExposed }} + View the list of domains blocked by this instance + {{- else }} + This instance does not publically share their list of blocked domains. + {{- end }} +
+Email Address Confirmed
-Thanks {{.username}}! Your email address {{.email}} has been confirmed.
-
Email Address Confirmed
+Thanks {{ .username -}}! Your email address {{- .email -}} has been confirmed.
+
Suspended Instances
-- The following list of domains have been suspended by the administrator(s) of this server. -
-- All current and future accounts on these instances are blocked, and no more data is federated to the remote - servers. - This extends to subdomains, so an entry for 'example.com' includes 'social.example.com' as well. -
-
-
-
-
- {{range .blocklist}}
- Domain
- Public comment
-
-
- {{end}}
- Suspended Instances
++ The following list of domains have been suspended + by the administrator(s) of this server. +
++ All current and future accounts on these instances are + blocked, and no more data is federated to the remote servers. + This extends to subdomains, so an entry for 'example.com' + includes 'social.example.com' as well. +
+
+
+
+
+ {{- range .blocklist }}
+ Domain
+ Public comment
+
+
+ {{- end }}
+
+ {{- .Domain -}}
+
+
+
+ {{- .PublicComment -}}
+An error occured:
-{{.error}}
- {{if .requestID}}
-
- Request ID:
- {{end}}
- {{.requestID}}
- An error occured:
+{{- .error -}}
+ {{- if .requestID }}
+
+ Request ID:
+ {{- end }}
+ {{- .requestID -}}
+