From eade9199ce70922582912391012bdf45866aed52 Mon Sep 17 00:00:00 2001 From: Satinder Grewal Date: Thu, 16 Feb 2017 06:22:25 +1300 Subject: [PATCH] Wallet settings page changed a bit in design with some sections html/css change --- assets/css/dashboard.css | 4 +- assets/scripts/kmd_wallet_dashboard.js | 26 +- assets/scripts/sidebar.js | 5 +- index.html | 313 +++++++++++++++---------- 4 files changed, 212 insertions(+), 136 deletions(-) diff --git a/assets/css/dashboard.css b/assets/css/dashboard.css index 058e44e..60d20bd 100644 --- a/assets/css/dashboard.css +++ b/assets/css/dashboard.css @@ -18,9 +18,9 @@ box-shadow: 0 3px 10px 0px rgba(0, 0, 0, 0.32); } -#section-iguana-wallet-settings, #section-iguana-atomic-explorer, #section-extcoin { +/*#section-iguana-wallet-settings, #section-iguana-atomic-explorer, #section-extcoin { padding-top: 0; -} +}*/ .kmd-wallet-header { background: url("assets/images/bg/kmd_transparent_header_bg.png") !important; diff --git a/assets/scripts/kmd_wallet_dashboard.js b/assets/scripts/kmd_wallet_dashboard.js index 242e39e..7ef29d2 100644 --- a/assets/scripts/kmd_wallet_dashboard.js +++ b/assets/scripts/kmd_wallet_dashboard.js @@ -283,7 +283,8 @@ jQuery(document).ready(function() { if ( sessionStorage.getItem('edexTmpMode') !== null || sessionStorage.getItem('edexTmpMode') === "Native") { if ( sessionStorage.getItem('edexTmpRefresh') === null || sessionStorage.getItem('edexTmpRefresh') === "start") { //console.log('it is not COIN. '+'It is: ' + $('[data-data-extcoin]').attr("data-data-extcoin")); - $( "#btn_kmd_wallet_dashboard" ).trigger( "click" ); + var action_btn_code = getHeaderActionMenuButtonCoinCode(); + $( '#btn_'+action_btn_code+'_wallet_dashboard' ).trigger( "click" ); } } } @@ -380,7 +381,7 @@ function getTotalKMDBalance() { //console.log(AjaxOutputData); if (AjaxOutputData.interest != undefined) { console.log('show interest..'); - $('#kmd_total_interest_balance').text(AjaxOutputData.interest+' '+extcoin); + $('#kmd_total_interest_balance').text(parseFloat(AjaxOutputData.interest).toFixed(8)+' '+extcoin); $('#kmd_widget_get_total_balance_i').show(); $('#kmd_widget_get_total_balance_t').addClass(' col-lg-3'); $('#kmd_widget_get_total_balance_t').removeClass('col-lg-4'); @@ -398,9 +399,9 @@ function getTotalKMDBalance() { $('#kmd_widget_get_total_balance_tzi').addClass(' col-lg-4'); $('#kmd_widget_get_total_balance_tzi').removeClass(' col-lg-3'); } - $('#kmd_transparent_balance').text(AjaxOutputData.transparent+' '+extcoin); - $('#kmd_private_balance').text(AjaxOutputData.private+' '+extcoin); - $('#kmd_total_tz_balance').text(AjaxOutputData.total+' '+extcoin); + $('#kmd_transparent_balance').text(parseFloat(AjaxOutputData.transparent).toFixed(8)+' '+extcoin); + $('#kmd_private_balance').text(parseFloat(AjaxOutputData.private).toFixed(8)+' '+extcoin); + $('#kmd_total_tz_balance').text(parseFloat(AjaxOutputData.total).toFixed(8)+' '+extcoin); }, error: function(xhr, textStatus, error) { console.log('failed getting Coin History.'); @@ -699,7 +700,7 @@ function KMDGetPublicTransactions() { success: function(data, textStatus, jqXHR) { var AjaxOutputData = JSON.parse(data); //Ajax output gets the whole list of unspent coin with addresses //console.log('== Data OutPut of listtransactions =='); - //console.log(AjaxOutputData); + console.log(AjaxOutputData); $.each(AjaxOutputData, function(index, value) { //console.log(value); @@ -778,11 +779,15 @@ function KMDGetProtectedTransactions() { //console.log(AjaxOutputData); $.each(AjaxOutputData, function(index, txidvalue) { - //console.log(txidvalue); + console.log(txidvalue); var tmp_category = ' IN'; var tmp_addr = value.addr.slice(0, 30)+'...'; - var tmp_amount = txidvalue.amount; + if(!("amount" in txidvalue)) { + var tmp_amount = 0; + } else { + var tmp_amount = txidvalue.amount; + } var tmp_addr_txid_info = KMDGetTransactionIDInfo(AjaxOutputData[index].txid); //console.log(tmp_addr_txid_info); var tmp_confirmations = tmp_addr_txid_info[0].confirmations; @@ -822,8 +827,9 @@ function KMDfillTxHistoryT() { }); NProgress.start(); var txhistorydataT = KMDGetPublicTransactions(); - var txhistorydataZ = KMDGetProtectedTransactions(); - var txhistorydata = $.merge( txhistorydataT, txhistorydataZ ); + //var txhistorydataZ = KMDGetProtectedTransactions(); + //var txhistorydata = $.merge( txhistorydataT, txhistorydataZ ); + var txhistorydata = txhistorydataT; //console.log(txhistorydata); var kmd_txhistory_table = ''; diff --git a/assets/scripts/sidebar.js b/assets/scripts/sidebar.js index 0589dd8..e565e8c 100644 --- a/assets/scripts/sidebar.js +++ b/assets/scripts/sidebar.js @@ -163,6 +163,7 @@ $('#nav-iguana-atomic-explorer').on('click', function() { removeZECWalletStyle(); CommonSidebarActionsSet02(); removeDashboardStyle(); + $('#easydex-header-div').hide(); }); $('#nav-iguana-wallet-settings').on('click', function() { @@ -181,12 +182,13 @@ $('#nav-iguana-wallet-settings').on('click', function() { $('#nav-about-iguana').removeClass( " active open" ).addClass( "" ); $('#nav-iguana-atomic-explorer').removeClass( " active open" ).addClass( "" ); $('#nav-iguana-wallet-settings').removeClass( "" ).addClass( "active open" ); - $(".header-easydex-section").text("Wallet Settings"); + //$(".header-easydex-section").text("Wallet Settings"); removeKMDWalletStyle(); removeZECWalletStyle(); Settings_ShowWalletInfo(); //Execute this function from walletsettings.js file CommonSidebarActionsSet02(); removeDashboardStyle(); + $('#easydex-header-div').hide(); }); $('#nav-about-iguana').on('click', function() { @@ -210,6 +212,7 @@ $('#nav-about-iguana').on('click', function() { removeZECWalletStyle(); CommonSidebarActionsSet02(); removeDashboardStyle(); + $('#easydex-header-div').hide(); }); diff --git a/index.html b/index.html index 6db719d..312f1f0 100755 --- a/index.html +++ b/index.html @@ -211,7 +211,7 @@
> + data-animsition-out="fade-out">
SuperNET Iguana @@ -1579,9 +1579,11 @@ +
+

Atomic Explorer

+
- -
- - -
-
-
- - - - - - - - - - - - - -
KeyValue
pubkey
btcpubkey
rmd160
NXT
notary
status
-
-
-
- -
-

Use this section to check if the node IP you wish to add is allready active as peer of your coin:

-
-
- -
-
-
- -
-
-
SuperNET Peers:
-

-
Raw Peers:
-

+ + +
+
+

Wallet Settings

+
+
+ +
+
+ + + + + + + + + + + + + +
KeyValue
pubkey
btcpubkey
rmd160
NXT
notary
status
+
-
-

Use this section to add a peer IP to a selected coin:

-
-
- -
-
- -
-
-
- -
+
+ +
+
+
+ +
+

Use this section to check if the node IP you wish to add is allready active as peer of your coin:

+
+
+ +
+
+
+ +
+
+
SuperNET Peers:
+

+
Raw Peers:
+

+
+
+ +
+

Use this section to add a peer IP to a selected coin:

+
+
+ +
+
+ +
+
+
+ +
+
+
+
+
-
-
- Wallet Backup section to be updated soon. -
-
-

Only the active coin wallet wif keys will be shown here.
- If you don't see a wif key for the coin you are looking for please active it by adding it from EasyDEX Dashboard.
- You can use these wif keys to import to another coin wallets. Please keep these keys extra safe and secure.

-
-
-
- - + +
+ +
+
+ Wallet Backup section to be updated soon.
-
- +
+
+ + +
+ +
+
+ Fiat currency settings section to be updated soon.
- +
+
-
-
+
+ +
+
+

Only the active coin wallet wif keys will be shown here.
If you don't see a wif key for the coin you are looking for please active it by adding it from EasyDEX Dashboard.
You can use these wif keys to import to another coin wallets. Please keep these keys extra safe and secure.

+
+
+
+ + +
+
+ +
+
+ +
+
+ +
-
-
- Fiat currency settings section to be updated soon. +
+
+ + +
-
- +
+
+

About Iguana

Page content goes here

+