Skip to content

Commit

Permalink
fix: support password entry for /join-manually (#306)
Browse files Browse the repository at this point in the history
Closes #234.

Co-authored-by: decentral1se <cellarspoon@riseup.net>
  • Loading branch information
decentral1se and decentral1se committed Aug 22, 2022
1 parent 92681a9 commit 6aaea32
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 1 deletion.
2 changes: 2 additions & 0 deletions web/i18n/defaults/active.de.toml
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,8 @@ InviteInsertWelcome = "Du kannst mit deine SSB-ID eine Einladung anfordern. Dana

InviteConsumedTitle = "Einladung angenommen!"
InviteConsumedWelcome = "Du bist jetzt Mitglied dieses Raums. Wenn du eine Multiserver-Adresse benötigst, kannst du die folgende kopieren und einfügen: "
InviteConsumedSetPassword = "Du kannst jetzt ein Fallback-Passwort für Ihr Konto erstellen:"
InviteConsumedSetPasswordButton = "Passwort erstellen"

# alias resolution
##################
Expand Down
2 changes: 2 additions & 0 deletions web/i18n/defaults/active.en.toml
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,8 @@ InviteInsertWelcome = "You can claim your invite by inserting your SSB ID below.

InviteConsumedTitle = "Invite accepted!"
InviteConsumedWelcome = "You are now a member of this room. If you need a multiserver address to connect to the room, you can copy-paste the one below:"
InviteConsumedSetPassword = "You can now create an account fallback password:"
InviteConsumedSetPasswordButton = "Create password"

# alias resolution
##################
Expand Down
13 changes: 12 additions & 1 deletion web/templates/invite/consumed.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,16 @@ SPDX-License-Identifier: CC-BY-4.0
<span
class="bg-gray-200 py-1 px-2 mb-8 w-64 font-mono break-all"
>{{.MultiserverAddress}}</span>

<span
class="text-center"
>{{i18n "InviteConsumedSetPassword" }}<br /></span>

<span
class="w-64 my-6 text-center"
><a
class="self-start shadow rounded h-8 flex flex-row justify-center items-center text-gray-100 bg-pink-600 hover:bg-pink-700 focus:outline-none focus:ring-2 focus:ring-pink-600 focus:ring-opacity-50"
href="{{urlTo "members:change-password"}}"
>{{i18n "InviteConsumedSetPasswordButton" }}</a></span>
</div>
{{end}}
{{end}}

0 comments on commit 6aaea32

Please sign in to comment.