From 528f1ebd00a39ab6d45dc75ec0512f7d49c973b0 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Sun, 18 Oct 2015 00:27:20 +0200
Subject: [PATCH 1/3] Add a favicon

---
 conf.py           |   3 +++
 files/favicon.png | Bin 0 -> 6663 bytes
 2 files changed, 3 insertions(+)
 create mode 100644 files/favicon.png

diff --git a/conf.py b/conf.py
index 5295f93..7aec5ad 100644
--- a/conf.py
+++ b/conf.py
@@ -408,6 +408,9 @@ CODE_COLOR_SCHEME = 'monokai'
 #     ("icon", "/favicon.ico", "16x16"),
 #     ("icon", "/icon_128x128.png", "128x128"),
 # }
+FAVICONS = {
+    ('icon', '/favicon.png', '16x16,24x24,32x32,48x48,64x64')
+}
 
 # Show only teasers in the index pages? Defaults to False
 INDEX_TEASERS = True
diff --git a/files/favicon.png b/files/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fef3a3d338400c866cda46d70dbadc04445475b
GIT binary patch
literal 6663
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
RVln^#002ovPDHLkV1hH?E<FGM

literal 0
HcmV?d00001


From b29392f5fc440e3d19230c585c35fbcb66b7caa8 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Sun, 18 Oct 2015 14:56:25 +0200
Subject: [PATCH 2/3] Last set of updates before GO LIVE

---
 blog/openlp-22-released.rst                |  8 ++-
 deploy.sh                                  |  2 +-
 themes/openlp2v2/assets/css/custom.css     |  4 +-
 themes/openlp2v2/templates/front_page.html | 73 +++++++++++++++-------
 4 files changed, 61 insertions(+), 26 deletions(-)

diff --git a/blog/openlp-22-released.rst b/blog/openlp-22-released.rst
index 1cb4c13..e61a1a3 100644
--- a/blog/openlp-22-released.rst
+++ b/blog/openlp-22-released.rst
@@ -103,6 +103,9 @@ Internals
 Important Notes
 ^^^^^^^^^^^^^^^
 
+Incompatibilities
+-----------------
+
 **OpenLP 2.2 is not backwards compatible with 2.0.5.**
 
 **Service Files created in 2.2 cannot be opened in 2.0.**
@@ -113,6 +116,9 @@ startup, but it is recommended that you make your own backup too.
 Upgrading from versions of OpenLP before 2.0.5 are not supported. You need to upgrade to 2.0.5 first, and make sure
 you run OpenLP at least once before continuing to upgrade to 2.2.
 
+Known Issues
+------------
+
 There are some known issues in OpenLP 2.2 that you should know about before upgrading:
 
 1. Live Backgrounds does not work on Windows and Mac OS X
@@ -131,7 +137,7 @@ As leader of the project, I'd like to say a special thank you to the folks invol
 
 .. raw:: html
 
-    <div class="text-center"><p><a class="btn btn-success btn-lg" href="/#download"><strong>Download Now</strong></a></p></div>
+    <div class="text-center"><p><a class="btn btn-success btn-lg" href="/#downloads"><strong>Download Now</strong></a></p></div>
 
 [ Image Credit: `Thai Lanterns by Mark Fischer`_ ]
 
diff --git a/deploy.sh b/deploy.sh
index 766ede6..0685a87 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -7,5 +7,5 @@ fi
 $NIKOLA clean
 $NIKOLA build
 cd output
-rsync -r -a -v -z -e ssh * openlp@openlp.org:public_html/beta/
+rsync -r -a -v -z -e ssh * openlp@openlp.org:public_html/
 cd ..
diff --git a/themes/openlp2v2/assets/css/custom.css b/themes/openlp2v2/assets/css/custom.css
index 3734f95..15ac9fc 100644
--- a/themes/openlp2v2/assets/css/custom.css
+++ b/themes/openlp2v2/assets/css/custom.css
@@ -319,8 +319,8 @@ p.indent {
     margin-left: 3em;
 }
 
-a.screenshot-gallery {
-    display: block;
+div.screenshot {
     border-radius: 6px;
     border: 4px solid #efefef;
+    margin: 0 10px;
 }
diff --git a/themes/openlp2v2/templates/front_page.html b/themes/openlp2v2/templates/front_page.html
index aa7142b..0e19143 100644
--- a/themes/openlp2v2/templates/front_page.html
+++ b/themes/openlp2v2/templates/front_page.html
@@ -122,25 +122,33 @@
                                 </p>
                             </div>
                         </div>
+                    </div>
+                </div>
+                <div class="space"></div>
+                <div class="row">
+                    <h2 class="text-center"><i class="fa fw fa-desktop"></i> Screenshots</h2>
+                    <div class="col-md-offset-2 col-md-8">
                         <div class="space"></div>
                         <div class="row">
-                            <h2 class="text-center"><i class="fa fw fa-desktop"></i> Screenshots</h2>
-                            <div class="col-md-offset-2 col-md-8">
-                                <div class="space"></div>
-                                <div class="row">
-                                    <a href="/screenshots/mainwindow.png" data-toggle="lightbox" data-gallery="screenshots" data-title="Control OpenLP from the Main Window" class="col-sm-3">
-                                        <img src="/screenshots/mainwindow.png" class="img-responsive">
-                                    </a>
-                                    <a href="/screenshots/songimporterchoices.png" data-toggle="lightbox" data-gallery="screenshots" data-title="Import Songs from Many Formats" class="col-sm-3">
-                                        <img src="/screenshots/songimporterchoices.png" class="img-responsive">
-                                    </a>
-                                    <a href="/screenshots/song_edit_verse_in_use.png" data-toggle="lightbox" data-gallery="screenshots" data-title="Editing a Song" class="col-sm-3">
-                                        <img src="/screenshots/song_edit_verse_in_use.png" class="img-responsive">
-                                    </a>
-                                    <a href="/screenshots/stage_view_song_w_note.png" data-toggle="lightbox" data-gallery="screenshots" data-title="Browser-based Stage View" class="col-sm-3">
-                                        <img src="/screenshots/stage_view_song_w_note.png" class="img-responsive">
-                                    </a>
-                                </div>
+                            <div class="col-sm-3">
+                                <a href="/screenshots/mainwindow.png" data-toggle="lightbox" data-gallery="screenshots" data-title="Control OpenLP from the Main Window">
+                                    <img src="/screenshots/mainwindow.png" class="img-responsive">
+                                </a>
+                            </div>
+                            <div class="col-sm-3">
+                                <a href="/screenshots/songimporterchoices.png" data-toggle="lightbox" data-gallery="screenshots" data-title="Import Songs from Many Formats">
+                                    <img src="/screenshots/songimporterchoices.png" class="img-responsive">
+                                </a>
+                            </div>
+                            <div class="col-sm-3">
+                                <a href="/screenshots/song_edit_verse_in_use.png" data-toggle="lightbox" data-gallery="screenshots" data-title="Editing a Song">
+                                    <img src="/screenshots/song_edit_verse_in_use.png" class="img-responsive">
+                                </a>
+                            </div>
+                            <div class="col-sm-3">
+                                <a href="/screenshots/stage_view_song_w_note.png" data-toggle="lightbox" data-gallery="screenshots" data-title="Browser-based Stage View">
+                                    <img src="/screenshots/stage_view_song_w_note.png" class="img-responsive">
+                                </a>
                             </div>
                         </div>
                     </div>
@@ -280,11 +288,32 @@
                         </div>
                         <div class="windows hidden">
                             <h4>OpenLP 2.2 for Windows 7 and higher</h4>
-                            <p>OpenLP-2.2-setup.exe</p>
+                            <p>OpenLP-2.2-setup.exe / OpenLPPortable_2.2.paf.exe</p>
                             <p>
-                                <a href="https://get.openlp.org/2.2/OpenLP-2.2-setup.exe" class="btn btn-success"><i class="fa fa-fw fa-download"></i> Direct Download</a>
-                                <a href="https://get.openlp.org/2.2/OpenLP-2.2-setup.exe.torrent" class="btn btn-warning"><i class="fa fa-fw fa-cloud-download"></i> BitTorrent</a>
-                                <a href="https://get.openlp.org/2.2/OpenLP-2.2-setup.exe.torrent" class="btn btn-danger"><i class="fa fa-fw fa-magnet fa-flip-vertical"></i> Magnet</a>
+                                <div class="btn-group">
+                                    <a href="https://get.openlp.org/2.2/OpenLP-2.2-setup.exe" class="btn btn-success"><i class="fa fa-fw fa-download"></i> Installer</a>
+                                    <div class="btn-group">
+                                        <button type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            <i class="fa fa-fw fa-cloud-download"></i> BitTorrent <span class="caret"></span>
+                                        </button>
+                                        <ul class="dropdown-menu">
+                                            <li><a href="https://get.openlp.org/2.2/OpenLP-2.2-setup.exe.torrent"><i class="fa fa-fw fa-file"></i> Torrent File</a></li>
+                                            <li><a href="magnet:?xt=urn:btih:e496b1f1251e313b4fad630af81288180f380010&amp;tr=udp://tracker.unit193.net:6969&amp;tr=udp://open.demonii.com:1337"><i class="fa fa-fw fa-magnet fa-flip-vertical"></i> Magnet</a></li>
+                                        </ul>
+                                    </div>
+                                </div>
+                                <div class="btn-group">
+                                    <a href="https://get.openlp.org/2.2/OpenLPPortable_2.2.paf.exe" class="btn btn-primary"><i class="fa fa-fw fa-download"></i> PortableApps.com</a>
+                                    <div class="btn-group">
+                                        <button type="button" class="btn btn-warning dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                            <i class="fa fa-fw fa-cloud-download"></i> BitTorrent <span class="caret"></span>
+                                        </button>
+                                        <ul class="dropdown-menu">
+                                            <li><a href="https://get.openlp.org/2.2/OpenLPPortable_2.2.paf.exe.torrent"><i class="fa fa-fw fa-file"></i> Torrent File</a></li>
+                                            <li><a href="magnet:?xt=urn:btih:4666535f08b091c38c8aab6cead166e45d27d36a&tr=udp://tracker.unit193.net:6969&tr=udp://open.demonii.com:1337"><i class="fa fa-fw fa-magnet fa-flip-vertical"></i> Magnet</a></li>
+                                        </ul>
+                                    </div>
+                                </div>
                             </p>
                         </div>
                         <div class="macosx hidden">
@@ -293,7 +322,7 @@
                             <p>
                                 <a href="https://get.openlp.org/2.2/OpenLP-2.2.dmg" class="btn btn-success"><i class="fa fa-fw fa-download"></i> Direct Download</a>
                                 <a href="https://get.openlp.org/2.2/OpenLP-2.2.dmg.torrent" class="btn btn-warning"><i class="fa fa-fw fa-cloud-download"></i> BitTorrent</a>
-                                <a href="https://get.openlp.org/2.2/OpenLP-2.2.dmg.torrent" class="btn btn-danger"><i class="fa fa-fw fa-magnet fa-flip-vertical"></i> Magnet</a>
+                                <a href="magnet:?xt=urn:btih:46a69790629817a731930545d7bb1ead052df62d&amp;tr=udp://tracker.unit193.net:6969&amp;tr=udp://open.demonii.com:1337" class="btn btn-danger"><i class="fa fa-fw fa-magnet fa-flip-vertical"></i> Magnet</a>
                             </p>
                         </div>
                         <div class="linux hidden">

From 2e4985be3f658b484d7e17bfca3008bb2ce06bd1 Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Sun, 18 Oct 2015 15:05:43 +0200
Subject: [PATCH 3/3] Forgot to add the bit about VLC on Linux

---
 blog/openlp-22-released.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/blog/openlp-22-released.rst b/blog/openlp-22-released.rst
index e61a1a3..30cda38 100644
--- a/blog/openlp-22-released.rst
+++ b/blog/openlp-22-released.rst
@@ -123,6 +123,7 @@ There are some known issues in OpenLP 2.2 that you should know about before upgr
 
 1. Live Backgrounds does not work on Windows and Mac OS X
 2. Playback of linked audio does not work on Mac OS X
+3. OpenLP on Linux will not start up if VLC is not installed. Simply install VLC to get around this problem.
 
 We plan to fix these issues in OpenLP 2.4. We're moving to a faster release cycle, which means that OpenLP 2.4 should be released in 6 to 12 months from now.