fixed masternodes mage

_i18n/en.yml

@@ -8,20 +8,16 @@ pages:
 
     hero-heading: Masternodes
     hero-text: Masternodes are computers that run a dash wallet and make decisions, such as locking transactions with InstantSend, coordinate mixing of coins, and voting on budget funding.
-    hero-what-btn: Buy with fiat currency
+    hero-what-btn: What is a Masternode
-    hero-how-btn: Buy with cryptocurrency
+    hero-how-btn: How to Set up a Masternode
-    hero-network-btn: Full Exchanges Listing
+    hero-network-btn: Masternode Network
-    hero-p2p-btn: P2P
+    hero-masternode-mining-btn: Masternode vs Mining
 
     marsternode-text: Masternodes are required to have 1000 Dash collateral, a dedicated IP address, and be able to run 24 hours a day without a more than a 1 hr connection loss. Masternodes get paid 45% of the block reward on every block, which is distributed to masternodes one at a time. Typically, around 2 dash is paid to each masternode every 7 days.
 
     what-heading: WHAT IS MASTERNODE?
-    what-text: |
-      In Evolution, you will be able to connect directly with merchants to make purchases or even setup auto debits to pay for subscription services. Every merchant that integrates Dash will be searchable on the blockchain. You’ll be able to rate purchases so the community can decide which vendors are providing quality products and services.”chain and you can rate purchases so the community can decide who’s providing a good service or not.
 
-      Masternodes are also given voting rights on proposals. Each masternode has 1 vote and this vote can be used on budget proposals or important decisions that affect Dash. For a complete list of current proposals please click here.
+    earn-heading: Masternode Income
-
-    earn-heading: EARN A MASTERNODE?
     earn-text: |
       Masternodes cost money and effort to host so they are paid a share of the block reward to incentivize them. With current masternode numbers and rewards masternodes earn approximately a 11% return on 1000 Dash for the year of 2016. This reward falls off in subsequent years but as the value of Dash is rising and the supply of Dash goes down, masternodes should still be sufficiently incentivized.
 
@@ -34,21 +30,22 @@ pages:
     evolution-text: a decentralized payment processor (think a decentralized Paypal).
 
     host-heading: HOST A MASTERNODE
-    host-text-right: |
+    host-text: |
       1000 Dash: Arguably the hardest part. Dash can be obtained from exchanges such as Poloniex, Bittrex and Shapeshift‘s service is also an excellent way. For the full list of places to obtain Dash click here.
 
       A server or a VPS installed with Linux: For the purposes of this guide we will be used Ubuntu 14.04 LTS. We recommend cheap VPSes such as from Vultr and DigitalOcean though any decent provider will do. Generally a low specced one will do. I use the 5 USD ones from Vultr and they work fine.
 
       A dedicated IP address: These usually come with the VPS/server.
 
-    host-text-left: |
       A little time: When I first got into masternodes, there were only a few guides around and did not cover all the scenarios. It took days for me to figure out the best ways to do everything. However, the process now takes a few minutes. Here are a few guides that I hope will make the process a lot easier.
 
       If you can’t be bothered with setting up and maintaining your own and don’t mind paying a little extra, you can go with paid masternode hosters which will greatly simplify the process. A few good ones can be found here.
 
     host-btn: Start Masternode
 
-    host-table-heading: MasterNodes Network
+    hosting-services: Masternode Hosting Services
+    hosting-services-text:
+    hosting-services-btn: Masternode Hosting Services
 
     p2p-text: |
       Text about peer2peer Thanks to incentivization, Dash’s network has grown to 4,100 masternodes since launch in 2014, meaning Dash’s peer-to-peer network is one of the largest in the world.

_includes/hero/masternodes.html

@@ -15,10 +15,10 @@
 		<p class="hero__lead">{% t pages.masternodes.hero-text %}</p>
 
 		<div class="hero__buttons">
-			<a href="#" class="btn-white-solid">{% t pages.masternodes.hero-what-btn %}</a>
+			<a href="https://dashpay.atlassian.net/wiki/x/WIAc" class="btn-white-solid" target="_blank">{% t pages.masternodes.hero-what-btn %}</a>
-			<a href="#" class="btn-white-solid">{% t pages.masternodes.hero-how-btn %}</a>
+			<a href="https://dashpay.atlassian.net/wiki/x/JgAGAg" class="btn-white-solid">{% t pages.masternodes.hero-how-btn %}</a>
-			<a href="#" class="btn-white-solid">{% t pages.masternodes.hero-network-btn %}</a>
+			<a href="https://dashpay.atlassian.net/wiki/x/FoBgAw" class="btn-white-solid" target="_blank">{% t pages.masternodes.hero-masternode-mining-btn%}</a>
-			<a href="#" class="btn-white-solid">{% t pages.masternodes.hero-p2p-btn %}</a>
+			<a href="{{ basenav }}/network/#section-network" class="btn-white-solid" >{% t pages.masternodes.hero-network-btn %}</a>
 		</div>
 	</div>
 

assets/img/masternodes/evol.svg

@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 85 85" style="enable-background:new 0 0 85 85;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#010101;}
-</style>
-<path class="st0" d="M71.8,12.7H15.6c-6.1,0-11.2,5.6-11.2,12.4v34.2c0,6.8,5,12.4,11.2,12.4h56.2C78,71.6,83,66,83,59.2V25.1
-	C82.9,18.3,77.9,12.7,71.8,12.7z M15.6,17.1h56.2c3.7,0,6.8,3.6,6.8,8v2.1H8.8v-2.1C8.8,20.7,11.9,17.1,15.6,17.1z M71.8,67.2H15.6
-	c-3.7,0-6.8-3.6-6.8-8V31.5h69.7v27.7C78.6,63.6,75.5,67.2,71.8,67.2z"/>
-<circle class="st0" cx="51.9" cy="22" r="2.7"/>
-<circle class="st0" cx="60.3" cy="22" r="2.7"/>
-<circle class="st0" cx="69.3" cy="22" r="2.7"/>
-<path class="st0" d="M30.9,53.6h18.5l2.9-8.5H33.8l1.4-4.2h20.5c0.6,0,1.1,0.1,1.6,0.4c0.5,0.2,0.8,0.6,1.1,1
-	c0.3,0.4,0.4,0.9,0.5,1.4c0.1,0.5,0,1.1-0.2,1.7l-2.8,8C55.7,54,55.4,54.5,55,55c-0.4,0.5-0.9,1-1.5,1.4c-0.5,0.4-1.1,0.7-1.8,1
-	c-0.6,0.2-1.2,0.4-1.8,0.4H29.4L30.9,53.6"/>
-<polygon class="st0" points="27.1,51.5 39.9,51.5 41.3,47.2 28.5,47.2 "/>
-</svg>

assets/img/masternodes/masternode.svg

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 85 85" style="enable-background:new 0 0 85 85;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#1D75BC;}
-</style>
-<path class="st0" d="M70.6,49.2c0,0.3,0,0.6-0.1,0.9c0,0.1,0,0.1,0,0.2c-0.4,0-0.7-0.1-1.1-0.1c-6.8,0-12.2,5.5-12.2,12.2
-	s5.5,12.2,12.2,12.2s12.2-5.5,12.2-12.2c0-4.3-2.3-8.2-5.8-10.4c0-0.3,0.1-0.6,0.1-0.9c0-0.2,0-0.4,0.1-0.5c0-0.4,0.1-0.7,0.1-1.1
-	c0-0.2,0-0.4,0-0.5c0-0.5,0-1.1,0-1.5c0-10.1-4.5-19.4-12.4-25.7c-1.2-1-3-0.7-4,0.5c-1,1.2-0.7,3,0.5,4c6.6,5.2,10.4,13,10.4,21.2
-	c0,0.5,0,0.9,0,1.3C70.6,48.9,70.6,49.1,70.6,49.2z M76,62.4c0,3.7-3,6.7-6.7,6.7s-6.7-3-6.7-6.7s3-6.7,6.7-6.7
-	C73.1,55.8,76,58.8,76,62.4z M43.1,5.1c-2.3,0-4.4,0.6-6.3,1.8c-3.7,2.3-5.9,6.2-5.9,10.3c-1.4,0.6-2.8,1.3-4.1,2.1
-	c-8.6,5.2-14.3,14-15.6,24c-0.2,1.5,0.9,3,2.4,3.2c0.1,0,0.3,0,0.4,0c1.4,0,2.6-1,2.8-2.4c1.1-8.3,5.8-15.5,12.9-19.8
-	c0.8-0.5,1.6-0.9,2.4-1.4c0.2,0.4,0.4,0.6,0.5,0.9c2.3,3.7,6.1,5.9,10.4,5.9c2.3,0,4.4-0.6,6.3-1.8c2.8-1.7,4.8-4.3,5.6-7.6
-	c0.8-3.2,0.3-6.5-1.4-9.3C51.4,7.3,47.4,5.1,43.1,5.1z M49.6,18.8c-0.5,1.7-1.5,3.2-3,4.1c-1,0.6-2.3,1-3.4,1
-	c-2.3,0-4.5-1.2-5.7-3.2c-1.9-3.2-0.9-7.2,2.3-9.1c1-0.6,2.3-1,3.4-1c2.3,0,4.5,1.2,5.7,3.2C49.7,15.4,50,17.1,49.6,18.8z
-	 M11.7,73.2c1.8,1,3.9,1.5,5.9,1.5s4.1-0.5,5.9-1.5c0.3,0.2,0.5,0.4,0.7,0.5c0.2,0.1,0.3,0.3,0.5,0.4c0.3,0.2,0.6,0.4,0.9,0.6
-	c0.2,0.1,0.3,0.2,0.5,0.3c0.5,0.3,0.9,0.5,1.4,0.8l0,0l0,0c5,2.8,10.4,4.1,15.9,4.1c4.2,0,8.5-0.8,12.5-2.5c1.4-0.6,2.1-2.3,1.5-3.7
-	c-0.6-1.4-2.3-2.1-3.7-1.5c-7.7,3.2-16.3,2.7-23.6-1.4l0,0c-0.4-0.2-0.7-0.5-1.2-0.6c-0.1-0.1-0.3-0.2-0.4-0.3
-	c-0.3-0.2-0.5-0.4-0.7-0.5c-0.1,0-0.1-0.1-0.1-0.1c0.2-0.3,0.4-0.6,0.5-0.9c3.3-5.9,1.2-13.3-4.7-16.7c-1.8-1-3.9-1.5-5.9-1.5
-	c-4.4,0-8.6,2.4-10.6,6.2c-1.6,2.9-2,6.1-1.1,9.3C6.8,69,8.8,71.6,11.7,73.2z M11.8,59.3c1.2-2.1,3.4-3.4,5.8-3.4
-	c1.1,0,2.3,0.3,3.2,0.8c3.2,1.8,4.3,5.9,2.5,9c-1.2,2.1-3.4,3.4-5.8,3.4c-1.1,0-2.3-0.3-3.2-0.8c-1.5-0.9-2.7-2.3-3.2-4
-	C10.8,62.6,10.9,60.9,11.8,59.3z"/>
-</svg>

assets/img/masternodes/pay.svg

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 85 85" style="enable-background:new 0 0 85 85;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#EF4136;}
-	.st1{fill:#EF4237;}
-</style>
-<path class="st0" d="M18.9,58.8c-7.5,0-13.5-6.1-13.5-13.5v-2.7h5.4v2.7c0,4.5,3.6,8.1,8.1,8.1h13.5V42.5l13.5,13.5L32.4,69.6V58.8
-	H18.9z"/>
-<path class="st0" d="M66.9,28.8c7.5,0,13.5,6.1,13.5,13.5V45H75v-2.7c0-4.5-3.6-8.1-8.1-8.1H53.4V45L39.8,31.5l13.5-13.5v10.9H66.9z
-	"/>
-<g>
-	<path class="st1" d="M42.9,10.4C60.6,10.4,75,24.8,75,42.5S60.6,74.6,42.9,74.6S10.8,60.2,10.8,42.5S25.2,10.4,42.9,10.4 M42.9,5
-		C22.2,5,5.4,21.8,5.4,42.5s16.8,37.5,37.5,37.5s37.5-16.8,37.5-37.5S63.6,5,42.9,5L42.9,5z"/>
-</g>
-</svg>

assets/img/masternodes/private.svg

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 19.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 85 85" style="enable-background:new 0 0 85 85;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#009444;}
-</style>
-<path class="st0" d="M29.8,37.2h0.9v-3.8c0-6.2,5.1-11.3,11.3-11.3s11.3,5.1,11.3,11.3v3.8h0.9c1.6,0,2.8,1.3,2.8,2.8v16.9
-	c0,1.6-1.3,2.8-2.8,2.8H29.8c-1.6,0-2.8-1.3-2.8-2.8V40C27,38.4,28.2,37.2,29.8,37.2z M42,52.2c2.1,0,3.8-1.7,3.8-3.8
-	s-1.7-3.8-3.8-3.8s-3.8,1.7-3.8,3.8S39.9,52.2,42,52.2z M38.2,37.2h7.5v-3.8c0-2.1-1.7-3.8-3.8-3.8s-3.8,1.7-3.8,3.8V37.2z"/>
-<g>
-	<path class="st0" d="M63.4,13.3c4.4,0,7.9,3.6,7.9,7.9V63c0,4.4-3.6,7.9-7.9,7.9H21.7c-4.4,0-7.9-3.6-7.9-7.9V21.3
-		c0-4.4,3.6-7.9,7.9-7.9H63.4 M63.4,8.2H21.7c-7.2,0-13,5.9-13,13V63c0,7.2,5.9,13,13,13h41.7c7.2,0,13-5.9,13-13V21.3
-		C76.4,14.1,70.5,8.2,63.4,8.2L63.4,8.2z"/>
-</g>
-</svg>

masternodes/index.html

@@ -21,8 +21,8 @@ description: pages.budget.description
 		<div class="section__content">
 			<div class="row">
 				<div class="col-sm-6">
-					<h2>{% t pages.masternodes.what-heading %}</h2>
+					<h2 class="bottom-space">{% t pages.masternodes.what-heading %}</h2>
-					<p>{% t pages.masternodes.what-text %}</p>
+					<iframe width="560" height="315" src="https://www.youtube.com/embed/4GRrLiTCq5M" frameborder="0" allowfullscreen></iframe>
 				</div>
 				<div class="col-sm-6">
 					<h2>{% t pages.masternodes.earn-heading %}</h2>
@@ -45,43 +45,19 @@ description: pages.budget.description
 		</div>
 	</section>
 
-	<section class="section">
-		<div class="section__content">
-			<div class="row text-center">
-				<div class="col-sm-3">
-					<img src="/assets/img/masternodes/pay.svg" height="100" alt="Instant">
-					<h2>InstantSend</h2>
-					<p>{% t pages.masternodes.instantiend-text %}</p>
-				</div>
-				<div class="col-sm-3">
-					<img src="/assets/img/masternodes/private.svg" height="100" alt="Private">
-					<h2>PrivateSend</h2>
-					<p>{% t pages.masternodes.private-send-text %}</p>
-				</div>
-				<div class="col-sm-3">
-					<img src="/assets/img/masternodes/masternode.svg" height="100" alt="Secure">
-					<h2>Decentralised <br>Governance</h2>
-					<p>{% t pages.masternodes.governance-text %}</p>
-				</div>
-				<div class="col-sm-3">
-					<img src="/assets/img/masternodes/evol.svg" height="100" alt="Secure">
-					<h2>Dash Evolution</h2>
-					<p>{% t pages.masternodes.evolution-text %}</p>
-				</div>
-			</div>
-		</div>
-	</section>
 
 	<section class="section">
 		<div class="section__content">
-			<h2>{% t pages.masternodes.host-heading %}</h2>
 			<div class="row">
 				<div class="col-sm-6">
-					{% tmd pages.masternodes.host-text-right %}
+					<h2 class="bottom-space">{% t pages.masternodes.host-heading %}</h2>
+					<div class="bottom-space">{% tmd pages.masternodes.host-text %}</div>
+					<a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=33947686" class="btn-blue" target="_blank">{% t pages.masternodes.host-btn %}</a>
 				</div>
 				<div class="col-sm-6">
-					<div class="bottom-space">{% tmd pages.masternodes.host-text-left %}</div>
+					<h2 class="bottom-space">{% t pages.masternodes.hosting-services %}</h2>
-					<a href="#" class="btn-blue">{% t pages.masternodes.host-btn %}</a>
+					<div class="bottom-space">{% tmd pages.masternodes.hosting-services-text %}</div>
+					<a href="https://dashpay.atlassian.net/wiki/pages/viewpage.action?pageId=1867885" class="btn-blue" target="_blank">{% t pages.masternodes.hosting-services-btn %}</a>
 				</div>
 			</div>
 		</div>
@@ -115,7 +91,7 @@ description: pages.budget.description
 			<div class="row">
 				<div class="col-sm-6">
 					<div class="bottom-space">{% tmd pages.masternodes.p2p-text %}</div>
-					<a href="#" class="btn-blue">{% t pages.masternodes.p2p-btn %}</a>
+					<a href="http://178.254.23.111/~pub/Dash/Dash_Info.html" class="btn-blue"  target="_blank">{% t pages.masternodes.p2p-btn %}</a>
 				</div>
 				<div class="col-sm-6">
 					<img src="/assets/img/masternodes/p2p.png" alt="">