diff --git a/blog/openlp-212-released.rst b/blog/openlp-212-released.rst index cffeae6..a77fc41 100644 --- a/blog/openlp-212-released.rst +++ b/blog/openlp-212-released.rst @@ -18,7 +18,7 @@ Some of the most significant changes are: * Updated translations (now is the time to start translating OpenLP 2.2!) * Improved database upgrade to help with the migration from 2.0 to 2.2 series. -The full list can be found at `https://launchpad.net/openlp/trunk/2.1.2`_ +The full list can be found at `Launchpad.net`_ Important Notes ^^^^^^^^^^^^^^^ @@ -44,5 +44,7 @@ OpenLP's system requrements have been upgraded since the 2.0.5 release. We have

Download Now

-.. _https://launchpad.net/openlp/trunk/2.1.2: https://launchpad.net/openlp/trunk/2.1.2 +[ Image Credit: `Lady Bird by Samuel Johnson`_ ] +.. _Launchpad.net: https://launchpad.net/openlp/trunk/2.1.2 +.. _Lady Bird by Samuel Johnson: https://www.flickr.com/photos/samjuk/1129257862/ diff --git a/blog/video-visual-history-openlp-2x.rst b/blog/video-visual-history-openlp-2x.rst index ee1f832..6a68f05 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.png +.. previewimage: /cover-images/video-visual-history-openlp-2x.jpg 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. diff --git a/blog/woo-another-release-announcing-openlp-214.rst b/blog/woo-another-release-announcing-openlp-214.rst index b68d4e2..d13fd40 100644 --- a/blog/woo-another-release-announcing-openlp-214.rst +++ b/blog/woo-another-release-announcing-openlp-214.rst @@ -5,6 +5,7 @@ .. link: .. description: .. type: text +.. previewimage: /cover-images/woo-another-release-announcing-openlp-214.jpg I press on toward the goal for the prize of the upward call of God in Christ Jesus. @@ -54,5 +55,8 @@ A number of translations have been updated and nearing full coverage. **UPDATE:** All the files have been uploaded, and are available on the `Download`_ page. -.. _Download: http://openlp.org/en/download#dev-builds +[ Image Credit: `Balloon release by Jennie Rainsford`_ ] + +.. _Download: http://openlp.org/en/download#dev-builds +.. _Balloon release by Jennie Rainsford: https://www.flickr.com/photos/jennicatpink/3503569937/ diff --git a/deploy.sh b/deploy.sh new file mode 100755 index 0000000..766ede6 --- /dev/null +++ b/deploy.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +NIKOLA=`which nikola` +if [[ -f "nikola" ]]; then + NIKOLA="./nikola" +fi +$NIKOLA clean +$NIKOLA build +cd output +rsync -r -a -v -z -e ssh * openlp@openlp.org:public_html/beta/ +cd .. diff --git a/files/cover-images/donate.jpg b/files/cover-images/donate.jpg index 3a041eb..41a609f 100644 Binary files a/files/cover-images/donate.jpg and b/files/cover-images/donate.jpg differ diff --git a/files/cover-images/end-of-the-line.jpg b/files/cover-images/end-of-the-line.jpg index 919e7de..5dc8fe6 100644 Binary files a/files/cover-images/end-of-the-line.jpg and b/files/cover-images/end-of-the-line.jpg differ diff --git a/files/cover-images/openlp-204-correct-caleb-released.jpg b/files/cover-images/openlp-204-correct-caleb-released.jpg index e23c7fc..ea2cfbd 100644 Binary files a/files/cover-images/openlp-204-correct-caleb-released.jpg and b/files/cover-images/openlp-204-correct-caleb-released.jpg differ diff --git a/files/cover-images/openlp-212-released.jpg b/files/cover-images/openlp-212-released.jpg new file mode 100644 index 0000000..51e7b56 Binary files /dev/null and b/files/cover-images/openlp-212-released.jpg differ diff --git a/files/cover-images/server-migrations-and-support-e-mails.jpg b/files/cover-images/server-migrations-and-support-e-mails.jpg index 8cb9924..0ea418e 100644 Binary files a/files/cover-images/server-migrations-and-support-e-mails.jpg and b/files/cover-images/server-migrations-and-support-e-mails.jpg differ diff --git a/files/cover-images/upcoming-releases-and-the-road-to-22.jpg b/files/cover-images/upcoming-releases-and-the-road-to-22.jpg index dc6c8f8..fc7d4f1 100644 Binary files a/files/cover-images/upcoming-releases-and-the-road-to-22.jpg and b/files/cover-images/upcoming-releases-and-the-road-to-22.jpg differ diff --git a/files/cover-images/video-visual-history-openlp-2x.jpg b/files/cover-images/video-visual-history-openlp-2x.jpg new file mode 100644 index 0000000..6cc0c3d Binary files /dev/null and b/files/cover-images/video-visual-history-openlp-2x.jpg differ diff --git a/files/cover-images/video-visual-history-openlp-2x.png b/files/cover-images/video-visual-history-openlp-2x.png deleted file mode 100644 index b9fe94f..0000000 Binary files a/files/cover-images/video-visual-history-openlp-2x.png and /dev/null differ diff --git a/files/cover-images/want-openlp-in-your-language.jpg b/files/cover-images/want-openlp-in-your-language.jpg index a26bd46..06e6122 100644 Binary files a/files/cover-images/want-openlp-in-your-language.jpg and b/files/cover-images/want-openlp-in-your-language.jpg differ diff --git a/files/cover-images/woo-another-release-announcing-openlp-214.jpg b/files/cover-images/woo-another-release-announcing-openlp-214.jpg new file mode 100644 index 0000000..d35eb5a Binary files /dev/null and b/files/cover-images/woo-another-release-announcing-openlp-214.jpg differ diff --git a/pages/donate.rst b/pages/donate.rst index 2819bde..5e72b1a 100644 --- a/pages/donate.rst +++ b/pages/donate.rst @@ -49,7 +49,7 @@ 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`_ ] +[ Image Credit: `Tip Jar at Open Bar by Dave Dugdale`_ ] .. _contact form: /#support .. _Gratipay: https://gratipay.com/ @@ -58,5 +58,5 @@ will need roughly $12.50 per week. .. _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/ +.. _Tip Jar at Open Bar by Dave Dugdale: https://www.flickr.com/photos/davedugdale/5025601209/ diff --git a/themes/openlp2v2/bundles b/themes/openlp2v2/bundles index ca4b894..adb460b 100644 --- a/themes/openlp2v2/bundles +++ b/themes/openlp2v2/bundles @@ -1,4 +1,4 @@ assets/css/all-nocdn.css=bootstrap.css,font-awesome.css,rst.css,code.css,colorbox.css,theme.css,animate.css,animations.css,style.css,custom.css assets/css/all.css=font-awesome.css,rst.css,code.css,colorbox.css,theme.css,animate.css,animations.css,style.css,custom.css -assets/js/all-nocdn.js=jquery.min.js,bootstrap.min.js,jquery.colorbox-min.js,jquery.appear.js,jquery.backstretch.js,modernizer.js,isotope.js,template.js,custom.js +assets/js/all-nocdn.js=jquery.min.js,bootstrap.min.js,jquery.colorbox-min.js,jquery.appear.js,jquery.backstretch.js,modernizr.js,isotope.js,template.js,custom.js assets/js/all.js=jquery.colorbox-min.js,jquery.appear.js,jquery.backstretch.js,modernizr.js,isotope.js,template.js,custom.js diff --git a/themes/openlp2v2/templates/comments_helper_disqus.tmpl b/themes/openlp2v2/templates/comments_helper_disqus.tmpl index 4fab691..d5dd629 100644 --- a/themes/openlp2v2/templates/comments_helper_disqus.tmpl +++ b/themes/openlp2v2/templates/comments_helper_disqus.tmpl @@ -32,7 +32,7 @@ <%def name="comment_link(link, identifier)"> %if comment_system_id: - Comments + %endif diff --git a/themes/openlp2v2/templates/post_helper.tmpl b/themes/openlp2v2/templates/post_helper.tmpl index b7e5daa..0cc51ba 100644 --- a/themes/openlp2v2/templates/post_helper.tmpl +++ b/themes/openlp2v2/templates/post_helper.tmpl @@ -27,12 +27,12 @@