[tor-commits] [donate-static/staging] Move the remaining donate-pages to new layout template

[gus at torproject.org]

commit a8bf30da43b63bc90073c375c0c41175c88388e7
Author: kez <kez at torproject.org>
Date:   Tue Jun 22 14:34:40 2021 -0400

    Move the remaining donate-pages to new layout template
---
 content/cryptocurrency/contents.lr    | 5 +----
 content/donate-thank-you/contents.lr  | 4 +---
 content/donor-faq/contents.lr         | 4 +---
 content/privacy-policy/contents.lr    | 4 +---
 content/state-disclosures/contents.lr | 4 +---
 models/donate-page.ini                | 4 ----
 templates/donate-empty.html           | 3 ++-
 7 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/content/cryptocurrency/contents.lr b/content/cryptocurrency/contents.lr
index d6403d1d..c49fd436 100644
--- a/content/cryptocurrency/contents.lr
+++ b/content/cryptocurrency/contents.lr
@@ -1,6 +1,6 @@
 _model: donate-page
 ---
-_template: layout.html
+_template: donate-empty.html
 ---
 title: Cryptocurrency
 ---
@@ -88,6 +88,3 @@ body:
     If you have any questions, or would like to donate a cryptocurrency not listed below, please email us at giving at torproject.org.
   </p>
 </div>
-
----
-html: cryptocurrency.html
diff --git a/content/donate-thank-you/contents.lr b/content/donate-thank-you/contents.lr
index a2f2302f..74c7206c 100644
--- a/content/donate-thank-you/contents.lr
+++ b/content/donate-thank-you/contents.lr
@@ -1,6 +1,6 @@
 _model: donate-page
 ---
-_template: layout.html
+_template: donate-empty.html
 ---
 title: Thank You
 ---
@@ -36,5 +36,3 @@ We need people to run relays, write code, organize the community and spread the
 Learn how you can help.
 <hr>
 <a class="btn btn-primary" href="https://community.torproject.org/" target="_blank">I Want To Volunteer</a>
----
-html: donate-empty.html
diff --git a/content/donor-faq/contents.lr b/content/donor-faq/contents.lr
index ef5be450..ecdd955f 100644
--- a/content/donor-faq/contents.lr
+++ b/content/donor-faq/contents.lr
@@ -1,6 +1,6 @@
 _model: donate-page
 ---
-_template: layout.html
+_template: donate-empty.html
 ---
 section_id: donate
 ---
@@ -249,5 +249,3 @@ body:
     </div>
   </div>
 </div>
----
-html: donate-empty.html
diff --git a/content/privacy-policy/contents.lr b/content/privacy-policy/contents.lr
index 81b4db9a..ce626881 100644
--- a/content/privacy-policy/contents.lr
+++ b/content/privacy-policy/contents.lr
@@ -1,6 +1,6 @@
 _model: donate-page
 ---
-_template: layout.html
+_template: donate-empty.html
 ---
 title: Donor Privacy Policy
 ---
@@ -10,8 +10,6 @@ section: Donate
 ---
 color: primary
 ---
-html: donate-empty.html
----
 body:
 
 <div class="privacy-policy">
diff --git a/content/state-disclosures/contents.lr b/content/state-disclosures/contents.lr
index 77c08861..4085d0b3 100644
--- a/content/state-disclosures/contents.lr
+++ b/content/state-disclosures/contents.lr
@@ -1,6 +1,6 @@
 _model: donate-page
 ---
-_template: layout.html
+_template: donate-empty.html
 ---
 section_id: donate
 ---
@@ -38,5 +38,3 @@ body:
     </div>
   </div>
 </div>
----
-html: donate-empty.html
diff --git a/models/donate-page.ini b/models/donate-page.ini
index bd441c6e..577e3675 100644
--- a/models/donate-page.ini
+++ b/models/donate-page.ini
@@ -41,7 +41,3 @@ translate = True
 [fields.color]
 label = Color
 type = string
-
-[fields.html]
-label = Html
-type = string
diff --git a/templates/donate-empty.html b/templates/donate-empty.html
index ba2adc27..85d11b6a 100644
--- a/templates/donate-empty.html
+++ b/templates/donate-empty.html
@@ -1,4 +1,5 @@
-{% block body %}
+{% extends "layout.html" %}
+{% block content %}
   <div class="donate-page">
     <div class="donate-page-wrapper {{ this.page_type }}">
       {{ this.body }}