BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix modals, copayer list

This commit is contained in:
Gustavo Maximiliano Cortez 2015-05-13 10:56:08 -03:00
parent ffcd4b98ac
commit c24cee303d
No known key found for this signature in database
GPG Key ID: 15EDAD8D9F2EB1AF
6 changed files with 24 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
public/views/modals/tx-details.html
View File

@ -67,7 +67,7 @@
</li> </li>
</ul> </ul>
<div ng-if="btx.actions[0]"> <div ng-if="btx.actions[0] && isShared">
<h4 class="title m0" translate>Signatures</h4> <h4 class="title m0" translate>Signatures</h4>
<ul class="no-bullet size-14 m0"> <ul class="no-bullet size-14 m0">
<li class="line-b p10 text-gray" ng-repeat="c in btx.actions"> <li class="line-b p10 text-gray" ng-repeat="c in btx.actions">
@ -75,7 +75,7 @@
<i ng-if="c.type == 'reject'" class="fi-x icon-sign x db"></i> <i ng-if="c.type == 'reject'" class="fi-x icon-sign x db"></i>
<i ng-if="c.type == 'accept'" class="fi-check icon-sign check db"></i> <i ng-if="c.type == 'accept'" class="fi-check icon-sign check db"></i>
</span> </span>
<span>{{c.copayerName}}</span> {{c.copayerName}} <span ng-if="c.copayerId == copayerId">({{'Me'|translate}})</span>
</li> </li>
</ul> </ul>
</div> </div>

2
public/views/modals/txp-details.html
View File

@ -70,7 +70,7 @@
<ul class="no-bullet size-14 m0"> <ul class="no-bullet size-14 m0">
<li class="line-b p10 text-gray" ng-repeat="ac in tx.actions"> <li class="line-b p10 text-gray" ng-repeat="ac in tx.actions">
<i class="icon-contact size-24"></i> <i class="icon-contact size-24"></i>
<span>{{ac.copayerName}}</span> {{ac.copayerName}} <span ng-if="ac.copayerId == copayerId">({{'Me'|translate}})</span>
<span class="right"> <span class="right">
<i ng-if="ac.type == 'reject'" class="fi-x icon-sign x db"></i> <i ng-if="ac.type == 'reject'" class="fi-x icon-sign x db"></i>
<i ng-if="ac.type == 'accept'" class="fi-check icon-sign check db"></i> <i ng-if="ac.type == 'accept'" class="fi-check icon-sign check db"></i>

2
public/views/preferencesAbout.html
View File

@ -28,7 +28,7 @@
<h4 class="title m0">&nbsp;</h4> <h4 class="title m0">&nbsp;</h4>
<li class="line-b p20" ng-conf ng-click="$root.go('logs')"> <li class="line-b p20" ng-conf ng-click="$root.go('logs')">
<span translate>View session logs</span> <span translate>Session logs</span>
<span class="right text-gray"> <span class="right text-gray">
<i class="icon-arrow-right3 size-24 right text-gray"></i> <i class="icon-arrow-right3 size-24 right text-gray"></i>
</span> </span>

2
public/views/preferencesLogs.html
View File

@ -1,7 +1,7 @@
<div <div
class="topbar-container" class="topbar-container"
ng-include="'views/includes/topbar.html'" ng-include="'views/includes/topbar.html'"
ng-init="titleSection='Logs'; goBackToState = 'about'"> ng-init="titleSection='Session logs'; goBackToState = 'about'">
</div> </div>

24
public/views/walletHome.html
View File

@ -106,14 +106,22 @@
<span class="show-for-medium-up" translate>Preferences</span> <span class="show-for-medium-up" translate>Preferences</span>
</a> </a>
</div> </div>
<div class="wallet-info" ng-click="openCopayersModal(index.copayers, index.copayerId)"> <div class="wallet-info">
<p class="m0"> <div ng-show="index.isShared" ng-click="openCopayersModal(index.copayers, index.copayerId)">
{{index.m}} <span translate>of</span> {{index.n}} <p class="m0">
</p> {{index.m}} <span translate>of</span> {{index.n}}
<div class="size-12 text-gray"> </p>
<span ng-if="index.n > 1" translate>Multisignature wallet </span> <div class="size-12 text-gray">
<span ng-if="index.n == 1" translate>Personal Wallet</span> <span translate>Multisignature wallet</span> <span ng-if="index.network != 'livenet'">- Testnet</span>
<span ng-if="index.network != 'livenet'"> - Testnet</span> </div>
</div>
<div ng-show="!index.isShared">
<p class="m0">
{{index.m}} <span translate>of</span> {{index.n}}
</p>
<div class="size-12 text-gray">
<span translate>Personal Wallet</span> <span ng-if="index.network != 'livenet'">- Testnet</span>
</div>
</div> </div>
</div> </div>
</div> </div>

3
src/js/controllers/walletHome.js
View File

@ -131,6 +131,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.amountStr = tx.amountStr; $scope.amountStr = tx.amountStr;
$scope.alternativeAmountStr = tx.alternativeAmountStr; $scope.alternativeAmountStr = tx.alternativeAmountStr;
$scope.copayers = copayers $scope.copayers = copayers
$scope.copayerId = fc.credentials.copayerId;
$scope.loading = null; $scope.loading = null;
$scope.color = fc.backgroundColor; $scope.color = fc.backgroundColor;
@ -840,6 +841,8 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi
$scope.btx = btx; $scope.btx = btx;
$scope.settings = config; $scope.settings = config;
$scope.color = fc.backgroundColor; $scope.color = fc.backgroundColor;
$scope.copayerId = fc.credentials.copayerId;
$scope.isShared = fc.credentials.n > 1;
$scope.getAmount = function(amount) { $scope.getAmount = function(amount) {
return self.getAmount(amount); return self.getAmount(amount);