Merge branch 'ssbc:master' into master

planetary-social · Sep 11, 2022 · 4cf603d · 4cf603d
2 parents f2eb61f + c16fceb
commit 4cf603d
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 11 deletions.
diff --git a/web/assets/style.css b/web/assets/style.css
diff --git a/web/handlers/admin/members_test.go b/web/handlers/admin/members_test.go
@@ -112,12 +112,12 @@ func TestMembersAdd(t *testing.T) {
 	}
 	checkInputsAreDisabled(false)
 
-	// verify that inputs are disabled for RoleMember
+	// verify that inputs are enabled for RoleMember
 	ts.User = roomdb.Member{
 		ID:   7331,
 		Role: roomdb.RoleMember,
 	}
-	checkInputsAreDisabled(true)
+	checkInputsAreDisabled(false)
 }
 
 func TestMembersDontAddInvalid(t *testing.T) {

diff --git a/web/i18n/defaults/active.de.toml b/web/i18n/defaults/active.de.toml
@@ -30,7 +30,7 @@ NavAdminInvites = "Einladungen"
 NavAdminNotices = "Hinweise"
 
 # Error messages
-ErrorAuthBadLogin = "Die angegebenen Authentifizierungsdaten (Benutzername oder Passwort) sind falsch."
+ErrorAuthBadLogin = "Die angegebenen Authentifizierungsdaten (SSB-ID oder Passwort) sind falsch."
 ErrorNotFound = "Die Datenbank konnte den betreffenden Artikel nicht finden."
 ErrorAlreadyAdded = "Der öffentliche Schlüssel <strong> {{.Key}} </ strong> ist bereits in der Liste enthalten."
 ErrorPageNotFound = "Die angeforderte Seite <strong> ({{.Path}}) </ strong> ist nicht vorhanden."
@@ -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
 ##################

diff --git a/web/i18n/defaults/active.en.toml b/web/i18n/defaults/active.en.toml
@@ -33,7 +33,7 @@ NavAdminInvites = "Invites"
 NavAdminNotices = "Notices"
 
 # Error messages
-ErrorAuthBadLogin = "The supplied authentication credentials (username or password) are incorrect."
+ErrorAuthBadLogin = "The supplied authentication credentials (SSB-ID or password) are incorrect."
 ErrorNotFound = "The database couldn't find the item in question."
 ErrorAlreadyAdded = "The SSB-ID <strong>{{.Key}}</strong> already is on the list"
 ErrorPageNotFound = "The requested page <strong>({{.Path}})</strong> is not there."
@@ -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
 ##################

diff --git a/web/templates/admin/member-list.tmpl b/web/templates/admin/member-list.tmpl
@@ -23,19 +23,16 @@ SPDX-License-Identifier: CC-BY-4.0
     <label class="block mt-6 mb-1 text-sm text-gray-500">{{ i18n "AdminAddNewMemberTitle" }}</label>
     <div id="add-member-input-container" class="flex flex-row items-center justify-start mb-6">
       <input
-        {{ if member_is_elevated }} {{ else }} disabled {{ end }}
         type="text"
         name="pub_key"
         placeholder="{{i18n "PubKeyRefPlaceholder"}}"
-        class="w-8/12 self-stretch shadow rounded border border-transparent h-10 p-1 pl-4 font-mono truncate 
+        class="w-8/12 self-stretch shadow rounded border border-transparent h-10 p-1 pl-4 font-mono truncate
         text-purple-600 focus:outline-none focus:ring-2 focus:ring-purple-400 focus:border-transparent
-        {{ if member_is_elevated }} {{ else }} shadow ring-1 ring-gray-300 opacity-50 bg-gray-200 cursor-not-allowed {{ end }}
         ">
       <button
-        {{ if member_is_elevated }} {{ else }} disabled {{ end }}
         type="submit"
         class="ml-4 h-10 shadow rounded px-6 text-purple-600 ring-1 bg-white focus:outline-none focus:ring-2 focus:ring-purple-400
-        {{ if member_is_elevated }} ring-purple-400 hover:bg-purple-600 hover:text-gray-100 {{ else }} opacity-50 ring-purple-300 bg-purple-200 cursor-not-allowed {{ end }}
+        ring-purple-400 hover:bg-purple-600 hover:text-gray-100
         "
         >{{i18n "AdminMembersAdd"}}</button>
     </div>

diff --git a/web/templates/invite/consumed.tmpl b/web/templates/invite/consumed.tmpl
@@ -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}}