Merge remote-tracking branch 'dashpay/master'

This commit is contained in:
tungfa 2017-03-23 15:58:13 +08:00
commit 1a57e2431e
6 changed files with 132 additions and 147 deletions

View file

@ -16,13 +16,13 @@
links:
-
label: Download Installer
url: "/binaries/dashcore-0.12.1.3-win64-setup.exe"
url: "/binaries/dashcore-0.12.1.4-win64-setup.exe"
-
label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.3/SHA256SUMS.asc"
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.4/SHA256SUMS.asc"
-
label: PGP
url: "/binaries/dashcore-0.12.1.3-win64-setup.exe.asc"
url: "/binaries/dashcore-0.12.1.4-win64-setup.exe.asc"
- name: Dash Core Win/64 ZIP
description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
@ -42,13 +42,13 @@
links:
-
label: Download ZIP
url: "/binaries/dashcore-0.12.1.3-win64.zip"
url: "/binaries/dashcore-0.12.1.4-win64.zip"
-
label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.3/SHA256SUMS.asc"
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.4/SHA256SUMS.asc"
-
label: PGP
url: "/binaries/dashcore-0.12.1.3-win64.zip.asc"
url: "/binaries/dashcore-0.12.1.4-win64.zip.asc"
- name: "Dash Core Win/32 Installer"
description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
@ -68,13 +68,13 @@
links:
-
label: Download Installer
url: "/binaries/dashcore-0.12.1.3-win32-setup.exe"
url: "/binaries/dashcore-0.12.1.4-win32-setup.exe"
-
label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.3/SHA256SUMS.asc"
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.4/SHA256SUMS.asc"
-
label: PGP
url: "/binaries/dashcore-0.12.1.3-win32-setup.exe.asc"
url: "/binaries/dashcore-0.12.1.4-win32-setup.exe.asc"
- name: "Dash Core Win/32 ZIP"
description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
@ -94,13 +94,13 @@
links:
-
label: Download ZIP
url: "/binaries/dashcore-0.12.1.3-win32.zip"
url: "/binaries/dashcore-0.12.1.4-win32.zip"
-
label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.3/SHA256SUMS.asc"
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.4/SHA256SUMS.asc"
-
label: PGP
url: "/binaries/dashcore-0.12.1.3-win32.zip.asc"
url: "/binaries/dashcore-0.12.1.4-win32.zip.asc"
- name: Dash Core Linux 32 Bit
description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
@ -122,13 +122,13 @@
links:
-
label: Download TGZ
url: "/binaries/dashcore-0.12.1.3-linux32.tar.gz"
url: "/binaries/dashcore-0.12.1.4-linux32.tar.gz"
-
label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.3/SHA256SUMS.asc"
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.4/SHA256SUMS.asc"
-
label: PGP
url: "/binaries/dashcore-0.12.1.3-linux32.tar.gz.asc"
url: "/binaries/dashcore-0.12.1.4-linux32.tar.gz.asc"
- name: Dash Core Linux 64 Bit
description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
@ -148,13 +148,13 @@
links:
-
label: Download TGZ
url: "/binaries/dashcore-0.12.1.3-linux64.tar.gz"
url: "/binaries/dashcore-0.12.1.4-linux64.tar.gz"
-
label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.3/SHA256SUMS.asc"
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.4/SHA256SUMS.asc"
-
label: PGP
url: "/binaries/dashcore-0.12.1.3-linux64.tar.gz.asc"
url: "/binaries/dashcore-0.12.1.4-linux64.tar.gz.asc"
- name: Dash Core Raspberry Pi 2
description: Official Dash Core fully featured Wallet and P2P Client, including InstantSend, PrivateSend, Governance and Masternode management features
@ -174,13 +174,13 @@
links:
-
label: Download TGZ
url: "/binaries/dashcore-0.12.1.3-RPi2.tar.gz"
url: "/binaries/dashcore-0.12.1.4-RPi2.tar.gz"
-
label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.3/SHA256SUMS.asc"
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.4/SHA256SUMS.asc"
-
label: PGP
url: "/binaries/dashcore-0.12.1.3-RPi2.tar.gz.asc"
url: "/binaries/dashcore-0.12.1.4-RPi2.tar.gz.asc"
#- name: Dash Electrum 32/64bit
# description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
@ -333,13 +333,13 @@
links:
-
label: Download DMG
url: "/binaries/dashcore-0.12.1.3-osx.dmg"
url: "/binaries/dashcore-0.12.1.4-osx.dmg"
-
label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.3/SHA256SUMS.asc"
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.4/SHA256SUMS.asc"
-
label: PGP
url: "/binaries/dashcore-0.12.1.3-osx.dmg.asc"
url: "/binaries/dashcore-0.12.1.4-osx.dmg.asc"
#- name: Dash Electrum
# description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.

View file

@ -474,7 +474,7 @@ pages:
wallets-desktop-subtitle: Dash Desktop Wallets are available with different features and security.
wallets-desktop-latest: >
Latest: 25th Feb 2017
wallets-desktop-current-version: v0.12.1.3
wallets-desktop-current-version: v0.12.1.4
wallets-mobile-header: Mobile
wallets-mobile-subtitle: Dash Mobile Wallets are available with different features and security, run from your Mobile (Phone, Tablet,..) device
wallets-hardware-header: Hardware
@ -512,11 +512,11 @@ pages:
modal-win-core-source-code-key: Source Code
modal-win-core-source-code-value: .(link/ closed source)
modal-core-users-text: General Users
modal-core-users-value: 0.12.1.3
modal-core-users-value: 0.12.1.4
modal-core-masternode-text: Masternode Operators
modal-core-masternode-value: 0.12.1.3
modal-core-masternode-value: 0.12.1.4
modal-core-pool-text: Pool Operators
modal-core-pool-value: 0.12.1.3
modal-core-pool-value: 0.12.1.4
payments:
title: Dash Payment Processors
@ -556,11 +556,11 @@ pages:
modal-win-core-source-code-key: Source Code
modal-win-core-source-code-value: .(link/ closed source)
modal-core-users-text: General Users
modal-core-users-value: 0.12.1.3
modal-core-users-value: 0.12.1.4
modal-core-masternode-text: Masternode Operators
modal-core-masternode-value: 0.12.1.3
modal-core-masternode-value: 0.12.1.4
modal-core-pool-text: Pool Operators
modal-core-pool-value: 0.12.1.3
modal-core-pool-value: 0.12.1.4
disclaimer-text: >
DISCLAIMER: This list is provided for informational purposes only. Services listed here have not been evaluated or endorsed by the Dash developers and no guarantees are made as to the accuracy of this information. Please exercise discretion when using third-party services.

View file

@ -274,11 +274,11 @@ pages:
modal-win-core-source-code-key: Code source
modal-win-core-source-code-value: .(lien/source fermée)
modal-core-users-text: Utilisateurs ordinaires
modal-core-users-value: 0.12.1.3
modal-core-users-value: 0.12.1.4
modal-core-masternode-text: Opérateurs de masternode
modal-core-masternode-value: 0.12.1.3
modal-core-masternode-value: 0.12.1.4
modal-core-pool-text: Opérateurs de pool
modal-core-pool-value: 0.12.1.3
modal-core-pool-value: 0.12.1.4
contact:
@ -373,7 +373,7 @@ pages:
hero-image: get-dash-n.jpg
hero-heading: Télécharger le portefeuille Dash
hero-text: Pour commencer, téléchargez la dernière version du logiciel Dash
hero-wallet-version: Portefeuille Dash (v. 0.12.1.3) pour MacOS
hero-wallet-version: Portefeuille Dash (v. 0.12.1.4) pour MacOS
hero-wallet-version-select: Choisissez-en un autre
hero-platform-not-detected: "Nous sommes désolés, mais votre plateforme n'a pas pu être détectée automatiquement. Veuillez sélectionner \"Tous les portefeuilles\" pour trouver une version compatible."
hero-download-btn: Télécharger

View file

@ -140,28 +140,3 @@ description: pages.mining.description
</div>
<script type="text/javascript">
window.onload = function () {
$( document ).ready(function(){
// Get the blockchain info
$.ajax({
url: "{{ site.api }}/chain/latestBlocks/"
})
.done(function(response){
var blocks = response.blocks;
blocks.map(function(block){
var height = block.height,
age = moment.unix(block.time).format("LLL"),
txs = block.txlength,
out = block.cbvalue,
difficulty = block.difficulty;
$("#blocks>tbody").append('<tr><td data-header="Height">' + height + '</td><td data-header="Block Time">' + age + '</td><td data-header="Transactions">' + txs + '</td><td data-header="Value Out">' + out + '</td><td data-header="Difficulty">' + difficulty + '</td></tr>');
});
});
});
}
</script>

View file

@ -124,90 +124,3 @@ description: pages.currency.description
</section>
</div>
<script type="text/javascript">
window.onload = function () {
$( document ).ready(function(){
// Get the exchange data
$.ajax({
url: "{{ site.api }}/exchange/",
error: function(jqXHR, textStatus, errorThrown) {
console.log(jqXHR);
console.log(textStatus);
console.log('errorThrown:');
}
})
.done(function(response){
var exchanges = response;
exchanges.map(function(exchange){
if(exchange){
console.log('exchange',exchange);
var name = exchange.exchange,
url = exchange.url
volume = "$" + formatCurrency(exchange.volume,0),
price = "$" + formatCurrency(exchange.price),
change = formatNumber(exchange.percent_change);
$("#exchanges>tbody").append('<tr><td data-header="Exchange"><a target="_blank" href="' + url + '">' + name + '</a></td><td data-header="Volume (24h)">' + volume + '</td><td data-header="Price">' + price + '</td><td data-header="Volume (%)">' + change + '%</td></tr>');
}
});
});
// Get the current number of masternodes.
$.ajax({
url: "{{ site.api }}/masternodes/stats/"
})
.done(function(response){
console.log('masternode stats', response.stats);
var masternodes_count = formatNumber(response.stats['count']),
masternodes_max = formatNumber(response.stats['max']);
$("#masternodes_count").text(masternodes_count);
$("#masternodes_max").text(masternodes_max);
});
// Get the budget proposals
$.ajax({
url: "{{ site.api }}/budgets/"
})
.done(function(response){
var proposals = response.proposals;
proposals.map(function(proposal){
var title = proposal.title ? proposal.title : proposal.name,
url = proposal.dw_url,
owner = proposal.owner_username,
votes_yes = proposal.yes,
votes_no = proposal.no,
required_votes = proposal.remaining_yes_votes_until_funding,
amount_monthly = formatCurrency(proposal.monthly_amount)
will_be_funded = proposal.will_be_funded ? "yes" : "no";
$("#budgets>tbody").append('<tr><td data-header="Title"><a href="' + url + '" target="_blank">' + title + '</a></td><td data-header="Owner">' + owner + '</td><td data-header="Votes (yes/no)">' + votes_yes + '/' + votes_no + '</td><td data-header="Votes Required">' + required_votes + '</td><td data-header="Monthly Amount">' + amount_monthly + '</td><td data-header="Will be Funded">' + will_be_funded + '</td></tr>');
});
});
// Get the blockchain info
$.ajax({
url: "{{ site.api }}/chain/latestBlocks/"
})
.done(function(response){
var blocks = response.blocks;
blocks.map(function(block){
var height = block.height,
age = moment.unix(block.time).format("LLL"),
txs = block.txlength,
out = block.cbvalue,
difficulty = block.difficulty;
$("#blocks>tbody").append('<tr><td data-header="Height">' + height + '</td><td data-header="Block Time">' + age + '</td><td data-header="Transactions">' + txs + '</td><td data-header="Value Out">' + out + '</td><td data-header="Difficulty">' + difficulty + '</td></tr>');
});
});
});
}
</script>

97
src/js/tables.js Normal file
View file

@ -0,0 +1,97 @@
;(function ($) {
'use strict';
$(document).ready(function () {
var siteApi = '/api/v1/';
if($('#blocks').length){
// Get the blockchain info
$.ajax({
url: siteApi+"chain/latestBlocks/"
})
.done(function(response){
var blocks = response.blocks;
blocks.map(function(block){
var height = block.height,
age = moment.unix(block.time).format("LLL"),
txs = block.txlength,
out = block.cbvalue,
difficulty = block.difficulty;
$("#blocks>tbody").append('<tr><td data-header="Height">' + height + '</td><td data-header="Block Time">' + age + '</td><td data-header="Transactions">' + txs + '</td><td data-header="Value Out">' + out + '</td><td data-header="Difficulty">' + difficulty + '</td></tr>');
});
});
}
if($('#exchanges').length){
// Get the exchange data
$.ajax({
url: siteApi+"exchange/",
error: function(jqXHR, textStatus, errorThrown) {
console.log(jqXHR);
console.log(textStatus);
console.log('errorThrown:');
}
})
.done(function(response){
var exchanges = response;
exchanges.map(function(exchange){
if(exchange){
console.log('exchange',exchange);
var name = exchange.exchange,
url = exchange.url
volume = "$" + formatCurrency(exchange.volume,0),
price = "$" + formatCurrency(exchange.price),
change = formatNumber(exchange.percent_change);
$("#exchanges>tbody").append('<tr><td data-header="Exchange"><a target="_blank" href="' + url + '">' + name + '</a></td><td data-header="Volume (24h)">' + volume + '</td><td data-header="Price">' + price + '</td><td data-header="Volume (%)">' + change + '%</td></tr>');
}
});
});
}
if($('#masternodes_count').length){
// Get the current number of masternodes.
$.ajax({
url: siteApi+"masternodes/stats/"
})
.done(function(response){
console.log('masternode stats', response.stats);
var masternodes_count = formatNumber(response.stats['count']),
masternodes_max = formatNumber(response.stats['max']);
$("#masternodes_count").text(masternodes_count);
$("#masternodes_max").text(masternodes_max);
});
}
if($('#budgets').length){
// Get the budget proposals
$.ajax({
url: siteApi+"budgets/"
})
.done(function(response){
var proposals = response.proposals;
proposals.map(function(proposal){
var title = proposal.title ? proposal.title : proposal.name,
url = proposal.dw_url,
owner = proposal.owner_username,
votes_yes = proposal.yes,
votes_no = proposal.no,
required_votes = proposal.remaining_yes_votes_until_funding,
amount_monthly = formatCurrency(proposal.monthly_amount)
will_be_funded = proposal.will_be_funded ? "yes" : "no";
$("#budgets>tbody").append('<tr><td data-header="Title"><a href="' + url + '" target="_blank">' + title + '</a></td><td data-header="Owner">' + owner + '</td><td data-header="Votes (yes/no)">' + votes_yes + '/' + votes_no + '</td><td data-header="Votes Required">' + required_votes + '</td><td data-header="Monthly Amount">' + amount_monthly + '</td><td data-header="Will be Funded">' + will_be_funded + '</td></tr>');
});
});
}
});
}(jQuery));