Merge remote-tracking branch 'dashpay/master'

This commit is contained in:
tungfa 2017-02-21 09:05:02 +08:00
commit 2b2eaf3226
4 changed files with 52 additions and 49 deletions

View file

@ -16,13 +16,13 @@
links:
-
label: Download Installer
url: "/binaries/dashcore-0.12.1.0-win64-setup.exe"
url: "/binaries/dashcore-0.12.1.1-win64-setup.exe"
-
label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc"
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.1/SHA256SUMS.asc"
-
label: PGP
url: "/binaries/dashcore-0.12.1.0-win64-setup.exe.asc"
url: "/binaries/dashcore-0.12.1.1-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.0-win64.zip"
url: "/binaries/dashcore-0.12.1.1-win64.zip"
-
label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc"
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.1/SHA256SUMS.asc"
-
label: PGP
url: "/binaries/dashcore-0.12.1.0-win64.zip.asc"
url: "/binaries/dashcore-0.12.1.1-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.0-win32-setup.exe"
url: "/binaries/dashcore-0.12.1.1-win32-setup.exe"
-
label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc"
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.1/SHA256SUMS.asc"
-
label: PGP
url: "/binaries/dashcore-0.12.1.0-win32-setup.exe.asc"
url: "/binaries/dashcore-0.12.1.1-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.0-win32.zip"
url: "/binaries/dashcore-0.12.1.1-win32.zip"
-
label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc"
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.1/SHA256SUMS.asc"
-
label: PGP
url: "/binaries/dashcore-0.12.1.0-win32.zip.asc"
url: "/binaries/dashcore-0.12.1.1-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.0-linux32.tar.gz"
url: "/binaries/dashcore-0.12.1.1-linux32.tar.gz"
-
label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc"
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.1/SHA256SUMS.asc"
-
label: PGP
url: "/binaries/dashcore-0.12.1.0-linux32.tar.gz.asc"
url: "/binaries/dashcore-0.12.1.1-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.0-linux64.tar.gz"
url: "/binaries/dashcore-0.12.1.1-linux64.tar.gz"
-
label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc"
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.1/SHA256SUMS.asc"
-
label: PGP
url: "/binaries/dashcore-0.12.1.0-linux64.tar.gz.asc"
url: "/binaries/dashcore-0.12.1.1-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.0-RPi2.tar.gz"
url: "/binaries/dashcore-0.12.1.1-RPi2.tar.gz"
-
label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc"
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.1/SHA256SUMS.asc"
-
label: PGP
url: "/binaries/dashcore-0.12.1.0-RPi2.tar.gz.asc"
url: "/binaries/dashcore-0.12.1.1-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.0-osx.dmg"
url: "/binaries/dashcore-0.12.1.1-osx.dmg"
-
label: Hash File
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.0/SHA256SUMS.asc"
url: "https://github.com/dashpay/dash/releases/download/v0.12.1.1/SHA256SUMS.asc"
-
label: PGP
url: "/binaries/dashcore-0.12.1.0-osx.dmg.asc"
url: "/binaries/dashcore-0.12.1.1-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

@ -32,31 +32,31 @@ pages:
install-text:
install-btn: Learn More
how-heading: Manual Installation
how-text: >
There are a few cases when manually installing a WordPress Plugin is appropriate.
how-heading: Installation
how-text: |
1. Download Dash-Woocommerce-Plugin.zip from <a href="https://github.com/snogcel/dash-woocommerce-plugin/blob/master/dist/dash-woocommerce-plugin.zip.">https://github.com/snogcel/dash-woocommerce-plugin/blob/master/dist/dash-woocommerce-plugin.zip.</a>
If you wish to control the placement and process of installing a WordPress Plugin.
2. From the WordPress Admin interface, click plugins then click "Add New".
If your server does not permit automatic installation of a WordPress Plugin.
3. At the top of the screen find the "Upload Plugin" button and choose the zip file download previously.
The WordPress Plugin is not in the WordPress Plugins Directory.
4. Click the "Activate Plugin" button, once the plugin has been activated you'll find it included in the listing of Installed Plugins.
Installation of a WordPress Plugin manually requires FTP familiarity and the awareness that you may put your site at risk if you install a WordPress Plugin incompatible with the current version or from an unreliable source.
5. From "Installed Plugins", locate "Dashpay - WooCommerce Gateway" and click on Settings.
Backup your site completely before proceeding.
6. Select "DASH Checkout" from the list of available payment methods.
7. Check the "Enable this payment gateway" checkbox.
8. Configure the "Payment Service API" and "Insight API" option to point to your server.
Download your WordPress Plugin to your desktop.
If downloaded as a zip archive, extract the Plugin folder to your desktop.
Read through the "readme" file thoroughly to ensure you follow the installation instructions.
With your FTP program, upload the Plugin folder to the wp-content/plugins folder in your WordPress directory online.
how-text-more-link: Click here
how-text-more-link-text: to learn how to configure your Payment Gateway Server
how-text-plugin: Go to the Plugin screen and find the newly uploaded Plugin in the list.
Click Activate to activate it.
Check the Details readme file for customization and further instructions.
how-text-link: Get Plugin
how-install-link: Install Plugin
how-text-plugin-link: Get Plugin
how-install-btn: Install Plugin
graphics:
title: Dash Official Website | Dash Crypto Currency
@ -274,11 +274,11 @@ pages:
modal-win-core-source-code-key: Source Code
modal-win-core-source-code-value: .&#40link/ closed source&#41
modal-core-users-text: General Users
modal-core-users-value: 0.12.1.0
modal-core-users-value: 0.12.1.1
modal-core-masternode-text: Masternode Operators
modal-core-masternode-value: 0.12.1.0
modal-core-masternode-value: 0.12.1.1
modal-core-pool-text: Pool Operators
modal-core-pool-value: 0.12.1.0
modal-core-pool-value: 0.12.1.1
contact:

View file

@ -10,17 +10,18 @@
<!-- Navigation -->
{% include nav-desktop.html %}
{% include base.html %}
{% include base.html %}
<!-- Hero content -->
<div class="hero__content">
<h1 class="hero__title">{% t pages.woocommerce.hero-heading %}</h1>
<p class="hero__lead">{% t pages.woocommerce.hero-text %}</p>
<div class="hero__buttons">
<a href="https://github.com/nmarley/dashpayments-for-woocommerce" class="btn-blue-solid btn-large" _target="blank">{% t pages.woocommerce.hero-btn %}</a>
<a href="https://github.com/snogcel/dash-woocommerce-plugin/blob/master/dist/dash-woocommerce-plugin.zip" class="btn-blue-solid btn-large" _target="blank">{% t pages.woocommerce.hero-btn-download %}</a>
<a href="https://github.com/snogcel/dash-woocommerce-plugin" class="btn-blue-solid btn-large" _target="blank">{% t pages.woocommerce.hero-btn %}</a>
<a href="https://github.com/snogcel/dash-woocommerce-plugin/blob/master/dist/dash-woocommerce-plugin.zip
" class="btn-blue-solid btn-large" _target="blank">{% t pages.woocommerce.hero-btn-download %}</a>
</div>
<p>{% t pages.woocommerce.hero-description %} <a href="https://github.com/nmarley/dashpayments-for-woocommerce#requirements" _target="blank">{% t pages.woocommerce.hero-description-link %}</a></p>
<p>{% t pages.woocommerce.hero-description %} <a href="https://dashpay.atlassian.net/wiki/display/DOC/Dash+Payment+Processor+Overview" _target="blank">{% t pages.woocommerce.hero-description-link %}</a></p>
</div>
<!-- Hero stripe -->

View file

@ -57,10 +57,12 @@ description: pages.woocommerce.description
<div class="row">
<div class="col-sm-6 col-sm-push-6">
<h2>{% t pages.woocommerce.how-heading %}</h2>
<p></p>
<p>{% tmd pages.woocommerce.how-text %}</p>
<a href="http://codex.wordpress.org/Managing_Plugins#Manual_Plugin_Installation" class="btn-blue" target="_blank">{% t pages.woocommerce.how-install-link %}</a>
<p>
<a href="https://dashpay.atlassian.net/wiki/display/DOC/Dash+Payment+Processor" target="_blank">{% t pages.woocommerce.how-text-more-link %}</a>
{% t pages.woocommerce.how-text-more-link-text %}
</p>
<a href="http://codex.wordpress.org/Managing_Plugins#Manual_Plugin_Installation" class="btn-blue" target="_blank">{% t pages.woocommerce.how-install-btn %}</a>
</div>
<div class="col-sm-6 col-sm-pull-6 ">
<img src="/assets/img/woocommerce/woocommerce_plugin.jpg" alt="{% t pages.update.update-heading %}">
@ -76,7 +78,7 @@ description: pages.woocommerce.description
<h2>{% t pages.woocommerce.install-heading %}</h2>
<p>{% tmd pages.woocommerce.install-text %}</p>
<p>{% tmd pages.woocommerce.how-text-plugin %}</p>
<a href="https://wordpress.org/plugins/" class="btn-blue" target="_blank">{% t pages.woocommerce.how-text-link %}</a>
<a href="https://wordpress.org/plugins/" class="btn-blue" target="_blank">{% t pages.woocommerce.how-text-plugin-link %}</a>
</div>
<div class="col-sm-6">