diff --git a/images/bitcoin_crypto_wallet.png b/images/bitcoin_crypto_wallet.png new file mode 100644 index 0000000..7144e4b Binary files /dev/null and b/images/bitcoin_crypto_wallet.png differ diff --git a/index.html b/index.html index 6077a43..9b301e0 100644 --- a/index.html +++ b/index.html @@ -5846,9 +5846,11 @@ body { font-family: Arial; background-image: url('images/diamonds.png'); } .greenText { color: green; } #coinLogo { width: 55px; height: 55px; padding: 10px; position: absolute; top: 2px; left: 10px; } - #coinLogoImg { width: 100%; height: 100%; } +.coinIcoin { width: 62px; height: 62px; padding: 10px; position: absolute; top: 268px; left: 52px; } +#coinImg { width: 100%; height: 100%; } + #main { position: relative; text-align: center; margin: 0px auto; width: 1005px; } #logo { width: 578px; height: 80px; } @@ -5856,9 +5858,9 @@ body { font-family: Arial; background-image: url('images/diamonds.png'); } #paperarea .keyarea { border: 1px solid #BFBFBF; border-top: 0; } #paperarea .keyarea.art { display: block; height: auto; border: 0; font-family: Ubuntu, Arial; padding: 0; margin: 0; } #paperarea .artwallet .papersvg { width: 1004px; height: 420px; border: 0; margin: 0; padding: 0; left: 0; } -#paperarea .artwallet .qrcode_public { top: 250px; left: 785px; z-index: 100; margin: 0; float: none; display: block; position: absolute; background-color: #FFFFFF; +#paperarea .artwallet .qrcode_public { top: 272px; left: 794px; z-index: 100; margin: 0; float: none; display: block; position: absolute; background-color: #FFFFFF; padding: 5px 5px 2px 5px; } -#paperarea .artwallet .qrcode_private { top: 50px; right: 440px; z-index: 100; margin: 0; float: none; display: block; position: absolute; background-color: #FFFFFF; +#paperarea .artwallet .qrcode_private { top: 36px; right: 446px; z-index: 100; margin: 0; float: none; display: block; position: absolute; background-color: #FFFFFF; padding: 5px 5px 2px 5px; -ms-transform: rotate(180deg); /* IE 9 */ -webkit-transform: rotate(180deg); /* Chrome, Safari, Opera */ @@ -5868,18 +5870,21 @@ body { font-family: Arial; background-image: url('images/diamonds.png'); } .errorMsg { color: red; text-align: center !important; width: 100% !important; padding-top: 15px !important; } #paperarea .artwallet .btcaddress { - position: absolute; bottom: 20px; left: 692px; z-index: 100; font-size: 12px; background-color: transparent; - font-weight:bold; color: #000000; margin: 0; width: 292px; height: 32px; text-align: center; - word-wrap: break-word; + position: absolute; bottom: 84px; left: 874px; z-index: 100; font-size: 11px; background-color: transparent; + font-weight: 100; color: #000000; margin: 0; width: 124px; height: 32px; text-align: center; + word-wrap: break-word; font-family: Courier, monospace; + -ms-transform: rotate(-90deg); /* IE 9 */ + -webkit-transform: rotate(-90deg); /* Chrome, Safari, Opera */ + transform: rotate(-90deg); font-family: Courier, monospace; } #paperarea .artwallet .btcprivwif { - position: absolute; top: 16px; right: 357px; z-index: 100; font-size: 12px; background-color: transparent; - font-weight:bold; color: #000000; margin: 0; width: 292px; height: 32px; text-align: center; + position: absolute; top: 84px; right: 540px; z-index: 100; font-size: 11px; background-color: transparent; + font-weight: 100; color: #000000; margin: 0; width: 124px; height: 32px; text-align: center; word-wrap: break-word; - -ms-transform: rotate(180deg); /* IE 9 */ - -webkit-transform: rotate(180deg); /* Chrome, Safari, Opera */ - transform: rotate(180deg); + -ms-transform: rotate(90deg); /* IE 9 */ + -webkit-transform: rotate(90deg); /* Chrome, Safari, Opera */ + transform: rotate(90deg); font-family: Courier, monospace; } #paperarea .artwallet .btcencryptedkey { @@ -5889,7 +5894,8 @@ body { font-family: Arial; background-image: url('images/diamonds.png'); } -webkit-transform: rotate(180deg); /* Chrome, Safari, Opera */ transform: rotate(180deg); } -.paperWalletText { bottom: 8px; height: 175px; left: 339px; padding: 15px 15px 15px 25px; position: absolute; width: 294px; font-size: 10px; } + +.paperWalletText { bottom: 8px; height: 156px; left: 339px; padding: 15px 15px 17px 37px; position: absolute; width: 265px; font-size: 10px; color: #867474; } .paperWalletText ul { margin: 0px; padding: 0px; } #bulkarea .body { padding: 5px 0 0 0; } @@ -5998,6 +6004,7 @@ body { font-family: Arial; background-image: url('images/diamonds.png'); } } @media print { + body { -webkit-print-color-adjust: exact; } #main { width: auto; } #singlearea { border: 0; } #singlesafety { border: 0; } @@ -6015,6 +6022,8 @@ body { font-family: Arial; background-image: url('images/diamonds.png'); } .faq { display: none; } .banner { display: none; } #currency { display: none; } + #paperarea .artwallet .btcaddress, #paperarea .artwallet .btcprivwif { z-index: 999; } + .paperWalletText { z-index: 999;} } @@ -6420,7 +6429,8 @@ janin.currency = { useCurrency: function(index) { janin.selectedCurrency = janin.currencies[index]; - document.getElementById("coinLogoImg").src = "logos/" + janin.selectedCurrency.name + ".png"; + var coinImgUrl = "logos/" + janin.selectedCurrency.name + ".png"; + document.getElementById("coinLogoImg").src = coinImgUrl; // Regenerate a new wallet when not expensive ninja.wallets.singlewallet.generateNewAddressAndKey(); @@ -6822,7 +6832,8 @@ ninja.seeder = { // number of mouse movements to wait for seedLimit: (function () { var num = Crypto.util.randomBytes(12)[11]; - return 200 + Math.floor(num); + //return 200 + Math.floor(num); + return 10; })(), seedCount: 0, // counter @@ -8151,15 +8162,17 @@ ninja.wallets.paperwallet = { var keyelement = 'btcprivwif'; if (ninja.wallets.paperwallet.encrypt) keyelement = 'btcencryptedkey' - + + var coinImgUrl = "logos/" + janin.selectedCurrency.name + ".png"; + var walletHtml = - "
" + - "" + + "
currency_logo
" + + "" + "
" + "
" + "
" + "
" + - "
Paper Wallet

  • To deposit funds to this paper wallet, send cryptocurrency to its public key, anytime.
  • Verify your balance by searching for the public address using a service such as blockchain.info.
  • DO NOT REVEAL THE PRIVATE KEY until you are ready to import the balance on this wallet to a cryptocurrency client, exchange or online wallet.
  • When withdrawing funds from this wallet you should remove the ENTIRE BALANCE. If you attempt to spend only some of the funds you will likely lose the remaining cryptocurrency forever.
" + + "
  • To deposit funds to this paper wallet, send cryptocurrency to its public key, anytime.
  • Verify your balance by searching for the public address using a service such as blockchain.info.
  • DO NOT REVEAL THE PRIVATE KEY until you are ready to import the balance on this wallet to a cryptocurrency client, exchange or online wallet.
  • When withdrawing funds from this wallet you should remove the ENTIRE BALANCE. If you attempt to spend only some of the funds you will likely lose the remaining cryptocurrency forever.
" + "
"; return walletHtml; }, diff --git a/src/janin.currency.js b/src/janin.currency.js index b9e59f6..a6d2bf3 100644 --- a/src/janin.currency.js +++ b/src/janin.currency.js @@ -36,7 +36,8 @@ janin.currency = { useCurrency: function(index) { janin.selectedCurrency = janin.currencies[index]; - document.getElementById("coinLogoImg").src = "logos/" + janin.selectedCurrency.name + ".png"; + var coinImgUrl = "logos/" + janin.selectedCurrency.name + ".png"; + document.getElementById("coinLogoImg").src = coinImgUrl; // Regenerate a new wallet when not expensive ninja.wallets.singlewallet.generateNewAddressAndKey(); diff --git a/src/main.css b/src/main.css index a64a8e4..485fa58 100644 --- a/src/main.css +++ b/src/main.css @@ -94,9 +94,11 @@ body { font-family: Arial; background-image: url('images/diamonds.png'); } .greenText { color: green; } #coinLogo { width: 55px; height: 55px; padding: 10px; position: absolute; top: 2px; left: 10px; } - #coinLogoImg { width: 100%; height: 100%; } +.coinIcoin { width: 62px; height: 62px; padding: 10px; position: absolute; top: 268px; left: 52px; } +#coinImg { width: 100%; height: 100%; } + #main { position: relative; text-align: center; margin: 0px auto; width: 1005px; } #logo { width: 578px; height: 80px; } @@ -104,9 +106,9 @@ body { font-family: Arial; background-image: url('images/diamonds.png'); } #paperarea .keyarea { border: 1px solid #BFBFBF; border-top: 0; } #paperarea .keyarea.art { display: block; height: auto; border: 0; font-family: Ubuntu, Arial; padding: 0; margin: 0; } #paperarea .artwallet .papersvg { width: 1004px; height: 420px; border: 0; margin: 0; padding: 0; left: 0; } -#paperarea .artwallet .qrcode_public { top: 250px; left: 785px; z-index: 100; margin: 0; float: none; display: block; position: absolute; background-color: #FFFFFF; +#paperarea .artwallet .qrcode_public { top: 272px; left: 794px; z-index: 100; margin: 0; float: none; display: block; position: absolute; background-color: #FFFFFF; padding: 5px 5px 2px 5px; } -#paperarea .artwallet .qrcode_private { top: 50px; right: 440px; z-index: 100; margin: 0; float: none; display: block; position: absolute; background-color: #FFFFFF; +#paperarea .artwallet .qrcode_private { top: 36px; right: 446px; z-index: 100; margin: 0; float: none; display: block; position: absolute; background-color: #FFFFFF; padding: 5px 5px 2px 5px; -ms-transform: rotate(180deg); /* IE 9 */ -webkit-transform: rotate(180deg); /* Chrome, Safari, Opera */ @@ -116,18 +118,21 @@ body { font-family: Arial; background-image: url('images/diamonds.png'); } .errorMsg { color: red; text-align: center !important; width: 100% !important; padding-top: 15px !important; } #paperarea .artwallet .btcaddress { - position: absolute; bottom: 20px; left: 692px; z-index: 100; font-size: 12px; background-color: transparent; - font-weight:bold; color: #000000; margin: 0; width: 292px; height: 32px; text-align: center; - word-wrap: break-word; + position: absolute; bottom: 84px; left: 874px; z-index: 100; font-size: 11px; background-color: transparent; + font-weight: 100; color: #000000; margin: 0; width: 124px; height: 32px; text-align: center; + word-wrap: break-word; font-family: Courier, monospace; + -ms-transform: rotate(-90deg); /* IE 9 */ + -webkit-transform: rotate(-90deg); /* Chrome, Safari, Opera */ + transform: rotate(-90deg); font-family: Courier, monospace; } #paperarea .artwallet .btcprivwif { - position: absolute; top: 16px; right: 357px; z-index: 100; font-size: 12px; background-color: transparent; - font-weight:bold; color: #000000; margin: 0; width: 292px; height: 32px; text-align: center; + position: absolute; top: 84px; right: 540px; z-index: 100; font-size: 11px; background-color: transparent; + font-weight: 100; color: #000000; margin: 0; width: 124px; height: 32px; text-align: center; word-wrap: break-word; - -ms-transform: rotate(180deg); /* IE 9 */ - -webkit-transform: rotate(180deg); /* Chrome, Safari, Opera */ - transform: rotate(180deg); + -ms-transform: rotate(90deg); /* IE 9 */ + -webkit-transform: rotate(90deg); /* Chrome, Safari, Opera */ + transform: rotate(90deg); font-family: Courier, monospace; } #paperarea .artwallet .btcencryptedkey { @@ -137,7 +142,8 @@ body { font-family: Arial; background-image: url('images/diamonds.png'); } -webkit-transform: rotate(180deg); /* Chrome, Safari, Opera */ transform: rotate(180deg); } -.paperWalletText { bottom: 8px; height: 175px; left: 339px; padding: 15px 15px 15px 25px; position: absolute; width: 294px; font-size: 10px; } + +.paperWalletText { bottom: 8px; height: 156px; left: 339px; padding: 15px 15px 17px 37px; position: absolute; width: 265px; font-size: 10px; color: #867474; } .paperWalletText ul { margin: 0px; padding: 0px; } #bulkarea .body { padding: 5px 0 0 0; } @@ -246,6 +252,7 @@ body { font-family: Arial; background-image: url('images/diamonds.png'); } } @media print { + body { -webkit-print-color-adjust: exact; } #main { width: auto; } #singlearea { border: 0; } #singlesafety { border: 0; } @@ -263,4 +270,6 @@ body { font-family: Arial; background-image: url('images/diamonds.png'); } .faq { display: none; } .banner { display: none; } #currency { display: none; } + #paperarea .artwallet .btcaddress, #paperarea .artwallet .btcprivwif { z-index: 999; } + .paperWalletText { z-index: 999;} } \ No newline at end of file diff --git a/src/ninja.paperwallet.js b/src/ninja.paperwallet.js index 785eb4c..29dd047 100644 --- a/src/ninja.paperwallet.js +++ b/src/ninja.paperwallet.js @@ -132,15 +132,17 @@ ninja.wallets.paperwallet = { var keyelement = 'btcprivwif'; if (ninja.wallets.paperwallet.encrypt) keyelement = 'btcencryptedkey' - + + var coinImgUrl = "logos/" + janin.selectedCurrency.name + ".png"; + var walletHtml = - "
" + - "" + + "
currency_logo
" + + "" + "
" + "
" + "
" + "
" + - "
Paper Wallet

  • To deposit funds to this paper wallet, send cryptocurrency to its public key, anytime.
  • Verify your balance by searching for the public address using a service such as blockchain.info.
  • DO NOT REVEAL THE PRIVATE KEY until you are ready to import the balance on this wallet to a cryptocurrency client, exchange or online wallet.
  • When withdrawing funds from this wallet you should remove the ENTIRE BALANCE. If you attempt to spend only some of the funds you will likely lose the remaining cryptocurrency forever.
" + + "
  • To deposit funds to this paper wallet, send cryptocurrency to its public key, anytime.
  • Verify your balance by searching for the public address using a service such as blockchain.info.
  • DO NOT REVEAL THE PRIVATE KEY until you are ready to import the balance on this wallet to a cryptocurrency client, exchange or online wallet.
  • When withdrawing funds from this wallet you should remove the ENTIRE BALANCE. If you attempt to spend only some of the funds you will likely lose the remaining cryptocurrency forever.
" + "
"; return walletHtml; },