From c4f1504d2d1d98bb5a283056239b0cbd284cda08 Mon Sep 17 00:00:00 2001 From: andyfreer Date: Sun, 6 Nov 2016 21:43:13 +0000 Subject: [PATCH] Update: Merchant page and images --- _data/merchants-cards.yml | 9 +++++ _data/merchants-games.yml | 0 _data/merchants-gifts.yml | 0 _data/merchants-metals.yml | 16 ++++++++ _data/merchants-processors.yml | 0 _data/merchants-stores.yml | 22 +--------- _data/merchants-vpn.yml | 23 +++++++++++ _i18n/en.yml | 4 +- _includes/hero/merchants.html | 4 +- _includes/merchant-list.html | 13 +++--- assets/img/merchant_generic_logo.png | Bin 0 -> 2334 bytes assets/img/{home => merchants}/bolehvpn.png | Bin .../bravenewbooks_logo.png | Bin assets/img/{home => merchants}/coaex_logo.png | Bin .../img/{home => merchants}/giftoff_logo.png | Bin assets/img/{home => merchants}/isg3d_logo.png | Bin .../img/{home => merchants}/key4coin_logo.png | Bin .../livingroomofsatoshi_logo.png | Bin .../misconductwine_logo.jpg | Bin assets/img/{home => merchants}/node40.png | Bin assets/img/{home => merchants}/protonmail.png | Bin assets/img/{home => merchants}/qhoster.png | Bin .../img/{home => merchants}/shakepay_logo.png | Bin .../{home => merchants}/shapeshift_logo.png | Bin index.html | 24 +++++------ merchants/index.html | 38 ++++++++++++++---- 26 files changed, 104 insertions(+), 49 deletions(-) create mode 100644 _data/merchants-cards.yml create mode 100644 _data/merchants-games.yml create mode 100644 _data/merchants-gifts.yml create mode 100644 _data/merchants-metals.yml create mode 100644 _data/merchants-processors.yml create mode 100644 _data/merchants-vpn.yml create mode 100644 assets/img/merchant_generic_logo.png rename assets/img/{home => merchants}/bolehvpn.png (100%) rename assets/img/{home => merchants}/bravenewbooks_logo.png (100%) rename assets/img/{home => merchants}/coaex_logo.png (100%) rename assets/img/{home => merchants}/giftoff_logo.png (100%) rename assets/img/{home => merchants}/isg3d_logo.png (100%) rename assets/img/{home => merchants}/key4coin_logo.png (100%) rename assets/img/{home => merchants}/livingroomofsatoshi_logo.png (100%) rename assets/img/{home => merchants}/misconductwine_logo.jpg (100%) rename assets/img/{home => merchants}/node40.png (100%) rename assets/img/{home => merchants}/protonmail.png (100%) rename assets/img/{home => merchants}/qhoster.png (100%) rename assets/img/{home => merchants}/shakepay_logo.png (100%) rename assets/img/{home => merchants}/shapeshift_logo.png (100%) diff --git a/_data/merchants-cards.yml b/_data/merchants-cards.yml new file mode 100644 index 0000000..6f6b7be --- /dev/null +++ b/_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/ + diff --git a/_data/merchants-games.yml b/_data/merchants-games.yml new file mode 100644 index 0000000..e69de29 diff --git a/_data/merchants-gifts.yml b/_data/merchants-gifts.yml new file mode 100644 index 0000000..e69de29 diff --git a/_data/merchants-metals.yml b/_data/merchants-metals.yml new file mode 100644 index 0000000..106ae3b --- /dev/null +++ b/_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 + + + diff --git a/_data/merchants-processors.yml b/_data/merchants-processors.yml new file mode 100644 index 0000000..e69de29 diff --git a/_data/merchants-stores.yml b/_data/merchants-stores.yml index 779302f..e9d3104 100644 --- a/_data/merchants-stores.yml +++ b/_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 diff --git a/_data/merchants-vpn.yml b/_data/merchants-vpn.yml new file mode 100644 index 0000000..ebe24b9 --- /dev/null +++ b/_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 + + + + + diff --git a/_i18n/en.yml b/_i18n/en.yml index 0d48d76..2e7d3b4 100644 --- a/_i18n/en.yml +++ b/_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 diff --git a/_includes/hero/merchants.html b/_includes/hero/merchants.html index 44d7ea2..4c2cc0d 100644 --- a/_includes/hero/merchants.html +++ b/_includes/hero/merchants.html @@ -15,8 +15,8 @@
{% t pages.merchants.hero-map-btn %} - {% t pages.merchants.hero-integrate-btn %} - {% t pages.merchants.hero-getlisted-btn %} + {% t pages.merchants.hero-integrate-btn %} + {% t pages.merchants.hero-getlisted-btn %}
diff --git a/_includes/merchant-list.html b/_includes/merchant-list.html index feba4e3..16e4c6b 100644 --- a/_includes/merchant-list.html +++ b/_includes/merchant-list.html @@ -3,20 +3,21 @@
{% if merchant.image %}
- {{ merchant.name }} + + {{ merchant.name }} +
{% else %}
- {{ merchant.name }} + + {{ merchant.name }} +
{% endif %}
{{ merchant.name }}
+ {% if merchant.title %}
{{ merchant.title }}
- - {% if merchant.url %} -
{{ merchant.url }}
{% endif %} - diff --git a/assets/img/merchant_generic_logo.png b/assets/img/merchant_generic_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..24ed7b4fdd092938da7b60822746856fc37a623d GIT binary patch literal 2334 zcmd6o`9IYA7stmaKA*u@MkFFzwi0s( zm9M1*Q%K!Z5+NkH*Pf*=sqF4t5_fd(cl!&z-yh!ZbKd9iI`8-MoFC3R1?TE0EvYJr zKp>>CP8htq`U z2!&HgAZ!3YAd5()0U*pG`qQW|g$^=U!f*%#!Z0ArWwIzBBs?c2vNg{ENVCi z1H#e(nvj9dIuu^_5{*cO7JJ4KjlN23OVfT_^| z0Lx&35JM>cM(6zJl|~I|rkX;yBr3s^g#lp_L=D+e2t$bfQM;DLzx$i;@w_dff4A!| zp8toI&B$Y61VW6A#n=(pgP*)j+$NnA%ygm-eEoo%6|crm6T?apO<$=G*)~)tS{5e+ zU%qTw7+kW@!*D&PetbZqdRN)U9qY*7tY@#PC53*fA=9dU`=Z@JMDbQpbA^IY=RJYy z8XBSqihgX9EJ9WnVOxyYCi!1ZJo2x|H)q{Ef2D7}TVtcKwAXky>Y0+I*yhH<5LK)w z(sJ+Xnq#f_bd+LZtC|~%wT|W1<(cFMyxCc?!4ZjGf*%**-zN`R)6R?U=QH)?$biF! zu4rycnPb^$l_#aDk=5}ItaaZkbCs;chQbqqDy@l^1L1FO$i9`XY>i%!eW2SP9dm

1q;zk^g@BhzSnqedfM7a zd!5pqy%C4nw@v7`p0aQ0k=hI5vu3yd0mW6)i!&PRVHGSAD$)VdC19l zAJ_NFyt2#q_`%IR3f#ESriV)Ll2@}nhEsuq)^T9JMc?Ax2khl`M)jh)X!*2_pP|D9|i+gRt$XHWAeM_MnQeI9SykS;nQ$XGj^{@Fn$ zYqh`L$a=Ls>eaO&Y}RC~R;tf=rE%-2`tR*^MmadcBRxx)nZW1_?tsoUzO+J@-ScXD z^~M+VyUijqZVS9uD3{8`PO$b`Wbt)#rmVcQ!9**ayOp-=dLNGm2ghzECar(HGoISf z64lMuqvGH<|iKH$==OXk%Qb5(WL7(%@T&!m1Hgg5SqOcEdN4=fCf(LnB= z9JDFm@6Uct!ZiWCig-bRd8KM*R+{4=-1$X0bL_F7 zq&ImUx~Q_A8CBf&WNt!4LIDBb5XkL_Z_ZfsQ-h?jv$v|Mih8IQG7>vFI#Tel&Slo6 zGdq0VmMzL~ehsF-A4Kjgs^#zK^DAES9zD@6_@MkclvE6Bwl@6GB{;9D!602(Qx5Ka zHhhZESeiS69rRr7XMbn%i4KX&T2oNaWQ`AIG=#J`8@E<7E zT_#rvMti!ZV>DNaFln-W)?Lk3>GE@$EyU|I>V#D3MvhKjb58OZE?)h6UpITlG>zb+ zDr)!ZvY~|notVeThw>qt&Al+|#h8lj`yE9%^Nd{+Hw8R{=9=@5Tuj6gYy>N>^pYg) zmE*@%Co={mF|r+aUh?(*$jse#b?z87Nt>3-654NOT&22mCFZ@^+S8{OQI~5}ju+A` zZ7M5dw#}U68n#XStU#()=vnSXnxl?*8MN7xL`Z=yY3?@a@=(To^Ra~sD`lNWT3?t3PxtW{2 z%O}|vKja^c?dolIqP^pIjqvn_Y_PrpkA)VF$?wh8r+B{_TFC`P=7A?X?5o|;aEq+BmbQ5|8o9w&@&cX;zSVV Xx;K0CqDQW7{eW0|SInKGXU_crQQirR literal 0 HcmV?d00001 diff --git a/assets/img/home/bolehvpn.png b/assets/img/merchants/bolehvpn.png similarity index 100% rename from assets/img/home/bolehvpn.png rename to assets/img/merchants/bolehvpn.png diff --git a/assets/img/home/bravenewbooks_logo.png b/assets/img/merchants/bravenewbooks_logo.png similarity index 100% rename from assets/img/home/bravenewbooks_logo.png rename to assets/img/merchants/bravenewbooks_logo.png diff --git a/assets/img/home/coaex_logo.png b/assets/img/merchants/coaex_logo.png similarity index 100% rename from assets/img/home/coaex_logo.png rename to assets/img/merchants/coaex_logo.png diff --git a/assets/img/home/giftoff_logo.png b/assets/img/merchants/giftoff_logo.png similarity index 100% rename from assets/img/home/giftoff_logo.png rename to assets/img/merchants/giftoff_logo.png diff --git a/assets/img/home/isg3d_logo.png b/assets/img/merchants/isg3d_logo.png similarity index 100% rename from assets/img/home/isg3d_logo.png rename to assets/img/merchants/isg3d_logo.png diff --git a/assets/img/home/key4coin_logo.png b/assets/img/merchants/key4coin_logo.png similarity index 100% rename from assets/img/home/key4coin_logo.png rename to assets/img/merchants/key4coin_logo.png diff --git a/assets/img/home/livingroomofsatoshi_logo.png b/assets/img/merchants/livingroomofsatoshi_logo.png similarity index 100% rename from assets/img/home/livingroomofsatoshi_logo.png rename to assets/img/merchants/livingroomofsatoshi_logo.png diff --git a/assets/img/home/misconductwine_logo.jpg b/assets/img/merchants/misconductwine_logo.jpg similarity index 100% rename from assets/img/home/misconductwine_logo.jpg rename to assets/img/merchants/misconductwine_logo.jpg diff --git a/assets/img/home/node40.png b/assets/img/merchants/node40.png similarity index 100% rename from assets/img/home/node40.png rename to assets/img/merchants/node40.png diff --git a/assets/img/home/protonmail.png b/assets/img/merchants/protonmail.png similarity index 100% rename from assets/img/home/protonmail.png rename to assets/img/merchants/protonmail.png diff --git a/assets/img/home/qhoster.png b/assets/img/merchants/qhoster.png similarity index 100% rename from assets/img/home/qhoster.png rename to assets/img/merchants/qhoster.png diff --git a/assets/img/home/shakepay_logo.png b/assets/img/merchants/shakepay_logo.png similarity index 100% rename from assets/img/home/shakepay_logo.png rename to assets/img/merchants/shakepay_logo.png diff --git a/assets/img/home/shapeshift_logo.png b/assets/img/merchants/shapeshift_logo.png similarity index 100% rename from assets/img/home/shapeshift_logo.png rename to assets/img/merchants/shapeshift_logo.png diff --git a/index.html b/index.html index 3d22031..2e5af3b 100644 --- a/index.html +++ b/index.html @@ -41,7 +41,7 @@ description: pages.home.description

- +

Living Room of..

@@ -52,7 +52,7 @@ description: pages.home.description
- +

Misconduct Wine

@@ -63,7 +63,7 @@ description: pages.home.description
- +

Boleh VPN

@@ -74,7 +74,7 @@ description: pages.home.description
- +

ShapeShift

@@ -85,7 +85,7 @@ description: pages.home.description
- +

Node40

@@ -96,7 +96,7 @@ description: pages.home.description
- +

ProtonMail

@@ -107,7 +107,7 @@ description: pages.home.description
- +

Qhoster

@@ -118,7 +118,7 @@ description: pages.home.description
- +

ISG3D

@@ -129,7 +129,7 @@ description: pages.home.description
- +

CoaEX

@@ -140,7 +140,7 @@ description: pages.home.description
- +

BraveNewBooks

@@ -151,7 +151,7 @@ description: pages.home.description
- +

GiftOff

@@ -162,7 +162,7 @@ description: pages.home.description
- +

Key4Coin

diff --git a/merchants/index.html b/merchants/index.html index 6a2021d..454c8f6 100644 --- a/merchants/index.html +++ b/merchants/index.html @@ -9,12 +9,10 @@ description: pages.merchants.description
-
-

{% t pages.merchants.debit-cards-heading %}

+

{% t pages.merchants.cards-heading %}

-
    {% for merchant in site.data.merchants-stores %} {% include merchant-list.html %} @@ -22,18 +20,44 @@ description: pages.merchants.description
+
-
-

{% t pages.merchants.stores-heading %}

+

{% t pages.merchants.stores-heading %}

    - {% for merchant in site.data.merchants-stores %} + {% for merchant in site.data.merchants-cards %} + {% include merchant-list.html %} + {% endfor %} +
+
+
+ +
+
+
+

{% t pages.merchants.vpn-heading %}

+
+
    + {% for merchant in site.data.merchants-vpn %} {% include merchant-list.html %} {% endfor %}
-
+ +
+
+
+

{% t pages.merchants.metals-heading %}

+
+
    + {% for merchant in site.data.merchants-metals %} + {% include merchant-list.html %} + {% endfor %} +
+
+
+