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

Merge pull request #120 from JDonadio/fix/terms-of-use

Browse source 
Fix disclaimer link and overflow text
This commit is contained in:
Gustavo Maximiliano Cortez 2016-09-15 10:10:31 -03:00 • committed by GitHub
commit bb96f45488
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
public/views/modals/terms.html
View file

@ -7,14 +7,12 @@
</button>
</ion-nav-buttons>
</ion-nav-bar>
<ion-content class="has-header">
<div ng-include="'views/includes/terms.html'"></div>
<div class="padding-vertical" ng-show="lang != 'en'">
<a ng-click="openExternalLink(disclaimerUrl)" translate>Official English Disclaimer</a>
</div>
<ion-content class="has-header" scroll="false">
<ion-scroll ng-include="'views/includes/terms.html'" ng-style="{'height': '60%'}"></ion-scroll>
<div id="agree-to-terms">
<a ng-click="openExternalLink('https://copay.io/disclaimer')" ng-show="lang != 'en'" translate>Official English Disclaimer</a>
<ion-checkbox ng-model="terms.accept3"></ion-checkbox>
<p translate>I have read, understood, and agree with the <a ui-sref="onboarding.terms">Terms of use</a>.</p>
<p translate>I have read, understood, and agree with the Terms of use.</p>
<button ng-disabled="!terms.accept3" class="button button-block button-positive" ng-click="termsModal.hide(); confirm()" translate>Confirm & Finish</button>
</div>
</ion-content>

7
src/js/controllers/onboarding/disclaimer.js
View file

@ -1,8 +1,9 @@
'use strict';
angular.module('copayApp.controllers').controller('disclaimerController', function($scope, $timeout, $state, $log, $ionicModal, profileService) {
angular.module('copayApp.controllers').controller('disclaimerController', function($scope, $timeout, $state, $log, $ionicModal, profileService, uxLanguage, externalLinkService) {
$scope.init = function() {
$scope.lang = uxLanguage.currentLanguage;
$scope.terms = {};
$scope.accept1 = $scope.accept2 = $scope.accept3 = false;
$timeout(function() {
@ -19,6 +20,10 @@ angular.module('copayApp.controllers').controller('disclaimerController', functi
});
};
$scope.openExternalLink = function(url, target) {
externalLinkService.open(url, target);
};
$scope.openTermsModal = function() {
$ionicModal.fromTemplateUrl('views/modals/terms.html', {
scope: $scope

3
src/sass/views/onboarding/terms-of-use.scss
View file

@ -17,7 +17,8 @@
#agree-to-terms {
background: #fff;
padding: 1rem;
position: relative;
position: absolute;
bottom: 0;
.checkbox input:before,
.checkbox .checkbox-icon:before {
border-radius: 50% !important;