Simplify dao yml for en

HTML attributes should not be in <lang>.yml since they cannot be translated.
bisq-network · Aug 10, 2020 · 663990a · 663990a
1 parent 5193cf7
commit 663990a
Show file tree

Hide file tree

Showing 3 changed files with 111 additions and 50 deletions.
diff --git a/_data/en.yml b/_data/en.yml
@@ -105,48 +105,21 @@ os_selector_options:
   liVerificationText1: PGP signatures
   liVerificationText2: PGP Public Key
 
-dao_page:
-- title: "The Bisq DAO"
-  intro: "Decentralizing revenue distribution and decision-making to make Bisq self-sustaining and censorship-resistant.<span class=\"footnote\">DAO stands for Decentralized Autonomous Organisation</span><a href=\"#why\" class=\"btn btn-lg btn-outline-secondary mt-0 mt-lg-2 animate-scroll\">See more &darr;</a>"
-  img: /images/DAO/dao_intro.svg
-  class: -main
-  id: intro
-
-- title: Why?
-  intro: "<p>Bisq trading is currently decentralized, but its revenue distribution and decision-making are not.</p><p>It is critical that Bisq be resistant to censorship, and the trade protocol and P2P network achieve this—for traders.</p><p>What about Bisq's developers? With a traditional legal structure, project decision-making and revenue distribution would be centralized, and this would create vulnerabilities.</p>"
-  href_text: Learn more about the DAO ›
-  href: "https://docs.bisq.network/dao.html"
-  target: "_blank"
-  rel: "noopener"
-  img: /images/DAO/dao_why.svg
-  id: why
-
-- title: What Is The Bisq DAO?
-  intro: "<p>The Bisq DAO enables value transfer from traders to contributors. The BSQ token makes this possible in a decentralized way.</p><p>Trading fees are distributed to contributors without the confines of a corporation or other legal entity, keeping Bisq stateless & sovereign.</p>"
-  href_text: Learn more about the DAO ›
-  href: "https://docs.bisq.network/dao.html"
-  target: "_blank"
-  rel: "noopener"
-  img: /images/DAO/dao_what.svg
-  id: what
-
-- title: How Does It Work?
-  intro: "<div class=\"subtitle pt-4\"> Revenue distribution </div> <div class=\"small\"> <p> To distribute revenue from trading fees to contributors, Bisq uses BSQ - a Bitcoin-based colored coin. Contributors are issued new BSQ when stakeholders approve their compensation requests through voting, and BSQ gets “uncolored” when traders use it to pay trading fees. </p> <p> There is no central entity collecting or creating BSQ—Bisq stakeholders are collectively in charge of the issuance process. </p> <p class=\"disclaimer\"> This is not an ICO. No BSQ is sold to raise capital. </p> </div> <div class=\"subtitle pt-3\"> Decision-making </div> <div class=\"small\"> <p> With no CEO or central leadership team, Bisq stakeholders—traders and contributors—are the owners of Bisq. </p> <p> Through social consensus (via voting) they determine Bisq's project strategy. </p> </div>"
-  href_text: Learn more about the DAO ›
-  href: "https://docs.bisq.network/dao.html"
-  target: "_blank"
-  rel: "noopener"
-  img: /images/DAO/dao_how.svg
-  id: how
-
-- title: "Benefits"
-  intro: " <div class=\"subtitle\">Traders: Make Bisq sustainable</div> <ul class=\"small pb-5\"> <li>Help Bisq deliver consistent professional development and support by buying BSQ from contributors</li> <li>Help make Bisq the go-to censorship-resistant bitcoin-to-fiat and bitcoin-to-crypto marketplace</li> <li>Enjoy a discount if you use BSQ to pay trading fees</li> <li>You can still pay trading fees with plain BTC if you like</li> </ul> <div class=\"subtitle\">Contributors: Earn BSQ</div> <ul class=\"small pb-5\"> <li>Do valuable work, request compensation, earn BSQ</li> <li>Sell BSQ on Bisq for BTC</li> <li>Vote on compensation requests of other contributors</li> <li>Work on cutting-edge technology with a cutting-edge culture—Bisq collaboration is permissionless, non-hierarchical, and fluid</li> </ul>"
-  href_text: Learn more about the DAO ›
-  href: "https://docs.bisq.network/dao.html"
-  target: "_blank"
-  rel: "noopener"
-  img: /images/DAO/dao_benefits.svg
-  id: benefits
+dao_page_text:
+  introTitle: "The Bisq DAO"
+  introText: "Decentralizing revenue distribution and decision-making to make Bisq self-sustaining and censorship-resistant.<span class=\"footnote\">DAO stands for Decentralized Autonomous Organisation</span><a href=\"#why\" class=\"btn btn-lg btn-outline-secondary mt-0 mt-lg-2 animate-scroll\">See more &darr;</a>"
+  whyTitle: Why?
+  whyText: "<p>Bisq trading is currently decentralized, but its revenue distribution and decision-making are not.</p><p>It is critical that Bisq be resistant to censorship, and the trade protocol and P2P network achieve this—for traders.</p><p>What about Bisq's developers? With a traditional legal structure, project decision-making and revenue distribution would be centralized, and this would create vulnerabilities.</p>"
+  whyLinkText: Learn more about the DAO
+  whatTitle: What Is The Bisq DAO?
+  whatText: "<p>The Bisq DAO enables value transfer from traders to contributors. The BSQ token makes this possible in a decentralized way.</p><p>Trading fees are distributed to contributors without the confines of a corporation or other legal entity, keeping Bisq stateless & sovereign.</p>"
+  whatLinkText: Learn more about the DAO
+  howTitle: How Does It Work?
+  howText: "<div class=\"subtitle pt-4\"> Revenue distribution </div> <div class=\"small\"> <p> To distribute revenue from trading fees to contributors, Bisq uses BSQ - a Bitcoin-based colored coin. Contributors are issued new BSQ when stakeholders approve their compensation requests through voting, and BSQ gets “uncolored” when traders use it to pay trading fees. </p> <p> There is no central entity collecting or creating BSQ—Bisq stakeholders are collectively in charge of the issuance process. </p> <p class=\"disclaimer\"> This is not an ICO. No BSQ is sold to raise capital. </p> </div> <div class=\"subtitle pt-3\"> Decision-making </div> <div class=\"small\"> <p> With no CEO or central leadership team, Bisq stakeholders—traders and contributors—are the owners of Bisq. </p> <p> Through social consensus (via voting) they determine Bisq's project strategy. </p> </div>"
+  howLinkText: Learn more about the DAO
+  benefitsTitle: "Benefits"
+  benefitsText: " <div class=\"subtitle\">Traders: Make Bisq sustainable</div> <ul class=\"small pb-5\"> <li>Help Bisq deliver consistent professional development and support by buying BSQ from contributors</li> <li>Help make Bisq the go-to censorship-resistant bitcoin-to-fiat and bitcoin-to-crypto marketplace</li> <li>Enjoy a discount if you use BSQ to pay trading fees</li> <li>You can still pay trading fees with plain BTC if you like</li> </ul> <div class=\"subtitle\">Contributors: Earn BSQ</div> <ul class=\"small pb-5\"> <li>Do valuable work, request compensation, earn BSQ</li> <li>Sell BSQ on Bisq for BTC</li> <li>Vote on compensation requests of other contributors</li> <li>Work on cutting-edge technology with a cutting-edge culture—Bisq collaboration is permissionless, non-hierarchical, and fluid</li> </ul>"
+  benefitsLinkText: Learn more about the DAO
 
 dao_images:
   dao_intro_contributor: Contributor

diff --git a/_layouts/page_dao.html b/_layouts/page_dao.html
@@ -201,35 +201,123 @@
 </style>
 
 
+{% assign daoText = site.data[page.lang].dao_page_text %}
 
-{% for entry in site.data[page.lang].dao_page %}
-<div id="{{ entry.id }}" class="d-lg-flex h-md-100 align-items-center split-container{{ entry.class }} {% capture thecycle %}{% cycle 'odd', 'even' %}{% endcapture %}{% if thecycle == 'even' %}split-invert{% endif %}">
+<div id="intro" class="d-lg-flex h-md-100 align-items-center split-container-main">
   <div class="col-lg-6 p-0 h-md-100 split split-first">
       <div class="d-md-flex align-items-center h-100 p-5 justify-content-center">
           <div class="pt-sm-0 pt-md-5 pb-5 split-text">
               <div class="title">
-                {{ entry.title }}
+                {{ daoText.introTitle }}
               </div>
               <div class="intro">
-                {{ entry.intro }}
+                {{ daoText.introText }}
               </div>
-              <a href="{{ entry.href }}" target="_blank">{{ entry.href_text }}</a>
           </div>
       </div>
   </div>
+  <div class="col-lg-6 p-0 h-md-100 split split-last">
+      <div class="d-md-flex align-items-center h-md-100 p-1 p-lg-5 pt-5 pb-5 justify-content-center">
+          <img src="{% lingual_link images/DAO/dao_intro.svg %}" />
+      </div>
+  </div>
+</div>
 
+<div id="why" class="d-lg-flex h-md-100 align-items-center split-container split-invert">
+  <div class="col-lg-6 p-0 h-md-100 split split-first">
+      <div class="d-md-flex align-items-center h-100 p-5 justify-content-center">
+          <div class="pt-sm-0 pt-md-5 pb-5 split-text">
+              <div class="title">
+                {{ daoText.whyTitle }}
+              </div>
+              <div class="intro">
+                {{ daoText.whyText }}
+              </div>
+              <a href="https://docs.bisq.network/dao.html" target="_blank">
+                {{ daoText.whyLinkText }} ›
+              </a>
+          </div>
+      </div>
+  </div>
+  <div class="col-lg-6 p-0 h-md-100 split split-last">
+      <div class="d-md-flex align-items-center h-md-100 p-1 p-lg-5 pt-5 pb-5 justify-content-center">
+          <img src="{% lingual_link images/DAO/dao_why.svg %}" />
+      </div>
+  </div>
+</div>
+
+<div id="what" class="d-lg-flex h-md-100 align-items-center split-container">
+  <div class="col-lg-6 p-0 h-md-100 split split-first">
+      <div class="d-md-flex align-items-center h-100 p-5 justify-content-center">
+          <div class="pt-sm-0 pt-md-5 pb-5 split-text">
+              <div class="title">
+                {{ daoText.whatTitle }}
+              </div>
+              <div class="intro">
+                {{ daoText.whatText }}
+              </div>
+              <a href="https://docs.bisq.network/dao.html" target="_blank">
+                {{ daoText.whatLinkText }} ›
+              </a>
+          </div>
+      </div>
+  </div>
   <div class="col-lg-6 p-0 h-md-100 split split-last">
       <div class="d-md-flex align-items-center h-md-100 p-1 p-lg-5 pt-5 pb-5 justify-content-center">
-          <img src="{{ entry.img }}" />
+          <img src="{% lingual_link images/DAO/dao_what.svg %}" />
       </div>
   </div>
+</div>
 
+<div id="how" class="d-lg-flex h-md-100 align-items-center split-container split-invert">
+  <div class="col-lg-6 p-0 h-md-100 split split-first">
+      <div class="d-md-flex align-items-center h-100 p-5 justify-content-center">
+          <div class="pt-sm-0 pt-md-5 pb-5 split-text">
+              <div class="title">
+                {{ daoText.howTitle }}
+              </div>
+              <div class="intro">
+                {{ daoText.howText }}
+              </div>
+              <a href="https://docs.bisq.network/dao.html" target="_blank">
+                {{ daoText.howLinkText }} ›
+              </a>
+          </div>
+      </div>
+  </div>
+  <div class="col-lg-6 p-0 h-md-100 split split-last">
+      <div class="d-md-flex align-items-center h-md-100 p-1 p-lg-5 pt-5 pb-5 justify-content-center">
+          <img src="{% lingual_link images/DAO/dao_how.svg %}" />
+      </div>
+  </div>
 </div>
-{% endfor %}
 
+<div id="benefits" class="d-lg-flex h-md-100 align-items-center split-container">
+  <div class="col-lg-6 p-0 h-md-100 split split-first">
+      <div class="d-md-flex align-items-center h-100 p-5 justify-content-center">
+          <div class="pt-sm-0 pt-md-5 pb-5 split-text">
+              <div class="title">
+                {{ daoText.benefitsTitle }}
+              </div>
+              <div class="intro">
+                {{ daoText.benefitsText }}
+              </div>
+              <a href="https://docs.bisq.network/dao.html" target="_blank">
+                {{ daoText.benefitsLinkText }} ›
+              </a>
+          </div>
+      </div>
+  </div>
+  <div class="col-lg-6 p-0 h-md-100 split split-last">
+      <div class="d-md-flex align-items-center h-md-100 p-1 p-lg-5 pt-5 pb-5 justify-content-center">
+          <img src="{% lingual_link images/DAO/dao_benefits.svg %}" />
+      </div>
+  </div>
+</div>
 
 
 {% assign item = site.data[page.lang].dao_footer %}
+
 <div class="conclusion m-0 pb-5">
 <div class="row-block container">
   <h2 style="margin: 2em 0;">{{ item.hLearnMore }}</h2>

diff --git a/_plugins/custom_tag.rb b/_plugins/custom_tag.rb
@@ -9,7 +9,7 @@ def render(context)
     if @dest.strip == 'home' || @dest.strip == 'image'
       return ( lang == "en" ) ? "/" : "/#{lang}/"
     end
-    return ( lang == "en" ) ? "/#{@dest.strip}/" : "/#{lang}/#{@dest.strip}/"
+    return ( lang == "en" ) ? "/#{@dest.strip}" : "/#{lang}/#{@dest.strip}"
   end
 end