diff --git a/_data/merchants-cards.yml b/_data/merchants-cards.yml index 5f8e76f..cc683e2 100644 --- a/_data/merchants-cards.yml +++ b/_data/merchants-cards.yml @@ -1,25 +1,20 @@ - name: ShakePay - title: Debit Card url: https://shakepay.co image: shakepay_logo.png - name: SpectroCoin - title: Debit Card url: https://spectrocoin.com/ image: SpectroCoin.jpg - name: UQUID - title: Debit Card url: https://uquid.com/dash-debit-card image: UQUID.jpg - name: Bitwala - title: Debit Card url: https://my.bitwa.la image: Bitwala.jpg - name: Wirex - title: Debit Card url: https://wirexapp.com image: Wirex.jpg diff --git a/_data/merchants-metals.yml b/_data/merchants-metals.yml index 3e3377b..9ca482a 100644 --- a/_data/merchants-metals.yml +++ b/_data/merchants-metals.yml @@ -5,4 +5,4 @@ - name: Bitgild url: http://www.bitgild.com - image: Bitgild.png + image: Bitgild.jpg diff --git a/_data/merchants-stores.yml b/_data/merchants-stores.yml index 5bbd004..f8911a6 100644 --- a/_data/merchants-stores.yml +++ b/_data/merchants-stores.yml @@ -42,7 +42,7 @@ - name: Misconduct Wine Company title: Winery url: http://www.misconductwineco.com - image: misconductwine_logo.jpg.jpg + image: misconductwine_logo.jpg - name: Party Cakes4u title: Cake Shop @@ -57,7 +57,7 @@ - name: Healthiverse title: Health url: http://healthiverse.net - image: design.jpg + image: Healthiverse.jpg - name: Above All House Plants title: House/ Garden diff --git a/_i18n/en.yml b/_i18n/en.yml index a1fa567..9798621 100644 --- a/_i18n/en.yml +++ b/_i18n/en.yml @@ -163,7 +163,7 @@ pages: integrate-heading: Do you take Dash? integrate-text: Integrate instant, anonymous payments to your webstore, app or retail outlet integrate-btn: Integrate Dash - integrate-link: https://dashpay.atlassian.net/wiki/display/DOC/Merchants+IX+Payment+%28dashvend%29+Guide + integrate-link: https://dashpay.atlassian.net/wiki/display/DOC/Integrate+Dash+Payments integrate-payment-processor-btn: Payment Processors integrate-payment-processor-link: https://dashpay.atlassian.net/wiki/display/DOC/Payment+Processors integrate-contact-btn: Contact Our Team diff --git a/_includes/footer.html b/_includes/footer.html index 3615909..38cff15 100644 --- a/_includes/footer.html +++ b/_includes/footer.html @@ -3,18 +3,18 @@ {% t nav.get-dash %}
{% t nav.participate %}
@@ -22,10 +22,10 @@
{% t nav.currency %}
@@ -43,10 +43,10 @@
{% t nav.project %}
@@ -55,13 +55,13 @@ {% t nav.social %} @@ -69,7 +69,7 @@
{% t nav.tos %} {% t nav.sitemap %} - {% t nav.sitesource %} + {% t nav.sitesource %} {% t nav.contact %}
diff --git a/_includes/hero/merchants.html b/_includes/hero/merchants.html index 4c2cc0d..00643a0 100644 --- a/_includes/hero/merchants.html +++ b/_includes/hero/merchants.html @@ -14,8 +14,8 @@

{% t pages.merchants.hero-text %}

- {% t pages.merchants.hero-map-btn %} - {% t pages.merchants.hero-integrate-btn %} + {% t pages.merchants.hero-map-btn %} + {% t pages.merchants.hero-integrate-btn %} {% t pages.merchants.hero-getlisted-btn %}
diff --git a/assets/img/community/dashdotalhpa_logo.png b/assets/img/community/dashdotalpha_logo.png similarity index 100% rename from assets/img/community/dashdotalhpa_logo.png rename to assets/img/community/dashdotalpha_logo.png diff --git a/assets/img/community/dashforum_logo.png b/assets/img/community/dashforum_logo.png new file mode 100644 index 0000000..91f4d6b Binary files /dev/null and b/assets/img/community/dashforum_logo.png differ diff --git a/assets/img/merchants/SeymoreLocksmith.jpg b/assets/img/merchants/SeymourLocksmith.jpg similarity index 100% rename from assets/img/merchants/SeymoreLocksmith.jpg rename to assets/img/merchants/SeymourLocksmith.jpg diff --git a/community/index.html b/community/index.html index a2fc203..c0863c6 100644 --- a/community/index.html +++ b/community/index.html @@ -24,10 +24,10 @@ description: pages.community.description
- +
-

DashTalk

+

Dash Forum
@@ -132,7 +132,7 @@ description: pages.community.description
- +
diff --git a/currency/index.html b/currency/index.html index 58c48c3..410db20 100644 --- a/currency/index.html +++ b/currency/index.html @@ -141,7 +141,6 @@ description: pages.currency.description }); }); - // Get the current number of masternodes. $.ajax({ url: "{{ site.api }}/masternodes/stats/" @@ -155,7 +154,6 @@ description: pages.currency.description $("#masternodes_max").text(masternodes_max); }); - // Get the budget proposals $.ajax({ url: "{{ site.api }}/budgets/" @@ -173,14 +171,11 @@ description: pages.currency.description amount_monthly = formatCurrency(proposal.monthly_amount) will_be_funded = proposal.will_be_funded ? "yes" : "no"; - - - $("#budgets>tbody").append('' + title + '' + owner + '' + votes_yes + '/' + votes_no + '' + required_votes + '' + amount_monthly + '' + will_be_funded + ''); + $("#budgets>tbody").append('' + title + '' + owner + '' + votes_yes + '/' + votes_no + '' + required_votes + '' + amount_monthly + '' + will_be_funded + ''); }); }); - // Get the blockchain info $.ajax({ url: "{{ site.api }}/chain/latestBlocks/" diff --git a/get-dash/index.html b/get-dash/index.html index ee799b9..61641a5 100644 --- a/get-dash/index.html +++ b/get-dash/index.html @@ -32,7 +32,7 @@ description: pages.get-dash.description

{% t pages.get-dash.setup-heading %}

{% t pages.get-dash.setup-text %}

- {% t pages.get-dash.setup-btn %} + {% t pages.get-dash.setup-btn %}
@@ -40,7 +40,7 @@ description: pages.get-dash.description

{% t pages.get-dash.buy-heading %}

{% t pages.get-dash.buy-text %}

- {% t pages.get-dash.buy-btn %} + {% t pages.get-dash.buy-btn %}
@@ -48,7 +48,7 @@ description: pages.get-dash.description

{% t pages.get-dash.trade-heading %}

{% t pages.get-dash.trade-text %}

- {% t pages.get-dash.trade-btn %} + {% t pages.get-dash.trade-btn %}
@@ -56,7 +56,7 @@ description: pages.get-dash.description

{% t pages.get-dash.atm-heading %}

{% t pages.get-dash.atm-text %}

- {% t pages.get-dash.atm-btn %} + {% t pages.get-dash.atm-btn %}
@@ -64,7 +64,7 @@ description: pages.get-dash.description

{% t pages.get-dash.shop-heading %}

{% t pages.get-dash.shop-text %}

- {% t pages.get-dash.shop-btn %} + {% t pages.get-dash.shop-btn %}
@@ -72,7 +72,7 @@ description: pages.get-dash.description

{% t pages.get-dash.visa-heading %}

{% t pages.get-dash.visa-text %}

- {% t pages.get-dash.visa-btn %} + {% t pages.get-dash.visa-btn %}
diff --git a/participate/index.html b/participate/index.html index 1cc9f43..09a9b92 100644 --- a/participate/index.html +++ b/participate/index.html @@ -29,7 +29,7 @@ description: pages.participate.description

{% t pages.participate.masternode-heading %}

{% t pages.participate.masternode-text %}

- {% t pages.participate.masternode-btn %} + {% t pages.participate.masternode-btn %}
@@ -37,7 +37,7 @@ description: pages.participate.description

{% t pages.participate.mining-heading %}

{% t pages.participate.mining-text %}

- {% t pages.participate.mining-btn %} + {% t pages.participate.mining-btn %}
@@ -45,7 +45,7 @@ description: pages.participate.description

{% t pages.participate.funding-heading %}

{% t pages.participate.funding-text %}

- {% t pages.participate.funding-btn %} + {% t pages.participate.funding-btn %}
@@ -53,8 +53,8 @@ description: pages.participate.description

{% t pages.participate.integrate-heading %}

{% t pages.participate.integrate-text %}

- {% t pages.participate.integrate-btn %} - {% t pages.participate.integrate-payment-processor-btn %} + {% t pages.participate.integrate-btn %} + {% t pages.participate.integrate-payment-processor-btn %} {% t pages.participate.integrate-contact-btn %}