From c91ffb3c0a64ad4e74a94e1817cb66d140b65e5d Mon Sep 17 00:00:00 2001 From: blackaugust Date: Sat, 27 Nov 2021 18:49:17 -0500 Subject: [PATCH 1/3] moved all forms to seperate includes --- _includes/config-form.html | 11 +++++++++++ _includes/mailchimp-form.html | 16 ++++++++++++++++ _includes/paypal-cancel.html | 6 ++++++ _includes/paypal-donate.html | 6 ++++++ _includes/paypal-membership.html | 15 +++++++++++++++ _includes/paypal-pay.html | 6 ++++++ cancel.md | 24 ++--------------------- class.md | 17 +--------------- contact.md | 13 +------------ donate.md | 8 ++------ index.md | 17 +--------------- membership.md | 33 ++------------------------------ pay.md | 7 +------ 13 files changed, 70 insertions(+), 109 deletions(-) create mode 100644 _includes/config-form.html create mode 100644 _includes/mailchimp-form.html create mode 100644 _includes/paypal-cancel.html create mode 100644 _includes/paypal-donate.html create mode 100644 _includes/paypal-membership.html create mode 100644 _includes/paypal-pay.html diff --git a/_includes/config-form.html b/_includes/config-form.html new file mode 100644 index 0000000..d64af85 --- /dev/null +++ b/_includes/config-form.html @@ -0,0 +1,11 @@ + diff --git a/_includes/mailchimp-form.html b/_includes/mailchimp-form.html new file mode 100644 index 0000000..c4d704b --- /dev/null +++ b/_includes/mailchimp-form.html @@ -0,0 +1,16 @@ + + + +
+
+
+ + + +
+
+
+
diff --git a/_includes/paypal-cancel.html b/_includes/paypal-cancel.html new file mode 100644 index 0000000..792896e --- /dev/null +++ b/_includes/paypal-cancel.html @@ -0,0 +1,6 @@ +
+ + + + +
diff --git a/_includes/paypal-donate.html b/_includes/paypal-donate.html new file mode 100644 index 0000000..6e5af45 --- /dev/null +++ b/_includes/paypal-donate.html @@ -0,0 +1,6 @@ +
+ + + + +
diff --git a/_includes/paypal-membership.html b/_includes/paypal-membership.html new file mode 100644 index 0000000..b9ba01e --- /dev/null +++ b/_includes/paypal-membership.html @@ -0,0 +1,15 @@ +
+ + + + +
Membership Options
+ + + +
diff --git a/_includes/paypal-pay.html b/_includes/paypal-pay.html new file mode 100644 index 0000000..1006321 --- /dev/null +++ b/_includes/paypal-pay.html @@ -0,0 +1,6 @@ +
+ + + + +
diff --git a/cancel.md b/cancel.md index ee531fe..44607fb 100644 --- a/cancel.md +++ b/cancel.md @@ -8,35 +8,15 @@ permalink: /cancel ## I Still Want to Take the Class All Hands Active is committed to spreading knowledge. We won't keep anyone from attending a class. But we are sustained by donations! Can you give at least $1? -
- - - - -
+{% include paypal-donate.html %} ## This Class isn't for Me ### Stay informed about all things All Hands Active! Sign up for our email list or follow us on social media (at the bottom of the page). - - - -
-
-
- - - -
-
-
-
+{% include mailchimp-form.html %} ### Find another class Check our [calendar](https://www.meetup.com/AllHandsActive/events/) right now. Or contact us at and let us know what you want to learn. diff --git a/class.md b/class.md index a55b123..1101ee7 100644 --- a/class.md +++ b/class.md @@ -9,22 +9,7 @@ We're sure you're excited about that class. In the meantime, you might want to f ## Stay informed about all things All Hands Active! Sign up for our email list or follow us on social media (at the bottom of the page). - - - -
-
-
- - - -
-
-
-
+{% include mailchimp-form.html %} ## Find another class Check our [calendar](https://www.meetup.com/AllHandsActive/events/) right now. Or contact us at and let us know what you want to learn. diff --git a/contact.md b/contact.md index c51e5cd..8e4303c 100644 --- a/contact.md +++ b/contact.md @@ -34,15 +34,4 @@ https://chat.allhandsactive.org/ \#allhandsactive
on the tilde.chat IRC network - - +{% include contact-form.html %} diff --git a/donate.md b/donate.md index 8c986b5..d8f6123 100644 --- a/donate.md +++ b/donate.md @@ -17,12 +17,8 @@ excerpt: "Reach us by email, or visit us in person." ## Donate to All Hand Active All Hands Active depends on your generosity. Any donation helps, but we are especially grateful for recurring donations. -
- - - - -
+ +{% include paypal-donate.html %} We also have a [Patreon](https://www.patreon.com/AllHandsActive) - please consider supporting us there! diff --git a/index.md b/index.md index e613d95..e39f60d 100644 --- a/index.md +++ b/index.md @@ -55,19 +55,4 @@ feature_row2: Join our announcements email list! {: .text-center} - - - -
-
-
- - - -
-
-
-
+{% include mailchimp-form.html %} diff --git a/membership.md b/membership.md index a8289e7..e106239 100644 --- a/membership.md +++ b/membership.md @@ -74,22 +74,8 @@ on the mailing list to fixing something that's broken. ## Pay For a Membership via Paypal {: .text-center} -
- - - - -
Membership Options
- - - -
+{% include paypal-membership.html %} ## Subscribe {: .text-center} @@ -97,19 +83,4 @@ on the mailing list to fixing something that's broken. Stay informed about all things All Hands Active! {: .text-center} - - - -
-
-
- - - -
-
-
-
+{% include mailchimp-form.html %} diff --git a/pay.md b/pay.md index 11f5660..ebc3086 100644 --- a/pay.md +++ b/pay.md @@ -17,11 +17,6 @@ excerpt: "Reach us by email, or visit us in person." ## Donate for a class All Hands Active depends on your generosity. Most participants in classes donate $20 or more, but we want classes to be available to everyone. Please give what you can. -
- - - - -
+{% include paypal-pay.html %} From ab471633a3b6299a878813619a8b8edf8a2a8da1 Mon Sep 17 00:00:00 2001 From: blackaugust Date: Thu, 2 Dec 2021 18:04:35 -0500 Subject: [PATCH 2/3] reverted some forms, not needed as includes --- cancel.md | 8 ++++++-- contact.md | 12 +++++++++++- donate.md | 9 +++++++-- membership.md | 16 +++++++++++++++- pay.md | 10 +++++++--- 5 files changed, 46 insertions(+), 9 deletions(-) diff --git a/cancel.md b/cancel.md index 44607fb..e849db6 100644 --- a/cancel.md +++ b/cancel.md @@ -8,8 +8,12 @@ permalink: /cancel ## I Still Want to Take the Class All Hands Active is committed to spreading knowledge. We won't keep anyone from attending a class. But we are sustained by donations! Can you give at least $1? - -{% include paypal-donate.html %} +
+ + + + +
## This Class isn't for Me diff --git a/contact.md b/contact.md index 8e4303c..fe360cf 100644 --- a/contact.md +++ b/contact.md @@ -34,4 +34,14 @@ https://chat.allhandsactive.org/ \#allhandsactive
on the tilde.chat IRC network -{% include contact-form.html %} + diff --git a/donate.md b/donate.md index d8f6123..77739bd 100644 --- a/donate.md +++ b/donate.md @@ -17,8 +17,13 @@ excerpt: "Reach us by email, or visit us in person." ## Donate to All Hand Active All Hands Active depends on your generosity. Any donation helps, but we are especially grateful for recurring donations. - -{% include paypal-donate.html %} +
+ + + + +
We also have a [Patreon](https://www.patreon.com/AllHandsActive) - please consider supporting us there! diff --git a/membership.md b/membership.md index e106239..6655a6b 100644 --- a/membership.md +++ b/membership.md @@ -75,7 +75,21 @@ on the mailing list to fixing something that's broken. ## Pay For a Membership via Paypal {: .text-center} -{% include paypal-membership.html %} +
+ + + + +
Membership Options
+ + + +
## Subscribe {: .text-center} diff --git a/pay.md b/pay.md index ebc3086..6c6223f 100644 --- a/pay.md +++ b/pay.md @@ -17,6 +17,10 @@ excerpt: "Reach us by email, or visit us in person." ## Donate for a class All Hands Active depends on your generosity. Most participants in classes donate $20 or more, but we want classes to be available to everyone. Please give what you can. - -{% include paypal-pay.html %} - +
+ + + + +
From 369441b5841df4a60d4288d394f51eb43afcc69c Mon Sep 17 00:00:00 2001 From: blackaugust Date: Thu, 2 Dec 2021 18:05:37 -0500 Subject: [PATCH 3/3] removed uneeded includes --- _includes/paypal-cancel.html | 6 ------ _includes/paypal-donate.html | 6 ------ _includes/paypal-membership.html | 15 --------------- _includes/paypal-pay.html | 6 ------ 4 files changed, 33 deletions(-) delete mode 100644 _includes/paypal-cancel.html delete mode 100644 _includes/paypal-donate.html delete mode 100644 _includes/paypal-membership.html delete mode 100644 _includes/paypal-pay.html diff --git a/_includes/paypal-cancel.html b/_includes/paypal-cancel.html deleted file mode 100644 index 792896e..0000000 --- a/_includes/paypal-cancel.html +++ /dev/null @@ -1,6 +0,0 @@ -
- - - - -
diff --git a/_includes/paypal-donate.html b/_includes/paypal-donate.html deleted file mode 100644 index 6e5af45..0000000 --- a/_includes/paypal-donate.html +++ /dev/null @@ -1,6 +0,0 @@ -
- - - - -
diff --git a/_includes/paypal-membership.html b/_includes/paypal-membership.html deleted file mode 100644 index b9ba01e..0000000 --- a/_includes/paypal-membership.html +++ /dev/null @@ -1,15 +0,0 @@ -
- - - - -
Membership Options
- - - -
diff --git a/_includes/paypal-pay.html b/_includes/paypal-pay.html deleted file mode 100644 index 1006321..0000000 --- a/_includes/paypal-pay.html +++ /dev/null @@ -1,6 +0,0 @@ -
- - - - -