Merge pull request #4424 from bitcoin-dot-org/site-updates

Site updates

Author: Cobra-Bitcoin

_config.yml

@@ -652,7 +652,7 @@ collections:
     output: false
 
 donation_banner:
-  address: bc1qx3u4njquj0ux63030r4nat8awqrlm0x2zlt96h
+  address: bc1qp6ejw8ptj9l9pkscmlf8fhhkrrjeawgpyjvtq8
   display: true
   amounts_in_usd:
     - 50

_contrib/bco-htmlproof

@@ -31,7 +31,7 @@ HTML::Proofer.new(
           /^$/,          ## anchors with no href attribute set (for clickable javascript elements)
           /^\/bin/,      ## /bin dir is not part of repository; holds Bitcoin Core binaries
           /^.*\.(pdf|PDF)$/, ## Bitcoin whitepaper links
-          'bitcoin:bc1qx3u4njquj0ux63030r4nat8awqrlm0x2zlt96h', ## bitcoin address handlers
+          'bitcoin:bc1qp6ejw8ptj9l9pkscmlf8fhhkrrjeawgpyjvtq8', ## bitcoin address handlers
           /^\/stats/     ## /stats dir is not part of repository; generated by separate stats script
         ],
 

_includes/layout/base/footer-js.html

@@ -8,7 +8,7 @@
   addAnchorLinks();
   trackOutgoingLinks();
   toggleDarkMode();
-  handlePageRedirect({% if page.id == 'buy' %} true {% else %} false {% endif %})
+  handlePageRedirect({% if page.id == 'buy' %} true {% else %} false {% endif %}, {% if page.id == 'sell' %} true {% else %} false {% endif %});
 </script>
 
 {% comment %}

_includes/layout/base/footer-menu.html

@@ -10,7 +10,7 @@
         <span class="footer-title">{% translate donate-community layout %}:</span>
         <a onclick="openDonationModal()" class="donate-btn btn-bright">{% translate donate layout %}</a>
         <p class="donate-text">{% translate donate-community-support layout %}
-          <a class="donate-link" href="bitcoin:bc1qx3u4njquj0ux63030r4nat8awqrlm0x2zlt96h" target="_blank">bc1qx3u4njquj0ux63030r4nat8awqrlm0x2zlt96h</a>
+          <a class="donate-link" href="bitcoin:bc1qp6ejw8ptj9l9pkscmlf8fhhkrrjeawgpyjvtq8" target="_blank">bc1qp6ejw8ptj9l9pkscmlf8fhhkrrjeawgpyjvtq8</a>
         </p>
         {% if page.id == 'bitcoin-for-businesses' %}
           {% include animations/herecomesbitcoin/construction.html %}
@@ -102,11 +102,12 @@
       <ul class="footermenu-list">
         <li{% if page.id == 'support-bitcoin' %} class="active"{% endif %}>
           <a href="/{{ page.lang }}/{% translate support-bitcoin url %}">{% translate menu-support-bitcoin layout %}</a>
-        {% if page.lang == 'en' %}
         <li id="buybitcoinfootermenulink" {% if page.id == 'buy' %} class="active"{% endif %}>
           <a href="/{{ page.lang }}/{% translate buy url %}">{% translate menu-buy layout %}</a>
         </li>
-        {% endif %}
+        <li id="sellbitcoinfootermenulink" {% if page.id == 'sell' %} class="active"{% endif %}>
+          <a href="/en/{% translate sell url %}">{% translate menu-sell layout %}</a>
+        </li>
         {% if page.lang == 'en' %}
         <li{% if page.id == 'full-node' %} class="active"{% endif %}>
           <a href="/en/full-node">{% translate menu-full-node layout %}</a>

_includes/layout/base/head-menu.html

@@ -60,6 +60,7 @@
     <ul>
       <li{% if page.id == 'support-bitcoin' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate support-bitcoin url %}">{% translate menu-support-bitcoin layout %}</a>
       <li id="buybitcoinmenulink" {% if page.id == 'buy' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate buy url %}">{% translate menu-buy layout %}</a></li>
+      <li id="sellbitcoinmenulink" {% if page.id == 'sell' %} class="active"{% endif %}><a href="/en/{% translate sell url %}">{% translate menu-sell layout %}</a></li>
       {% if page.lang == 'en' %}<li{% if page.id == 'full-node' %} class="active"{% endif %}><a href="/en/full-node">Running a full node</a></li>{% endif %}
       <li{% if page.id == 'development' %} class="active"{% endif %}><a href="/{{ page.lang }}/{% translate development url %}">{% translate menu-development layout %}</a></li>
     </ul>

_templates/buy.html

@@ -5,7 +5,7 @@
 layout: base
 id: buy
 end_of_page: |
-  <script>showBuySellWidgets();</script>
+  <script>showBuyWidget();</script>
 ---
 
 <!-- Note: this file exempt from check-for-subheading-anchors check -->

_templates/sell.html

@@ -0,0 +1,29 @@
+---
+# This file is licensed under the MIT License (MIT) available on
+# http://opensource.org/licenses/MIT.
+
+layout: base
+id: sell
+end_of_page: |
+  <script>showSellWidget();</script>
+---
+
+<!-- Note: this file exempt from check-for-subheading-anchors check -->
+
+<div class="hero" style="padding:25px;">
+  <div class="container hero-container">
+    <h1>{% translate pagetitle %}</h1>
+  </div>
+</div>
+
+<div class="container">
+  <div class="row card-row" style="justify-content: center;">
+	<div class="card buy-card" style="width: 480px;margin-top: -30px;margin-bottom: 100px;">
+  		<div class="sell-widget"></div>
+  	</div>
+	<div class="buy-footer-notice">
+		<b>The above widget is provided by a third party provider (<a href="https://www.moonpay.com/">MoonPay</a>) and is not associated with bitcoin.org.</b>
+	</div>
+  </div>
+</div>
+

_translations/en.yml

@@ -144,6 +144,9 @@ en:
   whitepaper-mirrors:
     title: "Bitcoin: A Peer-to-Peer Electronic Cash System"
     summary: "Mirrors of the Bitcoin whitepaper"
+  sell:
+    title: "Sell Bitcoin"
+    pagetitle: "Sell Bitcoin"
   buy:
     title: "Buy Bitcoin"
     pagetitle: "Buy Bitcoin"
@@ -1165,6 +1168,7 @@ en:
     menu-scams: "Avoid Scams"
     menu-support-bitcoin: "Support Bitcoin"
     menu-buy: "Buy Bitcoin"
+    menu-sell: "Sell Bitcoin"
     menu-full-node: "Running a full node"
     menu-other: "Other"
     menu-vocabulary: Vocabulary
@@ -1198,6 +1202,7 @@ en:
     bitcoin-for-individuals: bitcoin-for-individuals
     bitcoin-for-businesses: bitcoin-for-businesses
     buy: buy
+    sell: sell
     choose-your-wallet: choose-your-wallet
     community: community
     developer-documentation: developer-documentation

js/main.js

@@ -731,7 +731,7 @@ function changeAccordionButtonText(button, text) {
   button.textContent = text;
 }
 
-function showBuySellWidgets() {
+function showBuyWidget() {
 
   var buyWidget = window.MoonPayWebSdk.init({
     flow: 'buy',
@@ -748,10 +748,30 @@ function showBuySellWidgets() {
   buyWidget.show();
 }
 
-function handlePageRedirect(isBuyPage) {
+function showSellWidget() {
+
+  var sellWidget = window.MoonPayWebSdk.init({
+    flow: 'sell',
+    environment: 'production',
+    containerNodeSelector: '.sell-widget',
+    variant: 'embedded',
+    params: {
+      apiKey: 'pk_live_QWvwDl3WJAq7S8fDjsOUMfjn09DSw8R',
+      theme: 'light',
+      colorCode: '#FF9500'
+    }
+  });
+
+  sellWidget.show();
+}
+
+function handlePageRedirect(isBuyPage, isSellPage) {
     if (isBuyPage === undefined) {
         isBuyPage = false;
     }
+    if (isSellPage === undefined) {
+        isSellPage = false;
+    }
 
     $.get('/cdn-cgi/trace')
         .done(function(response) {
@@ -771,20 +791,27 @@ function handlePageRedirect(isBuyPage) {
                 if (data.loc === 'GB') {
                     window.location.href = '/';
                 } else {
-                    showBuySellWidgets();
+                    showBuyWidget();
+                }
+            } else if (isSellPage) {
+                if (data.loc === 'GB') {
+                    window.location.href = '/';
+                } else {
+                    showSellWidget();
                 }
             } else {
-                  if (data.loc === 'GB') {
+                if (data.loc === 'GB') {
                     $('#buybitcoinbutton').hide();
                     $('#buybitcoinmenulink').hide();
                     $('#buybitcoinfootermenulink').hide();
                     $('#getstartedbuybutton').hide();
+                    $('#sellbitcoinmenulink').hide();
+                    $('#sellbitcoinfootermenulink').hide();
                 }
             }
         });
 }
 
-
 function sortTableColumn(selectedOption) {
   var tableAccordion = document.getElementById('tableAccordion');
   var tableAccordionButton = document.getElementById('tableAccordionButton');