-
+
- Display name
-
{account.display_name.trim().length > 0 ? account.display_name : account.username}
@@ -82,7 +82,7 @@ export function Status({ status }: { status: StatusType }) {
function StatusHeader({ status }: { status: StatusType }) {
const author = status.account;
-
+
return (
@@ -99,7 +99,7 @@ function StatusHeader({ status }: { status: StatusType }) { alt={`Avatar for ${author.username}`} title={`Avatar for ${author.username}`} /> - +{author.display_name} , @{author.acct} @@ -130,7 +130,7 @@ function StatusBody({ status }: { status: StatusType }) { className="spoiler-text" lang={status.language} > - { status.spoiler_text + {status.spoiler_text ? status.spoiler_text + " " : "[no content warning set] " } @@ -146,7 +146,7 @@ function StatusBody({ status }: { status: StatusType }) {diff --git a/web/source/settings/style.css b/web/source/settings/style.css index ecfe5910a..78e57c0c7 100644 --- a/web/source/settings/style.css +++ b/web/source/settings/style.css @@ -916,7 +916,7 @@ button.tab-button { border-bottom-left-radius: 0; border-bottom-right-radius: 0; box-shadow: none; - background: $blue1; + background: $blue2; &:hover { background: $button-hover-bg; diff --git a/web/template/about.tmpl b/web/template/about.tmpl index 37d115256..0d45d561d 100644 --- a/web/template/about.tmpl +++ b/web/template/about.tmpl @@ -42,7 +42,7 @@ {{- end }} {{- else }} -@@ -170,7 +170,7 @@ function StatusMedia({ status }: { status: StatusType }) { role="group" aria-label={aria_label} > - { status.media_attachments.map((media) => { + {status.media_attachments.map((media) => { return ( Published No preferred languages have yet been set for this instance.
+No preferred languages have yet been set for this instance.
{{- end }} {{- end -}} @@ -60,7 +60,8 @@ {{- end -}} {{- define "customCSSLimits" -}} -Custom CSS is +Custom CSS is {{- if .instance.Configuration.Accounts.AllowCustomCSS -}} enabled {{- else -}} @@ -82,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
+{{- if .instance.ContactAccount }} --
+
+ @{{- .instance.ContactAccount.Username -}} {{- else }} @@ -131,9 +132,9 @@ Polls can have up to {{- end }}- Instance Features
-++ -Instance Features
+- {{- template "statusLimits" . -}}
- {{- template "pollLimits" . -}} @@ -141,34 +142,34 @@ Polls can have up to
- Languages
-++ {{- include "index_register.tmpl" . | indent 1 }} -Languages
+{{- with . }} {{- include "languages" . | indent 3 }} {{- end }}- Instance Rules
-++ -Instance Rules
+{{- with . }} {{- include "rules" . | indent 3 }} {{- end }}- Terms and Conditions
-++ -Terms and Conditions
+{{- with . }} {{- include "termsAndConditions" . | indent 3 }} {{- end }}- Moderated servers
-++ -{{- end }} +{{- end }} \ No newline at end of file diff --git a/web/template/email_new_report.tmpl b/web/template/email_new_report.tmpl index af98579c4..538d019a6 100644 --- a/web/template/email_new_report.tmpl +++ b/web/template/email_new_report.tmpl @@ -23,4 +23,4 @@ Hello moderator of {{ .InstanceName }} ({{ .InstanceURL }})! {{- else if .ReportTargetDomain }}Someone from your instance has reported a user from {{ .ReportTargetDomain }}. {{- else }}Someone from your instance has reported another user from your instance.{{ end }} -To view the report, paste the following link into your browser: {{ .ReportURL }} +To view the report, paste the following link into your browser: {{ .ReportURL }} \ No newline at end of file diff --git a/web/template/finalize.tmpl b/web/template/finalize.tmpl index 861dc635f..383eb72d4 100644 --- a/web/template/finalize.tmpl +++ b/web/template/finalize.tmpl @@ -31,19 +31,14 @@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. @@ -176,8 +177,10 @@ Polls can have up to 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. +
- 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.
@@ -190,4 +193,4 @@ Polls can have up to
- + value="{{- .preferredUsername -}}">diff --git a/web/template/index.tmpl b/web/template/index.tmpl index 358bc081e..420ad4a8e 100644 --- a/web/template/index.tmpl +++ b/web/template/index.tmpl @@ -26,10 +26,10 @@ {{- end -}} {{- with . }} -- - About this instance
-++ + About this instance
+{{- include "shortDescription" . | indent 3 }} See more detailsdiff --git a/web/template/index_apps.tmpl b/web/template/index_apps.tmpl index 19a474692..8580b3983 100644 --- a/web/template/index_apps.tmpl +++ b/web/template/index_apps.tmpl @@ -18,11 +18,11 @@ */ -}} {{- with . }} -- Client applications
-++ Client applications
+diff --git a/web/template/index_register.tmpl b/web/template/index_register.tmpl index 38a00f47b..e51da948d 100644 --- a/web/template/index_register.tmpl +++ b/web/template/index_register.tmpl @@ -20,19 +20,20 @@ {{- define "registrationLimits" -}} New account registration is currently {{- if .instance.Registrations -}} - open. +open. {{- else -}} - closed. +closed. {{- end -}} {{- end -}} {{- with . }} -- Have an account on this instance and want to log in? + Have an account on this instance and want to log in? GoToSocial does not provide its own webclient, but implements the Mastodon client API. You can use a variety of clients to log in to your account here:
@@ -30,87 +30,51 @@- -
- -
+ title="The Tusky mascot, a cartoon elephant tooting happily" width="100" height="100" />
- -
+ title="The Feditext logo, the characters 'ft' at a slight angle" width="100" height="100" />
- -
+ title="The Mastodon logo, the character 'M' in a speech bubble" width="100" height="100" />
- Register an Account on {{ .instance.Title -}}
-++ Register an Account on {{ .instance.Title -}}
+{{- template "registrationLimits" . -}}
{{- if .instance.Registrations }} -To register a new account, please first read the rules and terms.
+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.
{{- end }} diff --git a/web/template/index_what_is_this.tmpl b/web/template/index_what_is_this.tmpl index 32ca6ed2f..15a17aab2 100644 --- a/web/template/index_what_is_this.tmpl +++ b/web/template/index_what_is_this.tmpl @@ -18,34 +18,24 @@ */ -}} {{- with . }} -- What is this?
-++ What is this?
+The web page you're reading right now is served by an instance of GoToSocial, a federated, distributed, open-source microblogging software which connects to other instances across a network known as the "fediverse".
-What is an "instance"?
+What is an "instance"?
"Instance" is a term commonly used for one node in the fediverse. Each instance has its own web address, user(s), culture, rules, and settings. Instances exchange data by "talking" to each other over the internet using a protocol called ActivityPub.
- -
+
+
Learn more about ActivityPub (opens in a new tab).
@@ -55,7 +45,7 @@
There are thousands of fediverse instances, connecting millions of people together.
-How do I join the fediverse?
+How do I join the fediverse?
You can join the fediverse by running your own instance of an ActivityPub software, or by finding an existing instance that aligns with your values and expectations, @@ -65,8 +55,10 @@ To help you find an instance that suits you, you can try one of the following tools:
-
-
- Fediverse Observer (opens in a new tab) -
- FediDB (opens in a new tab) +
- Fediverse + Observer (opens in a new tab) +
- FediDB (opens in + a new tab)
Or, just register for an account on this instance!
diff --git a/web/template/page.tmpl b/web/template/page.tmpl index d2edc5277..0bf33addd 100644 --- a/web/template/page.tmpl +++ b/web/template/page.tmpl @@ -22,7 +22,7 @@ If some if/else macro is used multiple times, declare it once here instead. When invoking these nested templates, remember to pass in the values passed to the executing template, ie., use '{{ template "example" . }}' not - '{{ template "example" }}', otherwise you'll end up with empty variables. +'{{ template "example" }}', otherwise you'll end up with empty variables. */ -}} {{- define "thumbnailType" -}} @@ -43,43 +43,47 @@ image/webp - - - - - - {{- if .ogMeta }} - {{- include "page_ogmeta.tmpl" . | indent 2 }} - {{- else }} - {{- end }} - {{- if .rssFeed }} - - {{- else }} - {{- end }} - {{- if .account }} - - {{- else if .status }} - - {{- else }} - {{- end }} - - - - {{- include "page_stylesheets.tmpl" . | indent 2 }} - {{- range .javascript }} - - {{- end }} -{{- template "instanceTitle" . -}} - - -- {{- include "page_header.tmpl" . | indent 3 }} - -- {{- include .pageContent . | indent 3 | outdentPre }} -- - + + + + + + + {{- if .ogMeta }} + {{- include "page_ogmeta.tmpl" . | indent 2 }} + {{- else }} + {{- end }} + {{- if .rssFeed }} + + {{- else }} + {{- end }} + {{- if .account }} + + {{- else if .status }} + + {{- else }} + {{- end }} + + + + {{- include "page_stylesheets.tmpl" . | indent 2 }} + {{- range .javascript }} + + {{- end }} +{{- template "instanceTitle" . -}} + + + ++ {{- include "page_header.tmpl" . | indent 3 }} + ++ {{- include .pageContent . | indent 3 | outdentPre }} ++ + + \ No newline at end of file diff --git a/web/template/page_footer.tmpl b/web/template/page_footer.tmpl index a00f4dfde..c4ef8a99d 100644 --- a/web/template/page_footer.tmpl +++ b/web/template/page_footer.tmpl @@ -21,43 +21,29 @@