Merge branch 'wbnns-exchanges'

_includes/layout/base/head-menu.html

@@ -14,9 +14,9 @@ http://opensource.org/licenses/MIT.
       <li{% if page.id == 'you-need-to-know' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate you-need-to-know url %}">{% translate menu-you-need-to-know layout %}</a></li>
     </ul>
   </li>
-  <li><a>{% translate menu-resources layout %}</a>
+  <li{% if page.id == 'resources' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate resources url %}">{% translate menu-resources layout %}</a>
     <ul>
-      <li{% if page.id == 'resources' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate resources url %}">{% translate menu-resources layout %}</a></li>
+      {% if page.lang == 'en' %}<li{% if page.id == 'exchanges' %} class="active"{% endif %}><a href="/en/exchanges">Exchanges</a></li>{% endif %}
       <li{% if page.id == 'community' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate community url %}">{% translate menu-community layout %}</a></li>
       {% if page.lang == 'en' %}<li{% if page.id == 'developer-documentation' %} class="active"{% endif %}><a href="/en/developer-documentation">Documentation</a></li>{% endif %}
       <li{% if page.id == 'vocabulary' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate vocabulary url %}">{% translate menu-vocabulary layout %}</a></li>

_less/ie.css

@@ -283,6 +283,15 @@ body{
 	display:inline;
 }
 
+.exchanges div div{
+	zoom:1;
+	display:inline;
+	padding:20px 0;
+}
+.exchanges div{
+	border-top:expression(this.parentNode.className=='exchanges'&&this.parentNode.getElementsByTagName('DIV')[0]!=this?'1px solid #e0e0e0':'0');
+}
+
 .banner-message a:hover,
 .banner-message a:hover:link,
 .banner-message a:hover:active,

_less/rtl.less

@@ -121,6 +121,14 @@ h2 .rssicon{
 	margin-left:5px;
 	bottom:-6px;
 }
+.exchanges{
+	text-align:right;
+}
+.exchanges img{
+	margin-right:0;
+	margin-left:5px;
+	bottom:-6px;
+}
 .downloadbox a{
 	direction:ltr;
 }

_less/screen.less

@@ -1464,6 +1464,31 @@ button.active {
 	bottom:-6px;
 }
 
+.exchanges{
+	margin-bottom:40px;
+	text-align:left;
+	font-size:0;
+}
+.exchanges div{
+	border-top:1px solid #e0e0e0;
+}
+.exchanges div:first-child,.exchanges div div{
+	border-top:0;
+}
+.exchanges div div{
+	width:278px;
+	font-size:16px;
+	display:inline-block;
+	vertical-align:top;
+}
+.exchanges img{
+	margin-right:5px;
+	width:24px;
+	height:24px;
+	position:relative;
+	bottom:-6px;
+}
+
 .resourcesmore{
 	text-align:center;
 	margin-top:40px;

_templates/exchanges.html

@@ -0,0 +1,169 @@
+---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+
+layout: base
+id: exchanges
+---
+
+<!-- Note: this file exempt from check-for-subheading-anchors check -->
+
+<h1>{% translate pagetitle %}</h1>
+<p class="summary">{% translate pagedesc %}</p>
+
+<h2><a name="exchanges">{% translate exchange %}</a></h2>
+<h4>Note: Exchanges provide highly varying degrees of safety, security,
+  privacy, and control over your funds and information. Perform your own
+  due diligence and <a href="/{{ page.lang }}/{% translate choose-your-wallet url %}">choose a wallet</a>
+  where you will keep your bitcoin before selecting an exchange.</h4>
+<div class="exchanges">
+<div>
+  <div>
+    <h3 id="international"><img src="/img/flags/ALL.png" alt="Globe">International</h3>
+    <p>
+      <a href="https://www.bitstamp.net/">Bitstamp</a><br>
+      <a href="https://bitsquare.io/">Bitsquare</a><br>
+      <a href="https://www.coinbase.com/">Coinbase</a><br>
+      <a href="https://www.kraken.com/">Kraken</a><br>
+      <a href="https://localbitcoins.com/">Local Bitcoins</a><br>
+      <a href="https://xapo.com/">Xapo</a>
+    </p>
+  </div>
+  <div>
+    <h3 id="argentina"><img src="/img/flags/AR.png" alt="Argentinan flag">Argentina</h3>
+    <p>
+      <a href="https://www.ripio.com/">Ripio</a><br>
+      <a href="https://www.satoshitango.com/">SatoshiTango</a>
+    </p>
+  </div>
+  <div>
+    <h3 id="australia"><img src="/img/flags/AU.png" alt="Australian flag">Australia</h3>
+    <p>
+      <a href="https://bitcoin.com.au/">Bitcoin Australia</a><br>
+      <a href="https://www.coinjar.com/">CoinJar</a><br>
+      <a href="https://www.cointree.com.au/">CoinTree</a><br>
+      <a href="https://www.coinloft.com.au/">CoinLoft</a>
+    </p>
+  </div>
+</div>
+<div>
+  <div>
+    <h3 id="brazil"><img src="/img/flags/BR.png" alt="Brazilian flag">Brazil</h3>
+    <p>
+      <a href="https://foxbit.com.br/">Foxbit</a><br>
+      <a href="https://www.mercadobitcoin.com.br/">Mercado Bitcoin</a>
+    </p>
+  </div>
+  <div>
+    <h3 id="canada"><img src="/img/flags/CA.png" alt="Canadian flag">Canada</h3>
+    <p>
+      <a href="https://quickbt.com/">QuickBT</a><br>
+      <a href="https://www.canadianbitcoins.com/">Canadian Bitcoins</a>
+    </p>
+  </div>
+  <div>
+    <h3 id="china"><img src="/img/flags/CN.png" alt="Chinese flag">China</h3>
+    <p>
+      <a href="https://www.btcchina.com/">BTCC</a><br>
+      <a href="https://www.huobi.com/">Huobi</a><br>
+      <a href="https://www.okcoin.com/">OKCoin</a>
+    </p>
+  </div>
+</div>
+<div>
+  <div>
+    <h3 id="france"><img src="/img/flags/FR.png" alt="French flag">France</h3>
+    <p>
+      <a href="https://www.paymium.com/">Paymium</a>
+    </p>
+  </div>
+  <div>
+    <h3 id="germany"><img src="/img/flags/DE.png" alt="German flag">Germany</h3>
+    <p>
+      <a href="https://www.bitcoin.de/">Bitcoin.de</a>
+    </p>
+  </div>
+  <div>
+    <h3 id="india"><img src="/img/flags/IN.png" alt="Indian flag">India</h3>
+    <p>
+      <a href="https://www.unocoin.com/">Unocoin</a>
+    </p>
+  </div>
+</div>
+<div>
+  <div>
+    <h3 id="indonesia"><img src="/img/flags/IN.png" alt="Indonesian flag">Indonesia</h3>
+    <p>
+      <a href="https://www.bitcoin.co.id/">Bitcoin Indonesia</a>
+    </p>
+  </div>
+  <div>
+    <h3 id="italy"><img src="/img/flags/IT.png" alt="Italian flag">Italy</h3>
+    <p>
+      <a href="https://posteb.it/">Postebit</a>
+    </p>
+  </div>
+  <div>
+    <h3 id="japan"><img src="/img/flags/JP.png" alt="Japanese flag">Japan</h3>
+    <p>
+      <a href="https://bitflyer.jp/">bitFlyer</a><br>
+      <a href="https://coincheck.com/">Coincheck</a>
+    </p>
+  </div>
+</div>
+<div>
+  <div>
+    <h3 id="mexico"><img src="/img/flags/MX.png" alt="Mexican flag">Mexico</h3>
+    <p>
+      <a href="https://bitso.com/">Bitso</a><br>
+      <a href="https://www.volabit.com/">Volabit</a>
+    </p>
+  </div>
+  <div>
+    <h3 id="saudi-arabia"><img src="/img/flags/SA.png" alt="Saudi Arabian flag">Saudi Arabia</h3>
+    <p>
+      <a href="https://bitoasis.net/">BitOasis</a>
+    </p>
+  </div>
+  <div>
+    <h3 id="south-africa"><img src="/img/flags/ZA.png" alt="South African flag">South Africa</h3>
+    <p>
+      <a href="https://www.ice3x.com/">iceCUBED</a><br>
+      <a href="https://www.luno.com/">Luno</a>
+    </p>
+  </div>
+</div>
+<div>
+  <div>
+    <h3 id="south-korea"><img src="/img/flags/KR.png" alt="South Korean flag">South Korea</h3>
+    <p>
+      <a href="https://www.korbit.co.kr/">Korbit</a>
+    </p>
+  </div>
+  <div>
+    <h3 id="turkey"><img src="/img/flags/TR.png" alt="Turkish flag">Turkey</h3>
+    <p>
+      <a href="https://www.btcturk.com/">BTCTurk</a>
+    </p>
+  </div>
+  <div>
+    <h3 id="united-kingdom"><img src="/img/flags/UK.png" alt="United Kingdom flag">United Kingdom</h3>
+    <p>
+      <a href="https://bittylicious.com/">Bittylicious</a><br>
+      <a href="https://www.coinfloor.co.uk/">Coinfloor</a>
+    </p>
+  </div>
+</div>
+<div>
+  <div>
+    <h3 id="united-states"><img src="/img/flags/US.png" alt="United States flag">United States</h3>
+    <p>
+      <a href="https://www.coinbase.com/">Coinbase</a><br>
+      <a href="https://gemini.com/">Gemini</a>
+    </p>
+  </div>
+</div>
+</div>
+
+<div class="introlink">Visit <a href="https://www.buybitcoinworldwide.com/">Buy Bitcoin Worldwide</a> for
+    user reviews on some of the above exchanges.</div>

_templates/getting-started.html

@@ -27,7 +27,7 @@ id: getting-started
   <div>
     <h2 id="get"><span>3.</span> {% translate get %}</h2>
     <p>{% translate gettxt %}</p>
-    <div><a href="https://www.buybitcoinworldwide.com/">{% translate getbut %}</a></div>
+    <div><a href="/en/exchanges">{% translate getbut %}</a></div>
   </div><div>
     <h2 id="spend"><span>4.</span> {% translate spend %}</h2>
     <p>{% translate spendtxt %}</p>

_translations/en.yml

@@ -316,6 +316,12 @@ en:
     full_node_guide: "Read the <a href=\"/en/full-node\">full node guide</a> for details."
     patient: "Check your bandwidth and space"
     releasekeys: "Bitcoin Core Release Signing Keys"
+  exchanges:
+    title: "Exchanges - Bitcoin"
+    metadescription: "Places to buy bitcoin in exchange for other currencies. Exchange US dollars (BTC/USD), Euros (BTC/EUR), Yuan (BTC/CNY) and other currencies for bitcoin."
+    pagetitle: "Bitcoin Exchanges"
+    pagedesc: "Places to buy bitcoin in exchange for other currencies."
+    exchange: "Bitcoin Exchanges"
   events:
     title: "Conferences and events - Bitcoin"
     pagetitle: "Conferences and events"
@@ -837,6 +843,7 @@ en:
     menu-community: Community
     menu-development: Development
     menu-events: Events
+    menu-exchanges: Exchanges
     menu-faq: FAQ
     menu-getting-started: "Getting started"
     menu-how-it-works: "How it works"
@@ -868,6 +875,7 @@ en:
     community: community
     development: development
     download: download
+    exchanges: exchanges
     events: events
     faq: faq
     getting-started: getting-started