openlp-core team mailing list archive

[Raoul Snyman <raoul@xxxxxxxxxxx>]

Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/donate into lp:openlp/website.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/donate/+merge/277389

- Add a donation blog post
- Change Gratipay widget on the donate page (which didn't work) to big green button
- Add the actual amount we are currently receiving.
-- 
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/donate into lp:openlp/website.

=== added file 'blog/contributing-to-openlp-financially.rst'
--- blog/contributing-to-openlp-financially.rst	1970-01-01 00:00:00 +0000
+++ blog/contributing-to-openlp-financially.rst	2015-11-12 20:20:28 +0000
@@ -0,0 +1,51 @@
+.. title: Contributing to OpenLP Financially
+.. slug: 2015/11/15/contributing-to-openlp-financially
+.. date: 2015-11-15 12:00:00 UTC
+.. tags:
+.. category:
+.. link:
+.. description:
+.. type: text
+.. previewimage: /cover-images/contributing-to-openlp-financially.jpg
+
+Over the years people have asked us about financial contributions and donations to the project. OpenLP, like many other
+open source projects, is largely funded by open source project sites (SourceForge.net, etc), donated resources, or (in
+some cases) the developers themselves. Until recently, this has meant that donations have mostly been unnecessary.
+
+After some upheaval in the open source community recently, we decided to start building our own server infrastructure
+around the project to reduce our reliance on third parties who can exercise control over our digital assets. This
+means that OpenLP is now in charge of funding our own servers, bandwidth, build tools and other things.
+
+Now that we are funding a lot more ourselves, we've decided to accept donations from folks. You can either give us a
+once-off donation, or you can donate on a regular basis (automatically), or you can buy swag (t-shirts, mugs, caps,
+stickers and more). Take a look at our `Donate`_ page for more information on where and how to donate.
+
+.. raw:: html
+
+    <hr>
+
+Check out some of the stuff you can order from our `online store`_:
+
+.. raw:: html
+
+    <div class="row">
+        <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
+            <a href="https://www.zazzle.com/openlp_mens_basic_t_shirt-235468873992673020";><img src="//rlv.zcache.com/svc/view?rlvnet=1&realview=113483422920275979&design=5923b48c-7afd-496f-8fdc-719da898c235&style=basic_tshirt&size=a_l&color=white&max_dim=512&hide=bleed%2Csafe%2CvisibleMask&r=1447358166963"></a>
+        </div>
+        <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
+            <a href="https://www.zazzle.com/openlp_ladies_baby_blue_t_shirt-235472386823918108";><img src="//rlv.zcache.com/svc/view?rlvnet=1&realview=113854201093837123&design=997b6ecb-c26e-4222-bf9d-dc491c9c369e&style=ladies_casual_ringer_tshirt&size=a_l&color=babybluenavy&max_dim=512&hide=bleed%2Csafe%2CvisibleMask&r=1447358172642"></a>
+        </div>
+        <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
+            <a href="https://www.zazzle.com/openlp_girls_hoodie-235572896428765501";><img src="//rlv.zcache.com/openlp_girls_hoodie-rac92d40542fa483a916f4f19f24f830f_wi1mf_512.jpg"></a>
+        </div>
+        <div class="col-xs-12 col-sm-6 col-md-4 col-lg-3">
+            <a href="https://www.zazzle.com/openlp_usb_flash_drive_16gb_swivel_usb_2_0_flash_drive-256736355735916624";><img src="//rlv.zcache.com/svc/view?realview=113720107861417526&design=16661e49-b71c-4db7-af17-7f5faa2052aa&rlvnet=1&clipcolor=silver&bodycolor=black&speed=usb2&max_dim=512&hide=bleed%2Csafe%2CvisibleMask&r=1447358198838"></a>
+        </div>
+    </div>
+    <hr>
+
+[ Image Credit: `Money by GotCredit`_ ]
+
+.. _Donate: https://openlp.org/donate
+.. _online store: https://www.zazzle.com/openlp
+.. _Money by GotCredit: https://www.flickr.com/photos/jakerust/16801498716/

=== added file 'files/cover-images/contributing-to-openlp-financially.jpg'
Binary files files/cover-images/contributing-to-openlp-financially.jpg	1970-01-01 00:00:00 +0000 and files/cover-images/contributing-to-openlp-financially.jpg	2015-11-12 20:20:28 +0000 differ
=== modified file 'pages/donate.rst'
--- pages/donate.rst	2015-10-14 20:20:09 +0000
+++ pages/donate.rst	2015-11-12 20:20:28 +0000
@@ -9,10 +9,11 @@
 fixed costs, like server hosting, domain names, and the like. If you'd like to
 help us out, please consider donating to our cause.
 
-There are two types of donation:
+There are three types of donations:
 
 1. Once-off donations
 2. Regular donations
+3. Buy swag
 
 Once-off Donations
 ^^^^^^^^^^^^^^^^^^
@@ -28,13 +29,27 @@
 want to donate on a monthly basis and basically divide it by 4. Gratipay works
 through PayPal, so all you need is a PayPal account.
 
-Set up your donation by clicking on the badge below.
+Set up your donation by clicking on the button below.
 
 .. raw:: html
 
-    <script data-gratipay-username="openlp" src="//grtp.co/v1.js" async></script>
-
-Monthly Costs
+    <p>
+        <a href="https://gratipay.com/openlp";>
+            <img alt="Support via Gratipay" src="https://cdn.rawgit.com/gratipay/gratipay-badge/2.3.0/dist/gratipay.png"/>
+        </a>
+    </p>
+
+*Currently, after payment fees, we are receiving US$ 0.05 per week.*
+
+Buy Swag
+^^^^^^^^
+One other way you can help us financially is by buying stuff from our online
+store. There are T-shirts, cups, hats, USB drives, and other things for sale,
+and a small percentage of the proceeds goes toward OpenLP.
+
+The store has been set up on Zazzle: `OpenLP Merchandise Store`_
+
+Regular Costs
 ^^^^^^^^^^^^^
 Here's a breakdown of our regular costs:
 
@@ -53,6 +68,7 @@
 
 .. _contact form: /#support
 .. _Gratipay: https://gratipay.com/
+.. _OpenLP Merchandise Store: https://www.zazzle.com/openlp
 .. _VPS from Linode.com: https://www.linode.com/pricing
 .. _backup service: https://www.linode.com/backups
 .. _Gandi.net's pricing page: https://www.gandi.net/domain/price/info

=== modified file 'themes/openlp2v2/templates/base_helper.tmpl'
--- themes/openlp2v2/templates/base_helper.tmpl	2015-07-11 21:57:10 +0000
+++ themes/openlp2v2/templates/base_helper.tmpl	2015-11-12 20:20:28 +0000
@@ -113,8 +113,8 @@
             <link href="http://fonts.googleapis.com/css?family=Raleway:700,400,300"; rel="stylesheet" type="text/css">
         %endif
     %else:
-        <link href="http://fonts.googleapis.com/css?family=Oxygen:400,300,700&amp;subset=latin,latin-ext"; rel="stylesheet" type="text/css">
-        <link href="http://fonts.googleapis.com/css?family=Raleway:700,400,300"; rel="stylesheet" type="text/css">
+        <link href="//fonts.googleapis.com/css?family=Oxygen:400,300,700&amp;subset=latin,latin-ext" rel="stylesheet" type="text/css">
+        <link href="//fonts.googleapis.com/css?family=Raleway:700,400,300" rel="stylesheet" type="text/css">
         %if use_cdn:
             <link href="//netdna.bootstrapcdn.com/bootstrap/3.3.0/css/bootstrap.min.css" rel="stylesheet">
         %else: