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

Merge pull request #2317 from bechi/bugs/no-wallets

Browse source 
fix bugs when you don't have wallets
This commit is contained in:
Matias Alejo Garcia 2015-01-19 11:32:52 -03:00
commit 16b55d0272
9 changed files with 31 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

4
css/src/main.css
View file

@ -536,7 +536,7 @@ ul.tx-copayers {
a.button-setup {
border-radius: 3px;
border: 1px solid #E4E8EC;
border: 1px solid #ccc;
display: block;
padding: 0.5rem;
background: transparent;
@ -1335,7 +1335,7 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
.black {
background-color: #2C3E50;
}
.text-italic {font-style: italic;}
.text-light {font-weight: 100;}
.text-bold {font-weight: 700;}
.text-gray {color: #8597A7;}

9
css/src/mobile.css
View file

@ -94,10 +94,7 @@
}
header {
background-image: -webkit-linear-gradient(#2C3E50 0%, #1D2833 100%);
background-image: -o-linear-gradient(#2C3E50 0%, #1D2833 100%);
background-image: linear-gradient(#2C3E50 0%, #1D2833 100%);
box-shadow: 0px 1px 0px 0px #2C3E50, inset -1px 0px 0px 0px rgba(0,0,0,0.24);
background-color: #2C3E50;
height: 120px;
width: 100%;
line-height: 110%;
@ -200,8 +197,8 @@
padding: 0.66667rem 1rem;
color: #7A8C9E;
border-top: 1px solid rgba(255,255,255,0.25);
-moz-box-shadow: 0px -1px 0px 0px rgba(165,178,191,0.15);
box-shadow: 0px -1px 0px 0px rgba(165,178,191,0.15);
-moz-box-shadow: none;
box-shadow: none;
}
ul.off-canvas-list li a i {

4
js/controllers/homeWallet.js
View file

@ -1,8 +1,6 @@
'use strict';
angular.module('copayApp.controllers').controller('HomeWalletController', function($scope, $rootScope, $timeout, $filter, $modal, rateService, notification, txStatus, identityService, isMobile) {
$scope.isMobile = isMobile.any();
angular.module('copayApp.controllers').controller('HomeWalletController', function($scope, $rootScope, $timeout, $filter, $modal, rateService, notification, txStatus, identityService) {
$scope.openTxModal = function(tx) {
var ModalInstanceCtrl = function($scope, $modalInstance) {

2
js/services/identityService.js
View file

@ -298,7 +298,7 @@ angular.module('copayApp.services')
iden.on('noWallets', function() {
notification.warning('No Wallets', 'Your profile has no wallets. Create one here');
$rootScope.starting = false;
$location.path('/create');
$location.path('/add');
$timeout(function() {
$rootScope.$digest();
}, 1);

13
views/copayers.html
View file

@ -50,11 +50,11 @@
</div>
<!-- end of row -->
<div class="row">
<div class="large-12 columns size-12">
<button class="warning" ng-show="!confirmDelete" ng-click="confirmDelete=!confirmDelete">
<div class="large-12 columns">
<button class="small warning" ng-show="!confirmDelete" ng-click="confirmDelete=!confirmDelete">
<i class="fi-trash"></i> Cancel
</button>
<div ng-show="confirmDelete">
<div class="text-center" ng-show="confirmDelete">
<h2>Are you sure you want to cancel and delete this wallet</h2>
<div class="row">
<div class="large-6 medium-6 small-6 columns">
@ -63,12 +63,7 @@
</div>
<div class="large-6 medium-6 small-6 columns">
<button class="warning" ng-disabled="loading" ng-click="deleteWallet()">
<span ng-show="!loading">
<i class="fi-trash"></i> Yes
</span>
<span ng-show="loading">
<i class="fi-bitcoin-circle icon-rotate spinner"></i> Deleting...
</span>
<i class="fi-trash"></i> Yes
</button>
</div>
</div>

2
views/homeWallet.html
View file

@ -85,7 +85,7 @@
</div>
</div>
<div class="row" ng-show="isMobile">
<div class="row hide-for-large-up">
<div class="large-12 columns text-right size-12">
<a ng-click="$root.go('more')"><i class="fi-widget"></i> Settings</a>
</div>

28
views/includes/sidebar.html
View file

@ -1,17 +1,22 @@
<div ng-init="init()">
<header ng-show="$root.wallet">
<div class="col1">
<div class="avatar-wallet">{{$root.wallet.getName() | limitTo: 1}}</div>
<header>
<div class="left p15" ng-show="!$root.wallet">
<span class="db m5t text-italic">You have no wallets</span>
</div>
<div class="col2" ng-class="{'col2_full':!wallets.length}">
<div class="oh m5t m10r">
<div class="name-wallet">
<div class="ellipsis">{{$root.wallet.getName()}}</div>
</div>
<div class="size-12"> {{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} </div>
<div ng-show="$root.wallet">
<div class="col1">
<div class="avatar-wallet">{{$root.wallet.getName() | limitTo: 1}}</div>
</div>
<div class="col2" ng-class="{'col2_full':!wallets.length}">
<div class="oh m5t m10r">
<div class="name-wallet">
<div class="ellipsis">{{$root.wallet.getName()}}</div>
</div>
<div class="size-12"> {{$root.wallet.requiredCopayers}} of {{$root.wallet.totalCopayers}} </div>
</div>
</div>
</div>
<div class="col3" ng-if="wallets.length > 1">
<div class="col3">
<a ng-class="{'selected':walletSelection}"
ng-click="toggleWalletSelection()">
<span ng-show="!walletSelection">
@ -25,8 +30,9 @@
</header>
<div>
<ul class="side-nav wallets" ng-class="{'pullDown': walletSelection}" ng-show="wallets[0]">
<ul class="side-nav wallets" ng-class="{'pullDown': walletSelection}">
<li
ng-if="wallets[0]"
ng-repeat="item in wallets track by $index"
class="nav-item"
ng-if="item.id != $root.wallet.id"

7
views/more.html
View file

@ -115,12 +115,7 @@
</div>
<div class="large-6 medium-6 small-6 columns">
<button class="warning" ng-disabled="loading" ng-click="deleteWallet()">
<span ng-show="!loading">
<i class="fi-trash"></i> Delete
</span>
<span ng-show="loading">
<i class="fi-bitcoin-circle icon-rotate spinner"></i> Deleting...
</span>
<i class="fi-trash"></i> Delete
</button>
</div>
</div>

7
views/profile.html
View file

@ -81,12 +81,7 @@
</div>
<div class="large-6 medium-6 small-6 columns">
<button class="warning" ng-disabled="loading" ng-click="deleteProfile()">
<span ng-show="!loading">
<i class="fi-trash"></i> Delete
</span>
<span ng-show="loading">
<i class="fi-bitcoin-circle icon-rotate spinner"></i> Deleting...
</span>
<i class="fi-trash"></i> Delete
</button>
</div>
</div>