BTCPrivate
/
copay
mirror of https://github.com/BTCPrivate/copay.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Conflicts: 

css/main.css
	views/modals/qr-address.html
This commit is contained in:
Gustavo Maximiliano Cortez 2014-08-01 13:14:10 -03:00
parent 1cd1ad2ff8 85e78f2797
commit a3baab397c
9 changed files with 46 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser-extensions/include
View File

@ -3,8 +3,11 @@ font
img
js
sound
views
config.js
version.js
index.html
popup.html
lib/angular/angular-csp.css
lib/angular/angular.min.js.map
lib/angular-route/angular-route.min.js.map

6
css/main.css
View File

@ -1116,5 +1116,11 @@ a.text-white:hover {color: #ccc;}
.btn-copy.zeroclipboard-is-hover { color: #000; }
.btn-copy.zeroclipboard-is-active { opacity: 1; }
@media only screen and (min-width: 40.063em) {
dialog.tiny, .reveal-modal.tiny {
width: 50%;
margin-left: -25%;
}
}
/*-----------------------------------------------------------------*/

7
css/mobile.css
View File

@ -114,6 +114,13 @@
display: block;
float: none;
margin: 0 auto;
width: 210px;
height: 210px;
}
.panel qrcode canvas {
width: 200px;
height: 200px;
}
.btn-copy {

17
index.html
View File

@ -109,22 +109,7 @@
<script src="js/controllers/uriPayment.js"></script>
<!-- PLACEHOLDER: CORDOVA SRIPT -->
<script type="text/javascript" charset="utf-8">
document.addEventListener("deviceready", onDeviceReady, false);
function onDeviceReady() {
setTimeout(function(){ navigator.splashscreen.hide(); }, 2000);
document.addEventListener("menubutton", function() {
var nav = document.getElementsByTagName('nav')[0];
if (!nav) return;
var menu = nav.getElementsByTagName('section')[0].getElementsByTagName('a')[0];
if (menu.offsetParent) menu.click();
}, false);
}
</script>
<script src="js/mobile.js"></script>
<script src="js/init.js"></script>
</body>

16
js/mobile.js Normal file
View File

@ -0,0 +1,16 @@
'use strict';
document.addEventListener("deviceready", onDeviceReady, false);
function onDeviceReady() {
setTimeout(function(){ navigator.splashscreen.hide(); }, 2000);
document.addEventListener("menubutton", function() {
var nav = document.getElementsByTagName('nav')[0];
if (!nav) return;
var menu = nav.getElementsByTagName('section')[0].getElementsByTagName('a')[0];
if (menu.offsetParent) menu.click();
}, false);
}

3
js/services/uriHandler.js
View File

@ -6,7 +6,8 @@ UriHandler.prototype.register = function() {
var base = window.location.origin + '/';
var url = base + '#!/uri-payment/%s';
if(navigator.registerProtocolHandler) {
var isFirefox = navigator.userAgent.toLowerCase().indexOf('firefox') > -1;
if(navigator.registerProtocolHandler && !isFirefox) {
navigator.registerProtocolHandler('bitcoin', url, 'Copay');
}
};

4
popup.html
View File

@ -26,7 +26,7 @@
</style>
</head>
<body>
<a href="index.html#signin" target="_blank">Open wallet</a>
<a href="index.html#settings" target="_blank">Settings</a>
<a href="index.html" target="_blank">Open wallet</a>
<a href="index.html#!/settings" target="_blank">Settings</a>
</body>
</html>

1
views/join.html
View File

@ -46,6 +46,7 @@
</div>
</div>
<div style="clear: both;"></div>
<label for="joinPassword"> User info </label>
<input id="joinPassword" type="text" class="form-control" placeholder="Your name (optional)" name="nickname" ng-model="nickname">
<input type="password" class="form-control"

18
views/modals/qr-address.html
View File

@ -1,19 +1,17 @@
<div class="text-center">
<qrcode size="160" data="bitcoin:{{address.address}}"></qrcode>
<h4>{{address.address}} <span class="btn-copy" clip-copy="address.address"></span></h4>
<qrcode size="250" data="{{address.address}}"></qrcode>
<div>
<div class="m10t">
<h4>{{address.address}} <span class="btn-copy" clip-copy="address.address"></span></h4>
<span ng-if="$root.updatingBalance">
<i class="fi-bitcoin-circle icon-rotate spinner"></i>
</span>
<span ng-if="!$root.updatingBalance">
<p class="m15b" ng-if="!$root.updatingBalance">
{{address.balance || 0|noFractionNumber}} {{$root.unitName}}
</span>
<div style="margin-top:10px;">
<span class="label pointer" open-external address="{{address.address}}">
<i class="fi-link">&nbsp;</i> Open in external application
</span>
</div>
</p>
<button class="m15t button secondary" open-external address="{{address.address}}">
<i class="fi-link">&nbsp;</i> Open in external aplication
</button>
</div>
</div>
<a class="close-reveal-modal" ng-click="cancel()">&#215;</a>