anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fixes https://github.com/bitpay/copay/issues/2017

Browse source
This commit is contained in:
Matias Alejo Garcia 2014-12-06 17:54:02 -03:00
commit f13e71b045
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
js/controllers/createProfile.js
View file

@ -117,8 +117,8 @@ angular.module('copayApp.controllers').controller('CreateProfileController', fun
// mobile // mobile
if ($scope.isMobile) { if ($scope.isMobile) {
_credentials = { _credentials = {
email: form.email.$modelValue, email: emailOrUsername,
password: form.password.$modelValue, password: password,
}; };
$scope.askForPin = 1; $scope.askForPin = 1;
$rootScope.hideNavigation = true; $rootScope.hideNavigation = true;

4
js/controllers/settings.js
View file

@ -89,14 +89,14 @@ angular.module('copayApp.controllers').controller('SettingsController', function
}), }),
}, },
function() { function() {
notification.success('Settings saved'); notification.success('Settings saved',"Settings were saved");
$location.path('/'); $location.path('/');
}); });
}; };
$scope.reset = function() { $scope.reset = function() {
configService.reset(function() { configService.reset(function() {
notification.success('Settings reseted'); notification.success('Settings reseted',"Settings were reseted");
$location.path('/'); $location.path('/');
}); });
}; };

2
views/createProfile.html
View file

@ -20,7 +20,7 @@
</div> </div>
</div> </div>
<div class="large-4 large-centered medium-6 medium-centered columns m20b" ng-show="!loading && !askForPin"> <div class="large-5 large-centered medium-6 medium-centered columns m20b" ng-show="!loading && !askForPin">
<div class="logo-setup hide-for-small-only"> <div class="logo-setup hide-for-small-only">
<img src="img/logo-negative-beta.svg" alt="Copay" width="100"> <img src="img/logo-negative-beta.svg" alt="Copay" width="100">
<div ng-include="'views/includes/version.html'"></div> <div ng-include="'views/includes/version.html'"></div>

12
views/home.html
View file

@ -20,7 +20,7 @@
</div> </div>
</div> </div>
<div class="large-4 large-centered medium-7 medium-centered columns" ng-show="!$root.starting"> <div class="large-5 large-centered medium-7 medium-centered columns" ng-show="!$root.starting">
<div class="logo-setup" ng-show="!$root.iden"> <div class="logo-setup" ng-show="!$root.iden">
<img src="img/logo-negative-beta.svg" alt="Copay" width="100"> <img src="img/logo-negative-beta.svg" alt="Copay" width="100">
<div ng-include="'views/includes/version.html'"></div> <div ng-include="'views/includes/version.html'"></div>
@ -164,22 +164,22 @@
<div class="box-setup-footer"> <div class="box-setup-footer">
<div class="right"> <div class="right">
<a class="button-setup text-gray" ng-click="$root.go('#!/settings')"> <a class="button-setup text-gray" ng-click="$root.go('/settings')">
<i class="icon-wrench"></i> <i class="icon-wrench"></i>
<span translate>Settings</span> <span translate>Settings</span>
</a> </a>
</div> </div>
<div class="left m10r"> <div class="left m10r">
<a class="button-setup text-gray" ng-click="$root.go('#!/createProfile')"> <a class="button-setup text-gray" ng-click="$root.go('/createProfile')">
<i class="icon-person"></i> <i class="icon-person"></i>
<span translate>Create a profile</span> <span translate>Create profile</span>
</a> </a>
</div> </div>
<div class="left"> <div class="left">
<a class="button-setup text-gray" ng-click="$root.go('#!/importProfile')"> <a class="button-setup text-gray" ng-click="$root.go('/importProfile')">
<i class="icon-upload"></i> <i class="icon-upload"></i>
<span translate>Import a profile</span> <span translate>Import</span>
</a> </a>
</div> </div>
</div> </div>