Update: Merchant page and images

_data/merchants-cards.yml

@@ -0,0 +1,9 @@
+
+- name: ShakePay
+  title: Debit Card
+  url: https://shakepay.co
+
+- name: SpectroCoin
+  title: Quality Assurance, Automation, Testing
+  url: https://spectrocoin.com/
+

_data/merchants-metals.yml

@@ -0,0 +1,16 @@
+
+- name: Coaex
+  url: https://www.coaex.com
+  image: coaex_logo.png
+
+- name: Amagi Metals
+  url: http://www.amagimetals.com
+
+- name: Bitgild
+  url: http://www.bitgild.com
+
+- name: Micro Precious Metals
+  url: http://www.micropreciousmetals.cf
+
+
+

_data/merchants-stores.yml

@@ -1,25 +1,5 @@
 
-- name: ShakePay
+- name: ShakePay2
   title: Debit Card
-  image: evan.png
   url: https://shakepay.co
 
-- name: SpectroCoin
-  title: Quality Assurance, Automation, Testing
-  image: evan.png
-  url: https://spectrocoin.com/
-
-- name: Card1
-  title: Debit Card
-  image: evan.png
-  url: https://shakepay.co
-
-- name: Card2
-  title: Debit Card
-  image: evan.png
-  url: https://shakepay.co
-
-- name: Card3
-  title: Debit Card
-  image: evan.png
-  url: https://shakepay.co

_data/merchants-vpn.yml

@@ -0,0 +1,23 @@
+
+- name: BolehVPN
+  url: https://bolehvpn.net
+
+- name: VikingVPN
+  url: https://vikingvpn.com
+
+- name: QHoster
+  url: http://www.qhoster.com
+
+- name: MultiVPN
+  url: http://multi-vpn.co.uk/
+
+- name: AirVPN
+  url: https://airvpn.org/
+
+- name: Seedstuff
+  url: http://www.seedstuff.ca
+
+
+
+
+

_i18n/en.yml

@@ -129,8 +129,10 @@ pages:
     hero-map-btn: Merchants Map
     hero-integrate-btn: Integrate Dash
     hero-getlisted-btn: Get Listed
-    debit-cards-heading: Debit Cards
+    cards-heading: Debit Cards
     stores-heading: Web Stores
+    vpn-heading: VPN Providers
+    metals-heading: Precious Metals
 
   participate:
     title: Join the Dash Network

_includes/hero/merchants.html

@@ -15,8 +15,8 @@
 
 		<div class="hero__buttons">
 			<a href="https://mapme.com/dash-merchants" class="btn-white-solid">{% t pages.merchants.hero-map-btn %}</a>
-			<a href="#participate-mining" class="btn-white-solid">{% t pages.merchants.hero-integrate-btn %}</a>
+			<a href="https://dashpay.atlassian.net/wiki/display/DOC/Merchants" class="btn-white-solid">{% t pages.merchants.hero-integrate-btn %}</a>
-			<a href="#participate-budgets" class="btn-white-solid">{% t pages.merchants.hero-getlisted-btn %}</a>
+			<a href="mailto:robert@dash.org" class="btn-white-solid">{% t pages.merchants.hero-getlisted-btn %}</a>
 		</div>
 	</div>
 

_includes/merchant-list.html

@@ -3,20 +3,21 @@
 	<div class="merchant__avatar">
 		{% if merchant.image %}
 		<div class="merchant__image-wrapper">
-			<img class="merchant__image" src="/assets/img/team/{{ merchant.image }}" alt="{{ merchant.name }}">
+			<a href="{{ merchant.url }}" target="_blank" class="ctabox__link">
+				<img class="merchant__image" src="/assets/img/merchants/{{ merchant.image }}" alt="{{ merchant.name }}">
+			</a>
 		</div>
 		{% else %}
 		<div class="merchant__image-wrapper">
-			<img class="merchant__image" src="/assets/img/team/anon.png" alt="{{ merchant.name }}">
+			<a href="{{ merchant.url }}" target="_blank" class="ctabox__link">
+				<img class="merchant__image" src="/assets/img/merchant_generic_logo.png" alt="{{ merchant.name }}">
+			</a>
 		</div>
 		{% endif %}
 	</div>
 
 	<div class="merchant__name" data-mh="merchant-name">{{ merchant.name }}</div>
+	{% if merchant.title %}
 	<div class="merchant__title" data-mh="merchant-title">{{ merchant.title }}</div>
-
-	{% if merchant.url %}
-	<div class="merchant__detail merchant__detail--email"><a href="{{ merchant.url }}">{{ merchant.url }}</a></div>
 	{% endif %}
-
 </li>

index.html

@@ -41,7 +41,7 @@ description: pages.home.description
 					<article class="ctabox__cta" data-js-ctabox-item>
 						<a href="https://www.livingroomofsatoshi.com/" target="_blank" class="ctabox__link">
 							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/home/livingroomofsatoshi_logo.png" class="ctabox__image">
+								<img src="/assets/img/merchants/livingroomofsatoshi_logo.png" class="ctabox__image">
 							</div>
 							<div class="ctabox__text">
 							<h4 class="ctabox__title">Living Room of..</h4>
@@ -52,7 +52,7 @@ description: pages.home.description
 					<article class="ctabox__cta" data-js-ctabox-item>
 						<a href="https://misconductwineco.com/" target="_blank" class="ctabox__link">
 							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/home/misconductwine_logo.jpg" class="ctabox__image">
+								<img src="/assets/img/merchants/misconductwine_logo.jpg" class="ctabox__image">
 							</div>
 							<div class="ctabox__text">
 							<h4 class="ctabox__title">Misconduct Wine</h4>
@@ -63,7 +63,7 @@ description: pages.home.description
 					<article class="ctabox__cta" data-js-ctabox-item>
 						<a href="https://www.bolehvpn.net/" target="_blank" class="ctabox__link">
 							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/home/bolehvpn.png" class="ctabox__image">
+								<img src="/assets/img/merchants/bolehvpn.png" class="ctabox__image">
 							</div>
 							<div class="ctabox__text">
 							<h4 class="ctabox__title">Boleh VPN</h4>
@@ -74,7 +74,7 @@ description: pages.home.description
 					<article class="ctabox__cta" data-js-ctabox-item>
 						<a href="https://shapeshift.io" target="_blank" class="ctabox__link">
 							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/home/shapeshift_logo.png" class="ctabox__image">
+								<img src="/assets/img/merchants/shapeshift_logo.png" class="ctabox__image">
 							</div>
 							<div class="ctabox__text">
 								<h4 class="ctabox__title">ShapeShift</h4>
@@ -85,7 +85,7 @@ description: pages.home.description
 					<article class="ctabox__cta" data-js-ctabox-item>
 						<a href="https://node40.com" target="_blank" class="ctabox__link">
 							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/home/node40.png" class="ctabox__image">
+								<img src="/assets/img/merchants/node40.png" class="ctabox__image">
 							</div>
 							<div class="ctabox__text">
 							<h4 class="ctabox__title">Node40</h4>
@@ -96,7 +96,7 @@ description: pages.home.description
 					<article class="ctabox__cta" data-js-ctabox-item>
 						<a href="https://protonmail.com/" target="_blank" class="ctabox__link">
 							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/home/protonmail.png" class="ctabox__image">
+								<img src="/assets/img/merchants/protonmail.png" class="ctabox__image">
 							</div>
 							<div class="ctabox__text">
 							<h4 class="ctabox__title">ProtonMail</h4>
@@ -107,7 +107,7 @@ description: pages.home.description
 					<article class="ctabox__cta" data-js-ctabox-item>
 						<a href="https://www.qhoster.com/" target="_blank" class="ctabox__link">
 							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/home/qhoster.png" class="ctabox__image">
+								<img src="/assets/img/merchants/qhoster.png" class="ctabox__image">
 							</div>
 							<div class="ctabox__text">
 							<h4 class="ctabox__title">Qhoster</h4>
@@ -118,7 +118,7 @@ description: pages.home.description
 					<article class="ctabox__cta" data-js-ctabox-item>
 						<a href="http://www.isg3d.com/" target="_blank" class="ctabox__link">
 							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/home/isg3d_logo.png" class="ctabox__image">
+								<img src="/assets/img/merchants/isg3d_logo.png" class="ctabox__image">
 							</div>
 							<div class="ctabox__text">
 								<h4 class="ctabox__title">ISG3D</h4>
@@ -129,7 +129,7 @@ description: pages.home.description
 					<article class="ctabox__cta" data-js-ctabox-item>
 						<a href="https://www.coaex.com" target="_blank" class="ctabox__link">
 							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/home/coaex_logo.png" class="ctabox__image">
+								<img src="/assets/img/merchants/coaex_logo.png" class="ctabox__image">
 							</div>
 							<div class="ctabox__text">
 								<h4 class="ctabox__title">CoaEX</h4>
@@ -140,7 +140,7 @@ description: pages.home.description
 					<article class="ctabox__cta" data-js-ctabox-item>
 						<a href="http://bravenewbookstore.com/" target="_blank" class="ctabox__link">
 							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/home/bravenewbooks_logo.png" class="ctabox__image">
+								<img src="/assets/img/merchants/bravenewbooks_logo.png" class="ctabox__image">
 							</div>
 							<div class="ctabox__text">
 								<h4 class="ctabox__title">BraveNewBooks</h4>
@@ -151,7 +151,7 @@ description: pages.home.description
 					<article class="ctabox__cta" data-js-ctabox-item>
 						<a href="https://giftoff.com/" target="_blank" class="ctabox__link">
 							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/home/giftoff_logo.png" class="ctabox__image">
+								<img src="/assets/img/merchants/giftoff_logo.png" class="ctabox__image">
 							</div>
 							<div class="ctabox__text">
 								<h4 class="ctabox__title">GiftOff</h4>
@@ -162,7 +162,7 @@ description: pages.home.description
 					<article class="ctabox__cta" data-js-ctabox-item>
 						<a href="https://key4co.in" target="_blank" class="ctabox__link">
 							<div class="ctabox__imagewrapper">
-								<img src="/assets/img/home/key4coin_logo.png" class="ctabox__image">
+								<img src="/assets/img/merchants/key4coin_logo.png" class="ctabox__image">
 							</div>
 							<div class="ctabox__text">
 								<h4 class="ctabox__title">Key4Coin</h4>

merchants/index.html

@@ -9,12 +9,10 @@ description: pages.merchants.description
 <div class="page page--team">
 
 	<section class="section section--intro-lead">
-
 		<div class="section__content content">
 			<div class="section__intro">
-				<h2 class="section__title">{% t pages.merchants.debit-cards-heading %}<!-- <a class="permalink" title="Permalink" id="social"></a> --></h1>
+				<h2 class="section__title">{% t pages.merchants.cards-heading %}<!-- <a class="permalink" title="Permalink" id="social"></a> --></h1>
 			</div>
-
 			<ul class="member-list member-list--merchants">
 				{% for merchant in site.data.merchants-stores %}
 					{% include merchant-list.html %}
@@ -22,18 +20,44 @@ description: pages.merchants.description
 			</ul>
 		</div>
 	</section>
+
 	<section class="section section--intro-lead">
-
 		<div class="section__content content">
 			<div class="section__intro">
-				<h2 class="section__title">{% t pages.merchants.stores-heading %}<!-- <a class="permalink" title="Permalink" id="social"></a> --></h1>
+				<h2 class="section__title">{% t pages.merchants.stores-heading %}</h1>
 			</div>
 			<ul class="member-list member-list--merchants">
-				{% for merchant in site.data.merchants-stores %}
+				{% for merchant in site.data.merchants-cards %}
+				{% include merchant-list.html %}
+				{% endfor %}
+			</ul>
+		</div>
+	</section>
+
+	<section class="section section--intro-lead">
+		<div class="section__content content">
+			<div class="section__intro">
+				<h2 class="section__title">{% t pages.merchants.vpn-heading %}</h1>
+			</div>
+			<ul class="member-list member-list--merchants">
+				{% for merchant in site.data.merchants-vpn %}
 					{% include merchant-list.html %}
 				{% endfor %}
 			</ul>
 		</div>
-
 	</section>
+
+	<section class="section section--intro-lead">
+		<div class="section__content content">
+			<div class="section__intro">
+				<h2 class="section__title">{% t pages.merchants.metals-heading %}</h1>
+			</div>
+			<ul class="member-list member-list--merchants">
+				{% for merchant in site.data.merchants-metals %}
+				{% include merchant-list.html %}
+				{% endfor %}
+			</ul>
+		</div>
+	</section>
+
 </div>