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

fix index

Browse source
This commit is contained in:
Matias Alejo Garcia 2016-08-19 14:38:28 -03:00
commit c340c78ded
No known key found for this signature in database
GPG key ID: 02470DB551277AB3
3 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
public/views/backup.html
View file

@ -162,7 +162,7 @@
translate>Finish translate>Finish
</button> </button>
<!-- hide this in multisig just to show less text --> <!-- hide this in multisig just to show less text -->
<div class="row m20t" ng-show="index.n==1"> <div class="row m20t" ng-show="n==1">
<div class="columns size-10 text-gray"> <div class="columns size-10 text-gray">
<div class="p10t line-t"> <div class="p10t line-t">
<span translate>You can safely install your wallet on another device and use it from multiple devices at the same time.</span> <span translate>You can safely install your wallet on another device and use it from multiple devices at the same time.</span>
@ -182,7 +182,7 @@
<p class="text-gray columns" translate> <p class="text-gray columns" translate>
Failed to verify backup. Please check your information Failed to verify backup. Please check your information
</p> </p>
<div class="columns size-10 text-gray extra-padding-bottom" ng-show="index.n==1"> <div class="columns size-10 text-gray extra-padding-bottom" ng-show="n==1">
<div class="p10t line-t"> <div class="p10t line-t">
<span translate>You can safely install your wallet on another device and use it from multiple devices at the same time.</span> <span translate>You can safely install your wallet on another device and use it from multiple devices at the same time.</span>
<a href="#" ng-click="$root.openExternalLink('https://github.com/bitpay/copay/blob/master/README.md#copay-backups-and-recovery')" translate> <a href="#" ng-click="$root.openExternalLink('https://github.com/bitpay/copay/blob/master/README.md#copay-backups-and-recovery')" translate>

42
public/views/buyAndSell.html
View file

@ -1,20 +1,24 @@
<div <ion-view>
class="topbar-container" <ion-nav-bar class="bar-stable">
ng-include="'views/includes/topbar.html'" <ion-nav-buttons side="primary">
ng-init="titleSection='Buy and Sell'; closeToHome = true; noColor = true"> <button class="button no-border" ui-sref="tabs.home">
</div> Back
</button>
</ion-nav-buttons>
<ion-nav-title translate>Buy and sell</ion-nav-title>
</ion-nav-bar>
<ion-content>
<ion-list>
<ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="glidera">
<img src="img/glidera-logo.png" width="150">
<i class="icon ion-chevron-right icon-accessory"></i>
</ion-item>
<ion-item class="item-remove-animate item-icon-right" type="item-text-wrap" ui-sref="coinbase">
<img src="img/coinbase-logo.png" width="150">
<i class="icon ion-chevron-right icon-accessory"></i>
</ion-item>
<div class="content">
<ul class="no-bullet manage text-center"> </ion-list>
<li class="white m20t" ng-show="index.glideraEnabled"> </ion-content>
<a href ui-sref="glidera"> </ion-view>
<img src="img/glidera-logo.png" width="150">
</a>
</li>
<li class="white m20t" ng-show="index.coinbaseEnabled">
<a href ui-sref="coinbase">
<img src="img/coinbase-logo.png" width="150">
</a>
</li>
</ul>
</div>

2
src/js/controllers/backup.js
View file

@ -6,6 +6,8 @@ angular.module('copayApp.controllers').controller('backupController',
var wallet = profileService.getWallet($stateParams.walletId); var wallet = profileService.getWallet($stateParams.walletId);
$scope.customWords = []; $scope.customWords = [];
$scope.walletName = wallet.credentials.walletName; $scope.walletName = wallet.credentials.walletName;
$scope.n = wallet.n;
$scope.credentialsEncrypted = wallet.isPrivKeyEncrypted; $scope.credentialsEncrypted = wallet.isPrivKeyEncrypted;
$scope.init = function() { $scope.init = function() {