bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-20 10:13:31 +00:00
Code Issues Releases Wiki Activity

callout component

Browse Source
This commit is contained in:
Kyle Spearrin
2018-06-25 20:49:49 -04:00
parent 1717960a8c
commit 03dfda7a17
11 changed files with 86 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/tools/export.component.html
View File

@@ -3,10 +3,7 @@
<h1>{{'exportVault' | i18n}}</h1>
</div>
<p>{{'exportMasterPassword' | i18n}}</p>
<div class="callout callout-warning" role="alert">
<h3 class="callout-heading">{{'warning' | i18n}}</h3>
<p class="mb-0">{{'exportWarning' | i18n}}</p>
</div>
<app-callout type="warning">{{'exportWarning' | i18n}}</app-callout>
<div class="row">
<div class="form-group col-6">
<label for="masterPassword">{{'masterPass' | i18n}}</label>

35
src/app/tools/import.component.html
View File

@@ -14,25 +14,22 @@
</div>
</div>
</div>
<div class="callout callout-info" role="alert" *ngIf="format">
<h3 class="callout-heading">{{'instructionsFor' | i18n : getFormatName()}}</h3>
<p class="mb-0">
<ng-container *ngIf="format === 'bitwardencsv'">
See detailed instructions on our help site at
<a target="_blank" href="https://help.bitwarden.com/article/export-your-data/">https://help.bitwarden.com/article/export-your-data/</a>
</ng-container>
<ng-container *ngIf="format === 'lastpasscsv'">
See detailed instructions on our help site at
<a target="_blank" href="https://help.bitwarden.com/article/import-from-lastpass/">https://help.bitwarden.com/article/import-from-lastpass/</a>
</ng-container>
<ng-container *ngIf="format === 'keepassxcsv'">
Using the KeePassX desktop application, navigate to "Database" &rarr; "Export to CSV file" and save the CSV file.
</ng-container>
<ng-container *ngIf="format === 'aviracsv'">
In the Avira web vault, go to "Settings" &rarr; "My Data" &rarr; "Export data" and save the CSV file.
</ng-container>
</p>
</div>
<app-callout type="info" title="{{getFormatInstructionTitle()}}" *ngIf="format">
<ng-container *ngIf="format === 'bitwardencsv'">
See detailed instructions on our help site at
<a target="_blank" href="https://help.bitwarden.com/article/export-your-data/">https://help.bitwarden.com/article/export-your-data/</a>
</ng-container>
<ng-container *ngIf="format === 'lastpasscsv'">
See detailed instructions on our help site at
<a target="_blank" href="https://help.bitwarden.com/article/import-from-lastpass/">https://help.bitwarden.com/article/import-from-lastpass/</a>
</ng-container>
<ng-container *ngIf="format === 'keepassxcsv'">
Using the KeePassX desktop application, navigate to "Database" &rarr; "Export to CSV file" and save the CSV file.
</ng-container>
<ng-container *ngIf="format === 'aviracsv'">
In the Avira web vault, go to "Settings" &rarr; "My Data" &rarr; "Export data" and save the CSV file.
</ng-container>
</app-callout>
<div class="row">
<div class="col-6">
<div class="form-group">

4
src/app/tools/import.component.ts
View File

@@ -165,14 +165,14 @@ export class ImportComponent {
}
}
getFormatName() {
getFormatInstructionTitle() {
if (this.format == null) {
return null;
}
const results = this.featuredImportOptions.concat(this.importOptions).filter((o) => o.id === this.format);
if (results.length > 0) {
return results[0].name;
return this.i18nService.t('instructionsFor', results[0].name);
}
return null;
}