Fixes: url handler

This commit is contained in:
Gustavo Maximiliano Cortez 2014-08-04 11:27:46 -03:00
parent 3ab1510051
commit ee031849b2
10 changed files with 57 additions and 23 deletions

View File

@ -1123,4 +1123,10 @@ a.text-white:hover {color: #ccc;}
}
}
.wide-page {
background-color: #2C3E50;
margin: 10% 0;
padding: 50px;
}
/*-----------------------------------------------------------------*/

View File

@ -1,7 +1,11 @@
'use strict';
angular.module('copayApp.controllers').controller('HomeController',
function($scope, $rootScope, walletFactory, notification) {
function($scope, $rootScope, $location, walletFactory, notification) {
if ($rootScope.wallet) {
$location.path('/addresses');
}
$scope.loading = false;
if ($rootScope.pendingPayment) {
notification.info('Login Required', 'Please open wallet to complete payment');

View File

@ -1,7 +1,11 @@
'use strict';
angular.module('copayApp.controllers').controller('ImportController',
function($scope, $rootScope, walletFactory, controllerUtils, Passphrase, notification) {
function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase, notification) {
if ($rootScope.wallet) {
$location.path('/addresses');
}
$scope.title = 'Import a backup';
$scope.importStatus = 'Importing wallet - Reading backup...';

View File

@ -1,7 +1,11 @@
'use strict';
angular.module('copayApp.controllers').controller('JoinController',
function($scope, $rootScope, $timeout, walletFactory, controllerUtils, Passphrase, notification) {
function($scope, $rootScope, $timeout, $location, walletFactory, controllerUtils, Passphrase, notification) {
if ($rootScope.wallet) {
$location.path('/addresses');
}
$scope.loading = false;
// QR code Scanner

View File

@ -1,7 +1,11 @@
'use strict';
angular.module('copayApp.controllers').controller('OpenController',
function($scope, $rootScope, walletFactory, controllerUtils, Passphrase, notification) {
function($scope, $rootScope, $location, walletFactory, controllerUtils, Passphrase, notification) {
if ($rootScope.wallet) {
$location.path('/addresses');
}
var cmp = function(o1, o2) {
var v1 = o1.show.toLowerCase(),
v2 = o2.show.toLowerCase();

View File

@ -2,6 +2,10 @@
angular.module('copayApp.controllers').controller('SettingsController',
function($scope, $rootScope, $window, $location) {
if ($rootScope.wallet) {
$location.path('/addresses');
}
$scope.title = 'Settings';
$scope.networkName = config.networkName;
$scope.insightHost = config.blockchain.host;

View File

@ -34,6 +34,9 @@ var valid_pairs = {
angular.module('copayApp.controllers').controller('SetupController',
function($scope, $rootScope, $location, $timeout, walletFactory, controllerUtils, Passphrase, backupService, notification) {
if ($rootScope.wallet) {
$location.path('/addresses');
}
$rootScope.videoInfo = {};
$scope.loading = false;

View File

@ -1,7 +1,9 @@
<div class="text-center logo-setup">
<img src="img/logo-negative-beta.svg" alt="Copay">
<div class="wide-page">
<div class="text-center">
<img src="img/logo-negative-beta.svg" alt="Copay">
</div>
<h1 class="text-center text-white">404</h1>
<h3 class="text-center text-white">Page not found</h3>
<p class="text-center"><a href="#!/">go back...</a></p>
</div>
<h1 class="text-center text-white">404</h1>
<h3 class="text-center">Page not found</h3>
<p class="text-center"><a href="#!/">go back...</a></p>

View File

@ -1,14 +1,17 @@
<div class="text-center logo-setup">
<img src="img/logo-negative-beta.svg" alt="Copay">
</div>
<h1 class="text-center text-white">Browser unsupported</h1>
<h3 class="text-center">
Copay uses webRTC for peer-to-peer communications,
but your browser does not support it.
Please use
a current version of Google Chrome, Mozilla Firefox, or Opera.
<br><br>
<div class="wide-page">
<div class="text-center">
<img src="img/logo-negative-beta.svg" alt="Copay">
</div>
<h1 class="text-center text-white">Browser unsupported</h1>
<h3 class="text-center text-white">
Copay uses webRTC for peer-to-peer communications,
but your browser does not support it.
Please use
a current version of Google Chrome, Mozilla Firefox, or Opera.
<br><br>
For more information
on supported browsers please check <a href="http://www.webrtc.org/">http://www.webrtc.org/</a>
</h3>
</div>
For more information
on supported browsers please check <a href="http://www.webrtc.org/">http://www.webrtc.org/</a>
</h3>

View File

@ -1,4 +1,4 @@
<h3 class="text-center">
<h3 class="text-center text-white">
Preparing payment...
</h3>
<div data-ng-init="" data-ng-controller="UriPaymentController">