mirror of https://github.com/BTCPrivate/copay.git
Fix layout on Safari when click on sidebar and then on send
This commit is contained in:
parent
e0ccb14ab5
commit
f329284210
|
@ -1,10 +1,10 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
angular.module('copayApp.controllers').controller('JoinController',
|
angular.module('copayApp.controllers').controller('JoinController',
|
||||||
function($scope, $rootScope, $timeout, controllerUtils, notification) {
|
function($scope, $rootScope, $timeout, isMobile, controllerUtils, notification) {
|
||||||
$rootScope.fromSetup = false;
|
$rootScope.fromSetup = false;
|
||||||
$scope.loading = false;
|
$scope.loading = false;
|
||||||
$scope.isMobile = !!window.cordova;
|
$scope.isMobile = isMobile.any();
|
||||||
$rootScope.title = 'Join shared wallet';
|
$rootScope.title = 'Join shared wallet';
|
||||||
|
|
||||||
// QR code Scanner
|
// QR code Scanner
|
||||||
|
|
|
@ -0,0 +1,15 @@
|
||||||
|
<div class="text-centered">
|
||||||
|
<canvas id="qr-canvas" width="200" height="150"></canvas>
|
||||||
|
<div ng-show="isMobile">
|
||||||
|
<div id="file-input-wrapper" class="btn btn-primary">
|
||||||
|
<span class="pull-left text-centered">
|
||||||
|
<i class="glyphicon glyphicon-refresh icon-rotate"></i>
|
||||||
|
<span translate>Get QR code</span>
|
||||||
|
</span>
|
||||||
|
<input id="qrcode-camera" type="file" capture="camera" accept="image/*">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div ng-hide="isMobile">
|
||||||
|
<video id="qrcode-scanner-video" width="300" height="225" ng-hide="isMobile"></video>
|
||||||
|
</div>
|
||||||
|
</div>
|
|
@ -36,7 +36,7 @@
|
||||||
|
|
||||||
|
|
||||||
<div class="pr">
|
<div class="pr">
|
||||||
<input id="connectionId" type="text" class="columns" placeholder="{{'Paste wallet secret here'|translate}}" name="connectionId" ng-model="connectionId" wallet-secret required auto-focus>
|
<input id="connectionId" type="text" class="columns" placeholder="{{'Paste wallet secret here'|translate}}" name="connectionId" ng-model="connectionId" wallet-secret required>
|
||||||
<div ng-hide="showScanner || disableScanner">
|
<div ng-hide="showScanner || disableScanner">
|
||||||
<a class="postfix button black" ng-click="openScanner()"><i class="fi-camera"> </i></a>
|
<a class="postfix button black" ng-click="openScanner()"><i class="fi-camera"> </i></a>
|
||||||
</div>
|
</div>
|
||||||
|
@ -45,23 +45,11 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="scanner" class="row" ng-if="showScanner">
|
<div id="scanner"
|
||||||
<div class="text-centered">
|
class="row"
|
||||||
<canvas id="qr-canvas" width="200" height="150"></canvas>
|
ng-if="showScanner"
|
||||||
<div ng-show="isMobile">
|
ng-include="'views/includes/scanner.html'"></div>
|
||||||
<div id="file-input-wrapper" class="btn btn-primary">
|
|
||||||
<span class="pull-left text-centered">
|
|
||||||
<i class="glyphicon glyphicon-refresh icon-rotate"></i>
|
|
||||||
<span translate>Get QR code</span>
|
|
||||||
</span>
|
|
||||||
<input id="qrcode-camera" type="file" capture="camera" accept="image/*">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div ng-hide="isMobile">
|
|
||||||
<video id="qrcode-scanner-video" width="300" height="225" ng-hide="isMobile"></video>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="line-dashed-h"></div>
|
<div class="line-dashed-h"></div>
|
||||||
|
|
|
@ -16,10 +16,11 @@
|
||||||
<h1 class="hide-for-large-up">{{$root.title}}</h1>
|
<h1 class="hide-for-large-up">{{$root.title}}</h1>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="large-12 columns">
|
<div class="large-12 columns">
|
||||||
|
<form name="sendForm" ng-submit="submitForm(sendForm)" novalidate>
|
||||||
<div class="panel">
|
<div class="panel">
|
||||||
<form name="sendForm" ng-submit="submitForm(sendForm)" novalidate>
|
|
||||||
<p class="text-warning size-16"
|
<p class="text-warning size-16"
|
||||||
ng-show="error">
|
ng-show="error">
|
||||||
<i class="fi-alert"></i>
|
<i class="fi-alert"></i>
|
||||||
|
@ -31,8 +32,6 @@
|
||||||
{{success|translate}}
|
{{success|translate}}
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<div class="row collapse">
|
<div class="row collapse">
|
||||||
<label for="address" class="left">
|
<label for="address" class="left">
|
||||||
<span translate>To</span>
|
<span translate>To</span>
|
||||||
|
@ -61,23 +60,11 @@
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
<div id="scanner"
|
||||||
<div id="scanner" ng-if="showScanner">
|
class="row"
|
||||||
<div class="text-centered">
|
ng-if="showScanner"
|
||||||
<canvas id="qr-canvas" width="200" height="150"></canvas>
|
ng-include="'views/includes/scanner.html'"></div>
|
||||||
<div ng-show="isMobile">
|
|
||||||
<div id="file-input-wrapper" class="btn btn-primary">
|
|
||||||
<span class="pull-left text-centered">
|
|
||||||
<i class="glyphicon glyphicon-refresh icon-rotate"></i>
|
|
||||||
<span translate>Get QR code</span>
|
|
||||||
</span>
|
|
||||||
<input id="qrcode-camera" type="file" capture="camera" accept="image/*">
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div ng-hide="isMobile">
|
|
||||||
<video id="qrcode-scanner-video" width="300" height="225" ng-hide="isMobile"></video>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row">
|
<div class="row">
|
||||||
|
@ -188,10 +175,11 @@
|
||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</div>
|
||||||
</div>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div><!-- end of row -->
|
</div><!-- end of row -->
|
||||||
|
|
||||||
<div class="row m20b" ng-show="$root.alternativeConversionRate > 0">
|
<div class="row m20b" ng-show="$root.alternativeConversionRate > 0">
|
||||||
<div class="large-12 columns size-12">
|
<div class="large-12 columns size-12">
|
||||||
<i class="fi-bitcoin-circle"></i>
|
<i class="fi-bitcoin-circle"></i>
|
||||||
|
|
Loading…
Reference in New Issue