From d5605d0c31fc501ede063a6d64ebf61e27fdeaff Mon Sep 17 00:00:00 2001
From: Raoul Snyman <raoul@snyman.info>
Date: Fri, 13 Oct 2017 23:28:17 -0700
Subject: [PATCH] Remove version 2.2.1 from the downloads. I'm tired of people
 sending in bug reports for bugs that have already been fixed but for some
 reason they thought it better to download version 2.2.1

---
 themes/openlp2v2/templates/front_page.html | 59 +++++-----------------
 1 file changed, 14 insertions(+), 45 deletions(-)

diff --git a/themes/openlp2v2/templates/front_page.html b/themes/openlp2v2/templates/front_page.html
index ac5bee0..1c51db2 100644
--- a/themes/openlp2v2/templates/front_page.html
+++ b/themes/openlp2v2/templates/front_page.html
@@ -296,65 +296,34 @@
                         </div>
                         <div class="windows hidden">
                             <h4>OpenLP for Windows 7 and higher</h4>
-                            <p>Please see our <a href="/blog/2016/02/14/openlp-24-released">blog post</a> about 2.2 vs 2.4</p>
+                            <p>OpenLP 2.4.6</p>
                             <p>
                                 <div class="btn-group">
-                                    <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                        OpenLP 2.2.1 <span class="caret"></span>
+                                    <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                        Windows Installer <span class="caret"></span>
                                     </button>
                                     <ul class="dropdown-menu">
-                                        <li><a href="https://get.openlp.org/2.2.1/OpenLP-2.2.1-setup.exe"><i class="fa fa-fw fa-download"></i> OpenLP-2.2.1-setup.exe</a></li>
-                                        <li><a href="https://get.openlp.org/2.2.1/OpenLPPortable_2.2.1.paf.exe"><i class="fa fa-fw fa-download"></i> OpenLPPortable_2.2.1.paf.exe</a></li>
-                                        <li role="separator" class="divider"></li>
-                                        <li class="dropdown-header">Installer Torrents</li>
-                                        <li><a href="https://get.openlp.org/2.2.1/OpenLP-2.2.1-setup.exe.torrent"><i class="fa fa-fw fa-cloud-download"></i> Torrent</a></li>
-                                        <li><a href="magnet:?xt=urn:btih:ace23e07070bb508f7af6f881ff9d71f4895158f&amp;tr=udp://tracker.unit193.net:6969&amp;tr=udp://tracker.coppersurfer.tk:6969"><i class="fa fa-fw fa-magnet fa-flip-vertical"></i> Magnet</a></li>
-                                        <li role="separator" class="divider"></li>
-                                        <li class="dropdown-header">Portable Torrents</li>
-                                        <li><a href="https://get.openlp.org/2.2.1/OpenLP-2.2.1-setup.exe.torrent"><i class="fa fa-fw fa-cloud-download"></i> Torrent</a></li>
-                                        <li><a href="magnet:?xt=urn:btih:d6c5b95778ce9bc066b9305f2da89e2b5a5ccaac&amp;tr=udp://tracker.unit193.net:6969&amp;tr=udp://tracker.coppersurfer.tk:6969"><i class="fa fa-fw fa-magnet fa-flip-vertical"></i> Magnet</a></li>
+                                        <li><a href="https://get.openlp.org/2.4.6/OpenLP-2.4.6-setup.exe"><i class="fa fa-fw fa-download"></i> Direct Download</a></li>
+                                        <li><a href="https://get.openlp.org/2.4.6/OpenLP-2.4.6-setup.exe.torrent"><i class="fa fa-fw fa-cloud-download"></i> BitTorrent Download</a></li>
                                     </ul>
                                 </div>
                                 <div class="btn-group">
-                                    <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                        OpenLP 2.4.6 <span class="caret"></span>
+                                    <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                        Portable Version <span class="caret"></span>
                                     </button>
                                     <ul class="dropdown-menu">
-                                        <li><a href="https://get.openlp.org/2.4.6/OpenLP-2.4.6-setup.exe"><i class="fa fa-fw fa-download"></i> OpenLP-2.4.6-setup.exe</a></li>
-                                        <li><a href="https://get.openlp.org/2.4.6/OpenLPPortable_2.4.6.paf.exe"><i class="fa fa-fw fa-download"></i> OpenLPPortable_2.4.6.paf.exe</a></li>
-                                        <li role="separator" class="divider"></li>
-                                        <li class="dropdown-header">Torrents</li>
-                                        <li><a href="https://get.openlp.org/2.4.6/OpenLP-2.4.6-setup.exe.torrent"><i class="fa fa-fw fa-cloud-download"></i> OpenLP-2.4.6-setup.exe.torrent</a></li>
-                                        <li><a href="https://get.openlp.org/2.4.6/OpenLPPortable_2.4.6.paf.exe.torrent"><i class="fa fa-fw fa-cloud-download"></i> OpenLPPortable_2.4.6.paf.exe.torrent</a></li>
+                                        <li><a href="https://get.openlp.org/2.4.6/OpenLPPortable_2.4.6.paf.exe"><i class="fa fa-fw fa-download"></i> Direct Download</a></li>
+                                        <li><a href="https://get.openlp.org/2.4.6/OpenLPPortable_2.4.6.paf.exe.torrent"><i class="fa fa-fw fa-cloud-download"></i> BitTorrent Download</a></li>
                                     </ul>
                                 </div>
                             </p>
                         </div>
                         <div class="macosx hidden">
                             <h4>OpenLP for Mac OS X 10.9 and higher</h4>
-                            <p>Please see our <a href="/blog/2016/02/14/openlp-24-released">blog post</a> about 2.2 vs 2.4</p>
+                            <p>OpenLP 2.4.6</p>
                             <p>
-                                <div class="btn-group">
-                                    <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                        OpenLP 2.2.1 <span class="caret"></span>
-                                    </button>
-                                    <ul class="dropdown-menu">
-                                        <li><a href="https://get.openlp.org/2.2.1/OpenLP-2.2.1.dmg"><i class="fa fa-fw fa-download"></i> OpenLP-2.2.1.dmg</a></li>
-                                        <li role="separator" class="divider"></li>
-                                        <li><a href="https://get.openlp.org/2.2.1/OpenLP-2.2.1.dmg.torrent"><i class="fa fa-fw fa-cloud-download"></i> Torrent</a></li>
-                                        <li><a href="magnet:?xt=urn:btih:ac2126bed2fa7bc8a6c61f09299dd8d1f555369d&amp;tr=udp://tracker.unit193.net:6969&amp;tr=udp://tracker.coppersurfer.tk:6969"><i class="fa fa-fw fa-magnet fa-flip-vertical"></i> Magnet</a></li>
-                                    </ul>
-                                </div>
-                                <div class="btn-group">
-                                    <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
-                                        OpenLP 2.4.6 <span class="caret"></span>
-                                    </button>
-                                    <ul class="dropdown-menu">
-                                        <li><a href="https://get.openlp.org/2.4.6/OpenLP-2.4.6.dmg"><i class="fa fa-fw fa-download"></i> OpenLP-2.4.6.dmg</a></li>
-                                        <li role="separator" class="divider"></li>
-                                        <li><a href="https://get.openlp.org/2.4.6/OpenLP-2.4.6.dmg.torrent"><i class="fa fa-fw fa-cloud-download"></i> Torrent</a></li>
-                                    </ul>
-                                </div>
+                                <a href="https://get.openlp.org/2.4.6/OpenLP-2.4.6.dmg" class="btn btn-success"><i class="fa fa-fw fa-download"></i> Direct Download</a>
+                                <a href="https://get.openlp.org/2.4.6/OpenLP-2.4.6.dmg.torrent" class="btn btn-primary"><i class="fa fa-fw fa-cloud-download"></i> BitTorrent Download</a>
                             </p>
                         </div>
                         <div class="linux hidden">
@@ -402,7 +371,7 @@
                                   </div>
                                   <div class="modal-body">
                                     <div class="alert alert-info small" role="alert">
-                                      <p><strong>Note:</strong> OpenLP only realistically supports the most recent Fedora release.</p>
+                                      <p><strong>Note:</strong> OpenLP only supports the most recent Fedora release.</p>
                                     </div> 
                                     <p>To install OpenLP, either search for OpenLP in your GUI package manager, or run the following command:</p>
                                     <pre>$ sudo dnf install OpenLP</pre>
@@ -424,7 +393,7 @@
                                   </div>
                                   <div class="modal-body">
                                     <div class="alert alert-info small" role="alert">
-                                      <p><strong>Note:</strong> OpenLP only realistically supports Debian unstable.</p>
+                                      <p><strong>Note:</strong> OpenLP only supports Debian unstable.</p>
                                     </div> 
                                     <p>To install OpenLP, either search for OpenLP in your GUI package manager, or run the following command:</p>
                                     <pre>$ sudo apt install openlp</pre>