From 0f42d00982bf533be46744a700e8edd196c6199f Mon Sep 17 00:00:00 2001 From: Petr Balashov Date: Thu, 9 Mar 2017 11:22:06 +0100 Subject: [PATCH 1/5] jumblr to multilang #2 --- assets/scripts/lang/en.js | 53 ++++++++++++++- index.html | 133 ++++++++++++++++++-------------------- 2 files changed, 114 insertions(+), 72 deletions(-) diff --git a/assets/scripts/lang/en.js b/assets/scripts/lang/en.js index 89fab3f..c407127 100644 --- a/assets/scripts/lang/en.js +++ b/assets/scripts/lang/en.js @@ -173,7 +173,8 @@ const _lang = { 'DEBUG_LOG_LINES': 'Input number of lines to read', 'TARGET': 'Target', 'LOAD_DEBUG_LOG': 'Load debug log', - 'REFRESH_FUNDS': 'Refresh Funds' + 'REFRESH_FUNDS': 'Refresh Funds', + 'INFO': 'Info' }, 'JUMBLR': { 'NOTICE': 'EXPERIMENTAL TEST VERSION ONLY', @@ -183,7 +184,55 @@ const _lang = { 'TO_USE_JUMBLR': 'To use Jumblr feature, you need to activate Komodo in Native Mode.', 'IF_YOU_ALREADY_RUNNING': 'If you are already running Komodo in either Basilisk Mode or Full Mode, close the wallet and restart again to start Komodo In Native Mode.', 'THIS_SCREEN_DOESNT_REFRESH': 'This screen does not auto refresh. ' + - 'You will need to hit the Refresh button on the top right corner of the screen to get latest Jumblr data.' + 'You will need to hit the Refresh button on the top right corner of the screen to get latest Jumblr data.', + 'FEW_SECURITY_NOTES': 'Few Security Notes for your Privacy and Anonymity of funds', + 'FEW_SECURITY_NOTES_DESC1': 'Jumblr addresses (BTC Jumbler and KMD Jumbler) addresses are your Private Addresses.', + 'FEW_SECURITY_NOTES_DESC2': 'DO NOT SHARE your Jumblr addresses with anyone.', + 'FEW_SECURITY_NOTES_DESC3': 'Jumblr addresses are like YOUR PASSWORD. Keep them safe, secure and hidden.', + 'FEW_SECURITY_NOTES_DESC4': 'Only YOU should know your Jumblr Address. Nobody else.', + 'FEW_SECURITY_NOTES_DESC5': 'Sharing your Jumblr Addresses with ANYONE will defeat the purpose of using Jumblr, and your funds and transactions will not be private anymore.', + 'ACCESS_JUMBLR_FUNDS': 'How to Access your Jumblr Funds', + 'ADDRESS_ACCESSIBLE_EASILY': 'Your Jumbler Addresses are accessible easily. For example you logged into your wallet with passphrase', + 'TO_ACCESS': 'To access your Jumbler address funds Logout.', + 'CLOSE_IAPP': 'Close Iguana App.', + 'START_IAPP': 'Start Iguana App again.', + 'START_KMD': 'Start Komodo in either Full Mode or Basilisk Mode.', + 'WORD_JUMBLR': 'Then add word \'jumblr \' before your passphrase.', + 'SMALL_LETTERS': '"jumblr" is all in small letters.', + 'WHITE_SPACE': 'There is a white space after "jumblr ".', + 'PER_EXAMPLE': 'So as per this example, your Jumbler Addresses are accessible with:', + 'LOGIN_WITH_JUMBLR': 'You\'ll login with your Jumblr passphrase to access funds and will be able to use it just like any other wallet address.', + 'AGAIN_DONT_SHARE': 'Again, DO NOT SHARE YOUR JUMBLR ADDRESS WITH ANYONE.', + 'USING_JUMBLR': 'Using Jumblr', + 'RUN_KMD': 'Run Komodo in Native Mode', + 'LOGIN_KMD': 'Login with your passphrase', + 'GO_TO': 'Go to Jumblr Menu', + 'FIND_DEPOSIT_ADDR': 'There find your Deposit Address for coin you want to anonymise your funds. (For a start only KMD is supported. BTC support will come in later versions)', + 'YOU_SEND_FUNDS': 'You send your funds to deposit address.', + 'KEEP_WALLET_OPEN': 'Keep your wallet open', + 'IMPORTANT_FUNDS': '[IMPORTANT] Funds are processed in lot sizes 100 KMD, 1000 KMD, and 10,000 KMD.', + 'LARGE_LOT': 'The large lot sizes will process first, and then smaller.', + 'EG': 'For example, you sent 1393 KMD to KMD Deposit Address.
' + + 'First it will process 1000 KMD
' + + 'then 100 KMD
' + + 'then 100 KMD
' + + 'then 100 KMD', + '93_KMD': '93 KMD will keep waiting in deposit address.', + 'TO_CLEAR_THEM': 'To clear them you\'ll have to send 7 KMD more to your KMD Deposit Address.', + 'WHEN_IT_TOTALS': 'When it totals to 100 KMD, it will process to your KMD Jumblr Address.', + 'JADDR': 'Jumblr Addresses', + 'BTC_DEPOSIT': 'BTC Deposit', + 'SHOW_HIDE': 'Show/Hide', + 'HIDDEN': 'Hidden for security reason.', + 'KMD_DEPOSIT': 'KMD Deposit', + 'JSTATUS': 'Jumblr Status', + 'RESULT': 'Result', + 'DEPOSITED': 'Deposited', + 'PUB_TO_PRIV': 'Public to Private', + 'PRIV_TO_PRIV': 'Private to Private', + 'PRIV_TO_PUB': 'Private to Public', + 'FINISHED': 'Finished', + 'PENDING': 'Pending' }, 'DASHBOARD': { 'SELECT_ADDRESS': '- Select Address -', diff --git a/index.html b/index.html index d6c8718..2c377c4 100755 --- a/index.html +++ b/index.html @@ -1351,80 +1351,73 @@
    -
  • Jumblr addresses (BTC Jumbler and KMD Jumbler) addresses are your Private Addresses.
    • -
  • DO NOT SHARE your Jumblr addresses with anyone.
    • -
  • Jumblr addresses are like YOUR PASSWORD. Keep them safe, secure and hidden.
    • -
  • Only YOU should know your Jumblr Address. Nobody else.
    • -
  • Sharing your Jumblr Addresses with ANYONE will defeat the purpose of using Jumblr, and your funds and transactions will not be private anymore.
    • +
  • +
  • +
  • +
  • +
-

Your Jumbler Addresses are accessible easily. - For example you logged into your wallet with passphrase

+

    duck dog cat donkey
    -
  1. To access your Jumbler address funds Logout.
    2. -
  2. Close Iguana App.
    3. -
  3. Start Iguana App again.
    4. -
  4. Start Komodo in either Full Mode or Basilisk Mode.
    5. -
  5. Then add word 'jumblr ' before your passphrase. +
  6. +
  7. +
  8. +
  9. +
    10. -
    • "jumblr" is all in small letters.
      • -
    • There is a white space after "jumblr ".
      • +
    • +
  11. - So as per this example, your Jumbler Addresses are accessible with: +
    jumblr duck dog cat donkey
    12. -
  12. You'll login with your Jumblr passphrase to access funds and will be able to use it just like any other wallet address.
    13. +
-

Again, DO NOT SHARE YOUR JUMBLR ADDRESS WITH ANYONE.

+

    -
  • Run Komodo in Native Mode
    • -
  • Loging with your passphrase
    • -
  • Go to Jumblr Menu
    • -
  • There find your Deposit Address for coin you want to anonymise your funds. (For a start only KMD is supported. BTC support will come in later versions)
    • -
  • You send your funds to deposit address.
    • -
  • Keep your wallet open
    • -
  • [IMPORTANT] Funds are processed in lot sizes 100 KMD, 1000 KMD, and 10,000 KMD.
    • -
  • The large lot sizes will process first, and then smaller.
    • +
  • +
  • +
  • +
  • +
  • +
  • +
  • +
-

- For example, you sent 1393 KMD to KMD Deposit Address.
- First it will process 1000 KMD
- then 100 KMD
- then 100 KMD
- then 100 KMD -

-

93 KMD will keep waiting in deposit address.

-

To clear them you'll have to send 7 KMD more to your KMD Deposit Address.

-

When it totals to 100 KMD, it will process to your KMD Jumblr Address.

+

+

+

+

@@ -1433,13 +1426,13 @@
-

Jumblr Addresses

+

Jumblr Addresses

- + @@ -1448,14 +1441,14 @@ - + @@ -1464,10 +1457,10 @@ @@ -1479,7 +1472,7 @@
-

Jumblr Status

+

BTC Deposit BTC Jumblr - Hidden for security reason. +
KMD Deposit KMD Jumblr - Hidden for security reason. +
@@ -1489,43 +1482,43 @@ --> - + - + - + - + - + - + - + @@ -1536,7 +1529,7 @@ - + @@ -1570,7 +1563,7 @@
-
+
- | - / - | : - @@ -1664,24 +1657,24 @@
KMD Deposit
KMD Jumblr
Result
Deposited
Public to Private
Private to Private
Private to Public
Finished
Pending
- - - - - - - + + + + + + + - - - - - - - + + + + + + +
TypeDirectionConfirmationsAmountTimeDest. AddressTx Detail
TypeDirectionConfirmationsAmountTimeDest. AddressTx Detail
@@ -1908,7 +1901,7 @@

- Komodo Info + Komodo

From 0e017a08b61ddaee4bd779d857d78ae9b4d7a673 Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Fri, 10 Mar 2017 00:46:12 +1300 Subject: [PATCH 2/5] tiny change for Jumblr subtext --- assets/scripts/lang/en.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets/scripts/lang/en.js b/assets/scripts/lang/en.js index 89fab3f..f31def5 100644 --- a/assets/scripts/lang/en.js +++ b/assets/scripts/lang/en.js @@ -288,7 +288,7 @@ const _lang = { }, 'SIDEBAR': { 'EDEX_MOTTO': 'Most Secure, Easy and Native Decentralised Exchange', - 'JUMBLR_MOTTO': 'Secure, Native and Decentralised Coin Shuffling' + 'JUMBLR_MOTTO': 'Secure, Native and Decentralised Coin Anonymizer' }, 'SETTINGS': { 'PASSPHRASE_REQ': 'Passphrase is required.' From 056d0f69ea1b60e28f0c7b43e15d03a11c1c9d1c Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Fri, 10 Mar 2017 01:08:30 +1300 Subject: [PATCH 3/5] language fixes in native GUI --- assets/scripts/kmd_wallet/KMDTransaction.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/assets/scripts/kmd_wallet/KMDTransaction.js b/assets/scripts/kmd_wallet/KMDTransaction.js index 338cfcb..2755f14 100644 --- a/assets/scripts/kmd_wallet/KMDTransaction.js +++ b/assets/scripts/kmd_wallet/KMDTransaction.js @@ -38,16 +38,16 @@ function KMDGetPublicTransactions() { var tmp_secondsToString = secondsToString(AjaxOutputData[index].time); if ( AjaxOutputData[index].category == 'send' ) { - tmp_category = ' '._lang[defaultLang].TOASTR.OUT; + tmp_category = ' '+_lang[defaultLang].DASHBOARD.OUT; } if ( AjaxOutputData[index].category == 'receive' ) { - tmp_category = ' ' + _lang[defaultLang].TOASTR.IN; + tmp_category = ' ' + _lang[defaultLang].DASHBOARD.IN; } if ( AjaxOutputData[index].category == 'generate' ) { - tmp_category = ' ' + _lang[defaultLang].TOASTR.MINED; + tmp_category = ' ' + _lang[defaultLang].DASHBOARD.MINED; } if ( AjaxOutputData[index].category == 'immature' ) { - tmp_category = ' ' + _lang[defaultLang].TOASTR.IMMATURE; + tmp_category = ' ' + _lang[defaultLang].DASHBOARD.IMMATURE; } tmplisttransactions = [ From 8ba1f107c5334f436bba68c4b9940ef2df309661 Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Fri, 10 Mar 2017 01:11:40 +1300 Subject: [PATCH 4/5] hidden transactions menu option from native gui. wasn't needed --- index.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.html b/index.html index d6c8718..e80dc82 100755 --- a/index.html +++ b/index.html @@ -683,9 +683,9 @@
    • -
  • +
  • @@ -708,9 +708,9 @@
    • -
  • +
  • From 1916f13985aff7d2b7bd33f64a0ba54dfd9b3add Mon Sep 17 00:00:00 2001 From: Petr Balashov Date: Thu, 9 Mar 2017 14:31:51 +0100 Subject: [PATCH 5/5] split index.html into smaller files (wip) --- assets/scripts/kmd_wallet/KMDTransaction.js | 6 +- assets/scripts/templates/addCoinLoginModal.js | 73 ++++ assets/scripts/templates/addCoinModal.js | 74 ++++ assets/scripts/templates/ieFix.js | 6 + assets/scripts/templates/loginPage.js | 182 ++++++++ .../refreshBasiliskConnectionsModal.js | 67 +++ index.html | 411 +----------------- 7 files changed, 425 insertions(+), 394 deletions(-) create mode 100644 assets/scripts/templates/addCoinLoginModal.js create mode 100644 assets/scripts/templates/addCoinModal.js create mode 100644 assets/scripts/templates/ieFix.js create mode 100644 assets/scripts/templates/loginPage.js create mode 100644 assets/scripts/templates/refreshBasiliskConnectionsModal.js diff --git a/assets/scripts/kmd_wallet/KMDTransaction.js b/assets/scripts/kmd_wallet/KMDTransaction.js index 338cfcb..d46401f 100644 --- a/assets/scripts/kmd_wallet/KMDTransaction.js +++ b/assets/scripts/kmd_wallet/KMDTransaction.js @@ -38,7 +38,7 @@ function KMDGetPublicTransactions() { var tmp_secondsToString = secondsToString(AjaxOutputData[index].time); if ( AjaxOutputData[index].category == 'send' ) { - tmp_category = ' '._lang[defaultLang].TOASTR.OUT; + tmp_category = ' ' + _lang[defaultLang].TOASTR.OUT; } if ( AjaxOutputData[index].category == 'receive' ) { tmp_category = ' ' + _lang[defaultLang].TOASTR.IN; @@ -114,8 +114,8 @@ function KMDGetProtectedTransactions() { var AjaxOutputData = JSON.parse(data); // Ajax output gets the whole list of unspent coin with addresses $.each(AjaxOutputData, function(index, txidvalue) { - var tmp_category = ' ' + _lang[defaultLang].TOASTR.IN; - var tmp_addr = value.addr.slice(0, 30) + '...'; + var tmp_category = ' ' + _lang[defaultLang].TOASTR.IN, + tmp_addr = value.addr.slice(0, 30) + '...'; if (!('amount' in txidvalue)) { var tmp_amount = 0; } else { diff --git a/assets/scripts/templates/addCoinLoginModal.js b/assets/scripts/templates/addCoinLoginModal.js new file mode 100644 index 0000000..2f7b9db --- /dev/null +++ b/assets/scripts/templates/addCoinLoginModal.js @@ -0,0 +1,73 @@ +templates.addCoinLoginModal = +` + + + +`; \ No newline at end of file diff --git a/assets/scripts/templates/addCoinModal.js b/assets/scripts/templates/addCoinModal.js new file mode 100644 index 0000000..2adf134 --- /dev/null +++ b/assets/scripts/templates/addCoinModal.js @@ -0,0 +1,74 @@ +templates.addCoinModal = +` + + + + +`; \ No newline at end of file diff --git a/assets/scripts/templates/ieFix.js b/assets/scripts/templates/ieFix.js new file mode 100644 index 0000000..c4ab1ec --- /dev/null +++ b/assets/scripts/templates/ieFix.js @@ -0,0 +1,6 @@ +templates.ieFix = +` + +`; \ No newline at end of file diff --git a/assets/scripts/templates/loginPage.js b/assets/scripts/templates/loginPage.js new file mode 100644 index 0000000..2024520 --- /dev/null +++ b/assets/scripts/templates/loginPage.js @@ -0,0 +1,182 @@ +templates.loginPage = +` + +
    +
    +
    +
    + SuperNET Iguana +
    + + + + + + + + +
    +

    +
    + +
    +
    + + + + + +
    +
    +
    +`; \ No newline at end of file diff --git a/assets/scripts/templates/refreshBasiliskConnectionsModal.js b/assets/scripts/templates/refreshBasiliskConnectionsModal.js new file mode 100644 index 0000000..83a3a8f --- /dev/null +++ b/assets/scripts/templates/refreshBasiliskConnectionsModal.js @@ -0,0 +1,67 @@ +templates.refreshBasiliskConnectionsModal = +` + +
    + + + +`; \ No newline at end of file diff --git a/index.html b/index.html index 2c377c4..7492c38 100755 --- a/index.html +++ b/index.html @@ -67,401 +67,31 @@ - + + + + + + - -
    - - - - - - - -
    - - - - -
    -
    -
    -
    - SuperNET Iguana -
    - - - - - - - - -
    -

    -
    - -
    -
    - - - - - -
    -
    +
    +
    + - - - +
    @@ -2639,7 +2269,6 @@ -