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

do not hice create/join forms with working / no color on global pages

Browse source
This commit is contained in:
Matias Alejo Garcia 2015-04-27 03:03:08 -03:00
commit 2f7f593ad6
5 changed files with 19 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
public/views/create.html
View file

@ -14,7 +14,7 @@
</div> </div>
<form name="setupForm" ng-submit="create.create(setupForm)" ng-show="!create.loading" novalidate> <form name="setupForm" ng-submit="create.create(setupForm)" novalidate>
<div class="row"> <div class="row">
<div class="large-12 columns"> <div class="large-12 columns">
<div class="box-notification" ng-show="create.error"> <div class="box-notification" ng-show="create.error">

2
public/views/includes/topbar.html
View file

@ -19,7 +19,7 @@
</section> </section>
<section class="middle tab-bar-section"> <section class="middle tab-bar-section">
<h1 class="title ellipsis" ng-style="{'color':index.backgroundColor}"> <h1 class="title ellipsis" ng-style="{'color': noColor ? '#4B6178' : index.backgroundColor}">
{{(titleSection|translate) || index.walletName}} {{(titleSection|translate) || index.walletName}}
</h1> </h1>
</section> </section>

2
public/views/join.html
View file

@ -12,7 +12,7 @@
</div> </div>
</div> </div>
<div class="row" ng-show="!join.loading"> <div class="row">
<div class="large-12 columns"> <div class="large-12 columns">
<div class="box-notification" ng-show="join.error "> <div class="box-notification" ng-show="join.error ">

4
src/js/controllers/join.js
View file

@ -151,7 +151,9 @@ angular.module('copayApp.controllers').controller('joinController',
$rootScope.$apply(); $rootScope.$apply();
return return
} }
go.walletHome(); $timeout(function() {
go.walletHome();
}, 2000);
}); });
}, 100); }, 100);
} }

19
src/js/routes.js
View file

@ -98,6 +98,7 @@ angular
templateUrl: 'views/createProfile.html', templateUrl: 'views/createProfile.html',
controller: function($scope) { controller: function($scope) {
$scope.mainDark = true; $scope.mainDark = true;
$scope.noColor = true;
} }
} }
} }
@ -122,6 +123,7 @@ angular
templateUrl: 'views/includes/topbar.html', templateUrl: 'views/includes/topbar.html',
controller: function($scope) { controller: function($scope) {
$scope.goBackToState = 'walletHome'; $scope.goBackToState = 'walletHome';
$scope.noColor = true;
} }
} }
}, },
@ -144,6 +146,7 @@ angular
controller: function($scope) { controller: function($scope) {
$scope.titleSection = 'Join shared wallet'; $scope.titleSection = 'Join shared wallet';
$scope.goBackToState = 'add'; $scope.goBackToState = 'add';
$scope.noColor = true;
} }
} }
} }
@ -160,6 +163,7 @@ angular
controller: function($scope) { controller: function($scope) {
$scope.titleSection = 'Import wallet'; $scope.titleSection = 'Import wallet';
$scope.goBackToState = 'add'; $scope.goBackToState = 'add';
$scope.noColor = true;
} }
} }
} }
@ -181,6 +185,7 @@ angular
controller: function($scope) { controller: function($scope) {
$scope.titleSection = 'Import legacy wallet'; $scope.titleSection = 'Import legacy wallet';
$scope.goBackToState = 'add'; $scope.goBackToState = 'add';
$scope.noColor = true;
} }
} }
} }
@ -199,6 +204,7 @@ angular
controller: function($scope) { controller: function($scope) {
$scope.titleSection = 'Create new wallet'; $scope.titleSection = 'Create new wallet';
$scope.goBackToState = 'add'; $scope.goBackToState = 'add';
$scope.noColor = true;
} }
} }
} }
@ -215,12 +221,6 @@ angular
} }
} }
}) })
.state('profile', {
url: '/profile',
controller: 'profileController',
templateUrl: 'views/profile.html',
needProfile: true
})
.state('preferences', { .state('preferences', {
url: '/preferences', url: '/preferences',
templateUrl: 'views/preferences.html', templateUrl: 'views/preferences.html',
@ -252,6 +252,7 @@ angular
controller: function($scope) { controller: function($scope) {
$scope.titleSection = 'Language'; $scope.titleSection = 'Language';
$scope.goBackToState = 'preferences'; $scope.goBackToState = 'preferences';
$scope.noColor = true;
} }
} }
} }
@ -270,6 +271,7 @@ angular
controller: function($scope) { controller: function($scope) {
$scope.titleSection = 'Unit'; $scope.titleSection = 'Unit';
$scope.goBackToState = 'preferences'; $scope.goBackToState = 'preferences';
$scope.noColor = true;
} }
} }
} }
@ -307,6 +309,7 @@ angular
controller: function($scope) { controller: function($scope) {
$scope.titleSection = 'Alternative Currency'; $scope.titleSection = 'Alternative Currency';
$scope.goBackToState = 'preferences'; $scope.goBackToState = 'preferences';
$scope.noColor = true;
} }
} }
} }
@ -325,6 +328,7 @@ angular
controller: function($scope) { controller: function($scope) {
$scope.titleSection = 'Bitcore Wallet Service'; $scope.titleSection = 'Bitcore Wallet Service';
$scope.goBackToState = 'preferences'; $scope.goBackToState = 'preferences';
$scope.noColor = true;
} }
} }
} }
@ -361,6 +365,7 @@ angular
controller: function($scope) { controller: function($scope) {
$scope.titleSection = 'About'; $scope.titleSection = 'About';
$scope.goBackToState = 'preferences'; $scope.goBackToState = 'preferences';
$scope.noColor = true;
} }
} }
} }
@ -379,6 +384,7 @@ angular
controller: function($scope) { controller: function($scope) {
$scope.titleSection = 'Logs'; $scope.titleSection = 'Logs';
$scope.goBackToState = 'about'; $scope.goBackToState = 'about';
$scope.noColor = true;
} }
} }
} }
@ -426,6 +432,7 @@ angular
controller: function($scope) { controller: function($scope) {
$scope.titleSection = 'Add wallet'; $scope.titleSection = 'Add wallet';
$scope.closeToHome = true; $scope.closeToHome = true;
$scope.noColor = true;
} }
} }
} }