From 05a9b736b37f1c6f955414c683a36013bdb77d1a Mon Sep 17 00:00:00 2001 From: pointbiz Date: Sun, 7 Oct 2012 00:21:17 -0400 Subject: [PATCH] v1.8 Art Wallet updates --- bitaddress.org.html | 40 +++++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/bitaddress.org.html b/bitaddress.org.html index 42a0339..fb043d2 100644 --- a/bitaddress.org.html +++ b/bitaddress.org.html @@ -3937,14 +3937,15 @@ #paperarea { min-height: 120px; display: none; } #paperarea .keyarea { border: 2px solid green; border-top: 0; } #paperarea .keyarea.art { display: block; height: auto; border: 0; font-family: Ubuntu, Arial; padding: 0; margin: 0; } - #paperarea .artwallet .papersvg { width: 795px; height: 430px; border: 0; margin: 0; padding: 0; left: 0; } - #paperarea .artwallet .qrcode_public { top: 100px; left: 34px; z-index: 100; margin: 0; float: none; display: block; position: absolute; } - #paperarea .artwallet .qrcode_private { top: 182px; left: 593px; z-index: 100; margin: 0; float: none; display: block; position: absolute; } - #paperarea .artwallet .artpubwhitebox { width: 151px; height: 151px; top: 95px; left: 29px; z-index: 90; background-color: #FFFFFF; margin: 0; float: none; display: block; position: absolute; } - #paperarea .artwallet .artprivwhitebox { width: 186px; height: 186px; top: 177px; left: 588px; z-index: 90; background-color: #FFFFFF; margin: 0; float: none; display: block; position: absolute; } + #paperarea .artwallet .papersvg { width: 486px; height: 261px; border: 0; margin: 0; padding: 0; left: 0; } + #paperarea .artwallet .qrcode_public { top: 55px; left: 17px; z-index: 100; margin: 0; float: none; display: block; position: absolute; background-color: #FFFFFF; + padding: 5px 5px 2px 5px; } + #paperarea .artwallet .qrcode_private { top: 108px; left: 360px; z-index: 100; margin: 0; float: none; display: block; position: absolute; background-color: #FFFFFF; + padding: 5px 5px 2px 5px; } + #paperarea .artwallet .btcaddress { - position: absolute; top: 285px; left: 231px; z-index: 100; font-size: 9.7px; + position: absolute; top: 240px; left: 139px; z-index: 100; font-size: 10px; background-color: transparent; font-weight:bold; color: #8e6502; margin: 0; -webkit-transform-origin:top left; -webkit-transform:rotate(-90deg); -moz-transform-origin:top left; -moz-transform:rotate(-90deg); @@ -3954,7 +3955,7 @@ } #paperarea .artwallet .btcprivwif { - position: absolute; top: 385px; left: 560px; z-index: 100; font-size: 9.7px; + position: absolute; top: 236px; left: 346px; z-index: 100; font-size: 7px; background-color: transparent; font-weight:bold; color: #8e6502; margin: 0; -webkit-transform-origin:top left; -webkit-transform:rotate(-90deg); -moz-transform-origin:top left; -moz-transform:rotate(-90deg); @@ -4037,9 +4038,10 @@ } @media print { - #main { width: 795px; } + #main { width: auto; } #paperarea .keyarea:first-child { border-top: 2px solid green; } #paperarea .keyarea.art:first-child { border: 0; } + .pagebreak { height: 1px; } .paper #logo { display: none; } .menu { display: none; } .footer { display: none; } @@ -4068,10 +4070,10 @@
- Art? + Hide Art? Addresses per page: Addresses to generate: - +
@@ -4265,7 +4267,7 @@
PGP Public Key - Signed Version History (v1.7) + Signed Version History (v1.8) GitHub Repository
@@ -4548,7 +4550,7 @@ limitElement.value = pageBreakAt; } if (paperArea.innerHTML == "") { - ninja.wallets.paperwallet.build(pageBreakAt, pageBreakAt, document.getElementById('paperart').checked); + ninja.wallets.paperwallet.build(pageBreakAt, pageBreakAt, !document.getElementById('paperart').checked); } }, @@ -4561,8 +4563,8 @@ remaining: null, // use to keep track of how many addresses are left to process when building the paper wallet count: 0, pageBreakAtDefault: 7, - pageBreakAtArtisticDefault: 2, - useArtisticWallet: false, + pageBreakAtArtisticDefault: 3, + useArtisticWallet: true, pageBreakAt: null, build: function (numWallets, pageBreakAt, useArtisticWallet) { @@ -4657,9 +4659,7 @@ var walletHtml = "
" + //"" + - "" + - "
" + - "
" + + "" + "
" + "
" + "
" + @@ -4672,7 +4672,7 @@ var keyValuePair = {}; keyValuePair["qrcode_public" + idPostFix] = bitcoinAddress; keyValuePair["qrcode_private" + idPostFix] = privateKeyWif; - ninja.qrCode.showQrCode(keyValuePair, 4.3); + ninja.qrCode.showQrCode(keyValuePair, 2.4); document.getElementById("btcaddress" + idPostFix).innerHTML = bitcoinAddress; document.getElementById("btcprivwif" + idPostFix).innerHTML = privateKeyWif; @@ -4692,11 +4692,13 @@ }, toggleArt: function (element) { - if (element.checked) { + if (!element.checked) { + // show Art document.getElementById("paperlimitperpage").value = ninja.wallets.paperwallet.pageBreakAtArtisticDefault; document.getElementById("paperlimit").value = ninja.wallets.paperwallet.pageBreakAtArtisticDefault; } else { + // hide Art document.getElementById("paperlimitperpage").value = ninja.wallets.paperwallet.pageBreakAtDefault; document.getElementById("paperlimit").value = ninja.wallets.paperwallet.pageBreakAtDefault; }