mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-09-20 15:04:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

adjust design of auth for recovery key

Browse Source
This commit is contained in:
Armin Schrenk
2022-06-27 17:21:45 +02:00
parent 35c5bd03de
commit 07cfef2e41
2 changed files with 34 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/resources/fxml/recoverykey_create.fxml
+32 -10
View File
@@ -7,25 +7,47 @@
<?import javafx.scene.control.ButtonBar?> <?import javafx.scene.control.ButtonBar?>
<?import javafx.scene.layout.HBox?> <?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<VBox xmlns:fx="http://javafx.com/fxml" <?import javafx.scene.Group?>
<?import javafx.scene.layout.StackPane?>
<?import javafx.scene.shape.Circle?>
<?import org.cryptomator.ui.controls.FontAwesome5IconView?>
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.Region?>
<HBox xmlns:fx="http://javafx.com/fxml"
xmlns="http://javafx.com/javafx" xmlns="http://javafx.com/javafx"
fx:controller="org.cryptomator.ui.recoverykey.RecoveryKeyCreationController" fx:controller="org.cryptomator.ui.recoverykey.RecoveryKeyCreationController"
minWidth="400" minWidth="400"
maxWidth="400" maxWidth="400"
minHeight="145" minHeight="175"
spacing="12" spacing="12"
alignment="TOP_CENTER"> alignment="TOP_LEFT">
<padding> <padding>
<Insets topRightBottomLeft="12"/> <Insets topRightBottomLeft="12"/>
</padding> </padding>
<children> <children>
<VBox spacing="6"> <Group>
<FormattedLabel format="%recoveryKey.enterPassword.prompt" arg1="${controller.vault.displayName}" wrapText="true"/> <StackPane>
<padding>
<Insets topRightBottomLeft="6"/>
</padding>
<Circle styleClass="glyph-icon-primary" radius="24"/>
<FontAwesome5IconView styleClass="glyph-icon-white" glyph="LOCK" glyphSize="24"/>
</StackPane>
</Group>
<VBox HBox.hgrow="ALWAYS">
<Label styleClass="label-large" text="%recoveryKey.create.title" wrapText="true" textAlignment="LEFT">
<padding>
<Insets bottom="6" top="6"/>
</padding>
</Label>
<FormattedLabel format="%recoveryKey.enterPassword.prompt" arg1="${controller.vault.displayName}" wrapText="true">
<padding>
<Insets bottom="6"/>
</padding>
</FormattedLabel>
<NiceSecurePasswordField fx:id="passwordField" HBox.hgrow="ALWAYS"/> <NiceSecurePasswordField fx:id="passwordField" HBox.hgrow="ALWAYS"/>
</VBox> <Region VBox.vgrow="ALWAYS" minHeight="18"/>
<ButtonBar buttonMinWidth="120" buttonOrder="+CX">
<VBox alignment="BOTTOM_CENTER" VBox.vgrow="ALWAYS">
<ButtonBar buttonMinWidth="120" buttonOrder="C+X">
<buttons> <buttons>
<Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close"/> <Button text="%generic.button.cancel" ButtonBar.buttonData="CANCEL_CLOSE" cancelButton="true" onAction="#close"/>
<Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#createRecoveryKey" disable="${passwordField.text.empty}"/> <Button text="%generic.button.next" ButtonBar.buttonData="NEXT_FORWARD" defaultButton="true" onAction="#createRecoveryKey" disable="${passwordField.text.empty}"/>
@@ -33,4 +55,4 @@
</ButtonBar> </ButtonBar>
</VBox> </VBox>
</children> </children>
</VBox> </HBox>
src/main/resources/i18n/strings.properties
+2 -1
View File
@@ -361,7 +361,8 @@ vaultOptions.masterkey.recoverPasswordBtn=Recover Password
# Recovery Key # Recovery Key
recoveryKey.title=Recovery Key recoveryKey.title=Recovery Key
recoveryKey.enterPassword.prompt=Enter your password to show the recovery key for "%s": recoveryKey.create.title=Password required
recoveryKey.enterPassword.prompt=Enter the password for "%s" to show its recovery key.
recoveryKey.display.message=The following recovery key can be used to restore access to "%s": recoveryKey.display.message=The following recovery key can be used to restore access to "%s":
recoveryKey.display.StorageHints=Keep it somewhere very secure, e.g.:\n • Store it using a password manager\n • Save it on a USB flash drive\n • Print it on paper recoveryKey.display.StorageHints=Keep it somewhere very secure, e.g.:\n • Store it using a password manager\n • Save it on a USB flash drive\n • Print it on paper
recoveryKey.recover.prompt=Enter your recovery key for "%s": recoveryKey.recover.prompt=Enter your recovery key for "%s":