Merge pull request #809 from maraoz/ui/settings-tab

change backup to settings tab
This commit is contained in:
Matias Alejo Garcia 2014-07-03 16:16:20 -03:00
commit 008199f4c0
4 changed files with 5 additions and 5 deletions

View File

@ -806,7 +806,7 @@
</div>
</div>
<div class="row text-center">
<div class="button radius warning small m30v" ng-really-message="Are you sure to delete this wallet from this computer?" ng-really-click="deleteWallet()">Delete this wallet from this computer</div>
<div class="button radius warning small m30v" ng-really-message="Are you sure to delete this wallet from this computer?" ng-really-click="deleteWallet()"><i class="fi-minus-circle large"></i> Delete this wallet from this computer</div>
</div>
</div>
</script>

View File

@ -2,7 +2,7 @@
angular.module('copayApp.controllers').controller('BackupController',
function($scope, $rootScope, $location, $window, $timeout, $modal, backupService, walletFactory, controllerUtils) {
$scope.title = 'Backup';
$scope.title = 'Settings';
$scope.download = function() {
backupService.download($rootScope.wallet);

View File

@ -15,8 +15,8 @@ angular.module('copayApp.controllers').controller('HeaderController',
'icon': 'fi-arrow-right',
'link': '#/send'
}, {
'title': 'Backup',
'icon': 'fi-archive',
'title': 'Settings',
'icon': 'fi-wrench',
'link': '#/backup'
}];

View File

@ -42,7 +42,7 @@ describe("Unit: Controllers", function() {
}));
it('Should have a Backup controller', function() {
expect(scope.title).equal('Backup');
expect(scope.title).equal('Settings');
});
it('Backup controller #download', function() {