Merge remote-tracking branch 'dashpay/master'

_i18n/en.yml

@@ -32,31 +32,31 @@ pages:
     install-text:
     install-btn: Learn More
 
-    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>
+    how-heading: Manual Installation
+    how-text: >
+      There are a few cases when manually installing a WordPress Plugin is appropriate.
 
-        2. From the WordPress Admin interface, click plugins then click "Add New".
+      If you wish to control the placement and process of installing a WordPress Plugin.
 
-        3. At the top of the screen find the "Upload Plugin" button and choose the zip file download previously.
+      If your server does not permit automatic installation of a WordPress Plugin.
 
-        4. Click the "Activate Plugin" button, once the plugin has been activated you'll find it included in the listing of Installed Plugins.
+      The WordPress Plugin is not in the WordPress Plugins Directory.
 
-        5. From "Installed Plugins", locate "Dashpay - WooCommerce Gateway" and click on Settings.
+      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.
 
-        6. Select "DASH Checkout" from the list of available payment methods.
+      Backup your site completely before proceeding.
 
-        7. Check the "Enable this payment gateway" checkbox.
 
-        8. Configure the "Payment Service API" and "Insight API" option to point to your server.
 
-    how-text-more-link: Click here
-    how-text-more-link-text:  to learn how to configure your Payment Gateway 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-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-plugin-link: Get Plugin
-    how-install-btn: Install Plugin
+    how-text-link: Get Plugin
+    how-install-link: Install Plugin
 
   graphics:
     title: Dash Official Website | Dash Crypto Currency

_includes/hero/woocommerce.html

@@ -10,18 +10,17 @@
 
 	<!-- 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/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>
+			<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>
 		</div>
-		<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>
+		<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>
 	</div>
 
 	<!-- Hero stripe -->

woocommerce/index.html

@@ -57,12 +57,10 @@ 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>
-					<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>
+
+					<a href="http://codex.wordpress.org/Managing_Plugins#Manual_Plugin_Installation" class="btn-blue" target="_blank">{% t pages.woocommerce.how-install-link %}</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 %}">
@@ -78,7 +76,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-plugin-link %}</a>
+					<a href="https://wordpress.org/plugins/" class="btn-blue" target="_blank">{% t pages.woocommerce.how-text-link %}</a>
 
 				</div>
 				<div class="col-sm-6">