fixed update page

This commit is contained in:
VitaliyTr 2017-02-05 14:15:38 +07:00
parent 47f2e3d6be
commit dd9694af57
7 changed files with 105 additions and 178 deletions

View file

@ -132,11 +132,9 @@ pages:
masternodes-btn: Masternodes
exchanges-btn: Exchanges
integrate-heading: Dash Evolution Progress
integrate-text: Sentinel can also be re-geared and deployed to operate digital companies that have a built-in workforce, infrastructure to deploy again, and as an engine for storage and retrieval of information.
slack-btn: Slack Chanel
forum-btn: Dash Forums
proposal-heading: Proposal Automated Service
proposal-text:
proposal-btn: Learn more
execution-heading: What is Evolution
execution-text:

View file

@ -18,8 +18,8 @@
<p class="hero__lead">{% t pages.evolution.hero-text %}</p>
<div class="hero__buttons">
<a href="{{basenav}}/get-dash/" class="btn-blue-solid btn-large">{% t pages.evolution.hero-btn %}</a>
<a href="{{basenav}}/get-dash/" class="btn-blue-solid btn-large">{% t pages.evolution.subscribe-btn %}</a>
<a href="https://dashpay.atlassian.net/wiki/x/DQBcAg" class="btn-blue-solid btn-large" target="_blank">{% t pages.evolution.hero-btn %}</a>
<a href="{{basenav}}/contact/#mailing" class="btn-blue-solid btn-large">{% t pages.evolution.subscribe-btn %}</a>
</div>
</div>

View file

@ -1,4 +1,4 @@
<div class="hero" id="hero">
<div class="hero hero--home" id="hero">
<div class="hero__background">
{% srcset hero/home.jpg ppi:1,2 class="hero__background-image" %}
{% srcset_source width:1920 %}

Binary file not shown.

After

Width:  |  Height:  |  Size: 323 KiB

View file

@ -20,7 +20,7 @@ description: pages.contact.description
</div>
</section>
<section class="section section--cta section--colored">
<section id="mailing" class="section section--cta section--colored">
<div class="section__content">
<h3>{% t pages.contact.mail-list-heading %}</h3>
@ -38,29 +38,29 @@ description: pages.contact.description
<div id="mc_embed_signup" class="js-mailing-form hidden">
<form action="//dash.us10.list-manage.com/subscribe/post?u=24325ade3f458f5d1004b6c23&amp;id=8ecd7e9bb7" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank" novalidate>
<div id="mc_embed_signup_scroll">
<h2>Subscribe to our mailing list</h2>
<div class="indicates-required"><span class="asterisk">*</span> indicates required</div>
<div class="mc-field-group">
<label for="mce-EMAIL">Email Address <span class="asterisk">*</span>
</label>
<input type="email" value="" name="EMAIL" class="required email" id="mce-EMAIL">
</div>
<div class="mc-field-group input-group">
<strong>Subscriptions </strong>
<ul><li><input type="checkbox" value="1" name="group[9869][1]" id="mce-group[9869]-9869-0"><label for="mce-group[9869]-9869-0">Technical Updates and Alerts</label></li>
<li><input type="checkbox" value="2" name="group[9869][2]" id="mce-group[9869]-9869-1"><label for="mce-group[9869]-9869-1">Monthly Newsletter</label></li>
<li><input type="checkbox" value="4" name="group[9869][4]" id="mce-group[9869]-9869-2"><label for="mce-group[9869]-9869-2">Weekly Content Digest from Dash.org</label></li>
</ul>
</div>
<p class="bottom-space"><a href="http://us10.campaign-archive2.com/home/?u=24325ade3f458f5d1004b6c23&id=8ecd7e9bb7" title="View previous campaigns" >View previous campaigns.</a></p>
<div id="mce-responses" class="clear">
<div class="response" id="mce-error-response" style="display:none"></div>
<div class="response" id="mce-success-response" style="display:none"></div>
</div> <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
<div style="position: absolute; left: -5000px;" aria-hidden="true"><input type="text" name="b_24325ade3f458f5d1004b6c23_8ecd7e9bb7" tabindex="-1" value=""></div>
<div class="clear"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button"></div>
</div>
<div id="mc_embed_signup_scroll">
<h2>Subscribe to our mailing list</h2>
<div class="indicates-required"><span class="asterisk">*</span> indicates required</div>
<div class="mc-field-group">
<label for="mce-EMAIL">Email Address <span class="asterisk">*</span>
</label>
<input type="email" value="" name="EMAIL" class="required email" id="mce-EMAIL">
</div>
<div class="mc-field-group input-group">
<strong>Subscriptions </strong>
<ul><li><input type="checkbox" value="1" name="group[9869][1]" id="mce-group[9869]-9869-0"><label for="mce-group[9869]-9869-0">Technical Updates and Alerts</label></li>
<li><input type="checkbox" value="2" name="group[9869][2]" id="mce-group[9869]-9869-1"><label for="mce-group[9869]-9869-1">Monthly Newsletter</label></li>
<li><input type="checkbox" value="4" name="group[9869][4]" id="mce-group[9869]-9869-2"><label for="mce-group[9869]-9869-2">Weekly Content Digest from Dash.org</label></li>
</ul>
</div>
<p class="bottom-space"><a href="http://us10.campaign-archive2.com/home/?u=24325ade3f458f5d1004b6c23&id=8ecd7e9bb7" title="View previous campaigns" >View previous campaigns.</a></p>
<div id="mce-responses" class="clear">
<div class="response" id="mce-error-response" style="display:none"></div>
<div class="response" id="mce-success-response" style="display:none"></div>
</div> <!-- real people should not fill this in and expect good things - do not remove this or risk form bot signups-->
<div style="position: absolute; left: -5000px;" aria-hidden="true"><input type="text" name="b_24325ade3f458f5d1004b6c23_8ecd7e9bb7" tabindex="-1" value=""></div>
<div class="clear"><input type="submit" value="Subscribe" name="subscribe" id="mc-embedded-subscribe" class="button"></div>
</div>
</form>
</div>
<script type='text/javascript' src='//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js'></script><script type='text/javascript'>(function($) {window.fnames = new Array(); window.ftypes = new Array();fnames[0]='EMAIL';ftypes[0]='email';fnames[1]='FNAME';ftypes[1]='text';fnames[2]='LNAME';ftypes[2]='text';fnames[6]='MMERGE6';ftypes[6]='dropdown';fnames[3]='MMERGE3';ftypes[3]='text';fnames[5]='MMERGE5';ftypes[5]='text';}(jQuery));var $mcj = jQuery.noConflict(true);</script>
@ -72,7 +72,7 @@ description: pages.contact.description
</section>
<!--
CTA sections
CTA sections
-->
<section id="contact-social" class="section section--cta">
<div class="section__content">
@ -254,82 +254,82 @@ description: pages.contact.description
<!--
MEDIA | CONFERENCES | TECHNOLOGY | YOUTUBE
similiar layout to news posts on home page.
.community-post
.community-image
.community-body
.community-title
MEDIA | CONFERENCES | TECHNOLOGY | YOUTUBE
similiar layout to news posts on home page.
.community-post
.community-image
.community-body
.community-title
<section id="community-media">
<div class="content">
<div class="row">
<div class="col-sm-6 col-md-3">
<div class="community-post">
<div class="community-image">
<section id="community-media">
<div class="content">
<div class="row">
<div class="col-sm-6 col-md-3">
<div class="community-post">
<div class="community-image">
</div>
<div class="community-body">
<h3 class="community-title">{% t pages.community.media-heading %}</h3>
</div>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="community-post">
<div class="community-image">
</div>
<div class="community-body">
<h3 class="community-title">{% t pages.community.media-heading %}</h3>
</div>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="community-post">
<div class="community-image">
</div>
<div class="community-body">
<h3 class="community-title">{% t pages.community.conferences-heading %}</h3>
</div>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="community-post">
<div class="community-image">
</div>
<div class="community-body">
<h3 class="community-title">{% t pages.community.conferences-heading %}</h3>
</div>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="community-post">
<div class="community-image">
</div>
<div class="community-body">
<h3 class="community-title">{% t pages.community.technology-heading %}</h3>
</div>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="community-post">
<div class="community-image">
</div>
<div class="community-body">
<h3 class="community-title">{% t pages.community.technology-heading %}</h3>
</div>
</div>
</div>
<div class="col-sm-6 col-md-3">
<div class="community-post">
<div class="community-image">
</div>
<div class="community-body">
<h3 class="community-title">{% t pages.community.community-heading %}</h3>
<a href="#" class="btn-blue">{% t pages.community.youtube-btn %}</a>
</div>
</div>
</div>
</div>
</div>
</section>
-->
</div>
<div class="community-body">
<h3 class="community-title">{% t pages.community.community-heading %}</h3>
<a href="#" class="btn-blue">{% t pages.community.youtube-btn %}</a>
</div>
</div>
</div>
</div>
</div>
</section>
-->
<!--
NEED SOME DASH
Repeat info from the GET-DASH page
.getdash-need-graphic
NEED SOME DASH
Repeat info from the GET-DASH page
.getdash-need-graphic
<section>
<div class="content">
<div class="row">
<div class="col-sm-6">
<h2>{% t pages.get-dash.need-heading %}</h2>
{% tmd pages.get-dash.need-text %}
<section>
<div class="content">
<div class="row">
<div class="col-sm-6">
<h2>{% t pages.get-dash.need-heading %}</h2>
{% tmd pages.get-dash.need-text %}
<a href="#" class="btn-blue">{% t pages.get-dash.need-btn %}</a>
{% tmd pages.get-dash.need-input %}
</div>
<div class="col-sm-6 getdash-need-graphic">
<a href="#" class="btn-blue">{% t pages.get-dash.need-btn %}</a>
{% tmd pages.get-dash.need-input %}
</div>
<div class="col-sm-6 getdash-need-graphic">
</div>
</div>
</div>
</section>
-->
</div>
</div>
</div>
</section>
-->
</div>

View file

@ -21,7 +21,7 @@ description: pages.evolution.description
<div class="section__btn-grp">
<a href="https://www.youtube.com/watch?v=rcHC40YmS0g" class="btn-blue btn-large" target="_blank" data-js-popup="video">{% t pages.evolution.video-btn %}</a>
<a href="{{ basenav }}/get-dash/" class="btn-blue-solid btn-large">{% t pages.evolution.sentinel-btn %}</a>
<a href="https://dashpay.atlassian.net/wiki/x/ErwxBg" class="btn-blue-solid btn-large" target="_blank">{% t pages.evolution.sentinel-btn %}</a>
</div>
</div>
</section>

View file

@ -46,90 +46,19 @@ description: pages.update.description
</section>
<!--
INTEGRATION
PROPOSAL
-->
<section>
<div class="content">
<div>
<h2>{% t pages.update.integrate-heading %}</h2>
{% tmd pages.update.integrate-text %}
<h2>{% t pages.update.proposal-heading %}</h2>
<img src="/assets/img/update/Voting.png" alt="">
</div>
<div class="ctabox ctabox_small-font ctabox--gray-light-bg" data-js-ctabox>
<div class="ctabox__inner">
<article class="ctabox__cta" data-js-ctabox-item>
<a href="https://shakepay.co" target="_blank" class="ctabox__link">
<div class="ctabox__imagewrapper">
<img src="/assets/img/update/network.png" class="ctabox__image">
</div>
<div class="ctabox__text">
<h4 class="ctabox__title">EVOLUTION</h4>
<p class="ctabox__description">Lead evolution developer Andy Freer has been locked away producing huge amounts of documentation for the various concepts of Evolution.</p>
</div>
</a>
</article>
<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/update/update.png" class="ctabox__image">
</div>
<div class="ctabox__text">
<h4 class="ctabox__title">RESEARCH</h4>
<p class="ctabox__description">In January 2016 we released an early Evolution prototype based on Electrum which enabled basic functions such as registering a username and paying friends by name.</p>
</div>
</a>
</article>
<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/update/frontend.png" class="ctabox__image">
</div>
<div class="ctabox__text">
<h4 class="ctabox__title">FRONTEND</h4>
<p class="ctabox__description">The 3 main areas of frontend design and development have been to design a secure, SPV based Web Wallet, merchant tools to enable drag-and-drop checkout on a website, and an SDK that connects web clients to DAPI.</p>
</div>
</a>
</article>
<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/update/backend.png" class="ctabox__image">
</div>
<div class="ctabox__text">
<h4 class="ctabox__title">BACKEND</h4>
<p class="ctabox__description">The first has been to port BitPays Bitcore Platform to Dash including merging Bitcore Node to DashCore 12.1 for native API support.</p>
</div>
</a>
</article>
<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/update/code.png" class="ctabox__image">
</div>
<div class="ctabox__text">
<h4 class="ctabox__title"> CORE</h4>
<p class="ctabox__description">Evolution Core work has been focused on first providing a basis to the new system in the form of Sentinel and improving DashCore to be implementation-agnostic to governance functions and objects.</p>
</div>
</a>
</article>
<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/update/netw.png" class="ctabox__image">
</div>
<div class="ctabox__text">
<h4 class="ctabox__title">NETWORK</h4>
<p class="ctabox__description">Enforcement will be turned off for this network upgrade, meaning nodes running the old version of the Dash software (12.0) will quickly stop being paid (contingent on miners upgrading).</p>
</div>
</a>
</article>
</div>
</div>
<div>
<a href="http://dash-nation-invite.herokuapp.com/" target="_blank" class="btn-blue">{% t pages.update.slack-btn %}</a>
<a href="https://www.dash.org/forum" target="_blank" class="btn-blue">{% t pages.update.forum-btn %}</a>
<a href="http://govobject-proposal.slayer.work/" target="_blank" class="btn-blue">{% t pages.update.proposal-btn %}</a>
</div>
</div>
</section>