diff --git a/blog/almost-there-openlp-216-release-candidate-3.rst b/blog/almost-there-openlp-216-release-candidate-3.rst index f55b18d..c447242 100644 --- a/blog/almost-there-openlp-216-release-candidate-3.rst +++ b/blog/almost-there-openlp-216-release-candidate-3.rst @@ -68,5 +68,8 @@ reap the rewards of your eathly work in Heaven. `Download Now! `_ -.. |OpenLP Translations| image:: /pictures/openlp-22-translations.png +[ Image Credit: `Road Ends 300 Ft. f/4 by Atomic Taco`_ ] + +.. |OpenLP Translations| image:: /pictures/openlp-22-translations.png +.. _Road Ends 300 Ft. f/4 by Atomic Taco: https://www.flickr.com/photos/atomictaco/5409578523/ diff --git a/blog/android-2-alpha-release-through-google-play-store.rst b/blog/android-2-alpha-release-through-google-play-store.rst index 51dbc1a..7a542fe 100644 --- a/blog/android-2-alpha-release-through-google-play-store.rst +++ b/blog/android-2-alpha-release-through-google-play-store.rst @@ -1,4 +1,4 @@ -.. title: Android 2 -(Alpha) Release through Google Play Store +.. title: Android 2 (Alpha Release) through Google Play Store .. slug: 2015/06/05/android-2-alpha-release-through-google-play-store .. date: 2015-06-05 17:06:57 UTC .. tags: @@ -29,4 +29,7 @@ The following functions are supported: The new version can be found at the `Google Play Store`_. +[ Image Credit: `Android Lineup - Beige by Rob Bulmahn`_ ] + .. _Google Play Store: https://play.google.com/store/apps/details?id=org.openlp.android2 +.. _Android Lineup - Beige by Rob Bulmahn: https://www.flickr.com/photos/rbulmahn/6180104944/ diff --git a/blog/getting-closer-stable-release-version-215.rst b/blog/getting-closer-stable-release-version-215.rst index 2fd2d1e..621ceac 100644 --- a/blog/getting-closer-stable-release-version-215.rst +++ b/blog/getting-closer-stable-release-version-215.rst @@ -6,6 +6,7 @@ .. link: .. description: .. type: text +.. previewimage: /cover-images/getting-closer-stable-release-version-215.jpg So we do not lose heart. Though our outer self is wasting away, our inner self is being renewed day by day. For this light momentary affliction is preparing for us an eternal weight of glory beyond all comparison,  as we look not to the things that are seen but to the things that are unseen. For the things that are seen are transient, but the things that are unseen are eternal. @@ -27,5 +28,7 @@ Here are the bug reports we have fixed: * #1449041 Main vebview doesn't mirror PowerPoint when using a single-screen setup * #1449064 Transitions happens in the same slide -.. _Download: http://openlp.org/download +[ Image Credit: `Stables by Larry Ewing`_ ] +.. _Download: http://openlp.org/download +.. _Stables by Larry Ewing: https://www.flickr.com/photos/lewing/3510479166/ diff --git a/blog/video-visual-history-openlp-2x.rst b/blog/video-visual-history-openlp-2x.rst index 771d73f..ee1f832 100644 --- a/blog/video-visual-history-openlp-2x.rst +++ b/blog/video-visual-history-openlp-2x.rst @@ -5,7 +5,7 @@ .. link: .. description: .. type: text -.. previewimage: /cover-images/video-visual-history-openlp-2x.jpg +.. previewimage: /cover-images/video-visual-history-openlp-2x.png Ever wanted to know how many developers work on OpenLP, or when OpenLP started, or even how many are working on the code at the same time? Well, now you can see this and more with the video above. @@ -25,7 +25,7 @@ Enjoy! .. youtube:: 77a2iNvmvts :height: 315 :width: 560 - + .. raw:: html - \ No newline at end of file + diff --git a/conf.py b/conf.py index 741d93a..28c0ff2 100644 --- a/conf.py +++ b/conf.py @@ -676,6 +676,10 @@ COPY_SOURCES = False # # #""" +EXTRA_HEAD_DATA = """ + +""" + # Google Analytics or whatever else you use. Added to the bottom of # in the default template (base.tmpl). # (translatable) diff --git a/files/contact-us.php b/files/contact-us.php new file mode 100644 index 0000000..748da48 --- /dev/null +++ b/files/contact-us.php @@ -0,0 +1,78 @@ + '6Lc7Hg4TAAAAAP7o80vkVc9rwBXAeo9PlN3Q7khh', + 'response' => $_POST['g-recaptcha-response'], + 'remoteip', $remote_ip +); +$fields_string = http_build_query($fields); + +// Open connection +$ch = curl_init(); + +// Set the url, number of POST vars, POST data +curl_setopt($ch, CURLOPT_URL, $url); +curl_setopt($ch, CURLOPT_POST, count($fields)); +curl_setopt($ch, CURLOPT_POSTFIELDS, $fields_string); +curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); + +// Execute post +$result = curl_exec($ch); + +// Close connection +curl_close($ch); + +// Parse response +if ($result !== false && $result !== true) { + $json = new Services_JSON(); + $api_response = $json->decode($result); + if ($api_response->success !== true) { + error_log('Error from verification: ' . print_r($api_response, true)); + redirect('https://openlp.org/?m=0#support'); + } +} +else { + error_log('Got an error code: ' . $response_status); + redirect('https://openlp.org/?m=0#support'); +} + +// Get everything together +$headers['From'] = $_POST['name'] . ' <' . $_POST['email'] . '>'; +$headers['To'] = 'support@openlp.org'; +$headers['Subject'] = $_POST['subject']; +$body = $_POST['message']; +$recipients = 'support@openlp.org'; +if ($_POST['me-too']) { + $recipients .= ',' . $_POST['email']; +} + +// Create the mail object using the Mail::factory method +$mail_object =& Mail::factory('mail'); +$result = $mail_object->send($recipients, $headers, $body); +if ($result !== true) { + error_log(print_r($result, true)); + redirect('https://openlp.org/?m=0#support'); +} + +redirect('https://openlp.org/?m=1#support'); diff --git a/files/cover-images/donate.jpg b/files/cover-images/donate.jpg new file mode 100644 index 0000000..3a041eb Binary files /dev/null and b/files/cover-images/donate.jpg differ diff --git a/files/cover-images/getting-closer-stable-release-version-215.jpg b/files/cover-images/getting-closer-stable-release-version-215.jpg new file mode 100644 index 0000000..e79cff1 Binary files /dev/null and b/files/cover-images/getting-closer-stable-release-version-215.jpg differ diff --git a/files/cover-images/video-visual-history-openlp-2x.png b/files/cover-images/video-visual-history-openlp-2x.png new file mode 100644 index 0000000..b9fe94f Binary files /dev/null and b/files/cover-images/video-visual-history-openlp-2x.png differ diff --git a/files/cover-images/want-openlp-in-your-language.jpg b/files/cover-images/want-openlp-in-your-language.jpg new file mode 100644 index 0000000..a26bd46 Binary files /dev/null and b/files/cover-images/want-openlp-in-your-language.jpg differ diff --git a/pages/donate.rst b/pages/donate.rst new file mode 100644 index 0000000..2819bde --- /dev/null +++ b/pages/donate.rst @@ -0,0 +1,62 @@ +.. title: Donate to OpenLP +.. slug: donate +.. date: 2015-10-03 20:31:32 UTC +.. type: text +.. previewimage: /cover-images/donate.jpg + +Like most other voluntary open source projects, OpenLP has no income and is +entirely funded by the personal funds of the developers. We have a number of +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: + +1. Once-off donations +2. Regular donations + +Once-off Donations +^^^^^^^^^^^^^^^^^^ +Once-off donations are gratefully accepted. Donations can be made via PayPal. +To send a once-off donatation to OpenLP, send an e-mail via our `contact form`_ +and we will reply with the Paypal address. + +Regular Donations +^^^^^^^^^^^^^^^^^ +While once-off donations are nice, regular donations are much more useful to us. +They help to cover our month-to-month costs. We use `Gratipay`_ for automated +regular donations. Gratipay works on a weekly schedule, so calculate what you +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. + +.. raw:: html + + + +Monthly Costs +^^^^^^^^^^^^^ +Here's a breakdown of our regular costs: + +1. $20/month for a `VPS from Linode.com`_, which we'd like to upgrade to the + next level, which will cost us $40/month. +2. $10/month for a `backup service`_, also from Linode.com. +3. $17/year for our main domain, `openlp.org`_. See `Gandi.net's pricing page`_ + for information on domain name costs. +4. $35/year for our developer domain, `openlp.io`_. + +This comes to roughly $8 per week. To be able to upgrade to the next level, we +will need roughly $12.50 per week. + + +[ Image Credit: `Oak Street Blues`_ ] + +.. _contact form: /#support +.. _Gratipay: https://gratipay.com/ +.. _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 +.. _openlp.org: https://openlp.org/ +.. _openlp.io: https://openlp.io/ +.. _Oak Street Blues: https://www.flickr.com/photos/jamesvela/16914677777/ + diff --git a/themes/openlp2v2/assets/css/custom.css b/themes/openlp2v2/assets/css/custom.css index d59fd3c..035232c 100644 --- a/themes/openlp2v2/assets/css/custom.css +++ b/themes/openlp2v2/assets/css/custom.css @@ -291,3 +291,26 @@ article blockquote p:first-child { .lead { font-size: 1.4em; } + +.scrollToTop { + width: 20px; + height: 20px; + opacity: 0.5; + position: fixed; + bottom: 20px; + right: 30px; +} + +.scrollToTop a { + text-decoration: none; +} + +.checkbox input[type="checkbox"] { + margin-top: 0; +} + +.checkbox > label { + color: #888; + font-size: 14px; + line-height: 1.42857; +} \ No newline at end of file diff --git a/themes/openlp2v2/assets/js/custom.js b/themes/openlp2v2/assets/js/custom.js index 65bdb1a..9b8ab8f 100644 --- a/themes/openlp2v2/assets/js/custom.js +++ b/themes/openlp2v2/assets/js/custom.js @@ -15,4 +15,22 @@ $(function(){ $("#download-section > div > div").hide().removeClass("hidden"); $("#download-section > div > div." + target).show(); }); -}); \ No newline at end of file + $(".scrollToTop a").on('click', function(e) { + e.preventDefault(); + $('html, body').animate({scrollTop: 0}, 300); + }); + var queryParams = location.search.slice(1).split("&"); + var params = {}; + queryParams.forEach(function (value) { + var parts = value.split("="); + params[parts[0]] = parts[1]; + }); + if (params.hasOwnProperty("m")) { + if (params.m == 1) { + $("#success-alert").removeClass("hidden"); + } + else if (params.m == 0) { + $("#error-alert").removeClass("hidden"); + } + } +}); diff --git a/themes/openlp2v2/templates/base.tmpl b/themes/openlp2v2/templates/base.tmpl index 25bc482..21bcf1f 100644 --- a/themes/openlp2v2/templates/base.tmpl +++ b/themes/openlp2v2/templates/base.tmpl @@ -12,7 +12,7 @@ ${template_hooks['extra_head']()} % if permalink is not UNDEFINED and permalink == u'/index.html': <%include file="front_page.html"/> % else: -
+
@@ -48,7 +48,11 @@ ${template_hooks['extra_head']()}
  • Testimonials
  • Support
  • Forums
    • +% if permalink.startswith(u'/blog'):
  • Blog
    • +% else: +
  • Blog
    • +% endif
    @@ -95,8 +99,9 @@ ${template_hooks['extra_head']()}

    - Copyright © 2004-2015 OpenLP Developers. Theme based on Worthy by HTML Coder - + Copyright © 2004-2015 OpenLP Developers | + Theme based on Worthy by HTML Coder | + Donate to OpenLP

    diff --git a/themes/openlp2v2/templates/front_page.html b/themes/openlp2v2/templates/front_page.html index c1c8114..cb3eb2f 100644 --- a/themes/openlp2v2/templates/front_page.html +++ b/themes/openlp2v2/templates/front_page.html @@ -1,4 +1,4 @@ -
    +
    @@ -232,21 +232,21 @@

    Select a platform from the options above

    @@ -386,11 +386,12 @@

    OpenLP is not developed by a company, but by a group of volunteers who dedicate part of their spare time to developing this application. Please be patient if we do not answer immediately.

    - @@ -431,7 +452,11 @@
    -

    Copyright © 2004-2015 OpenLP Developers. Theme based on Worthy by HTML Coder

    +

    + Copyright © 2004-2015 OpenLP Developers | + Theme based on Worthy by HTML Coder | + Donate to OpenLP +