From 6cf1d3b734ef67aa57ba4e00d1c9d34c2babf458 Mon Sep 17 00:00:00 2001 From: Pawel Plociennik Date: Thu, 19 Oct 2017 21:45:01 +0200 Subject: [PATCH 1/2] paperbulk --- bitaddress.org.html | 10 ++++++++++ src/bitaddress-ui.html | 3 +++ src/main.css | 3 +++ src/ninja.paperwallet.js | 4 ++++ 4 files changed, 20 insertions(+) diff --git a/bitaddress.org.html b/bitaddress.org.html index eee04c7..8c377e9 100644 --- a/bitaddress.org.html +++ b/bitaddress.org.html @@ -6447,6 +6447,8 @@ input[type=checkbox] { position: relative; z-index: 20; } -o-transform-origin:top left; -o-transform:rotate(-90deg); transform-origin:top left; transform:rotate(-90deg); } +#paperbulkarea { padding: 50px; 0 0 0; } +#paperbulktextarea { font-size: 90%; width: 98%; margin: 4px 0 0 0; } #bulkarea .body { padding: 5px 0 0 0; } #bulkarea .format { font-style: italic; font-size: 90%; } #bulktextarea { font-size: 90%; width: 98%; margin: 4px 0 0 0; } @@ -6585,6 +6587,7 @@ input[type=checkbox] { position: relative; z-index: 20; } #singlesafety { border: 0; } #paperarea .keyarea:first-child { border-top: 2px solid #009900; } #paperarea .keyarea.art:first-child { border: 0; } + #paperbulkarea { display: none; } .pagebreak { height: 1px; } .paper #logo { display: none; } .menu, .footer, .commands, #tagline, #faqs, #culturemenu { display: none; } @@ -6698,6 +6701,9 @@ input[type=checkbox] { position: relative; z-index: 20; }
+
+ +
@@ -9821,6 +9827,7 @@ ninja.wallets.paperwallet = { ninja.wallets.paperwallet.useArtisticWallet = useArtisticWallet; ninja.wallets.paperwallet.pageBreakAt = pageBreakAt; document.getElementById("paperkeyarea").innerHTML = ""; + document.getElementById("paperbulktextarea").value = ""; if (ninja.wallets.paperwallet.encrypt) { if (passphrase == "") { alert(ninja.translator.get("bip38alertpassphraserequired")); @@ -9876,6 +9883,7 @@ ninja.wallets.paperwallet = { // generate bitcoin address, private key, QR Code and update information in the HTML // idPostFix: 1, 2, 3, etc. generateNewWallet: function (idPostFix) { + var paperBulkTextArea = document.getElementById("paperbulktextarea"); if (ninja.wallets.paperwallet.encrypt) { var compressed = true; ninja.privateKey.BIP38GenerateECAddressAsync(ninja.wallets.paperwallet.intermediatePoint, compressed, function (address, encryptedKey) { @@ -9886,6 +9894,7 @@ ninja.wallets.paperwallet = { else { ninja.wallets.paperwallet.showWallet(idPostFix, address, encryptedKey); } + paperBulkTextArea.value += address + "\n"; }); } else { @@ -9899,6 +9908,7 @@ ninja.wallets.paperwallet = { else { ninja.wallets.paperwallet.showWallet(idPostFix, bitcoinAddress, privateKeyWif); } + paperBulkTextArea.value += bitcoinAddress + "\n"; } }, diff --git a/src/bitaddress-ui.html b/src/bitaddress-ui.html index 0d6f752..d8faa8a 100644 --- a/src/bitaddress-ui.html +++ b/src/bitaddress-ui.html @@ -208,6 +208,9 @@
+
+ +
diff --git a/src/main.css b/src/main.css index 1734fa3..9b168d0 100644 --- a/src/main.css +++ b/src/main.css @@ -88,6 +88,8 @@ input[type=checkbox] { position: relative; z-index: 20; } -o-transform-origin:top left; -o-transform:rotate(-90deg); transform-origin:top left; transform:rotate(-90deg); } +#paperbulkarea { padding: 50px; 0 0 0; } +#paperbulktextarea { font-size: 90%; width: 98%; margin: 4px 0 0 0; } #bulkarea .body { padding: 5px 0 0 0; } #bulkarea .format { font-style: italic; font-size: 90%; } #bulktextarea { font-size: 90%; width: 98%; margin: 4px 0 0 0; } @@ -226,6 +228,7 @@ input[type=checkbox] { position: relative; z-index: 20; } #singlesafety { border: 0; } #paperarea .keyarea:first-child { border-top: 2px solid #009900; } #paperarea .keyarea.art:first-child { border: 0; } + #paperbulkarea { display: none; } .pagebreak { height: 1px; } .paper #logo { display: none; } .menu, .footer, .commands, #tagline, #faqs, #culturemenu { display: none; } diff --git a/src/ninja.paperwallet.js b/src/ninja.paperwallet.js index f3a0060..8840244 100644 --- a/src/ninja.paperwallet.js +++ b/src/ninja.paperwallet.js @@ -44,6 +44,7 @@ ninja.wallets.paperwallet = { ninja.wallets.paperwallet.useArtisticWallet = useArtisticWallet; ninja.wallets.paperwallet.pageBreakAt = pageBreakAt; document.getElementById("paperkeyarea").innerHTML = ""; + document.getElementById("paperbulktextarea").value = ""; if (ninja.wallets.paperwallet.encrypt) { if (passphrase == "") { alert(ninja.translator.get("bip38alertpassphraserequired")); @@ -99,6 +100,7 @@ ninja.wallets.paperwallet = { // generate bitcoin address, private key, QR Code and update information in the HTML // idPostFix: 1, 2, 3, etc. generateNewWallet: function (idPostFix) { + var paperBulkTextArea = document.getElementById("paperbulktextarea"); if (ninja.wallets.paperwallet.encrypt) { var compressed = true; ninja.privateKey.BIP38GenerateECAddressAsync(ninja.wallets.paperwallet.intermediatePoint, compressed, function (address, encryptedKey) { @@ -109,6 +111,7 @@ ninja.wallets.paperwallet = { else { ninja.wallets.paperwallet.showWallet(idPostFix, address, encryptedKey); } + paperBulkTextArea.value += address + "\n"; }); } else { @@ -122,6 +125,7 @@ ninja.wallets.paperwallet = { else { ninja.wallets.paperwallet.showWallet(idPostFix, bitcoinAddress, privateKeyWif); } + paperBulkTextArea.value += bitcoinAddress + "\n"; } }, From a7ca7dd0cfd5505a9220fc341530d04bd85b1414 Mon Sep 17 00:00:00 2001 From: Pawel Plociennik Date: Mon, 23 Oct 2017 21:07:36 +0200 Subject: [PATCH 2/2] numlabel --- bitaddress.org.html | 2 ++ src/main.css | 1 + src/ninja.paperwallet.js | 1 + 3 files changed, 4 insertions(+) diff --git a/bitaddress.org.html b/bitaddress.org.html index 8c377e9..67f14eb 100644 --- a/bitaddress.org.html +++ b/bitaddress.org.html @@ -6370,6 +6370,7 @@ hr { margin: 20px 0; border-top: 2px dashed #008000; } .keyarea .pubaddress { display: inline-block; height: 40px; padding: 0 0 0 10px; float: left; } .keyarea .privwif { margin: 0; float: right; text-align: right; padding: 0 20px 0 0; position: relative; } .keyarea .label { font-weight: bold; } +.keyarea .numlabel { position:absolute; left:50%; top:50%; font-weight: bold; } .keyarea .output { display: block; font-family: monospace; font-size: 1.25em; } .keyarea .qrcode_public { display: inline-block; float: left; } .keyarea .qrcode_private { display: inline-block; position: relative; top: 28px; float: right; } @@ -9919,6 +9920,7 @@ ninja.wallets.paperwallet = { } var walletHtml = + "
["+i+"]
" + "
" + "
" + "
" + diff --git a/src/main.css b/src/main.css index 9b168d0..12ed389 100644 --- a/src/main.css +++ b/src/main.css @@ -11,6 +11,7 @@ hr { margin: 20px 0; border-top: 2px dashed #008000; } .keyarea .pubaddress { display: inline-block; height: 40px; padding: 0 0 0 10px; float: left; } .keyarea .privwif { margin: 0; float: right; text-align: right; padding: 0 20px 0 0; position: relative; } .keyarea .label { font-weight: bold; } +.keyarea .numlabel { position:absolute; left:50%; top:50%; font-weight: bold; } .keyarea .output { display: block; font-family: monospace; font-size: 1.25em; } .keyarea .qrcode_public { display: inline-block; float: left; } .keyarea .qrcode_private { display: inline-block; position: relative; top: 28px; float: right; } diff --git a/src/ninja.paperwallet.js b/src/ninja.paperwallet.js index 8840244..4116894 100644 --- a/src/ninja.paperwallet.js +++ b/src/ninja.paperwallet.js @@ -136,6 +136,7 @@ ninja.wallets.paperwallet = { } var walletHtml = + "
["+i+"]
" + "
" + "
" + "
" +