Merge pull request #197 from colkito/feature/import-backups

Feature/import backups
This commit is contained in:
Matias Alejo Garcia 2014-04-26 11:31:58 -03:00
commit d08d0aa875
6 changed files with 73 additions and 13 deletions

View file

@ -154,7 +154,7 @@
<div ng-show="wallets.length">
<a ng-click="create()" ng-disabled="loading" loading="Creating">Create a new wallet</a>
</div>
<a class="right" ng-click="import()">Import from file</a>
<a class="right" ng-href="#import">Import from file</a>
</div>
</div>
@ -163,6 +163,16 @@
</div>
</script>
<script type="text/ng-template" id="import.html">
<div ng-controller="ImportController">
<h3>{{title}}</h3>
<div class="large-6 columns">
<input type="file" class="form-control" placeholder="Select a backup file" ng-model="backupFile" autofocus="" ng-file-select>
</div>
</div>
</script>
<script type="text/ng-template" id="setup.html">
<div ng-controller="SetupController">
<div data-alert class="alert-box info round" ng-show="loading">
@ -535,6 +545,7 @@
<script src="js/controllers/backup.js"></script>
<script src="js/controllers/signin.js"></script>
<script src="js/controllers/setup.js"></script>
<script src="js/controllers/import.js"></script>
<script src="js/init.js"></script>
</body>