1
0
mirror of https://github.com/bitwarden/web synced 2026-01-01 16:13:15 +00:00

Update 2017-05-03T14:30:05.647Z

This commit is contained in:
Kyle Spearrin
2017-05-03 10:30:11 -04:00
parent 2d7f83905b
commit db7ff13f2e
52 changed files with 5931 additions and 1296 deletions

View File

@@ -7,24 +7,17 @@
<section class="content">
<div class="box box-default">
<div class="box-header with-border">
<h3 class="box-title">Import</h3>
<h3 class="box-title">Import/Export</h3>
</div>
<div class="box-body">
Quickly import your logins and other data from a previous bitwarden export or from another
password manager application.
<p>
Quickly import your logins and other data from a previous export or from another
password management application.
</p>
<p>You can also export all of your vault data in <code>.csv</code> format.</p>
</div>
<div class="box-footer">
<button class="btn btn-default btn-flat" type="button" ng-click="import()">Import Data</button>
</div>
</div>
<div class="box box-default">
<div class="box-header with-border">
<h3 class="box-title">Export</h3>
</div>
<div class="box-body">
Export all of your vault data in <code>.csv</code> format.
</div>
<div class="box-footer">
<button class="btn btn-default btn-flat" type="button" ng-click="export()">Export Data</button>
</div>
</div>
@@ -36,12 +29,4 @@
Password generator is currently available in all other client applications. Coming soon to the web vault!
</div>
</div>
<div class="box box-default">
<div class="box-header with-border">
<h3 class="box-title">Audits</h3>
</div>
<div class="box-body">
Coming soon!
</div>
</div>
</section>

View File

@@ -1,10 +0,0 @@
<div class="modal-header">
<button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="auditsModelLabel"><i class="fa fa-search"></i> Audits</h4>
</div>
<div class="modal-body">
Coming soon...
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default btn-flat" ng-click="close()">Close</button>
</div>

View File

@@ -2,21 +2,33 @@
<button type="button" class="close" ng-click="close()" aria-label="Close"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="importModelLabel"><i class="fa fa-cloud-upload"></i> Import</h4>
</div>
<form name="importForm" ng-submit="importForm.$valid && import(model)" ng-show="!processing">
<form name="importForm" ng-submit="importForm.$valid && import(model, importForm)" ng-show="!processing">
<div class="modal-body">
<div class="callout callout-danger validation-errors" ng-show="importForm.$errors">
<h4>Errors have occured</h4>
<ul>
<li ng-repeat="e in importForm.$errors">{{e}}</li>
</ul>
</div>
<div class="form-group">
<label for="source">1. Select the source of this import file</label>
<select id="source" name="source" class="form-control" ng-model="model.source" ng-change="setSource()">
<label for="source">1. Select the format of the import file</label>
<select id="source" name="source" class="form-control" ng-model="model.source" ng-change="setSource()" required>
<option value="">-- Select --</option>
<option ng-repeat="option in options" value="{{option.id}}">{{option.name}}</option>
</select>
</div>
<div class="callout callout-default">
<div class="callout callout-default" ng-show="model.source">
<h4><i class="fa fa-info-circle"></i> {{source.name}} Instructions</h4>
<div ng-bind-html="source.instructions"></div>
</div>
<div class="form-group">
<label for="file">2. Select the import file</label>
<input type="file" id="file" name="file" required />
<input type="file" id="file" name="file" />
</div>
<div class="form-group">
<label for="fileContents">or copy/paste the import file contents</label>
<textarea id="fileContents" class="form-control" name="fileContents" ng-model="model.fileContents"
style="height: 150px;"></textarea>
</div>
</div>
<div class="modal-footer">