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

Merge pull request #1102 from yemel/fix/ui-issues

Browse source 
Fix/ui issues
This commit is contained in:
Matias Alejo Garcia 2014-08-15 16:30:40 -04:00
commit 6b0782f3a0
8 changed files with 22 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
css/main.css
View file

@ -925,6 +925,18 @@ button, .button, p {
margin-left: 0; margin-left: 0;
} }
.addresses .list-addr i {
position: absolute;
top: -25px;
left: 6px;
cursor: pointer;
}
.addresses .list-addr contact {
margin-left: 42px;
cursor: text;
}
.pointer { .pointer {
cursor: pointer; cursor: pointer;
} }

1
js/controllers/join.js
View file

@ -5,6 +5,7 @@ angular.module('copayApp.controllers').controller('JoinController',
controllerUtils.redirIfLogged(); controllerUtils.redirIfLogged();
$rootScope.fromSetup = false; $rootScope.fromSetup = false;
$scope.loading = false; $scope.loading = false;
$scope.isMobile = !!window.cordova;
// QR code Scanner // QR code Scanner
var cameraInput; var cameraInput;

1
js/controllers/open.js
View file

@ -14,6 +14,7 @@ angular.module('copayApp.controllers').controller('OpenController',
$scope.wallets = walletFactory.getWallets().sort(cmp); $scope.wallets = walletFactory.getWallets().sort(cmp);
$scope.selectedWalletId = walletFactory.storage.getLastOpened() || ($scope.wallets[0] && $scope.wallets[0].id); $scope.selectedWalletId = walletFactory.storage.getLastOpened() || ($scope.wallets[0] && $scope.wallets[0].id);
$scope.openPassword = ''; $scope.openPassword = '';
$scope.isMobile = !!window.cordova;
$scope.open = function(form) { $scope.open = function(form) {
if (form && form.$invalid) { if (form && form.$invalid) {

1
js/controllers/setup.js
View file

@ -40,6 +40,7 @@ angular.module('copayApp.controllers').controller('SetupController',
$rootScope.videoInfo = {}; $rootScope.videoInfo = {};
$scope.loading = false; $scope.loading = false;
$scope.walletPassword = $rootScope.walletPassword; $scope.walletPassword = $rootScope.walletPassword;
$scope.isMobile = !!window.cordova;
// ng-repeat defined number of times instead of repeating over array? // ng-repeat defined number of times instead of repeating over array?
$scope.getNumber = function(num) { $scope.getNumber = function(num) {

BIN
mobile/res/drawable/screen.9.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

6
views/addresses.html
View file

@ -10,9 +10,9 @@
<ul> <ul>
<li class="panel radius oh" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll"> <li class="panel radius oh" ng-repeat="addr in addresses|removeEmpty|limitAddress:showAll">
<div class="large-8 small-6 column" ng-click="openAddressModal(addr)"> <div class="large-8 small-6 column">
<div class="ellipsis"> <div class="ellipsis list-addr">
<i class="fi-thumbnails">&nbsp;</i> <i class="fi-thumbnails size-48" ng-click="openAddressModal(addr)">&nbsp;</i>
<span><contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/></span> <span><contact address="{{addr.address}}" tooltip-popup-delay="500" tooltip tooltip-placement="right"/></span>
<small ng-if="addr.isChange">change</small> <small ng-if="addr.isChange">change</small>
</div> </div>

2
views/copayers.html
View file

@ -8,7 +8,7 @@
<div class="large-8 columns line-dashed-setup-v"> <div class="large-8 columns line-dashed-setup-v">
<div class="box-setup oh"> <div class="box-setup oh">
<div ng-if="!$root.wallet.publicKeyRing.isComplete()"> <div ng-if="!$root.wallet.publicKeyRing.isComplete()">
<img ng-if="$root.fromSetup" class="right m15t" src="../img/step-3.svg" alt="Step 3"> <img ng-if="$root.fromSetup && !isMobile" class="right m15t" src="img/step-3.svg" alt="Step 3">
<h1 class="text-primary line-sidebar-b">Waiting copayers</h1> <h1 class="text-primary line-sidebar-b">Waiting copayers</h1>
<h3>Share this secret with your other copayers</h3> <h3>Share this secret with your other copayers</h3>
<div class="panel"> <div class="panel">

6
views/setup.html
View file

@ -12,8 +12,8 @@
</div> </div>
<div class="large-8 columns line-dashed-setup-v"> <div class="large-8 columns line-dashed-setup-v">
<div class="box-setup oh"> <div class="box-setup oh">
<img ng-if="!isSetupWalletPage" class="right m15t" src="../img/step-1.svg" alt="Step 1"> <img ng-if="!isSetupWalletPage && !isMobile" class="right m15t" src="img/step-1.svg" alt="Step 1">
<img ng-if="isSetupWalletPage" class="right m15t" src="../img/step-2.svg" alt="Step 2"> <img ng-if="isSetupWalletPage && !isMobile" class="right m15t" src="img/step-2.svg" alt="Step 2">
<h1 class="text-secondary line-sidebar-b">Create new wallet</h1> <h1 class="text-secondary line-sidebar-b">Create new wallet</h1>
<label ng-show="!isSetupWalletPage">Wallet name <label ng-show="!isSetupWalletPage">Wallet name
<input type="text" placeholder="Family vacation funds" class="form-control" ng-model="walletName"> <input type="text" placeholder="Family vacation funds" class="form-control" ng-model="walletName">
@ -54,7 +54,7 @@
</div> </div>
<div class="large-6 medium-6 columns"> <div class="large-6 medium-6 columns">
<label>Select required signatures (*) <label>Select required signatures (*)
<select ng-model="requiredCopayers" ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues"> <select ng-model="requiredCopayers" ng-options="requiredCopayers as requiredCopayers for requiredCopayers in RCValues" ng-disabled="totalCopayers == 1">
</select> </select>
</label> </label>
</div> </div>