Implements Contact Email Form with merge from master

Merge branch 'master' into feature/send-contact-email

* master:
  cleanup on news posts to invoke and include in build
  fix minor typo
  updated ruby version
  Adds address to contact page.
  -- wallets/index.html: Pulls all electrum wallets -- fixes padding for EXODUS logo -- fixes extra curly brace on homepage
  News post +video (#116)
  News post +video

Conflicts:
	_includes/hero/contact.html
This commit is contained in:
Chuck Williams 2017-02-11 01:30:19 -07:00
commit b88da87ca7
16 changed files with 282 additions and 234 deletions

1
.ruby-version Normal file
View file

@ -0,0 +1 @@
2.3.3

View file

@ -288,7 +288,7 @@
- name: prtfw
title: FrontEnd Developer
description: prtfw is a reformed ex-VC and Financier turned coder, Start + FinTech Pro, usually hacking on AI/Machine-Learning projects, pilot, adventurer, polymath + nomad with mild ADHD
description: prtfw is a reformed ex-VC and Financier turned coder, Startup + FinTech Pro, usually hacking on AI/Machine-Learning projects, pilot, adventurer, polymath + nomad with mild ADHD
image: prtfw.png
email: mns_catdogmice@yahoo.ca
keybase: https://keybase.io/longgamma_act

View file

@ -182,83 +182,83 @@
label: PGP
url: "/binaries/dashcore-0.12.1.0-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.
logo_url: /assets/img/wallets/electrum_banner.png
os: linux
type: desktop
vendor_id: electrum
vendor_label: Electrum
control_type: full
validation_type: spv
access_type: multi
product_id: dash_electrum
product_label: Dash Electrum
product_website_label: Electrum-Dash.org
product_website_url: "https://electrum-dash.org/"
product_source_url: "https://github.com/dashpay/electrum-dash"
links:
-
label: Download PKG
url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin"
-
label: Hash File
url: "/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.DIGESTS.txt"
-
label: PGP
url: "/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.asc"
#- name: Dash Electrum 32/64bit
# description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
# logo_url: /assets/img/wallets/electrum_banner.png
# os: linux
# type: desktop
# vendor_id: electrum
# vendor_label: Electrum
# control_type: full
# validation_type: spv
# access_type: multi
# product_id: dash_electrum
# product_label: Dash Electrum
# product_website_label: Electrum-Dash.org
# product_website_url: "https://electrum-dash.org/"
# product_source_url: "https://github.com/dashpay/electrum-dash"
# links:
# -
# label: Download PKG
# url: "https://www.dash.org/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin"
# -
# label: Hash File
# url: "/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.DIGESTS.txt"
# -
# label: PGP
# url: "/binaries/Electrum-DASH-2.4.1_Linux_x86_64-Installer.bin.asc"
- name: Dash Electrum 32/64bit
description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
logo_url: /assets/img/wallets/electrum_banner.png
os: win32
type: desktop
vendor_id: dash_core
vendor_label: Dash Core
control_type: full
validation_type: spv
access_type: multi
product_id: dash_electrum
product_label: Dash Electrum
product_website_label: Electrum-Dash.org
product_website_url: "https://electrum-dash.org/"
product_source_url: "https://github.com/dashpay/electrum-dash"
links:
-
label: Download
url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe"
-
label: Hash File
url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt"
-
label: PGP
url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc"
#- name: Dash Electrum 32/64bit
# description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
# logo_url: /assets/img/wallets/electrum_banner.png
# os: win32
# type: desktop
# vendor_id: dash_core
# vendor_label: Dash Core
# control_type: full
# validation_type: spv
# access_type: multi
# product_id: dash_electrum
# product_label: Dash Electrum
# product_website_label: Electrum-Dash.org
# product_website_url: "https://electrum-dash.org/"
# product_source_url: "https://github.com/dashpay/electrum-dash"
# links:
# -
# label: Download
# url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe"
# -
# label: Hash File
# url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt"
# -
# label: PGP
# url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc"
- name: Dash Electrum 32/64bit
description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
logo_url: /assets/img/wallets/electrum_banner.png
os: win64
type: desktop
vendor_id: dash_core
vendor_label: Dash Core
control_type: full
validation_type: spv
access_type: multi
product_id: dash_electrum
product_label: Dash Electrum
product_website_label: Electrum-Dash.org
product_website_url: "https://electrum-dash.org/"
product_source_url: "https://github.com/dashpay/electrum-dash"
links:
-
label: Download
url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe"
-
label: Hash File
url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt"
-
label: PGP
url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc"
#- name: Dash Electrum 32/64bit
# description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
# logo_url: /assets/img/wallets/electrum_banner.png
# os: win64
# type: desktop
# vendor_id: dash_core
# vendor_label: Dash Core
# control_type: full
# validation_type: spv
# access_type: multi
# product_id: dash_electrum
# product_label: Dash Electrum
# product_website_label: Electrum-Dash.org
# product_website_url: "https://electrum-dash.org/"
# product_source_url: "https://github.com/dashpay/electrum-dash"
# links:
# -
# label: Download
# url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe"
# -
# label: Hash File
# url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.DIGESTS.txt"
# -
# label: PGP
# url: "/binaries/Electrum-DASH-2.4.1-Windows-setup.exe.asc"
- name: Jaxx
description: |
@ -341,29 +341,29 @@
label: PGP
url: "/binaries/dashcore-0.12.1.0-osx.dmg.asc"
- name: Dash Electrum
description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
logo_url: /assets/img/wallets/electrum_banner.png
os: osx
type: desktop
vendor_id: dash_core
vendor_label: Dash Core
control_type: full
validation_type: full
access_type: p2p
product_id: dash_electrum
product_label: Dash Electrum
product_source_url: "https://github.com/dashpay/electrum-dash"
links:
-
label: Download PKG
url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg"
-
label: Hash File
url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg.DIGESTS.txt"
-
label: PGP
url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg.asc"
#- name: Dash Electrum
# description: Dash Core "Light" Wallet, provides basic payment functions with SPV based security for low powered systems.
# logo_url: /assets/img/wallets/electrum_banner.png
# os: osx
# type: desktop
# vendor_id: dash_core
# vendor_label: Dash Core
# control_type: full
# validation_type: full
# access_type: p2p
# product_id: dash_electrum
# product_label: Dash Electrum
# product_source_url: "https://github.com/dashpay/electrum-dash"
# links:
# -
# label: Download PKG
# url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg"
# -
# label: Hash File
# url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg.DIGESTS.txt"
# -
# label: PGP
# url: "/binaries/Electrum-DASH-2.4.1-Installer.pkg.asc"
- name: Jaxx
description: |

View file

@ -287,9 +287,9 @@ pages:
hero-image:
hero-heading: Contact
hero-text:
form-pretext: For technical support or troubleshooting with wallets, mining, or other general questions, please visit DashTalk or one of the many other community resources.
form-pretext-2: For other inquiries, use this link.
# form-pretext-2: For other inquiries, use this form.
form-pretext: |
For technical support or troubleshooting with wallets, mining, or other general questions, please visit <a href="https://www.dash.org/forum/" target="_blank">DashTalk</a> or one of the many other community resources.
form-pretext-2: For other inquiries, use this form.
social-heading: Forums & Social Media
mail-list-heading: Mailing List
mail-list-text: Have trouble keeping up-to-date? Join our mailing list.

View file

@ -1,8 +1,8 @@
---
author: tungfa
layout: post
image: Instructions12-1.png
title: Dash Releases Software Upgrade in Sweeping Redesign
image: "Instructions12-1.png"
title: "Dash Releases Software Upgrade in Sweeping Redesign"
---
Labeling it “its largest software upgrade ever”, Dash has released version 12.1, codenamed Sentinel, today. The anticipated update sets to path a wider redesign of Dash in its advent toward unveiling Evolution a decentralized payments system and marketplace that Dash says will compete with the likes of PayPal and Venmo.

View file

@ -2,7 +2,7 @@
author: tungfa
layout: post
image: 2017-02-09networkswitchvideo.png
title: Network Switch, General Bytes, & Testnet Slots | DASH: Detailed
title: "Network Switch, General Bytes, &amp; Testnet Slots : DASH| Detailed"
---
<iframe width="560" height="315" src="https://www.youtube.com/embed/nSUMA8vj2iA" frameborder="0" allowfullscreen></iframe>
@ -11,3 +11,4 @@ And now for development updates.Lead developer of Dash, Evan Duffield, has publi
Payment Week covers 12.1: <http://paymentweek.com/2017-2-6-dash-unveils-largest-software-upgrade-since-inception/as> well as Samburaj Das in CryptoCoins News.CryptoCoinNews covers 12.1: <https://www.cryptocoinsnews.com/dash-releases-software-upgrade-sweeping-redesign/In> addition, Ryan Taylor also gave an interview on the Spanish YouTube channel Cripto Noticias. The verbiage is in English, the subtitles are in Spanish, just to be clear.CriptoNoticias interviews Ryan Taylor: <https://youtu.be/jfrMOv5jF4wAnd now to Business News.The exchange BitSane based in Ireland is now a new fiat gateway for those wanting to buy Dash with dollars or euros. BitSane accepts dollar or euro deposits via OKPAY, AdvCash or bank wires.BitSane exchange: http://bitsane.comAnd speaking of fiat gateways, I must correct a mistake I made in last week's show in that Bittylicious, yes only accepts bank wires from UK customers, but they accept credit and debit card purchases from people all over the world. Sorry about that Bittylicious and thanks for correcting me.Bittylicious exchange: http://bittylicious.comAnd in other business news very exciting General Bytes, the CTM manufacturer based in Czech Republic, has launched a ThunderClap campaign to add Dash to their CTMs. So what General Bytes is seeking is that any Dash support who has a Twitter, Facebook, or Tumblr account sign-up to share the news about the Dash addition to the product on February 24th.At this time, 39 of the desired 100 people have agreed to do so, myself included. So if you have a Twitter, Tumblr, or Facebook and you'd be willing to share the message that Dash is going to be supported on General Bytes on the 24th, go ahead and sign-up at this page.General Bytes Thunderclap campaign: https://www.thunderclap.it/projects/52838-bring-dash-to-your-local-atmAnd finally we're almost to the end Social Happenings.There have been two Dash meetups one in Kazakhstan, yes Kazakhstan! As well as one in Panama, where Dash core member Danial Diaz presented.My information on the Kazakhstan meetup is limited to this snappy video that was uploaded by a sister YouTube channel that I didn't know that we had.Meetup in Kazahkstan:https://youtu.be/B_qvKJojCBgWell done.And more information about the Panamanian meetup can be found on this Steemit post by Randy
Hilarski.Meetup in Panama: https://twitter.com/PanamaBitcoin/status/827164921641078784, https://www.meetup.com/Panama-Bitcoin/events/237335516, https://steemit.com/bitcoin/@hilarski/bitcoin-meetup-panama-photosNext, the Dash Force has announced their testnet contest winners who are defacto, t0dd, and 1fabunicorn who each won $100 in Dash for their great work testing. Well done.Dash Force testnet contest winners: https://dashnation.slack.com/archives/dash_talk/p1486321479027998And finally, Dash developer kodaxx has put up this web game to test gambling with Dash using slots. Anybody can stop by to try out the game, which uses testnet coins.DashSlots gambling with testnet Dash: http://dashslots.uphero.com/If you'd like to try, kodaxx recommends that you use the Android Dash testnet wallet, and you can get free testnet Dash at any sort of faucet, like this one.Dash testnet Android wallet: https://github.com/HashEngineering/dash-wallet/releases/download/v4.65.12.1g/dash-wallet-testnet-4.65.12.1G.apkDash testnet faucet: http://test.faucet.masternode.io/And that's it for DASH: Detailed. What a day! What a week!If you've not yet, I hope that you'll subscribe to this weekly series by sending an email to Amanda [at] @Dash [dot] org and I'll take care of it.We publish a new video every Wednesday at 12pm EST.So see you then. Bye-bye.Music:•“We Are One” by Vexento https://www.youtube.com/watch?v=Ssvu2yncgWUDash graphics:•Alex-ru DASH photo bank: http://bit.ly/2fnyZClGet social & learn more:•Dash Slack / Forum / Reddit: http://dashnation.com/chat•DASH: Detailed Homepage: http://dashdetailed.com•DASH: Detailed Twitter: http://twitter.com/dashdetailed•Dash Homepage: http://dash.org
•Dash Twitter: <http://twitter.com/dashpay>

View file

@ -1,8 +1,8 @@
---
author: tungfa
layout: post
image: 2017-02-10100hrs after.png
title: 100 hrs after Dash 12.1 Launch = 98% - 100% Miner Support !
image: "2017-02-10100hrs after.png"
title: "100 hrs after Dash 12.1 Launch = 98% - 100% Miner Support !"
---
100 hrs after Dash 12.1 Launch = 98% - 100% Miner Support !
What a community - Tx to All ; )

View file

@ -0,0 +1,9 @@
---
author: tungfa
layout: post
image: "2017-02-11ICEtotalgamingvideo.png"
title: "Robert Wiecko from Dash at ICE Totally Gaming 2017"
---
Dash presentation by Robert Wiecko and Coinfirm presentation by Maciej Ziolkowski at 2017 ICE Totally Gaming conference (8th February 2017).
<iframe width="560" height="315" src="https://www.youtube.com/embed/cWIfkz2US0Y" frameborder="0" allowfullscreen></iframe>

View file

@ -13,31 +13,37 @@
<h1 class="hero__title">{% t pages.contact.hero-heading %}</h1>
<p class="hero__lead">{% t pages.contact.hero-text %}</p>
<form onsubmit="return false;">
<div class="row">
<div class="col-sm-4">
{% t pages.contact.form-pretext %} <br/>
{% t pages.contact.form-pretext-2 %}
<a style="display: inline-block;" href="mailto:contact@dash.org"> Contact us.</a> <!-- !!!remove after form is back up-->
<!--<a style="display: inline-block;" href="mailto:contact@dash.org"> Contact us.</a>-->
<!-- !!!remove after form is back up-->
</div>
<div class="col-sm-6">
<form onsubmit="return false;">
<div class="col-sm-8">
<div class="row">
<div class="col-xs-12">
<input id="contact_name" placeholder="Name" type="text" class="input-block">
</div>
</div>
<div class="row">
<div class="col-xs-12">
<input id = 'contact_email' class="input-block" placeholder="Email" type="text">
</div>
</div>
<div class="row">
<div class="col-xs-12">
<select id="contact_category" class="form-control input-block" placeholder="category">
<div class="col-xs-6">
<input id="contact_name" placeholder="Name" type="text" class="input-block bottom-space">
<input id='contact_email' class="input-block bottom-space" placeholder="Email" type="text">
<select id="contact_category" class="form-control input-block bottom-space" placeholder="category">
<option value="">Category</option>
<option value="feedback">Feedback</option>
<option value="inquiry">Inquiry</option>
<option value="offering">Offer</option>
<option value="request">Request</option>
<option value="other">Other Communication</option>
</select>
</div>
<div class="col-sm-6">
<div class="callout-blue compact">
Dash <br/>
1475 North Scottsdale Road, Suite 200 <br/>
Scottsdale, Arizona 85257-3538 <br/>
USA <br />
<a href="https://goo.gl/maps/ES3A21Bf55y" target="_blank">View in Google Maps</a>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-12">
@ -47,14 +53,13 @@
<div class="row">
<div class="col-xs-12">
<input class="btn-blue-solid reset" type="submit" value="Send Message">
<div id="msg_sent" style="display: none;"> Message Sent! </div>
<div id="msg_sent" style="display: none;"> Message Sent!</div>
</div>
</div>
</div>
</div>
</div>
</form>
</div>
</div>
</div>
<!-- Hero stripe -->
@ -62,3 +67,12 @@
</div>
<!--
____ ____ _ _____ ____ ____ _____
/ _\/ _ \/ \ /|/__ __\/ _ \/ _\/__ __\
| / | / \|| |\ || / \ | / \|| / / \
| \__| \_/|| | \|| | | | |-||| \_ | |
\____/\____/\_/ \| \_/ \_/ \|\____/ \_/
20170210_2353_ccw
-->

Binary file not shown.

After

Width:  |  Height:  |  Size: 130 KiB

View file

@ -6,6 +6,19 @@ description: pages.blog.description
{% include hero/blog.html %}
<!--
__________ ____ ___.___.____ ________ ._.
\______ \ | \ | | \______ \| |
| | _/ | / | | | | \ |
| | \ | /| | |___ | ` \|
|______ /______/ |___|_______ \/_______ /_
\/ \/ \/\/
201702102218
-->
<div class="page page--blog">
<section class="section">
@ -14,6 +27,7 @@ description: pages.blog.description
{% for post in paginator.posts %}
<!-- limit:10 -->
<article class="featurepost">
<div class="featurepost__preview {% if post.image %}featurepost__preview--image{% else %}featurepost__preview--no-image{% endif %}">
{% if post.image %}
<a href="{{ basenav }}{{ post.url }}"><img src="/assets/img/blog/{{ post.image }}" class="featurepost__image"></a>
@ -25,6 +39,7 @@ description: pages.blog.description
<em class="featurepost__date">{{ post.date | date: "%b %d, %Y" }}</em>
<p class="featurepost__description">{{ post.excerpt | strip_html | truncatewords: 50 }}</p>
<div class="featurepost__divider"></div>
</article>
{% endfor %}

View file

@ -292,7 +292,7 @@ description: pages.home.description
<h2>{% t pages.home.evolution-heading %}</h2>
{% tmd pages.home.evolution-text %}
<a href="{{{basenav}}/evolution/" target="_blank" class="btn-blue">{% t pages.home.evolution-btn %}</a>
<a href="{{basenav}}/evolution/" target="_blank" class="btn-blue">{% t pages.home.evolution-btn %}</a>
</div>
<div class="col-sm-6 col-sm-pull-6 home-evolution-graphic">
<img src="/assets/img/home/evo.png" alt="Dash Evolution">

View file

@ -10,14 +10,14 @@
console.log(name, email, category, message);
$(this).closest('form').find('input[type=text], textarea').val('');
$.post("http://localhost:8080/send-contact-email/",{
$.post('http://localhost:8080/send-contact-email/',{
from: name,
email: email,
subject: category,
message: message
}, function(response){
}, function(response) {
console.info('Message sent: ' , response);
})
});
$('#msg_sent').css('display', 'inline-block');

View file

@ -83,6 +83,11 @@ iframe {
padding: 10px;
margin-bottom: 20px;
text-align: center;
&.compact {
padding: 6px;
margin-bottom: 10px;
line-height: 1.4;
}
h2 {
font-size: 64px;
margin-bottom: 20px;

View file

@ -71,7 +71,7 @@ $wallet-tile-hover-background-base-color: lighten($color-blue-light, 9);
& .thumbnail {
& .logo-container {
margin: $wallet-tile-spacing auto;
padding: $wallet-tile-spacing*.3;
padding: 0;
display: block;
max-width: $wallet-tile-logo-container-width;
max-height: $wallet-tile-logo-container-height;

View file

@ -19,7 +19,7 @@ description: pages.wallets.description
{% include wallets_js_data.html %}
{% for vendor-group in vendor-collection %}
{% include modals/vendor-group-download-collection.html %}
{% include modals/vendor-group-download-collection.html %}
{% endfor %}
<div class="page page--wallets">
@ -27,7 +27,8 @@ description: pages.wallets.description
<section class="section clearfix">
<div class="section__content">
<h3>{% t pages.wallets.wallets-security-header %}</h3>
<p>{% t pages.wallets.wallets-security-subtitle %} <a href="http://keepass.info/" target="_blank">keepass.info</a></p>
<p>{% t pages.wallets.wallets-security-subtitle %} <a href="http://keepass.info/" target="_blank">keepass.info</a>
</p>
<div class="row">
{% for wallet in security-wallets %}
{% include wallet-tile.html %}
@ -44,7 +45,8 @@ description: pages.wallets.description
{% for os-sequence in desktop-os-order-list %}
{% for wallet-group in desktop-os-collection %}
{% if os-sequence == wallet-group.name %}
<li role="tab" {%if forloop.first == true %}class="active"{% endif %}><a data-toggle="pill" href="#{{wallet-group.name}}">
<li role="tab" {%if forloop.first== true %}class="active" {% endif %}><a data-toggle="pill"
href="#{{wallet-group.name}}">
{% case wallet-group.name %}
{% when 'win64' %}
Windows (64bit)
@ -82,7 +84,8 @@ description: pages.wallets.description
<p>{% t pages.wallets.wallets-mobile-subtitle %}</p>
<ul id="wallet-mobile-os-tabs" class="nav2 nav-tabs " role="">
{% for wallet-group in mobile-os-collection %}
<li {%if forloop.first == true %}class="active"{% endif %} role="tab"><a data-toggle="pill" href="#{{wallet-group.name}}">
<li {%if forloop.first== true %}class="active" {% endif %} role="tab"><a data-toggle="pill"
href="#{{wallet-group.name}}">
{% case wallet-group.name %}
{% when 'android' %}
Android