diff --git a/files/favicon.png b/files/favicon.png index 6fef3a3..8baf593 100644 Binary files a/files/favicon.png and b/files/favicon.png differ diff --git a/pages/donate.rst b/pages/donate.rst index 0e5d5fa..248e138 100644 --- a/pages/donate.rst +++ b/pages/donate.rst @@ -2,22 +2,17 @@ .. slug: donate .. date: 2015-10-03 20:31:32 UTC .. type: text +.. hidetitle: True .. previewimage: /cover-images/donate.jpg +.. raw:: html + +
+ 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 ways to help out financially: - -1. Once-off donations -2. Buy swag - -Once-off Donations -^^^^^^^^^^^^^^^^^^ - -Once-off donations are gratefully accepted. - .. raw:: html
@@ -69,15 +64,37 @@ Once-off donations are gratefully accepted.
-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 all proceeds go to OpenLP. +Current Needs +^^^^^^^^^^^^^ + +The reality is that most of the donated money we receive is contributed toward various server costs, +as detailed below. From time to time, however, we have additional needs that are usually financed +by the OpenLP team themselves. Below are some of those needs, and whether or not we have purchased +them already. + +.. table:: + :class: table + + +-----------------------------------+---------+---------+-----------+------------+ + | Item | Cost | Covered | Purchased | Keywords | + +===================================+=========+=========+===========+============+ + | `Extra RAM for virtual machines`_ | $39.99 | $0 | Yes | RAM | + +-----------------------------------+---------+---------+-----------+------------+ + | `4K monitor for Hi DPI testing`_ | $169.99 | $0 | Yes | 4K Monitor | + +-----------------------------------+---------+---------+-----------+------------+ + | `Refurbished Apple M1 Mac Mini`_ | $469.00 | $0 | No | M1 Mac | + +-----------------------------------+---------+---------+-----------+------------+ + +If you feel led to give for something specifically, please feel free to use the keywords when you +donate. Below are ways to get hold of us: + +* If you use PayPal, add the keywords in the message +* You can direct message `Raoul`_ via `your Inbox`_ on the `forums`_ +* You can `come into IRC`_ and let "superfly", "TRB143" or "tgc" know your amount and keywords .. raw:: html -

Buy Some Swag

-
+
Regular Costs ^^^^^^^^^^^^^ @@ -91,6 +108,13 @@ Here's a breakdown of our regular costs: [ Image Credit: `Tip Jar at Open Bar by Dave Dugdale`_ ] +.. _Extra RAM for virtual machines: https://www.amazon.com/dp/B08H7T81YV?psc=1&ref=ppx_yo2ov_dt_b_product_details +.. _4K monitor for Hi DPI testing: https://www.amazon.com/gp/product/B08MXQ4NJ9/ref=ppx_od_dt_b_asin_title_s00?ie=UTF8&psc=1 +.. _Refurbished Apple M1 Mac Mini: https://www.apple.com/shop/product/FGNR3LL/A/refurbished-mac-mini-apple-m1-chip-with-8%E2%80%91core-cpu-and-8%E2%80%91core-gpu +.. _Raoul: https://forums.openlp.org/profile/raoul +.. _your Inbox: https://forums.openlp.org/messages/inbox +.. _forums: https://forums.openlp.org/ +.. _come into IRC: https://kiwiirc.com/client/irc.libera.chat/?nick=guest?#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 diff --git a/themes/openlp2v2/assets/css/custom.css b/themes/openlp2v2/assets/css/custom.css index 9d871c9..d0e84a7 100644 --- a/themes/openlp2v2/assets/css/custom.css +++ b/themes/openlp2v2/assets/css/custom.css @@ -82,8 +82,8 @@ div.product-chooser div.product-chooser-item { } div.product-chooser div.product-chooser-item.selected{ - border: 4px solid #55acee; - color: #55acee; + border: 4px solid #3d6adb; + color: #3d6adb; } div.product-chooser div.product-chooser-item img{ @@ -223,7 +223,7 @@ article .section { time { background-color: #fff; border-radius: 3px; - border: 1px solid #55acee; + border: 1px solid #3d6adb; box-shadow: 0 1px 2px #bbb; display: block; float: right; @@ -247,7 +247,7 @@ time * { time strong { - background-color: #55acee; + background-color: #3d6adb; color: #fff; padding: 0.4em 0; position: absolute; @@ -461,3 +461,31 @@ aside.tip p.admonition-title { background-color: #17a2b8 !important; color: white; } + +html, body { + font-family: 'Oxygen', 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; +} + +h1, h2, h3, h4, h5, h6, .h1, .h2, .h3, .h4, .h5, .h6 { + font-family: 'Montserrat', 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; +} + +.site-name { + font-family: 'Montserrat', 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; +} + +h1 span, h2 span, h3 span, h4 span, a, .text-colored { + color: #3d6adb; +} + +.default-bg.blue { + background-color: #3d6adb; +} + +.translucent-bg.blue:after { + background-color: rgba(61, 106, 189, 0.7); +} + +.banner-caption h1 { + text-shadow: 0 0 5px rgba(34, 34, 34, 0.5); +} diff --git a/themes/openlp2v2/assets/images/logo.png b/themes/openlp2v2/assets/images/logo.png index ccf9657..8e61886 100644 Binary files a/themes/openlp2v2/assets/images/logo.png and b/themes/openlp2v2/assets/images/logo.png differ diff --git a/themes/openlp2v2/templates/base.tmpl b/themes/openlp2v2/templates/base.tmpl index 482aaaf..b769906 100644 --- a/themes/openlp2v2/templates/base.tmpl +++ b/themes/openlp2v2/templates/base.tmpl @@ -20,7 +20,7 @@ ${template_hooks['extra_head']()}
OpenLP
diff --git a/themes/openlp2v2/templates/base_helper.tmpl b/themes/openlp2v2/templates/base_helper.tmpl index c503403..a633116 100644 --- a/themes/openlp2v2/templates/base_helper.tmpl +++ b/themes/openlp2v2/templates/base_helper.tmpl @@ -35,6 +35,9 @@ lang="${lang}"> ${title|striphtml} | ${blog_title|striphtml} + + + ${html_stylesheets()} ${html_feedlinks()} %if permalink: diff --git a/themes/openlp2v2/templates/front_page.html b/themes/openlp2v2/templates/front_page.html index e37536e..0135b03 100644 --- a/themes/openlp2v2/templates/front_page.html +++ b/themes/openlp2v2/templates/front_page.html @@ -5,7 +5,7 @@
OpenLP
@@ -83,7 +83,7 @@
  • Cross platform between Linux, Windows, OS X and FreeBSD
  • Display songs, Bible verses, presentations, images and more
    • -
  • Control OpenLP remotely via the Android remote, iOS remote or mobile web browser
    • +
  • Control OpenLP remotely via your mobile web browser
  • Quickly and easily import songs from other popular presentation packages
  • Easy enough to use to get up and running in less than 10 minutes
@@ -451,18 +451,6 @@
-

Get the Mobile Remote App

-
-
- Android app on Google Play -
-
- Android app on F-Droid -
-
- -
-

Older versions can be downloaded from our downloads archive, but we do not support these versions.

diff --git a/themes/openlp2v2/templates/post.tmpl b/themes/openlp2v2/templates/post.tmpl index 760c57a..6c8efb9 100644 --- a/themes/openlp2v2/templates/post.tmpl +++ b/themes/openlp2v2/templates/post.tmpl @@ -28,7 +28,7 @@ <%block name="content"> -
+
${pheader.html_post_header()}
${post.text()} @@ -46,7 +46,7 @@ % endif ${helper.mathjax_script(post)} -
+
${comments.comment_link_script()}