Merge branch 'release-3.1.1' into 'master'

Release 3.1.1

See merge request openlp/website!40

blog/openlp-311-beaming-bartimaeus-released.rst

@@ -0,0 +1,42 @@
+.. title: OpenLP 3.1.1 "Beaming Bartimaeus" Released
+.. slug: 2024/03/10/openlp-311-beaming-bartimaeus-released
+.. date: 2024-03-10 12:00:00 UTC
+.. tags: 
+.. category: 
+.. link: 
+.. description: 
+.. type: text
+.. previewimage: /cover-images/openlp-311-beaming-bartimaeus-released.jpg
+
+Hot on the heals of the 3.1 release is 3.1.1 which fixes a couple of bugs that some people have encountered with the 3.1 release.
+
+We also have an experimental Flatpak build for those on Linux who are feeling adventurous.
+
+   So then the Lord, after he had spoken to them, was received up into heaven and sat down at the right hand of God.
+   They went out and preached everywhere, the Lord working with them and confirming the word by the signs that
+   followed. Amen.
+
+   Mark 16:19-20
+
+New Features
+------------
+
+* Experimental Flatpak build
+
+Bugs Fixed
+----------
+
+* Fix path to QtWebEngineProcess binary in macOS builds
+* Use Python's version comparison, not Qt's to align with new versioning scheme
+* Always open downloaded songs as utf-8 when downloading from Song Select
+* Update and fix a number of translations
+
+Known Issues
+------------
+
+See the `OpenLP 3.1 release blog post </blog/2024/02/29/openlp-310-superb-seth-released>`_ for the list of known issues.
+
+Download
+--------
+
+Download the latest version of OpenLP from the downloads section on the site.

themes/openlp2v2/assets/css/custom.css

@@ -183,6 +183,18 @@ div.product-chooser div.product-chooser-item input{
   border-color: #147db2;
 }
 
+.btn-flatpak {
+  color: #fff;
+  background-color: #4a90d9;
+  border: 1px solid #4a90d9;
+}
+
+.btn-flatpak:hover, .btn-flatpak:focus, .btn-flatpak.focus {
+  color: #fff;
+  background-color: #74aae2;
+  border: 1px solid #4a90d9;
+}
+
 .btn-freebsd {
   color: #fff;
   background-color: #e00;

themes/openlp2v2/templates/front_page.html

@@ -319,15 +319,15 @@
         </div>
         <div class="windows hidden">
           <h4>OpenLP for Windows 10 and higher</h4>
-          <p class="notranslate">OpenLP 3.1.0</p>
+          <p class="notranslate">OpenLP 3.1.1</p>
           <div>
             <div class="btn-group">
               <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                 Windows Installer <span class="caret notranslate"></span>
               </button>
               <ul class="dropdown-menu">
-                <li><a href="https://get.openlp.org/3.1.0/OpenLP-3.1.0-x64.msi"><i class="fa fa-fw fa-download notranslate"></i> 64-bit Direct Download</a></li>
+                <li><a href="https://get.openlp.org/3.1.1/OpenLP-3.1.1-x64.msi"><i class="fa fa-fw fa-download notranslate"></i> 64-bit Direct Download</a></li>
-                <li><a href="https://get.openlp.org/3.1.0/OpenLP-3.1.0.msi"><i class="fa fa-fw fa-download notranslate"></i> 32-bit Direct Download</a></li>
+                <li><a href="https://get.openlp.org/3.1.1/OpenLP-3.1.1.msi"><i class="fa fa-fw fa-download notranslate"></i> 32-bit Direct Download</a></li>
               </ul>
             </div>
             <div class="btn-group">
@@ -335,15 +335,15 @@
                 Portable Version <span class="caret notranslate"></span>
               </button>
               <ul class="dropdown-menu">
-                <li><a href="https://get.openlp.org/3.1.0/OpenLPPortable_3.1.0.5000-x64.paf.exe"><i class="fa fa-fw fa-download notranslate"></i> 64-bit Direct Download</a></li>
+                <li><a href="https://get.openlp.org/3.1.1/OpenLPPortable_3.1.1.5000-x64.paf.exe"><i class="fa fa-fw fa-download notranslate"></i> 64-bit Direct Download</a></li>
-                <li><a href="https://get.openlp.org/3.1.0/OpenLPPortable_3.1.0.5000-x86.paf.exe"><i class="fa fa-fw fa-download notranslate"></i> 32-bit Direct Download</a></li>
+                <li><a href="https://get.openlp.org/3.1.1/OpenLPPortable_3.1.1.5000-x86.paf.exe"><i class="fa fa-fw fa-download notranslate"></i> 32-bit Direct Download</a></li>
               </ul>
             </div>
           </div>
         </div>
         <div class="macosx hidden">
           <h4>OpenLP for Mac OS X 10.15 and higher</h4>
-          <p class="notranslate">OpenLP 3.1.0</p>
+          <p class="notranslate">OpenLP 3.1.1</p>
           <p>
             <button type="button" class="btn btn-success" data-toggle="modal" data-target="#macos-install"><i class="fa fa-fw fa-download notranslate"></i> Direct Download</button>
           </p>
@@ -374,8 +374,8 @@
                   </ol>
                 </div>
                 <div class="modal-footer">
-                  <a class="btn btn-primary" href="https://get.openlp.org/3.1.0/OpenLP-3.1.0-x86_64.dmg"><i class="fa fa-fw fa-download notranslate"></i> Intel Processor</a>
+                  <a class="btn btn-primary" href="https://get.openlp.org/3.1.1/OpenLP-3.1.1-x86_64.dmg"><i class="fa fa-fw fa-download notranslate"></i> Intel Processor</a>
-                  <a class="btn btn-info" href="https://get.openlp.org/3.1.0/OpenLP-3.1.0-arm64.dmg"><i class="fa fa-fw fa-download notranslate"></i> Apple Silicon</a>
+                  <a class="btn btn-info" href="https://get.openlp.org/3.1.1/OpenLP-3.1.1-arm64.dmg"><i class="fa fa-fw fa-download notranslate"></i> Apple Silicon</a>
                   <button type="button" class="btn btn-danger" data-dismiss="modal">Close</button>
                 </div>
               </div>
@@ -390,6 +390,7 @@
             <button type="button" class="btn btn-fedora" data-toggle="modal" data-target="#fedora-install"><img src="/images/fedora-logo.png" class="icon notranslate"> Fedora</button>
             <button type="button" class="btn btn-debian" data-toggle="modal" data-target="#debian-install"><img src="/images/debian-logo.png" class="icon notranslate"> Debian</button>
             <button type="button" class="btn btn-arch" data-toggle="modal" data-target="#arch-install"><img src="/images/archlinux-logo.png" class="icon notranslate"> Arch</button>
+            <button type="button" class="btn btn-flatpak" data-toggle="modal" data-target="#flatpak-install"><img src="/images/flatpak-logo.png" class="icon notranslate"> Flatpak</button>
           </p>
           <div class="modal fade" id="ubuntu-install" tabindex="-1" role="dialog" aria-labelledby="ubuntu-install-title" style="text-align: left;" data-backdrop="true">
             <div class="modal-dialog" role="document">
@@ -415,8 +416,8 @@
                       <p>If you are running an older version of Ubuntu (22.04 and up), you can install the latest
                       version of OpenLP by downloading the latest DEB file and installing it, running the following
                       commands in a terminal:</p>
-                      <pre>wget https://get.openlp.org/3.1.0/openlp_3.1.0-1.deb
+                      <pre>wget https://get.openlp.org/3.1.1/openlp_3.1.1-1.deb
-sudo dpkg -i openlp_3.1.0-1.deb
+sudo dpkg -i openlp_3.1.1-1.deb
 sudo apt -f install</pre>
                     </div>
                   </p>
@@ -493,12 +494,35 @@ sudo apt -f install</pre>
               </div>
             </div>
           </div>
+          <div class="modal fade" id="flatpak-install" tabindex="-1" role="dialog" aria-labelledby="flatpak-install-title" style="text-align: left;" data-backdrop="true">
+            <div class="modal-dialog" role="document">
+              <div class="modal-content">
+                <div class="modal-header">
+                  <button type="button" class="close notranslate" data-dismiss="modal" aria-label="Close" tx-attrs="aria-label">
+                    <span aria-hidden="true">&times;</span>
+                  </button>
+                  <h4 class="modal-title" id="flatpak-install-title">Flatpak Installation</h4>
+                </div>
+                <div class="modal-body">
+                  <div class="alert alert-danger" role="alert">
+                    <p><i class="fa fa-fw fa-exclamation-triangle notranslate"></i> This is for informational purposes and <strong>unsupported</strong> by OpenLP.</p>
+                  </div>
+                  <p>This Flatpak is experimental, and currently the OpenLP team does not support its use.</p>
+                  <p>You will need the FlatHub repository installed in order to install dependencies.</p>
+                </div>
+                <div class="modal-footer">
+                  <a class="btn btn-success" href="https://get.openlp.org/3.1.1/openlp-3.1.1-1.flatpak"><i class="fa fa-fw fa-download"></i> Download</a>
+                  <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
         <div class="source hidden">
           <h4>OpenLP Source Code</h4>
-          <p class="notranslate">OpenLP 3.1.0</p>
+          <p class="notranslate">OpenLP 3.1.1</p>
           <p>
-            <a href="https://get.openlp.org/3.1.0/OpenLP-3.1.0.tar.gz" class="btn btn-success"><i class="fa fa-fw fa-download notranslate"></i> Direct Download</a>
+            <a href="https://get.openlp.org/3.1.1/OpenLP-3.1.1.tar.gz" class="btn btn-success"><i class="fa fa-fw fa-download notranslate"></i> Direct Download</a>
           </p>
         </div>
       </div>