Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/website-donations-debian into lp:openlp/website.
Requested reviews: OpenLP Core (openlp-core) For more details, see: https://code.launchpad.net/~raoul-snyman/openlp/website-donations-debian/+merge/327055 Blog about the recent addition of new methods of donating, and update the Linux download section to show installation instructions instead of just linking to a page about the package. Blog post is due to go live on Sunday at 8:00 UTC -- Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/website-donations-debian into lp:openlp/website.
=== added file 'blog/more-ways-to-donate-and-debian-updated.rst' --- blog/more-ways-to-donate-and-debian-updated.rst 1970-01-01 00:00:00 +0000 +++ blog/more-ways-to-donate-and-debian-updated.rst 2017-07-08 02:46:52 +0000 @@ -0,0 +1,28 @@ +.. title: More Ways to Donate & Debian Updated +.. slug: 2017/07/09/more-ways-to-donate-and-debian-updated +.. date: 2017-07-09 08:00:00 UTC +.. tags: +.. category: +.. link: +.. description: +.. type: text +.. previewimage: /cover-images/more-ways-to-donate-and-debian-updated.jpg + +Over the last few years since we started accepting donations we're received a couple of enquiries from people looking +to be able to donate via credit card or Bitcoin, and without needing a PayPal account. We're pleased to announce that +you can now donate to OpenLP in Bitcoin or with a debit or credit card. + +Just head on over to the `donate`_ page which now has options for Bitcoin and debit/credit card too. Debit/credit card +payments are powered by `Stripe`_. As always, if you run into any issues please let us know via our `support options`_. + +In other news, we've recently updated OpenLP in Debian Linux. For a while we were unable to update the package because +of preparation for the Debian 9 release. Now that Debian 9 has been released, we're able to update the OpenLP package +again. OpenLP should come through with your regular updates. + + +[ Image Credit: `Credit Cards and Cash by Sean MacEntree`_ ] + +.. _donate: https://openlp.org/donate +.. _Stripe: https://www.stripe.com/ +.. _support options: https://openlp.org/#support +.. _Credit Cards and Cash by Sean MacEntree: https://www.flickr.com/photos/smemon/12696360474/ === added file 'files/cover-images/more-ways-to-donate-and-debian-updated.jpg' Binary files files/cover-images/more-ways-to-donate-and-debian-updated.jpg 1970-01-01 00:00:00 +0000 and files/cover-images/more-ways-to-donate-and-debian-updated.jpg 2017-07-08 02:46:52 +0000 differ === added file 'files/images/archlinux-logo.png' Binary files files/images/archlinux-logo.png 1970-01-01 00:00:00 +0000 and files/images/archlinux-logo.png 2017-07-08 02:46:52 +0000 differ === added file 'files/images/debian-logo.png' Binary files files/images/debian-logo.png 1970-01-01 00:00:00 +0000 and files/images/debian-logo.png 2017-07-08 02:46:52 +0000 differ === added file 'files/images/ubuntu-logo.png' Binary files files/images/ubuntu-logo.png 1970-01-01 00:00:00 +0000 and files/images/ubuntu-logo.png 2017-07-08 02:46:52 +0000 differ === modified file 'pages/donate.rst' --- pages/donate.rst 2017-06-21 05:34:56 +0000 +++ pages/donate.rst 2017-07-08 02:46:52 +0000 @@ -33,8 +33,8 @@ <div class="col-lg-4 col-md-4 col-sm-6 col-xs-12"> <h3>PayPal <small>(Preferred)</small></h3> <p>You can donate via PayPal buy clicking the button.</p> + <p class="small text-info">You will be guided to create a PayPal account if you don't have one already.</p> <p><a class="btn btn-primary" href="https://paypal.me/raoulsnyman";><i class="fa fa-fw fa-paypal"></i> Donate via PayPal</a></p> - <p class="small">You will be guided to create a PayPal account if you don't have one already.</p> </div> <div class="col-lg-4 col-md-4 col-sm-6 col-xs-12"> <h3>Bitcoin</h3> @@ -78,10 +78,10 @@ <div class="clearfix"> <div class="col-lg-4 col-md-4 col-sm-6 col-xs-12"> - <h3>Gratipay</h3> - <p>PalPal-based automated donation service.</p> + <h3>Gratipay <small>(Preferred)</small></h3> + <p>PayPal-based automated donation service.</p> + <p><img src="https://img.shields.io/gratipay/team/openlp.svg";></p> <p><a class="btn btn-primary" href="https://gratipay.com/openlp";><i class="fa fa-fw fa-gratipay"></i> Support via Gratipay</a></p> - <p class="small">Gratipay works weekly, so you'll need to divide your monthly donation into 4.</p> </div> <div class="col-lg-4 col-md-4 col-sm-6 col-xs-12"> <h3>Bitcoin</h3> @@ -97,8 +97,6 @@ </div> </div> -*Currently, after payment fees, we are receiving around US$ 1.00 per week.* - .. raw:: html <hr> === modified file 'stripe.ini.default' --- stripe.ini.default 2017-06-21 05:34:56 +0000 +++ stripe.ini.default 2017-07-08 02:46:52 +0000 @@ -1,2 +1,2 @@ [stripe] -api_key = sk_test_hqTZIARVq2wYrjptvH2kfXRT +api_key = === modified file 'themes/openlp2v2/assets/css/custom.css' --- themes/openlp2v2/assets/css/custom.css 2017-03-18 01:02:51 +0000 +++ themes/openlp2v2/assets/css/custom.css 2017-07-08 02:46:52 +0000 @@ -123,9 +123,10 @@ .btn-ubuntu { color: #fff; - background-color: #e36c43; + background-color: #e95420; border: 1px solid #e05a2b; } + .btn-ubuntu:hover, .btn-ubuntu:focus, .btn-ubuntu.focus { color: #fff; background-color: #dd4814; @@ -138,7 +139,7 @@ border: 1px solid #2a5cb1; } -.btn-fedora:hover { +.btn-fedora:hover, .btn-fedora:focus, .btn-fedora.focus { color: #fff; background-color: #294172; border-color: #294172; @@ -150,7 +151,7 @@ border: 1px solid #dd1155; } -.btn-debian:hover { +.btn-debian:hover, .btn-debian:focus, .btn-debian.focus { color: #fff; background-color: #A80030; border-color: #A80030; @@ -162,7 +163,7 @@ border: 1px solid #168cc7; } -.btn-arch:hover { +.btn-arch:hover, .btn-arch:focus, .btn-arch.focus { color: #fff; background-color: #147db2; border-color: #147db2; @@ -174,7 +175,7 @@ border: 1px solid #d00; } -.btn-freebsd:hover { +.btn-freebsd:hover, .btn-freebsd:focus, .btn-freebsd.focus { color: #fff; background-color: #a00; border-color: #a00; @@ -185,6 +186,13 @@ vertical-align: text-bottom; } +.btn > img.icon { + display: inline; + height: 16px; + margin-top: -2px; + width: 16px; +} + div.postindex article { border-bottom: 2px solid #ddd; padding-bottom: 0.5em; === modified file 'themes/openlp2v2/templates/front_page.html' --- themes/openlp2v2/templates/front_page.html 2017-04-02 17:03:28 +0000 +++ themes/openlp2v2/templates/front_page.html 2017-07-08 02:46:52 +0000 @@ -382,12 +382,104 @@ <h4>Linux/FreeBSD Downloads</h4> <p>Select a distribution</p> <p> - <a href="https://launchpad.net/~openlp-core/+archive/release"; class="btn btn-ubuntu"><i class="fa fa-fw fa-external-link"></i> Ubuntu</a> - <a href="https://admin.fedoraproject.org/pkgdb/package/OpenLP/"; class="btn btn-fedora"><i class="fa fa-fw fa-external-link"></i> Fedora</a> - <a href="https://packages.debian.org/openlp"; class="btn btn-debian"><i class="fa fa-fw fa-external-link"></i> Debian</a> - <a href="https://aur.archlinux.org/packages/openlp/"; class="btn btn-arch"><i class="fa fa-fw fa-external-link"></i> Arch</a> + <button type="button" class="btn btn-ubuntu" data-toggle="modal" data-target="#ubuntu-install"><img src="/images/ubuntu-logo.png" class="icon"> Ubuntu</button> + <!-- a href="https://launchpad.net/~openlp-core/+archive/release"; class="btn btn-ubuntu"><i class="fa fa-fw fa-external-link"></i> Ubuntu</a --> + <button type="button" class="btn btn-fedora" data-toggle="modal" data-target="#fedora-install"><img src="/files/fedora-logo.png" class="icon hidden"> Fedora</button> + <!-- a href="https://apps.fedoraproject.org/package/OpenLP"; class="btn btn-fedora"><i class="fa fa-fw fa-external-link"></i> Fedora</a --> + <button type="button" class="btn btn-debian" data-toggle="modal" data-target="#debian-install"><img src="/images/debian-logo.png" class="icon"> Debian</button> + <!-- a href="https://packages.debian.org/openlp"; class="btn btn-debian"><img src="/images/debian-logo.png" class="icon"> Debian</a --> + <button type="button" class="btn btn-arch" data-toggle="modal" data-target="#arch-install"><img src="/images/archlinux-logo.png" class="icon"> Arch</button> + <!-- a href="https://aur.archlinux.org/packages/openlp/"; class="btn btn-arch"><img src="/images/archlinux-logo.png" class="icon"> Arch</a --> <!-- a href="http://www.freshports.org/multimedia/py-openlp"; class="btn btn-freebsd"><i class="fa fa-fw fa-external-link"></i> FreeBSD</a --> </p> + <div class="modal fade" id="ubuntu-install" tabindex="-1" role="dialog" aria-labelledby="ubuntu-install-title" style="text-align: left;" data-backdrop="true"> + <div class="modal-dialog" role="document"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"> + <span aria-hidden="true">×</span> + </button> + <h4 class="modal-title" id="ubuntu-install-title">Ubuntu Installation Instructions</h4> + </div> + <div class="modal-body"> + <div class="alert alert-info small" role="alert"> + <p><i class="fa fa-fw fa-info-circle"></i> OpenLP only supports Canonical-supported versions of Ubuntu from 16.04 and up.</p> + </div> + <p>To install OpenLP, either search for OpenLP in Software Center, or run the following command:</p> + <pre>$ sudo apt install openlp</pre> + <p>Ubuntu does not always have the latest version of OpenLP in its repositories, so it may be handy to use our <abbr title="Personal Package Archive">PPA</abbr>:</p> + <pre>$ sudo add-apt-repository ppa:openlp-core/release<br>$ sudo apt update<br>$ sudo apt install openlp</pre> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button> + </div> + </div> + </div> + </div> + <div class="modal fade" id="fedora-install" tabindex="-1" role="dialog" aria-labelledby="fedora-install-title" style="text-align: left;" data-backdrop="true"> + <div class="modal-dialog" role="document"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"> + <span aria-hidden="true">×</span> + </button> + <h4 class="modal-title" id="fedora-install-title">Fedora Installation Instructions</h4> + </div> + <div class="modal-body"> + <div class="alert alert-info small" role="alert"> + <p><strong>Note:</strong> OpenLP only realistically supports the most recent Fedora release.</p> + </div> + <p>To install OpenLP, either search for OpenLP in your GUI package manager, or run the following command:</p> + <pre>$ sudo dnf install openlp</pre> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button> + </div> + </div> + </div> + </div> + <div class="modal fade" id="debian-install" tabindex="-1" role="dialog" aria-labelledby="debian-install-title" style="text-align: left;" data-backdrop="true"> + <div class="modal-dialog" role="document"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"> + <span aria-hidden="true">×</span> + </button> + <h4 class="modal-title" id="debian-install-title">Debian Installation Instructions</h4> + </div> + <div class="modal-body"> + <div class="alert alert-info small" role="alert"> + <p><strong>Note:</strong> OpenLP only realistically supports Debian unstable.</p> + </div> + <p>To install OpenLP, either search for OpenLP in your GUI package manager, or run the following command:</p> + <pre>$ sudo apt install openlp</pre> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button> + </div> + </div> + </div> + </div> + <div class="modal fade" id="arch-install" tabindex="-1" role="dialog" aria-labelledby="arch-install-title" style="text-align: left;" data-backdrop="true"> + <div class="modal-dialog" role="document"> + <div class="modal-content"> + <div class="modal-header"> + <button type="button" class="close" data-dismiss="modal" aria-label="Close"> + <span aria-hidden="true">×</span> + </button> + <h4 class="modal-title" id="arch-install-title">Arch Linux Installation Instructions</h4> + </div> + <div class="modal-body"> + <p>OpenLP is available in the Arch User Repository. You'll need to <a href="https://aur.archlinux.org/packages/pacaur/";>install <code>pacaur</code></a> if you haven't already.</p> + <p>To install OpenLP, run the following command:</p> + <pre># pacaur -S openlp</pre> + </div> + <div class="modal-footer"> + <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button> + </div> + </div> + </div> + </div> </div> <div class="source hidden"> <h4>OpenLP Source Code</h4>
_______________________________________________ Mailing list: https://launchpad.net/~openlp-core Post to : openlp-core@lists.launchpad.net Unsubscribe : https://launchpad.net/~openlp-core More help : https://help.launchpad.net/ListHelp
![https://img.shields.io/gratipay/team/openlp.svg"](https://img.shields.io/gratipay/team/openlp.svg"){kind=link}