Merge branch 'update-donation-page' into 'master'

Update the website

See merge request openlp/website!34

blog/thank-you-for-your-donations.rst

@@ -0,0 +1,44 @@
+.. title: Thank You for Your Donations!
+.. slug: blog/2023/06/07/thank-you-for-your-donations
+.. date: 2023-06-07 12:00:00 UTC
+.. tags: 
+.. category: 
+.. link: 
+.. description: 
+.. type: text
+.. previewimage: /cover-images/thank-you-for-your-donations.jpg
+
+**Thank you so much!**
+
+We want to say a **HUGE** thank you to our community for the recent donations we have received. The
+recent donations we have received have enabled us to purchase the following items:
+
+High DPI monitor
+----------------
+
+Many people have had issues on Windows with high DPI monitors and scaling. Thanks to the community,
+we were able to purchase a 4K monitor so that we can test OpenLP with high resolutions and hopefully
+narrow down these issues.
+
+Apple Silicon Mac Mini
+----------------------
+
+Due to a lack of resources, up until now we have not been able to build OpenLP on the new Apple
+Silicon platform, resulting in various compatibility issues, especially with video. Thanks to some
+extremely generous members of our community, we were able to purchase a Mac Mini M2, and we'll be
+using that for building Apple Silicon versions of OpenLP, as well as testing and development of
+OpenLP on that platform.
+
+Extra RAM
+---------
+
+We are also using virtual machines for running some tests and some development on Windows. These can
+be quite resource intensive, and my desktop computer was not able to fully handle it. Thanks to our
+community, the cost of an extra 16GB of RAM was covered, and we're able to run more virtual machines
+for development and testing.
+
+Ongoing Expenses
+----------------
+
+We do still have our regular ongoing expenses (domain names, downloads and forums hosting, etc), and
+we are really grateful for the continued financial support of the community. Thank you!

pages/donate.rst

@@ -59,17 +59,15 @@ them already.
 .. table::
    :class: table
 
-   +------------------------------------------------------------------+-------------------+--------------+--------------+------------------+
+   +------------------------------------------------------------------+-------------------+-------------------+---------------+----------------------+
-   | Item                                                             | Cost              | Covered      | Purchased    |       Keywords   |
+   | Item                                                             | Cost              | Covered           | Purchased     |       Keywords       |
-   +==================================================================+===================+==============+==============+==================+
+   +==================================================================+===================+===================+===============+======================+
-   | `Extra RAM for virtual machines`_                                | $39.99            | $39.99       | Yes          | RAM              |
+   | |ss| `Extra RAM for virtual machines`_ |se|                      | |ss| $39.99 |se|  | |ss| $39.99 |se|  | |ss| Yes |se| | |ss| RAM |se|        |
-   +------------------------------------------------------------------+-------------------+--------------+--------------+------------------+
+   +------------------------------------------------------------------+-------------------+-------------------+---------------+----------------------+
-   | `4K monitor for Hi DPI testing`_                                 | $169.99           | $65.00       | Yes          | 4K Monitor       |
+   | |ss| `4K monitor for Hi DPI testing`_ |se|                       | |ss| $169.99 |se| | |ss| $169.99 |se| | |ss| Yes |se| | |ss| 4K Monitor |se| |
-   +------------------------------------------------------------------+-------------------+--------------+--------------+------------------+
+   +------------------------------------------------------------------+-------------------+-------------------+---------------+----------------------+
-   | |ss| Refurbished Apple M1 Mac Mini |se|  *(no longer available)* | |ss| $469.00 |se| | |ss| $0 |ss| | |ss| No |se| | |ss| M1 Mac |se| |
+   | |ss| `Apple M2 Mac Mini`_ |se|                                   | |ss| $599.00 |se| | |se| $599.00 |se| | |ss| Yes |se| | |ss| M2 Mac |se|     |
-   +------------------------------------------------------------------+-------------------+--------------+--------------+------------------+
+   +------------------------------------------------------------------+-------------------+-------------------+---------------+----------------------+
-   | `Apple M2 Mac Mini`_                                             | $599.00           | $0           | No           | M2 Mac           |
-   +------------------------------------------------------------------+-------------------+--------------+--------------+------------------+
 
 
 If you feel led to give for something specifically, please feel free to use the keywords when you

themes/openlp2v2/templates/front_page.html

@@ -342,8 +342,41 @@
           <h4>OpenLP for Mac OS X 10.15 and higher</h4>
           <p class="notranslate">OpenLP 3.0.2</p>
           <p>
-            <a href="https://get.openlp.org/3.0.2/OpenLP-3.0.2.dmg" class="btn btn-success"><i class="fa fa-fw fa-download notranslate"></i> Direct Download</a>
+            <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>
+          <div class="modal fade" id="macos-install" tabindex="-1" role="dialog" aria-labelledby="macos-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="macos-install-title">macOS Installation Instructions</h4>
+                </div>
+                <div class="modal-body">
+                  <div class="alert alert-danger small" role="alert">
+                    <p><i class="fa fa-fw fa-info-circle notranslate"></i> Follow the instructions below or OpenLP will be corrupted.</p>
+                  </div>
+                  <ol>
+                    <li><p>Download OpenLP using the download button below</p></li>
+                    <li><p>Open the downloaded file and drag the OpenLP app to your Applications folder</p></li>
+                    <li><p>In your Applications folder, open the <strong>Utilities</strong> folder and run the <strong>Terminal</strong> app</p></li>
+                    <li>
+                      <p>In the Terminal app, type the following:</p>
+                      <pre class="literal-block">xattr -dr com.apple.quarantine /Applications/OpenLP.app</pre>
+                      <p>If you are on an Apple Silicon Mac, you may need to run this command too:</p>
+                      <pre class="literal-block">xattr -cr /Applications/OpenLP.app</pre>
+                    </li>
+                    <li><p>Now OpenLP should open correctly.</p></li>
+                  </ol>
+                </div>
+                <div class="modal-footer">
+                  <a href="https://get.openlp.org/3.0.2/OpenLP-3.0.2.dmg" class="btn btn-success"><i class="fa fa-fw fa-download notranslate"></i> Download</a>
+                  <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
         <div class="linux hidden">
           <h4>OpenLP for Linux</h4>
@@ -364,12 +397,25 @@
                   <h4 class="modal-title" id="ubuntu-install-title">Ubuntu Installation Instructions</h4>
                 </div>
                 <div class="modal-body">
-                  <div class="alert alert-danger small" role="alert">
+                  <div class="alert alert-info" role="alert">
-                    <p><i class="fa fa-fw fa-info-circle notranslate"></i> OpenLP only supports Canonical-supported versions of Ubuntu from <strong>22.04 and up</strong>.</p>
+                    <p><i class="fa fa-fw fa-info-circle notranslate"></i> OpenLP only supports Ubuntu from <strong>23.04 and up</strong>.</p>
                   </div>
                   <p>To install OpenLP, either search for OpenLP in Software Center, or run the following command:</p>
                   <pre>$ sudo apt install openlp</pre>
-                  <p>To get the latest pre-release files, see the <a href="/blog/">latest blog post</a>.</p>
+                  <p>
+                    <a href="#ubuntu-advanced" data-toggle="collapse" role="button" aria-expanded="false" aria-controls="ubuntu-advanced">Previous versions of Ubuntu <span class="caret"></span></a>
+                    <div class="collapse" id="ubuntu-advanced">
+                      <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>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.0.2/openlp_3.0.2-1.deb
+sudo dpkg -i openlp_3.0.2-1.deb
+sudo apt -f install</pre>
+                    </div>
+                  </p>
                 </div>
                 <div class="modal-footer">
                   <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
@@ -387,8 +433,8 @@
                   <h4 class="modal-title" id="fedora-install-title">Fedora Installation Instructions</h4>
                 </div>
                 <div class="modal-body">
-                  <div class="alert alert-danger small" role="alert">
+                  <div class="alert alert-info" role="alert">
-                    <p><strong>Note:</strong> OpenLP only supports the most recent Fedora release.</p>
+                    <p><i class="fa fa-info-circle"></i> <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>
@@ -409,11 +455,13 @@
                   <h4 class="modal-title" id="debian-install-title">Debian Installation Instructions</h4>
                 </div>
                 <div class="modal-body">
-                  <div class="alert alert-danger small" role="alert">
+                  <div class="alert alert-info" role="alert">
-                    <p><strong>Note:</strong> OpenLP only supports Debian unstable.</p>
+                    <p><i class="fa fa-info-circle"></i> <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>
+                  <p><strong>Note:</strong> The version of OpenLP in the repositories at time lags behind the official
+                  release by a week or two.</p>
                 </div>
                 <div class="modal-footer">
                   <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>