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

Adds scan tab. Fix grunt ios

Browse source
This commit is contained in:
Gustavo Maximiliano Cortez 2016-08-17 15:23:17 -03:00
commit 70ba150e60
No known key found for this signature in database
GPG key ID: 15EDAD8D9F2EB1AF
14 changed files with 141 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

0
public/cordova.js vendored Normal file
View file

8
public/index.html
View file

@ -8,19 +8,17 @@
<meta name="format-detection" content="telephone=no">
<link rel="stylesheet" type="text/css" href="css/ionic.min.css">
<link rel="stylesheet" type="text/css" href="css/copay.css">
<title>{{index.appConfig.name}} - {{index.appConfig.description}}</title>
<title>{{index.appConfig.nameCase}} - {{index.appConfig.description}}</title>
<link rel="shortcut icon" href="img/favicon.ico">
</head>
<!-- <body ng&#45;cloak class="ng&#45;cloak"> -->
<body >
<body>
<ion-nav-view name="main"></ion-nav-view>
<script src="lib/ionic.bundle.min.js"></script>
<script src="lib/angular.js"></script>
<!-- DO NOT DELETE THIS COMMET -->
<!-- PLACEHOLDER: CORDOVA SRIPT -->
<script type="text/javascript" charset="utf-8" src="cordova.js"></script>
<script src="js/copay.js"></script>

47
public/views/disclaimer.html
View file

@ -1,34 +1,21 @@
<div class="splash extra-padding-bottom p20t content text-center"
ng-controller="disclaimerController as disclaimer" ng-init="disclaimer.init()">
<div class="row">
<div class="medium-centered small-centered large-centered columns size-14">
<span class="text-bold text-white" translate>WELCOME TO COPAY</span>
<p class="text-gray m0 text-light" translate>A multisignature bitcoin wallet</p>
</div>
</div>
<div class="row">
<div class="scrollArea">
<p class="enable_text_select m0">
<div class="size-14 text-gray" translate>Terms of Use</div>
<div ng-include="'views/includes/terms.html'"></div>
</p>
</div>
</div>
<ion-view>
<ion-content class="padding" ng-controller="disclaimerController" ng-init="init()">
<h1 translate>WELCOME TO COPAY</h1>
<h3 translate>A multisignature bitcoin wallet</h3>
<div class="row">
<p ng-show="disclaimer.lang != 'en'">
<a class="center" ng-click="$root.openExternalLink('https://copay.io/disclaimer')" translate>Official English Disclaimer</a>
</p>
</div>
<div>
<p class="text-gray columns size-12" translate>I affirm that I have read, understood, and agree with these terms.</p>
</div>
<div class="row">
<h4 translate>Terms of Use</h4>
<p ng-include="'views/includes/terms.html'"></p>
<div class="start-button columns button-box">
<button ng-click="disclaimer.accept()" class="button black expand round size-12 text-spacing m0" translate>
<div class="padding-vertical" ng-show="lang != 'en'">
<a ng-click="$root.openExternalLink('https://copay.io/disclaimer')" translate>Official English Disclaimer</a>
</div>
<p translate>I affirm that I have read, understood, and agree with these terms.</p>
<button ng-click="accept()" class="button button-block button-positive" translate>
I AGREE. GET STARTED
</button>
</div>
</div>
</div>
</ion-content>
</ion-view>

4
public/views/modals/scanner.html
View file

@ -1,4 +1,4 @@
<ion-modal-view ng-controller="scannerController">
<ion-modal-view>
<ion-header-bar align-title="center" class="tab-bar">
<div class="left-small">
<a ng-click="cancel()" class="p10">
@ -7,7 +7,7 @@
</div>
<h1 class="title ellipsis" translate>QR-Scanner</h1>
</ion-header-bar>
<ion-content class="modal-content text-center fix-modals-touch" ng-init="init()">
<ion-content ng-controller="tabScanController" ng-init="init()">
<canvas id="qr-canvas" width="200" height="150"></canvas>
<video id="qrcode-scanner-video" width="300" height="225"></video>
</ion-content>

11
public/views/tab-scan.html Normal file
View file

@ -0,0 +1,11 @@
<ion-view view-title="Scan" cache-view="false">
<ion-nav-bar class="bar-stable">
<ion-nav-title>Scan</ion-nav-title>
</ion-nav-bar>
<ion-content ng-controller="tabScanController" ng-init="init()">
<canvas id="qr-canvas" width="200" height="150"></canvas>
<video id="qrcode-scanner-video" width="300" height="225"></video>
</ion-content>
</ion-view>

4
public/views/tabs.html
View file

@ -14,7 +14,7 @@ navigation history that also transitions its views in and out.
</ion-tab>
<ion-tab title="Scan" icon-off="ion-ios-chatboxes-outline" icon-on="ion-ios-chatboxes" href="#/scan">
<ion-tab title="Scan" icon-off="ion-ios-camera-outline" icon-on="ion-ios-camera" href="#/tabs/scan">
<ion-nav-view name="tab-scan"></ion-nav-view>
</ion-tab>
@ -26,4 +26,4 @@ navigation history that also transitions its views in and out.
<ion-tab title="Settings" icon-off="ion-ios-gear-outline" icon-on="ion-ios-gear" href="#/tabs/settings">
<ion-nav-view name="tab-settings"></ion-nav-view>
</ion-tab>
</ion-tabs>
</ion-tabs>