← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~raoul-snyman/openlp/website into lp:openlp/website

 

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

Requested reviews:
  Tim Bentley (trb143)

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

Add some more cover images, and some icons for some buttons and things to spruce it up a bit.
-- 
Your team OpenLP Core is subscribed to branch lp:openlp/website.
=== modified file 'blog/openlp-212-released.rst'
--- blog/openlp-212-released.rst	2015-07-20 21:14:58 +0000
+++ blog/openlp-212-released.rst	2015-10-14 21:31:45 +0000
@@ -18,7 +18,7 @@
 * 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 @@
 
     <p style="text-align: center; font-size: 150%;"><a href="http://openlp.org/download"; title="Download OpenLP Now!">Download Now</a></p>
 
-.. _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/

=== modified file 'blog/video-visual-history-openlp-2x.rst'
--- blog/video-visual-history-openlp-2x.rst	2015-10-04 21:47:30 +0000
+++ blog/video-visual-history-openlp-2x.rst	2015-10-14 21:31:45 +0000
@@ -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.

=== modified file 'blog/woo-another-release-announcing-openlp-214.rst'
--- blog/woo-another-release-announcing-openlp-214.rst	2015-08-03 20:40:10 +0000
+++ blog/woo-another-release-announcing-openlp-214.rst	2015-10-14 21:31:45 +0000
@@ -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 @@
 
 **UPDATE:** All the files have been uploaded, and are available on the `Download`_ page.
 
+[ 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/
 

=== added file 'deploy.sh'
--- deploy.sh	1970-01-01 00:00:00 +0000
+++ deploy.sh	2015-10-14 21:31:45 +0000
@@ -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@xxxxxxxxxx:public_html/beta/
+cd ..

=== modified file 'files/cover-images/donate.jpg'
Binary files files/cover-images/donate.jpg	2015-10-03 22:55:26 +0000 and files/cover-images/donate.jpg	2015-10-14 21:31:45 +0000 differ
=== modified file 'files/cover-images/end-of-the-line.jpg'
Binary files files/cover-images/end-of-the-line.jpg	2015-07-15 21:14:54 +0000 and files/cover-images/end-of-the-line.jpg	2015-10-14 21:31:45 +0000 differ
=== modified file 'files/cover-images/openlp-204-correct-caleb-released.jpg'
Binary files files/cover-images/openlp-204-correct-caleb-released.jpg	2015-08-09 14:43:49 +0000 and files/cover-images/openlp-204-correct-caleb-released.jpg	2015-10-14 21:31:45 +0000 differ
=== added file 'files/cover-images/openlp-212-released.jpg'
Binary files files/cover-images/openlp-212-released.jpg	1970-01-01 00:00:00 +0000 and files/cover-images/openlp-212-released.jpg	2015-10-14 21:31:45 +0000 differ
=== modified file 'files/cover-images/server-migrations-and-support-e-mails.jpg'
Binary files files/cover-images/server-migrations-and-support-e-mails.jpg	2015-08-09 14:56:03 +0000 and files/cover-images/server-migrations-and-support-e-mails.jpg	2015-10-14 21:31:45 +0000 differ
=== modified file 'files/cover-images/upcoming-releases-and-the-road-to-22.jpg'
Binary files files/cover-images/upcoming-releases-and-the-road-to-22.jpg	2015-07-15 21:14:54 +0000 and files/cover-images/upcoming-releases-and-the-road-to-22.jpg	2015-10-14 21:31:45 +0000 differ
=== added file 'files/cover-images/video-visual-history-openlp-2x.jpg'
Binary files files/cover-images/video-visual-history-openlp-2x.jpg	1970-01-01 00:00:00 +0000 and files/cover-images/video-visual-history-openlp-2x.jpg	2015-10-14 21:31:45 +0000 differ
=== removed file 'files/cover-images/video-visual-history-openlp-2x.png'
Binary files files/cover-images/video-visual-history-openlp-2x.png	2015-10-04 21:47:30 +0000 and files/cover-images/video-visual-history-openlp-2x.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'files/cover-images/want-openlp-in-your-language.jpg'
Binary files files/cover-images/want-openlp-in-your-language.jpg	2015-10-03 22:55:26 +0000 and files/cover-images/want-openlp-in-your-language.jpg	2015-10-14 21:31:45 +0000 differ
=== added file 'files/cover-images/woo-another-release-announcing-openlp-214.jpg'
Binary files files/cover-images/woo-another-release-announcing-openlp-214.jpg	1970-01-01 00:00:00 +0000 and files/cover-images/woo-another-release-announcing-openlp-214.jpg	2015-10-14 21:31:45 +0000 differ
=== modified file 'pages/donate.rst'
--- pages/donate.rst	2015-10-03 22:55:26 +0000
+++ pages/donate.rst	2015-10-14 21:31:45 +0000
@@ -49,7 +49,7 @@
 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 @@
 .. _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/
 

=== modified file 'themes/openlp2v2/bundles'
--- themes/openlp2v2/bundles	2015-07-11 21:57:10 +0000
+++ themes/openlp2v2/bundles	2015-10-14 21:31:45 +0000
@@ -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

=== modified file 'themes/openlp2v2/templates/comments_helper_disqus.tmpl'
--- themes/openlp2v2/templates/comments_helper_disqus.tmpl	2015-08-28 20:09:12 +0000
+++ themes/openlp2v2/templates/comments_helper_disqus.tmpl	2015-10-14 21:31:45 +0000
@@ -32,7 +32,7 @@
 
 <%def name="comment_link(link, identifier)">
     %if comment_system_id:
-    <a href="${link}#disqus_thread" data-disqus-identifier="${identifier[:-5]}">Comments</a>
+    <a href="${link}#disqus_thread" data-disqus-identifier="${identifier[:-5]}"><i class="fa fa-fw fa-comments"></i></a>
     %endif
 </%def>
 

=== modified file 'themes/openlp2v2/templates/post_helper.tmpl'
--- themes/openlp2v2/templates/post_helper.tmpl	2015-08-28 20:09:12 +0000
+++ themes/openlp2v2/templates/post_helper.tmpl	2015-10-14 21:31:45 +0000
@@ -27,12 +27,12 @@
         <ul class="pager hidden-print">
         %if post.prev_post:
             <li class="previous">
-                <a href="${post.prev_post.permalink()[:-5]}" rel="prev" title="${post.prev_post.title()|h}">${messages("Previous post")}</a>
+                <a href="${post.prev_post.permalink()[:-5]}" rel="prev" title="${post.prev_post.title()|h}"><i class="fa fa-fw fa-chevron-left"></i> ${messages("Previous post")}</a>
             </li>
         %endif
         %if post.next_post:
             <li class="next">
-                <a href="${post.next_post.permalink()[:-5]}" rel="next" title="${post.next_post.title()|h}">${messages("Next post")}</a>
+                <a href="${post.next_post.permalink()[:-5]}" rel="next" title="${post.next_post.title()|h}">${messages("Next post")} <i class="fa fa-fw fa-chevron-right"></i></a>
             </li>
         %endif
         </ul>


Follow ups