diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json old mode 100644 new mode 100755 index 8d896d69160..c6961b4e618 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -125,7 +125,7 @@ "message": "Account" }, "changeMasterPassword": { - "message": "Change Master Password" + "message": "The modification of your password must be done from your Cozy. Do you want to open it now ?" }, "fingerprintPhrase": { "message": "Fingerprint Phrase", @@ -302,6 +302,9 @@ "rateExtensionDesc": { "message": "Please consider helping us out with a good review!" }, + "connectedCozy": { + "message": "Connected to:" + }, "browserNotSupportClipboard": { "message": "Your web browser does not support easy clipboard copying. Copy it manually instead." }, @@ -458,7 +461,7 @@ "message": "Change Master Password" }, "changeMasterPasswordConfirmation": { - "message": "You can change your master password on the bitwarden.com web vault. Do you want to visit the website now?" + "message": "To change your password, you need to go on your Cozy. Do you want to visit the website now?" }, "twoStepLoginConfirmation": { "message": "Two-step login makes your account more secure by requiring you to verify your login with another device such as a security key, authenticator app, SMS, phone call, or email. Two-step login can be enabled on the bitwarden.com web vault. Do you want to visit the website now?" diff --git a/src/_locales/fr/messages.json b/src/_locales/fr/messages.json old mode 100644 new mode 100755 index b12f6818275..f2c268949bf --- a/src/_locales/fr/messages.json +++ b/src/_locales/fr/messages.json @@ -125,7 +125,7 @@ "message": "Compte" }, "changeMasterPassword": { - "message": "Changer le mot de passe maître" + "message": "Changer le mot de passe mon Cozy" }, "fingerprintPhrase": { "message": "Phrase d'empreinte", @@ -299,6 +299,9 @@ "rateExtensionDesc": { "message": "Merci de nous aider en mettant une bonne note !" }, + "connectedCozy": { + "message": "Connecté à :" + }, "browserNotSupportClipboard": { "message": "Votre navigateur web ne supporte pas la copie facilitée du presse-papier. Copiez-le manuellement à la place." }, @@ -455,7 +458,7 @@ "message": "Modifier le mot de passe maître" }, "changeMasterPasswordConfirmation": { - "message": "Vous pouvez modifier votre mot de passe maître depuis le coffre web sur bitwarden.com. Souhaitez-vous visiter le site maintenant ?" + "message": "Modifier votre mot de passe doit se faire directement depuis votre Cozy. Voulez vous l'ouvrir maintenant ?" }, "editedFolder": { "message": "Dossier modifié" diff --git a/src/popup/scss/box.scss b/src/popup/scss/box.scss index 0158818c934..ad26b63c8cb 100755 --- a/src/popup/scss/box.scss +++ b/src/popup/scss/box.scss @@ -9,6 +9,11 @@ margin-top: 0; } + &.box-uri { // snap the box-ui to the previous block + margin-top: -11px; + z-index: 1; + } + .box-header { margin: 15px 10px 5px 10px; display: flex; @@ -59,6 +64,10 @@ @include themify($themes) { color: themed('mutedColor'); } + &.in-flex-row-full-width { + flex : 0 0 100%; + margin: 5px 0; + } } &.list { @@ -251,6 +260,12 @@ //word-break: break-all; } + &.box-content-row-multi-wrap { + display: flex; + flex-wrap: wrap; + align-items: center; + } + &.options-row label:first-child { @include themify($themes) { color: themed('textColor'); diff --git a/src/popup/services/cozyClient.service.ts b/src/popup/services/cozyClient.service.ts old mode 100644 new mode 100755 index 8add5ebeb52..9a709993494 --- a/src/popup/services/cozyClient.service.ts +++ b/src/popup/services/cozyClient.service.ts @@ -72,6 +72,7 @@ export class CozyClientService { } getAppURL(appName: string, hash: string) { + if (!appName) return (new URL(this.getCozyURL())).toString(); const url = new URL(this.getCozyURL()); const hostParts = url.host.split('.'); url.host = [ diff --git a/src/popup/settings/settings.component.html b/src/popup/settings/settings.component.html index 6f0369d681a..cbcc332184c 100755 --- a/src/popup/settings/settings.component.html +++ b/src/popup/settings/settings.component.html @@ -43,18 +43,25 @@
-
+
+ + + + + + +
{{'premiumMembership' | i18n}}
{{'changeMasterPassword' | i18n}}
 - -->
{{'logOut' | i18n}}
@@ -94,15 +101,13 @@
{{'helpFeedback' | i18n}}
 -
-
{{'rateExtensionDesc' | i18n}}
+
{{'connectedCozy' | i18n}} {{getCozyURL()}}
diff --git a/src/popup/settings/settings.component.ts b/src/popup/settings/settings.component.ts old mode 100644 new mode 100755 index 2b2f0873f1c..aaf716c936e --- a/src/popup/settings/settings.component.ts +++ b/src/popup/settings/settings.component.ts @@ -182,15 +182,19 @@ export class SettingsComponent implements OnInit { // TODO: redirect to the Cozy settings async changePassword() { - this.analytics.eventTrack.next({ action: 'Clicked Change Password' }); + this.analytics.eventTrack.next({ action: 'Clicked Change Password' }); const confirmed = await this.platformUtilsService.showDialog( this.i18nService.t('changeMasterPasswordConfirmation'), this.i18nService.t('changeMasterPassword'), this.i18nService.t('yes'), this.i18nService.t('cancel')); if (confirmed) { - BrowserApi.createNewTab('https://help.bitwarden.com/article/change-your-master-password/'); + BrowserApi.createNewTab(this.cozyClientService.getAppURL('settings', '/profile/password')); } } + getCozyURL() { + return this.cozyClientService.getAppURL('', ''); + } + // TODO: Add a Cozy help import() { const url = this.cozyClientService.getAppURL('passwords', '/installation/import'); diff --git a/src/popup/vault/add-edit.component.html b/src/popup/vault/add-edit.component.html index 33ee326a023..cf5c916ff0c 100755 --- a/src/popup/vault/add-edit.component.html +++ b/src/popup/vault/add-edit.component.html @@ -198,7 +198,7 @@ -
+
-
+